chore(rename): move llama_stack.distribution to llama_stack.core (#2975)

We would like to rename the term `template` to `distribution`. To
prepare for that, this is a precursor.

cc @leseb

tests/unit/server/test_access_control.py

@@ -12,9 +12,9 @@ from pydantic import TypeAdapter, ValidationError
 
 from llama_stack.apis.datatypes import Api
 from llama_stack.apis.models import ModelType
-from llama_stack.distribution.access_control.access_control import AccessDeniedError, is_action_allowed
-from llama_stack.distribution.datatypes import AccessRule, ModelWithOwner, User
-from llama_stack.distribution.routing_tables.models import ModelsRoutingTable
+from llama_stack.core.access_control.access_control import AccessDeniedError, is_action_allowed
+from llama_stack.core.datatypes import AccessRule, ModelWithOwner, User
+from llama_stack.core.routing_tables.models import ModelsRoutingTable
 
 
 class AsyncMock(MagicMock):
@@ -40,7 +40,7 @@ async def test_setup(cached_disk_dist_registry):
     yield cached_disk_dist_registry, routing_table
 
 
-@patch("llama_stack.distribution.routing_tables.common.get_authenticated_user")
+@patch("llama_stack.core.routing_tables.common.get_authenticated_user")
 async def test_access_control_with_cache(mock_get_authenticated_user, test_setup):
     registry, routing_table = test_setup
     model_public = ModelWithOwner(
@@ -104,7 +104,7 @@ async def test_access_control_with_cache(mock_get_authenticated_user, test_setup
         await routing_table.get_model("model-admin")
 
 
-@patch("llama_stack.distribution.routing_tables.common.get_authenticated_user")
+@patch("llama_stack.core.routing_tables.common.get_authenticated_user")
 async def test_access_control_and_updates(mock_get_authenticated_user, test_setup):
     registry, routing_table = test_setup
     model_public = ModelWithOwner(
@@ -142,7 +142,7 @@ async def test_access_control_and_updates(mock_get_authenticated_user, test_setu
     assert model.identifier == "model-updates"
 
 
-@patch("llama_stack.distribution.routing_tables.common.get_authenticated_user")
+@patch("llama_stack.core.routing_tables.common.get_authenticated_user")
 async def test_access_control_empty_attributes(mock_get_authenticated_user, test_setup):
     registry, routing_table = test_setup
     model = ModelWithOwner(
@@ -166,7 +166,7 @@ async def test_access_control_empty_attributes(mock_get_authenticated_user, test
     assert "model-empty-attrs" in model_ids
 
 
-@patch("llama_stack.distribution.routing_tables.common.get_authenticated_user")
+@patch("llama_stack.core.routing_tables.common.get_authenticated_user")
 async def test_no_user_attributes(mock_get_authenticated_user, test_setup):
     registry, routing_table = test_setup
     model_public = ModelWithOwner(
@@ -196,7 +196,7 @@ async def test_no_user_attributes(mock_get_authenticated_user, test_setup):
     assert all_models.data[0].identifier == "model-public-2"
 
 
-@patch("llama_stack.distribution.routing_tables.common.get_authenticated_user")
+@patch("llama_stack.core.routing_tables.common.get_authenticated_user")
 async def test_automatic_access_attributes(mock_get_authenticated_user, test_setup):
     """Test that newly created resources inherit access attributes from their creator."""
     registry, routing_table = test_setup
@@ -275,7 +275,7 @@ async def test_setup_with_access_policy(cached_disk_dist_registry):
     yield routing_table
 
 
-@patch("llama_stack.distribution.routing_tables.common.get_authenticated_user")
+@patch("llama_stack.core.routing_tables.common.get_authenticated_user")
 async def test_access_policy(mock_get_authenticated_user, test_setup_with_access_policy):
     routing_table = test_setup_with_access_policy
     mock_get_authenticated_user.return_value = User(
@@ -561,6 +561,6 @@ def test_invalid_condition():
     ],
 )
 def test_condition_reprs(condition):
-    from llama_stack.distribution.access_control.conditions import parse_condition
+    from llama_stack.core.access_control.conditions import parse_condition
 
     assert condition == str(parse_condition(condition))

tests/unit/server/test_auth.py

@@ -11,7 +11,7 @@ import pytest
 from fastapi import FastAPI
 from fastapi.testclient import TestClient
 
-from llama_stack.distribution.datatypes import (
+from llama_stack.core.datatypes import (
     AuthenticationConfig,
     AuthProviderType,
     CustomAuthConfig,
@@ -19,9 +19,9 @@ from llama_stack.distribution.datatypes import (
     OAuth2JWKSConfig,
     OAuth2TokenAuthConfig,
 )
-from llama_stack.distribution.request_headers import User
-from llama_stack.distribution.server.auth import AuthenticationMiddleware, _has_required_scope
-from llama_stack.distribution.server.auth_providers import (
+from llama_stack.core.request_headers import User
+from llama_stack.core.server.auth import AuthenticationMiddleware, _has_required_scope
+from llama_stack.core.server.auth_providers import (
     get_attributes_from_claims,
 )
 
@@ -150,10 +150,10 @@ def scope_middleware_with_mocks(mock_auth_endpoint):
         else:
             raise ValueError("No matching route")
 
-    import llama_stack.distribution.server.auth
+    import llama_stack.core.server.auth
 
-    llama_stack.distribution.server.auth.find_matching_route = mock_find_matching_route
-    llama_stack.distribution.server.auth.initialize_route_impls = lambda impls: {}
+    llama_stack.core.server.auth.find_matching_route = mock_find_matching_route
+    llama_stack.core.server.auth.initialize_route_impls = lambda impls: {}
 
     return middleware, mock_app
 

tests/unit/server/test_auth_github.py

@@ -11,8 +11,8 @@ import pytest
 from fastapi import FastAPI
 from fastapi.testclient import TestClient
 
-from llama_stack.distribution.datatypes import AuthenticationConfig, AuthProviderType, GitHubTokenAuthConfig
-from llama_stack.distribution.server.auth import AuthenticationMiddleware
+from llama_stack.core.datatypes import AuthenticationConfig, AuthProviderType, GitHubTokenAuthConfig
+from llama_stack.core.server.auth import AuthenticationMiddleware
 
 
 class MockResponse:
@@ -78,7 +78,7 @@ def test_authenticated_endpoint_with_invalid_bearer_format(github_token_client):
     assert "Invalid Authorization header format" in response.json()["error"]["message"]
 
 
-@patch("llama_stack.distribution.server.auth_providers.httpx.AsyncClient")
+@patch("llama_stack.core.server.auth_providers.httpx.AsyncClient")
 def test_authenticated_endpoint_with_valid_github_token(mock_client_class, github_token_client):
     """Test accessing protected endpoint with valid GitHub token"""
     # Mock the GitHub API responses
@@ -118,7 +118,7 @@ def test_authenticated_endpoint_with_valid_github_token(mock_client_class, githu
     assert calls[0][1]["headers"]["Authorization"] == "Bearer github_token_123"
 
 
-@patch("llama_stack.distribution.server.auth_providers.httpx.AsyncClient")
+@patch("llama_stack.core.server.auth_providers.httpx.AsyncClient")
 def test_authenticated_endpoint_with_invalid_github_token(mock_client_class, github_token_client):
     """Test accessing protected endpoint with invalid GitHub token"""
     # Mock the GitHub API to return 401 Unauthorized
@@ -135,7 +135,7 @@ def test_authenticated_endpoint_with_invalid_github_token(mock_client_class, git
     )
 
 
-@patch("llama_stack.distribution.server.auth_providers.httpx.AsyncClient")
+@patch("llama_stack.core.server.auth_providers.httpx.AsyncClient")
 def test_github_enterprise_support(mock_client_class):
     """Test GitHub Enterprise support with custom API base URL"""
     app = FastAPI()

tests/unit/server/test_quota.py

@@ -9,8 +9,8 @@ from fastapi import FastAPI, Request
 from fastapi.testclient import TestClient
 from starlette.middleware.base import BaseHTTPMiddleware
 
-from llama_stack.distribution.datatypes import QuotaConfig, QuotaPeriod
-from llama_stack.distribution.server.quota import QuotaMiddleware
+from llama_stack.core.datatypes import QuotaConfig, QuotaPeriod
+from llama_stack.core.server.quota import QuotaMiddleware
 from llama_stack.providers.utils.kvstore.config import SqliteKVStoreConfig
 
 

tests/unit/server/test_replace_env_vars.py

@@ -8,7 +8,7 @@ import os
 
 import pytest
 
-from llama_stack.distribution.stack import replace_env_vars
+from llama_stack.core.stack import replace_env_vars
 
 
 @pytest.fixture

tests/unit/server/test_resolver.py

@@ -12,14 +12,14 @@ from unittest.mock import AsyncMock, MagicMock
 from pydantic import BaseModel, Field
 
 from llama_stack.apis.inference import Inference
-from llama_stack.distribution.datatypes import (
+from llama_stack.core.datatypes import (
     Api,
     Provider,
     StackRunConfig,
 )
-from llama_stack.distribution.resolver import resolve_impls
-from llama_stack.distribution.routers.inference import InferenceRouter
-from llama_stack.distribution.routing_tables.models import ModelsRoutingTable
+from llama_stack.core.resolver import resolve_impls
+from llama_stack.core.routers.inference import InferenceRouter
+from llama_stack.core.routing_tables.models import ModelsRoutingTable
 from llama_stack.providers.datatypes import InlineProviderSpec, ProviderSpec
 
 

tests/unit/server/test_server.py

@@ -10,9 +10,9 @@ from fastapi import HTTPException
 from openai import BadRequestError
 from pydantic import ValidationError
 
-from llama_stack.distribution.access_control.access_control import AccessDeniedError
-from llama_stack.distribution.datatypes import AuthenticationRequiredError
-from llama_stack.distribution.server.server import translate_exception
+from llama_stack.core.access_control.access_control import AccessDeniedError
+from llama_stack.core.datatypes import AuthenticationRequiredError
+from llama_stack.core.server.server import translate_exception
 
 
 class TestTranslateException:
@@ -29,7 +29,7 @@ class TestTranslateException:
 
     def test_translate_access_denied_error_with_context(self):
         """Test that AccessDeniedError with context includes detailed information."""
-        from llama_stack.distribution.datatypes import User
+        from llama_stack.core.datatypes import User
 
         # Create mock user and resource
         user = User("test-user", {"roles": ["user"], "teams": ["dev"]})

tests/unit/server/test_sse.py

@@ -8,7 +8,7 @@ import asyncio
 from unittest.mock import AsyncMock, MagicMock
 
 from llama_stack.apis.common.responses import PaginatedResponse
-from llama_stack.distribution.server.server import create_dynamic_typed_route, create_sse_event, sse_generator
+from llama_stack.core.server.server import create_dynamic_typed_route, create_sse_event, sse_generator
 
 
 async def test_sse_generator_basic():