matplobbot-shared 0.1.331__py3-none-any.whl → 0.1.332__py3-none-any.whl

{matplobbot_shared-0.1.331.dist-info → matplobbot_shared-0.1.332.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: matplobbot-shared
-Version: 0.1.331
+Version: 0.1.332
 Summary: Shared library for the Matplobbot ecosystem.
 Author: Ackrome
 Author-email: ivansergeyevich@gmail.com

{matplobbot_shared-0.1.331.dist-info → matplobbot_shared-0.1.332.dist-info}/RECORD

@@ -1,30 +1,30 @@
-matplobbot_shared-0.1.331.dist-info/licenses/LICENSE,sha256=AmYEbPAbaZOpoiTYDrcnDjhoQqO_pe2QTX9CcvSB5z4,1072
+matplobbot_shared-0.1.332.dist-info/licenses/LICENSE,sha256=AmYEbPAbaZOpoiTYDrcnDjhoQqO_pe2QTX9CcvSB5z4,1072
 shared_lib/__init__.py,sha256=XaPjbKhDIlcsuwUrjMkqt1OajCFldAG8z7dTNbVTh3g,46
 shared_lib/celery_app.py,sha256=Z2T-XWwFu_kkxj_mi15VC8ol9naMMUq7CpQHxVxhF9g,3390
 shared_lib/constants.py,sha256=iY9AgvSgE9-C0TY_GXbO8a3mb1Ada3FAhzH5CVcSsbk,541
-shared_lib/database.py,sha256=MpePUsjfiiWj5nlTmqjNDz485pZwQ9jKJlN1hGzcGq4,64081
+shared_lib/database.py,sha256=1Da8qQ6b3RhxVQtcSTbnqf4j6JhtYcEXb-3_uUz2cEE,65231
 shared_lib/egress.py,sha256=C74dyj2LKMLGkanFd7tokjIJJKIJ8p70tA25TrBkwns,2979
-shared_lib/html_tools.py,sha256=bu8uavXm53deg86UHEHW8p93YhdJq3QAjgVEOt9dja8,4438
+shared_lib/html_tools.py,sha256=ZzKMxAR2qNHdJGtGmu7i5Az_AwEkzCMoQFhmJxpowN0,4435
 shared_lib/i18n.py,sha256=HLXm8WjjcMtFiiD62DW8FgBlmwNZ6BoZ6MxuVO0wWCA,2199
-shared_lib/mail_bridge.py,sha256=KT7P2fJ6r88mA7jUmj_kpwQCYO1Lo6CisAN_WpDaaIs,10010
-shared_lib/models.py,sha256=QKD2H6m8-c8RKre6m2rVqaO8g2aydiVnqkWqq--ld4s,7681
-shared_lib/redis_client.py,sha256=LipBJYFbCOFOUsY9PXkFqBKXS4MzJewvu3wfw67YL1M,3234
+shared_lib/mail_bridge.py,sha256=Cxk9k_KOWqgPnpMlM6Sime6MfWAlo7K5lMoekL7x0Vo,9248
+shared_lib/models.py,sha256=FYcnolw3b728dyVpDa-t9FuGrOum0PONes9OmO7w354,8868
+shared_lib/redis_client.py,sha256=cbF1tHOzEqlvBtmnEg7K0TSh2ZmORGuPYIbdqeE2TAs,3323
 shared_lib/request_context.py,sha256=A3SJT2EOPP5JVX7kDhu_RAJWUt5KN5WpMKWz13HQge0,1693
 shared_lib/schemas.py,sha256=Bo9Z6aebgZGQ1Bm8v9ggOviu_-e6wf7zBP2lCjIW6_U,21384
-shared_lib/tasks.py,sha256=frSmBvUoPbHkTlZsCB_8HNlGQarlN-mkY3xGOG_A-DI,28933
+shared_lib/tasks.py,sha256=e0FMq93UEchDCBYg7qkqzMs8VmDFVE_IGhx9n5AN52w,29003
 shared_lib/telegram_bot_session.py,sha256=dw7p0d4x6tELYd8kaucaPz6cDECK-FCVyrdDAFYV4aM,6625
 shared_lib/telegram_http.py,sha256=iZA70ty7CdooXVO2_N1x6hf2MHoTlThxjlnRA4_OBtY,1597
 shared_lib/telegram_polling.py,sha256=6adHLV09IO3CrLT0enipdc9bc7WMRz5TUngiKWqs7cs,740
 shared_lib/telemetry.py,sha256=jW4DFXXHu4jR3qL47okrQ6n1SXkNLlPSFHZmXHWafKI,2908
-shared_lib/locales/en.json,sha256=DFfZZngJlTwK6JmRawP0R4-gi3pIGJmoUureeZDOcf4,29939
-shared_lib/locales/ru.json,sha256=QkE5aYRdIz5WpjUVghgxgQCCKLox0BJ6P25rinTIoaU,42582
+shared_lib/locales/en.json,sha256=MmXknymct8Avg4Rm4saF4F9WEz5wWsjRXcQK_9pqlOo,29988
+shared_lib/locales/ru.json,sha256=JKvdcCT2Z52yBkBpo4IlwIOhYmapniXULWrc1t-lyGM,42649
 shared_lib/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 shared_lib/services/broadcast_service.py,sha256=bXRoRNevnzWf27xAfVcyJma9Q7UO-T5Zg-6AyzRba64,9498
 shared_lib/services/calendar_sync_state.py,sha256=yR3OTufxIlz81Q3ZZHno6CNq-NPLlDN_Cr1jp8HM0lM,8494
 shared_lib/services/schedule_service.py,sha256=GOOl79s4xPo9sQttfd_ZYiz3tFaX03dYRKVfTCcJcQo,58691
 shared_lib/services/semantic_search.py,sha256=Q58gfcUUvxUrCw4SSntfw956YYFhv_6povhGciMIZ8U,3917
-shared_lib/services/university_api.py,sha256=WyqfESf1DN_Gr4so9ij6Oo3t0gAPu5JIdO9-SqN_GmQ,3603
-matplobbot_shared-0.1.331.dist-info/METADATA,sha256=WPbL1qCel0nOhdddHFtJJvubTwlBlLBAVc_elCYWNNc,851
-matplobbot_shared-0.1.331.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-matplobbot_shared-0.1.331.dist-info/top_level.txt,sha256=L8mrC50YWCe19jmh_zrUZFvXSkhsnES5K6y027G1838,11
-matplobbot_shared-0.1.331.dist-info/RECORD,,
+shared_lib/services/university_api.py,sha256=sD1PsBrEdZvKGsUkxK5brkfgSwc_0uBZckZBjFChNOE,3791
+matplobbot_shared-0.1.332.dist-info/METADATA,sha256=XHiZI4AZkzV1Fw6ulOd3dwY8lneNdWR1bSPrGS9fwJU,851
+matplobbot_shared-0.1.332.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+matplobbot_shared-0.1.332.dist-info/top_level.txt,sha256=L8mrC50YWCe19jmh_zrUZFvXSkhsnES5K6y027G1838,11
+matplobbot_shared-0.1.332.dist-info/RECORD,,

shared_lib/database.py

@@ -815,14 +815,17 @@ async def delete_old_inactive_subscriptions(days_inactive: int = 30):
 
 
 async def get_subscriptions_for_notification(notification_time: str) -> list:
+    try:
+        target_time = datetime.time.fromisoformat(notification_time)
+    except (TypeError, ValueError):
+        logger.warning("Ignoring invalid notification time: %r", notification_time)
+        return []
+
     async with get_session() as session:
-        # notification_time comes as "HH:MM"
-        # We use PostgreSQL TO_CHAR on the Time column
         stmt = select(UserScheduleSubscription).where(
             and_(
                 UserScheduleSubscription.is_active.is_(True),
-                func.to_char(UserScheduleSubscription.notification_time, "HH24:MI")
-                == notification_time,
+                UserScheduleSubscription.notification_time == target_time,
             )
         )
         result = await session.execute(stmt)
@@ -1004,20 +1007,46 @@ async def batch_update_subscription_hashes(entity_type: str, entity_id: str, new
 
 
 # --- Cached Schedules ---
+def _cached_entity_name(entity_type: str, data: list | dict, fallback: str) -> str:
+    """Extract a stable display name without querying/expanding JSON later."""
+    if not isinstance(data, list):
+        return fallback
+    field_by_type = {
+        "group": "group",
+        "person": "lecturer_title",
+        "auditorium": "auditorium",
+    }
+    field = field_by_type.get(entity_type)
+    if not field:
+        return fallback
+    for lesson in data:
+        if isinstance(lesson, dict):
+            value = str(lesson.get(field) or "").strip()
+            if value:
+                return value[:255]
+    return fallback
+
+
 async def upsert_cached_schedule(entity_type: str, entity_id: str, data: list | dict):
     json_data = json.loads(json.dumps(data, default=str))  # Ensure serializable
+    entity_name = _cached_entity_name(entity_type, json_data, str(entity_id))
     async with get_session() as session:
         stmt = (
             pg_insert(CachedSchedule)
             .values(
                 entity_type=entity_type,
                 entity_id=str(entity_id),
+                entity_name=entity_name,
                 schedule_data=json_data,
                 updated_at=datetime.datetime.now(),
             )
             .on_conflict_do_update(
                 constraint="uq_cached_schedule_entity",
-                set_=dict(schedule_data=json_data, updated_at=datetime.datetime.now()),
+                set_=dict(
+                    entity_name=entity_name,
+                    schedule_data=json_data,
+                    updated_at=datetime.datetime.now(),
+                ),
             )
         )
         await session.execute(stmt)
@@ -1598,6 +1627,7 @@ async def merge_cached_schedule(
         # merged_data.sort(key=lambda x: (x.get('date', ''), x.get('beginLesson', '')))
 
         json_data = json.loads(json.dumps(merged_data, default=str))
+        entity_name = _cached_entity_name(entity_type, json_data, str(entity_id))
 
         # 4. Upsert (вставка или обновление)
         stmt_insert = (
@@ -1605,12 +1635,17 @@ async def merge_cached_schedule(
             .values(
                 entity_type=entity_type,
                 entity_id=str(entity_id),
+                entity_name=entity_name,
                 schedule_data=json_data,
                 updated_at=datetime.datetime.now(),
             )
             .on_conflict_do_update(
                 constraint="uq_cached_schedule_entity",
-                set_=dict(schedule_data=json_data, updated_at=datetime.datetime.now()),
+                set_=dict(
+                    entity_name=entity_name,
+                    schedule_data=json_data,
+                    updated_at=datetime.datetime.now(),
+                ),
             )
         )
 

shared_lib/html_tools.py

@@ -1,4 +1,4 @@
-import re
+import re
 
 HTML_TAG_RE = re.compile(r"(</?([a-zA-Z0-9_-]+)(?:\s+[^>]*)?>)")
 

shared_lib/locales/en.json

@@ -157,6 +157,7 @@
     "help_btn_lec_search": "📚 /lec_search - Search notes",
     "help_btn_lec_all": "📂 /lec_all - Browse notes",
     "help_btn_favorites": "⭐ /favorites - Favorites",
+    "help_btn_mail": "✉️ /mail - Mailboxes",
     "help_btn_settings": "⚙️ /settings - Settings",
     "help_btn_latex": "🧮 /latex - Render LaTeX",
     "help_btn_mermaid": "🎨 /mermaid - Render Mermaid",

shared_lib/locales/ru.json

@@ -136,6 +136,7 @@
     "help_btn_lec_search": "📚 /lec_search - Поиск по конспектам",
     "help_btn_lec_all": "📂 /lec_all - Просмотр конспектов",
     "help_btn_favorites": "⭐ /favorites - Избранное",
+    "help_btn_mail": "✉️ /mail - Почтовые ящики",
     "help_btn_settings": "⚙️ /settings - Настройки",
     "help_btn_latex": "🧮 /latex - Рендер LaTeX",
     "help_btn_mermaid": "🎨 /mermaid - Рендер Mermaid",

shared_lib/mail_bridge.py

@@ -13,9 +13,10 @@ from html import escape
 
 from bs4 import BeautifulSoup
 from cryptography.fernet import Fernet
-from sqlalchemy import BigInteger, Boolean, Column, Integer, LargeBinary, String, UniqueConstraint
 
-from shared_lib.models import Base
+from shared_lib.models import MailAccount
+
+__all__ = ["MailAccount", "cipher", "seal", "unseal", "validate_host", "poll_mail", "parse_mail"]
 
 MAX_MAIL_BYTES = 35 * 1024 * 1024
 PASSWORD_PROMPT = "Пароль приложения для почты"
@@ -41,24 +42,6 @@ def sensitive_mail_update(event, data):
     )
 
 
-class MailAccount(Base):
-    __tablename__ = "mail_accounts"
-    __table_args__ = (
-        UniqueConstraint("user_id", "address", "host", name="uq_mail_owner_address_host"),
-    )
-    id = Column(Integer, primary_key=True)
-    user_id = Column(BigInteger, nullable=False, index=True)
-    address = Column(String(320), nullable=False)
-    host = Column(String(253), nullable=False)
-    protocol = Column(String(8), nullable=False)
-    port = Column(Integer, nullable=False, default=993)
-    credential = Column(LargeBinary, nullable=False)
-    enabled = Column(Boolean, nullable=False, default=True)
-    checkpoint = Column(LargeBinary, nullable=False)
-    pending = Column(LargeBinary, nullable=True)
-    status = Column(String(80), nullable=False, default="ready")
-
-
 def cipher():
     return Fernet(os.environ["MAIL_CREDENTIAL_KEY"].encode("ascii"))
 

shared_lib/models.py

@@ -36,7 +36,9 @@ class UserAction(Base):
     __tablename__ = "user_actions"
 
     id = Column(Integer, primary_key=True, autoincrement=True)
-    user_id = Column(BigInteger, ForeignKey("users.user_id", ondelete="CASCADE"), nullable=False, index=True)
+    user_id = Column(
+        BigInteger, ForeignKey("users.user_id", ondelete="CASCADE"), nullable=False, index=True
+    )
     action_type = Column(String, nullable=False, index=True)
     action_details = Column(String, nullable=True)
     timestamp = Column(DateTime(timezone=True), server_default=func.now(), index=True)
@@ -78,7 +80,12 @@ class UserScheduleSubscription(Base):
     __tablename__ = "user_schedule_subscriptions"
 
     id = Column(Integer, primary_key=True, autoincrement=True)
-    user_id = Column(BigInteger, ForeignKey("users.user_id", ondelete="CASCADE"), nullable=False)
+    user_id = Column(
+        BigInteger,
+        ForeignKey("users.user_id", ondelete="CASCADE"),
+        nullable=False,
+        index=True,
+    )
     chat_id = Column(BigInteger, nullable=False)
     entity_type = Column(String, nullable=False)
     entity_id = Column(String, nullable=False)
@@ -95,6 +102,11 @@ class UserScheduleSubscription(Base):
         UniqueConstraint(
             "chat_id", "entity_type", "entity_id", "notification_time", name="uq_schedule_subs"
         ),
+        Index(
+            "ix_user_subscriptions_notification_time_active",
+            "notification_time",
+            "is_active",
+        ),
     )
 
 
@@ -132,6 +144,7 @@ class CachedSchedule(Base):
     id = Column(Integer, primary_key=True, autoincrement=True)
     entity_type = Column(String, nullable=False)
     entity_id = Column(String, nullable=False)
+    entity_name = Column(String(255), nullable=True)
     schedule_data = Column(JSONB, nullable=False)
     updated_at = Column(DateTime(timezone=True), server_default=func.now(), onupdate=func.now())
 
@@ -140,6 +153,31 @@ class CachedSchedule(Base):
     )
 
 
+class MailAccount(Base):
+    """Encrypted mailbox connection owned by a Telegram user."""
+
+    __tablename__ = "mail_accounts"
+    __table_args__ = (
+        UniqueConstraint("user_id", "address", "host", name="uq_mail_owner_address_host"),
+    )
+    id = Column(Integer, primary_key=True)
+    user_id = Column(
+        BigInteger,
+        ForeignKey("users.user_id", ondelete="CASCADE"),
+        nullable=False,
+        index=True,
+    )
+    address = Column(String(320), nullable=False)
+    host = Column(String(253), nullable=False)
+    protocol = Column(String(8), nullable=False)
+    port = Column(Integer, nullable=False, default=993)
+    credential = Column(LargeBinary, nullable=False)
+    enabled = Column(Boolean, nullable=False, default=True)
+    checkpoint = Column(LargeBinary, nullable=False)
+    pending = Column(LargeBinary, nullable=True)
+    status = Column(String(80), nullable=False, default="ready")
+
+
 class SearchDocument(Base):
     __tablename__ = "search_documents"
 

shared_lib/redis_client.py

@@ -1,5 +1,6 @@
 import json
 import logging
+import os
 
 import redis.asyncio as redis
 
@@ -67,4 +68,7 @@ class RedisClient:
 
 
 # Создаем единственный экземпляр клиента
-redis_client = RedisClient(host="redis")
+redis_client = RedisClient(
+    host=os.getenv("REDIS_HOST", "redis"),
+    port=int(os.getenv("REDIS_PORT", "6379")),
+)

shared_lib/services/university_api.py

@@ -31,8 +31,10 @@ class RuzAPIClient:
         self.initial_delay = initial_delay
         self.backoff_factor = backoff_factor
 
-    async def _request(self, sub_url: str) -> dict[str, Any] | list[dict[str, Any]]:
-        full_url = self.HOST + sub_url
+    async def _request(
+        self, path: str, params: dict[str, str] | None = None
+    ) -> dict[str, Any] | list[dict[str, Any]]:
+        full_url = self.HOST + path
         ssl_context = ssl.create_default_context(cafile=certifi.where())
         last_exception = None
 
@@ -40,7 +42,10 @@ class RuzAPIClient:
             try:
                 # Добавляем явный таймаут на запрос, чтобы не висеть бесконечно
                 async with self.session.get(
-                    full_url, ssl=ssl_context, timeout=aiohttp.ClientTimeout(total=15)
+                    full_url,
+                    params=params,
+                    ssl=ssl_context,
+                    timeout=aiohttp.ClientTimeout(total=15),
                 ) as response:
                     if response.status == 200:
                         try:
@@ -73,14 +78,17 @@ class RuzAPIClient:
 
     async def search(self, term: str, search_type: str) -> list[dict[str, Any]]:
         """Generic search function."""
-        return await self._request(f"/api/search?term={term}&type={search_type}")
+        return await self._request(
+            "/api/search", params={"term": term, "type": search_type}
+        )
 
     async def get_schedule(
         self, entity_type: str, entity_id: str, start: str, finish: str
     ) -> list[dict[str, Any]]:
         """Generic function to get a schedule."""
         return await self._request(
-            f"/api/schedule/{entity_type}/{entity_id}?start={start}&finish={finish}&lng=1"
+            f"/api/schedule/{entity_type}/{entity_id}",
+            params={"start": start, "finish": finish, "lng": "1"},
         )
 
 

shared_lib/tasks.py

@@ -623,7 +623,9 @@ def compile_project_task(
                             return {
                                 "status": "error",
                                 "message": f"Security restriction in {path}: LaTeX source must be UTF-8 text",
-                                "errors": [{"line": 1, "message": "LaTeX source must be UTF-8 text"}],
+                                "errors": [
+                                    {"line": 1, "message": "LaTeX source must be UTF-8 text"}
+                                ],
                             }
                         is_safe, reason = _validate_latex_source(file_text)
                         if not is_safe: