Revert portg

app.py

@@ -16,6 +16,7 @@ import io
 import wave
 import asyncio
 import uvicorn
+import socket
 
 # Simplified configuration parameters
 SILENCE_THRESHS = [0, 0.4]
@@ -866,17 +867,48 @@ def create_app():
             }
         else:
             # Get Cloudflare TURN credentials
-            turn_credentials = get_cloudflare_turn_credentials(hf_token)
-            rtc_config = {
-                "iceServers": [
-                    {"urls": "stun:stun.l.google.com:19302"},
-                    {
-                        "urls": f"turn:{turn_credentials['urls'][0]}",
-                        "username": turn_credentials["username"],
-                        "credential": turn_credentials["credential"]
-                    }
-                ]
-            }
+            try:
+                turn_credentials = get_cloudflare_turn_credentials(hf_token)
+                
+                # Safely extract credentials from the response
+                ice_servers = []
+                
+                # Always add STUN server
+                ice_servers.append({"urls": "stun:stun.l.google.com:19302"})
+                
+                # Check for and add TURN server if available
+                if turn_credentials and isinstance(turn_credentials, dict):
+                    # Handle different possible structures
+                    if 'iceServers' in turn_credentials:
+                        # If credentials already have iceServers, use them directly
+                        rtc_config = turn_credentials
+                    elif 'urls' in turn_credentials and isinstance(turn_credentials['urls'], list) and turn_credentials['urls']:
+                        # Structure: {urls: [...], username: "...", credential: "..."}
+                        ice_servers.append({
+                            "urls": [f"turn:{url}" for url in turn_credentials["urls"]],
+                            "username": turn_credentials.get("username", ""),
+                            "credential": turn_credentials.get("credential", "")
+                        })
+                        rtc_config = {"iceServers": ice_servers}
+                    elif 'url' in turn_credentials:
+                        # Structure with single URL
+                        ice_servers.append({
+                            "urls": f"turn:{turn_credentials['url']}",
+                            "username": turn_credentials.get("username", ""),
+                            "credential": turn_credentials.get("credential", "")
+                        })
+                        rtc_config = {"iceServers": ice_servers}
+                    else:
+                        print("Warning: Unexpected TURN credentials format. Using STUN only.")
+                        rtc_config = {"iceServers": ice_servers}
+                else:
+                    print("Warning: Could not get TURN credentials. Using STUN only.")
+                    rtc_config = {"iceServers": ice_servers}
+            except Exception as e:
+                print(f"Warning: Error getting TURN credentials: {e}. Using STUN only.")
+                rtc_config = {
+                    "iceServers": [{"urls": "stun:stun.l.google.com:19302"}]
+                }
         
         # Create FastRTC stream
         stream = Stream(
@@ -898,6 +930,22 @@ def create_app():
     return app
 
 
+# Function to find an available port
+def find_available_port(start_port=7860, max_tries=10):
+    """Find an available port starting from start_port"""
+    for port_offset in range(max_tries):
+        port = start_port + port_offset
+        try:
+            sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            sock.bind(('0.0.0.0', port))
+            sock.close()
+            return port
+        except OSError:
+            continue
+    # If no ports are available, return a default and let the server handle the error
+    return start_port
+
+
 # Main entry point
 if __name__ == "__main__":
     # Create the app
@@ -907,6 +955,12 @@ if __name__ == "__main__":
     host = os.environ.get("HOST", "0.0.0.0")
     port = int(os.environ.get("PORT", 7860))
     
+    # Find available port if specified port is in use
+    available_port = find_available_port(port)
+    if available_port != port:
+        print(f"Port {port} is in use, using port {available_port} instead.")
+        port = available_port
+    
     print(f"""
     🎤 Real-time Speaker Diarization Server
     =====================================