updated app.py

app.py

@@ -53,29 +53,57 @@ cfg = write_config()
 # MAIN PREDICTION FUNCTION
 # ==================================
 
-def predict(uploaded_file):
-    if uploaded_file is None:
+# def predict(uploaded_file):
+#     if uploaded_file is None:
+#         return None, None, "No file uploaded."
+#     # uploaded_path = uploaded_file
+#     # input_filename = os.path.basename(uploaded_path)
+#     # print(f"✅ Image received at {uploaded_path}")
+
+#     uploaded_path = os.path.join(UPLOAD_DIR, uploaded_file.name)
+#     with open(uploaded_path, "wb") as f:
+#         f.write(uploaded_file.read())
+#     print(f"✅ Image saved to {uploaded_path}")
+
+
+#     # Save uploaded image
+#     # input_bytes = uploaded_file.read()
+#     # img = Image.open(BytesIO(input_bytes)).convert("RGB")
+#     # input_filename = uploaded_file.name
+#     # uploaded_path = os.path.join(UPLOAD_DIR, input_filename)
+#     # img.save(uploaded_path)
+#     # print(f"✅ Image saved to {uploaded_path}")
+
+#     # Prepare output paths
+#     input_filename = uploaded_file.name
+#     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)
+
+#     # Run model
+#     main(cfg, uploaded_path, output_json_path, output_image_path)
+
+#     # 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 result_img, json.dumps(result_json, indent=2), None
+
+def predict(uploaded_file_path):
+    if uploaded_file_path is None:
         return None, None, "No file uploaded."
-    # uploaded_path = uploaded_file
-    # input_filename = os.path.basename(uploaded_path)
-    # print(f"✅ Image received at {uploaded_path}")
 
-    uploaded_path = os.path.join(UPLOAD_DIR, uploaded_file.name)
-    with open(uploaded_path, "wb") as f:
-        f.write(uploaded_file.read())
+    input_filename = os.path.basename(uploaded_file_path)
+    uploaded_path = os.path.join(UPLOAD_DIR, input_filename)
+    shutil.copy(uploaded_file_path, uploaded_path)
     print(f"✅ Image saved to {uploaded_path}")
 
-
-    # Save uploaded image
-    # input_bytes = uploaded_file.read()
-    # img = Image.open(BytesIO(input_bytes)).convert("RGB")
-    # input_filename = uploaded_file.name
-    # uploaded_path = os.path.join(UPLOAD_DIR, input_filename)
-    # img.save(uploaded_path)
-    # print(f"✅ Image saved to {uploaded_path}")
-
     # Prepare output paths
-    input_filename = uploaded_file.name
     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")