From bd1faa5a79ff41373120b1113c8710e63b0639c2 Mon Sep 17 00:00:00 2001 From: zosimovaa Date: Sat, 8 Nov 2025 17:46:27 +0300 Subject: [PATCH] Completed transfer of classes, corrected imports. --- .../excel_processor/configurable_parser.py | 12 +++++++++++- src/mail_order_bot/excel_processor/excel_parser.py | 10 +++++++--- .../excel_processor/excel_processor.py | 10 ++++++++++ src/mail_order_bot/excel_processor/parser_factory.py | 10 +++++++++- 4 files changed, 37 insertions(+), 5 deletions(-) diff --git a/src/mail_order_bot/excel_processor/configurable_parser.py b/src/mail_order_bot/excel_processor/configurable_parser.py index c623947..a07e4a2 100644 --- a/src/mail_order_bot/excel_processor/configurable_parser.py +++ b/src/mail_order_bot/excel_processor/configurable_parser.py @@ -1,4 +1,14 @@ -from typing import Optional +import logging +import pandas as pd +from typing import Dict, Any, Optional, List +from decimal import Decimal + +from .excel_parser import ExcelParser +from .order_position import OrderPosition + + +logger = logging.getLogger(__name__) + class ConfigurableExcelParser(ExcelParser): """ Универсальный парсер, настраиваемый через конфигурацию. diff --git a/src/mail_order_bot/excel_processor/excel_parser.py b/src/mail_order_bot/excel_processor/excel_parser.py index e0b33ff..8ae12f9 100644 --- a/src/mail_order_bot/excel_processor/excel_parser.py +++ b/src/mail_order_bot/excel_processor/excel_parser.py @@ -1,7 +1,11 @@ -from abc import ABC, abstractmethod -from typing import List -import pandas as pd import logging +import pandas as pd +from abc import ABC, abstractmethod +from typing import Dict, Any, List + + +from .order_position import OrderPosition + logger = logging.getLogger(__name__) diff --git a/src/mail_order_bot/excel_processor/excel_processor.py b/src/mail_order_bot/excel_processor/excel_processor.py index adf09f8..3fa59e2 100644 --- a/src/mail_order_bot/excel_processor/excel_processor.py +++ b/src/mail_order_bot/excel_processor/excel_processor.py @@ -1,3 +1,13 @@ +import logging +from typing import List +from pathlib import Path + +from .parser_factory import ParserFactory +from .order_position import OrderPosition + + +logger = logging.getLogger(__name__) + class ExcelProcessor: """ Главный класс-фасад для обработки Excel файлов. diff --git a/src/mail_order_bot/excel_processor/parser_factory.py b/src/mail_order_bot/excel_processor/parser_factory.py index a4bf045..d3b91d5 100644 --- a/src/mail_order_bot/excel_processor/parser_factory.py +++ b/src/mail_order_bot/excel_processor/parser_factory.py @@ -1,6 +1,14 @@ import yaml import json +import logging from pathlib import Path +from typing import Dict, Any, List + +from .excel_parser import ExcelParser +from .configurable_parser import ConfigurableExcelParser + + +logger = logging.getLogger(__name__) class ParserFactory: """ @@ -10,7 +18,7 @@ class ParserFactory: # Реестр кастомных парсеров CUSTOM_PARSERS = { - 'supplier_a': SupplierAParser, + #'supplier_a': SupplierAParser, # Добавляйте сюда специализированные парсеры }