fix circular import

prassanna-ravishankar · prassanna-ravishankar · commit ec9aeace0a46 · 2025-10-01T15:26:00.000+01:00
diff --git a/src/agentex/lib/adk/__init__.py b/src/agentex/lib/adk/__init__.py
@@ -1,14 +1,19 @@
+# ruff: noqa: I001
+# Import order matters here to avoid circular imports
+# The _modules must be imported before providers/utils
 
-from agentex.lib.adk import utils, providers
 from agentex.lib.adk._modules.acp import ACPModule
-from agentex.lib.adk._modules.state import StateModule
-from agentex.lib.adk._modules.tasks import TasksModule
 from agentex.lib.adk._modules.agents import AgentsModule
+from agentex.lib.adk._modules.agent_task_tracker import AgentTaskTrackerModule
 from agentex.lib.adk._modules.events import EventsModule
-from agentex.lib.adk._modules.tracing import TracingModule
 from agentex.lib.adk._modules.messages import MessagesModule
+from agentex.lib.adk._modules.state import StateModule
 from agentex.lib.adk._modules.streaming import StreamingModule
-from agentex.lib.adk._modules.agent_task_tracker import AgentTaskTrackerModule
+from agentex.lib.adk._modules.tasks import TasksModule
+from agentex.lib.adk._modules.tracing import TracingModule
+
+from agentex.lib.adk import providers
+from agentex.lib.adk import utils
 
 acp = ACPModule()
 agents = AgentsModule()
diff --git a/src/agentex/lib/adk/_modules/acp.py b/src/agentex/lib/adk/_modules/acp.py
@@ -1,25 +1,28 @@
-from typing import Any, List
+# ruff: noqa: I001
+# Import order matters - AsyncTracer must come after client import to avoid circular imports
 from datetime import timedelta
+from typing import Any, List
 
+from agentex.types import Event
 from temporalio.common import RetryPolicy
 
-from agentex.types import Event
-from agentex.types.task import Task
-from agentex.lib.utils.logging import make_logger
-from agentex.lib.utils.temporal import in_temporal_workflow
-from agentex.types.task_message import TaskMessage
-from agentex.lib.core.tracing.tracer import AsyncTracer
-from agentex.types.task_message_content import TaskMessageContent
+from agentex import AsyncAgentex  # noqa: F401
 from agentex.lib.adk.utils._modules.client import create_async_agentex_client
 from agentex.lib.core.services.adk.acp.acp import ACPService
 from agentex.lib.core.temporal.activities.activity_helpers import ActivityHelpers
 from agentex.lib.core.temporal.activities.adk.acp.acp_activities import (
     ACPActivityName,
     EventSendParams,
+    MessageSendParams,
     TaskCancelParams,
     TaskCreateParams,
-    MessageSendParams,
 )
+from agentex.lib.core.tracing.tracer import AsyncTracer
+from agentex.types.task_message import TaskMessage
+from agentex.types.task import Task
+from agentex.lib.utils.logging import make_logger
+from agentex.lib.utils.temporal import in_temporal_workflow
+from agentex.types.task_message_content import TaskMessageContent
 
 logger = make_logger(__name__)
 
diff --git a/src/agentex/lib/adk/_modules/agent_task_tracker.py b/src/agentex/lib/adk/_modules/agent_task_tracker.py
@@ -1,20 +1,23 @@
+# ruff: noqa: I001
+# Import order matters - AsyncTracer must come after client import to avoid circular imports
 from datetime import timedelta
 
 from temporalio.common import RetryPolicy
 
-from agentex.lib.utils.logging import make_logger
-from agentex.lib.utils.temporal import in_temporal_workflow
-from agentex.lib.core.tracing.tracer import AsyncTracer
-from agentex.types.agent_task_tracker import AgentTaskTracker
+from agentex import AsyncAgentex  # noqa: F401
 from agentex.lib.adk.utils._modules.client import create_async_agentex_client
 from agentex.lib.core.services.adk.agent_task_tracker import AgentTaskTrackerService
 from agentex.lib.core.temporal.activities.activity_helpers import ActivityHelpers
 from agentex.lib.core.temporal.activities.adk.agent_task_tracker_activities import (
-    GetAgentTaskTrackerParams,
     AgentTaskTrackerActivityName,
-    UpdateAgentTaskTrackerParams,
     GetAgentTaskTrackerByTaskAndAgentParams,
+    GetAgentTaskTrackerParams,
+    UpdateAgentTaskTrackerParams,
 )
+from agentex.lib.core.tracing.tracer import AsyncTracer
+from agentex.types.agent_task_tracker import AgentTaskTracker
+from agentex.lib.utils.logging import make_logger
+from agentex.lib.utils.temporal import in_temporal_workflow
 
 logger = make_logger(__name__)
 
