Rename startup-hf.sh to start_hf.py

start_hf.py

@@ -0,0 +1,135 @@
+#!/usr/bin/env python3
+"""
+HuggingFace Spaces Startup Script
+Handles bot and server startup with proper port management
+"""
+import os
+import sys
+import time
+import signal
+import socket
+import subprocess
+from pathlib import Path
+
+PORT = int(os.environ.get("PORT", 7860))
+
+def is_port_in_use(port):
+    """Check if a port is in use"""
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+        return s.connect_ex(('localhost', port)) == 0
+
+def kill_port_process(port):
+    """Kill process using a specific port"""
+    try:
+        # Try fuser first
+        result = subprocess.run(
+            f"fuser -k {port}/tcp",
+            shell=True,
+            capture_output=True,
+            timeout=5
+        )
+        if result.returncode == 0:
+            print(f"✅ Killed process on port {port} using fuser")
+            return True
+    except:
+        pass
+    
+    try:
+        # Try lsof
+        result = subprocess.run(
+            f"lsof -t -i:{port}",
+            shell=True,
+            capture_output=True,
+            timeout=5
+        )
+        if result.returncode == 0:
+            pids = result.stdout.decode().strip().split('\n')
+            for pid in pids:
+                if pid:
+                    os.kill(int(pid), signal.SIGKILL)
+            print(f"✅ Killed process(es) on port {port} using lsof")
+            return True
+    except:
+        pass
+    
+    return False
+
+def start_bot():
+    """Start the Ultroid bot in background"""
+    print("🤖 Starting Ultroid bot...")
+    
+    if os.environ.get("SESSION1"):
+        bot_process = subprocess.Popen(
+            [sys.executable, "multi_client.py"],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE
+        )
+    else:
+        bot_process = subprocess.Popen(
+            [sys.executable, "-m", "pyUltroid"],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE
+        )
+    
+    print(f"✅ Bot started with PID: {bot_process.pid}")
+    return bot_process
+
+def start_server(port):
+    """Start the FastAPI server"""
+    print(f"🚀 Starting API server on port {port}...")
+    
+    # Import and run server
+    os.environ["PORT"] = str(port)
+    
+    # Run server.py directly
+    subprocess.run([sys.executable, "server.py"])
+
+def main():
+    print("=" * 50)
+    print("🚀 Ultroid HuggingFace Startup (Python)")
+    print("=" * 50)
+    
+    # Change to repo directory
+    repo_dir = Path("/app/repo")
+    if repo_dir.exists():
+        os.chdir(repo_dir)
+        print(f"📂 Working directory: {repo_dir}")
+    else:
+        print(f"❌ Repo directory not found: {repo_dir}")
+        sys.exit(1)
+    
+    # Check if port is in use
+    if is_port_in_use(PORT):
+        print(f"⚠️  Port {PORT} is already in use!")
+        print(f"🧹 Attempting to free port {PORT}...")
+        
+        if kill_port_process(PORT):
+            time.sleep(2)
+            if is_port_in_use(PORT):
+                print(f"❌ Failed to free port {PORT}")
+                sys.exit(1)
+        else:
+            print(f"⚠️  Could not kill process on port {PORT}")
+    else:
+        print(f"✅ Port {PORT} is available")
+    
+    # Start bot in background
+    bot_process = start_bot()
+    
+    # Wait for bot to initialize
+    print("⏳ Waiting for bot to initialize...")
+    time.sleep(5)
+    
+    # Check port one more time before starting server
+    if is_port_in_use(PORT):
+        print(f"❌ Port {PORT} was taken while bot was starting!")
+        kill_port_process(PORT)
+        time.sleep(2)
+    
+    # Start server (blocks here)
+    print(f"📊 Dashboard will be available on port {PORT}")
+    print("=" * 50)
+    start_server(PORT)
+
+if __name__ == "__main__":
+    main()

startup-hf.sh

@@ -1,40 +0,0 @@
-#!/usr/bin/env bash
-# HuggingFace startup script for Ultroid with Dashboard
-
-echo "
-            ┏┳┓╋┏┓╋╋╋╋┏┓┏┓
-            ┃┃┣┓┃┗┳┳┳━╋╋┛┃
-            ┃┃┃┗┫┏┫┏┫╋┃┃╋┃
-            ┗━┻━┻━┻┛┗━┻┻━┛
-
-      Visit @TheUltroid for updates!!
-      Dashboard enabled on port 7860
-"
-
-# Fix DNS for HuggingFace
-if [ -w /etc/resolv.conf ]; then
-    echo "nameserver 1.1.1.1" > /etc/resolv.conf
-    echo "nameserver 1.0.0.1" >> /etc/resolv.conf
-fi
-
-# Load environment variables if .env exists
-if [ -f .env ] ; then  
-    set -o allexport
-    source .env
-    set +o allexport
-fi
-
-# Start the bot in background
-echo "🤖 Starting Ultroid bot..."
-if [ $SESSION1 ] ; then 
-    python3 multi_client.py & 
-else 
-    python3 -m pyUltroid & 
-fi
-
-# Wait a bit for bot to initialize
-sleep 5
-
-# Start the API server (serves dashboard + API endpoints)
-echo "🚀 Starting API server with dashboard on port ${PORT:-7860}..."
-python3 server.py