Basic docker configs added

.gitignore

@@ -1,6 +1,5 @@
-.venv
+venv
 .vscode
 __pycache__
 .env
 .cursorignore
-logs/

dockerfile

@@ -1,5 +1,5 @@
 # Используем официальный образ Python
-FROM python:3.12-slim
+FROM python:3.11-slim
 
 # Устанавливаем git для клонирования репозитория
 RUN apt-get update && apt-get install -y git && rm -rf /var/lib/apt/lists/*
@@ -27,6 +27,4 @@ ENV PYTHONDONTWRITEBYTECODE=1
 
 # Команда запуска приложения (замените на вашу)
 # CMD ["python", "-m", "mail_order_bot"]
-WORKDIR /app/src/mail_order_bot
-
-CMD ["python", "/app/src/mail_order_bot/main.py"]
+CMD ["python", "src/mail_order_bot/main.py"]

pyproject.toml

@@ -1,32 +0,0 @@
-[build-system]
-requires = ["setuptools>=75.3.0"]
-build-backend = "setuptools.build_meta"
-
-[project]
-name = "MailOrderBot"
-description = "Config manager for building applications"
-version = "1.0.4"
-authors = [
-    { name = "Aleksei Zosimov", email = "lesha.spb@gmail.com" }
-]
-readme = "README.md"
-
-requires-python = ">=3.12"
-dependencies = [
-    "python-dotenv>=1.0.0",
-    "config_manager @ git+https://git.lesha.spb.ru/alex/config_manager.git@master"
-]
-
-[tool.setuptools.packages.find]
-where = ["src"]
-
-[project.urls]
-Homepage = "https://git.lesha.spb.ru/alex/mail_order_bot"
-Documentation = "https://git.lesha.spb.ru/alex/mail_order_bot"
-Repository = "https://git.lesha.spb.ru/alex/mail_order_bot"
-
-
-[tool.pytest.ini_options]
-addopts = [
-    "--import-mode=importlib",
-]

pyptoject.toml

@@ -0,0 +1,14 @@
+[build-system]
+requires = ["setuptools>=75.3.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "MailOrderBot"
+requires-python = ">=3.12"
+dependencies = [
+    "python-dotenv>=1.0.0"
+]
+dynamic = ["version"]
+
+[tool.setuptools.packages.find]
+where = ["src"]

src/MailOrderBot.egg-info/PKG-INFO

@@ -1,11 +0,0 @@
-Metadata-Version: 2.4
-Name: MailOrderBot
-Version: 1.0.2
-Summary: Config manager for building applications
-Author-email: Aleksei Zosimov <lesha.spb@gmail.com>
-Project-URL: Homepage, https://git.lesha.spb.ru/alex/config_manager
-Project-URL: Documentation, https://git.lesha.spb.ru/alex/config_manager
-Project-URL: Repository, https://git.lesha.spb.ru/alex/config_manager
-Requires-Python: >=3.12
-Description-Content-Type: text/markdown
-Requires-Dist: python-dotenv>=1.0.0

src/MailOrderBot.egg-info/SOURCES.txt

@@ -1,17 +0,0 @@
-README.md
-pyproject.toml
-src/MailOrderBot.egg-info/PKG-INFO
-src/MailOrderBot.egg-info/SOURCES.txt
-src/MailOrderBot.egg-info/dependency_links.txt
-src/MailOrderBot.egg-info/requires.txt
-src/MailOrderBot.egg-info/top_level.txt
-src/mail_order_bot/__init__.py
-src/mail_order_bot/main.py
-src/mail_order_bot/email_client/__init__.py
-src/mail_order_bot/email_client/email_client.py
-src/mail_order_bot/email_client/email_objects.py
-src/mail_order_bot/excel_processor/configurable_parser.py
-src/mail_order_bot/excel_processor/excel_parser.py
-src/mail_order_bot/excel_processor/excel_processor.py
-src/mail_order_bot/excel_processor/order_position.py
-src/mail_order_bot/excel_processor/parser_factory.py

src/MailOrderBot.egg-info/dependency_links.txt

@@ -1 +0,0 @@
-

src/MailOrderBot.egg-info/requires.txt

@@ -1 +0,0 @@
-python-dotenv>=1.0.0

src/MailOrderBot.egg-info/top_level.txt

@@ -1 +0,0 @@
-mail_order_bot

src/mail_order_bot/config.yml

@@ -1,58 +0,0 @@
-# === Раздел с общими конфигурационными параметрами ===
-
-update_interval: 10
-work_interval: 30
-
-email_dir: "spareparts"
-
-# === Логирование ===
-log:
-  version: 1
-  disable_existing_loggers: False
-
-  formatters:
-    standard:
-      format: '%(asctime)s %(module)15s [%(levelname)8s]: %(message)s'
-    telegram:
-      format: '%(message)s'
-
-  handlers:
-    console:
-      level: DEBUG
-      formatter: standard
-      class: logging.StreamHandler
-      stream: ext://sys.stdout  # Default is stderr
-
-    file:
-      level: DEBUG
-      formatter: standard
-      class: logging.handlers.RotatingFileHandler
-      filename: logs/log.log
-      mode: a
-      maxBytes: 500000
-      backupCount: 10
-
-    telegram:
-      level: CRITICAL
-      formatter: telegram
-      class: logging_telegram_handler.TelegramHandler
-      chat_id: 211945135
-      alias: "Mail order bot"
-
-
-# -- Логгеры --
-  loggers:
-    '':
-      handlers: [console, file, telegram]
-      level: INFO
-      propagate: False
-
-    __main__:
-      handlers: [console, file, telegram]
-      level: INFO
-      propagate: False
-
-    config_manager:
-      handlers: [console, file]
-      level: DEBUG
-    

src/mail_order_bot/email_client/__init__.py

@@ -1,2 +1,19 @@
-from .client import EmailClient
-from .objects import EmailMessage, EmailAttachment
+from .email_client import EmailClient
+from .email_objects import EmailMessage, EmailAttachment
+
+
+__all__ = ['EmailClient', 'EmailMessage', 'EmailAttachment']
+
+def test_email_client():
+    email_client = EmailClient(
+        imap_host='imap.yandex.ru',
+        smtp_host='smtp.yandex.ru',
+        email='zosimovaa@yandex.ru',
+        password='test'
+    )
+    assert email_client is not None
+    email_client.close()
+    pytest.main()
+
+if __name__ == "__main__":
+    test_email_client()

src/mail_order_bot/email_client/email_client.py

@@ -1,17 +1,17 @@
+import imaplib
+import smtplib
 import re
-from datetime import datetime
-from typing import List, Optional
-from dataclasses import dataclass
-import email
-from email import encoders
 from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
 from email.mime.base import MIMEBase
+from email import encoders
+import email
 from email.header import decode_header
-import imaplib
-import smtplib
+from datetime import datetime
+from typing import List, Optional
+from dataclasses import dataclass
 
-from .objects import EmailMessage, EmailAttachment
+from .email_objects import EmailMessage, EmailAttachment
 
 
 class EmailClient:
@@ -109,16 +109,27 @@ class EmailClient:
         07.10.2025, 16:01, Имя (email@example.com):
         Кому: ...
         """
-        # Ищем email внутри скобок после строки "Пересылаемое сообщение"
-        pattern = r"Пересылаемое сообщение.*?\((.*?)\)"
-        match = re.search(pattern, body, re.DOTALL)
+        # Ищем первую секцию пересылаемого сообщения (по структуре письма)
+        match = re.search(
+            r"-{8,}\\s*Пересылаемое сообщение\\s*-{8,}.*?(\\d{2}\\.\\d{2}\\.\\d{4},\\s*\\d{2}:\\d{2},.*?)\\(([^\\)]+)\\):",
+            body, re.DOTALL)
+        emails = []
         if match:
-            return match.group(1)
-        return None
+            emails.append(match.group(2))  # email из первой строки пересыла
+        # Ищем все email в первой пересылаемой секции (например, в "Кому:")
+        forwarded_section = re.search(
+            r"^-{8,}.*?Пересылаемое сообщение.*?:$(.*?)(?:^[-=]{5,}|\\Z)",
+            body, re.MULTILINE | re.DOTALL)
+        if forwarded_section:
+            addresses = re.findall(r"\\b([\\w\\.-]+@[\\w\\.-]+)\\b", forwarded_section.group(1))
+            for addr in addresses:
+                if addr not in emails:
+                    emails.append(addr)
+        return emails
     
     def _extract_body(self, msg: email.message.Message) -> str:
         """
-        Извлечь текст письма из любого типа содержимого, кроме вложений.
+        Извлечь текст письма.
         
         Args:
             msg: Объект письма
@@ -130,36 +141,25 @@ class EmailClient:
         
         if msg.is_multipart():
             for part in msg.walk():
+                content_type = part.get_content_type()
                 content_disposition = str(part.get("Content-Disposition", ""))
-                # Пропускаем вложения
-                if "attachment" in content_disposition.lower():
-                    continue
-                try:
-                    charset = part.get_content_charset() or 'utf-8'
-                    payload = part.get_payload(decode=True)
-                    if payload:
-                        body_piece = payload.decode(charset, errors='ignore')
-                        body += body_piece
-                except Exception:
-                    pass
+                
+                # Ищем текстовые части без вложений
+                if content_type == "text/plain" and "attachment" not in content_disposition:
+                    try:
+                        charset = part.get_content_charset() or 'utf-8'
+                        body += part.get_payload(decode=True).decode(charset, errors='ignore')
+                    except:
+                        pass
         else:
             try:
                 charset = msg.get_content_charset() or 'utf-8'
-                payload = msg.get_payload(decode=True)
-                if payload:
-                    body = payload.decode(charset, errors='ignore')
-            except Exception:
+                body = msg.get_payload(decode=True).decode(charset, errors='ignore')
+            except:
                 pass
         
         return body
     
-    def __extract_email(self, text: str) -> str:
-        match = re.search(r'<([^<>]+)>', text)
-        if match:
-            return match.group(1)
-        return None
-
-    
     def _extract_attachments(self, msg: email.message.Message) -> List[EmailAttachment]:
         """
         Извлечь вложения из письма.
@@ -239,8 +239,6 @@ class EmailClient:
                 from_addr = self._decode_header(msg.get("From", ""))
                 subject = self._decode_header(msg.get("Subject", ""))
                 
-                from_email = self.__extract_email(from_addr)
-                
                 # Получаем дату
                 date_str = msg.get("Date", "")
                 try:
@@ -256,7 +254,6 @@ class EmailClient:
                 # Извлекаем тело письма
                 body = self._extract_body(msg)
 
-                #print(body)
                 first_sender = self._extract_first_sender(body)
                 
                 # Извлекаем вложения
@@ -265,7 +262,6 @@ class EmailClient:
                 # Создаем объект письма
                 email_obj = EmailMessage(
                     from_addr=from_addr,
-                    from_email=from_email,
                     subj=subject,
                     dt=dt,
                     body=body,

src/mail_order_bot/email_client/email_objects.py

@@ -14,7 +14,6 @@ class EmailAttachment:
 class EmailMessage:
     """Класс для представления электронного письма"""
     from_addr: str
-    from_email: str
     subj: str
     dt: datetime
     body: str

src/mail_order_bot/main.py

@@ -1,57 +0,0 @@
-
-from config_manager import ConfigManager
-from dotenv import load_dotenv
-import asyncio
-import logging
-import os
-from dotenv import load_dotenv
-
-from email_client import EmailClient
-
-
-logger = logging.getLogger()
-
-
-
-class MailOrderBot(ConfigManager):
-    def __init__(self, *agrs, **kwargs):
-        super().__init__(*agrs, **kwargs)
-        self.email_client = EmailClient(
-            imap_host=os.getenv('IMAP_HOST'),
-            smtp_host=os.getenv('SMTP_HOST'),
-            email=os.getenv('EMAIL_USER'),
-            password=os.getenv('EMAIL_PASSWORD'),
-            imap_port=os.getenv('IMAP_PORT'),
-            smtp_port=os.getenv('SMTP_PORT')
-        )
-
-    def execute(self):
-        logger.debug(f"Check emails for new orders")
-
-        emails = self.email_client.get_emails(folder="spareparts", only_unseen=True, mark_as_read=True)
-        for email in emails:
-            logger.info(email.subj)
-            logger.info(email.from_addr)
-            logger.info(email.dt)
-            logger.info(email.body)
-            logger.info(email.first_sender)
-            logger.info('--------------------------------')
-        logger.critical("mail checked")
-
-
-logger = logging.getLogger()
-
-async def main():
-    app = MailOrderBot("config.yml")
-    await app.start()
-
-    #await asyncio.sleep(200)
-    #await app.stop()
-
-if __name__ == "__main__":
-    if os.environ.get("APP_ENV") != "PRODUCTION":
-        logger.warning("Non production environment")
-        load_dotenv()
-
-    asyncio.run(main())
-    

src/main.py

@@ -0,0 +1,5 @@
+from config_manager import Configmanager
+
+
+if __name__=="__main__":
+    print("Hello, World!")

tests/email_client/test_email_client.py

@@ -1,13 +1,13 @@
 import os
 from dotenv import load_dotenv
+import sys
+sys.path.append('./src')
+
+load_dotenv()
+
 from mail_order_bot.email_client import EmailClient
 
-
 if __name__ == "__main__":
-    print(__name__)
-    # подгружаем переменные окружения
-    load_dotenv()
-
     email_client = EmailClient(
         imap_host=os.getenv('IMAP_HOST'),
         smtp_host=os.getenv('SMTP_HOST'),
@@ -16,13 +16,12 @@ if __name__ == "__main__":
         imap_port=os.getenv('IMAP_PORT'),
         smtp_port=os.getenv('SMTP_PORT')
     )
-    emails = email_client.get_emails(folder='spareparts', only_unseen=True, mark_as_read=False)
-
+    emails = email_client.get_emails(folder='spareparts', only_unseen=True, mark_as_read=True)
     for email in emails:
         print(email.subj)
         print(email.from_addr)
-        print(email.from_email)
         print(email.dt)
+        print(email.body)
         print(email.first_sender)
         print('--------------------------------')