updated modelgen, decoupling tester

cfg/amar/.env

@@ -28,8 +28,8 @@ DB_DUMP=dev.sql
 # =============================================================================
 # PORTS
 # =============================================================================
-BACKEND_PORT=8000
-FRONTEND_PORT=3000
+BACKEND_PORT=8010
+FRONTEND_PORT=3010
 
 # =============================================================================
 # BACKEND SERVER (Uvicorn)

cfg/amar/ctrl/start.sh

@@ -9,29 +9,42 @@
 #   ./start.sh --build      # Rebuild images
 
 set -e
-cd "$(dirname "$0")/.."
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+CFG_DIR="$(dirname "$SCRIPT_DIR")"
+GEN_DIR="$CFG_DIR/../../gen/amar"
+SPR_DIR="$GEN_DIR/soleprint"
 
 BUILD=""
 DETACH=""
 TARGET="all"
+NGINX="-f $CFG_DIR/soleprint/docker-compose.nginx.yml"
 
 for arg in "$@"; do
     case $arg in
         -d|--detached) DETACH="-d" ;;
         --build) BUILD="--build" ;;
+        --no-nginx) NGINX="" ;;
         amar) TARGET="amar" ;;
         soleprint) TARGET="soleprint" ;;
     esac
 done
 
-if [ "$TARGET" = "all" ] || [ "$TARGET" = "amar" ]; then
+if [ "$TARGET" = "all" ]; then
+    echo "Starting amar + soleprint..."
+    (cd "$CFG_DIR" && docker compose up $BUILD -d)
+    (cd "$SPR_DIR" && docker compose -f docker-compose.yml $NGINX up $BUILD -d)
+    if [ -z "$DETACH" ]; then
+        (cd "$CFG_DIR" && docker compose logs -f) &
+        (cd "$SPR_DIR" && docker compose logs -f) &
+        wait
+    fi
+elif [ "$TARGET" = "amar" ]; then
     echo "Starting amar..."
-    docker compose up $DETACH $BUILD
-fi
-
-if [ "$TARGET" = "all" ] || [ "$TARGET" = "soleprint" ]; then
+    (cd "$CFG_DIR" && docker compose up $DETACH $BUILD)
+elif [ "$TARGET" = "soleprint" ]; then
     echo "Starting soleprint..."
-    (cd soleprint && docker compose up $DETACH $BUILD)
+    (cd "$SPR_DIR" && docker compose -f docker-compose.yml $NGINX up $DETACH $BUILD)
 fi
 
 if [ -n "$DETACH" ]; then

cfg/amar/ctrl/stop.sh

@@ -7,19 +7,23 @@
 #   ./stop.sh soleprint    # Stop only soleprint
 
 set -e
-cd "$(dirname "$0")/.."
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+CFG_DIR="$(dirname "$SCRIPT_DIR")"
+GEN_DIR="$CFG_DIR/../../gen/amar"
+SPR_DIR="$GEN_DIR/soleprint"
 
 TARGET="all"
 [ -n "$1" ] && TARGET="$1"
 
 if [ "$TARGET" = "all" ] || [ "$TARGET" = "soleprint" ]; then
     echo "Stopping soleprint..."
-    (cd soleprint && docker compose down)
+    (cd "$SPR_DIR" && docker compose -f docker-compose.yml -f "$CFG_DIR/soleprint/docker-compose.nginx.yml" down 2>/dev/null || true)
 fi
 
 if [ "$TARGET" = "all" ] || [ "$TARGET" = "amar" ]; then
     echo "Stopping amar..."
-    docker compose down
+    (cd "$CFG_DIR" && docker compose down)
 fi
 
 echo "Done."

cfg/amar/soleprint/.env

@@ -13,14 +13,18 @@ DEPLOYMENT_NAME=amar_soleprint
 NETWORK_NAME=soleprint_network
 
 # =============================================================================
-# PATHS
+# PATHS (bare-metal only, not used by docker)
 # =============================================================================
-SOLEPRINT_BARE_PATH=/home/mariano/wdir/spr/gen
+SOLEPRINT_BARE_PATH=/home/mariano/wdir/spr/gen/amar/soleprint
 
 # =============================================================================
 # PORTS
 # =============================================================================
 SOLEPRINT_PORT=12000
+NGINX_PORT=8030
+ROOM_NAME=amar
+MANAGED_DOMAIN=amar.local.ar
+SOLEPRINT_DOMAIN=spr.local.ar
 
 # =============================================================================
 # DATABASE (amar's DB for station tools)

cfg/amar/soleprint/docker-compose.nginx.yml

@@ -20,12 +20,10 @@ services:
     image: nginx:alpine
     container_name: ${DEPLOYMENT_NAME}_nginx
     ports:
-      - "80:80"
+      - "${NGINX_PORT:-8030}:80"
     volumes:
       # Mount template that will be processed with envsubst
-      - ../ctrl/server/nginx/docker-local.conf:/etc/nginx/templates/default.conf.template:ro
-      # Mount wrapper files for serving
-      - ../wrapper:/app/wrapper:ro
+      - ./nginx/local.conf:/etc/nginx/conf.d/default.conf:ro
     env_file:
       - .env
     environment:

cfg/amar/soleprint/docker-compose.yml

@@ -1,34 +1,34 @@
-# Soleprint Services - Docker Compose
+# Soleprint Services - Amar Room
 #
 # Runs soleprint hub as a single service
 # Artery, atlas, station are accessed via path-based routing
 #
 # Usage:
-#   cd mainroom/soleprint && docker compose up -d
+#   cd gen/amar/soleprint && docker compose up
+
+name: ${DEPLOYMENT_NAME}
 
 services:
   soleprint:
     build:
-      context: ${SOLEPRINT_BARE_PATH}
+      context: .
       dockerfile: Dockerfile
     container_name: ${DEPLOYMENT_NAME}_soleprint
+    user: "${UID:-1000}:${GID:-1000}"
     volumes:
-      - ${SOLEPRINT_BARE_PATH}:/app
+      - .:/app
     ports:
       - "${SOLEPRINT_PORT}:8000"
     env_file:
       - .env
     environment:
-      # For single-port mode, all subsystems are internal routes
       - ARTERY_EXTERNAL_URL=/artery
       - ATLAS_EXTERNAL_URL=/atlas
       - STATION_EXTERNAL_URL=/station
     networks:
       - default
-    # Use run.py for single-port bare-metal mode
     command: uvicorn run:app --host 0.0.0.0 --port 8000 --reload
 
 networks:
   default:
-    external: true
     name: ${NETWORK_NAME}