chore: навел порядок в импортах

src/base/base.py

@@ -1,18 +1,14 @@
-# TODO: Почему каталог с базовыми классами лежит внутри каталога с утилитами? Это странно.
-
-
 from __future__ import annotations
-# TODO: Правило хорошего тона при оформлении импортов: сначала встроенные библиотеки,
-#  через одну пустую строку - дополнительно установленные, и еще через одну пустую строку - собственные импорты.
 import os
 from typing import Optional, Union, Any
+
 from cachetools import LRUCache
 import numpy as np
 import pyqtgraph as pg
-
 import pandas as pd
 from PyQt5.QtCore import QObject, QTimer
 from PyQt5.QtWidgets import QWidget, QTabWidget, QMainWindow, QVBoxLayout
+
 from OptAlgorithm import OptAlgorithm
 from utils.qt_settings import dark_style
 

src/controller/controller.py

@@ -1,8 +1,9 @@
-from PyQt5.QtWidgets import QWidget
-from PyQt5.QtCore import pyqtSignal
 from typing import Union
 
-from utils.base.base import BaseController
+from PyQt5.QtWidgets import QWidget
+from PyQt5.QtCore import pyqtSignal
+
+from base.base import BaseController
 
 
 class Controller(BaseController):

src/controller/converter.py

@@ -1,13 +1,15 @@
-import pandas as pd
 import traceback
 import sys
+
+import pandas as pd
 from loguru import logger
 
+from base.base import BaseDataConverter
+
+
 # FIXME: костыль для выключения предупреждения "replace deprecated"
 pd.set_option('future.no_silent_downcasting', True)
 
-from utils.base.base import BaseDataConverter
-
 
 class DataConverter(BaseDataConverter):
 

src/controller/mediator.py

@@ -1,10 +1,9 @@
-import pandas as pd
-import time
-
 from typing import Union
+
+import pandas as pd
 from PyQt5.QtWidgets import QWidget
 
-from utils.base.base import (BaseMediator, BaseDirectoryMonitor, 
+from base.base import (BaseMediator, BaseDirectoryMonitor, 
                              BaseDataConverter, BasePlotWidget, 
                              BasePointPassportFormer)
 
@@ -16,20 +15,19 @@ class Mediator(BaseMediator):
                data: Union[list[str], list[pd.DataFrame], list[list], list[QWidget]]):
         
         if issubclass(source.__class__, BaseDirectoryMonitor):
-            # TODO: self._controller.update_status("CSV found! Calculating...") А вот так нельзя написать?
+            self._controller.update_status("CSV found! Calculating...")
-            self.update_status("CSV found! Calculating...")
             self._converter.convert_data(data)
 
         if issubclass(source.__class__, BaseDataConverter):
-            self.update_status(0.5)
+            self._controller.update_status(1)
             self._passportFormer.form_passports(data)
 
         if issubclass(source.__class__, BasePointPassportFormer):
-            self.update_status(1)
+            self._controller.update_status(2)
             self._plot.build(data)
 
         if issubclass(source.__class__, BasePlotWidget):
-            self.update_status(100)
+            self._controller.update_status(100)
             self._controller.send_widgets(data)
 
     def update_settings(self, settings: list[dict]):
@@ -40,8 +38,5 @@ class Mediator(BaseMediator):
         self._monitor.update_settings(settings)
         self._passportFormer.update_settings(settings)
 
-    def update_status(self, msg: Union[str, float]) -> None:
-        # TODO: Бессмысленный метод.
-        self._controller.update_status(msg)
 
 

src/controller/monitor.py

@@ -1,7 +1,8 @@
 import os
+
 from loguru import logger
 
-from utils.base.base import BaseDirectoryMonitor
+from base.base import BaseDirectoryMonitor
 
 
 class DirectoryMonitor(BaseDirectoryMonitor):

src/controller/passportFormer.py

@@ -1,9 +1,10 @@
-import pandas as pd
 import traceback
 import sys
+
+import pandas as pd
 from loguru import logger
 
-from utils.base.base import BasePointPassportFormer, BaseIdealDataBuilder
+from base.base import BasePointPassportFormer, BaseIdealDataBuilder
 
 
 class idealDataBuilder(BaseIdealDataBuilder):

src/gui/mainGui.py

@@ -1,11 +1,12 @@
 from datetime import datetime as dt
 from typing import Optional
+
 from PyQt5 import QtWidgets
 from PyQt5.QtCore import Qt
 from PyQt5.QtGui import QPixmap, QIcon
 from PyQt5.QtWidgets import QSizePolicy as QSP
 
-from utils.base.base import BaseMainWindow, BaseController
+from base.base import BaseMainWindow, BaseController
 from gui.settings_window import SystemSettings, OperatorSettings
 from gui.reportGui import ReportSettings
 

src/gui/plotter.py

@@ -1,18 +1,18 @@
+import copy
+import traceback
+import sys
+from typing import Optional, Any
+
 from PyQt5.QtWidgets import (QWidget, QVBoxLayout,
                               QHBoxLayout, QLabel,
                                 QGraphicsRectItem, QSpacerItem,
                                 QSizePolicy)
-
 from PyQt5.QtCore import Qt
-import copy
-import traceback
-import sys
 from loguru import logger
 import pyqtgraph as pg
 import pandas as pd
-from typing import Optional, Any
 
-from utils.base.base import BasePlotWidget
+from base.base import BasePlotWidget
 # TODO: Навести порядок в импортах.
 
 class ProcessStage():

src/gui/reportGui.py

@@ -1,11 +1,11 @@
-import pyqtgraph as pg
-from pyqtgraph.parametertree import Parameter, ParameterTree
-from typing import Union
-from PyQt5 import QtWidgets
 import traceback
 import sys
-from loguru import logger
+from typing import Union
 
+import pyqtgraph as pg
+from pyqtgraph.parametertree import Parameter, ParameterTree
+from PyQt5 import QtWidgets
+from loguru import logger
 
 
 class ReportSettings(QtWidgets.QWidget):

src/gui/settings_window.py

@@ -1,4 +1,5 @@
 from typing import Callable, Optional, Any
+
 from PyQt5.QtWidgets import (QWidget, QPushButton, 
                              QLineEdit, QHBoxLayout, 
                              QVBoxLayout, QLabel, 
@@ -9,6 +10,7 @@ from PyQt5.QtGui import QIntValidator, QDoubleValidator
 from utils.json_tools import read_json, write_json
 from utils import qt_settings as qts
 
+
 class settingsWindow(QWidget):
     def __init__(self, path: str, name: str, upd_func: Callable[[], None], names: dict):
         """

src/performance/performance.py

@@ -1,5 +1,6 @@
 from typing import Optional
 import os
+
 import numpy as np
 import pandas as pd
 

src/performance/roboter.py

@@ -1,10 +1,11 @@
-from __future__ import annotations
 from abc import ABC, abstractmethod
-from typing import Optional
 import os
+from typing import Optional
+from __future__ import annotations
+
 import numpy as np
 import pandas as pd
-# TODO: Оформление импортов
+
 
 
 class BasePerformanceFactory(ABC):

src/uml/request_generator.py

@@ -1,6 +1,7 @@
-from plantuml import PlantUML
 from os.path import abspath
-# TODO: Навести порядок в импортах.
+
+from plantuml import PlantUML
+
 
 class Request:
     # TODO: Имя класса не соответствует тому, что он делает.