mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-12-03 18:00:36 +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>
88 lines
4.1 KiB
Python
88 lines
4.1 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 unittest.mock import patch
|
|
|
|
import pytest
|
|
from llama_stack_api import OpenAIFilePurpose, ResourceNotFoundError
|
|
|
|
from llama_stack.core.datatypes import User
|
|
from llama_stack.providers.remote.files.s3.files import S3FilesImpl
|
|
|
|
|
|
async def test_listing_hides_other_users_file(s3_provider, sample_text_file):
|
|
"""Listing should not show files uploaded by other users."""
|
|
user_a = User("user-a", {"roles": ["team-a"]})
|
|
user_b = User("user-b", {"roles": ["team-b"]})
|
|
|
|
with patch("llama_stack.providers.utils.sqlstore.authorized_sqlstore.get_authenticated_user") as mock_get_user:
|
|
mock_get_user.return_value = user_a
|
|
uploaded = await s3_provider.openai_upload_file(file=sample_text_file, purpose=OpenAIFilePurpose.ASSISTANTS)
|
|
|
|
with patch("llama_stack.providers.utils.sqlstore.authorized_sqlstore.get_authenticated_user") as mock_get_user:
|
|
mock_get_user.return_value = user_b
|
|
listed = await s3_provider.openai_list_files()
|
|
assert all(f.id != uploaded.id for f in listed.data)
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"op",
|
|
[S3FilesImpl.openai_retrieve_file, S3FilesImpl.openai_retrieve_file_content, S3FilesImpl.openai_delete_file],
|
|
ids=["retrieve", "content", "delete"],
|
|
)
|
|
async def test_cannot_access_other_user_file(s3_provider, sample_text_file, op):
|
|
"""Operations (metadata/content/delete) on another user's file should raise ResourceNotFoundError.
|
|
|
|
`op` is an async callable (provider, file_id) -> awaits the requested operation.
|
|
"""
|
|
user_a = User("user-a", {"roles": ["team-a"]})
|
|
user_b = User("user-b", {"roles": ["team-b"]})
|
|
|
|
with patch("llama_stack.providers.utils.sqlstore.authorized_sqlstore.get_authenticated_user") as mock_get_user:
|
|
mock_get_user.return_value = user_a
|
|
uploaded = await s3_provider.openai_upload_file(file=sample_text_file, purpose=OpenAIFilePurpose.ASSISTANTS)
|
|
|
|
with patch("llama_stack.providers.utils.sqlstore.authorized_sqlstore.get_authenticated_user") as mock_get_user:
|
|
mock_get_user.return_value = user_b
|
|
with pytest.raises(ResourceNotFoundError):
|
|
await op(s3_provider, uploaded.id)
|
|
|
|
|
|
async def test_shared_role_allows_listing(s3_provider, sample_text_file):
|
|
"""Listing should show files uploaded by other users when roles are shared."""
|
|
user_a = User("user-a", {"roles": ["shared-role"]})
|
|
user_b = User("user-b", {"roles": ["shared-role"]})
|
|
|
|
with patch("llama_stack.providers.utils.sqlstore.authorized_sqlstore.get_authenticated_user") as mock_get_user:
|
|
mock_get_user.return_value = user_a
|
|
uploaded = await s3_provider.openai_upload_file(file=sample_text_file, purpose=OpenAIFilePurpose.ASSISTANTS)
|
|
|
|
with patch("llama_stack.providers.utils.sqlstore.authorized_sqlstore.get_authenticated_user") as mock_get_user:
|
|
mock_get_user.return_value = user_b
|
|
listed = await s3_provider.openai_list_files()
|
|
assert any(f.id == uploaded.id for f in listed.data)
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"op",
|
|
[S3FilesImpl.openai_retrieve_file, S3FilesImpl.openai_retrieve_file_content, S3FilesImpl.openai_delete_file],
|
|
ids=["retrieve", "content", "delete"],
|
|
)
|
|
async def test_shared_role_allows_access(s3_provider, sample_text_file, op):
|
|
"""Operations (metadata/content/delete) on another user's file should succeed when users share a role.
|
|
|
|
`op` is an async callable (provider, file_id) -> awaits the requested operation.
|
|
"""
|
|
user_x = User("user-x", {"roles": ["shared-role"]})
|
|
user_y = User("user-y", {"roles": ["shared-role"]})
|
|
|
|
with patch("llama_stack.providers.utils.sqlstore.authorized_sqlstore.get_authenticated_user") as mock_get_user:
|
|
mock_get_user.return_value = user_x
|
|
uploaded = await s3_provider.openai_upload_file(file=sample_text_file, purpose=OpenAIFilePurpose.ASSISTANTS)
|
|
|
|
with patch("llama_stack.providers.utils.sqlstore.authorized_sqlstore.get_authenticated_user") as mock_get_user:
|
|
mock_get_user.return_value = user_y
|
|
await op(s3_provider, uploaded.id)
|