fix: Separate module for shared code

Author: g3force

adk/agenticlayer/adk/agent.py

@@ -8,8 +8,8 @@
 import httpx
 from a2a.client import A2ACardResolver
 from a2a.utils.constants import AGENT_CARD_WELL_KNOWN_PATH
-from agenticlayer.config import InteractionType, McpTool, SubAgent
-from agenticlayer.constants import HTTP_HEADERS_SESSION_KEY
+from agenticlayer.shared.config import InteractionType, McpTool, SubAgent
+from agenticlayer.shared.constants import HTTP_HEADERS_SESSION_KEY
 from google.adk.agents import BaseAgent, LlmAgent
 from google.adk.agents.llm_agent import ToolUnion
 from google.adk.agents.readonly_context import ReadonlyContext

adk/agenticlayer/adk/agent_to_a2a.py

@@ -13,8 +13,8 @@
 from a2a.server.tasks import InMemoryTaskStore
 from a2a.types import AgentCapabilities, AgentCard
 from a2a.utils.constants import AGENT_CARD_WELL_KNOWN_PATH
-from agenticlayer.config import McpTool, SubAgent
-from agenticlayer.constants import HTTP_HEADERS_SESSION_KEY
+from agenticlayer.shared.config import McpTool, SubAgent
+from agenticlayer.shared.constants import HTTP_HEADERS_SESSION_KEY
 from google.adk.a2a.converters.request_converter import AgentRunRequest
 from google.adk.a2a.executor.a2a_agent_executor import A2aAgentExecutor
 from google.adk.agents import LlmAgent
@@ -224,7 +224,7 @@ async def lifespan(app: Starlette) -> AsyncIterator[None]:
     starlette_app = Starlette(lifespan=lifespan)
 
     # Instrument the Starlette app with OpenTelemetry
-    from agenticlayer.otel_starlette import instrument_starlette_app
+    from agenticlayer.shared.otel_starlette import instrument_starlette_app
 
     instrument_starlette_app(starlette_app)
 

adk/agenticlayer/adk/otel.py

@@ -1,12 +1,12 @@
 """OpenTelemetry setup for a Google ADK Agent App."""
 
-from agenticlayer._otel import (
+from agenticlayer.shared.otel import (
     _decode_body,
     _is_text_content,
     request_hook,
     response_hook,
 )
-from agenticlayer._otel import (
+from agenticlayer.shared.otel import (
     setup_otel as _setup_otel_base,
 )
 

adk/tests/fixtures/app_factory.py

@@ -5,7 +5,7 @@
 from typing import Any
 
 import pytest_asyncio
-from agenticlayer.config import McpTool, SubAgent
+from agenticlayer.shared.config import McpTool, SubAgent
 from asgi_lifespan import LifespanManager
 from google.adk.agents import LlmAgent
 from httpx_retries import Retry

adk/tests/test_agent_integration.py

@@ -6,8 +6,8 @@
 import pytest
 import respx
 from a2a.client.errors import A2AClientHTTPError
-from agenticlayer.config import InteractionType, McpTool, SubAgent
-from agenticlayer.loguru_config import setup_logging
+from agenticlayer.shared.config import InteractionType, McpTool, SubAgent
+from agenticlayer.shared.loguru_config import setup_logging
 from asgi_lifespan import LifespanManager
 from fastmcp import Context, FastMCP
 from httpx_retries import Retry

adk/tests/test_config.py

@@ -1,7 +1,7 @@
 """Unit tests for config parsing functions."""
 
 import pytest
-from agenticlayer.config import InteractionType, parse_sub_agents, parse_tools
+from agenticlayer.shared.config import InteractionType, parse_sub_agents, parse_tools
 
 
 class TestParseSubAgents:

msaf/agenticlayer/msaf/agent.py

@@ -13,7 +13,7 @@
 from a2a.utils.constants import AGENT_CARD_WELL_KNOWN_PATH
 from agent_framework._mcp import MCPStreamableHTTPTool
 from agent_framework._tools import FunctionTool
-from agenticlayer.config import McpTool, SubAgent
+from agenticlayer.shared.config import McpTool, SubAgent
 from httpx_retries import Retry, RetryTransport
 
 logger = logging.getLogger(__name__)

msaf/agenticlayer/msaf/agent_to_a2a.py

@@ -29,7 +29,7 @@
 from agent_framework import SupportsAgentRun
 from agent_framework._mcp import MCPStreamableHTTPTool
 from agent_framework._tools import FunctionTool
-from agenticlayer.config import McpTool, SubAgent
+from agenticlayer.shared.config import McpTool, SubAgent
 from httpx_retries import Retry
 from starlette.applications import Starlette
 
@@ -298,7 +298,7 @@ async def lifespan(app: Starlette) -> AsyncIterator[None]:
     starlette_app = Starlette(lifespan=lifespan)
 
     # Instrument the Starlette app with OpenTelemetry
-    from agenticlayer.otel_starlette import instrument_starlette_app
+    from agenticlayer.shared.otel_starlette import instrument_starlette_app
 
     instrument_starlette_app(starlette_app)
 

msaf/agenticlayer/msaf/otel.py

@@ -1,6 +1,6 @@
 """OpenTelemetry setup for a Microsoft Agent Framework Agent App."""
 
-from agenticlayer._otel import setup_otel as _setup_otel_shared
+from agenticlayer.shared.otel import setup_otel as _setup_otel_shared
 
 __all__ = ["setup_otel"]
 

msaf/pyproject.toml

@@ -6,7 +6,6 @@ requires-python = ">=3.14,<3.15"
 dependencies = [
     "agentic-layer-sdk",
     "agent-framework-core>=1.0.0rc2",
-#    "httpx",
     "httpx-retries>=0.4.5",
 ]