update things

app.py

@@ -125,48 +125,73 @@ apply_torchvision_fix()
 
 # Custom import handling for loop module to handle dependency issues
 loop = None
-try:
-    # Try to import torchvision with error handling
+loop_import_error = None
+
+def try_import_loop():
+    """Try to import the loop module with comprehensive error handling"""
+    global loop, loop_import_error
+    
     try:
-        import torchvision
-        print(f"torchvision {torchvision.__version__} imported successfully")
-    except (RuntimeError, AttributeError) as e:
-        if "operator torchvision::nms does not exist" in str(e) or "extension" in str(e):
-            print("Detected torchvision compatibility issue. Applying additional fixes...")
-            # Re-apply fixes after the error
-            apply_torchvision_fix()
-            
-            # Try importing again with sys.modules manipulation
-            try:
-                if 'torchvision' in sys.modules:
-                    del sys.modules['torchvision']
-                import torchvision
-                print("torchvision imported successfully after fixes")
-            except Exception as e2:
-                print(f"torchvision still has issues, but continuing: {e2}")
-        else:
-            print(f"Other torchvision error: {e}")
+        # Try to import torchvision with error handling
+        try:
+            import torchvision
+            print(f"torchvision {torchvision.__version__} imported successfully")
+        except (RuntimeError, AttributeError) as e:
+            if "operator torchvision::nms does not exist" in str(e) or "extension" in str(e):
+                print("Detected torchvision compatibility issue. Applying additional fixes...")
+                # Re-apply fixes after the error
+                apply_torchvision_fix()
                 
-    # Now try to import the loop module
-    from loop import loop
-    print("Successfully imported loop module")
-except ImportError as e:
-    print(f"Error importing loop: {e}")
-    print("Make sure all dependencies are installed correctly")
-    if "torchvision" in str(e) or "torch" in str(e):
-        print("This appears to be a PyTorch/torchvision compatibility issue.")
-        print("The app will still start but may have limited functionality.")
-        loop = None  # Set to None so the app can still start
-except RuntimeError as e:
-    print(f"Runtime error importing loop: {e}")
-    if "operator torchvision::nms does not exist" in str(e):
-        print("This is a known issue with incompatible PyTorch/torchvision versions.")
-        print("Attempting to continue with limited functionality...")
-        loop = None  # Set to None so the app can still start
-except Exception as e:
-    print(f"Unexpected error importing loop: {e}")
-    print("The app will start with limited functionality.")
-    loop = None
+                # Try importing again with sys.modules manipulation
+                try:
+                    if 'torchvision' in sys.modules:
+                        del sys.modules['torchvision']
+                    import torchvision
+                    print("torchvision imported successfully after fixes")
+                except Exception as e2:
+                    print(f"torchvision still has issues, but continuing: {e2}")
+            else:
+                print(f"Other torchvision error: {e}")
+                    
+        # Now try to import the loop module
+        from loop import loop as loop_func
+        loop = loop_func
+        print("Successfully imported loop module")
+        return True
+        
+    except ImportError as e:
+        error_msg = f"ImportError: {e}"
+        print(error_msg)
+        if "torchvision" in str(e) or "torch" in str(e):
+            loop_import_error = "PyTorch/torchvision compatibility issue detected. The processing engine could not be loaded."
+        else:
+            loop_import_error = f"Missing dependencies: {str(e)}"
+        return False
+        
+    except RuntimeError as e:
+        error_msg = f"RuntimeError: {e}"
+        print(error_msg)
+        if "operator torchvision::nms does not exist" in str(e):
+            loop_import_error = "PyTorch/torchvision version incompatibility. This is a known issue in some environments."
+        else:
+            loop_import_error = f"Runtime error during import: {str(e)}"
+        return False
+        
+    except Exception as e:
+        error_msg = f"Unexpected error: {e}"
+        print(error_msg)
+        loop_import_error = f"Unexpected error during import: {str(e)}"
+        return False
+
+# Try to import the loop module
+print("Attempting to import processing engine...")
+import_success = try_import_loop()
+
+if import_success:
+    print("✓ Processing engine loaded successfully")
+else:
+    print(f"✗ Processing engine failed to load: {loop_import_error}")
+    print("The interface will still start, but processing functionality will be limited.")
 
 # Ensure NeuralJacobianFields is properly configured
 try:
