Moved some stuff out of common/; re-generated OpenAPI spec

This commit is contained in:
Ashwin Bharambe 2024-09-16 21:21:11 -07:00
parent 76b354a081
commit 6665d31cdf
12 changed files with 238 additions and 236 deletions

View file

@ -14,7 +14,7 @@ from pydantic import BaseModel, ConfigDict, Field
from typing_extensions import Annotated
from llama_models.llama3.api.datatypes import * # noqa: F403
from llama_stack.common.deployment_types import * # noqa: F403
from llama_stack.apis.common.deployment_types import * # noqa: F403
from llama_stack.apis.inference import * # noqa: F403
from llama_stack.apis.safety import * # noqa: F403
from llama_stack.apis.memory import * # noqa: F403

View file

@ -0,0 +1,5 @@
# Copyright (c) Meta Platforms, Inc. and affiliates.
# All rights reserved.
#
# This source code is licensed under the terms described in the LICENSE file in
# the root directory of this source tree.

View file

@ -13,7 +13,7 @@ from pydantic import BaseModel
from llama_models.llama3.api.datatypes import * # noqa: F403
from llama_stack.apis.dataset import * # noqa: F403
from llama_stack.common.training_types import * # noqa: F403
from llama_stack.apis.common.training_types import * # noqa: F403
class TextGenerationMetric(Enum):

View file

@ -15,7 +15,7 @@ from pydantic import BaseModel, Field
from llama_models.llama3.api.datatypes import * # noqa: F403
from llama_stack.apis.dataset import * # noqa: F403
from llama_stack.common.training_types import * # noqa: F403
from llama_stack.apis.common.training_types import * # noqa: F403
class OptimizerType(Enum):

View file

@ -11,7 +11,7 @@ from llama_models.schema_utils import json_schema_type, webmethod
from pydantic import BaseModel, validator
from llama_models.llama3.api.datatypes import * # noqa: F403
from llama_stack.common.deployment_types import RestAPIExecutionConfig
from llama_stack.apis.common.deployment_types import RestAPIExecutionConfig
@json_schema_type

View file

@ -151,7 +151,7 @@ as being "Llama Stack compatible"
def module(self) -> str:
if self.adapter:
return self.adapter.module
return f"llama_stack.{self.api.value}.client"
return f"llama_stack.apis.{self.api.value}.client"
@property
def pip_packages(self) -> List[str]:

View file

@ -309,7 +309,7 @@ async def resolve_impls(
specs[api] = RouterProviderSpec(
api=api,
module=f"llama_stack.{api.value.lower()}.router",
module=f"llama_stack.providers.routers.{api.value.lower()}",
api_dependencies=[],
inner_specs=inner_specs,
)

View file

@ -7,7 +7,7 @@
from llama_models.llama3.api.datatypes import * # noqa: F403
from llama_stack.apis.agents import * # noqa: F403
from llama_stack.apis.dataset import * # noqa: F403
from llama_stack.evaluations.api import * # noqa: F403
from llama_stack.apis.evals import * # noqa: F403
from llama_stack.apis.inference import * # noqa: F403
from llama_stack.apis.batch_inference import * # noqa: F403
from llama_stack.apis.memory import * # noqa: F403