reset previous changes

src/converter.py

@@ -11,28 +11,15 @@ from parser_factory import ParserFactory
 # Import all parsers to ensure they're registered
 import parsers
 
-# Configure logging
-logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-logger = logging.getLogger(__name__)
-
-# Global cancellation flag
-_cancellation_flag = None
+# Reference to the cancellation flag from ui.py
+# This will be set by the UI when the cancel button is clicked
+conversion_cancelled = None
 
 def set_cancellation_flag(flag):
-    """Set the cancellation flag to be used by the converter."""
-    global _cancellation_flag
-    _cancellation_flag = flag
-    logger.info("Cancellation flag set in converter module")
+    """Set the reference to the cancellation flag from ui.py"""
+    global conversion_cancelled
+    conversion_cancelled = flag
 
-def is_cancelled():
-    """Check if cancellation has been requested."""
-    global _cancellation_flag
-    if _cancellation_flag is None:
-        return False
-    cancelled = _cancellation_flag.is_set()
-    if cancelled:
-        logger.info("Cancellation detected in converter")
-    return cancelled
 
 def convert_file(file_path, parser_name, ocr_method_name, output_format):
     """
@@ -47,14 +34,15 @@ def convert_file(file_path, parser_name, ocr_method_name, output_format):
     Returns:
         tuple: (content, download_file_path)
     """
-    # Check for cancellation at the start
-    if is_cancelled():
-        logger.info("Conversion cancelled before starting parser")
-        return "Conversion cancelled.", None
-
+    global conversion_cancelled
+    
     if not file_path:
         return "Please upload a file.", None
 
+    # Check for cancellation
+    if conversion_cancelled and conversion_cancelled.is_set():
+        return "Conversion cancelled.", None
+
     # Create a temporary file with English filename
     try:
         original_ext = Path(file_path).suffix
@@ -66,9 +54,8 @@ def convert_file(file_path, parser_name, ocr_method_name, output_format):
     except Exception as e:
         return f"Error creating temporary file: {e}", None
 
-    # Check for cancellation after parser creation
-    if is_cancelled():
-        logger.info("Conversion cancelled after parser creation")
+    # Check for cancellation again
+    if conversion_cancelled and conversion_cancelled.is_set():
         # Clean up temp file
         try:
             os.unlink(temp_input.name)
@@ -89,15 +76,14 @@ def convert_file(file_path, parser_name, ocr_method_name, output_format):
             parser_name=parser_name,
             ocr_method_name=ocr_method_name,
             output_format=output_format.lower(),
-            cancellation_flag=is_cancelled  # Pass the flag to parsers
+            cancellation_flag=conversion_cancelled  # Pass the flag to parsers
         )
         
         duration = time.time() - start
         logging.info(f"Processed in {duration:.2f} seconds.")
         
         # Check for cancellation after processing
-        if is_cancelled():
-            logger.info("Conversion cancelled after parsing")
+        if conversion_cancelled and conversion_cancelled.is_set():
             # Clean up temp file
             try:
                 os.unlink(temp_input.name)
@@ -125,9 +111,8 @@ def convert_file(file_path, parser_name, ocr_method_name, output_format):
     else:
         ext = ".txt"
 
-    # Check for cancellation after formatting
-    if is_cancelled():
-        logger.info("Conversion cancelled after formatting")
+    # Check for cancellation again
+    if conversion_cancelled and conversion_cancelled.is_set():
         # Clean up temp file
         try:
             os.unlink(temp_input.name)

src/parser_factory.py

@@ -1,7 +1,6 @@
 from typing import Optional, Dict, Any, Union
 from pathlib import Path
 import threading
-from docling.datamodel.document import Document
 
 from parser_interface import DocumentParser
 from parser_registry import ParserRegistry
@@ -63,43 +62,4 @@ class ParserFactory:
         
         # Parse the document, passing the cancellation flag
         kwargs['cancellation_flag'] = cancellation_flag
-        return parser.parse(file_path, ocr_method=ocr_method_id, **kwargs) 
-
-class BaseParser:
-    def __init__(self):
-        self._cancellation_check = lambda: False
-    
-    def set_cancellation_check(self, check_func):
-        """Set a function that will be called to check for cancellation."""
-        self._cancellation_check = check_func
-    
-    def is_cancelled(self):
-        """Check if processing should be cancelled."""
-        return self._cancellation_check()
-    
-    def parse(self, file_path):
-        """Parse the file and return the content."""
-        # Initialize document
-        document = Document()
-        
-        # Check for cancellation
-        if self.is_cancelled():
-            return document
-        
-        # Open the file
-        # ...
-        
-        # Process each page
-        for page_num in range(num_pages):
-            # Check for cancellation before processing each page
-            if self.is_cancelled():
-                return document
-            
-            # Process page
-            # ...
-            
-            # Check for cancellation after processing each page
-            if self.is_cancelled():
-                return document
-        
-        return document
+        return parser.parse(file_path, ocr_method=ocr_method_id, **kwargs) 

src/ui.py

@@ -265,4 +265,4 @@ def launch_ui(server_name="0.0.0.0", server_port=7860, share=False):
         root_path="",
         show_error=True,
         share=share
-    )
+    )