@@ -281,7 +306,16 @@ def process_garment(input_type, text_prompt, base_text_prompt, mesh_target_image
                 print(f"Target mesh image saved to {target_mesh_image_path}")
                 
                 # Set mesh paths based on selected source mesh type
-                source_mesh_file = f"./meshes/{source_mesh_type}.obj"
+                # Map display names to actual file names
+                mesh_mapping = {
+                    "tshirt": "tshirt",
+                    "longsleeve": "longsleeve", 
+                    "tanktop": "tanktop",
+                    "poncho": "poncho",
+                    "dress_shortsleeve": "dress_shortsleeve"
+                }
+                mesh_file = mesh_mapping.get(source_mesh_type, "tshirt")
+                source_mesh_file = f"./meshes/{mesh_file}.obj"
                 
                 # Configure for image-to-mesh processing
                 config.update({
@@ -349,7 +383,10 @@ def process_garment(input_type, text_prompt, base_text_prompt, mesh_target_image
             try:
                 # Check if loop is available
                 if loop is None:
-                    error_message = "Error: The garment generation engine could not be loaded due to dependency issues. This is likely due to compatibility issues between PyTorch and torchvision in the current environment."
+                    if loop_import_error:
+                        error_message = f"Error: {loop_import_error}"
+                    else:
+                        error_message = "Error: The garment generation engine could not be loaded due to dependency issues."
                     print(error_message)
                     return error_message
                 
@@ -481,18 +518,21 @@ def create_interface():
                 
                 # Image to Mesh inputs (hidden by default)
                 with gr.Group(visible=False) as image_to_mesh_group:
+                    gr.Markdown("### Upload Garment Image")
                     mesh_target_image = gr.Image(
                         label="Target Garment Image for Mesh Generation",
-                        sources=["upload", "webcam"],
+                        sources=["upload", "clipboard"],
                         type="numpy",
-                        interactive=True
+                        interactive=True,
+                        height=300
                     )
                     gr.Markdown("*Upload an image of the garment to convert directly to a 3D mesh*")
                     
+                    gr.Markdown("### Select Base Mesh Type")
                     source_mesh_type = gr.Dropdown(
                         label="Source Mesh Type",
-                        choices=["t-shirt", "longsleeve", "tanktop", "poncho", "dress_shortsleeve"],
-                        value="t-shirt",
+                        choices=["tshirt", "longsleeve", "tanktop", "poncho", "dress_shortsleeve"],
+                        value="tshirt",
                         interactive=True
                     )
                     gr.Markdown("*Select the type of base garment mesh to use as a starting point*")
@@ -558,7 +598,15 @@ def create_interface():
                 """)
         
         # Add a status output for errors and messages
-        status_output = gr.Markdown("Ready to generate garments. Select an input method and click 'Generate 3D Garment'.")
+        if loop is not None:
+            engine_status = "✅ Processing engine loaded successfully"
+            status_msg = "Ready to generate garments. Select an input method and click 'Generate 3D Garment'."
+        else:
+            engine_status = f"❌ Processing engine unavailable: {loop_import_error or 'Unknown error'}"
+            status_msg = "Processing engine is currently unavailable. Please check the system status."
+        
+        engine_status_output = gr.Markdown(f"**System Status:** {engine_status}")
+        status_output = gr.Markdown(status_msg)
         
         # Define a function to handle mode changes with clearer UI feedback
         def update_mode(mode):
@@ -572,8 +620,8 @@ def create_interface():
                 status_msg += "Upload a garment image and select mesh type, then click Generate."
                 
             return (
-                gr.Group.update(visible=text_visibility),
-                gr.Group.update(visible=image_to_mesh_visibility),
+                gr.update(visible=text_visibility),
+                gr.update(visible=image_to_mesh_visibility),
                 status_msg
             )