Update app.py

app.py

@@ -1,4 +1,4 @@
-# app.py — Multimodal API + Gradio UI with automatic free port selection
+# app.py — Full multimodal FastAPI + Gradio with auto free port pick
 import os
 import shutil
 import asyncio
@@ -11,18 +11,16 @@ from fastapi.middleware.cors import CORSMiddleware
 import gradio as gr
 import uvicorn
 
-# ------------------- Import your multimodal module -------------------
 from multimodal_module import MultiModalChatModule
 AI = MultiModalChatModule()
 
-# ------------------- Helpers -------------------
 TMP_DIR = "/tmp"
 os.makedirs(TMP_DIR, exist_ok=True)
 
+# --- Helpers ---
 class FileWrapper:
     def __init__(self, path: str):
         self._path = path
-
     async def download_to_drive(self, dst_path: str) -> None:
         loop = asyncio.get_event_loop()
         await loop.run_in_executor(None, shutil.copyfile, self._path, dst_path)
@@ -43,37 +41,18 @@ async def call_ai(fn, *args, **kwargs):
         return await fn(*args, **kwargs)
     return await asyncio.to_thread(lambda: fn(*args, **kwargs))
 
-def find_free_port(start_port=7860, max_tries=50):
-    """Find an available port starting from start_port."""
-    port = start_port
-    for _ in range(max_tries):
-        with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-            if s.connect_ex(("0.0.0.0", port)) != 0:
-                return port
-        port += 1
-    raise OSError("No free port found")
-
-# ------------------- FastAPI -------------------
+# --- FastAPI app ---
 app = FastAPI(title="Multimodal Module API")
 
-# Allow all origins (adjust for production)
 app.add_middleware(
     CORSMiddleware,
-    allow_origins=["*"],
+    allow_origins=["*"],  # Change this in production!
     allow_credentials=True,
     allow_methods=["*"],
     allow_headers=["*"],
 )
 
-# ------------------- API Endpoints -------------------
-@app.post("/api/predict")
-async def api_predict(inputs: str = Form(...), user_id: Optional[int] = Form(0), lang: str = Form("en")):
-    try:
-        fn = getattr(AI, "generate_response", getattr(AI, "process_text", None))
-        reply = await call_ai(fn, inputs, int(user_id), lang)
-        return {"data": [reply]}
-    except Exception as e:
-        return JSONResponse({"error": str(e)}, status_code=500)
+# --- API Endpoints ---
 
 @app.post("/api/text")
 async def api_text(text: str = Form(...), user_id: Optional[int] = Form(0), lang: str = Form("en")):
@@ -114,7 +93,13 @@ async def api_image_caption(user_id: Optional[int] = Form(0), image_file: Upload
         return JSONResponse({"error": str(e)}, status_code=500)
 
 @app.post("/api/generate_image")
-async def api_generate_image(user_id: Optional[int] = Form(0), prompt: str = Form(...), width: int = Form(512), height: int = Form(512), steps: int = Form(30)):
+async def api_generate_image(
+    user_id: Optional[int] = Form(0),
+    prompt: str = Form(...),
+    width: int = Form(512),
+    height: int = Form(512),
+    steps: int = Form(30)
+):
     try:
         fn = getattr(AI, "generate_image_from_text", None)
         out_path = await call_ai(fn, prompt, int(user_id), width, height, steps)
@@ -123,14 +108,25 @@ async def api_generate_image(user_id: Optional[int] = Form(0), prompt: str = For
         return JSONResponse({"error": str(e)}, status_code=500)
 
 @app.post("/api/edit_image")
-async def api_edit_image(user_id: Optional[int] = Form(0), image_file: UploadFile = File(...), mask_file: Optional[UploadFile] = File(None), prompt: str = Form("")):
+async def api_edit_image(
+    user_id: Optional[int] = Form(0),
+    image_file: UploadFile = File(...),
+    mask_file: Optional[UploadFile] = File(None),
+    prompt: str = Form("")
+):
     try:
         img_path = await save_upload_to_tmp(image_file)
         mask_path = None
         if mask_file:
             mask_path = await save_upload_to_tmp(mask_file)
         fn = getattr(AI, "edit_image_inpaint", None)
-        out_path = await call_ai(fn, FileWrapper(img_path), FileWrapper(mask_path) if mask_path else None, prompt, int(user_id))
+        out_path = await call_ai(
+            fn,
+            FileWrapper(img_path),
+            FileWrapper(mask_path) if mask_path else None,
+            prompt,
+            int(user_id)
+        )
         return {"status": "ok", "file": out_path}
     except Exception as e:
         return JSONResponse({"error": str(e)}, status_code=500)
@@ -167,7 +163,7 @@ async def api_code(user_id: Optional[int] = Form(0), prompt: str = Form(...), ma
     except Exception as e:
         return JSONResponse({"error": str(e)}, status_code=500)
 
-# ------------------- Gradio UI -------------------
+# --- Gradio UI ---
 def gradio_text_fn(text, user_id, lang):
     fn = getattr(AI, "generate_response", getattr(AI, "process_text", None))
     if fn is None:
@@ -178,17 +174,22 @@ def gradio_text_fn(text, user_id, lang):
 with gr.Blocks(title="Multimodal Bot (UI)") as demo:
     gr.Markdown("# 🧠 Multimodal Bot — UI")
     with gr.Row():
-        txt_uid = gr.Textbox(label="User ID", value="0")
-        txt_lang = gr.Dropdown(["en","zh","ja","ko","es","fr","de","it"], value="en", label="Language")
+        uid = gr.Textbox(label="User ID", value="0")
+        lang = gr.Dropdown(["en", "zh", "ja", "ko", "es", "fr", "de", "it"], value="en", label="Language")
     inp = gr.Textbox(lines=3, label="Message")
     out = gr.Textbox(lines=6, label="Reply")
-    gr.Button("Send").click(gradio_text_fn, [inp, txt_uid, txt_lang], out)
+    gr.Button("Send").click(gradio_text_fn, [inp, uid, lang], out)
 
-# Mount Gradio app into FastAPI
 app = gr.mount_gradio_app(app, demo, path="/")
 
-# ------------------- Run -------------------
+# --- Auto free port finder ---
+def get_free_port():
+    s = socket.socket()
+    s.bind(("", 0))
+    port = s.getsockname()[1]
+    s.close()
+    return port
+
 if __name__ == "__main__":
-    port = int(os.environ.get("PORT", find_free_port()))
-    print(f"🚀 Starting server on port {port}")
-    uvicorn.run("app:app", host="0.0.0.0", port=port, reload=False)
+    port = int(os.environ.get("PORT", get_free_port()))
+    uvicorn.run("app:app", host="0.0.0.0", port=port)