Add --foreground option to start.sh to run uvicorn/ollama in foreground for continuous terminal logs

Author: fansichen421

web/start.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -euo pipefail
 # One-click start script for web backend and optionally Ollama.
-# Usage: start.sh [--backend] [--ollama [MODEL]] [--all]
+# Usage: start.sh [--backend] [--ollama [MODEL]] [--all] [--foreground]
 
 ENV_NAME="lightllm"
 ROOT_DIR="$(cd "$(dirname "$0")" && pwd)/.."
@@ -39,21 +39,44 @@ start_backend() {
   if command -v conda >/dev/null 2>&1; then
     # Try to get the python executable path inside the env
     PY_CMD="$(conda run -n "$ENV_NAME" --no-capture-output which python 2>/dev/null || true)"
-    if [ -z "$PY_CMD" ]; then
-      # Fallback to conda run python -m
-      echo "Using 'conda run -n $ENV_NAME python -m uvicorn' fallback"
-        (PYTHONPATH="$ROOT_DIR" conda run -n "$ENV_NAME" --no-capture-output bash -lc 'nohup python -m uvicorn web.backend:app --host 127.0.0.1 --port 8000 --reload > "$UVICORN_LOG" 2>&1 &')
+      if [ -z "$PY_CMD" ]; then
+        # Fallback to conda run python -m
+        echo "Using 'conda run -n $ENV_NAME python -m uvicorn' fallback"
+        if [ "$FOREGROUND" -eq 1 ]; then
+          echo "Running uvicorn in foreground (conda run)...";
+          PYTHONPATH="$ROOT_DIR" conda run -n "$ENV_NAME" --no-capture-output bash -lc 'python -m uvicorn web.backend:app --host 127.0.0.1 --port 8000 --reload'
+        else
+          (PYTHONPATH="$ROOT_DIR" conda run -n "$ENV_NAME" --no-capture-output bash -lc 'nohup python -m uvicorn web.backend:app --host 127.0.0.1 --port 8000 --reload > "$UVICORN_LOG" 2>&1 &')
+        fi
+      else
     else
       echo "Using python: $PY_CMD"
+      if [ "$FOREGROUND" -eq 1 ]; then
+        echo "Running uvicorn in foreground using $PY_CMD";
+        PYTHONPATH="$ROOT_DIR" exec "$PY_CMD" -m uvicorn web.backend:app --host 127.0.0.1 --port 8000
+      else
         (PYTHONPATH="$ROOT_DIR" nohup "$PY_CMD" -m uvicorn web.backend:app --host 127.0.0.1 --port 8000 > "$UVICORN_LOG" 2>&1 &)
+      fi
+    fi
+  else
     fi
   else
     # No conda: use system python3 if available
     if command -v python3 >/dev/null 2>&1; then
+      if [ "$FOREGROUND" -eq 1 ]; then
+        echo "Running uvicorn in foreground using system python3";
+        PYTHONPATH="$ROOT_DIR" exec python3 -m uvicorn web.backend:app --host 127.0.0.1 --port 8000
+      else
         (PYTHONPATH="$ROOT_DIR" nohup python3 -m uvicorn web.backend:app --host 127.0.0.1 --port 8000 > "$UVICORN_LOG" 2>&1 &)
+      fi
     else
       # Fallback: try uvicorn directly
+      if [ "$FOREGROUND" -eq 1 ]; then
+        echo "Running uvicorn in foreground (uvicorn CLI)";
+        PYTHONPATH="$ROOT_DIR" exec uvicorn web.backend:app --host 127.0.0.1 --port 8000
+      else
         (PYTHONPATH="$ROOT_DIR" nohup uvicorn web.backend:app --host 127.0.0.1 --port 8000 > "$UVICORN_LOG" 2>&1 &)
+      fi
     fi
   fi
 
@@ -74,9 +97,14 @@ start_ollama() {
     echo "Pulling model: $model (this may take time)" | tee -a "$OLLAMA_LOG"
     ollama pull "$model" >> "$OLLAMA_LOG" 2>&1 || true
   fi
-  nohup ollama serve > "$OLLAMA_LOG" 2>&1 &
-  sleep 2
-  echo "Ollama served (log: $OLLAMA_LOG)"
+  if [ "$FOREGROUND" -eq 1 ]; then
+    echo "Running ollama serve in foreground (logs to stdout/stderr)"
+    exec ollama serve
+  else
+    nohup ollama serve > "$OLLAMA_LOG" 2>&1 &
+    sleep 2
+    echo "Ollama served (log: $OLLAMA_LOG)"
+  fi
 }
 
 print_usage() {
@@ -99,6 +127,7 @@ fi
 MODE_BACKEND=0
 MODE_OLLAMA=0
 OLLAMA_MODEL=""
+FOREGROUND=0
 
 while [ "$#" -gt 0 ]; do
   case "$1" in
@@ -110,6 +139,8 @@ while [ "$#" -gt 0 ]; do
       MODE_BACKEND=1; MODE_OLLAMA=1; shift;;
     --help|-h)
       print_usage; exit 0;;
+    --foreground|--fg)
+      FOREGROUND=1; shift;;
     *)
       echo "Unknown arg: $1"; print_usage; exit 1;;
   esac