fix ci

Author: yibeichan

.github/workflows/ci.yml

@@ -23,18 +23,27 @@ jobs:
           docker compose version
           docker compose -f docker-compose.dev.yml build
           docker compose -f docker-compose.dev.yml up -d
-          docker compose -f docker-compose.dev.yml exec -T reproschema python -m pytest tests/
+          docker compose -f docker-compose.dev.yml exec -T reproschema-server python -m pytest tests/
           docker compose -f docker-compose.dev.yml down
         env:
+          # Core settings
           NODE_ENV: development
+          CONTAINER_NAME: reproschema-server
+          
+          # Schema configuration
+          SCHEMA_SOURCE: https://raw.githubusercontent.com/ReproNim/demo-protocol/main/DemoProtocol/DemoProtocol_schema
+          SCHEMA_PATH: ./schemas
+          
+          # Data paths
+          DATA_PATH: ./data
+          
+          # Project configuration
+          PROJECT_NAME: development  # Match development environment
+          
+          # Development settings
           DEV_MODE: 1
-          PROJECT_NAME: development
-          SCHEMA_URL: http://localhost:80/schema/demo-protocol.json
-          LOCAL_SCHEMA_DIR: ./schemas
-          FRONTEND_PORT: 3000
-          BACKEND_PORT: 8000
-          PORT: 80
-          NGINX_HOST: localhost
+          ADMIN_MODE: true
+          DEBUG_MODE: true
 
   docker:
     needs: test
@@ -51,6 +60,9 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker images
+        env:
+          NODE_ENV: production  # Ensure production build
+          PROJECT_NAME: reproschema  # Use production name
         run: |
           docker compose -f docker-compose.yml build
           docker compose -f docker-compose.yml push

docker-compose.dev.yml

@@ -1,42 +1,79 @@
 version: '3.8'
-
 services:
-  reproschema:
+  reproschema-server:
+    container_name: ${CONTAINER_NAME:-reproschema-server}
     build:
       context: .
       dockerfile: docker/Dockerfile
       args:
-        - NODE_ENV=development
+        NODE_VERSION: "18"
+        SCHEMA_SOURCE: ${SCHEMA_SOURCE:-https://raw.githubusercontent.com/ReproNim/demo-protocol/main/DemoProtocol/DemoProtocol_schema}
+        ASSETS_PUBLIC_PATH: ${ASSETS_PUBLIC_PATH:-/}  # uppercase, consistent
     ports:
       - "${PORT:-80}:80"
-      - "8000:8000"
+      - "8000:8000"  # Backend API port
     volumes:
-      # Development-specific volume mounts
-      - ./docker/frontend:/usr/src/app
-      - /usr/src/app/node_modules
-      - ./docker/backend:/app
-      - ./tests:/app/tests
-      # Production volume mounts
+      # Local schema mount (only used when SCHEMA_SOURCE=local)
       - ${SCHEMA_PATH:-./schemas}:/schemas:ro
-      - ${DATA_PATH:-./data}:/data
+      # Data storage volume
+      - ${DATA_PATH:-./data}:/data:rw
     environment:
-      # Development-specific settings
-      - NODE_ENV=development
-      - VUE_APP_HOT_RELOAD=true
-      - DEV_MODE=1
+      # Core settings
+      - NODE_ENV=${NODE_ENV:-development}  # Default to development
 
-      # Core settings from production
+      # Schema configuration
       - SCHEMA_SOURCE=${SCHEMA_SOURCE:-https://raw.githubusercontent.com/ReproNim/demo-protocol/main/DemoProtocol/DemoProtocol_schema}
+      
+      # UI configuration
+      - BANNER=${BANNER:-Reproschema Protocol}
+      - START_BUTTON=${START_BUTTON:-Start}
+      - STUDY_PREFIX=${STUDY_PREFIX:-study}
+      
+      # Backend configuration
       - REPROSCHEMA_BACKEND_BASEDIR=/data
-      - INITIAL_TOKEN=${INITIAL_TOKEN:-}
+      # For development mode
+      - DEV8dac6d02a913=${DEV_MODE:-1}
       - BACKEND_URL=${BACKEND_URL:-/api}
+      # Project name for data organization
+      - PROJECT_NAME=${PROJECT_NAME:-development}  # Default to development
+      
+      # Development settings
+      - DEV_MODE=${DEV_MODE:-1}  # Default to development mode ON
+      - ADMIN_MODE=${ADMIN_MODE:-true}
+      - DEBUG_MODE=${DEBUG_MODE:-true}
 
-      # Override SCHEMA_URL for development if needed
-      - VUE_APP_SCHEMA_URL=${SCHEMA_URL:-http://localhost:${PORT:-80}/schema/demo-protocol.json}
-    
-    # Development-specific command to enable hot reloading
-    command: sh -c "npm run serve & uvicorn main:app --host 0.0.0.0 --port ${BACKEND_PORT:-8000} --reload"
+      # Additional configuration
+      - VALIDATE_SCHEMA=${VALIDATE_SCHEMA:-true}
+      - SCHEMA_TYPE=${SCHEMA_TYPE:-jsonld}
+      
+      # Runtime configuration
+      - ASSETS_PUBLIC_PATH=${ASSETS_PUBLIC_PATH:-/}  # Use same default as build arg
+      
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8000/health"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 15s
+    restart: unless-stopped
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "3"
+    networks:
+      - reproschema-net
 
 volumes:
   participant_data:
-    name: ${PROJECT_NAME:-reproschema}_data
+    name: ${PROJECT_NAME:-reproschema}_data
+    driver: local
+    driver_opts:
+      type: none
+      device: ${DATA_PATH:-./data}
+      o: bind
+
+networks:
+  reproschema-net:
+    name: ${PROJECT_NAME:-reproschema}_network
+    driver: bridge

docker/backend/app.py

@@ -37,6 +37,7 @@ async def health_check(request):
 
 @app.get("/api/token")
 async def get_token(request):
+    print("Token request:", request.args)  # Debug token requests
     token = request.args.get('token')
     project = request.args.get('project', os.getenv('STUDY_PREFIX', 'study'))
     expiry_minutes = int(request.args.get('expiry_minutes', 90))
@@ -73,6 +74,8 @@ async def register(request):
 
 @app.post("/api/responses")
 async def submit_data(request):
+    print("Response headers:", request.headers)  # Debug headers
+    print("Response data:", request.json)  # Debug data
     auth_token = request.headers.get('Authorization')
 
     # Strip "Bearer " prefix if present