Spaces:

dmartincy
/

document-translation

Sleeping

App Files Files Community

dmartincy commited on Jan 11

Commit

24c2656

1 Parent(s): dbe735d

Improve service handling

Browse files

Files changed (3) hide show

document-authoring.js +1 -1
index.html +62 -0
start-services.sh +41 -65

document-authoring.js CHANGED Viewed

@@ -2,7 +2,7 @@
 const app = document.getElementById('app');
 app.innerHTML = `
   <div style="max-width: 1024px; margin: 0 auto; padding: 20px;">
-    <button id="translateButton" style="margin-bottom: 10px;">Translate to Spanish</button>
     <div id="editor" style="border: 1px solid black; height: 600px; position: relative"></div>
   </div>
 `;

 const app = document.getElementById('app');
 app.innerHTML = `
   <div style="max-width: 1024px; margin: 0 auto; padding: 20px;">
+    <button id="translateButton" style="margin-bottom: 10px;" disabled class="button-disabled">Translate to Spanish</button>
     <div id="editor" style="border: 1px solid black; height: 600px; position: relative"></div>
   </div>
 `;

index.html CHANGED Viewed

@@ -27,10 +27,72 @@
         cursor: not-allowed;
         opacity: 0.7;
       }
     </style>
   </head>
   <body>
     <div id="app"></div>
     <script src="/document-authoring.js"></script>
   </body>
 </html>

         cursor: not-allowed;
         opacity: 0.7;
       }
+      /* Add styles for disabled state */
+      .button-disabled {
+        cursor: not-allowed;
+        opacity: 0.5;
+        pointer-events: none;
+      }
+      /* Add a status indicator */
+      #statusIndicator {
+        position: fixed;
+        bottom: 10px;
+        right: 10px;
+        padding: 8px;
+        border-radius: 4px;
+        background: #f0f0f0;
+        font-size: 14px;
+      }
     </style>
   </head>
   <body>
     <div id="app"></div>
+    <div id="statusIndicator">Services starting...</div>
+    <script>
+      // Add this before loading the main script
+      window.servicesReady = false;
+      // Create a function to check service status
+      function checkServicesStatus() {
+        fetch('/client/api/v1/healthcheck')
+          .then(response => {
+            if (response.ok) {
+              window.servicesReady = true;
+              const translateButton = document.getElementById('translateButton');
+              const statusIndicator = document.getElementById('statusIndicator');
+              if (translateButton) {
+                translateButton.classList.remove('button-disabled');
+                translateButton.disabled = false;
+              }
+              if (statusIndicator) {
+                statusIndicator.style.background = '#e6ffe6';
+                statusIndicator.textContent = 'Services ready';
+                // Optionally hide after a delay:
+                setTimeout(() => {
+                  statusIndicator.style.display = 'none';
+                }, 3000);
+              }
+              return true;
+            }
+            throw new Error('Services not ready');
+          })
+          .catch(error => {
+            console.log('Waiting for services...', error);
+            return false;
+          });
+      }
+      // Check status every 2 seconds until ready
+      const statusInterval = setInterval(() => {
+        if (window.servicesReady) {
+          clearInterval(statusInterval);
+        } else {
+          checkServicesStatus();
+        }
+      }, 2000);
+    </script>
     <script src="/document-authoring.js"></script>
   </body>
 </html>

start-services.sh CHANGED Viewed

@@ -1,10 +1,7 @@
 #!/bin/sh
 set -e
-# 1. Start Flask (already started in the CMD)
-echo "Flask is running..."
-# 2. Start Nginx
 echo "Starting nginx..."
 /usr/sbin/nginx -c /etc/nginx/nginx.conf
 if [ $? -ne 0 ]; then
@@ -12,14 +9,14 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
-# Verify nginx is running
 if ! ps aux | grep nginx | grep -v grep > /dev/null; then
     echo "Nginx failed to start"
     exit 1
 fi
 echo "Nginx started successfully"
