Code formatted

src/errors/argument_exception.py

@@ -3,4 +3,4 @@ from src.errors.base_exception import base_exception
 
 class argument_exception(base_exception):
     def __init__(self, *args):
-        super().__init__(args)
+        super().__init__(args)

src/errors/base_exception.py

@@ -3,12 +3,11 @@ from src.errors.error_proxy import error_proxy
 
 class base_exception(Exception):
     __inner_error: error_proxy = error_proxy()
-    
+
     def __init__(self, *args: object) -> None:
         super().__init__(*args)
         self.__inner_error.set_error(self)
-        
-    @property    
+
+    @property
     def error(self):
-        return self.__inner_error      
-    
+        return self.__inner_error

src/errors/error_proxy.py

@@ -1,17 +1,13 @@
-
-
 class error_proxy:
     __error_text = ""
     __error_source = ""
     __is_error = False
-    
-    
+
     def __init__(self, error_text: str = "", error_source: str = "") -> None:
         self.error_source = error_source
         self.error_text = error_text
-        
-    
-    @property    
+
+    @property
     def error_text(self):
         """
             Текст сообщения
@@ -19,22 +15,20 @@ class error_proxy:
             _type_: _description_
         """
         return self.__error_text
-    
-    
+
     @error_text.setter
     def error_text(self, value: str):
         if not isinstance(value, str):
             raise Exception("Некорректно передан аргумент!")
-        
-        if(value.strip() ==""):
+
+        if value.strip() == "":
             self.__is_error = False
             return
-            
+
         self.__error_text = value.strip()
         self.__is_error = True
-        
-        
-    @property    
+
+    @property
     def error_source(self):
         """
             Источник ошибки
@@ -42,27 +36,24 @@ class error_proxy:
             _type_: _description_
         """
         return self.__error_source
-    
-    
+
     @error_source.setter
     def error_source(self, value: str):
         if not isinstance(value, str):
             raise Exception("Некорректно передан аргумент!")
-        
-        if(value.strip() ==""):
+
+        if value.strip() == "":
             return
-            
+
         self.__error_source = value.strip()
-    
-        
+
     @property
     def is_error(self):
         """
-            Флаг. Есть ошибка
+        Флаг. Есть ошибка
         """
-        return self.__is_error  
-        
-        
+        return self.__is_error
+
     def set_error(self, exception: Exception):
         """
             Сохранить ошибку
@@ -71,16 +62,16 @@ class error_proxy:
         """
         if not isinstance(exception, Exception):
             self.error_text = "Некорректно переданы параметры!"
-            self.error_source = "set_error" 
+            self.error_source = "set_error"
             return
 
-        if exception is not None:        
+        if exception is not None:
             self.error_text = f"ОШИБКА! {str(exception)}"
             self.error_source = f"ИСКЛЮЧЕНИЕ! {type(exception)}"
         else:
             self.error_text = ""
-            
-    @property        
+
+    @property
     def is_empty(self) -> bool:
         """
             Флаг. Есть ошибка
@@ -90,4 +81,4 @@ class error_proxy:
         if len(self._error_text) != 0:
             return False
         else:
-            return True         
+            return True

src/errors/file_exception.py

@@ -3,4 +3,4 @@ from src.errors.base_exception import base_exception
 
 class file_exception(base_exception):
     def __init__(self, *args):
-        super().__init__(args)
+        super().__init__(args)

src/errors/instance_exception.py

@@ -3,4 +3,4 @@ from src.errors.base_exception import base_exception
 
 class instance_exception(base_exception):
     def __init__(self, *args):
-        super().__init__(args)
+        super().__init__(args)

src/models/company_model.py

@@ -3,7 +3,7 @@ from src.settings.settings import settings
 from src.validation.validator import validator
 
 
-class company_model (abstract_reference):
+class company_model(abstract_reference):
     # ИНН
     __tax_id = 0
     # БИК
@@ -16,14 +16,13 @@ class company_model (abstract_reference):
     # Валидатор
     __vtor = validator()
 
-
     def __init__(self, name, data: settings):
         """
         Args:
             data (settings): Объект настроек с данными организации
         """
         self.__vtor.check_type(data, settings)
-        
+
         self.__tax_id = data.tax_id
         self.__bank_id = data.bank_id
         self.__bank_account_id = data.bank_account_id
@@ -36,21 +35,21 @@ class company_model (abstract_reference):
         """ИНН"""
 
         return self.__tax_id
-    
+
     @property
     def bank_id(self):
         """БИК"""
 
         return self.__bank_id
-    
+
     @property
     def bank_account_id(self):
         """Банковский счет"""
 
         return self.__bank_account_id
-    
+
     @property
     def property_type(self):
         """Вид собственности"""
 
-        return self.__property_type
+        return self.__property_type

src/models/ingredient_model.py

@@ -4,7 +4,7 @@ from src.models.abstract_reference import abstract_reference
 from src.validation.validator import validator
 
 
-class ingredient_model (abstract_reference):
+class ingredient_model(abstract_reference):
     # Номенклатура ингредиента
     __nomenclature = None
 
@@ -14,12 +14,16 @@ class ingredient_model (abstract_reference):
     # Единица измерения количества ингредиента
     __measurement_unit = None
 
-
     # Валидатор
     __vtor = validator()
 
-
-    def __init__(self, name, nomenclature:nomenclature_model, amount:int, unit:measurement_unit_model):
+    def __init__(
+        self,
+        name,
+        nomenclature: nomenclature_model,
+        amount: int,
+        unit: measurement_unit_model,
+    ):
         self.__vtor.check_type(nomenclature, nomenclature_model)
         self.__vtor.check_number(amount)
         self.__vtor.check_type(unit, measurement_unit_model)
@@ -28,13 +32,12 @@ class ingredient_model (abstract_reference):
         self.__measurement_unit = unit
         super().__init__(name)
 
-    
     @property
     def nomenclature(self):
         """Номенклатура ингредиента"""
 
         return self.__nomenclature
-    
+
     @nomenclature.setter
     def nomenclature(self, value: nomenclature_model):
         """