diff --git a/src/agentex/lib/adk/_modules/agents.py b/src/agentex/lib/adk/_modules/agents.py
@@ -1,16 +1,19 @@
-from typing import Optional
+# ruff: noqa: I001
+# Import order matters - AsyncTracer must come after client import to avoid circular imports
 from datetime import timedelta
+from typing import Optional
 
+from agentex.lib.adk.utils._modules.client import create_async_agentex_client
+from agentex.lib.core.temporal.activities.adk.agents_activities import AgentsActivityName, GetAgentParams
 from temporalio.common import RetryPolicy
 
+from agentex import AsyncAgentex  # noqa: F401
+from agentex.lib.core.services.adk.agents import AgentsService
+from agentex.lib.core.temporal.activities.activity_helpers import ActivityHelpers
+from agentex.lib.core.tracing.tracer import AsyncTracer
 from agentex.types.agent import Agent
 from agentex.lib.utils.logging import make_logger
 from agentex.lib.utils.temporal import in_temporal_workflow
-from agentex.lib.core.tracing.tracer import AsyncTracer
-from agentex.lib.core.services.adk.agents import AgentsService
-from agentex.lib.adk.utils._modules.client import create_async_agentex_client
-from agentex.lib.core.temporal.activities.activity_helpers import ActivityHelpers
-from agentex.lib.core.temporal.activities.adk.agents_activities import GetAgentParams, AgentsActivityName
 
 logger = make_logger(__name__)
 
diff --git a/src/agentex/lib/adk/_modules/events.py b/src/agentex/lib/adk/_modules/events.py
@@ -1,19 +1,22 @@
+# ruff: noqa: I001
+# Import order matters - AsyncTracer must come after client import to avoid circular imports
 from datetime import timedelta
 
 from temporalio.common import RetryPolicy
 
-from agentex.types.event import Event
-from agentex.lib.utils.logging import make_logger
-from agentex.lib.utils.temporal import in_temporal_workflow
-from agentex.lib.core.tracing.tracer import AsyncTracer
-from agentex.lib.core.services.adk.events import EventsService
+from agentex import AsyncAgentex  # noqa: F401
 from agentex.lib.adk.utils._modules.client import create_async_agentex_client
+from agentex.lib.core.services.adk.events import EventsService
 from agentex.lib.core.temporal.activities.activity_helpers import ActivityHelpers
 from agentex.lib.core.temporal.activities.adk.events_activities import (
+    EventsActivityName,
     GetEventParams,
     ListEventsParams,
-    EventsActivityName,
 )
+from agentex.lib.core.tracing.tracer import AsyncTracer
+from agentex.types.event import Event
+from agentex.lib.utils.logging import make_logger
+from agentex.lib.utils.temporal import in_temporal_workflow
 
 logger = make_logger(__name__)
 
diff --git a/src/agentex/lib/adk/_modules/messages.py b/src/agentex/lib/adk/_modules/messages.py
@@ -1,24 +1,27 @@
+# ruff: noqa: I001
+# Import order matters - AsyncTracer must come after client import to avoid circular imports
 from datetime import timedelta
 
 from temporalio.common import RetryPolicy
 
-from agentex.lib.utils.logging import make_logger
-from agentex.lib.utils.temporal import in_temporal_workflow
-from agentex.types.task_message import TaskMessage, TaskMessageContent
-from agentex.lib.core.tracing.tracer import AsyncTracer
+from agentex import AsyncAgentex  # noqa: F401
 from agentex.lib.adk.utils._modules.client import create_async_agentex_client
+from agentex.lib.core.adapters.streams.adapter_redis import RedisStreamRepository
 from agentex.lib.core.services.adk.messages import MessagesService
 from agentex.lib.core.services.adk.streaming import StreamingService
-from agentex.lib.core.adapters.streams.adapter_redis import RedisStreamRepository
 from agentex.lib.core.temporal.activities.activity_helpers import ActivityHelpers
 from agentex.lib.core.temporal.activities.adk.messages_activities import (
-    ListMessagesParams,
     CreateMessageParams,
-    UpdateMessageParams,
-    MessagesActivityName,
     CreateMessagesBatchParams,
+    ListMessagesParams,
+    MessagesActivityName,
+    UpdateMessageParams,
     UpdateMessagesBatchParams,
 )
+from agentex.lib.core.tracing.tracer import AsyncTracer
+from agentex.types.task_message import TaskMessage, TaskMessageContent
+from agentex.lib.utils.logging import make_logger
+from agentex.lib.utils.temporal import in_temporal_workflow
 
 logger = make_logger(__name__)
 
diff --git a/src/agentex/lib/adk/_modules/state.py b/src/agentex/lib/adk/_modules/state.py
@@ -1,23 +1,26 @@
-from typing import Any
+# ruff: noqa: I001
+# Import order matters - AsyncTracer must come after client import to avoid circular imports
 from datetime import timedelta
