Рефаткоринг, добавляю пайплайн
This commit is contained in:
@@ -0,0 +1,28 @@
|
||||
clients:
|
||||
"todx.ru":
|
||||
- handler: "OrderParser",
|
||||
config:
|
||||
sheet_name: "Лист1"
|
||||
key_value: "Артикул"
|
||||
mapping:
|
||||
name: "Наименование"
|
||||
manufacturer: "Производитель"
|
||||
price: "Цена\nдетали"
|
||||
quantity: "Кол-\nво"
|
||||
total: "Сумма"
|
||||
- handler: "OrderCreator"
|
||||
- handler: "ExcelWriter"
|
||||
config: "output.xlsx"
|
||||
- handler: "EmailSender"
|
||||
config:
|
||||
to: "todx@yandex.ru"
|
||||
- Notifier:
|
||||
- channel: "email"
|
||||
to : "status@zapchastiya.ru"
|
||||
- channel: "telegram"
|
||||
to: "123454323"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
import logging
|
||||
import requests
|
||||
from ..abstract_task import AbstractTask
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
class InstantOrderTest(AbstractTask):
|
||||
URL = "https://api.telegram.org/bot{0}/sendMessage?chat_id={1}&text={2}"
|
||||
|
||||
def do(self) -> None:
|
||||
|
||||
positions = self.context["positions"]
|
||||
|
||||
message = f"Запрос на создание заказа от {self.context['client']}:\n"
|
||||
message += "\n".join(f"{pos.article}: {pos.name} ({pos.quantity} x {pos.price} = {pos.total})" for pos in positions)
|
||||
|
||||
api_key = self.config["api_key"]
|
||||
chat_id = self.config["chat_id"]
|
||||
url = self.URL.format(api_key, chat_id, message)
|
||||
resp = requests.get(url).json()
|
||||
logger.info(resp)
|
||||
|
||||
@@ -1,25 +1,22 @@
|
||||
import logging
|
||||
import pandas as pd
|
||||
from abc import ABC, abstractmethod
|
||||
from typing import Dict, Any, List
|
||||
from io import BytesIO
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
from typing import Dict, Any
|
||||
|
||||
|
||||
class AbstractHandler(ABC):
|
||||
class AbstractTask(ABC):
|
||||
"""
|
||||
Абстрактный базовый класс для всех хэндлеров.
|
||||
"""
|
||||
|
||||
def __init__(self, config: Dict[str, Any], context: Dict[str, Any],*args, **kwargs) -> None:
|
||||
self.config = config
|
||||
self.context = context
|
||||
|
||||
@abstractmethod
|
||||
def do(self, *args, **kwargs) -> Dict[str, Any]:
|
||||
def do(self) -> None:
|
||||
"""
|
||||
Парсит Excel файл и возвращает список позиций.
|
||||
Должен быть реализован в каждом конкретном парсере.
|
||||
Выполняет работу над заданием
|
||||
Входные и выходные данные - в self.context
|
||||
Конфиг задается при инициализации
|
||||
"""
|
||||
pass
|
||||
raise NotImplementedError
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ class BasicExcelParser(AbstractTask):
|
||||
Подходит для большинства стандартных случаев.
|
||||
"""
|
||||
|
||||
def do(self) -> List[OrderPosition]:
|
||||
def do(self) -> None:
|
||||
|
||||
# todo сделать проверку на наличие файла и его тип
|
||||
file_bytes = BytesIO(self.context.get("attachment")) # self.context.get("attachment") #
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
import logging
|
||||
import pandas as pd
|
||||
from typing import Dict, Any, Optional, List
|
||||
from decimal import Decimal
|
||||
|
||||
from ..abstract_task import AbstractTask
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
class TestNotifier(AbstractTask):
|
||||
def do(self) -> None:
|
||||
|
||||
positions = self.context["positions"]
|
||||
|
||||
print(f"\nПолучено {len(positions)} позиций от {self.context["client"]}:")
|
||||
for pos in positions: # Первые 5
|
||||
print(f" - {pos.article}: {pos.name} "
|
||||
f"({pos.quantity} x {pos.price} = {pos.total})")
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
from enum import Enum
|
||||
|
||||
class OrderStatus(Enum):
|
||||
NEW = 1
|
||||
IN_PROGRESS = 2
|
||||
COMPLETED = 3
|
||||
FAILED = 4
|
||||
OPERATOR_HANDLING = 5
|
||||
INVALID = 6
|
||||
|
||||
|
||||
class Order:
|
||||
def __init__(self, context: dict):
|
||||
attachment = context["attachment"]
|
||||
self.context = context
|
||||
@@ -1,35 +1,36 @@
|
||||
from pathlib import Path
|
||||
import os
|
||||
import yaml
|
||||
import json
|
||||
import logging
|
||||
from typing import Dict, Any
|
||||
from pathlib import Path
|
||||
|
||||
from ..task_handler.excel_parsers.basic_excel_parcer import BasicExcelParser
|
||||
from ..task_handler.notifiers.test_notifier import TestNotifier
|
||||
from ..task_handler.abcp_client.OrderCreator import InstantOrderTest
|
||||
|
||||
from ..excel_processor.configurable_parser import ConfigurableExcelParser
|
||||
|
||||
|
||||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
class TaskProcessor:
|
||||
def __init__(self, config_path: Path):
|
||||
self.config_path = config_path
|
||||
self.context = {}
|
||||
self.context = dict()
|
||||
|
||||
def process(self, client, file_object):
|
||||
def process(self, client, attachment):
|
||||
config = self._load_config(client)
|
||||
self.context = dict()
|
||||
self.context["client"] = client
|
||||
self.context["attachment"] = attachment.content
|
||||
|
||||
self.context["status"] = client
|
||||
|
||||
for stage in config["pipeline"]:
|
||||
handler_name = stage["handler"]
|
||||
config = stage["config"]
|
||||
|
||||
handler = globals()[handler_name](config)
|
||||
self.context["positions"] = handler.parse(file_object)
|
||||
|
||||
|
||||
return self.context["positions"]
|
||||
|
||||
logger.info(f"Processing handler: {handler_name}")
|
||||
task = globals()[handler_name](stage.get("config", None), self.context)
|
||||
task.do()
|
||||
|
||||
return self.context
|
||||
|
||||
|
||||
pass
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
# Конфигурационный файл для контрагента todx.ru
|
||||
|
||||
pipeline:
|
||||
# Обработчик вложений
|
||||
- handler: "BasicExcelParser"
|
||||
config:
|
||||
sheet_name: 0
|
||||
key_field: "Код детали"
|
||||
mapping:
|
||||
article: "Код детали"
|
||||
manufacturer: "Производитель"
|
||||
name: "Наименование"
|
||||
price: "Цена\nдетали"
|
||||
quantity: "Кол-\nво"
|
||||
total: "Сумма"
|
||||
|
||||
- handler: InstantOrderTest
|
||||
config:
|
||||
api_key: "8056899069:AAFEfw9QRMvmEwQyH0CI4e_v_sZuOSdNWcE"
|
||||
chat_id: 211945135
|
||||
|
||||
- handler: "TestNotifier"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
import os
|
||||
import chardet # pip install chardet
|
||||
import traceback
|
||||
from mail_order_bot.task_handler import TaskProcessor
|
||||
import datetime
|
||||
# установим рабочую директорию
|
||||
import os
|
||||
|
||||
os.chdir(os.path.dirname(os.path.abspath(__file__)))
|
||||
from io import BytesIO
|
||||
|
||||
import logging
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
logging.basicConfig(level=logging.WARNING, format='%(module)s - %(message)s') # %(asctime)s -
|
||||
BASE_PATH = './files'
|
||||
|
||||
|
||||
from mail_order_bot.email_client import EmailMessage, EmailAttachment
|
||||
|
||||
processor = TaskProcessor("./configs")
|
||||
|
||||
for provider_name in os.listdir(BASE_PATH):
|
||||
provider_folder = os.path.join(BASE_PATH, provider_name)
|
||||
if os.path.isdir(provider_folder):
|
||||
for file_name in os.listdir(provider_folder):
|
||||
file_path = os.path.join(provider_folder, file_name)
|
||||
if os.path.isfile(file_path):
|
||||
with open(file_path, 'rb') as file: # бинарный режим
|
||||
raw_data = file.read()
|
||||
|
||||
# Создаем объект EmailAttachment
|
||||
att = EmailAttachment(file_name, raw_data)
|
||||
email = EmailMessage(
|
||||
from_addr=provider_name,
|
||||
from_email='test@gmail.com',
|
||||
subj='order request',
|
||||
dt=datetime.datetime.now(),
|
||||
body= 'body text',
|
||||
attachments=[att],
|
||||
first_sender='test@gmail.com'
|
||||
)
|
||||
|
||||
|
||||
|
||||
#bio = BytesIO(raw_data)
|
||||
print("========================================================")
|
||||
print(f'Обработка: {provider_name} - {file_name}')
|
||||
try:
|
||||
|
||||
positions_a = processor.process(provider_name, att)
|
||||
|
||||
|
||||
|
||||
|
||||
except Exception as e:
|
||||
print(f"Ошибка обработки: {e}", traceback.format_exc())
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user