Update gradio_demo.py

gradio_demo.py

@@ -972,7 +972,7 @@ def process_image(input_image, input_text):
         # input_boxes = np.array(input_boxes)
         # class_ids = np.array(class_ids)
 
-        classes = [x.strip().lower() for x in TEXT_PROMPT.split('.') if x]
+        classes = [x.strip().lower() for x in input_text.split('.') if x]
         class_name_to_id = {name: id for id, name in enumerate(classes)}
         class_id_to_name = {id: name for name, id in class_name_to_id.items()}
         
@@ -1331,31 +1331,30 @@ with block:
 
         class BackgroundManager:
             def __init__(self):
-                self.original_bg = None
-
-        #     # def update_position(self, background, x_pos, y_pos, scale):
-        #     #     """Update composite when position changes"""
-        #     #     if background is None:
-        #     #         return None
-                
-        #     #     if self.original_bg is None:
-        #     #         self.original_bg = background.copy()
-                
-        #     #     # Convert string values to float
-        #     #     x_pos = float(x_pos)
-        #     #     y_pos = float(y_pos)
-        #     #     scale = float(scale)
-                
-        #     #     return mask_mover.create_composite(self.original_bg, x_pos, y_pos, scale)
-            
-            def update_position(self, background, x_pos, y_pos, scale, *args):
+                self.original_bg = None  # To store the original background
+        
+            def update_background(self, new_bg):
+                """Set a new background."""
+                if new_bg is not None:
+                    self.original_bg = new_bg.copy()
+                    print("Background updated successfully.")  # Debugging
+                    
+            def update_position(self, background, x_pos, y_pos, scale):
+                """Update composite when position changes."""
                 if self.original_bg is None:
                     print("No original background set.")
                     return None
-                fresh_bg = self.original_bg.copy()  # Start from a clean original background
-                return mask_mover.create_composite(fresh_bg, float(x_pos), float(y_pos), float(scale))
-
-
+            
+                # Start from a clean copy of the original background
+                fresh_bg = self.original_bg.copy()
+                
+                # Debugging
+                print(f"Updating position: x={x_pos}, y={y_pos}, scale={scale}")
+                
+                # Composite the foreground onto the fresh background
+                composite = mask_mover.create_composite(fresh_bg, x_pos, y_pos, scale)
+                
+                return composite
     
         # Create an instance of BackgroundManager
         bg_manager = BackgroundManager()
@@ -1375,26 +1374,26 @@ with block:
 
 
         input_bg.change(
-        fn=lambda new_bg: setattr(bg_manager, 'original_bg', None) or new_bg,
-        inputs=[input_bg],
-        outputs=[input_bg],
-        show_progress=False
+            fn=lambda new_bg: bg_manager.update_background(new_bg) or new_bg,
+            inputs=[input_bg],
+            outputs=[input_bg],
+            show_progress=False
         )
 
         x_slider.change(
-            fn=update_position_wrapper,
+            fn=bg_manager.update_position,
             inputs=[input_bg, x_slider, y_slider, fg_scale_slider],
             outputs=[input_bg]
         )
-
+        
         y_slider.change(
-            fn=update_position_wrapper,
+            fn=bg_manager.update_position,
             inputs=[input_bg, x_slider, y_slider, fg_scale_slider],
             outputs=[input_bg]
         )
-
+        
         fg_scale_slider.change(
-            fn=update_position_wrapper,
+            fn=bg_manager.update_position,
             inputs=[input_bg, x_slider, y_slider, fg_scale_slider],
             outputs=[input_bg]
         )