@@ -49,13 +52,12 @@ class ingredient_model (abstract_reference):
 
         self.__nomenclature = value
 
-    
     @property
     def amount(self):
         """Количество ингредиента"""
 
         return self.__amount
-    
+
     @amount.setter
     def amount(self, value):
         """
@@ -70,13 +72,12 @@ class ingredient_model (abstract_reference):
 
         self.__amount = value
 
-
     @property
     def measurement_unit(self):
         """Единица измерения количества ингредиента"""
 
         return self.__measurement_unit
-    
+
     @measurement_unit.setter
     def measurement_unit(self, value: measurement_unit_model):
         """
@@ -89,4 +90,4 @@ class ingredient_model (abstract_reference):
 
         self.__vtor.check_type(value, measurement_unit_model)
 
-        self.__measurement_unit = value
+        self.__measurement_unit = value

src/models/measurement_unit_model.py

@@ -2,7 +2,7 @@ from src.models.abstract_reference import abstract_reference
 from src.validation.validator import validator
 
 
-class measurement_unit_model (abstract_reference):
+class measurement_unit_model(abstract_reference):
     # Базовая единица измерения
     __base_measurement_unit = None
     # Базовый коэффициент
@@ -11,7 +11,7 @@ class measurement_unit_model (abstract_reference):
     # Валидатор
     __vtor = validator()
 
-    def __init__(self, name, base_coefficient = 1, base_measurement=None):
+    def __init__(self, name, base_coefficient=1, base_measurement=None):
         """
         Args:
             base_measurement (measurement_unit_model): Базовая единица измерения
@@ -25,19 +25,18 @@ class measurement_unit_model (abstract_reference):
         self.__base_coefficient = base_coefficient
 
         super().__init__(name)
-        
 
     @property
     def base_measurement_unit(self):
         """
-            Базовая единица измерения
+        Базовая единица измерения
         """
 
         if self.__base_measurement_unit is None:
             return self
 
         return self.__base_measurement_unit
-    
+
     @base_measurement_unit.setter
     def base_measurement_unit(self, value):
         """
@@ -52,15 +51,14 @@ class measurement_unit_model (abstract_reference):
 
         self.__base_measurement_unit = value
 
-    
     @property
     def base_coefficient(self):
         """
-            Коэффициент относительно базовой единицы измерения
+        Коэффициент относительно базовой единицы измерения
         """
 
         return self.__base_coefficient
-    
+
     @base_coefficient.setter
     def base_coefficient(self, value):
         """
@@ -74,16 +72,15 @@ class measurement_unit_model (abstract_reference):
         self.__vtor.check_number(value)
 
         self.__base_coefficient = value
-    
 
     def to_base_unit(self, value):
         """
-            Значение в базовой единице измерения
+        Значение в базовой единице измерения
         """
 
         return value * self.base_coefficient
-    
-    @staticmethod    
+
+    @staticmethod
     def create_g():
         """
             Создать единицу измерения грамм
