Fix: AttributeError in OCRProcessor and refactor all relative imports to absolute
This commit is contained in:
+10
-12
@@ -16,15 +16,13 @@ from app.services.ocr_service import OCRService
|
||||
from app.services.order_service import OrderService
|
||||
from app.core.utils.log_utils import get_logger
|
||||
|
||||
from .logging_ui import add_to_log, init_gui_logger, dispose_gui_logger, GUILogHandler
|
||||
from .ui_widgets import ProgressReporter
|
||||
from .error_utils import show_error_dialog, get_error_suggestion
|
||||
|
||||
logger = get_logger(__name__)
|
||||
from .result_previews import show_ocr_result_preview, show_excel_result_preview, show_merge_result_preview
|
||||
from .user_settings import add_recent_file
|
||||
from .command_runner import get_running_task, set_running_task
|
||||
from .file_operations import select_file, select_excel_file, validate_unit_price_against_item_data
|
||||
from app.ui.logging_ui import add_to_log, init_gui_logger, dispose_gui_logger, GUILogHandler
|
||||
from app.ui.ui_widgets import ProgressReporter
|
||||
from app.ui.error_utils import show_error_dialog, get_error_suggestion
|
||||
from app.ui.result_previews import show_ocr_result_preview, show_excel_result_preview, show_merge_result_preview
|
||||
from app.ui.user_settings import add_recent_file
|
||||
from app.ui.command_runner import get_running_task, set_running_task
|
||||
from app.ui.file_operations import select_file, select_excel_file, validate_unit_price_against_item_data
|
||||
|
||||
|
||||
def _get_missing_barcodes_callback(log_widget):
|
||||
@@ -249,9 +247,9 @@ def batch_process_all_inputs(log_widget, status_bar):
|
||||
|
||||
init_gui_logger(log_widget)
|
||||
|
||||
from ..services.batch_service import BatchService
|
||||
from ..config.settings import ConfigManager
|
||||
from .memory_editor import show_memory_editor # noqa: F401 触发 import 顺序
|
||||
from app.services.batch_service import BatchService
|
||||
from app.config.settings import ConfigManager
|
||||
from app.ui.memory_editor import show_memory_editor # noqa: F401 触发 import 顺序
|
||||
cfg = ConfigManager()
|
||||
|
||||
svc = BatchService(cfg, missing_barcodes_cb=_get_missing_barcodes_callback(log_widget))
|
||||
|
||||
@@ -7,8 +7,8 @@ import json
|
||||
import tkinter as tk
|
||||
from tkinter import messagebox, filedialog, scrolledtext
|
||||
|
||||
from .logging_ui import add_to_log
|
||||
from .ui_widgets import center_window
|
||||
from app.ui.logging_ui import add_to_log
|
||||
from app.ui.ui_widgets import center_window
|
||||
from app.config.settings import ConfigManager
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@ def ensure_directories():
|
||||
|
||||
def clean_cache(log_widget):
|
||||
"""清除处理缓存"""
|
||||
from .command_runner import set_running_task
|
||||
from app.ui.command_runner import set_running_task
|
||||
try:
|
||||
config = ConfigManager()
|
||||
processed_record = config.get_path('Paths', 'processed_record', fallback='data/processed_files.json')
|
||||
|
||||
+11
-11
@@ -11,29 +11,29 @@ from tkinter import messagebox, filedialog, scrolledtext
|
||||
from app.config.settings import ConfigManager
|
||||
from app.core.utils.log_utils import set_log_level
|
||||
|
||||
from .theme import THEMES, get_theme_mode, set_theme_mode, create_modern_button, create_card_frame
|
||||
from .logging_ui import add_to_log, poll_log_queue
|
||||
from .ui_widgets import StatusBar, ToolTip
|
||||
from .user_settings import (
|
||||
from app.ui.theme import THEMES, get_theme_mode, set_theme_mode, create_modern_button, create_card_frame
|
||||
from app.ui.logging_ui import add_to_log, poll_log_queue
|
||||
from app.ui.ui_widgets import StatusBar, ToolTip
|
||||
from app.ui.user_settings import (
|
||||
load_user_settings, save_user_settings, refresh_recent_list_widget,
|
||||
_extract_path_from_recent_item, clear_recent_files, RECENT_LIST_WIDGET,
|
||||
)
|
||||
from .file_operations import (
|
||||
from app.ui.file_operations import (
|
||||
ensure_directories, open_result_directory, clean_cache,
|
||||
clean_data_files, clean_result_files,
|
||||
)
|
||||
from .action_handlers import (
|
||||
from app.ui.action_handlers import (
|
||||
process_single_image_with_status, run_pipeline_directly,
|
||||
batch_ocr_with_status, batch_process_orders_with_status,
|
||||
merge_orders_with_status, process_excel_file_with_status,
|
||||
process_dropped_file, batch_process_all_inputs,
|
||||
)
|
||||
from .memory_editor import show_memory_editor
|
||||
from .config_dialog import show_config_dialog
|
||||
from .barcode_editor import edit_barcode_mappings
|
||||
from .shortcuts import bind_keyboard_shortcuts
|
||||
from app.ui.memory_editor import show_memory_editor
|
||||
from app.ui.config_dialog import show_config_dialog
|
||||
from app.ui.barcode_editor import edit_barcode_mappings
|
||||
from app.ui.shortcuts import bind_keyboard_shortcuts
|
||||
from app.core.utils.dialog_utils import show_cloud_sync_dialog
|
||||
from .db_viewer import show_db_viewer
|
||||
from app.ui.db_viewer import show_db_viewer
|
||||
|
||||
|
||||
def _init_window():
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
import tkinter as tk
|
||||
from tkinter import ttk
|
||||
|
||||
from .theme import THEMES, get_theme_mode
|
||||
from app.ui.theme import THEMES, get_theme_mode
|
||||
|
||||
|
||||
class StatusBar(tk.Frame):
|
||||
|
||||
Reference in New Issue
Block a user