mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-12-03 18:00:36 +00:00
85d407c2a0
Extract API definitions, models, and provider specifications into a standalone llama-stack-api package that can be published to PyPI independently of the main llama-stack server. 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.* - Preserved git history using git mv for moved files - Configured local editable install for development workflow - Updated linting and type-checking configuration for both packages - Rebased on top of upstream src/ layout changes Testing Package builds successfully and can be imported independently. All pre-commit hooks pass with expected exclusions maintained. Next Steps - Publish llama-stack-api to PyPI - Update external provider dependencies - Re-enable external provider module tests Signed-off-by: Charlie Doern <cdoern@redhat.com>
112 lines
4 KiB
Python
112 lines
4 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.
|
|
|
|
|
|
from llama_stack_api.apis.models import ModelType
|
|
|
|
from llama_stack.core.datatypes import ModelWithOwner, User
|
|
from llama_stack.core.store.registry import CachedDiskDistributionRegistry
|
|
|
|
|
|
async def test_registry_cache_with_acl(cached_disk_dist_registry):
|
|
model = ModelWithOwner(
|
|
identifier="model-acl",
|
|
provider_id="test-provider",
|
|
provider_resource_id="model-acl-resource",
|
|
model_type=ModelType.llm,
|
|
owner=User("testuser", {"roles": ["admin"], "teams": ["ai-team"]}),
|
|
)
|
|
|
|
success = await cached_disk_dist_registry.register(model)
|
|
assert success
|
|
|
|
cached_model = cached_disk_dist_registry.get_cached("model", "model-acl")
|
|
assert cached_model is not None
|
|
assert cached_model.identifier == "model-acl"
|
|
assert cached_model.owner.principal == "testuser"
|
|
assert cached_model.owner.attributes["roles"] == ["admin"]
|
|
assert cached_model.owner.attributes["teams"] == ["ai-team"]
|
|
|
|
fetched_model = await cached_disk_dist_registry.get("model", "model-acl")
|
|
assert fetched_model is not None
|
|
assert fetched_model.identifier == "model-acl"
|
|
assert fetched_model.owner.attributes["roles"] == ["admin"]
|
|
|
|
new_registry = CachedDiskDistributionRegistry(cached_disk_dist_registry.kvstore)
|
|
await new_registry.initialize()
|
|
|
|
new_model = await new_registry.get("model", "model-acl")
|
|
assert new_model is not None
|
|
assert new_model.identifier == "model-acl"
|
|
assert new_model.owner.principal == "testuser"
|
|
assert new_model.owner.attributes["roles"] == ["admin"]
|
|
assert new_model.owner.attributes["teams"] == ["ai-team"]
|
|
|
|
|
|
async def test_registry_empty_acl(cached_disk_dist_registry):
|
|
model = ModelWithOwner(
|
|
identifier="model-empty-acl",
|
|
provider_id="test-provider",
|
|
provider_resource_id="model-resource",
|
|
model_type=ModelType.llm,
|
|
owner=User("testuser", None),
|
|
)
|
|
|
|
await cached_disk_dist_registry.register(model)
|
|
|
|
cached_model = cached_disk_dist_registry.get_cached("model", "model-empty-acl")
|
|
assert cached_model is not None
|
|
assert cached_model.owner is not None
|
|
assert cached_model.owner.attributes is None
|
|
|
|
all_models = await cached_disk_dist_registry.get_all()
|
|
assert len(all_models) == 1
|
|
|
|
model = ModelWithOwner(
|
|
identifier="model-no-acl",
|
|
provider_id="test-provider",
|
|
provider_resource_id="model-resource-2",
|
|
model_type=ModelType.llm,
|
|
)
|
|
|
|
await cached_disk_dist_registry.register(model)
|
|
|
|
cached_model = cached_disk_dist_registry.get_cached("model", "model-no-acl")
|
|
assert cached_model is not None
|
|
assert cached_model.owner is None
|
|
|
|
all_models = await cached_disk_dist_registry.get_all()
|
|
assert len(all_models) == 2
|
|
|
|
|
|
async def test_registry_serialization(cached_disk_dist_registry):
|
|
attributes = {
|
|
"roles": ["admin", "researcher"],
|
|
"teams": ["ai-team", "ml-team"],
|
|
"projects": ["project-a", "project-b"],
|
|
"namespaces": ["prod", "staging"],
|
|
}
|
|
|
|
model = ModelWithOwner(
|
|
identifier="model-serialize",
|
|
provider_id="test-provider",
|
|
provider_resource_id="model-resource",
|
|
model_type=ModelType.llm,
|
|
owner=User("bob", attributes),
|
|
)
|
|
|
|
await cached_disk_dist_registry.register(model)
|
|
|
|
new_registry = CachedDiskDistributionRegistry(cached_disk_dist_registry.kvstore)
|
|
await new_registry.initialize()
|
|
|
|
loaded_model = await new_registry.get("model", "model-serialize")
|
|
assert loaded_model is not None
|
|
|
|
assert loaded_model.owner.attributes["roles"] == ["admin", "researcher"]
|
|
assert loaded_model.owner.attributes["teams"] == ["ai-team", "ml-team"]
|
|
assert loaded_model.owner.attributes["projects"] == ["project-a", "project-b"]
|
|
assert loaded_model.owner.attributes["namespaces"] == ["prod", "staging"]
|