Update app.py

app.py

@@ -1,162 +1,104 @@
-from fastapi import FastAPI, Request, HTTPException
+from fastapi import FastAPI, Request
 from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import RedirectResponse, JSONResponse
-from fastapi.exceptions import RequestValidationError
+from fastapi.responses import RedirectResponse
 from api import api_router
 import gradio as gr
 import requests
 import logging
-import os
-from datetime import datetime
 
-# Configure logging
-logging.basicConfig(
-    level=logging.INFO,
-    format='%(asctime)s - %(levelname)s - %(name)s - %(message)s',
-    handlers=[
-        logging.StreamHandler(),
-        logging.FileHandler('app.log')
-    ]
-)
+logging.basicConfig(level=logging.DEBUG)
 logger = logging.getLogger(__name__)
+logger.debug("Initializing application")
 
-app = FastAPI(
-    title="Medical EHR System",
-    description="Electronic Health Records Management API",
-    version="1.0.0",
-    docs_url="/docs",
-    redoc_url="/redoc"
-)
+app = FastAPI()
 
-# CORS Configuration
+# CORS
 app.add_middleware(
     CORSMiddleware,
     allow_origins=["*"],
     allow_credentials=True,
     allow_methods=["*"],
     allow_headers=["*"],
-    expose_headers=["*"]
 )
 
-# Include API routes
-app.include_router(api_router, prefix="/api/v1")
+app.include_router(api_router)
 
 @app.get("/")
-async def root():
-    logger.info("Root endpoint accessed")
-    return {"message": "🚀 FastAPI with MongoDB + JWT is running", "status": "healthy"}
+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(f"Redirecting /login to /auth/login from {request.client.host}")
-    return RedirectResponse(url="/auth/login", status_code=status.HTTP_307_TEMPORARY_REDIRECT)
-
-@app.exception_handler(RequestValidationError)
-async def validation_exception_handler(request: Request, exc: RequestValidationError):
-    logger.error(f"Validation error: {exc.errors()}")
-    return JSONResponse(
-        status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
-        content={"detail": exc.errors(), "body": exc.body},
-    )
-
-@app.exception_handler(HTTPException)
-async def http_exception_handler(request: Request, exc: HTTPException):
-    logger.error(f"HTTP error: {exc.detail}")
-    return JSONResponse(
-        status_code=exc.status_code,
-        content={"detail": exc.detail},
-        headers=exc.headers
-    )
-
-@app.exception_handler(Exception)
-async def general_exception_handler(request: Request, exc: Exception):
-    logger.error(f"Unhandled exception: {str(exc)}", exc_info=True)
-    return JSONResponse(
-        status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-        content={"detail": "Internal server error"},
-    )
+    logger.info("Redirecting /login to /auth/login")
+    return RedirectResponse(url="/auth/login", status_code=307)
 
-# Gradio Interface Configuration
-BACKEND_URL = os.getenv("BACKEND_URL", "http://localhost:8000")
+# Gradio doctor creation logic
+BACKEND_URL = "https://rocketfarmstudios-cps-api.hf.space"
 
-def create_doctor(full_name: str, email: str, matricule: str, password: str, specialty: str):
+def create_doctor(full_name, email, matricule, password, specialty):
+    payload = {
+        "full_name": full_name,
+        "email": email,
+        "license_number": matricule,
+        "password": password,
+        "specialty": specialty,
+    }
     try:
-        payload = {
-            "full_name": full_name,
-            "email": email,
-            "license_number": matricule,
-            "password": password,
-            "specialty": specialty,
-        }
-        
-        logger.info(f"Attempting to create doctor: {email}")
-        response = requests.post(
-            f"{BACKEND_URL}/auth/admin/doctors",
-            json=payload,
-            headers={"Content-Type": "application/json"},
-            timeout=10
-        )
-        
-        if response.status_code == 201:
-            logger.info(f"Successfully created doctor: {email}")
+        res = requests.post(f"{BACKEND_URL}/auth/admin/doctors", json=payload)
+        if res.status_code == 201:
             return "✅ Doctor created successfully!"
-        else:
-            error_msg = response.json().get("detail", "Unknown error occurred")
-            logger.error(f"Failed to create doctor {email}: {error_msg}")
-            return f"❌ Error: {error_msg}"
-            
-    except requests.exceptions.RequestException as e:
-        logger.error(f"Network error during doctor creation: {str(e)}")
-        return f"❌ Network Error: {str(e)}"
+        return f"❌ {res.json().get('detail', 'Error occurred')}"
     except Exception as e:
