cli-74

Author: eshaan-mehta

backend/apps/dev_combined.py

@@ -17,6 +17,7 @@
 """
 
 import logging
+import os
 import modal
 
 from shared.config import get_environment, get_secrets
@@ -37,10 +38,25 @@
         f"Current environment: {env}. Use separate apps for staging/prod."
     )
 
-logger.info("Starting Combined Dev App - all services in one app for local iteration")
+# Get dev name prefix (required in dev mode to avoid naming conflicts)
+# Only validate locally - Modal containers re-import but don't need DEV_NAME
+# since the app name is already determined by the local import
+dev_name = os.environ.get("DEV_NAME")
+if not dev_name:
+    if modal.is_local():
+        raise ValueError(
+            "DEV_NAME environment variable is required for dev mode. "
+            "Run with: uv run dev <name>"
+        )
+    else:
+        # Inside Modal container - use placeholder (app name already set)
+        dev_name = "container"
+
+app_name = f"{dev_name}-{env}-server"
+logger.info(f"Starting Combined Dev App '{app_name}' - all services in one app for local iteration")
 
 app = modal.App(
-    name=f"{env}-server",
+    name=app_name,
     image=get_dev_image(),
     secrets=[get_secrets()]
 )

backend/cli.py

@@ -1,5 +1,6 @@
 """CLI for serving Modal apps locally."""
 
+import os
 import signal
 import subprocess
 import sys
@@ -31,16 +32,33 @@ def _prefix_output(process, name, color):
 def serve_all():
     """
     Serve the combined dev app (all services in one).
-    
+
     For local development, we use dev_combined.py which includes
     Server, Search, and Processing in a single Modal app.
     This allows hot-reload on all services without cross-app lookup issues.
+
+    Usage: uv run dev <name>
+
+    The name parameter is required and will prefix the Modal app name
+    to avoid conflicts when multiple developers run dev instances.
     """
-    print("Starting combined dev app (all services in one)...\n")
-    print(f"  \033[32m●{RESET} dev-combined (server + search + processing)\n")
+    if len(sys.argv) < 2:
+        print("Error: Name parameter is required for dev mode.")
+        print("Usage: uv run dev <name>")
+        print("\nExample: uv run dev john")
+        print("This creates a Modal app named 'john-dev-server'")
+        sys.exit(1)
+
+    dev_name = sys.argv[1]
+
+    # Set environment variable for the Modal app to read
+    os.environ["DEV_NAME"] = dev_name
+
+    print(f"Starting combined dev app for '{dev_name}'...\n")
+    print(f"  \033[32m●{RESET} {dev_name}-dev-server (server + search + processing)\n")
     print("Note: For staging/prod, deploy individual apps separately.\n")
     print("-" * 60 + "\n")
-    
+
     # Run with color-coded output prefixing
     color = "\033[32m"  # Green for combined dev app
     process = subprocess.Popen(
@@ -49,18 +67,19 @@ def serve_all():
         stderr=subprocess.STDOUT,
         text=True,
         bufsize=1,
+        env={**os.environ, "DEV_NAME": dev_name},
     )
-    
+
     # Handle graceful shutdown
     def signal_handler(sig, frame):
         process.terminate()
         sys.exit(0)
-    
+
     signal.signal(signal.SIGINT, signal_handler)
     signal.signal(signal.SIGTERM, signal_handler)
-    
+
     # Stream output with color prefix
-    _prefix_output(process, "dev", color)
+    _prefix_output(process, dev_name, color)
     process.wait()