+from typing import Any
 
 from pydantic import BaseModel
 from temporalio.common import RetryPolicy
 
-from agentex.types.state import State
-from agentex.lib.utils.logging import make_logger
-from agentex.lib.utils.temporal import in_temporal_workflow
-from agentex.lib.core.tracing.tracer import AsyncTracer
-from agentex.lib.core.services.adk.state import StateService
+from agentex import AsyncAgentex  # noqa: F401
 from agentex.lib.adk.utils._modules.client import create_async_agentex_client
+from agentex.lib.core.services.adk.state import StateService
 from agentex.lib.core.temporal.activities.activity_helpers import ActivityHelpers
 from agentex.lib.core.temporal.activities.adk.state_activities import (
-    GetStateParams,
     CreateStateParams,
     DeleteStateParams,
+    GetStateParams,
     StateActivityName,
     UpdateStateParams,
 )
+from agentex.lib.core.tracing.tracer import AsyncTracer
+from agentex.types.state import State
+from agentex.lib.utils.logging import make_logger
+from agentex.lib.utils.temporal import in_temporal_workflow
 
 logger = make_logger(__name__)
 
diff --git a/src/agentex/lib/adk/_modules/streaming.py b/src/agentex/lib/adk/_modules/streaming.py
@@ -1,14 +1,17 @@
+# ruff: noqa: I001
+# Import order matters - AsyncTracer must come after client import to avoid circular imports
 from temporalio.common import RetryPolicy
 
-from agentex.lib.utils.logging import make_logger
-from agentex.lib.utils.temporal import in_temporal_workflow
-from agentex.types.task_message_content import TaskMessageContent
+from agentex import AsyncAgentex  # noqa: F401
 from agentex.lib.adk.utils._modules.client import create_async_agentex_client
+from agentex.lib.core.adapters.streams.adapter_redis import RedisStreamRepository
 from agentex.lib.core.services.adk.streaming import (
     StreamingService,
     StreamingTaskMessageContext,
 )
-from agentex.lib.core.adapters.streams.adapter_redis import RedisStreamRepository
+from agentex.types.task_message_content import TaskMessageContent
+from agentex.lib.utils.logging import make_logger
+from agentex.lib.utils.temporal import in_temporal_workflow
 
 logger = make_logger(__name__)
 
diff --git a/src/agentex/lib/adk/_modules/tasks.py b/src/agentex/lib/adk/_modules/tasks.py
@@ -1,19 +1,22 @@
+# ruff: noqa: I001
+# Import order matters - AsyncTracer must come after client import to avoid circular imports
 from datetime import timedelta
 
 from temporalio.common import RetryPolicy
 
-from agentex.types.task import Task
-from agentex.lib.utils.logging import make_logger
-from agentex.lib.utils.temporal import in_temporal_workflow
-from agentex.lib.core.tracing.tracer import AsyncTracer
-from agentex.lib.core.services.adk.tasks import TasksService
+from agentex import AsyncAgentex  # noqa: F401
 from agentex.lib.adk.utils._modules.client import create_async_agentex_client
+from agentex.lib.core.services.adk.tasks import TasksService
 from agentex.lib.core.temporal.activities.activity_helpers import ActivityHelpers
 from agentex.lib.core.temporal.activities.adk.tasks_activities import (
-    GetTaskParams,
     DeleteTaskParams,
+    GetTaskParams,
     TasksActivityName,
 )
+from agentex.lib.core.tracing.tracer import AsyncTracer
+from agentex.types.task import Task
+from agentex.lib.utils.logging import make_logger
+from agentex.lib.utils.temporal import in_temporal_workflow
 
 logger = make_logger(__name__)
 
diff --git a/src/agentex/lib/adk/_modules/tracing.py b/src/agentex/lib/adk/_modules/tracing.py
@@ -1,15 +1,13 @@
-from typing import Any
-from datetime import timedelta
-from contextlib import asynccontextmanager
+# ruff: noqa: I001
+# Import order matters - AsyncTracer must come after client import to avoid circular imports
 from collections.abc import AsyncGenerator
+from contextlib import asynccontextmanager
+from datetime import timedelta
+from typing import Any
 
 from temporalio.common import RetryPolicy
 
-from agentex.types.span import Span
-from agentex.lib.utils.logging import make_logger
-from agentex.lib.utils.temporal import in_temporal_workflow
-from agentex.lib.utils.model_utils import BaseModel
-from agentex.lib.core.tracing.tracer import AsyncTracer
+from agentex import AsyncAgentex  # noqa: F401
 from agentex.lib.adk.utils._modules.client import create_async_agentex_client
 from agentex.lib.core.services.adk.tracing import TracingService
 from agentex.lib.core.temporal.activities.activity_helpers import ActivityHelpers
