Adding environments changes

Author: jasonyang101

src/agentex/lib/cli/commands/agents.py

@@ -243,10 +243,13 @@ def deploy(
     cluster: str = typer.Option(
         ..., help="Target cluster name (must match kubectl context)"
     ),
+    environment: str = typer.Option(
+        ..., help="Environment name (dev, prod, etc.) - must be defined in environments.yaml"
+    ),
     manifest: str = typer.Option("manifest.yaml", help="Path to the manifest file"),
     namespace: str | None = typer.Option(
         None,
-        help="Kubernetes namespace to deploy to (required in non-interactive mode)",
+        help="Override Kubernetes namespace (defaults to namespace from environments.yaml)",
     ),
     tag: str | None = typer.Option(None, help="Override the image tag for deployment"),
     repository: str | None = typer.Option(
@@ -272,23 +275,30 @@ def deploy(
             console.print(f"[red]Error:[/red] Manifest file not found: {manifest}")
             raise typer.Exit(1)
 
-        # In non-interactive mode, require namespace
-        if not interactive and not namespace:
-            console.print(
-                "[red]Error:[/red] --namespace is required in non-interactive mode"
-            )
+        # Validate environments.yaml exists
+        environments_file = manifest_path.parent / "environments.yaml"
+        if not environments_file.exists():
+            console.print(f"[red]Error:[/red] environments.yaml not found next to {manifest}")
+            console.print("\n💡 To create one:")
+            console.print("   agentex agents init-environments")
+            console.print("\n📋 Why required:")
+            console.print("   Environment-specific settings (auth, namespace, resources)")
+            console.print("   must be separated from global manifest for proper isolation.")
             raise typer.Exit(1)
 
-        # Get namespace if not provided (only in interactive mode)
-        if not namespace:
-            namespace = questionary.text(
-                "Enter Kubernetes namespace:", default="default"
-            ).ask()
-            namespace = handle_questionary_cancellation(namespace, "namespace input")
+        # Load and validate environment configuration
+        try:
+            from agentex.lib.sdk.config.environment_config import AgentEnvironmentsConfig
+            environments_config = AgentEnvironmentsConfig.from_yaml(str(environments_file))
+            agent_env_config = environments_config.get_config_for_env(environment)
+        except Exception as e:
+            console.print(f"[red]Error:[/red] Failed to load environment config: {e}")
+            raise typer.Exit(1)
 
-            if not namespace:
-                console.print("Deployment cancelled")
-                raise typer.Exit(0)
+        # Use namespace from environment config if not overridden
+        if not namespace:
+            namespace = agent_env_config.kubernetes.namespace
+            console.print(f"[blue]ℹ[/blue] Using namespace from environments.yaml: {namespace}")
 
         # Validate override file exists if provided
         if override_file:
@@ -305,6 +315,7 @@ def deploy(
         # Confirm deployment (only in interactive mode)
         console.print("\n[bold]Deployment Summary:[/bold]")
         console.print(f"  Manifest: {manifest}")
+        console.print(f"  Environment: {environment}")
         console.print(f"  Cluster: {cluster}")
         console.print(f"  Namespace: {namespace}")
         if tag:
@@ -340,6 +351,7 @@ def deploy(
             namespace=namespace,
             deploy_overrides=deploy_overrides,
             override_file_path=override_file,
+            environment_name=environment,
         )
 
         # Use the already loaded manifest object

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

@@ -8,7 +8,6 @@
 from pydantic import BaseModel, Field
 from rich.console import Console
 
-from agentex.lib.cli.utils.auth_utils import _encode_principal_context
 from agentex.lib.cli.utils.exceptions import DeploymentError, HelmError
 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
@@ -116,6 +115,7 @@ def add_acp_command_to_helm_values(helm_values: dict[str, Any], manifest: AgentM
 
 def merge_deployment_configs(
     manifest: AgentManifest,
+    agent_env_config,
     cluster_config: ClusterConfig | None,
     deploy_overrides: InputDeployOverrides,
     manifest_path: str,
@@ -193,10 +193,12 @@ def merge_deployment_configs(
     if agent_config.env:
         all_env_vars.update(agent_config.env)
 
-    # Add auth principal env var if manifest principal is set
-    encoded_principal = _encode_principal_context(manifest)
-    if encoded_principal:
-        all_env_vars[EnvVarKeys.AUTH_PRINCIPAL_B64.value] = encoded_principal
+    # Add auth principal env var if environment config is set
+    if agent_env_config and 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)
+        if encoded_principal:
+            all_env_vars[EnvVarKeys.AUTH_PRINCIPAL_B64.value] = encoded_principal
 
     # Handle credentials and check for conflicts
     if agent_config.credentials:
@@ -278,6 +280,11 @@ def merge_deployment_configs(
         if cluster_config.additional_overrides:
             _deep_merge(helm_values, cluster_config.additional_overrides)
 
+    # Apply agent environment configuration overrides
+    if agent_env_config:
+        if agent_env_config.helm_overrides:
+            _deep_merge(helm_values, agent_env_config.helm_overrides)
+
     # Set final environment variables
     if all_env_vars:
         helm_values["env"] = convert_env_vars_dict_to_list(all_env_vars)
@@ -334,6 +341,7 @@ def deploy_agent(
     namespace: str,
     deploy_overrides: InputDeployOverrides,
     override_file_path: str | None = None,
+    environment_name: str | None = None,
 ) -> None:
     """Deploy an agent using helm"""
 
@@ -347,6 +355,17 @@ def deploy_agent(
     manifest = AgentManifest.from_yaml(file_path=manifest_path)
     override_config = load_override_config(override_file_path)
 
+    # Load agent environment configuration
+    agent_env_config = None
+    if environment_name:
+        manifest_dir = Path(manifest_path).parent
+        environments_config = manifest.load_environments_config(manifest_dir)
+        if environments_config:
+            agent_env_config = environments_config.get_config_for_env(environment_name)
+            console.print(f"[green]✓[/green] Using environment config: {environment_name}")
+        else:
+            console.print(f"[yellow]⚠[/yellow] No environments.yaml found, skipping environment-specific config")
+
     # Provide feedback about override configuration
     if override_config:
         console.print(f"[green]✓[/green] Using override config: {override_file_path}")
@@ -359,7 +378,7 @@ def deploy_agent(
     add_helm_repo()
 
     # Merge configurations
-    helm_values = merge_deployment_configs(manifest, override_config, deploy_overrides, manifest_path)
+    helm_values = merge_deployment_configs(manifest, agent_env_config, override_config, deploy_overrides, manifest_path)
 
     # Create values file
     values_file = create_helm_values_file(helm_values)

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

@@ -6,7 +6,6 @@
 from rich.console import Console
 from rich.panel import Panel
 
-from agentex.lib.cli.utils.auth_utils import _encode_principal_context
 from agentex.lib.cli.handlers.cleanup_handlers import (
     cleanup_agent_workflows,
     should_cleanup_on_restart
@@ -374,10 +373,13 @@ def create_agent_environment(manifest: AgentManifest) -> dict[str, str]:
         "ACP_PORT": str(manifest.local_development.agent.port),
     }
 
-    # Add authorization principal if set
+    # Add authorization principal if set - for local development, auth is optional
+    from agentex.lib.cli.utils.auth_utils import _encode_principal_context
     encoded_principal = _encode_principal_context(manifest)
     if encoded_principal:
         env_vars[EnvVarKeys.AUTH_PRINCIPAL_B64] = encoded_principal
+    else:
+        logger.info("No auth principal configured - agent will run without authentication context")
 
     # Add description if available
     if manifest.agent.description:

src/agentex/lib/cli/utils/auth_utils.py

@@ -1,18 +1,58 @@
 import base64
 import json
+from typing import Any, Dict
 
 from agentex.lib.sdk.config.agent_manifest import AgentManifest
+from agentex.lib.sdk.config.environment_config import AgentAuthConfig
 
+# DEPRECATED: Old function for backward compatibility
+# Will be removed in future version
+def _encode_principal_context(manifest: AgentManifest) -> str | None:
+    """
+    DEPRECATED: This function is deprecated as AgentManifest no longer contains auth.
+    Use _encode_principal_context_from_env_config instead.
+    
+    This function is kept temporarily for backward compatibility during migration.
+    """
+    # AgentManifest no longer has auth field - this will always return None
+    return None
 
-# Base 64 encode principal dictionary
-def _encode_principal_context(manifest: AgentManifest):
-    if manifest.auth is None:
-        return None
 
-    principal = manifest.auth.principal
+def _encode_principal_context_from_env_config(auth_config: "AgentAuthConfig | None") -> str | None:
+    """
+    Encode principal context from environment configuration.
+    
+    Args:
+        auth_config: AgentAuthConfig containing principal configuration
+        
+    Returns:
+        Base64-encoded JSON string of the principal, or None if no principal
+    """
+    if auth_config is None:
+        return None
+    
+    principal = auth_config.principal
     if principal is None:
         return None
 
     json_str = json.dumps(principal, separators=(',', ':'))
     encoded_bytes = base64.b64encode(json_str.encode('utf-8'))
     return encoded_bytes.decode('utf-8')
+
+
+def _encode_principal_dict(principal: Dict[str, Any]) -> str | None:
+    """
+    Encode principal dictionary directly.
+    
+    Args:
+        principal: Dictionary containing principal configuration
+        
+    Returns:
+        Base64-encoded JSON string of the principal, or None if principal is empty
+    """
+    if not principal:
+        return None
+
+    json_str = json.dumps(principal, separators=(',', ':'))
+    encoded_bytes = base64.b64encode(json_str.encode('utf-8'))
+    return encoded_bytes.decode('utf-8')

src/agentex/lib/sdk/config/agent_manifest.py

@@ -15,7 +15,7 @@
 
 from agentex.lib.sdk.config.agent_config import AgentConfig
 from agentex.lib.sdk.config.build_config import BuildConfig
-from agentex.lib.sdk.config.deployment_config import DeploymentConfig, AuthenticationConfig
+from agentex.lib.sdk.config.deployment_config import DeploymentConfig
 from agentex.lib.sdk.config.local_development_config import LocalDevelopmentConfig
 from agentex.lib.utils.logging import make_logger
 from agentex.lib.utils.model_utils import BaseModel
@@ -36,7 +36,7 @@ class AgentManifest(BaseModel):
     deployment: DeploymentConfig | None = Field(
         default=None, description="Deployment configuration for the agent"
     )
-    auth: AuthenticationConfig | None = Field(default=None, description="Authentication configuration")
+
 
     def context_manager(self, build_context_root: Path) -> BuildContextManager:
         """
@@ -45,6 +45,23 @@ def context_manager(self, build_context_root: Path) -> BuildContextManager:
         return BuildContextManager(
             agent_manifest=self, build_context_root=build_context_root
         )
+    
+    def load_environments_config(self, manifest_dir: Path) -> "AgentEnvironmentsConfig | None":
+        """Load environments.yaml from same directory as manifest.yaml.
+        
+        Args:
+            manifest_dir: Directory containing manifest.yaml
+            
+        Returns:
+            AgentEnvironmentsConfig if environments.yaml exists, None otherwise
+            
+        Raises:
+            ValueError: If environments.yaml exists but is invalid
+        """
+        # Import here to avoid circular imports
+        from agentex.lib.sdk.config.environment_config import load_environments_config_from_manifest_dir
+        
+        return load_environments_config_from_manifest_dir(manifest_dir)
 
 
 class BuildContextManager: