Update app.py

app.py

@@ -16,9 +16,14 @@ from starlette.config import Config
 from authlib.integrations.starlette_client import OAuth, OAuthError
 
 # Import our modular components
-from config.settings import settings
-from api.client import api_client
-from components.verification_result import format_verification_results
+try:
+    from config.settings import settings
+    from api.client import api_client
+    from components.verification_result import format_verification_results
+except Exception as e:
+    print(f"ERROR: Failed to import required modules: {e}")
+    print("Please ensure all environment variables are set correctly.")
+    raise
 
 # Create FastAPI app
 app = FastAPI(title="DGaze - News Verification")
@@ -143,8 +148,17 @@ def public(user: str = Depends(get_user), request: Request = None):
 
 @app.route('/login')
 async def login(request: Request):
-    # Use root URL as redirect_uri to match React app pattern
-    redirect_uri = f"http://localhost:{settings.GRADIO_SERVER_PORT}/"
+    # Use root URL as redirect_uri - adapt for Spaces or local
+    if settings.GRADIO_SERVER_NAME == "0.0.0.0" and settings.GRADIO_SERVER_PORT == 7860:
+        # Running on Hugging Face Spaces - use the current request's URL
+        redirect_uri = str(request.base_url).rstrip('/')
+        if not redirect_uri.startswith('https://'):
+            redirect_uri = redirect_uri.replace('http://', 'https://')
+    else:
+        # Running locally
+        redirect_uri = f"http://localhost:{settings.GRADIO_SERVER_PORT}/"
+    
+    print(f"DEBUG: Login redirect_uri: {redirect_uri}")
     return await oauth.auth0.authorize_redirect(request, redirect_uri)
 
 @app.route('/logout')
@@ -158,13 +172,26 @@ async def logout(request: Request):
     
     request.session.pop('user', None)
     request.session.pop('session_id', None)
+    
+    # Determine return URL for Spaces or local
+    if settings.GRADIO_SERVER_NAME == "0.0.0.0" and settings.GRADIO_SERVER_PORT == 7860:
+        # Running on Hugging Face Spaces - use the current request's URL
+        return_url = str(request.base_url).rstrip('/')
+        if not return_url.startswith('https://'):
+            return_url = return_url.replace('http://', 'https://')
+    else:
+        # Running locally
+        return_url = f"http://localhost:{settings.GRADIO_SERVER_PORT}/"
+    
+    print(f"DEBUG: Logout return_url: {return_url}")
+    
     return RedirectResponse(url=
         "https://"
         + settings.AUTH0_DOMAIN
         + "/v2/logout?"
         + urlencode(
             {
-                "returnTo": f"http://localhost:{settings.GRADIO_SERVER_PORT}/",
+                "returnTo": return_url,
                 "client_id": settings.AUTH0_CLIENT_ID,
             },
             quote_via=quote_plus,
@@ -893,17 +920,17 @@ def create_main_interface():
     
     return demo
 
+# Create interfaces
+trial_demo = create_trial_interface()
+login_demo = create_login_interface()
+main_demo = create_main_interface()
+
+# Mount Gradio apps
+gr.mount_gradio_app(app, trial_demo, path="/trial")
+gr.mount_gradio_app(app, login_demo, path="/login-page")
+gr.mount_gradio_app(app, main_demo, path="/demo")
+
 if __name__ == "__main__":
-    # Create interfaces
-    trial_demo = create_trial_interface()
-    login_demo = create_login_interface()
-    main_demo = create_main_interface()
-    
-    # Mount Gradio apps
-    gr.mount_gradio_app(app, trial_demo, path="/trial")
-    gr.mount_gradio_app(app, login_demo, path="/login-page")
-    gr.mount_gradio_app(app, main_demo, path="/demo")
-    
     # Run the application
     uvicorn.run(
         app,