Merge branch 'main' into stas/agent-auth

smoreinis · smoreinis · commit 66c395922dbe · 2025-07-30T11:54:13.000-07:00
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "0.2.2"
+  ".": "0.2.4"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.2.4 (2025-07-29)
+
+Full Changelog: [v0.2.3...v0.2.4](https://github.com/scaleapi/agentex-python/compare/v0.2.3...v0.2.4)
+
+## 0.2.3 (2025-07-29)
+
+Full Changelog: [v0.2.2...v0.2.3](https://github.com/scaleapi/agentex-python/compare/v0.2.2...v0.2.3)
+
 ## 0.2.2 (2025-07-28)
 
 Full Changelog: [v0.2.1...v0.2.2](https://github.com/scaleapi/agentex-python/compare/v0.2.1...v0.2.2)
diff --git a/examples/tutorials/00_sync/010_multiturn/manifest.yaml b/examples/tutorials/00_sync/010_multiturn/manifest.yaml
@@ -114,4 +114,4 @@ deployment:
         memory: "1Gi"
       limits:
         cpu: "1000m"
-        memory: "2Gi" 
+        memory: "2Gi"
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "agentex-sdk"
-version = "0.2.2"
+version = "0.2.4"
 description = "The official Python library for the agentex API"
 dynamic = ["readme"]
 license = "Apache-2.0"
diff --git a/src/agentex/_version.py b/src/agentex/_version.py
@@ -1,4 +1,4 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 __title__ = "agentex"
-__version__ = "0.2.2"  # x-release-please-version
+__version__ = "0.2.4"  # x-release-please-version
diff --git a/src/agentex/lib/adk/_modules/acp.py b/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 create_async_agentex_client
+from agentex.lib.adk.utils._modules.client import get_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 = create_async_agentex_client()
+            agentex_client = get_async_agentex_client()
             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,7 @@
 from temporalio.common import RetryPolicy
 
 from agentex import AsyncAgentex
-from agentex.lib.adk.utils._modules.client import create_async_agentex_client
+from agentex.lib.adk.utils._modules.client import get_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 = create_async_agentex_client()
+            agentex_client = get_async_agentex_client()
             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,7 @@
 from datetime import timedelta
 from typing import Optional
 
-from agentex.lib.adk.utils._modules.client import create_async_agentex_client
+from agentex.lib.adk.utils._modules.client import get_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 = create_async_agentex_client()
+            agentex_client = get_async_agentex_client()
             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,7 @@
 from temporalio.common import RetryPolicy
 
 from agentex import AsyncAgentex
-from agentex.lib.adk.utils._modules.client import create_async_agentex_client
+from agentex.lib.adk.utils._modules.client import get_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 = create_async_agentex_client()
+            agentex_client = get_async_agentex_client()
             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,7 @@
 from temporalio.common import RetryPolicy
 
 from agentex import AsyncAgentex
-from agentex.lib.adk.utils._modules.client import create_async_agentex_client
+from agentex.lib.adk.utils._modules.client import get_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 = create_async_agentex_client()
+            agentex_client = get_async_agentex_client()
             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,7 @@
 from temporalio.common import RetryPolicy
 
 from agentex import AsyncAgentex
-from agentex.lib.adk.utils._modules.client import create_async_agentex_client
+from agentex.lib.adk.utils._modules.client import get_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 = create_async_agentex_client()
+            agentex_client = get_async_agentex_client()
             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,7 @@
 from temporalio.common import RetryPolicy
 
 from agentex import AsyncAgentex
-from agentex.lib.adk.utils._modules.client import create_async_agentex_client
+from agentex.lib.adk.utils._modules.client import get_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 = create_async_agentex_client()
+            agentex_client = get_async_agentex_client()
             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,7 @@
 from temporalio.common import RetryPolicy
 
 from agentex import AsyncAgentex
-from agentex.lib.adk.utils._modules.client import create_async_agentex_client
+from agentex.lib.adk.utils._modules.client import get_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 = create_async_agentex_client()
+            agentex_client = get_async_agentex_client()
             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,7 @@
 from temporalio.common import RetryPolicy
 
 from agentex import AsyncAgentex
-from agentex.lib.adk.utils._modules.client import create_async_agentex_client
+from agentex.lib.adk.utils._modules.client import get_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 = create_async_agentex_client()
+            agentex_client = get_async_agentex_client()
             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
@@ -1,12 +1,43 @@
-import os
+import threading
+from typing import Dict, Optional, Any
 
 from agentex import AsyncAgentex
-from agentex.lib.environment_variables import refreshed_environment_variables
+from agentex.lib.environment_variables import EnvironmentVariables, refreshed_environment_variables
 
+_client: Optional["AsyncAgentex"] = None
+_cached_headers: Dict[str, str] = {}
+_init_kwargs: Dict[str, Any] = {}
+_lock = threading.RLock()
 
-def create_async_agentex_client(**kwargs):
-    #agent_id = refreshed_environment_variables.AGENT_ID
-    default_headers = {
-        "x-agent-identity": os.environ["AGENT_API_KEY"]
-    }
-    return AsyncAgentex(default_headers=default_headers, **kwargs)
+
+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 {}
+
+
+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
+
+    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
+
+        # 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
diff --git a/src/agentex/lib/cli/commands/agents.py b/src/agentex/lib/cli/commands/agents.py
@@ -141,13 +141,13 @@ def build(
         typer.echo("No registry provided, skipping image build")
         return
 
-    platform_list = platforms.split(",") if platforms else []
+    platform_list = platforms.split(",") if platforms else ["linux/amd64"]
 
     try:
         image_url = build_agent(
             manifest_path=manifest,
-            registry_url=registry,  # Now guaranteed to be non-None
-            repository_name=repository_name or "default-repo",  # Provide default
+            registry_url=registry,
+            repository_name=repository_name,
             platforms=platform_list,
             push=push,
             secret=secret or "",  # Provide default empty string
diff --git a/src/agentex/lib/cli/handlers/agent_handlers.py b/src/agentex/lib/cli/handlers/agent_handlers.py
@@ -21,7 +21,7 @@ class DockerBuildError(Exception):
 def build_agent(
     manifest_path: str,
     registry_url: str,
-    repository_name: str,
+    repository_name: str | None,
     platforms: list[str],
     push: bool = False,
     secret: str = None,
diff --git a/src/agentex/lib/cli/handlers/deploy_handlers.py b/src/agentex/lib/cli/handlers/deploy_handlers.py
@@ -176,9 +176,12 @@ def merge_deployment_configs(
         if TEMPORAL_WORKER_KEY in helm_values:
             helm_values[TEMPORAL_WORKER_KEY]["env"] = agent_config.env
 
-        encoded_principal = _encode_principal_context(manifest)
-        if encoded_principal:
-            helm_values["env"][EnvVarKeys.AUTH_PRINCIPAL_B64] = encoded_principal
+    # Add auth principal env var if manifest principal is set
+    encoded_principal = _encode_principal_context(manifest)
+    if encoded_principal:
+        if "env" not in helm_values:
+            helm_values["env"] = {}
+        helm_values["env"][EnvVarKeys.AUTH_PRINCIPAL_B64.value] = encoded_principal
 
     if manifest.deployment and manifest.deployment.imagePullSecrets:
         pull_secrets = [
diff --git a/src/agentex/lib/sdk/fastacp/base/base_acp_server.py b/src/agentex/lib/sdk/fastacp/base/base_acp_server.py
@@ -9,6 +9,7 @@
 
 import httpx
 import uvicorn
+from agentex.lib.adk.utils._modules.client import get_async_agentex_client
 from fastapi import FastAPI, Request
 from fastapi.responses import StreamingResponse
 from pydantic import TypeAdapter, ValidationError
@@ -414,12 +415,12 @@ async def _register_agent(self, env_vars: EnvironmentVariables):
                         os.environ["AGENT_ID"] = agent_id
                         os.environ["AGENT_NAME"] = agent_name
                         os.environ["AGENT_API_KEY"] = agent_api_key
-                        #refreshed_environment_variables.AGENT_ID = agent_id
-                        #refreshed_environment_variables.AGENT_NAME = agent_name
-                        #refreshed_environment_variables.AGENT_API_KEY = agent_api_key
-                        
+                        refreshed_environment_variables.AGENT_ID = agent_id
+                        refreshed_environment_variables.AGENT_NAME = agent_name
+                        refreshed_environment_variables.AGENT_API_KEY = agent_api_key
+                        get_async_agentex_client()  # refresh cache
                         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:

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- ".": "0.2.2"`
	`2`	`+ ".": "0.2.4"`
`3`	`3`	`}`