Merge pull request #35 from scaleapi/revert-29-anishxyz/authn

jasonyang101 · web-flow · commit 948eb9ca4a9d · 2025-07-28T17:14:01.000-07:00
Revert "Default Headers on ADK Client"
diff --git a/src/agentex/lib/adk/_modules/acp.py b/src/agentex/lib/adk/_modules/acp.py
@@ -4,7 +4,6 @@
 from temporalio.common import RetryPolicy
 
 from agentex import AsyncAgentex
-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 +40,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 = create_async_agentex_client()
+            agentex_client = AsyncAgentex()
             tracer = AsyncTracer(agentex_client)
             self._acp_service = ACPService(agentex_client=agentex_client, tracer=tracer)
         else:
diff --git a/src/agentex/lib/adk/_modules/agent_task_tracker.py b/src/agentex/lib/adk/_modules/agent_task_tracker.py
@@ -3,7 +3,6 @@
 from temporalio.common import RetryPolicy
 
 from agentex import AsyncAgentex
-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 +33,7 @@ def __init__(
         agent_task_tracker_service: AgentTaskTrackerService | None = None,
     ):
         if agent_task_tracker_service is None:
-            agentex_client = create_async_agentex_client()
+            agentex_client = AsyncAgentex()
             tracer = AsyncTracer(agentex_client)
             self._agent_task_tracker_service = AgentTaskTrackerService(
                 agentex_client=agentex_client, tracer=tracer
diff --git a/src/agentex/lib/adk/_modules/agents.py b/src/agentex/lib/adk/_modules/agents.py
@@ -1,7 +1,6 @@
 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
 
@@ -29,7 +28,7 @@ def __init__(
         agents_service: Optional[AgentsService] = None,
     ):
         if agents_service is None:
-            agentex_client = create_async_agentex_client()
+            agentex_client = AsyncAgentex()
             tracer = AsyncTracer(agentex_client)
             self._agents_service = AgentsService(agentex_client=agentex_client, tracer=tracer)
         else:
diff --git a/src/agentex/lib/adk/_modules/events.py b/src/agentex/lib/adk/_modules/events.py
@@ -3,7 +3,6 @@
 from temporalio.common import RetryPolicy
 
 from agentex import AsyncAgentex
-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 +32,7 @@ def __init__(
         events_service: EventsService | None = None,
     ):
         if events_service is None:
-            agentex_client = create_async_agentex_client()
+            agentex_client = AsyncAgentex()
             tracer = AsyncTracer(agentex_client)
             self._events_service = EventsService(
                 agentex_client=agentex_client, tracer=tracer
diff --git a/src/agentex/lib/adk/_modules/messages.py b/src/agentex/lib/adk/_modules/messages.py
@@ -3,7 +3,6 @@
 from temporalio.common import RetryPolicy
 
 from agentex import AsyncAgentex
-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 +37,7 @@ def __init__(
         messages_service: MessagesService | None = None,
     ):
         if messages_service is None:
-            agentex_client = create_async_agentex_client()
+            agentex_client = AsyncAgentex()
             stream_repository = RedisStreamRepository()
             streaming_service = StreamingService(
                 agentex_client=agentex_client,
diff --git a/src/agentex/lib/adk/_modules/state.py b/src/agentex/lib/adk/_modules/state.py
@@ -5,7 +5,6 @@
 from temporalio.common import RetryPolicy
 
 from agentex import AsyncAgentex
-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 +36,7 @@ def __init__(
         state_service: StateService | None = None,
     ):
         if state_service is None:
-            agentex_client = create_async_agentex_client()
+            agentex_client = AsyncAgentex()
             tracer = AsyncTracer(agentex_client)
             self._state_service = StateService(
                 agentex_client=agentex_client, tracer=tracer
diff --git a/src/agentex/lib/adk/_modules/streaming.py b/src/agentex/lib/adk/_modules/streaming.py
@@ -1,7 +1,6 @@
 from temporalio.common import RetryPolicy
 
 from agentex import AsyncAgentex
-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 +34,7 @@ def __init__(self, streaming_service: StreamingService | None = None):
         """
         if streaming_service is None:
             stream_repository = RedisStreamRepository()
-            agentex_client = create_async_agentex_client()
+            agentex_client = AsyncAgentex()
             self._streaming_service = StreamingService(
                 agentex_client=agentex_client,
                 stream_repository=stream_repository,
diff --git a/src/agentex/lib/adk/_modules/tasks.py b/src/agentex/lib/adk/_modules/tasks.py
@@ -3,7 +3,6 @@
 from temporalio.common import RetryPolicy
 
 from agentex import AsyncAgentex
-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 +31,7 @@ def __init__(
         tasks_service: TasksService | None = None,
     ):
         if tasks_service is None:
-            agentex_client = create_async_agentex_client()
+            agentex_client = AsyncAgentex()
             tracer = AsyncTracer(agentex_client)
             self._tasks_service = TasksService(
                 agentex_client=agentex_client, tracer=tracer
diff --git a/src/agentex/lib/adk/_modules/tracing.py b/src/agentex/lib/adk/_modules/tracing.py
@@ -6,7 +6,6 @@
 from temporalio.common import RetryPolicy
 
 from agentex import AsyncAgentex
-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 +38,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 = create_async_agentex_client()
+            agentex_client = AsyncAgentex()
             tracer = AsyncTracer(agentex_client)
             self._tracing_service = TracingService(tracer=tracer)
         else:
diff --git a/src/agentex/lib/adk/utils/_modules/client.py b/src/agentex/lib/adk/utils/_modules/client.py
diff --git a/src/agentex/lib/sdk/fastacp/base/base_acp_server.py b/src/agentex/lib/sdk/fastacp/base/base_acp_server.py
@@ -2,7 +2,6 @@
 import base64
 import inspect
 import json
-import os
 from collections.abc import AsyncGenerator, Awaitable, Callable
 from contextlib import asynccontextmanager
 from typing import Any
@@ -14,7 +13,7 @@
 from pydantic import TypeAdapter, ValidationError
 
 # from agentex.lib.sdk.fastacp.types import BaseACPConfig
-from agentex.lib.environment_variables import EnvironmentVariables, refreshed_environment_variables
+from agentex.lib.environment_variables import EnvironmentVariables
 from agentex.lib.types.acp import (
     PARAMS_MODEL_BY_METHOD,
     RPC_SYNC_METHODS,
@@ -391,16 +390,8 @@ async def _register_agent(self, env_vars: EnvironmentVariables):
                         registration_url, json=registration_data, timeout=30.0
                     )
                     if response.status_code == 200:
-                        agent = response.json()
-                        agent_id, agent_name = agent["id"], agent["name"]
-
-                        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
-                        
                         logger.info(
-                            f"Successfully registered agent '{agent_name}' with Agentex server with acp_url: {full_acp_url}. Registration data: {registration_data}"
+                            f"Successfully registered agent '{env_vars.AGENT_NAME}' with Agentex server with acp_url: {full_acp_url}. Registration data: {registration_data}"
                         )
                         return  # Success, exit the retry loop
                     else:
