working client auth

Author: anishxyz

src/agentex/lib/adk/providers/_modules/litellm.py

@@ -1,6 +1,7 @@
 from collections.abc import AsyncGenerator
 from datetime import timedelta
 
+from agentex.lib.adk.utils._modules.client import create_async_agentex_client
 from temporalio.common import RetryPolicy
 
 from agentex import AsyncAgentex
@@ -39,7 +40,7 @@ def __init__(
     ):
         if litellm_service is None:
             # Create default service
-            agentex_client = AsyncAgentex()
+            agentex_client = create_async_agentex_client()
             stream_repository = RedisStreamRepository()
             streaming_service = StreamingService(
                 agentex_client=agentex_client,

src/agentex/lib/adk/providers/_modules/openai.py

@@ -1,6 +1,7 @@
 from datetime import timedelta
 from typing import Any, Literal
 
+from agentex.lib.adk.utils._modules.client import create_async_agentex_client
 from agents import Agent, RunResult, RunResultStreaming
 from agents.agent import StopAtTools, ToolsToFinalOutputFunction
 from agents.agent_output import AgentOutputSchemaBase
@@ -46,7 +47,7 @@ def __init__(
     ):
         if openai_service is None:
             # Create default service
-            agentex_client = AsyncAgentex()
+            agentex_client = create_async_agentex_client()
             stream_repository = RedisStreamRepository()
             streaming_service = StreamingService(
                 agentex_client=agentex_client,

src/agentex/lib/adk/providers/_modules/sgp.py

@@ -1,5 +1,6 @@
 from datetime import timedelta
 
+from agentex.lib.adk.utils._modules.client import create_async_agentex_client
 from scale_gp import SGPClient, SGPClientError
 from temporalio.common import RetryPolicy
 
@@ -33,7 +34,7 @@ def __init__(
         if sgp_service is None:
             try:
                 sgp_client = SGPClient()
-                agentex_client = AsyncAgentex()
+                agentex_client = create_async_agentex_client()
                 tracer = AsyncTracer(agentex_client)
                 self._sgp_service = SGPService(sgp_client=sgp_client, tracer=tracer)
             except SGPClientError:

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

@@ -1,7 +1,7 @@
 import httpx
 
 from agentex import AsyncAgentex
-from agentex.lib.environment_variables import refreshed_environment_variables
+from agentex.lib.environment_variables import EnvironmentVariables
 from agentex.lib.utils.logging import make_logger
 
 logger = make_logger(__name__)
@@ -13,15 +13,16 @@ def __init__(self, header_name="x-agent-identity"):
 
     def auth_flow(self, request):
         # This gets called for every request
-
-        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}")
+        env_vars = EnvironmentVariables.refresh()
+        if env_vars:
+            agent_id = env_vars.AGENT_ID
+            if agent_id:
+                request.headers[self.header_name] = agent_id
+                logger.info(f"Adding header {self.header_name}:{agent_id}")
         yield request
 
 
 def create_async_agentex_client(**kwargs) -> AsyncAgentex:
-    http_client = httpx.AsyncClient(auth=EnvAuth())
-
-    return AsyncAgentex(http_client=http_client, **kwargs)
+    client = AsyncAgentex(**kwargs)
+    client._client.auth = EnvAuth()
+    return client

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

@@ -1,6 +1,7 @@
 from datetime import timedelta
 from typing import Any
 
+from agentex.lib.adk.utils._modules.client import create_async_agentex_client
 from temporalio.common import RetryPolicy
 
 from agentex import AsyncAgentex
@@ -39,7 +40,7 @@ def __init__(
             templating_service (Optional[TemplatingService]): Optional pre-configured templating service. If None, will be auto-initialized.
         """
         if templating_service is None:
-            agentex_client = AsyncAgentex()
+            agentex_client = create_async_agentex_client()
             tracer = AsyncTracer(agentex_client)
             self._templating_service = TemplatingService(tracer=tracer)
         else:

src/agentex/lib/core/temporal/activities/__init__.py

@@ -1,3 +1,4 @@
+from agentex.lib.adk.utils._modules.client import create_async_agentex_client
 from scale_gp import SGPClient, SGPClientError
 
 from agentex import AsyncAgentex
@@ -58,7 +59,7 @@ def get_all_activities(sgp_client=None):
 
     llm_gateway = LiteLLMGateway()
     stream_repository = RedisStreamRepository()
-    agentex_client = AsyncAgentex()
+    agentex_client = create_async_agentex_client()
     tracer = AsyncTracer(agentex_client)
 
     # Services

src/agentex/lib/core/tracing/processors/agentex_tracing_processor.py

@@ -1,6 +1,7 @@
 from typing import Any, Dict, override
 
 from agentex import Agentex, AsyncAgentex
+from agentex.lib.adk.utils._modules.client import create_async_agentex_client
 from agentex.lib.core.tracing.processors.tracing_processor_interface import (
     AsyncTracingProcessor,
     SyncTracingProcessor,
@@ -65,7 +66,7 @@ def shutdown(self) -> None:
 
 class AgentexAsyncTracingProcessor(AsyncTracingProcessor):
     def __init__(self, config: AgentexTracingProcessorConfig):
-        self.client = AsyncAgentex()
+        self.client = create_async_agentex_client()
 
     @override
     async def on_span_start(self, span: Span) -> None:

src/agentex/lib/environment_variables.py

@@ -4,12 +4,15 @@
 from enum import Enum
 from pathlib import Path
 
+from agentex.lib.utils.logging import make_logger
 from dotenv import load_dotenv
 
 from agentex.lib.utils.model_utils import BaseModel
 
 PROJECT_ROOT = Path(__file__).resolve().parents[2]
 
+logger = make_logger(__name__)
+
 
 class EnvVarKeys(str, Enum):
     ENVIRONMENT = "ENVIRONMENT"
@@ -64,6 +67,7 @@ def refresh(cls) -> EnvironmentVariables | None:
         if refreshed_environment_variables is not None:
             return refreshed_environment_variables
 
+        logger.info("Refreshing environment variables")
         if os.environ.get(EnvVarKeys.ENVIRONMENT) == Environment.DEV:
             # Load global .env file first
             global_env_path = PROJECT_ROOT / ".env"

src/agentex/lib/sdk/fastacp/base/base_acp_server.py

@@ -397,9 +397,11 @@ async def _register_agent(self, env_vars: EnvironmentVariables):
 
                         os.environ["AGENT_ID"] = agent_id
                         os.environ["AGENT_NAME"] = agent_name
-                        refreshed_environment_variables.AGENT_ID = agent_id
-                        refreshed_environment_variables.AGENT_NAME = agent_name
+                        env_vars.AGENT_ID = agent_id
+                        env_vars.AGENT_NAME = agent_name
                         create_async_agentex_client()  # refresh cache
+                        global refreshed_environment_variables
+                        refreshed_environment_variables = env_vars
                         logger.info(
                             f"Successfully registered agent '{env_vars.AGENT_NAME}' with Agentex server with acp_url: {full_acp_url}. Registration data: {registration_data}"
                         )

src/agentex/lib/sdk/fastacp/impl/agentic_base_acp.py

@@ -1,4 +1,6 @@
 from typing import Any
+
+from agentex.lib.adk.utils._modules.client import create_async_agentex_client
 from typing_extensions import override
 from agentex import AsyncAgentex
 from agentex.lib.sdk.fastacp.base.base_acp_server import BaseACPServer
@@ -24,7 +26,7 @@ class AgenticBaseACP(BaseACPServer):
     def __init__(self):
         super().__init__()
         self._setup_handlers()
-        self._agentex_client = AsyncAgentex()
+        self._agentex_client = create_async_agentex_client()
 
     @classmethod
     @override