Update app.py

app.py

@@ -249,101 +249,104 @@ class FileProcessor:
             logger.error(f"File processing error: {e}")
             return []
 
-    def generate_qr(json_data):
-        """Generate QR code from JSON data and return the file path."""
-        try:
-            # Try first with automatic version selection
-            qr = qrcode.QRCode(
-                error_correction=qrcode.constants.ERROR_CORRECT_L,
-                box_size=10,
-                border=4,
-            )
-            qr.add_data(json_data)
-            qr.make(fit=True)
-            
-            img = qr.make_image(fill_color="black", back_color="white")
-            temp_file = tempfile.NamedTemporaryFile(delete=False, suffix=".png")
-            img.save(temp_file.name)
-            return temp_file.name
-        except Exception as e:
-            # If the data is too large for a QR code
-            logger.error(f"QR generation error: {e}")
-            
-            # Create a simple QR with error message
-            qr = qrcode.QRCode(
-                version=1,
-                error_correction=qrcode.constants.ERROR_CORRECT_L,
-                box_size=10,
-                border=4,
-            )
-            qr.add_data("Error: Data too large for QR code")
-            qr.make(fit=True)
-            
-            img = qr.make_image(fill_color="black", back_color="white")
-            temp_file = tempfile.NamedTemporaryFile(delete=False, suffix=".png")
-            img.save(temp_file.name)
-            return temp_file.name
-
-    def process_all_inputs(urls, file, text, notes):
-        """Process all input types with progress tracking"""
-        try:
-            processor = URLProcessor()
-            file_processor = FileProcessor()
-            results = []
-
-            # Process URLs
-            if urls:
-                url_list = re.split(r'[,\n]', urls)
-                url_list = [url.strip() for url in url_list if url.strip()]
-
-                for url in url_list:
-                    validation = processor.validate_url(url)
-                    if validation.get('is_valid'):
-                        content = processor.fetch_content(url)
-                        if content:
-                            results.append({
-                                'source': 'url',
-                                'url': url,
-                                'content': content,
-                                'timestamp': datetime.now().isoformat()
-                            })
-
-            # Process files
-            if file:
-                results.extend(file_processor.process_file(file))
-
-            # Process text input
-            if text:
-                cleaned_text = processor.advanced_text_cleaning(text)
-                results.append({
-                    'source': 'direct_input',
-                    'content': cleaned_text,
-                    'timestamp': datetime.now().isoformat()
-                })
-
-            # Generate output
-            if results:
-                output_dir = Path('output') / datetime.now().strftime('%Y-%m-%d')
-                output_dir.mkdir(parents=True, exist_ok=True)
-                output_path = output_dir / f'processed_{int(time.time())}.json'
-
-                with open(output_path, 'w', encoding='utf-8') as f:
-                    json.dump(results, f, ensure_ascii=False, indent=2)
-
-                summary = f"Processed {len(results)} items successfully!"
-                json_data = json.dumps(results, indent=2)  # Prepare JSON for QR code
-                return str(output_path), summary, json_data  # Return JSON for editor
-            else:
-                return None, "No valid content to process.", ""
+# Move process_all_inputs outside of the FileProcessor class
+def process_all_inputs(urls, file, text, notes):
+    """Process all input types with progress tracking"""
+    try:
+        processor = URLProcessor()
+        file_processor = FileProcessor()
+        results = []
+
+        # Process URLs
+        if urls:
+            url_list = re.split(r'[,\n]', urls)
+            url_list = [url.strip() for url in url_list if url.strip()]
+
+            for url in url_list:
+                validation = processor.validate_url(url)
+                if validation.get('is_valid'):
+                    content = processor.fetch_content(url)
+                    if content:
+                        results.append({
+                            'source': 'url',
+                            'url': url,
+                            'content': content,
+                            'timestamp': datetime.now().isoformat()
+                        })
 
-        except Exception as e:
-            logger.error(f"Processing error: {e}")
-            return None, f"Error: {str(e)}", ""
+        # Process files
+        if file:
+            results.extend(file_processor.process_file(file))
 
-    def generate_qr_code(json_data):
-            """Generate QR code from JSON data and return the file path."""
-            if json_data:
-                return generate_qr(json_data)
+        # Process text input
+        if text:
+            cleaned_text = processor.advanced_text_cleaning(text)
+            results.append({
+                'source': 'direct_input',
+                'content': cleaned_text,
+                'timestamp': datetime.now().isoformat()
+            })
+
+        # Generate output
+        if results:
+            output_dir = Path('output') / datetime.now().strftime('%Y-%m-%d')
+            output_dir.mkdir(parents=True, exist_ok=True)
+            output_path = output_dir / f'processed_{int(time.time())}.json'
+
+            with open(output_path, 'w', encoding='utf-8') as f:
+                json.dump(results, f, ensure_ascii=False, indent=2)
+
+            summary = f"Processed {len(results)} items successfully!"
+            json_data = json.dumps(results, indent=2)  # Prepare JSON for QR code
+            return str(output_path), summary, json_data  # Return JSON for editor
+        else:
+            return None, "No valid content to process.", ""
+
+    except Exception as e:
+        logger.error(f"Processing error: {e}")
+        return None, f"Error: {str(e)}", ""
+
+# Also move generate_qr_code outside of the FileProcessor class
+def generate_qr_code(json_data):
+    """Generate QR code from JSON data and return the file path."""
+    if json_data:
+        return generate_qr(json_data)
+
+# Move generate_qr outside of the FileProcessor class as well
+def generate_qr(json_data):
+    """Generate QR code from JSON data and return the file path."""
+    try:
+        # Try first with automatic version selection
+        qr = qrcode.QRCode(
+            error_correction=qrcode.constants.ERROR_CORRECT_L,
+            box_size=10,
+            border=4,
+        )
+        qr.add_data(json_data)
+        qr.make(fit=True)
+        
+        img = qr.make_image(fill_color="black", back_color="white")
+        temp_file = tempfile.NamedTemporaryFile(delete=False, suffix=".png")
+        img.save(temp_file.name)
+        return temp_file.name
+    except Exception as e:
+        # If the data is too large for a QR code
+        logger.error(f"QR generation error: {e}")
+        
+        # Create a simple QR with error message
+        qr = qrcode.QRCode(
+            version=1,
+            error_correction=qrcode.constants.ERROR_CORRECT_L,
+            box_size=10,
+            border=4,
+        )
+        qr.add_data("Error: Data too large for QR code")
+        qr.make(fit=True)
+        
+        img = qr.make_image(fill_color="black", back_color="white")
+        temp_file = tempfile.NamedTemporaryFile(delete=False, suffix=".png")
+        img.save(temp_file.name)
+        return temp_file.name
 
 def create_interface():
     """Create a comprehensive Gradio interface with advanced features"""