-# 3. Start PostgreSQL
 echo "Starting PostgreSQL..."
 if [ ! -f "$PGDATA/PG_VERSION" ]; then
     mkdir -p $PGDATA
@@ -33,7 +30,7 @@ echo "Creating database user..."
 PGPASSWORD=password PGUSER=postgres createuser -s "db-user" || echo "User db-user already exists"
 PGPASSWORD=password PGUSER=postgres psql -c 'ALTER USER "db-user" WITH PASSWORD '\''password'\'';' postgres
-# Wait for PostgreSQL (using db-user)
 echo "Waiting for PostgreSQL..."
 until pg_isready -U db-user; do
     echo "Waiting for PostgreSQL to be ready..."
@@ -46,28 +43,7 @@ done
 echo "PostgreSQL is ready!"
-# # Start the web app
-# echo "Starting web app..."
-# cd /docauth
-# export NODE_OPTIONS="--experimental-vm-modules --experimental-json-modules"
-# # Start vite with the existing config.
-# npx vite serve --host 0.0.0.0 --port 7860 &
-# # Wait for the web app to start
-# echo "Waiting for web app..."
-# until curl -s http://127.0.0.1:7860 > /dev/null; do
-#     echo "Waiting for web app..."
-#     sleep 2
-#     if [ $SECONDS -gt 30 ]; then
-#         echo "Timeout waiting for web app"
-#         exit 1
-#     fi
-# done
-# echo "Web app is ready!"
-# 4. Start Llamafiler (reusing existing code)
 echo "Starting llamafiler services..."
 mkdir -p /tmp/llamafiler
@@ -79,56 +55,56 @@ echo "Starting embedding model..."
 TMPDIR=/tmp/llamafiler /usr/local/bin/llamafiler --model $HOME/models/embeddings.gguf --listen 0.0.0.0:8081 &
 EMBEDDINGS_PID=$!
-# Wait for the models to start loading
-echo "Waiting for initial model loading..."
-sleep 15  # Give more time for the models to load into memory
-echo 'Waiting for servers to start...'
-until curl -s --fail -X POST http://127.0.0.1:7861/v1/chat/completions \
-    -H "Content-Type: application/json" \
-    -d '{"model": "gemma-2b", "messages":[{"role":"user","content":"hi"}]}' >/dev/null 2>&1 && \
-      curl -s --fail -X POST http://127.0.0.1:7861/v1/embeddings \
-    -H "Content-Type: application/json" \
-    -d '{"input":"test"}' >/dev/null 2>&1
-do
-  # Check if processes are still running
-  if ! kill -0 $GEMMA_PID 2>/dev/null; then
-    echo "Gemma model process died."
-    exit 1
-  fi
-  if ! kill -0 $EMBEDDINGS_PID 2>/dev/null; then
-    echo "Embeddings model process died."
-    exit 1
-  fi
-  sleep 2
-  echo "Waiting for services... (PIDs: Gemma=$GEMMA_PID, Embeddings=$EMBEDDINGS_PID)"
 done
 echo 'Servers are ready!'
 echo 'All services are ready!'
-# Ensure we have the same environment as the base image
 export PNPM_HOME=/root/.local/share/pnpm
 export PATH=$PNPM_HOME/bin:$PATH
 cd /base  # Ensure we're in the correct directory
-echo "=== After Environment Setup ==="
-echo "New working directory: $(pwd)"
-echo "Updated PATH: $PATH"
-echo "Contents of prisma directory:"
 ls -la prisma/
-echo "NODE_PATH environment: $NODE_PATH"
-echo "PNPM_HOME contents:"
 ls -la $PNPM_HOME
-echo "Global node_modules:"
 ls -la $PNPM_HOME/global/5/node_modules/@prisma || echo "No global prisma found"
-echo "Local prisma version:"
 prisma -v
