Refactor

core/__init__.py

@@ -0,0 +1 @@
+

gui/__init__.py

@@ -0,0 +1 @@
+

similar_history_match.py → gui/similar_history_match.py

@@ -1,5 +1,11 @@
 import numpy as np
 import pandas as pd
+# 从父目录找config
+import sys
+from pathlib import Path
+root_dir = Path(__file__).parent.parent
+if str(root_dir) not in sys.path:
+    sys.path.insert(0, str(root_dir))
 from config import MONSTER_COUNT
 from config import FIELD_FEATURE_COUNT
 

simular_history_match_ui.py → gui/similar_history_match_ui.py

@@ -4,7 +4,13 @@
 import numpy as np
 import logging
 
-from similar_history_match import HistoryMatch
+from .similar_history_match import HistoryMatch
+# 从父目录找config
+import sys
+from pathlib import Path
+root_dir = Path(__file__).parent.parent
+if str(root_dir) not in sys.path:
+    sys.path.insert(0, str(root_dir))
 from config import MONSTER_COUNT, MONSTER_DATA
 
 logger = logging.getLogger(__name__)

main.py

@@ -18,15 +18,15 @@
 import loadData
 import auto_fetch
 from maa_adb_connector import MaaAdbConnector, MaaFrameworkDetector
-from dark_mode_style_fix import DarkModeStyleFix
-import similar_history_match
+from gui.dark_mode_style_fix import DarkModeStyleFix
+from gui.similar_history_match import HistoryMatch
+from gui.similar_history_match_ui import HistoryMatchUI
 import recognize
 from recognize import MONSTER_COUNT
 from specialmonster import SpecialMonsterHandler
 import data_package
 import winrt_capture
 from config import FIELD_FEATURE_COUNT, MONSTER_DATA
-from simular_history_match_ui import HistoryMatchUI
 from input_panel_ui import InputPanelUI
 
 logging.getLogger().setLevel(logging.DEBUG)
@@ -42,12 +42,12 @@
 
 
 try:
-    from predict import CannotModel
+    from core.predict import CannotModel
     from train import UnitAwareTransformer
 
     logger.info("Using PyTorch model for predictions.")
 except:
-    from predict_onnx import CannotModel
+    from core.predict_onnx import CannotModel
 
     logger.info("Using ONNX model for predictions.")
 
@@ -123,7 +123,7 @@ def __init__(self):
         # 初始化UI后加载历史数据
         logger.info("尝试获取错题本")
         self.history_match = None
-        self.history_match = similar_history_match.HistoryMatch()
+        self.history_match = HistoryMatch()
         # Ensure feat_past and N_history are initialized
         try:
             self.history_match.feat_past = np.hstack([self.history_match.past_left, self.history_match.past_right])

main_old.py

@@ -7,12 +7,12 @@
 import numpy as np
 import math
 from PIL import Image, ImageTk
-from predict import CannotModel
+from core.predict import CannotModel
 import loadData
 import recognize
 from train import UnitAwareTransformer
 from recognize import MONSTER_COUNT
-from similar_history_match import HistoryMatch
+from gui.similar_history_match import HistoryMatch
 from auto_fetch import AutoFetch
 
 logging.getLogger().setLevel(logging.DEBUG)

multi_instance.py

@@ -5,7 +5,7 @@
 import subprocess
 from pathlib import Path
 from PyQt6.QtWidgets import (
-    QApplication, QMainWindow, QWidget, QVBoxLayout, QHBoxLayout, 
+    QApplication, QMainWindow, QWidget, QVBoxLayout, QHBoxLayout,
     QPushButton, QLabel, QPlainTextEdit, QSpinBox, QComboBox, QCheckBox,
     QMessageBox, QSplitter, QScrollArea, QFrame, QLineEdit
 )
@@ -109,10 +109,10 @@ def get_cannot_model():
     if _cannot_model is None:
         logger.info("首次初始化 CannotModel...")
         try:
-            from predict import CannotModel
+            from core.predict import CannotModel
             logger.info("Using PyTorch model for predictions.")
         except Exception:
-            from predict_onnx import CannotModel
+            from core.predict_onnx import CannotModel
             logger.info("Using ONNX model for predictions.")
 
         _cannot_model = CannotModel()

tools/convert_model.py

@@ -1,9 +1,9 @@
 import sys
 sys.path.append(".")
 
-import predict
+import core.predict
 from train import UnitAwareTransformer
-import predict_onnx
+import core.predict_onnx
 import numpy as np
 from recognize import MONSTER_COUNT