UI fixing

app.py

@@ -22,9 +22,10 @@ UPLOAD_DIR = "/tmp/uploads/"
 JSON_DIR = "/tmp/results/"
 OUTPUT_DIR = "/tmp/output/"
 MODEL_DIR = os.path.join(BASE_DIR, "rcnn_model", "scripts")
-logo_path = os.path.join(BASE_DIR, "public", "logo.png")  # Your Inovonics image
+logo_path = os.path.join(BASE_DIR, "public", "logo.png")
 model_path = os.path.join(OUTPUT_DIR, "model_final.pth")
 
+# Google Drive model
 GOOGLE_DRIVE_FILE_ID = "1yr64AOgaYZPTcQzG6cxG6lWBENHR9qjW"
 GDRIVE_URL = f"https://drive.google.com/uc?id={GOOGLE_DRIVE_FILE_ID}"
 
@@ -55,55 +56,72 @@ cfg = write_config()
 def predict(uploaded_file_path):
     print("Inside Predict:" + uploaded_file_path)
     if uploaded_file_path is None:
-        return None, None, None, "No file uploaded."
+        return None, None, "No file uploaded.", None
 
+    # Save uploaded file to temp
     uploaded_path = os.path.join(UPLOAD_DIR, "input_image.png")
     shutil.copy(uploaded_file_path, uploaded_path)
 
     input_filename = "input_image.png"
 
-    output_json_name = input_filename.replace(".png", "_result.json")
-    output_image_name = input_filename.replace(".png", "_result.png")
+    output_json_name = input_filename.replace(".png", "_result.json").replace(".jpg", "_result.json").replace(".jpeg", "_result.json")
+    output_image_name = input_filename.replace(".png", "_result.png").replace(".jpg", "_result.png").replace(".jpeg", "_result.png")
 
     output_json_path = os.path.join(JSON_DIR, output_json_name)
     output_image_path = os.path.join(JSON_DIR, output_image_name)
 
-    main(cfg, uploaded_file_path, output_json_name, output_image_name)
+    # Run model
+    main(cfg, uploaded_path, output_json_name, output_image_name)
 
+    # Read outputs
     result_img = Image.open(output_image_path) if os.path.exists(output_image_path) else None
     result_json = {}
     if os.path.exists(output_json_path):
         with open(output_json_path, "r") as jf:
             result_json = json.load(jf)
 
-    return uploaded_path, result_img, json.dumps(result_json, indent=2), output_json_path
+    # Save JSON to file for download
+    download_json_path = os.path.join(JSON_DIR, "output_for_download.json")
+    with open(download_json_path, "w") as f:
+        json.dump(result_json, f, indent=2)
+
+    return result_img, json.dumps(result_json, indent=2), None, download_json_path, uploaded_path
 
 # ==================================
 # GRADIO UI
 # ==================================
 
 with gr.Blocks() as demo:
+    # Header
     with gr.Row():
-        gr.Image(logo_path, height=80, width=80)
-        gr.Markdown("<h1 style='text-align: center;'> Inovonics 2D Floorplan Vectorizer</h1>")
+        gr.Markdown(
+            """
+            <div style='display: flex; align-items: center; justify-content: center;'>
+                <img src='file/public/logo.png' style='height: 50px; margin-right: 10px;'/>
+                <h1>Inovonics 2D Floorplan Vectorizer</h1>
+            </div>
+            """,
+            unsafe_allow_html=True,
+        )
 
     with gr.Row():
         with gr.Column():
             uploaded_file = gr.File(label="Upload your Floorplan Image", type="filepath")
-            uploaded_img_preview = gr.Image(label="📤 Uploaded Image", interactive=False)
+            uploaded_image_display = gr.Image(label="Uploaded Image", visible=True)
             run_button = gr.Button("Run Vectorizer 🔥")
 
         with gr.Column():
             output_image = gr.Image(label="🖼 Output Vectorized Image")
             output_json = gr.JSON(label="🧾 Output JSON")
-            download_button = gr.File(label="⬇️ Download JSON")
+            download_button = gr.File(label="⬇️ Download JSON", visible=True)
 
     error_output = gr.Textbox(label="Error Message", visible=False)
 
+    # Logic binding
     run_button.click(
         predict,
         inputs=[uploaded_file],
-        outputs=[uploaded_img_preview, output_image, output_json, download_button]
+        outputs=[output_image, output_json, error_output, download_button, uploaded_image_display]
     )
 
 demo.launch(server_name="0.0.0.0", server_port=7860, share=True)