Merge branch 'main' into x/uv-in-docker

Author: x

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

@@ -11,7 +11,6 @@
 from rich.console import Console
 
 from agentex.lib.utils.logging import make_logger
-from agentex.lib.constants.ports import ACP_SERVER_PORT
 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
@@ -240,12 +239,12 @@ def add_acp_command_to_helm_values(helm_values: dict[str, Any], manifest: AgentM
     try:
         docker_acp_module = calculate_docker_acp_module(manifest, manifest_path)
         # Create the uvicorn command with the correct module path
-        helm_values["command"] = ["uvicorn", f"{docker_acp_module}:acp", "--host", "0.0.0.0", "--port", str(ACP_SERVER_PORT)]
+        helm_values["command"] = ["uvicorn", f"{docker_acp_module}:acp", "--host", "0.0.0.0", "--port", "8000"]
         logger.info(f"Using dynamic ACP command: uvicorn {docker_acp_module}:acp")
     except (PathResolutionError, Exception) as e:
         # Fallback to default command structure
         logger.warning(f"Could not calculate dynamic ACP module ({e}), using default: project.acp")
-        helm_values["command"] = ["uvicorn", "project.acp:acp", "--host", "0.0.0.0", "--port", str(ACP_SERVER_PORT)]
+        helm_values["command"] = ["uvicorn", "project.acp:acp", "--host", "0.0.0.0", "--port", "8000"]
 
 
 def merge_deployment_configs(

src/agentex/lib/environment_variables.py

@@ -1,3 +1,4 @@
+
 from __future__ import annotations
 
 import os
@@ -7,12 +8,6 @@
 from dotenv import load_dotenv
 
 from agentex.lib.utils.logging import make_logger
-from agentex.lib.constants.ports import (
-    ACP_SERVER_PORT as _DEFAULT_ACP_PORT,
-    TEMPORAL_ADDRESS as _DEFAULT_TEMPORAL_ADDRESS,
-    HEALTH_CHECK_PORT as _DEFAULT_HEALTH_CHECK_PORT,
-    AGENTEX_API_BASE_URL as _DEFAULT_AGENTEX_BASE_URL,
-)
 from agentex.lib.utils.model_utils import BaseModel
 
 PROJECT_ROOT = Path(__file__).resolve().parents[2]
@@ -61,9 +56,9 @@ class Environment(str, Enum):
 
 class EnvironmentVariables(BaseModel):
     ENVIRONMENT: str = Environment.DEV
-    TEMPORAL_ADDRESS: str | None = _DEFAULT_TEMPORAL_ADDRESS
+    TEMPORAL_ADDRESS: str | None = "localhost:7233"
     REDIS_URL: str | None = None
-    AGENTEX_BASE_URL: str | None = _DEFAULT_AGENTEX_BASE_URL
+    AGENTEX_BASE_URL: str | None = "http://localhost:5003"
     # Agent Identifiers
     AGENT_NAME: str
     AGENT_DESCRIPTION: str | None = None
@@ -73,12 +68,12 @@ class EnvironmentVariables(BaseModel):
     AGENT_INPUT_TYPE: str | None = None
     # ACP Configuration
     ACP_URL: str
-    ACP_PORT: int = _DEFAULT_ACP_PORT
+    ACP_PORT: int = 8000
     # Workflow Configuration
     WORKFLOW_TASK_QUEUE: str | None = None
     WORKFLOW_NAME: str | None = None
     # Temporal Worker Configuration
-    HEALTH_CHECK_PORT: int = _DEFAULT_HEALTH_CHECK_PORT
+    HEALTH_CHECK_PORT: int = 80
     # Auth Configuration
     AUTH_PRINCIPAL_B64: str | None = None
     # Build Information