Skip to content

Building AI agents, atomically

updating test imports and test structure

jon foxdcfff5940a01
diff --git a/atomic-agents/atomic_agents/connectors/mcp/__init__.py b/atomic-agents/atomic_agents/connectors/mcp/__init__.py
index 8c76b2e..ad6ba28 100644
--- a/atomic-agents/atomic_agents/connectors/mcp/__init__.py
+++ b/atomic-agents/atomic_agents/connectors/mcp/__init__.py
@@ -2,13 +2,11 @@ from .mcp_tool_factory import (
MCPToolFactory,
fetch_mcp_tools_async,
fetch_mcp_tools,
+ fetch_mcp_tools_with_schema,
create_mcp_orchestrator_schema,
MCPToolOutputSchema,
)
-from .tool_definition_service import (
- ToolDefinitionService,
- MCPTransportType,
-)
+from .tool_definition_service import ToolDefinitionService, MCPTransportType, MCPToolDefinition
from .schema_transformer import SchemaTransformer
__all__ = [
@@ -18,6 +16,8 @@ __all__ = [
"ToolDefinitionService",
"fetch_mcp_tools",
"fetch_mcp_tools_async",
+ "fetch_mcp_tools_with_schema",
"create_mcp_orchestrator_schema",
"MCPTransportType",
+ "MCPToolDefinition",
]
diff --git a/atomic-agents/tests/lib/base/test_base_tool.py b/atomic-agents/tests/base/test_base_tool.py
similarity index 95%
rename from atomic-agents/tests/lib/base/test_base_tool.py
rename to atomic-agents/tests/base/test_base_tool.py
index b0f619c..15f37c7 100644
--- a/atomic-agents/tests/lib/base/test_base_tool.py
+++ b/atomic-agents/tests/base/test_base_tool.py
@@ -1,6 +1,5 @@
from pydantic import BaseModel
-from atomic_agents.lib.base.base_tool import BaseToolConfig, BaseTool
-from atomic_agents.agents.base_agent import BaseIOSchema
+from atomic_agents import BaseToolConfig, BaseTool, BaseIOSchema
# Mock classes for testing
diff --git a/atomic-agents/tests/lib/factories/test_mcp_tool_factory.py b/atomic-agents/tests/connectors/mcp/test_mcp_tool_factory.py
similarity index 99%
rename from atomic-agents/tests/lib/factories/test_mcp_tool_factory.py
rename to atomic-agents/tests/connectors/mcp/test_mcp_tool_factory.py
index 1dafcb2..88ffebd 100644
--- a/atomic-agents/tests/lib/factories/test_mcp_tool_factory.py
+++ b/atomic-agents/tests/connectors/mcp/test_mcp_tool_factory.py
@@ -1,14 +1,14 @@
import pytest
from pydantic import BaseModel
import asyncio
-from atomic_agents.lib.factories.mcp_tool_factory import (
+from atomic_agents.connectors.mcp import (
fetch_mcp_tools,
create_mcp_orchestrator_schema,
fetch_mcp_tools_with_schema,
fetch_mcp_tools_async,
MCPToolFactory,
)
-from atomic_agents.lib.factories.tool_definition_service import MCPToolDefinition, ToolDefinitionService, MCPTransportType
+from atomic_agents.connectors.mcp import MCPToolDefinition, ToolDefinitionService, MCPTransportType
class DummySession:
diff --git a/atomic-agents/tests/lib/factories/test_schema_transformer.py b/atomic-agents/tests/connectors/mcp/test_schema_transformer.py
similarity index 97%
rename from atomic-agents/tests/lib/factories/test_schema_transformer.py
rename to atomic-agents/tests/connectors/mcp/test_schema_transformer.py
index 13fabdc..2e5f078 100644
--- a/atomic-agents/tests/lib/factories/test_schema_transformer.py
+++ b/atomic-agents/tests/connectors/mcp/test_schema_transformer.py
@@ -1,8 +1,8 @@
import pytest
from typing import Any, Dict, List, Optional
-from atomic_agents.lib.base.base_io_schema import BaseIOSchema
-from atomic_agents.lib.factories.schema_transformer import SchemaTransformer
+from atomic_agents import BaseIOSchema
+from atomic_agents.connectors.mcp import SchemaTransformer
class TestSchemaTransformer:
diff --git a/atomic-agents/tests/lib/factories/test_tool_definition_service.py b/atomic-agents/tests/connectors/mcp/test_tool_definition_service.py
similarity index 99%
rename from atomic-agents/tests/lib/factories/test_tool_definition_service.py
rename to atomic-agents/tests/connectors/mcp/test_tool_definition_service.py
index e1060a0..45dd8b9 100644
--- a/atomic-agents/tests/lib/factories/test_tool_definition_service.py
+++ b/atomic-agents/tests/connectors/mcp/test_tool_definition_service.py
@@ -1,7 +1,7 @@
import pytest
from unittest.mock import AsyncMock, MagicMock, patch
-from atomic_agents.lib.factories.tool_definition_service import (
+from atomic_agents.connectors.mcp import (
ToolDefinitionService,
MCPToolDefinition,
MCPTransportType,
diff --git a/atomic-agents/tests/lib/components/test_chat_history.py b/atomic-agents/tests/context/test_chat_history.py
similarity index 99%
rename from atomic-agents/tests/lib/components/test_chat_history.py
rename to atomic-agents/tests/context/test_chat_history.py
index fe68681..674ee71 100644
--- a/atomic-agents/tests/lib/components/test_chat_history.py
+++ b/atomic-agents/tests/context/test_chat_history.py
@@ -4,8 +4,8 @@ import pytest
import json
from typing import List, Dict
from pydantic import Field
-from atomic_agents.lib.components.chat_history import ChatHistory, Message
-from atomic_agents.lib.base.base_io_schema import BaseIOSchema
+from atomic_agents.context import ChatHistory, Message
+from atomic_agents import BaseIOSchema
import instructor
diff --git a/atomic-agents/tests/lib/components/test_system_prompt_generator.py b/atomic-agents/tests/context/test_system_prompt_generator.py
similarity index 95%
rename from atomic-agents/tests/lib/components/test_system_prompt_generator.py
rename to atomic-agents/tests/context/test_system_prompt_generator.py
index 3d6bd40..02ecfe5 100644
--- a/atomic-agents/tests/lib/components/test_system_prompt_generator.py
+++ b/atomic-agents/tests/context/test_system_prompt_generator.py
@@ -1,7 +1,7 @@
-from atomic_agents.lib.components.system_prompt_generator import SystemPromptGenerator, SystemPromptContextProviderBase
+from atomic_agents.context import SystemPromptGenerator, BaseDynamicContextProvider
-class MockContextProvider(SystemPromptContextProviderBase):
+class MockContextProvider(BaseDynamicContextProvider):
def __init__(self, title: str, info: str):
super().__init__(title)
self._info = info
diff --git a/atomic-agents/tests/lib/utils/test_format_tool_message.py b/atomic-agents/tests/utils/test_format_tool_message.py
similarity index 97%
rename from atomic-agents/tests/lib/utils/test_format_tool_message.py
rename to atomic-agents/tests/utils/test_format_tool_message.py
index fd624ce..bb439cf 100644
--- a/atomic-agents/tests/lib/utils/test_format_tool_message.py
+++ b/atomic-agents/tests/utils/test_format_tool_message.py
@@ -2,7 +2,7 @@ import uuid
from pydantic import BaseModel
import pytest
from atomic_agents.agents.base_agent import BaseIOSchema
-from atomic_agents.lib.utils.format_tool_message import format_tool_message
+from atomic_agents.utils import format_tool_message
# Mock classes for testing