Update app.py

app.py

@@ -6,6 +6,7 @@ import gradio as gr
 import requests
 import logging
 import time
+from typing import Optional
 
 # Configure logging
 logging.basicConfig(level=logging.DEBUG)
@@ -32,14 +33,13 @@ ADMIN_PASSWORD = "123456"
 MAX_TOKEN_RETRIES = 3
 TOKEN_RETRY_DELAY = 2  # seconds
 
-# Global token storage with refresh capability
 class TokenManager:
     def __init__(self):
-        self.token = None
-        self.last_obtained = 0
-        self.token_expiry = 3600  # 1 hour default expiry
+        self.token: Optional[str] = None
+        self.last_obtained: float = 0
+        self.token_expiry: int = 3600  # 1 hour default expiry
 
-    def get_token(self, force_refresh=False):
+    def get_token(self, force_refresh: bool = False) -> str:
         current_time = time.time()
         
         if not force_refresh and self.token and (current_time - self.last_obtained) < self.token_expiry:
@@ -54,12 +54,22 @@ class TokenManager:
                 }
                 
                 logger.debug(f"Attempting to obtain admin token (attempt {attempt + 1})")
+                
+                # Ensure proper headers for JSON content
+                headers = {
+                    "Content-Type": "application/json",
+                    "Accept": "application/json"
+                }
+                
                 res = requests.post(
                     f"{BACKEND_URL}/auth/login",
-                    json=login_payload,
+                    json=login_payload,  # Using json parameter automatically sets content-type
+                    headers=headers,
                     timeout=10
                 )
                 
+                logger.debug(f"Response status: {res.status_code}, content: {res.text}")
+                
                 if res.status_code == 200:
                     token_data = res.json()
                     self.token = token_data.get("access_token")
@@ -67,17 +77,23 @@ class TokenManager:
                         raise Exception("No access_token in response")
                     
                     self.last_obtained = current_time
-                    # Get expiry from token if available, otherwise use default
                     self.token_expiry = token_data.get("expires_in", 3600)
                     logger.info("Successfully obtained admin token")
                     return self.token
                 
                 logger.error(f"Token request failed: {res.status_code} - {res.text}")
+                if res.status_code == 422:
+                    raise Exception(f"Validation error: {res.json().get('detail', 'Unknown validation error')}")
                 if res.status_code == 401:
                     raise Exception("Invalid admin credentials")
                     
             except requests.exceptions.RequestException as e:
                 logger.error(f"Network error during token fetch: {str(e)}")
+                if attempt < MAX_TOKEN_RETRIES - 1:
+                    time.sleep(TOKEN_RETRY_DELAY * (attempt + 1))  # Exponential backoff
+                continue
+            except Exception as e:
+                logger.error(f"Unexpected error during token fetch: {str(e)}")
                 if attempt < MAX_TOKEN_RETRIES - 1:
                     time.sleep(TOKEN_RETRY_DELAY)
                 continue
@@ -86,29 +102,24 @@ class TokenManager:
 
 token_manager = TokenManager()
 
-# Root endpoint
 @app.get("/")
 def root():
     logger.debug("Root endpoint accessed")
     return {"message": "🚀 FastAPI with MongoDB + JWT is running."}
 
-# Redirect /login to /auth/login
 @app.post("/login")
 async def redirect_login(request: Request):
     logger.info("Redirecting /login to /auth/login")
     return RedirectResponse(url="/auth/login", status_code=307)
 
-# Admin authentication logic
 def authenticate_admin(email: str = None, password: str = None):
     if email != ADMIN_EMAIL or password != ADMIN_PASSWORD:
         logger.warning(f"Failed admin login attempt with email: {email}")
         raise HTTPException(status_code=401, detail="Unauthorized: Invalid email or password")
-    
     logger.info(f"Admin authenticated successfully: {email}")
     return True
 
-# Doctor creation with token handling
-def create_doctor(full_name, email, matricule, password, specialty):
+def create_doctor(full_name: str, email: str, matricule: str, password: str, specialty: str) -> str:
     try:
         token = token_manager.get_token()
         
@@ -119,6 +130,7 @@ def create_doctor(full_name, email, matricule, password, specialty):
             "password": password,
             "specialty": specialty,
         }
+        
         headers = {
             "Authorization": f"Bearer {token}",
             "Content-Type": "application/json"
@@ -146,7 +158,7 @@ def create_doctor(full_name, email, matricule, password, specialty):
             if res.status_code == 201:
                 return "✅ Doctor created successfully!"
         
-        error_detail = res.json().get('detail', 'Unknown error occurred')
+        error_detail = res.json().get('detail', res.text)
         return f"❌ Error: {error_detail} (Status: {res.status_code})"
         
     except requests.exceptions.RequestException as e:
@@ -154,7 +166,6 @@ def create_doctor(full_name, email, matricule, password, specialty):
     except Exception as e:
         return f"❌ System Error: {str(e)}"
 
-# Gradio interface
 admin_ui = gr.Blocks(css="""
     .gradio-container {
         background-color: #1A1B1F;
@@ -195,10 +206,8 @@ with admin_ui:
             outputs=output
         )
 
-# Mount Gradio interface
 app = gr.mount_gradio_app(app, admin_ui, path="/admin-auth")
 
-# Admin dashboard route
 @app.get("/admin")
 async def admin_dashboard(email: str = None, password: str = None, response: Response = None):
     logger.debug("Admin dashboard accessed")