agentex-sdk 0.4.18__py3-none-any.whl → 0.4.19__py3-none-any.whl

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

agentex/lib/cli/handlers/deploy_handlers.py

@@ -1,22 +1,21 @@
 import os
-import subprocess
 import tempfile
-from pathlib import Path
+import subprocess
 from typing import Any
+from pathlib import Path
 
 import yaml
-from pydantic import BaseModel, Field
+from pydantic import Field, BaseModel
 from rich.console import Console
 
-from agentex.lib.cli.utils.exceptions import DeploymentError, HelmError
-from agentex.lib.sdk.config.environment_config import AgentEnvironmentConfig
-from agentex.lib.cli.utils.kubectl_utils import check_and_switch_cluster_context
-from agentex.lib.cli.utils.path_utils import calculate_docker_acp_module, PathResolutionError
+from agentex.lib.utils.logging import make_logger
+from agentex.lib.cli.utils.exceptions import HelmError, DeploymentError
+from agentex.lib.cli.utils.path_utils import PathResolutionError, calculate_docker_acp_module
 from agentex.lib.environment_variables import EnvVarKeys
+from agentex.lib.cli.utils.kubectl_utils import check_and_switch_cluster_context
 from agentex.lib.sdk.config.agent_config import AgentConfig
 from agentex.lib.sdk.config.agent_manifest import AgentManifest
-
-from agentex.lib.utils.logging import make_logger
+from agentex.lib.sdk.config.environment_config import AgentEnvironmentConfig
 
 logger = make_logger(__name__)
 console = Console()
@@ -46,7 +45,7 @@ def check_helm_installed() -> bool:
         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
@@ -54,15 +53,15 @@ def add_helm_repo() -> None:
             ["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,
             )
@@ -265,7 +264,7 @@ def merge_deployment_configs(
     if not helm_overrides_command:
         add_acp_command_to_helm_values(helm_values, manifest, manifest_path)
     
-    print("Deploying with the following helm values: ", helm_values)
+    console.print("Deploying with the following helm values: ", helm_values)
     return helm_values
 
 
@@ -318,8 +317,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)
@@ -349,7 +354,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",
@@ -371,7 +376,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",

agentex/lib/environment_variables.py

@@ -39,6 +39,7 @@ class EnvVarKeys(str, Enum):
 
 
 class Environment(str, Enum):
+    LOCAL = "local"
     DEV = "development"
     STAGING = "staging"
     PROD = "production"

agentex/lib/sdk/config/environment_config.py

@@ -7,11 +7,11 @@ configurations that are separate from the main manifest.yaml file.
 
 from __future__ import annotations
 
-from pathlib import Path
 from typing import Any, Dict, override
+from pathlib import Path
 
 import yaml
-from pydantic import BaseModel, Field, field_validator
+from pydantic import Field, BaseModel, field_validator
 
 from agentex.lib.utils.model_utils import BaseModel as UtilsBaseModel
 
@@ -73,6 +73,14 @@ class AgentEnvironmentConfig(BaseModel):
         ..., 
         description="Authentication and authorization configuration"
     )
