Update app.py

app.py

@@ -22,18 +22,41 @@ logger = logging.getLogger(__name__)
 class ImageToDxfConverter:
     def __init__(self):
         """Initialize the converter with configuration."""
-        # For Hugging Face Spaces, executable should be in the root directory
         self.executable_path = Path("SimpleImageToDxfHavePass")
         self.hf_token = os.getenv("HF_TOKEN")
         self.repo_id = "ArrcttacsrjksX/ImageToAutocadData"
         
-        # Make executable file executable (Hugging Face Spaces specific)
         try:
             os.chmod(self.executable_path, 0o755)
             logger.info(f"Set executable permissions for {self.executable_path}")
         except Exception as e:
             logger.error(f"Failed to set executable permissions: {e}")
 
+    def _process_image(self, image_path: str, size_multiplier: float, black_white: bool) -> str:
+        """Process the image with size multiplier and black/white conversion."""
+        try:
+            with Image.open(image_path) as img:
+                # Calculate new size
+                new_width = int(img.width * size_multiplier)
+                new_height = int(img.height * size_multiplier)
+                
+                # Resize image
+                img = img.resize((new_width, new_height), Image.LANCZOS)
+                
+                # Convert to black and white if option is selected
+                if black_white:
+                    img = img.convert('L')  # Convert to grayscale
+                    img = img.point(lambda x: 0 if x < 128 else 255, '1')  # Convert to binary
+                
+                # Save processed image to temporary file
+                with tempfile.NamedTemporaryFile(delete=False, suffix='.png') as temp_file:
+                    img.save(temp_file.name, 'PNG')
+                    return temp_file.name
+                    
+        except Exception as e:
+            logger.error(f"Failed to process image: {str(e)}")
+            return image_path
+
     def _ensure_directory(self, path: Union[str, Path]) -> Path:
         """Ensure directory exists and return Path object."""
         path = Path(path)
@@ -52,11 +75,9 @@ class ImageToDxfConverter:
     def _save_base64_image(self, base64_data: str) -> str:
         """Save base64 image data to temporary file."""
         try:
-            # Extract actual base64 data after comma
             img_data = base64_data.split(',')[1]
             img_bytes = base64.b64decode(img_data)
             
-            # Create temporary file
             with tempfile.NamedTemporaryFile(delete=False, suffix='.png') as temp_file:
                 temp_file.write(img_bytes)
                 return temp_file.name
@@ -67,10 +88,11 @@ class ImageToDxfConverter:
 
     def convert_image(self, 
                      image_input: Union[str, None], 
-                     use_lines: bool = False) -> Tuple[Optional[str], Optional[str], List[str]]:
-        """Convert image to DXF format."""
+                     use_lines: bool = False,
+                     size_multiplier: float = 1.0,
+                     black_white: bool = False) -> Tuple[Optional[str], Optional[str], List[str]]:
+        """Convert image to DXF format with size multiplier and black/white option."""
         try:
-            # Input validation
             if not image_input:
                 return None, None, []
 
@@ -83,6 +105,9 @@ class ImageToDxfConverter:
             else:
                 image_path = image_input
 
+            # Process image with size multiplier and black/white conversion
+            processed_image_path = self._process_image(image_path, size_multiplier, black_white)
+
             # Setup output directory
             output_dir = self._ensure_directory("OutputPDF")
             timestamp = datetime.datetime.now().strftime("%Y-%m-%d_%H-%M-%S")
@@ -91,14 +116,13 @@ class ImageToDxfConverter:
             # Prepare conversion command
             command = [
                 f"./{self.executable_path}",
-                f"--imagePath={image_path}",
+                f"--imagePath={processed_image_path}",
                 f"--outputPath={paths['temp_dxf']}",
                 f"--debug-output={paths['temp_debug']}"
             ]
             if use_lines:
                 command.append("--use-lines")
 
