file structure change

README.md

@@ -82,3 +82,39 @@ build:
 ## Development
 
 For local development, ensure you have Tesseract OCR installed and the TESSDATA_PREFIX environment variable set correctly.
+
+## Recommended Folder Structure
+
+```
+markit/
+├── app.py                  # Main application entry point
+├── setup.sh                # Setup script
+├── build.sh                # Build script
+├── requirements.txt        # Python dependencies
+├── README.md               # Project documentation
+├── .env                    # Environment variables
+├── .gitignore              # Git ignore file
+├── .gitattributes          # Git attributes file
+├── src/                    # Source code
+│   ├── __init__.py         # Package initialization
+│   ├── main.py             # Main module
+│   ├── core/               # Core functionality
+│   │   ├── __init__.py     # Package initialization
+│   │   ├── converter.py    # Document conversion logic
+│   │   └── parser_factory.py # Parser factory
+│   ├── parsers/            # Parser implementations
+│   │   ├── __init__.py     # Package initialization
+│   │   ├── parser_interface.py # Parser interface
+│   │   ├── parser_registry.py # Parser registry
+│   │   ├── docling_parser.py # Docling parser
+│   │   ├── marker_parser.py # Marker parser
+│   │   └── pypdfium_parser.py # PyPDFium parser
+│   ├── ui/                 # User interface
+│   │   ├── __init__.py     # Package initialization
+│   │   └── ui.py           # Gradio UI implementation
+│   └── services/           # External services
+│       ├── __init__.py     # Package initialization
+│       └── docling_chat.py # Chat service
+└── tests/                  # Tests
+    └── __init__.py         # Package initialization
+```

src/core/__init__.py

@@ -0,0 +1 @@
+"""Core functionality module for document conversion.""" 

src/{converter.py → core/converter.py}

@@ -5,7 +5,7 @@ import os
 from pathlib import Path
 
 # Use relative imports instead of absolute imports
-from parser_factory import ParserFactory
+from src.core.parser_factory import ParserFactory
 
 # Import all parsers to ensure they're registered
 import parsers

src/{parser_factory.py → core/parser_factory.py}

@@ -4,8 +4,8 @@ import threading
 import logging
 import time
 
-from parser_interface import DocumentParser
-from parser_registry import ParserRegistry
+from src.parsers.parser_interface import DocumentParser
+from src.parsers.parser_registry import ParserRegistry
 
 
 class ParserFactory:

src/main.py

@@ -1,6 +1,6 @@
 import parsers  # Import all parsers to ensure they're registered
 
-from ui import launch_ui
+from src.ui.ui import launch_ui
 
 
 def main():

src/parsers/__init__.py

@@ -1,7 +1,9 @@
-# Import all parsers to ensure they register themselves
-from parsers.pypdfium_parser import PyPdfiumParser
-from parsers.docling_parser import DoclingParser
-from parsers.marker_parser import MarkerParser
+"""Parser implementations for document conversion."""
+
+# Import all parsers to ensure they're registered
+from src.parsers.docling_parser import DoclingParser
+from src.parsers.marker_parser import MarkerParser
+from src.parsers.pypdfium_parser import PyPdfiumParser
 
 # You can add new parsers here in the future 
 

src/parsers/docling_parser.py

@@ -2,8 +2,8 @@ from pathlib import Path
 from typing import Dict, List, Optional, Any, Union
 import json
 
-from parser_interface import DocumentParser
-from parser_registry import ParserRegistry
+from src.parsers.parser_interface import DocumentParser
+from src.parsers.parser_registry import ParserRegistry
 from docling.document_converter import DocumentConverter, PdfFormatOption
 from docling.datamodel.base_models import InputFormat
 from docling.datamodel.pipeline_options import (

src/parsers/marker_parser.py

@@ -1,9 +1,12 @@
 from pathlib import Path
 from typing import Dict, List, Optional, Any, Union
+import subprocess
+import tempfile
+import os
 import json
 
-from parser_interface import DocumentParser
-from parser_registry import ParserRegistry
+from src.parsers.parser_interface import DocumentParser
+from src.parsers.parser_registry import ParserRegistry
 from marker.converters.pdf import PdfConverter
 from marker.models import create_model_dict
 from marker.output import text_from_rendered

src/{parser_registry.py → parsers/parser_registry.py}

@@ -1,5 +1,5 @@
 from typing import Dict, List, Type, Any, Optional
-from parser_interface import DocumentParser
+from src.parsers.parser_interface import DocumentParser
 
 
 class ParserRegistry:

src/parsers/pypdfium_parser.py

@@ -1,8 +1,10 @@
 from pathlib import Path
 from typing import Dict, List, Optional, Any, Union
+import json
+import pypdfium2 as pdfium
 
-from parser_interface import DocumentParser
-from parser_registry import ParserRegistry
+from src.parsers.parser_interface import DocumentParser
+from src.parsers.parser_registry import ParserRegistry
 from docling.document_converter import DocumentConverter, PdfFormatOption
 from docling.datamodel.base_models import InputFormat
 from docling.datamodel.pipeline_options import PdfPipelineOptions
@@ -63,7 +65,6 @@ class PyPdfiumParser(DocumentParser):
         # Return the content in the requested format
         output_format = kwargs.get("output_format", "markdown")
         if output_format.lower() == "json":
-            import json
             return json.dumps(doc.export_to_dict(), ensure_ascii=False, indent=2)
         elif output_format.lower() == "text":
             return doc.export_to_text()

src/services/__init__.py

@@ -0,0 +1 @@
+"""External services module for the application.""" 

src/ui/__init__.py

@@ -0,0 +1 @@
+"""User interface module for the application.""" 

src/{ui.py → ui/ui.py}

@@ -3,9 +3,9 @@ import markdown
 import threading
 import time
 import logging
-from converter import convert_file, set_cancellation_flag, is_conversion_in_progress
-from docling_chat import chat_with_document
-from parser_registry import ParserRegistry
+from src.core.converter import convert_file, set_cancellation_flag, is_conversion_in_progress
+from src.services.docling_chat import chat_with_document
+from src.parsers.parser_registry import ParserRegistry
 
 # Configure logging
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')

tests/__init__.py

@@ -0,0 +1 @@
+"""Test suite for the application."""