ci/cocalc-api: restart hub to enable jupyter api

Author: haraldschilly

.github/workflows/make-and-test.yml

@@ -178,23 +178,99 @@ jobs:
       - name: Create CI admin user and API key
         run: |
           cd src/packages/hub
-          node dist/run/test-create-admin.js > ../../api_key.txt
+          OUTPUT=$(node dist/run/test-create-admin.js)
+          # Split output into account_id and API key (format: UUID;api-key)
+          ACCOUNT_ID=$(echo "$OUTPUT" | cut -d';' -f1)
+          API_KEY=$(echo "$OUTPUT" | cut -d';' -f2)
+
+          # Store in separate files
+          echo "$ACCOUNT_ID" > ../../account_id.txt
+          echo "$API_KEY" > ../../api_key.txt
+
+          # Validate account ID (UUID format)
+          if ! echo "$ACCOUNT_ID" | grep -qE '^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$'; then
+            echo "Error: Invalid account ID format: $ACCOUNT_ID"
+            exit 1
+          fi
+
           # Validate API key was created
           if [ ! -s ../../api_key.txt ]; then
             echo "Error: API key file is empty or missing"
             exit 1
           fi
-          API_KEY=$(cat ../../api_key.txt)
           if ! echo "$API_KEY" | grep -qE '^sk-[A-Za-z0-9]+$'; then
             echo "Error: Invalid API key format: $API_KEY"
             exit 1
           fi
+
+          echo "Account ID: $ACCOUNT_ID"
           echo "API key created successfully"
         env:
           PGDATABASE: smc
           PGUSER: smc
           PGHOST: localhost
 
+      - name: Restart CoCalc Hub
+        run: |
+            HUB_PID=$(cat src/packages/hub/hub.pid)
+            echo "Stopping hub with PID $HUB_PID"
+            kill $HUB_PID || true
+            # Wait a bit for graceful shutdown
+            sleep 5
+            # Force kill if still running
+            kill -9 $HUB_PID 2>/dev/null || true
+
+            # Read the admin account ID created in the previous step
+            cd src/packages/hub
+            ADMIN_ACCOUNT_ID=$(cat ../../account_id.txt)
+            echo "Using admin account ID: $ADMIN_ACCOUNT_ID"
+
+            # Export env vars for the hub process
+            export COCALC_SETTING_JUPYTER_API_ENABLED=yes
+            export COCALC_SETTING_JUPYTER_ACCOUNT_ID=$ADMIN_ACCOUNT_ID
+            export COCALC_SETTING_JUPYTER_PROJECT_POOL_SIZE=1
+
+            # Start hub with new configuration
+            pnpm run hub-project-dev-nobuild > hub.log 2>&1 &
+            HUB_PID=$!
+            echo $HUB_PID > hub.pid
+            echo "Hub restarted with PID $HUB_PID"
+
+            # Check if process is still running after a moment
+            sleep 2
+            if ! kill -0 $HUB_PID 2>/dev/null; then
+              echo "Error: Hub process died immediately after restarting"
+              echo "Hub log:"
+              cat hub.log
+              exit 1
+            fi
+
+            # Wait for hub to be ready
+            MAX_ATTEMPTS=30
+            READY=false
+            for i in $(seq 1 $MAX_ATTEMPTS); do
+              if curl -sf --max-time 3 http://localhost:5000/healthcheck > /dev/null; then
+                echo "Hub is ready after restart"
+                READY=true
+                break
+              fi
+              echo "Waiting for hub to be ready... ($i/$MAX_ATTEMPTS)"
+              sleep 3
+            done
+            if [ "$READY" = "false" ]; then
+              echo "Hub failed to become ready after restart"
+              echo "Hub log:"
+              cat hub.log
+              exit 1
+            fi
+        env:
+          PGDATABASE: smc
+          PGUSER: smc
+          PGHOST: localhost
+          COCALC_MODE: single-user
+          COCALC_TEST_MODE: yes
+          DEBUG: 'cocalc:*,-cocalc:silly:*,hub:*,project:*'
+
       - name: Install uv for cocalc-api tests
         run: curl -LsSf https://astral.sh/uv/install.sh | sh && echo "$HOME/.local/bin" >> $GITHUB_PATH
 

src/packages/hub/run/test-create-admin.ts

@@ -59,8 +59,8 @@ async function main() {
   console.error(`API key created with id=${apiKey.id}: ${apiKey.secret}`);
   console.error(`Last 6 chars: ${apiKey.secret.slice(-6)}`);
 
-  // Output the key for CI
-  process.stdout.write(apiKey.secret);
+  // Output the account_id and API key for CI in format: UUID;api-key
+  process.stdout.write(`${account_id};${apiKey.secret}`);
 }
 
 main().catch((err) => {

src/python/cocalc-api/tests/test_jupyter.py

@@ -68,7 +68,6 @@ def test_python3_kernel_available(self, hub, temporary_project):
 class TestJupyterExecuteViaHub:
     """Tests for executing code via hub.jupyter.execute()."""
 
-    @pytest.mark.skip(reason="hub.jupyter.execute() has timeout issues - use project.system.jupyter_execute() instead")
     def test_execute_simple_sum(self, hub, temporary_project):
         """Test executing a simple sum using the python3 kernel."""
         project_id = temporary_project["project_id"]
@@ -90,7 +89,6 @@ def test_execute_simple_sum(self, hub, temporary_project):
         assert "text/plain" in first_output["data"]
         assert first_output["data"]["text/plain"] == "4950"
 
-    @pytest.mark.skip(reason="hub.jupyter.execute() has timeout issues - use project.system.jupyter_execute() instead")
     def test_execute_with_history(self, hub, temporary_project):
         """Test executing code with history context."""
         project_id = temporary_project["project_id"]
@@ -109,7 +107,6 @@ def test_execute_with_history(self, hub, temporary_project):
         assert "text/plain" in first_output["data"]
         assert first_output["data"]["text/plain"] == "5050"
 
-    @pytest.mark.skip(reason="hub.jupyter.execute() has timeout issues - use project.system.jupyter_execute() instead")
     def test_execute_print_statement(self, hub, temporary_project):
         """Test executing code that prints output."""
         project_id = temporary_project["project_id"]