-            # Execute conversion
             try:
                 result = subprocess.run(
                     command,
@@ -122,16 +146,14 @@ class ImageToDxfConverter:
                 try:
                     date_folder = timestamp
                     
-                    # Upload input image
                     uploaded_input = upload_file(
-                        path_or_fileobj=image_path,
-                        path_in_repo=f"datasets/{self.repo_id}/{date_folder}/{Path(image_path).name}",
+                        path_or_fileobj=processed_image_path,
+                        path_in_repo=f"datasets/{self.repo_id}/{date_folder}/{Path(processed_image_path).name}",
                         repo_id=self.repo_id,
                         token=self.hf_token
                     )
                     uploaded_files.append(uploaded_input)
 
-                    # Upload DXF output
                     uploaded_dxf = upload_file(
                         path_or_fileobj=str(paths['output_dxf']),
                         path_in_repo=f"datasets/{self.repo_id}/{date_folder}/{paths['output_dxf'].name}",
@@ -140,7 +162,6 @@ class ImageToDxfConverter:
                     )
                     uploaded_files.append(uploaded_dxf)
 
-                    # Upload debug image if available
                     if use_lines and os.path.exists(paths['debug_png']):
                         uploaded_debug = upload_file(
                             path_or_fileobj=str(paths['debug_png']),
@@ -152,12 +173,18 @@ class ImageToDxfConverter:
                 except Exception as e:
                     logger.error(f"Upload failed: {str(e)}")
 
-            # Clean up temporary file if it was created from base64
+            # Clean up temporary files
             if isinstance(image_input, str) and image_input.startswith('data:image'):
                 try:
                     os.unlink(image_path)
                 except Exception as e:
                     logger.error(f"Failed to clean up temporary file: {str(e)}")
+            
+            if processed_image_path != image_path:
+                try:
+                    os.unlink(processed_image_path)
+                except Exception as e:
+                    logger.error(f"Failed to clean up processed image file: {str(e)}")
 
             return (
                 str(paths['output_dxf']),
@@ -169,7 +196,6 @@ class ImageToDxfConverter:
             logger.error(f"Conversion failed: {str(e)}")
             return None, None, []
 
-
 def create_gradio_interface():
     """Create and configure the Gradio interface."""
     converter = ImageToDxfConverter()
@@ -181,7 +207,6 @@ def create_gradio_interface():
         Press Ctrl+V to paste image from clipboard.
         """)
         
-        # Thêm state để lưu base64 data
         clipboard_image = gr.State()
         
         with gr.Row():
@@ -193,11 +218,24 @@ def create_gradio_interface():
                     height=300
                 )
             with gr.Column(scale=1):
+                size_multiplier = gr.Number(
+                    label="Image Size Multiplier",
+                    value=1.0,
+                    minimum=0.1,
+                    maximum=10.0,
+                    step=0.1,
+                    elem_id="size_multiplier"
+                )
                 use_lines_checkbox = gr.Checkbox(
                     label="Enable line detection",
                     value=False,
                     elem_id="use_lines"
                 )
+                black_white_checkbox = gr.Checkbox(
+                    label="Convert to Black & White",
+                    value=False,
+                    elem_id="black_white"
+                )
                 convert_btn = gr.Button(
                     "Convert to DXF",
                     variant="primary",
@@ -218,7 +256,7 @@ def create_gradio_interface():
                     height=300
                 )
 
-        # Cập nhật JavaScript để xử lý paste
+        # JavaScript for paste handling
         demo.load(js="""
         function initPasteHandler() {
             document.addEventListener('paste', function(e) {
@@ -252,7 +290,7 @@ def create_gradio_interface():
                                         setTimeout(() => {
                                             const convertBtn = document.querySelector('#convert_btn');
                                             if (convertBtn) convertBtn.click();
-                                        }, 500);  // Tăng timeout lên 500ms
+                                        }, 500);
                                     }
                                 });
                         };
@@ -270,14 +308,13 @@ def create_gradio_interface():
             window.addEventListener('load', initPasteHandler);
         }
         
-        // Thêm handler để debug
         console.log('Paste handler initialized');
         """)
 
         # Event handlers
         convert_btn.click(
             fn=converter.convert_image,
-            inputs=[image_input, use_lines_checkbox],
+            inputs=[image_input, use_lines_checkbox, size_multiplier, black_white_checkbox],
             outputs=[dxf_output, debug_output],
         )