env auth flow on client

Author: anishxyz

src/agentex/lib/adk/_modules/acp.py

@@ -4,7 +4,7 @@
 from temporalio.common import RetryPolicy
 
 from agentex import AsyncAgentex
-from agentex.lib.adk.utils._modules.client import get_async_agentex_client
+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 (
@@ -41,7 +41,7 @@ def __init__(self, acp_service: ACPService | None = None):
             acp_activities (Optional[ACPActivities]): Optional pre-configured ACP activities. If None, will be auto-initialized.
         """
         if acp_service is None:
-            agentex_client = get_async_agentex_client()
+            agentex_client = create_async_agentex_client()
             tracer = AsyncTracer(agentex_client)
             self._acp_service = ACPService(agentex_client=agentex_client, tracer=tracer)
         else:

src/agentex/lib/adk/_modules/agent_task_tracker.py

@@ -3,7 +3,7 @@
 from temporalio.common import RetryPolicy
 
 from agentex import AsyncAgentex
-from agentex.lib.adk.utils._modules.client import get_async_agentex_client
+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 (
@@ -34,7 +34,7 @@ def __init__(
         agent_task_tracker_service: AgentTaskTrackerService | None = None,
     ):
         if agent_task_tracker_service is None:
-            agentex_client = get_async_agentex_client()
+            agentex_client = create_async_agentex_client()
             tracer = AsyncTracer(agentex_client)
             self._agent_task_tracker_service = AgentTaskTrackerService(
                 agentex_client=agentex_client, tracer=tracer

src/agentex/lib/adk/_modules/agents.py

@@ -1,7 +1,7 @@
 from datetime import timedelta
 from typing import Optional
 
-from agentex.lib.adk.utils._modules.client import get_async_agentex_client
+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
 
@@ -29,7 +29,7 @@ def __init__(
         agents_service: Optional[AgentsService] = None,
     ):
         if agents_service is None:
-            agentex_client = get_async_agentex_client()
+            agentex_client = create_async_agentex_client()
             tracer = AsyncTracer(agentex_client)
             self._agents_service = AgentsService(agentex_client=agentex_client, tracer=tracer)
         else:

src/agentex/lib/adk/_modules/events.py

@@ -3,7 +3,7 @@
 from temporalio.common import RetryPolicy
 
 from agentex import AsyncAgentex
-from agentex.lib.adk.utils._modules.client import get_async_agentex_client
+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 (
@@ -33,7 +33,7 @@ def __init__(
         events_service: EventsService | None = None,
     ):
         if events_service is None:
-            agentex_client = get_async_agentex_client()
+            agentex_client = create_async_agentex_client()
             tracer = AsyncTracer(agentex_client)
             self._events_service = EventsService(
                 agentex_client=agentex_client, tracer=tracer

src/agentex/lib/adk/_modules/messages.py

@@ -3,7 +3,7 @@
 from temporalio.common import RetryPolicy
 
 from agentex import AsyncAgentex
-from agentex.lib.adk.utils._modules.client import get_async_agentex_client
+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
@@ -38,7 +38,7 @@ def __init__(
         messages_service: MessagesService | None = None,
     ):
         if messages_service is None:
-            agentex_client = get_async_agentex_client()
+            agentex_client = create_async_agentex_client()
             stream_repository = RedisStreamRepository()
             streaming_service = StreamingService(
                 agentex_client=agentex_client,

src/agentex/lib/adk/_modules/state.py

@@ -5,7 +5,7 @@
 from temporalio.common import RetryPolicy
 
 from agentex import AsyncAgentex
-from agentex.lib.adk.utils._modules.client import get_async_agentex_client
+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 (
@@ -37,7 +37,7 @@ def __init__(
         state_service: StateService | None = None,
     ):
         if state_service is None:
-            agentex_client = get_async_agentex_client()
+            agentex_client = create_async_agentex_client()
             tracer = AsyncTracer(agentex_client)
             self._state_service = StateService(
                 agentex_client=agentex_client, tracer=tracer

src/agentex/lib/adk/_modules/streaming.py

@@ -1,7 +1,7 @@
 from temporalio.common import RetryPolicy
 
 from agentex import AsyncAgentex
-from agentex.lib.adk.utils._modules.client import get_async_agentex_client
+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,
@@ -35,7 +35,7 @@ def __init__(self, streaming_service: StreamingService | None = None):
         """
         if streaming_service is None:
             stream_repository = RedisStreamRepository()
-            agentex_client = get_async_agentex_client()
+            agentex_client = create_async_agentex_client()
             self._streaming_service = StreamingService(
                 agentex_client=agentex_client,
                 stream_repository=stream_repository,

src/agentex/lib/adk/_modules/tasks.py

@@ -3,7 +3,7 @@
 from temporalio.common import RetryPolicy
 
 from agentex import AsyncAgentex
-from agentex.lib.adk.utils._modules.client import get_async_agentex_client
+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 (
@@ -32,7 +32,7 @@ def __init__(
         tasks_service: TasksService | None = None,
     ):
         if tasks_service is None:
-            agentex_client = get_async_agentex_client()
+            agentex_client = create_async_agentex_client()
             tracer = AsyncTracer(agentex_client)
             self._tasks_service = TasksService(
                 agentex_client=agentex_client, tracer=tracer

src/agentex/lib/adk/_modules/tracing.py

@@ -6,7 +6,7 @@
 from temporalio.common import RetryPolicy
 
 from agentex import AsyncAgentex
-from agentex.lib.adk.utils._modules.client import get_async_agentex_client
+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
 from agentex.lib.core.temporal.activities.adk.tracing_activities import (
@@ -39,7 +39,7 @@ def __init__(self, tracing_service: TracingService | None = None):
             tracing_activities (Optional[TracingActivities]): Optional pre-configured tracing activities. If None, will be auto-initialized.
         """
         if tracing_service is None:
-            agentex_client = get_async_agentex_client()
+            agentex_client = create_async_agentex_client()
             tracer = AsyncTracer(agentex_client)
             self._tracing_service = TracingService(tracer=tracer)
         else:

src/agentex/lib/adk/utils/_modules/client.py

@@ -1,43 +1,27 @@
-import threading
-from typing import Dict, Optional, Any
+import httpx
 
 from agentex import AsyncAgentex
-from agentex.lib.environment_variables import EnvironmentVariables, refreshed_environment_variables
+from agentex.lib.environment_variables import refreshed_environment_variables
+from agentex.lib.utils.logging import make_logger
 
-_client: Optional["AsyncAgentex"] = None
-_cached_headers: Dict[str, str] = {}
-_init_kwargs: Dict[str, Any] = {}
-_lock = threading.RLock()
+logger = make_logger(__name__)
 
 
-def _build_headers() -> Dict[str, str]:
-    EnvironmentVariables.refresh()
-    if refreshed_environment_variables and getattr(refreshed_environment_variables, "AGENT_ID", None):
-        return {"x-agent-identity": refreshed_environment_variables.AGENT_ID}
-    return {}
+class EnvAuth(httpx.Auth):
+    def __init__(self, header_name="x-agent-identity"):
+        self.header_name = header_name
 
+    def auth_flow(self, request):
+        # This gets called for every request
 
-def get_async_agentex_client(**kwargs) -> "AsyncAgentex":
-    """
-    Return a cached AsyncAgentex instance (created synchronously).
-    Each call re-checks env vars and updates client.default_headers if needed.
-    """
-    global _client, _cached_headers, _init_kwargs
+        agent_id = refreshed_environment_variables.AGENT_ID
+        if agent_id:
+            request.headers[self.header_name] = agent_id
+            logger.info(f"Adding header {self.header_name}:{agent_id}")
+        yield request
 
-    new_headers = _build_headers()
 
-    with _lock:
-        # First time (or kwargs changed) -> build a new client
-        if _client is None or kwargs != _init_kwargs:
-            _client = AsyncAgentex(default_headers=new_headers.copy(), **kwargs)
-            _cached_headers = new_headers
-            _init_kwargs = dict(kwargs)
-            return _client
+def create_async_agentex_client(**kwargs) -> AsyncAgentex:
+    http_client = httpx.AsyncClient(auth=EnvAuth())
 
-        # Same client; maybe headers changed
-        if new_headers != _cached_headers:
-            _cached_headers = new_headers
-            _client.default_headers.clear()
-            _client.default_headers.update(new_headers)
-
-        return _client
+    return AsyncAgentex(http_client=http_client, **kwargs)