-echo "======================="
-# Now execute the entrypoint with the proper environment
 echo "Executing: /base/bin/entrypoint.sh node /base/app/main.bundle.js"
-set -x  # Enable command tracing
 exec /base/bin/entrypoint.sh node /base/app/main.bundle.js

 #!/bin/sh
 set -e
+# Start Nginx.
 echo "Starting nginx..."
 /usr/sbin/nginx -c /etc/nginx/nginx.conf
 if [ $? -ne 0 ]; then
     exit 1
 fi
+# Verify nginx is running.
 if ! ps aux | grep nginx | grep -v grep > /dev/null; then
     echo "Nginx failed to start"
     exit 1
 fi
 echo "Nginx started successfully"
+# Start PostgreSQL.
 echo "Starting PostgreSQL..."
 if [ ! -f "$PGDATA/PG_VERSION" ]; then
     mkdir -p $PGDATA
 PGPASSWORD=password PGUSER=postgres createuser -s "db-user" || echo "User db-user already exists"
 PGPASSWORD=password PGUSER=postgres psql -c 'ALTER USER "db-user" WITH PASSWORD '\''password'\'';' postgres
+# Wait for PostgreSQL (using db-user).
 echo "Waiting for PostgreSQL..."
 until pg_isready -U db-user; do
     echo "Waiting for PostgreSQL to be ready..."
 echo "PostgreSQL is ready!"
+# Start Llamafiler.
 echo "Starting llamafiler services..."
 mkdir -p /tmp/llamafiler
 TMPDIR=/tmp/llamafiler /usr/local/bin/llamafiler --model $HOME/models/embeddings.gguf --listen 0.0.0.0:8081 &
 EMBEDDINGS_PID=$!
+# Wait for the models to be ready with a timeout
+echo "Waiting for models to be ready..."
+TIMEOUT=300  # 5 minutes timeout
+START_TIME=$SECONDS
+wait_for_services() {
+    curl -s --fail -X POST http://127.0.0.1:7861/v1/chat/completions \
+        -H "Content-Type: application/json" \
+        -d '{"model": "gemma-2b", "messages":[{"role":"user","content":"hi"}]}' >/dev/null 2>&1 && \
+    curl -s --fail -X POST http://127.0.0.1:7861/v1/embeddings \
+        -H "Content-Type: application/json" \
+        -d '{"input":"test"}' >/dev/null 2>&1
+}
+until wait_for_services; do
+    ELAPSED=$((SECONDS - START_TIME))
+    if [ $ELAPSED -gt $TIMEOUT ]; then
+        echo "Timeout waiting for services after ${TIMEOUT} seconds"
+        exit 1
+    fi
+    # Check if processes are still running
+    if ! kill -0 $GEMMA_PID 2>/dev/null; then
+        echo "Gemma model process died."
+        exit 1
+    fi
+    if ! kill -0 $EMBEDDINGS_PID 2>/dev/null; then
+        echo "Embeddings model process died."
+        exit 1
+    fi
+    echo "Waiting for services... (${ELAPSED}s elapsed, PIDs: Gemma=$GEMMA_PID, Embeddings=$EMBEDDINGS_PID)"
+    sleep 2
 done
 echo 'Servers are ready!'
 echo 'All services are ready!'
+# Ensure we have the same environment as the base image.
 export PNPM_HOME=/root/.local/share/pnpm
 export PATH=$PNPM_HOME/bin:$PATH
 cd /base  # Ensure we're in the correct directory
 ls -la prisma/
 ls -la $PNPM_HOME
 ls -la $PNPM_HOME/global/5/node_modules/@prisma || echo "No global prisma found"
 prisma -v
+# Now execute the entrypoint with the proper environment.
 echo "Executing: /base/bin/entrypoint.sh node /base/app/main.bundle.js"
+set -x  # Enable command tracing.
 exec /base/bin/entrypoint.sh node /base/app/main.bundle.js