mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-12-03 09:53:45 +00:00
840ad75fe9
# What does this PR do? Extract API definitions and provider specifications into a standalone llama-stack-api package that can be published to PyPI independently of the main llama-stack server. see: https://github.com/llamastack/llama-stack/pull/2978 and https://github.com/llamastack/llama-stack/pull/2978#issuecomment-3145115942 Motivation External providers currently import from llama-stack, which overrides the installed version and causes dependency conflicts. This separation allows external providers to: - Install only the type definitions they need without server dependencies - Avoid version conflicts with the installed llama-stack package - Be versioned and released independently This enables us to re-enable external provider module tests that were previously blocked by these import conflicts. Changes - Created llama-stack-api package with minimal dependencies (pydantic, jsonschema) - Moved APIs, providers datatypes, strong_typing, and schema_utils - Updated all imports from llama_stack.* to llama_stack_api.* - Configured local editable install for development workflow - Updated linting and type-checking configuration for both packages Next Steps - Publish llama-stack-api to PyPI - Update external provider dependencies - Re-enable external provider module tests Pre-cursor PRs to this one: - #4093 - #3954 - #4064 These PRs moved key pieces _out_ of the Api pkg, limiting the scope of change here. relates to #3237 ## Test Plan Package builds successfully and can be imported independently. All pre-commit hooks pass with expected exclusions maintained. --------- Signed-off-by: Charlie Doern <cdoern@redhat.com>
75 lines
2.8 KiB
Python
75 lines
2.8 KiB
Python
# 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.
|
|
|
|
import os
|
|
from typing import Any
|
|
|
|
from llama_stack_api import json_schema_type
|
|
from pydantic import BaseModel, Field
|
|
|
|
from llama_stack.providers.utils.inference.model_registry import RemoteInferenceProviderConfig
|
|
|
|
|
|
class OCIProviderDataValidator(BaseModel):
|
|
oci_auth_type: str = Field(
|
|
description="OCI authentication type (must be one of: instance_principal, config_file)",
|
|
)
|
|
oci_region: str = Field(
|
|
description="OCI region (e.g., us-ashburn-1)",
|
|
)
|
|
oci_compartment_id: str = Field(
|
|
description="OCI compartment ID for the Generative AI service",
|
|
)
|
|
oci_config_file_path: str | None = Field(
|
|
default="~/.oci/config",
|
|
description="OCI config file path (required if oci_auth_type is config_file)",
|
|
)
|
|
oci_config_profile: str | None = Field(
|
|
default="DEFAULT",
|
|
description="OCI config profile (required if oci_auth_type is config_file)",
|
|
)
|
|
|
|
|
|
@json_schema_type
|
|
class OCIConfig(RemoteInferenceProviderConfig):
|
|
oci_auth_type: str = Field(
|
|
description="OCI authentication type (must be one of: instance_principal, config_file)",
|
|
default_factory=lambda: os.getenv("OCI_AUTH_TYPE", "instance_principal"),
|
|
)
|
|
oci_region: str = Field(
|
|
default_factory=lambda: os.getenv("OCI_REGION", "us-ashburn-1"),
|
|
description="OCI region (e.g., us-ashburn-1)",
|
|
)
|
|
oci_compartment_id: str = Field(
|
|
default_factory=lambda: os.getenv("OCI_COMPARTMENT_OCID", ""),
|
|
description="OCI compartment ID for the Generative AI service",
|
|
)
|
|
oci_config_file_path: str = Field(
|
|
default_factory=lambda: os.getenv("OCI_CONFIG_FILE_PATH", "~/.oci/config"),
|
|
description="OCI config file path (required if oci_auth_type is config_file)",
|
|
)
|
|
oci_config_profile: str = Field(
|
|
default_factory=lambda: os.getenv("OCI_CLI_PROFILE", "DEFAULT"),
|
|
description="OCI config profile (required if oci_auth_type is config_file)",
|
|
)
|
|
|
|
@classmethod
|
|
def sample_run_config(
|
|
cls,
|
|
oci_auth_type: str = "${env.OCI_AUTH_TYPE:=instance_principal}",
|
|
oci_config_file_path: str = "${env.OCI_CONFIG_FILE_PATH:=~/.oci/config}",
|
|
oci_config_profile: str = "${env.OCI_CLI_PROFILE:=DEFAULT}",
|
|
oci_region: str = "${env.OCI_REGION:=us-ashburn-1}",
|
|
oci_compartment_id: str = "${env.OCI_COMPARTMENT_OCID:=}",
|
|
**kwargs,
|
|
) -> dict[str, Any]:
|
|
return {
|
|
"oci_auth_type": oci_auth_type,
|
|
"oci_config_file_path": oci_config_file_path,
|
|
"oci_config_profile": oci_config_profile,
|
|
"oci_region": oci_region,
|
|
"oci_compartment_id": oci_compartment_id,
|
|
}
|