Adding changes to be able to init the new environments.yaml file on init

Author: jasonyang101

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

@@ -295,10 +295,17 @@ def deploy(
             console.print(f"[red]Error:[/red] Failed to load environment config: {e}")
             raise typer.Exit(1)
 
+        # Load manifest for credential validation
+        manifest_obj = AgentManifest.from_yaml(str(manifest_path))
+
         # 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}")
+            namespace_from_config = agent_env_config.kubernetes.namespace if agent_env_config.kubernetes else None
+            if namespace_from_config:
+                console.print(f"[blue]ℹ[/blue] Using namespace from environments.yaml: {namespace_from_config}")
+                namespace = namespace_from_config
+            else:
+                raise DeploymentError(f"No namespace found in environments.yaml for environment: {environment}, and not passed in as --namespace")
 
         # Validate override file exists if provided
         if override_file:
@@ -309,8 +316,6 @@ def deploy(
                 )
                 raise typer.Exit(1)
 
-        # Load manifest for credential validation
-        manifest_obj = AgentManifest.from_yaml(str(manifest_path))
 
         # Confirm deployment (only in interactive mode)
         console.print("\n[bold]Deployment Summary:[/bold]")

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

@@ -65,6 +65,7 @@ def create_project_structure(
         ".dockerignore.j2": ".dockerignore",
         "manifest.yaml.j2": "manifest.yaml",
         "README.md.j2": "README.md",
+        "environments.yaml.j2": "environments.yaml",
     }
 
     # Add package management file based on uv choice

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

@@ -9,6 +9,7 @@
 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.environment_variables import EnvVarKeys
@@ -115,7 +116,7 @@ def add_acp_command_to_helm_values(helm_values: dict[str, Any], manifest: AgentM
 
 def merge_deployment_configs(
     manifest: AgentManifest,
-    agent_env_config,
+    agent_env_config: AgentEnvironmentConfig | None,
     cluster_config: ClusterConfig | None,
     deploy_overrides: InputDeployOverrides,
     manifest_path: str,
@@ -193,12 +194,7 @@ def merge_deployment_configs(
     if agent_config.env:
         all_env_vars.update(agent_config.env)
 
-    # 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:
@@ -282,11 +278,22 @@ def merge_deployment_configs(
 
     # Apply agent environment configuration overrides
     if agent_env_config:
+        # 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}")
+                
         if agent_env_config.helm_overrides:
             _deep_merge(helm_values, agent_env_config.helm_overrides)
 
     # Set final environment variables
     if all_env_vars:
+        # WORRY: That this will override env vars set in the environments.yaml file
         helm_values["env"] = convert_env_vars_dict_to_list(all_env_vars)
 
     if secret_env_vars:

src/agentex/lib/cli/templates/default/deploy/example.yaml.j2

@@ -0,0 +1,57 @@
+# Agent Environment Configuration
+# ------------------------------
+# This file defines environment-specific settings for your agent.
+# This DIFFERS from the manifest.yaml file in that it is used to program things that are ONLY per environment.
+
+# ********** EXAMPLE **********
+# schema_version: "v1" # This is used to validate the file structure and is not used by the agentex CLI
+# environments:
+#   dev:
+#     auth:
+#       principal:
+#         user_id: "1234567890"
+#         user_name: "John Doe"
+#         user_email: "[email protected]"
+#         user_role: "admin"
+#       user_permissions: "read, write, delete"
+#     helm_overrides: # This is used to override the global helm values.yaml file in the agentex-agent helm charts
+#       replicas: 3
+#       resources:
+#         requests:
+#           cpu: "1000m"
+#           memory: "2Gi"
+#         limits:
+#           cpu: "2000m"
+#           memory: "4Gi"
+#       env:
+#         - name: LOG_LEVEL
+#           value: "DEBUG"
+#         - name: ENVIRONMENT
+#           value: "staging"
+#
+#     kubernetes: 
+#       # OPTIONAL - Otherwise it will be derived from separately. However, this can be used to override the derived
+#       #   namespace and deploy it with in the same namespace that already exists for a separate agent.
+#       namespace: "team-{{agent_name}}"
+# ********** END EXAMPLE **********
+
+schema_version: "v1" # This is used to validate the file structure and is not used by the agentex CLI
+environments:
+  dev:
+    auth:
+      principal:
+        user_id: # TODO: Fill in
+        account_id: # TODO: Fill in
+    helm_overrides:
+      replicas: 2
+      resources:
+        requests:
+          cpu: "500m"
+          memory: "1Gi"
+        limits:
+          cpu: "1000m"
+          memory: "2Gi"
+      temporal:
+        enabled: false
+          
+

src/agentex/lib/cli/templates/default/environments.yaml.j2

@@ -0,0 +1,53 @@
+# Agent Environment Configuration
+# ------------------------------
+# This file defines environment-specific settings for your agent.
+# This DIFFERS from the manifest.yaml file in that it is used to program things that are ONLY per environment.
+
+# ********** EXAMPLE **********
+# schema_version: "v1" # This is used to validate the file structure and is not used by the agentex CLI
+# environments:
+#   dev:
+#     auth:
+#       principal:
+#         user_id: "1234567890"
+#         user_name: "John Doe"
+#         user_email: "[email protected]"
+#         user_role: "admin"
+#       user_permissions: "read, write, delete"
+#     helm_overrides: # This is used to override the global helm values.yaml file in the agentex-agent helm charts
+#       replicas: 3
+#       resources:
+#         requests:
+#           cpu: "1000m"
+#           memory: "2Gi"
+#         limits:
+#           cpu: "2000m"
+#           memory: "4Gi"
+#       env:
+#         - name: LOG_LEVEL
+#           value: "DEBUG"
+#         - name: ENVIRONMENT
+#           value: "staging"
+#     kubernetes: 
+#       # OPTIONAL - Otherwise it will be derived from separately. However, this can be used to override the derived
+#       #   namespace and deploy it with in the same namespace that already exists for a separate agent.
+#       namespace: "team-{{agent_name}}"
+# ********** END EXAMPLE **********
+
+schema_version: "v1" # This is used to validate the file structure and is not used by the agentex CLI
+environments:
+  dev:
+    auth:
+      principal:
+        user_id: # TODO: Fill in
+        account_id: # TODO: Fill in
+    helm_overrides:
+      replicas: 2
+      resources:
+        requests:
+          cpu: "500m"
+          memory: "1Gi"
+        limits:
+          cpu: "1000m"
+          memory: "2Gi"
+