fix safety check

app.py

@@ -296,8 +296,8 @@ def handle_image_upload_and_gallery_hf(uploaded_files):
             else:
                 ind_small += 1
                 # Handle JPG/JPEG files (existing process)
-                # file_path = save_uploaded_file(st.session_state['dir_uploaded_images'], uploaded_file) ######### Yale  TODO
-                file_path = os.path.join(st.session_state['dir_uploaded_images'], uploaded_file.name)
+                file_path = save_uploaded_file(st.session_state['dir_uploaded_images'], uploaded_file, img=None) ######### Yale  TODO
+                # file_path = os.path.join(st.session_state['dir_uploaded_images'], uploaded_file.name)
 
                 st.session_state['input_list'].append(file_path)
                 if ind_small < MAX_GALLERY_IMAGES +5:

vouchervision/utils_hf.py

@@ -69,78 +69,85 @@ def save_uploaded_file_local(directory_in, directory_out, img_file_name, image=N
                 pass
             
 
-# def save_uploaded_file(directory, img_file, image=None):
+def save_uploaded_file(directory, img_file, image=None):
+    if not os.path.exists(directory):
+        os.makedirs(directory)
+
+    full_path = os.path.join(directory, img_file.name)
+
+    # Assuming the uploaded file is an image
+    if img_file.name.lower().endswith('.pdf'):
+        with open(full_path, 'wb') as out_file:
+            # If img_file is a file-like object (e.g., Django's UploadedFile),
+            # you can use copyfileobj or read chunks.
+            # If it's a path, you'd need to open and then save it.
+            if hasattr(img_file, 'read'):
+                # This is a file-like object
+                copyfileobj(img_file, out_file)
+            else:
+                # If img_file is a path string
+                with open(img_file, 'rb') as fd:
+                    copyfileobj(fd, out_file)    
+            return full_path
+    else:
+        if image is None:
+            try:
+                with Image.open(img_file) as image:
+                    full_path = os.path.join(directory, img_file.name)
+                    image.save(full_path, "JPEG")
+                # Return the full path of the saved image
+                return full_path
+            except:
+                try:
+                    with Image.open(os.path.join(directory,img_file)) as image:
+                        full_path = os.path.join(directory, img_file)
+                        image.save(full_path, "JPEG")
+                    # Return the full path of the saved image
+                    return full_path
+                except:
+                    with Image.open(os.path.join(directory,img_file.name)) as image:
+                        full_path = os.path.join(directory, img_file.name)
+                        image.save(full_path, "JPEG")
+                    # Return the full path of the saved image
+                    return full_path
+        else:
+            try:
+                full_path = os.path.join(directory, img_file.name)
+                image.save(full_path, "JPEG")
+                return full_path
+            except:
+                full_path = os.path.join(directory, img_file)
+                image.save(full_path, "JPEG")
+                return full_path
+# def save_uploaded_file(directory, uploaded_file, image=None):
 #     if not os.path.exists(directory):
 #         os.makedirs(directory)
 
-#     full_path = os.path.join(directory, img_file.name)
+#     full_path = os.path.join(directory, uploaded_file.name)
 
-#     # Assuming the uploaded file is an image
-#     if img_file.name.lower().endswith('.pdf'):
+#     # Handle PDF files
+#     if uploaded_file.name.lower().endswith('.pdf'):
 #         with open(full_path, 'wb') as out_file:
-#             # If img_file is a file-like object (e.g., Django's UploadedFile),
-#             # you can use copyfileobj or read chunks.
-#             # If it's a path, you'd need to open and then save it.
-#             if hasattr(img_file, 'read'):
-#                 # This is a file-like object
-#                 copyfileobj(img_file, out_file)
+#             if hasattr(uploaded_file, 'read'):
+#                 copyfileobj(uploaded_file, out_file)
 #             else:
-#                 # If img_file is a path string
-#                 with open(img_file, 'rb') as fd:
-#                     copyfileobj(fd, out_file)    
-#             return full_path
+#                 with open(uploaded_file, 'rb') as fd:
+#                     copyfileobj(fd, out_file)
+#         return full_path
 #     else:
 #         if image is None:
 #             try:
-#                 with Image.open(img_file) as image:
-#                     full_path = os.path.join(directory, img_file.name)
-#                     image.save(full_path, "JPEG")
-#                 # Return the full path of the saved image
-#                 return full_path
+#                 with Image.open(uploaded_file) as img:
+#                     img.save(full_path, "JPEG")
 #             except:
-#                 with Image.open(os.path.join(directory,img_file)) as image:
-#                     full_path = os.path.join(directory, img_file)
-#                     image.save(full_path, "JPEG")
-#                 # Return the full path of the saved image
-#                 return full_path
+#                 with Image.open(full_path) as img:
+#                     img.save(full_path, "JPEG")
 #         else:
 #             try:
-#                 full_path = os.path.join(directory, img_file.name)
 #                 image.save(full_path, "JPEG")
-#                 return full_path
 #             except:
-#                 full_path = os.path.join(directory, img_file)
-#                 image.save(full_path, "JPEG")
-#                 return full_path
-def save_uploaded_file(directory, uploaded_file, image=None):
-    if not os.path.exists(directory):
-        os.makedirs(directory)
-
-    full_path = os.path.join(directory, uploaded_file.name)
-
-    # Handle PDF files
-    if uploaded_file.name.lower().endswith('.pdf'):
-        with open(full_path, 'wb') as out_file:
-            if hasattr(uploaded_file, 'read'):
-                copyfileobj(uploaded_file, out_file)
-            else:
-                with open(uploaded_file, 'rb') as fd:
-                    copyfileobj(fd, out_file)
-        return full_path
-    else:
-        if image is None:
-            try:
-                with Image.open(uploaded_file) as img:
-                    img.save(full_path, "JPEG")
-            except Exception:
-                with Image.open(os.path.join(directory, uploaded_file.name)) as img:
-                    img.save(full_path, "JPEG")
-        else:
-            try:
-                image.save(full_path, "JPEG")
-            except Exception:
-                image.save(os.path.join(directory, uploaded_file.name), "JPEG")
-        return full_path
+#                 image.save(os.path.join(directory, uploaded_file.name), "JPEG")
+#         return full_path
     
 def save_uploaded_local(directory, img_file, image=None):
     name = img_file.split(os.path.sep)[-1]