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>
54 lines
1.9 KiB
Python
54 lines
1.9 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 yaml
|
|
from llama_stack_api import Api, ExternalApiSpec
|
|
|
|
from llama_stack.core.datatypes import BuildConfig, StackRunConfig
|
|
from llama_stack.log import get_logger
|
|
|
|
logger = get_logger(name=__name__, category="core")
|
|
|
|
|
|
def load_external_apis(config: StackRunConfig | BuildConfig | None) -> dict[Api, ExternalApiSpec]:
|
|
"""Load external API specifications from the configured directory.
|
|
|
|
Args:
|
|
config: StackRunConfig or BuildConfig containing the external APIs directory path
|
|
|
|
Returns:
|
|
A dictionary mapping API names to their specifications
|
|
"""
|
|
if not config or not config.external_apis_dir:
|
|
return {}
|
|
|
|
external_apis_dir = config.external_apis_dir.expanduser().resolve()
|
|
if not external_apis_dir.is_dir():
|
|
logger.error(f"External APIs directory is not a directory: {external_apis_dir}")
|
|
return {}
|
|
|
|
logger.info(f"Loading external APIs from {external_apis_dir}")
|
|
external_apis: dict[Api, ExternalApiSpec] = {}
|
|
|
|
# Look for YAML files in the external APIs directory
|
|
for yaml_path in external_apis_dir.glob("*.yaml"):
|
|
try:
|
|
with open(yaml_path) as f:
|
|
spec_data = yaml.safe_load(f)
|
|
|
|
spec = ExternalApiSpec(**spec_data)
|
|
api = Api.add(spec.name)
|
|
logger.info(f"Loaded external API spec for {spec.name} from {yaml_path}")
|
|
external_apis[api] = spec
|
|
except yaml.YAMLError as yaml_err:
|
|
logger.error(f"Failed to parse YAML file {yaml_path}: {yaml_err}")
|
|
raise
|
|
except Exception:
|
|
logger.exception(f"Failed to load external API spec from {yaml_path}")
|
|
raise
|
|
|
|
return external_apis
|