@@ -92,8 +89,8 @@ class measurement_unit_model (abstract_reference):
             Модель грамма
         """
         item = measurement_unit_model("грамм")
-        return item    
-    
+        return item
+
     @staticmethod
     def create_kg():
         """
@@ -104,7 +101,7 @@ class measurement_unit_model (abstract_reference):
         g = measurement_unit_model.create_g()
         item = measurement_unit_model("киллограмм", 1000, g)
         return item
-    
+
     @staticmethod
     def create_pcs():
         """
@@ -113,7 +110,7 @@ class measurement_unit_model (abstract_reference):
             Модель штуки
         """
         return measurement_unit_model("штук")
-    
+
     @staticmethod
     def create_ml():
         """
@@ -122,7 +119,7 @@ class measurement_unit_model (abstract_reference):
             Модель миллилитра
         """
         return measurement_unit_model("мл")
-    
+
     @staticmethod
     def create_l():
         """
@@ -130,6 +127,4 @@ class measurement_unit_model (abstract_reference):
         Returns:
             Модель литра
         """
-        return measurement_unit_model("литр",
-                                      measurement_unit_model.create_ml(),
-                                      1000)
+        return measurement_unit_model("литр", measurement_unit_model.create_ml(), 1000)

src/models/nomenclature_group_model.py

@@ -1,7 +1,7 @@
 from src.models.abstract_reference import abstract_reference
 
 
-class nomenclature_group_model (abstract_reference):
+class nomenclature_group_model(abstract_reference):
     def __init__(self, name):
         super().__init__(name)
 
@@ -14,4 +14,4 @@ class nomenclature_group_model (abstract_reference):
             _type_: _description_
         """
         item = nomenclature_group_model("Ингредиенты")
-        return item
+        return item

src/models/nomenclature_model.py

@@ -15,7 +15,6 @@ class nomenclature_model(abstract_reference):
     # Валидатор
     __vtor = validator()
 
-
     def __init__(self, name, full_name, measurement_unit, nomenclature_group):
         """
         Args:
@@ -38,9 +37,9 @@ class nomenclature_model(abstract_reference):
     @property
     def full_name(self):
         """Полное наименование (до 256 символов)"""
-        
+
         return self.__full_name
-    
+
     @full_name.setter
     def full_name(self, value: str):
         """
@@ -56,13 +55,13 @@ class nomenclature_model(abstract_reference):
         self.__vtor.check_length_less(256)
 
         self.__full_name = value
-    
+
     @property
     def measurement_unit(self):
         """Единица измерения"""
 
         return self.__measurement_unit
-    
+
     @measurement_unit.setter
     def measurement_unit(self, value: measurement_unit_model):
         """
@@ -76,13 +75,13 @@ class nomenclature_model(abstract_reference):
         self.__vtor.check_type(value, measurement_unit_model)
 
         self.__measurement_unit = value
-    
+
     @property
     def nomenclature_group(self):
         """Группа номенклатуры"""
 
         return self.__nomenclature_group
-    
+
     @nomenclature_group.setter
     def nomenclature_group(self, value: nomenclature_group_model):
         """
@@ -95,4 +94,4 @@ class nomenclature_model(abstract_reference):
 
         self.__vtor.check_type(value, nomenclature_group_model)
 
-        self.__nomenclature_group = value
+        self.__nomenclature_group = value

src/models/recipe_model.py

@@ -3,24 +3,21 @@ from src.models.abstract_reference import abstract_reference
 from src.validation.validator import validator
 
 
-class recipe_model (abstract_reference):
+class recipe_model(abstract_reference):
     # Ингредиенты рецепта
     __ingredients = list()
 
     # Шаги приготовления рецепта
     __steps = list()
 
-
     # Валидатор
     __vtor = validator()
 
-
     def __init__(self, name):
         super().__init__(name)
 
-    
     @staticmethod
-    def create(name, ingredients:list=None, steps:list=None):
+    def create(name, ingredients: list = None, steps: list = None):
         """
             Фабричный метод для создания рецепта
         Args:
@@ -31,19 +28,18 @@ class recipe_model (abstract_reference):
         """
 
         recipe = recipe_model(name)
-        
+
         recipe.ingredients = ingredients if ingredients is not None else list()
         recipe.steps = steps if steps is not None else list()
 
         return recipe
 
-
     @property
     def ingredients(self):
         """Ингредиенты рецепта"""
 
         return self.__ingredients
-    
+
     @ingredients.setter
     def ingredients(self, ingredients: list):
         """
