From bfe5e256e492899eb58eb4227d362da1f0d1eaa7 Mon Sep 17 00:00:00 2001 From: Emilio Garcia Date: Tue, 4 Nov 2025 15:28:27 -0500 Subject: [PATCH] fix(imports): tests no longer fail due to agents import errors --- src/llama_stack/__init__.py | 5 ----- tests/integration/fixtures/common.py | 2 +- tests/integration/inference/test_provider_data_routing.py | 2 +- tests/integration/inference/test_tools_with_schemas.py | 2 +- tests/integration/inspect/test_inspect.py | 2 +- tests/integration/providers/test_providers.py | 2 +- tests/integration/responses/fixtures/fixtures.py | 2 +- tests/integration/responses/test_file_search.py | 2 +- tests/integration/responses/test_tool_responses.py | 2 +- tests/integration/tool_runtime/test_mcp.py | 2 +- tests/integration/tool_runtime/test_mcp_json_schema.py | 2 +- tests/integration/tool_runtime/test_registration.py | 2 +- 12 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/llama_stack/__init__.py b/src/llama_stack/__init__.py index 1c2ce7123..756f351d8 100644 --- a/src/llama_stack/__init__.py +++ b/src/llama_stack/__init__.py @@ -3,8 +3,3 @@ # # This source code is licensed under the terms described in the LICENSE file in # the root directory of this source tree. - -from llama_stack.core.library_client import ( # noqa: F401 - AsyncLlamaStackAsLibraryClient, - LlamaStackAsLibraryClient, -) diff --git a/tests/integration/fixtures/common.py b/tests/integration/fixtures/common.py index 67e459cc5..d5e4c15f7 100644 --- a/tests/integration/fixtures/common.py +++ b/tests/integration/fixtures/common.py @@ -20,8 +20,8 @@ import yaml from llama_stack_client import LlamaStackClient from openai import OpenAI -from llama_stack import LlamaStackAsLibraryClient from llama_stack.core.datatypes import VectorStoresConfig +from llama_stack.core.library_client import LlamaStackAsLibraryClient from llama_stack.core.stack import run_config_from_adhoc_config_spec from llama_stack.env import get_env_or_fail diff --git a/tests/integration/inference/test_provider_data_routing.py b/tests/integration/inference/test_provider_data_routing.py index 34ee2672f..99aa75395 100644 --- a/tests/integration/inference/test_provider_data_routing.py +++ b/tests/integration/inference/test_provider_data_routing.py @@ -16,7 +16,6 @@ from unittest.mock import AsyncMock, patch import pytest -from llama_stack import LlamaStackAsLibraryClient from llama_stack.apis.datatypes import Api from llama_stack.apis.inference.inference import ( OpenAIAssistantMessageParam, @@ -24,6 +23,7 @@ from llama_stack.apis.inference.inference import ( OpenAIChatCompletionUsage, OpenAIChoice, ) +from llama_stack.core.library_client import LlamaStackAsLibraryClient from llama_stack.core.telemetry.telemetry import MetricEvent diff --git a/tests/integration/inference/test_tools_with_schemas.py b/tests/integration/inference/test_tools_with_schemas.py index b144a5196..f30e9ece5 100644 --- a/tests/integration/inference/test_tools_with_schemas.py +++ b/tests/integration/inference/test_tools_with_schemas.py @@ -13,7 +13,7 @@ import json import pytest -from llama_stack import LlamaStackAsLibraryClient +from llama_stack.core.library_client import LlamaStackAsLibraryClient from llama_stack.models.llama.datatypes import ToolDefinition from tests.common.mcp import make_mcp_server diff --git a/tests/integration/inspect/test_inspect.py b/tests/integration/inspect/test_inspect.py index 8c62c85a1..3a62068c9 100644 --- a/tests/integration/inspect/test_inspect.py +++ b/tests/integration/inspect/test_inspect.py @@ -7,7 +7,7 @@ import pytest from llama_stack_client import LlamaStackClient -from llama_stack import LlamaStackAsLibraryClient +from llama_stack.core.library_client import LlamaStackAsLibraryClient class TestInspect: diff --git a/tests/integration/providers/test_providers.py b/tests/integration/providers/test_providers.py index fc65e2a10..959abf195 100644 --- a/tests/integration/providers/test_providers.py +++ b/tests/integration/providers/test_providers.py @@ -6,7 +6,7 @@ from llama_stack_client import LlamaStackClient -from llama_stack import LlamaStackAsLibraryClient +from llama_stack.core.library_client import LlamaStackAsLibraryClient class TestProviders: diff --git a/tests/integration/responses/fixtures/fixtures.py b/tests/integration/responses/fixtures/fixtures.py index 1783a5622..dbf67e138 100644 --- a/tests/integration/responses/fixtures/fixtures.py +++ b/tests/integration/responses/fixtures/fixtures.py @@ -11,7 +11,7 @@ import pytest import yaml from openai import OpenAI -from llama_stack import LlamaStackAsLibraryClient +from llama_stack.core.library_client import LlamaStackAsLibraryClient # --- Helper Functions --- diff --git a/tests/integration/responses/test_file_search.py b/tests/integration/responses/test_file_search.py index e8d4fe359..dde5fd7f6 100644 --- a/tests/integration/responses/test_file_search.py +++ b/tests/integration/responses/test_file_search.py @@ -9,7 +9,7 @@ import time import pytest -from llama_stack import LlamaStackAsLibraryClient +from llama_stack.core.library_client import LlamaStackAsLibraryClient from .helpers import new_vector_store, upload_file diff --git a/tests/integration/responses/test_tool_responses.py b/tests/integration/responses/test_tool_responses.py index 3f1c35214..9bf58c6ff 100644 --- a/tests/integration/responses/test_tool_responses.py +++ b/tests/integration/responses/test_tool_responses.py @@ -12,8 +12,8 @@ import httpx import openai import pytest -from llama_stack import LlamaStackAsLibraryClient from llama_stack.core.datatypes import AuthenticationRequiredError +from llama_stack.core.library_client import LlamaStackAsLibraryClient from tests.common.mcp import dependency_tools, make_mcp_server from .fixtures.test_cases import ( diff --git a/tests/integration/tool_runtime/test_mcp.py b/tests/integration/tool_runtime/test_mcp.py index 59f558d2c..3a8fde37f 100644 --- a/tests/integration/tool_runtime/test_mcp.py +++ b/tests/integration/tool_runtime/test_mcp.py @@ -10,7 +10,7 @@ import pytest from llama_stack_client.lib.agents.agent import Agent from llama_stack_client.lib.agents.turn_events import StepCompleted, StepProgress, ToolCallIssuedDelta -from llama_stack import LlamaStackAsLibraryClient +from llama_stack.core.library_client import LlamaStackAsLibraryClient AUTH_TOKEN = "test-token" diff --git a/tests/integration/tool_runtime/test_mcp_json_schema.py b/tests/integration/tool_runtime/test_mcp_json_schema.py index 240ec403a..def0b27b8 100644 --- a/tests/integration/tool_runtime/test_mcp_json_schema.py +++ b/tests/integration/tool_runtime/test_mcp_json_schema.py @@ -13,7 +13,7 @@ import json import pytest -from llama_stack import LlamaStackAsLibraryClient +from llama_stack.core.library_client import LlamaStackAsLibraryClient from tests.common.mcp import make_mcp_server AUTH_TOKEN = "test-token" diff --git a/tests/integration/tool_runtime/test_registration.py b/tests/integration/tool_runtime/test_registration.py index c8c9cd046..4d532ed87 100644 --- a/tests/integration/tool_runtime/test_registration.py +++ b/tests/integration/tool_runtime/test_registration.py @@ -8,8 +8,8 @@ import re import pytest -from llama_stack import LlamaStackAsLibraryClient from llama_stack.apis.common.errors import ToolGroupNotFoundError +from llama_stack.core.library_client import LlamaStackAsLibraryClient from tests.common.mcp import MCP_TOOLGROUP_ID, make_mcp_server