Merge branch 'main' into fix/linting-issues

Resolved conflicts:
- deploy_handlers.py: kept logger.info with plugin support from main
- temporal_client.py: merged plugin support with client property validation
- utils.py: integrated plugin validation from main
- worker.py: combined plugin support with existing code
- fastacp.py: merged plugin parameter handling
- temporal_acp.py: integrated plugin support in create method
- fastacp.py types: added plugin validation

All files formatted with rye run format

Author: prassanna-ravishankar

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.4.16"
+  ".": "0.4.18"
 }

.stats.yml

@@ -1,4 +1,4 @@
 configured_endpoints: 34
-openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/sgp%2Fagentex-sdk-80c50e5d150c0baca970fa26bc298a878e02bf5869a16fd3a812255cca077333.yml
-openapi_spec_hash: 41bed3c1c935a8054600e6d177faa396
+openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/sgp%2Fagentex-sdk-76382de80057321dae48471054ca469af8b5b5b1b0b252e92fd70d7a9998dd6d.yml
+openapi_spec_hash: c1e34098e62dee3304ba1d49233e4e9d
 config_hash: aeabb3a919ad2763f5d0f41961a2520a

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.4.18 (2025-09-29)
+
+Full Changelog: [v0.4.17...v0.4.18](https://github.com/scaleapi/agentex-python/compare/v0.4.17...v0.4.18)
+
+### Chores
+
+* **internal:** version bump ([eded756](https://github.com/scaleapi/agentex-python/commit/eded756bde2f3b4cfcf02c7a9cf72e70a82dd9aa))
+
+## 0.4.17 (2025-09-29)
+
+Full Changelog: [v0.4.16...v0.4.17](https://github.com/scaleapi/agentex-python/compare/v0.4.16...v0.4.17)
+
 ## 0.4.16 (2025-09-16)
 
 Full Changelog: [v0.4.15...v0.4.16](https://github.com/scaleapi/agentex-python/compare/v0.4.15...v0.4.16)

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agentex-sdk"
-version = "0.4.16"
+version = "0.4.18"
 description = "The official Python library for the agentex API"
 dynamic = ["readme"]
 license = "Apache-2.0"

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.4.16"  # x-release-please-version
+__version__ = "0.4.18"  # x-release-please-version

src/agentex/lib/cli/handlers/deploy_handlers.py

@@ -25,43 +25,35 @@
 
 
 class InputDeployOverrides(BaseModel):
-    repository: str | None = Field(
-        default=None, description="Override the repository for deployment"
-    )
-    image_tag: str | None = Field(
-        default=None, description="Override the image tag for deployment"
-    )
+    repository: str | None = Field(default=None, description="Override the repository for deployment")
+    image_tag: str | None = Field(default=None, description="Override the image tag for deployment")
 
 
 def check_helm_installed() -> bool:
     """Check if helm is installed and available"""
     try:
-        result = subprocess.run(
-            ["helm", "version", "--short"], capture_output=True, text=True, check=True
-        )
+        result = subprocess.run(["helm", "version", "--short"], capture_output=True, text=True, check=True)
         logger.info(f"Helm version: {result.stdout.strip()}")
         return True
     except (subprocess.CalledProcessError, FileNotFoundError):
         return False
 
 
-def add_helm_repo() -> None:
+def add_helm_repo(helm_repository_name: str, helm_repository_url: str) -> None:
     """Add the agentex helm repository if not already added"""
     try:
         # Check if repo already exists
-        result = subprocess.run(
-            ["helm", "repo", "list"], capture_output=True, text=True, check=True
-        )
+        result = subprocess.run(["helm", "repo", "list"], capture_output=True, text=True, check=True)
 
-        if "scale-egp" not in result.stdout:
+        if helm_repository_name not in result.stdout:
             console.print("Adding agentex helm repository...")
             subprocess.run(
                 [
                     "helm",
                     "repo",
                     "add",
-                    "scale-egp",
-                    "https://scale-egp-helm-charts-us-west-2.s3.amazonaws.com/charts",
+                    helm_repository_name,
+                    helm_repository_url,
                 ],
                 check=True,
             )
@@ -75,7 +67,6 @@ def add_helm_repo() -> None:
         raise HelmError(f"Failed to add helm repository: {e}") from e
 
 
-
 def convert_env_vars_dict_to_list(env_vars: dict[str, str]) -> list[dict[str, str]]:
     """Convert a dictionary of environment variables to a list of dictionaries"""
     return [{"name": key, "value": value} for key, value in env_vars.items()]
@@ -169,11 +160,11 @@ def merge_deployment_configs(
     # Priority: manifest -> environments.yaml -> secrets (highest)
     all_env_vars: dict[str, str] = {}
     secret_env_vars: list[dict[str, str]] = []
-    
+
     # Start with agent_config env vars from manifest
     if agent_config.env:
         all_env_vars.update(agent_config.env)
-    
+
     # Override with environment config env vars if they exist
     if agent_env_config and agent_env_config.helm_overrides and "env" in agent_env_config.helm_overrides:
         env_overrides = agent_env_config.helm_overrides["env"]
@@ -185,8 +176,6 @@ def merge_deployment_configs(
                     env_override_dict[str(env_var["name"])] = str(env_var["value"])
             all_env_vars.update(env_override_dict)
 
-
-
     # Handle credentials and check for conflicts
     if agent_config.credentials:
         for credential in agent_config.credentials:
@@ -199,7 +188,7 @@ def merge_deployment_configs(
                 env_var_name = credential.env_var_name
                 secret_name = credential.secret_name
                 secret_key = credential.secret_key
-            
+
             # Check if the environment variable name conflicts with existing env vars
             if env_var_name in all_env_vars:
                 logger.warning(
@@ -208,7 +197,7 @@ def merge_deployment_configs(
                 )
                 # Remove from regular env vars since secret takes precedence
                 del all_env_vars[env_var_name]
-            
+
             secret_env_vars.append(
                 {
                     "name": env_var_name,
@@ -222,13 +211,14 @@ def merge_deployment_configs(
         # Add auth principal env var if environment config is set
         if agent_env_config.auth:
             from agentex.lib.cli.utils.auth_utils import _encode_principal_context_from_env_config
+
             encoded_principal = _encode_principal_context_from_env_config(agent_env_config.auth)
             logger.info(f"Encoding auth principal from {agent_env_config.auth}")
             if encoded_principal:
                 all_env_vars[EnvVarKeys.AUTH_PRINCIPAL_B64.value] = encoded_principal
             else:
                 raise DeploymentError(f"Auth principal unable to be encoded for agent_env_config: {agent_env_config}")
-        
+
         logger.info(f"Defined agent helm overrides: {agent_env_config.helm_overrides}")
         logger.info(f"Before-merge helm values: {helm_values}")
         if agent_env_config.helm_overrides:
@@ -239,7 +229,7 @@ def merge_deployment_configs(
     # Environment variable precedence: manifest -> environments.yaml -> secrets (highest)
     if all_env_vars:
         helm_values["env"] = convert_env_vars_dict_to_list(all_env_vars)
-    
+
     if secret_env_vars:
         helm_values["secretEnvVars"] = secret_env_vars
 
@@ -252,30 +242,25 @@ def merge_deployment_configs(
 
     # Handle image pull secrets
     if manifest.deployment and manifest.deployment.imagePullSecrets:
-        pull_secrets = [
-            pull_secret.model_dump()
-            for pull_secret in manifest.deployment.imagePullSecrets
-        ]
+        pull_secrets = [pull_secret.model_dump() for pull_secret in manifest.deployment.imagePullSecrets]
         helm_values["global"]["imagePullSecrets"] = pull_secrets
         helm_values["imagePullSecrets"] = pull_secrets
 
     # Add dynamic ACP command based on manifest configuration if command is not set in helm overrides
-    helm_overrides_command = agent_env_config and agent_env_config.helm_overrides and "command" in agent_env_config.helm_overrides
+    helm_overrides_command = (
+        agent_env_config and agent_env_config.helm_overrides and "command" in agent_env_config.helm_overrides
+    )
     if not helm_overrides_command:
         add_acp_command_to_helm_values(helm_values, manifest, manifest_path)
-    
+
     logger.info("Deploying with the following helm values: %s", helm_values)
     return helm_values
 
 
 def _deep_merge(base_dict: dict[str, Any], override_dict: dict[str, Any]) -> None:
     """Deep merge override_dict into base_dict"""
     for key, value in override_dict.items():
-        if (
-            key in base_dict
-            and isinstance(base_dict[key], dict)
-            and isinstance(value, dict)
-        ):
+        if key in base_dict and isinstance(base_dict[key], dict) and isinstance(value, dict):
             _deep_merge(base_dict[key], value)
         else:
             base_dict[key] = value
@@ -317,8 +302,14 @@ def deploy_agent(
         else:
             console.print(f"[yellow]⚠[/yellow] No environments.yaml found, skipping environment-specific config")
 
+    if agent_env_config:
+        helm_repository_name = agent_env_config.helm_repository_name
+        helm_repository_url = agent_env_config.helm_repository_url
+    else:
+        helm_repository_name = "scale-egp"
+        helm_repository_url = "https://scale-egp-helm-charts-us-west-2.s3.amazonaws.com/charts"
     # Add helm repository/update
-    add_helm_repo()
+    add_helm_repo(helm_repository_name, helm_repository_url)
 
     # Merge configurations
     helm_values = merge_deployment_configs(manifest, agent_env_config, deploy_overrides, manifest_path)
@@ -348,7 +339,7 @@ def deploy_agent(
                 "helm",
                 "upgrade",
                 release_name,
-                "scale-egp/agentex-agent",
+                f"{helm_repository_name}/agentex-agent",
                 "--version",
                 AGENTEX_AGENTS_HELM_CHART_VERSION,
                 "-f",
@@ -370,7 +361,7 @@ def deploy_agent(
                 "helm",
                 "install",
                 release_name,
-                "scale-egp/agentex-agent",
+                f"{helm_repository_name}/agentex-agent",
                 "--version",
                 AGENTEX_AGENTS_HELM_CHART_VERSION,
                 "-f",
@@ -388,12 +379,8 @@ def deploy_agent(
 
         # Show success message with helpful commands
         console.print("\n[green]🎉 Deployment completed successfully![/green]")
-        console.print(
-            f"[blue]Check deployment status:[/blue] helm status {release_name} -n {namespace}"
-        )
-        console.print(
-            f"[blue]View logs:[/blue] kubectl logs -l app.kubernetes.io/name=agentex-agent -n {namespace}"
-        )
+        console.print(f"[blue]Check deployment status:[/blue] helm status {release_name} -n {namespace}")
+        console.print(f"[blue]View logs:[/blue] kubectl logs -l app.kubernetes.io/name=agentex-agent -n {namespace}")
 
     except subprocess.CalledProcessError as e:
         raise HelmError(

src/agentex/lib/core/clients/temporal/temporal_client.py

@@ -22,7 +22,7 @@
     maximum_attempts=1,
     initial_interval=timedelta(seconds=1),
     backoff_coefficient=2.0,
-    maximum_interval=timedelta(minutes=10)
+    maximum_interval=timedelta(minutes=10),
 )
 
 
@@ -40,8 +40,7 @@
     ),
     WorkflowExecutionStatus.FAILED: WorkflowState(
         status=TaskStatus.FAILED,
-        reason="Task encountered terminal failure. "
-        "Please contact support if retrying does not resolve the issue.",
+        reason="Task encountered terminal failure. Please contact support if retrying does not resolve the issue.",
         is_terminal=True,
     ),
     WorkflowExecutionStatus.RUNNING: WorkflowState(
@@ -75,8 +74,9 @@
 
 
 class TemporalClient:
-    def __init__(self, temporal_client: Client | None = None):
+    def __init__(self, temporal_client: Client | None = None, plugins: list[Any] = []):
         self._client: Client | None = temporal_client
+        self._plugins = plugins
 
     @property
     def client(self) -> Client:
@@ -86,7 +86,7 @@ def client(self) -> Client:
         return self._client
 
     @classmethod
-    async def create(cls, temporal_address: str):
+    async def create(cls, temporal_address: str, plugins: list[Any] = []):
         if temporal_address in [
             "false",
             "False",
@@ -99,13 +99,11 @@ async def create(cls, temporal_address: str):
         ]:
             _client = None
         else:
-            _client = await get_temporal_client(temporal_address)
-        return cls(_client)
+            _client = await get_temporal_client(temporal_address, plugins=plugins)
+        return cls(_client, plugins)
 
     async def setup(self, temporal_address: str):
-        self._client = await self._get_temporal_client(
-            temporal_address=temporal_address
-        )
+        self._client = await self._get_temporal_client(temporal_address=temporal_address)
 
     async def _get_temporal_client(self, temporal_address: str) -> Client | None:
         if temporal_address in [
@@ -120,7 +118,7 @@ async def _get_temporal_client(self, temporal_address: str) -> Client | None:
         ]:
             return None
         else:
-            return await get_temporal_client(temporal_address)
+            return await get_temporal_client(temporal_address, plugins=self._plugins)
 
     async def start_workflow(
         self,
@@ -131,9 +129,7 @@ async def start_workflow(
         execution_timeout: timedelta = timedelta(seconds=86400),
         **kwargs: Any,
     ) -> str:
-        temporal_retry_policy = TemporalRetryPolicy(
-            **retry_policy.model_dump(exclude_unset=True)
-        )
+        temporal_retry_policy = TemporalRetryPolicy(**retry_policy.model_dump(exclude_unset=True))
         workflow_handle = await self.client.start_workflow(
             *args,
             retry_policy=temporal_retry_policy,

src/agentex/lib/core/clients/temporal/utils.py

@@ -1,4 +1,6 @@
-from temporalio.client import Client
+from typing import Any
+
+from temporalio.client import Client, Plugin as ClientPlugin
 from temporalio.runtime import Runtime, TelemetryConfig, OpenTelemetryConfig
 from temporalio.contrib.pydantic import pydantic_data_converter
 
@@ -38,12 +40,46 @@
 # )
 
 
-async def get_temporal_client(temporal_address: str, metrics_url: str | None = None) -> Client:
+def validate_client_plugins(plugins: list[Any]) -> None:
+    """
+    Validate that all items in the plugins list are valid Temporal client plugins.
+
+    Args:
+        plugins: List of plugins to validate
+
+    Raises:
+        TypeError: If any plugin is not a valid ClientPlugin instance
+    """
+    for i, plugin in enumerate(plugins):
+        if not isinstance(plugin, ClientPlugin):
+            raise TypeError(
+                f"Plugin at index {i} must be an instance of temporalio.client.Plugin, "
+                f"got {type(plugin).__name__}. Note: WorkerPlugin is not valid for workflow clients."
+            )
+
+
+async def get_temporal_client(temporal_address: str, metrics_url: str | None = None, plugins: list[Any] = []) -> Client:
+    """
+    Create a Temporal client with plugin integration.
+
+    Args:
+        temporal_address: Temporal server address
+        metrics_url: Optional metrics endpoint URL
+        plugins: List of Temporal plugins to include
+
+    Returns:
+        Configured Temporal client
+    """
+    # Validate plugins if any are provided
+    if plugins:
+        validate_client_plugins(plugins)
+
     if not metrics_url:
         client = await Client.connect(
             target_host=temporal_address,
             # data_converter=custom_data_converter,
             data_converter=pydantic_data_converter,
+            plugins=plugins,
         )
     else:
         runtime = Runtime(telemetry=TelemetryConfig(metrics=OpenTelemetryConfig(url=metrics_url)))
@@ -52,5 +88,6 @@ async def get_temporal_client(temporal_address: str, metrics_url: str | None = N
             # data_converter=custom_data_converter,
             data_converter=pydantic_data_converter,
             runtime=runtime,
+            plugins=plugins,
         )
     return client