@@ -57,16 +53,15 @@ class recipe_model (abstract_reference):
 
         self.__vtor.check_type(ingredients, list)
         self.__vtor.check_collection_types_all(ingredients, ingredient_model)
-        
-        self.__ingredients = ingredients
 
+        self.__ingredients = ingredients
 
     @property
     def steps(self):
         """Шаги рецепта"""
 
         return self.__steps
-    
+
     @steps.setter
     def steps(self, steps: list):
         """
@@ -79,8 +74,9 @@ class recipe_model (abstract_reference):
         """
 
         self.__vtor.check_type(steps, list)
-        self.__vtor.check_collection_all(steps,
-                                               lambda item: self.__vtor.check_type(item, str))
+        self.__vtor.check_collection_all(
+            steps, lambda item: self.__vtor.check_type(item, str)
+        )
         self.__vtor.check_collection_types_all(steps, str)
-        
-        self.__steps = steps
+
+        self.__steps = steps

src/models/warehouse_model.py

@@ -1,6 +1,6 @@
 from src.models.abstract_reference import abstract_reference
 
 
-class warehouse_model (abstract_reference):
+class warehouse_model(abstract_reference):
     def __init__(self, name):
-        super().__init__(name)
+        super().__init__(name)

src/storage/storage.py

@@ -3,13 +3,12 @@
 #
 class storage:
     __data = {}
-    
-    
+
     def __new__(cls):
-        if not hasattr(cls, 'instance'):
+        if not hasattr(cls, "instance"):
             cls.instance = super(storage, cls).__new__(cls)
-        return cls.instance  
-    
+        return cls.instance
+
     @property
     def data(self) -> dict:
         """
@@ -20,7 +19,6 @@ class storage:
         """
         return self.__data
 
- 
     @staticmethod
     def nomenclature_key():
         """
@@ -30,7 +28,6 @@ class storage:
         """
         return "nomenclature"
 
-  
     @staticmethod
     def nomenclature_group_key():
         """
@@ -39,9 +36,8 @@ class storage:
             _type_: _description_
         """
         return "group"
-      
-      
-    @staticmethod  
+
+    @staticmethod
     def measurement_unit_key():
         """
               Список единиц измерения
@@ -49,7 +45,6 @@ class storage:
             _type_: _description_
         """
         return "unit"
-    
 
     @staticmethod
     def ingredient_key():
@@ -59,7 +54,6 @@ class storage:
             _type_: _description_
         """
         return "ingredient"
-    
 
     @staticmethod
     def recipe_key():
@@ -69,4 +63,3 @@ class storage:
             _type_: _description_
         """
         return "recipe"
-    

tests/test_models.py

@@ -16,10 +16,10 @@ class test_models(unittest.TestCase):
         setman = settings_manager()
         setman.open(path.dirname(__file__) + "/../config/settings.json")
         sts = setman.settings
-    
+
         # Действие
         company = company_model("Test company", sts)
-    
+
         # Проверка
         assert isinstance(company, company_model)
         print("c", company.tax_id)
@@ -28,15 +28,14 @@ class test_models(unittest.TestCase):
         assert company.bank_id == sts.bank_id
         assert company.bank_account_id == sts.bank_account_id
         assert company.property_type == sts.property_type
-        
+
     def test_measurement_unit(self):
         # Подготовка
         g = measurement_unit_model("Граммы")
         kg = measurement_unit_model("Килограммы", 1000, g)
-    
+
         # Действие
-        
-    
+
         # Проверка
         assert isinstance(g, measurement_unit_model)
         assert isinstance(kg, measurement_unit_model)
@@ -47,11 +46,12 @@ class test_models(unittest.TestCase):
         # Подготовка
         munit = measurement_unit_model("Test munit")
         fn = "abc"
-        nom = nomenclature_model("Test nomenclature", fn, munit, nomenclature_group_model("Test ng"))
-    
+        nom = nomenclature_model(
+            "Test nomenclature", fn, munit, nomenclature_group_model("Test ng")
+        )
+
         # Действие
-        
-    
+
         # Проверка
         assert isinstance(nom, nomenclature_model)
         assert nom.full_name == fn
@@ -94,16 +94,15 @@ class test_models(unittest.TestCase):
         assert len(recipe.steps) == 2
         assert recipe.steps[0] == steps[0]
         assert recipe.steps[1] == steps[1]
-        
+
     def test_base_name_validation(self):
         # Подготовка
         fn = "abc"
         some = abstract_reference(fn)
         fn *= 2
-    
+
         # Действие
         some.name = fn
-    
+
         # Проверка
         assert some.name == fn
-