Merge branch 'main' of https://huggingface.co/spaces/ffbeqwbe/DarwinChatbotFinal

app.py

@@ -1,83 +1,93 @@
+# app.py for Hugging Face Spaces (place in /home/user/app)
 import os
 import subprocess
 import sys
+import threading
 import time
 
-# Path to your main application - CORRECT PATH
+# Path to your main application
 DARWIN_APP_PATH = "/data/DarwinChatbot"
-SCRIPT_DIR = os.path.join(DARWIN_APP_PATH, "scripts")
-SCRIPT_PATH = os.path.join(SCRIPT_DIR, "app.py")
+DARWIN_SCRIPT_PATH = os.path.join(DARWIN_APP_PATH, "scripts", "app.py")
+
+def run_ollama_serve():
+    """Start Ollama’s local inference server."""
+    try:
+        print("[SPACES] Starting Ollama serve...")
+        # Launch ollama serve (will keep running)
+        proc = subprocess.Popen(
+            ["ollama", "serve"],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            text=True,
+            env=os.environ
+        )
+        # Optionally log Ollama output
+        while True:
+            line = proc.stdout.readline()
+            if not line and proc.poll() is not None:
+                break
+            if line:
+                print(f"[OLLAMA] {line.strip()}")
+        print("[SPACES] Ollama serve exited with code", proc.returncode)
+    except Exception as e:
+        print(f"[SPACES] Error launching Ollama serve: {e}")
 
 def run_nicegui_app():
-    """Run the NiceGUI app directly on port 7860"""
-    # Check if the script exists first
-    if not os.path.exists(SCRIPT_PATH):
-        print(f"[SPACES] ERROR: Script not found at {SCRIPT_PATH}")
-        print("[SPACES] Listing available files:")
-        
-        # List files in the main directory
-        print(f"Files in {DARWIN_APP_PATH}:")
-        if os.path.exists(DARWIN_APP_PATH):
-            print(os.listdir(DARWIN_APP_PATH))
-        
-        # List files in the scripts directory if it exists
-        print(f"Files in {SCRIPT_DIR}:")
-        if os.path.exists(SCRIPT_DIR):
-            print(os.listdir(SCRIPT_DIR))
-        
-        return
-    
-    # Add the paths to Python path
+    """Run the NiceGUI app directly on port 7860."""
+    # Add the Darwin app path to Python path
     sys.path.insert(0, DARWIN_APP_PATH)
-    sys.path.insert(0, SCRIPT_DIR)
-    
-    # Change to the scripts directory to ensure imports work correctly
-    os.chdir(SCRIPT_DIR)
-    
+    # Change to the app directory
+    os.chdir(DARWIN_APP_PATH)
     # Set environment variables for the NiceGUI app
     env = {
-        **os.environ, 
-        "PORT": "7860",  # Use the Hugging Face Spaces port directly
-        "HOST": "0.0.0.0",  # Listen on all interfaces
-        "NICEGUI_DISABLE_RELOAD": "1",  # Disable hot-reload
-        "NICEGUI_NO_AUTO_RELOAD": "1"   # Also try this environment variable
+        **os.environ,
+        "PORT": "7860",    # Use the Hugging Face Spaces port directly
+        "HOST": "0.0.0.0", # Listen on all interfaces
     }
-    
-    # Start the NiceGUI application
     try:
-        print(f"[SPACES] Starting NiceGUI app from {SCRIPT_PATH}")
-        
-        # Directly run the script from the scripts directory
+        print(f"[SPACES] Starting NiceGUI app from {DARWIN_SCRIPT_PATH}")
+        # Verify the script exists
+        if not os.path.exists(DARWIN_SCRIPT_PATH):
+            print(f"[SPACES] ERROR: Script not found at {DARWIN_SCRIPT_PATH}")
+            print("[SPACES] Available files in scripts directory:")
+            scripts_dir = os.path.join(DARWIN_APP_PATH, "scripts")
+            if os.path.exists(scripts_dir):
+                print(os.listdir(scripts_dir))
+            else:
+                print(f"[SPACES] Scripts directory not found at {scripts_dir}")
+            return
+
         process = subprocess.Popen(
-            [sys.executable, SCRIPT_PATH],
+            [sys.executable, DARWIN_SCRIPT_PATH],
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,
             text=True,
-            env=env,
-            cwd=SCRIPT_DIR  # Set the working directory explicitly
+            env=env
         )
-        
         print("[SPACES] Started NiceGUI app process")
-        
         # Log output from the NiceGUI app
         while True:
             output = process.stdout.readline()
             if output:
-                print(f"[APP] {output.strip()}")
+                print(f"[NiceGUI] {output.strip()}")
             if process.poll() is not None:
-                print("[SPACES] Process exited with code:", process.returncode)
+                print("[SPACES] NiceGUI process exited with code:", process.returncode)
                 break
     except Exception as e:
         print(f"[SPACES] Error starting NiceGUI app: {e}")
 
 if __name__ == "__main__":
-    print("[SPACES] Starting Darwin Chatbot application")
-    
-    # Start the app in the main thread
+    print("[SPACES] Initializing Darwin Chatbot application")
+
+    # 1) Start Ollama serve in a daemon thread
+    ollama_thread = threading.Thread(target=run_ollama_serve, daemon=True)
+    ollama_thread.start()
+
+    # 2) Then start the NiceGUI frontend (blocks until exit)
     run_nicegui_app()
-    
-    # If the app exits, keep the process alive
-    print("[SPACES] App exited, keeping container alive")
+
+    # If the NiceGUI app ever exits, keep container alive
+    print("[SPACES] NiceGUI app exited, keeping container alive")
     while True:
         time.sleep(60)
-        print("[SPACES] Container still running, waiting for restart...")
+        print("[SPACES] Container still running, waiting for restart...")