@@ -18,6 +16,11 @@
     StartSpanParams,
     TracingActivityName,
 )
+from agentex.lib.core.tracing.tracer import AsyncTracer
+from agentex.types.span import Span
+from agentex.lib.utils.logging import make_logger
+from agentex.lib.utils.model_utils import BaseModel
+from agentex.lib.utils.temporal import in_temporal_workflow
 
 logger = make_logger(__name__)
 
diff --git a/src/agentex/lib/core/tracing/tracing_processor_manager.py b/src/agentex/lib/core/tracing/tracing_processor_manager.py
@@ -1,38 +1,53 @@
+from typing import TYPE_CHECKING
 from threading import Lock
 
 from agentex.lib.types.tracing import TracingProcessorConfig, AgentexTracingProcessorConfig
 from agentex.lib.core.tracing.processors.sgp_tracing_processor import (
     SGPSyncTracingProcessor,
     SGPAsyncTracingProcessor,
 )
-from agentex.lib.core.tracing.processors.agentex_tracing_processor import (
-    AgentexSyncTracingProcessor,
-    AgentexAsyncTracingProcessor,
-)
 from agentex.lib.core.tracing.processors.tracing_processor_interface import (
     SyncTracingProcessor,
     AsyncTracingProcessor,
 )
 
+if TYPE_CHECKING:
+    from agentex.lib.core.tracing.processors.agentex_tracing_processor import (  # noqa: F401
+        AgentexSyncTracingProcessor,
+        AgentexAsyncTracingProcessor,
+    )
+
 
 class TracingProcessorManager:
     def __init__(self):
         # Mapping of processor config type to processor class
+        # Use lazy loading for agentex processors to avoid circular imports
         self.sync_config_registry: dict[str, type[SyncTracingProcessor]] = {
-            "agentex": AgentexSyncTracingProcessor,
             "sgp": SGPSyncTracingProcessor,
         }
         self.async_config_registry: dict[str, type[AsyncTracingProcessor]] = {
-            "agentex": AgentexAsyncTracingProcessor,
             "sgp": SGPAsyncTracingProcessor,
         }
         # Cache for processors
         self.sync_processors: list[SyncTracingProcessor] = []
         self.async_processors: list[AsyncTracingProcessor] = []
         self.lock = Lock()
+        self._agentex_registered = False
+
+    def _ensure_agentex_registered(self):
+        """Lazily register agentex processors to avoid circular imports."""
+        if not self._agentex_registered:
+            from agentex.lib.core.tracing.processors.agentex_tracing_processor import (
+                AgentexSyncTracingProcessor,
+                AgentexAsyncTracingProcessor,
+            )
+            self.sync_config_registry["agentex"] = AgentexSyncTracingProcessor
+            self.async_config_registry["agentex"] = AgentexAsyncTracingProcessor
+            self._agentex_registered = True
 
     def add_processor_config(self, processor_config: TracingProcessorConfig) -> None:
         with self.lock:
+            self._ensure_agentex_registered()
             sync_processor = self.sync_config_registry[processor_config.type]
             async_processor = self.async_config_registry[processor_config.type]
             self.sync_processors.append(sync_processor(processor_config))
@@ -55,8 +70,23 @@ def get_async_processors(self) -> list[AsyncTracingProcessor]:
 
 add_tracing_processor_config = GLOBAL_TRACING_PROCESSOR_MANAGER.add_processor_config
 set_tracing_processor_configs = GLOBAL_TRACING_PROCESSOR_MANAGER.set_processor_configs
-get_sync_tracing_processors = GLOBAL_TRACING_PROCESSOR_MANAGER.get_sync_processors
-get_async_tracing_processors = GLOBAL_TRACING_PROCESSOR_MANAGER.get_async_processors
 
-# Add the Agentex tracing processor by default
-add_tracing_processor_config(AgentexTracingProcessorConfig())
+# Lazy initialization to avoid circular imports
+_default_initialized = False
+
+def _ensure_default_initialized():
+    """Ensure default processor is initialized (lazy to avoid circular imports)."""
+    global _default_initialized
+    if not _default_initialized:
+        add_tracing_processor_config(AgentexTracingProcessorConfig())
+        _default_initialized = True
+
+def get_sync_tracing_processors():
+    """Get sync processors, initializing defaults if needed."""
+    _ensure_default_initialized()
+    return GLOBAL_TRACING_PROCESSOR_MANAGER.get_sync_processors()
+
+def get_async_tracing_processors():
+    """Get async processors, initializing defaults if needed."""
+    _ensure_default_initialized()
+    return GLOBAL_TRACING_PROCESSOR_MANAGER.get_async_processors()
