Merge remote-tracking branch 'origin/main' into mcp-with-on-demand-tokens

Author: hassan11196

src/cli/cli_main.py

@@ -66,7 +66,7 @@ def create(name: str, config_files: list, config_dir: str, env_file: str, servic
     if len(config_files) != 1:
         raise click.ClickException("Exactly one config file is supported; please provide a single -c file.")
 
-    print("Starting ARCHI deployment process...")
+    click.echo("Starting ARCHI deployment process...")
     setup_cli_logging(verbosity=verbosity)
     logger = get_logger(__name__)
 
@@ -284,6 +284,7 @@ def restart(
 ):
     """Restart a specific service in an existing deployment while reusing its configured ports."""
     setup_cli_logging(verbosity=verbosity)
+    logger = get_logger(__name__)
 
     if not podman and not check_docker_available():
         raise click.ClickException(
@@ -389,6 +390,13 @@ def restart(
             allow_port_reuse=True,
         )
 
+    if not no_build and not (config_files or config_dir):
+        template_manager = TemplateManager(env, verbosity)
+        try:
+            template_manager.copy_source_code(deployment_dir)
+        except Exception as e:
+            logger.warning(f"Warning: could not update source code before rebuild: {e}", err=True)
+
     deployment_manager = DeploymentManager(use_podman=podman)
     deployment_manager.restart_service(
         deployment_dir=deployment_dir,
@@ -482,7 +490,7 @@ def evaluate(name: str, config_file: str, config_dir: str, env_file: str, force:
     else: 
         config_files = [item for item in config_file.split(",")]
 
-    print("Starting ARCHI benchmarking process...")
+    click.echo("Starting ARCHI benchmarking process...")
     setup_cli_logging(verbosity=verbosity)
     logger = get_logger(__name__)
 

src/cli/managers/templates_manager.py

@@ -265,7 +265,7 @@ def _stage_web_lists(self, context: TemplateContext) -> None:
         self._copy_web_input_lists(context)
 
     def _stage_source_copy(self, context: TemplateContext) -> None:
-        self._copy_source_code(context.base_dir)
+        self.copy_source_code(context.base_dir)
 
     def _stage_benchmarking(self, context: TemplateContext) -> None:
         query_file = context.pop_option("query_file")
@@ -665,7 +665,7 @@ def _copy_web_input_lists(self, context: TemplateContext) -> None:
             else:
                 logger.warning(f"Configured input list {input_list} not found; skipping")
 
-    def _copy_source_code(self, base_dir: Path) -> None:
+    def copy_source_code(self, base_dir: Path) -> None:
         # Try to locate the repository root in a robust way. Prefer CWD when
         # it contains expected marker files (pyproject.toml, LICENSE, .git)
         # — this is what the template/preview code typically uses. If CWD

src/cli/templates/base-compose.yaml

@@ -337,6 +337,10 @@ services:
         condition: service_completed_successfully
     {% endif -%}
     environment:
+      PGHOST: {{ 'localhost' if host_mode else 'postgres' }}
+      PGPORT: {{ postgres_port }}
+      PGDATABASE: archi-db
+      PGUSER: archi
       {% for secret in required_secrets | default([]) -%}
       {{ secret.upper() }}_FILE: /run/secrets/{{ secret.lower() }}
       {% endfor %}
@@ -468,6 +472,10 @@ services:
         condition: service_completed_successfully
     {% endif -%}
     environment:
+      PGHOST: {{ 'localhost' if host_mode else 'postgres' }}
+      PGPORT: {{ postgres_port }}
+      PGDATABASE: archi-db
+      PGUSER: archi
       {% for secret in required_secrets | default([]) -%}
       {{ secret.upper() }}_FILE: /run/secrets/{{ secret.lower() }}
       {% endfor %}
@@ -528,6 +536,10 @@ services:
         condition: service_completed_successfully
     {% endif -%}
     environment:
+      PGHOST: {{ 'localhost' if host_mode else 'postgres' }}
+      PGPORT: {{ postgres_port }}
+      PGDATABASE: archi-db
+      PGUSER: archi
       {% for secret in required_secrets | default([]) -%}
       {{ secret.upper() }}_FILE: /run/secrets/{{ secret.lower() }}
       {% endfor %}