-        logger.error(f"Unexpected error during doctor creation: {str(e)}")
-        return f"❌ Unexpected Error: {str(e)}"
+        return f"❌ Network Error: {str(e)}"
+
+# Define Gradio interface as a separate function
+def setup_gradio():
+    logger.debug("Setting up Gradio interface")
+    with gr.Blocks(css="""
+        .gradio-container {
+            background-color: #1A1B1F;
+            color: #E2E8F0;
+            font-family: 'Segoe UI', sans-serif;
+            padding: 3rem;
+        }
+        .title-text { text-align: center; font-size: 2rem; font-weight: 700; color: #37B6E9; margin-bottom: 0.5rem; }
+        .description-text { text-align: center; font-size: 1rem; color: #A0AEC0; margin-bottom: 2rem; }
+        .gr-box, .gr-form, .gr-column, .gr-panel { background-color: #2D2F36 !important; border-radius: 16px !important; padding: 2rem !important; max-width: 600px; margin: auto; box-shadow: 0 0 0 1px #3B3E47; }
+        label { font-weight: 600; color: #F7FAFC; margin-bottom: 6px; }
+        input, select, textarea { background-color: #1A1B1F !important; color: #F7FAFC !important; border: 1px solid #4A5568 !important; font-size: 14px; padding: 10px; border-radius: 10px; }
+        button { background-color: #37B6E9 !important; color: #1A1B1F !important; border-radius: 10px !important; font-weight: 600; padding: 12px; width: 100%; margin-top: 1.5rem; }
+        .output-box textarea { background-color: transparent !important; border: none; color: #90CDF4; font-size: 14px; margin-top: 1rem; }
+    """) as admin_ui:
+        gr.Markdown("<div class='title-text'>👨‍⚕️ Doctor Account Creator</div>")
+        gr.Markdown("<div class='description-text'>Admins can register new doctors using this secure panel. Generated at 03:43 PM CET on Saturday, May 17, 2025.</div>")
 
-def setup_gradio_interface():
-    with gr.Blocks(
-        title="Doctor Management Portal",
-        css="""
-        .gradio-container { max-width: 800px; margin: 0 auto; }
-        .success { color: #4CAF50; }
-        .error { color: #F44336; }
-        """
-    ) as interface:
-        gr.Markdown("# 👨‍⚕️ Doctor Account Management")
-        
-        with gr.Row():
-            with gr.Column():
-                full_name = gr.Textbox(label="Full Name", placeholder="Dr. John Smith")
-                email = gr.Textbox(label="Email", placeholder="doctor@hospital.org")
-                matricule = gr.Textbox(label="License Number", placeholder="MD-12345")
-                specialty = gr.Dropdown(
-                    label="Specialty",
-                    choices=["Cardiology", "Neurology", "Pediatrics", "General Practice"],
-                    value="General Practice"
-                )
-                password = gr.Textbox(label="Password", type="password")
-                submit_btn = gr.Button("Create Doctor Account", variant="primary")
-                
-            with gr.Column():
-                output = gr.Textbox(label="Result", interactive=False)
-                
-        submit_btn.click(
-            fn=create_doctor,
-            inputs=[full_name, email, matricule, specialty, password],
-            outputs=output
-        )
-        
-    return interface
+        with gr.Column():
+            full_name = gr.Textbox(label="Full Name", placeholder="e.g. Dr. Sarah Hopkins")
+            email = gr.Textbox(label="Email", placeholder="e.g. doctor@clinic.org")
+            matricule = gr.Textbox(label="Matricule", placeholder="e.g. DOC-1234")
+            specialty = gr.Dropdown(
+                label="Specialty",
+                choices=["Cardiology", "Neurology", "Pediatrics", "Oncology", "General Practice", "Psychiatry", "Dermatology", "Orthopedics"],
+                value="Cardiology"
+            )
+            password = gr.Textbox(label="Password", type="password", placeholder="Secure password")
+            submit_btn = gr.Button("Create Doctor Account")
+            output = gr.Textbox(label="", show_label=False, elem_classes=["output-box"])
 
-# Mount Gradio interface
-gradio_ui = setup_gradio_interface()
-app = gr.mount_gradio_app(app, gradio_ui, path="/admin")
+            submit_btn.click(
+                fn=create_doctor,
+                inputs=[full_name, email, matricule, specialty, password],
+                outputs=output
+            )
+    return admin_ui
 
+# Mount Gradio at /admin
 if __name__ == "__main__":
+    logger.debug("Running main block")
+    admin_ui = setup_gradio()
+    app = gr.mount_gradio_app(app, admin_ui, path="/admin")
+    logger.debug("Gradio mounted, starting app")
     import uvicorn
-    uvicorn.run(
-        app,
-        host="0.0.0.0",
-        port=int(os.getenv("PORT", 8000)),
-        log_level="info",
-        reload=True
-    )
+    uvicorn.run(app, host="0.0.0.0", port=7860)  # Hugging Face Spaces default port