+    helm_repository_name: str = Field(
+        default="scale-egp", 
+        description="Helm repository name for the environment"
+    )
+    helm_repository_url: str = Field(
+        default="https://scale-egp-helm-charts-us-west-2.s3.amazonaws.com/charts", 
+        description="Helm repository url for the environment"
+    )
     helm_overrides: Dict[str, Any] = Field(
         default_factory=dict, 
         description="Helm chart value overrides for environment-specific tuning"

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

@@ -1,5 +1,6 @@
 import asyncio
 import inspect
+import uuid
 from datetime import datetime
 from collections.abc import AsyncGenerator, Awaitable, Callable
 from contextlib import asynccontextmanager
@@ -9,6 +10,7 @@ import uvicorn
 from fastapi import FastAPI, Request
 from fastapi.responses import StreamingResponse
 from pydantic import TypeAdapter, ValidationError
+from starlette.middleware.base import BaseHTTPMiddleware
 
 # from agentex.lib.sdk.fastacp.types import BaseACPConfig
 from agentex.lib.environment_variables import EnvironmentVariables, refreshed_environment_variables
@@ -24,7 +26,7 @@ from agentex.lib.types.acp import (
 from agentex.lib.types.json_rpc import JSONRPCError, JSONRPCRequest, JSONRPCResponse
 from agentex.types.task_message_update import StreamTaskMessageFull, TaskMessageUpdate
 from agentex.types.task_message_content import TaskMessageContent
-from agentex.lib.utils.logging import make_logger
+from agentex.lib.utils.logging import ctx_var_request_id, make_logger
 from agentex.lib.utils.model_utils import BaseModel
 from agentex.lib.utils.registration import register_agent
 from agentex.lib.sdk.fastacp.base.constants import (
@@ -38,6 +40,20 @@ logger = make_logger(__name__)
 task_message_update_adapter = TypeAdapter(TaskMessageUpdate)
 
 
+class RequestIDMiddleware(BaseHTTPMiddleware):
+    """Middleware to extract or generate request IDs and add them to logs and response headers"""
+
+    async def dispatch(self, request: Request, call_next):
+        # Extract request ID from header or generate a new one if there isn't one
+        request_id = request.headers.get("x-request-id") or uuid.uuid4().hex
+        logger.info(f"Request ID: {request_id}")
+        # Store request ID in request state for access in handlers
+        ctx_var_request_id.set(request_id)
+        # Process request
+        response = await call_next(request)
+        return response
+
+
 class BaseACPServer(FastAPI):
     """
     AsyncAgentACP provides RPC-style hooks for agent events and commands asynchronously.
@@ -56,6 +72,8 @@ class BaseACPServer(FastAPI):
         self.post("/api")(self._handle_jsonrpc)
 
         # Method handlers
+        # this just adds a request ID to the request and response headers
+        self.add_middleware(RequestIDMiddleware)
         self._handlers: dict[RPCMethod, Callable] = {}
 
     @classmethod

agentex/lib/utils/logging.py

@@ -1,31 +1,79 @@
 import logging
-
+import contextvars
 from rich.console import Console
 from rich.logging import RichHandler
+import json_log_formatter
+import os
+import ddtrace
+from ddtrace import tracer
+
+_is_datadog_configured = bool(os.environ.get("DD_AGENT_HOST"))
+
+ctx_var_request_id = contextvars.ContextVar[str]("request_id")
+
+
+class CustomJSONFormatter(json_log_formatter.JSONFormatter):
+    def json_record(self, message: str, extra: dict, record: logging.LogRecord) -> dict:
+        extra = super().json_record(message, extra, record)
+        extra["level"] = record.levelname
+        extra["name"] = record.name
+        extra["lineno"] = record.lineno
+        extra["pathname"] = record.pathname
+        extra["request_id"] = ctx_var_request_id.get(None)
+        if _is_datadog_configured:
+            extra["dd.trace_id"] = tracer.get_log_correlation_context().get("dd.trace_id", None) or getattr(
+                record, "dd.trace_id", 0
+            )
+            extra["dd.span_id"] = tracer.get_log_correlation_context().get("dd.span_id", None) or getattr(
+                record, "dd.span_id", 0
+            )
+        # add the env, service, and version configured for the tracer
+        # If tracing is not set up, then this should pull values from DD_ENV, DD_SERVICE, and DD_VERSION.
+        service_override = ddtrace.config.service or os.getenv("DD_SERVICE")
+        if service_override:
+            extra["dd.service"] = service_override
+
+        env_override = ddtrace.config.env or os.getenv("DD_ENV")
+        if env_override:
+            extra["dd.env"] = env_override
 
+        version_override = ddtrace.config.version or os.getenv("DD_VERSION")
+        if version_override:
+            extra["dd.version"] = version_override
 
-def make_logger(name: str):
+        return extra
+
+def make_logger(name: str) -> logging.Logger:
     """
     Creates a logger object with a RichHandler to print colored text.
     :param name: The name of the module to create the logger for.
     :return: A logger object.
     """
     # Create a console object to print colored text
-    console = Console()
-
-    # Create a logger object with the name of the current module
     logger = logging.getLogger(name)
-
-    # Set the global log level to INFO
     logger.setLevel(logging.INFO)
 
-    # Add the RichHandler to the logger to print colored text
-    handler = RichHandler(
-        console=console,
-        show_level=False,
-        show_path=False,
-        show_time=False,
-    )
-    logger.addHandler(handler)
+    environment = os.getenv("ENVIRONMENT")
+    if environment == "local":
+        console = Console()
+        # Add the RichHandler to the logger to print colored text
+        handler = RichHandler(
+            console=console,
+            show_level=False,
+            show_path=False,
+            show_time=False,
+        )
+        logger.addHandler(handler)
+        return logger
+
+    stream_handler = logging.StreamHandler()
+    if _is_datadog_configured:
+        stream_handler.setFormatter(CustomJSONFormatter())
+    else:
+        stream_handler.setFormatter(
+            logging.Formatter("%(asctime)s %(levelname)s [%(name)s] [%(filename)s:%(lineno)d] - %(message)s")
+        )
 
+    logger.addHandler(stream_handler)
+    # Create a logger object with the name of the current module
     return logger

{agentex_sdk-0.4.18.dist-info → agentex_sdk-0.4.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: agentex-sdk
-Version: 0.4.18
+Version: 0.4.19
 Summary: The official Python library for the agentex API
 Project-URL: Homepage, https://github.com/scaleapi/agentex-python
 Project-URL: Repository, https://github.com/scaleapi/agentex-python
@@ -22,11 +22,14 @@ Requires-Python: <4,>=3.12
 Requires-Dist: aiohttp<4,>=3.10.10
 Requires-Dist: anyio<5,>=3.5.0
 Requires-Dist: cloudpickle>=3.1.1
+Requires-Dist: datadog>=0.52.1
+Requires-Dist: ddtrace>=3.13.0
 Requires-Dist: distro<2,>=1.7.0
 Requires-Dist: fastapi<0.116,>=0.115.0
 Requires-Dist: httpx<0.28,>=0.27.2
 Requires-Dist: ipykernel>=6.29.5
 Requires-Dist: jinja2<4,>=3.1.3
+Requires-Dist: json-log-formatter>=1.1.1
 Requires-Dist: jsonref<2,>=1.1.0
 Requires-Dist: jsonschema<5,>=4.23.0
 Requires-Dist: kubernetes<29.0.0,>=25.0.0

{agentex_sdk-0.4.18.dist-info → agentex_sdk-0.4.19.dist-info}/RECORD

@@ -11,7 +11,7 @@ agentex/_resource.py,sha256=S1t7wmR5WUvoDIhZjo_x-E7uoTJBynJ3d8tPJMQYdjw,1106
 agentex/_response.py,sha256=Tb9zazsnemO2rTxWtBjAD5WBqlhli5ZaXGbiKgdu5DE,28794
 agentex/_streaming.py,sha256=FNGJExRCF-vTRUZHFKUfoAWFhDGOB3XbioVCF37Jr7E,10104
 agentex/_types.py,sha256=lO491FSd7vM_uBp7-TvItbauEAH8SsEPYcyNO_5lKGM,7297
-agentex/_version.py,sha256=8azpxMAVbxSJfOSmVjFkPPS49oSMFsAqfcYO7jXRKZg,159
+agentex/_version.py,sha256=6BcFOkutui_Zk8paug6PcP6bW9nEWC3lUJBtRbIwUOM,159
 agentex/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agentex/_utils/__init__.py,sha256=7fch0GT9zpNnErbciSpUNa-SjTxxjY6kxHxKMOM4AGs,2305
 agentex/_utils/_compat.py,sha256=D8gtAvjJQrDWt9upS0XaG9Rr5l1QhiAx_I_1utT_tt0,1195
@@ -27,7 +27,7 @@ agentex/_utils/_typing.py,sha256=N_5PPuFNsaygbtA_npZd98SVN1LQQvFTKL6bkWPBZGU,478
 agentex/_utils/_utils.py,sha256=D2QE7mVPNEJzaB50u8rvDQAUDS5jx7JoeFD7zdj-TeI,12231
 agentex/lib/.keep,sha256=wuNrz-5SXo3jJaJOJgz4vFHM41YH_g20F5cRQo0vLes,224
 agentex/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-agentex/lib/environment_variables.py,sha256=8iMiBxDCFnG63IJ0VkFlOArTuGdwy2ADTO4fThRzUhU,3369
+agentex/lib/environment_variables.py,sha256=3vnoPoG3UyVAnPV8bwa93CFkapdr0DuND85oMAJzkZE,3389
 agentex/lib/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agentex/lib/adk/__init__.py,sha256=-PpVfEvYr_HD7TnxUWU8RCW2OnxfwpPxTW97dKTnqvI,1082
 agentex/lib/adk/_modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -63,7 +63,7 @@ agentex/lib/cli/debug/debug_handlers.py,sha256=i2Og0v5MPKIxG0uMZIp4NpmCpAro23t7P
 agentex/lib/cli/handlers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agentex/lib/cli/handlers/agent_handlers.py,sha256=iVZ-4TSQJuq7XpPBYjYIN76M33XwxDjQTuNwTzzynec,5573
 agentex/lib/cli/handlers/cleanup_handlers.py,sha256=V1V0zeErOUGTgCQqjyUl6CWtzGjFW878uzFaLOQJEyQ,7073
-agentex/lib/cli/handlers/deploy_handlers.py,sha256=rGZxGfcghc-FNAy7xItoYNQyo3TSSmI5graahPz4dSg,16038
+agentex/lib/cli/handlers/deploy_handlers.py,sha256=VFEUXaA6IZRfrXBiUiHr-2RLePxTixE5a3bx5U6M2As,16447
 agentex/lib/cli/handlers/run_handlers.py,sha256=TMelCWTwFxUJJJ7At3zG-cXTn2mBmK1ZJuJ63Ero6xs,15396
 agentex/lib/cli/handlers/secret_handlers.py,sha256=VfAdAQovW9tG36Xgk_gGIGwTyFMxR3P6xc7fmAviNA8,24719
 agentex/lib/cli/templates/default/.dockerignore.j2,sha256=hweGFxw5eDZYsb5EnRHpv27o9M1HF2PEWOxqsfBBcAE,320
@@ -178,13 +178,13 @@ agentex/lib/sdk/config/agent_config.py,sha256=WhLMd15po3loE67LNPjCGSG5xhvv4KH6xV
 agentex/lib/sdk/config/agent_manifest.py,sha256=GXEVZ9OEHPA4ESSNG4miCFjxiHhxmAWbe6nYwbiC3JM,8626
 agentex/lib/sdk/config/build_config.py,sha256=KI7SfVxGrv0rxJCIBuMT5M4oJ2o9n46LRH0t6fIki3g,1049
 agentex/lib/sdk/config/deployment_config.py,sha256=lbOx2g0Q2gbo9CqWFejzmiYqh3GLndpB7_gX6R92t0g,3992
-agentex/lib/sdk/config/environment_config.py,sha256=mZLy0MntogcTxyfSAhuWv4lJW3U1w3vSxm8opHW4Dqg,6462
+agentex/lib/sdk/config/environment_config.py,sha256=RrQPMHNAKOuqGpXPDKoQNi50lXssLOncIYLy4iwbrxs,6790
 agentex/lib/sdk/config/local_development_config.py,sha256=b1AZsOVo1RoHKbk8Nm5nC8jcjJSOxKkKBv9gLhFLX8s,1697
 agentex/lib/sdk/config/project_config.py,sha256=CGH_r9KbnSFMj2CnBkZnfg41L2o0TeVNz6MwBDKPT_U,3642
 agentex/lib/sdk/config/validation.py,sha256=QGAlAzlVJiWRlIksqxNS-JSwkk8Z4gXMSFUJc4qPrIQ,8989
 agentex/lib/sdk/fastacp/__init__.py,sha256=UvAdexdnfb4z0F4a2sfXROFyh9EjH89kf3AxHPybzCM,75
 agentex/lib/sdk/fastacp/fastacp.py,sha256=RM89_4_G2ZtIybPeMg641cw4ixFn4rZHy260FGSAa6o,3770
-agentex/lib/sdk/fastacp/base/base_acp_server.py,sha256=mVi8uSOZtf70rogS7xDJwHU1hF_5Fv7S8383rUN0kK8,15604
+agentex/lib/sdk/fastacp/base/base_acp_server.py,sha256=QLSdJVVW3E2K6qdHI6ZWQpAoOsfXQ_wk5Q6cFA2N5G4,16435
 agentex/lib/sdk/fastacp/base/constants.py,sha256=W4vpJ-5NML7239JyqzUWdu2IypIl8Cey8CS41KR2Vk0,519
 agentex/lib/sdk/fastacp/impl/agentic_base_acp.py,sha256=LWLAlHrs-2Lc2UICBAEFL8c3JwTA6oxPnzUzW0qQWSA,2694
 agentex/lib/sdk/fastacp/impl/sync_acp.py,sha256=0y_cYD-0UJOiVJv-BBMOt6PvElDf5zmc1uvbr81VcSI,3897
@@ -221,7 +221,7 @@ agentex/lib/utils/debug.py,sha256=1o2NjG8bZXTi63KTGjL3EmU_zMGapco7v5xoDuZRjU8,21
 agentex/lib/utils/io.py,sha256=17p7dfUZ1YxTAc-n_g7eFOjzInoKi7Uedyad967EKYQ,754
 agentex/lib/utils/iterables.py,sha256=cD49hj98mtY0QPaS0ZA2kguNeGzRU4UfbZfwyASWdzY,319
 agentex/lib/utils/json_schema.py,sha256=nSHbi6LC-oWXHP6sMLCBychA7B0R2DItRIJNCCEzRsY,741
-agentex/lib/utils/logging.py,sha256=RychRZ4I5JlhBRtkP6KGMZBEcRVNN8mpBjv03aV2S0E,798
+agentex/lib/utils/logging.py,sha256=osfi7UUiZ30As6z3vgn1djdGLlzTO3SBYiX6212TKAg,2911
 agentex/lib/utils/mcp.py,sha256=lYQPwKAOH6Gf2I_TeovhEG9YUijUPcN0rENNdT0Vk6c,505
 agentex/lib/utils/model_utils.py,sha256=bkcB1I0DMRAtFQpznsXgFGKZGrT7NGJ4tIwFM4dtUXQ,2547
 agentex/lib/utils/parsing.py,sha256=2T-B4nJSupo2RLf9AkpV6VQHqDnF97ZBgO6zvGCauCo,369
@@ -304,8 +304,8 @@ agentex/types/messages/batch_update_params.py,sha256=Ug5CThbD49a8j4qucg04OdmVrp_
 agentex/types/messages/batch_update_response.py,sha256=TbSBe6SuPzjXXWSj-nRjT1JHGBooTshHQQDa1AixQA8,278
 agentex/types/shared/__init__.py,sha256=IKs-Qn5Yja0kFh1G1kDqYZo43qrOu1hSoxlPdN-85dI,149
 agentex/types/shared/delete_response.py,sha256=8qH3zvQXaOHYQSHyXi7UQxdR4miTzR7V9K4zXVsiUyk,215
-agentex_sdk-0.4.18.dist-info/METADATA,sha256=yYmjMxPlZKhAlm1spqPQnhGhUycSwqSgHazP7ou4KPM,15095
-agentex_sdk-0.4.18.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-agentex_sdk-0.4.18.dist-info/entry_points.txt,sha256=V7vJuMZdF0UlvgX6KiBN7XUvq_cxF5kplcYvc1QlFaQ,62
-agentex_sdk-0.4.18.dist-info/licenses/LICENSE,sha256=Q1AOx2FtRcMlyMgQJ9eVN2WKPq2mQ33lnB4tvWxabLA,11337
-agentex_sdk-0.4.18.dist-info/RECORD,,
+agentex_sdk-0.4.19.dist-info/METADATA,sha256=wAVGZ27kfYe2_6mzg6KYLTquxKguzFAL-y_C8ZI9azg,15198
+agentex_sdk-0.4.19.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+agentex_sdk-0.4.19.dist-info/entry_points.txt,sha256=V7vJuMZdF0UlvgX6KiBN7XUvq_cxF5kplcYvc1QlFaQ,62
+agentex_sdk-0.4.19.dist-info/licenses/LICENSE,sha256=Q1AOx2FtRcMlyMgQJ9eVN2WKPq2mQ33lnB4tvWxabLA,11337
+agentex_sdk-0.4.19.dist-info/RECORD,,