Update main.py

main.py

@@ -2,9 +2,9 @@ import os
 import threading
 import uvicorn
 import subprocess
+import time
 import signal
 import sys
-import time
 from api import app as fastapi_app
 
 # Set environment variables for Streamlit
@@ -14,39 +14,66 @@ os.environ["STREAMLIT_SERVER_PORT"] = "8501"
 os.environ["STREAMLIT_SERVER_ADDRESS"] = "0.0.0.0"
 os.environ["STREAMLIT_GLOBAL_DISABLE_WATCHDOG_WARNING"] = "true"
 
-def run_fastapi():
-    """Run FastAPI server"""
-    # Get port from environment or use default
-    fastapi_port = int(os.getenv('FASTAPI_PORT', 7861))
-    
-    # Try different ports if specified port is busy
-    ports_to_try = [fastapi_port, 8000, 8080, 3000, 5000, 9000, 9001, 9002]
+# Global variables to track processes
+fastapi_process = None
+streamlit_process = None
+
+def cleanup_processes():
+    """Clean up any existing processes"""
+    print("🧹 Cleaning up existing processes...")
+    os.system("pkill -f 'uvicorn'")
+    os.system("pkill -f 'streamlit'")
+    time.sleep(2)
+
+def signal_handler(signum, frame):
+    """Handle shutdown signals"""
+    print(f"\n⚠️  Received signal {signum}, shutting down...")
+    cleanup_processes()
+    sys.exit(0)
+
+def find_free_port(start_port, max_attempts=10):
+    """Find a free port starting from start_port"""
+    import socket
     
-    for port in ports_to_try:
+    for port in range(start_port, start_port + max_attempts):
         try:
-            print(f"🚀 Trying to start FastAPI on port {port}...")
-            uvicorn.run(
-                fastapi_app, 
-                host="0.0.0.0", 
-                port=port, 
-                log_level="info",
-                access_log=False  # Reduce log noise
-            )
-            break
-        except OSError as e:
-            if "Address already in use" in str(e):
-                print(f"⚠️  Port {port} is busy, trying next...")
-                continue
-            else:
-                print(f"❌ Error starting FastAPI on port {port}: {e}")
-                continue
-    else:
-        print("❌ No available ports found for FastAPI!")
-        sys.exit(1)
+            with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+                s.bind(('', port))
+                return port
+        except OSError:
+            continue
+    return None
+
+def run_fastapi():
+    """Run FastAPI server"""
+    try:
+        # Find a free port for FastAPI
+        fastapi_port = find_free_port(7861)
+        if not fastapi_port:
+            fastapi_port = find_free_port(8000)
+        
+        if not fastapi_port:
+            print("❌ No free ports found for FastAPI!")
+            return
+            
+        print(f"🚀 Starting FastAPI on port {fastapi_port}...")
+        uvicorn.run(
+            fastapi_app, 
+            host="0.0.0.0", 
+            port=fastapi_port, 
+            log_level="warning",  # Reduce log verbosity
+            access_log=False
+        )
+    except Exception as e:
+        print(f"❌ FastAPI error: {e}")
 
 def run_streamlit():
     """Run Streamlit app"""
     try:
+        # Wait a bit for FastAPI to start
+        time.sleep(3)
+        
+        print("🖥️  Starting Streamlit dashboard...")
         subprocess.run([
             "streamlit", "run", "app.py",
             "--server.port=8501",
@@ -55,57 +82,59 @@ def run_streamlit():
             "--global.disableWatchdogWarning=true",
             "--server.enableCORS=false",
             "--server.enableXsrfProtection=false",
-            "--global.suppressDeprecationWarnings=true"
-        ], check=True)
-    except subprocess.CalledProcessError as e:
-        print(f"❌ Error starting Streamlit: {e}")
-        sys.exit(1)
-
-def signal_handler(signum, frame):
-    """Handle shutdown signals"""
-    print(f"\n⚠️  Received signal {signum}, shutting down services...")
-    sys.exit(0)
+            "--browser.gatherUsageStats=false"
+        ])
+    except Exception as e:
+        print(f"❌ Streamlit error: {e}")
 
 if __name__ == "__main__":
-    # Set up signal handlers
+    # Only set up signal handlers in main thread
     signal.signal(signal.SIGINT, signal_handler)
     signal.signal(signal.SIGTERM, signal_handler)
     
     print("🚀 Starting GitHub Activity Feed...")
-    print("📡 FastAPI webhook server will start on available port")
-    print("🖥️  Streamlit dashboard will run on port 8501")
     
-    # Add a small delay to prevent rapid restarts
-    time.sleep(2)
-    
-    # Create threads for both services
-    fastapi_thread = threading.Thread(target=run_fastapi, daemon=True, name="FastAPI")
-    streamlit_thread = threading.Thread(target=run_streamlit, daemon=True, name="Streamlit")
-
-    # Start FastAPI first
-    fastapi_thread.start()
-    time.sleep(3)  # Give FastAPI time to start
+    # Clean up any existing processes first
+    cleanup_processes()
     
-    # Then start Streamlit
-    streamlit_thread.start()
+    print("📡 Starting FastAPI webhook server...")
+    print("🖥️  Starting Streamlit dashboard...")
     
-    print("✅ Both services started successfully!")
-
-    # Keep the main thread alive
     try:
+        # Create threads for both services
+        fastapi_thread = threading.Thread(target=run_fastapi, daemon=True)
+        streamlit_thread = threading.Thread(target=run_streamlit, daemon=True)
+
+        # Start FastAPI first
+        fastapi_thread.start()
+        
+        # Wait a bit then start Streamlit
+        time.sleep(5)
+        streamlit_thread.start()
+        
+        print("✅ Both services started successfully!")
+        print("📡 FastAPI webhook available")
+        print("🖥️  Streamlit dashboard available on port 8501")
+
+        # Keep the main thread alive and monitor services
         while True:
             if not fastapi_thread.is_alive():
-                print("❌ FastAPI thread died, restarting...")
-                fastapi_thread = threading.Thread(target=run_fastapi, daemon=True, name="FastAPI")
+                print("⚠️  FastAPI thread died, restarting...")
+                fastapi_thread = threading.Thread(target=run_fastapi, daemon=True)
                 fastapi_thread.start()
             
             if not streamlit_thread.is_alive():
-                print("❌ Streamlit thread died, restarting...")
-                streamlit_thread = threading.Thread(target=run_streamlit, daemon=True, name="Streamlit")
+                print("⚠️  Streamlit thread died, restarting...")
+                streamlit_thread = threading.Thread(target=run_streamlit, daemon=True)
                 streamlit_thread.start()
             
-            time.sleep(10)  # Check every 10 seconds
+            time.sleep(30)  # Check every 30 seconds
             
     except KeyboardInterrupt:
-        print("\n⚠️  Shutting down services...")
-        sys.exit(0)
+        print("\n⚠️  Received interrupt signal...")
+        cleanup_processes()
+        sys.exit(0)
+    except Exception as e:
+        print(f"❌ Unexpected error: {e}")
+        cleanup_processes()
+        sys.exit(1)