matplobbot-shared 0.1.332__tar.gz → 0.1.334__tar.gz

{matplobbot_shared-0.1.332 → matplobbot_shared-0.1.334}/PKG-INFO

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

{matplobbot_shared-0.1.332 → matplobbot_shared-0.1.334}/README.md

@@ -285,7 +285,7 @@ The repository uses GitHub Actions for CI and image publishing, with Jenkins han
 ## Roadmap
 
 - [x] Integrate SQLAlchemy Core instead of raw SQL
-- [x] Add semantic search for project materials
+- [x] Add PostgreSQL text search for project materials
 - [ ] Add plugin-based support for multiple universities
 - [ ] Support voice-driven schedule requests
 

{matplobbot_shared-0.1.332 → matplobbot_shared-0.1.334}/matplobbot_shared.egg-info/PKG-INFO

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

{matplobbot_shared-0.1.332 → matplobbot_shared-0.1.334}/setup.py

@@ -2,7 +2,7 @@ from setuptools import find_packages, setup
 
 setup(
     name="matplobbot-shared",
-    version="0.1.332",  # Bump version
+    version="0.1.334",  # Bump version
     packages=find_packages(include=["shared_lib", "shared_lib.*"]),
     description="Shared library for the Matplobbot ecosystem.",
     author="Ackrome",

{matplobbot_shared-0.1.332 → matplobbot_shared-0.1.334}/shared_lib/database.py

@@ -3,6 +3,7 @@ import json
 import logging
 import os
 import uuid
+from zoneinfo import ZoneInfo
 
 from sqlalchemy import and_, delete, func, insert, or_, select, text, update
 from sqlalchemy.dialects.postgresql import insert as pg_insert
@@ -625,6 +626,13 @@ async def add_schedule_subscription(
     entity_id: str,
     entity_name: str,
     notification_time: datetime.time,
+    *,
+    profile_id: str | None = None,
+    timezone: str = "Europe/Moscow",
+    delivery_mode: str = "telegram",
+    lesson_mode: str = "all",
+    calendar_enabled: bool = True,
+    selected_modules: list[str] | None = None,
 ) -> int | None:
     async with get_session() as session:
         stmt = (
@@ -637,10 +645,26 @@ async def add_schedule_subscription(
                 entity_id=entity_id,
                 entity_name=entity_name,
                 notification_time=notification_time,
+                profile_id=profile_id,
+                timezone=timezone or "Europe/Moscow",
+                delivery_mode=delivery_mode or "telegram",
+                lesson_mode=lesson_mode or "all",
+                calendar_enabled=calendar_enabled,
+                selected_modules=selected_modules or [],
             )
             .on_conflict_do_update(
                 constraint="uq_schedule_subs",
-                set_=dict(entity_name=entity_name, is_active=True, user_id=user_id),
+                set_=dict(
+                    entity_name=entity_name,
+                    is_active=True,
+                    user_id=user_id,
+                    profile_id=profile_id,
+                    timezone=timezone or "Europe/Moscow",
+                    delivery_mode=delivery_mode or "telegram",
+                    lesson_mode=lesson_mode or "all",
+                    calendar_enabled=calendar_enabled,
+                    selected_modules=selected_modules or [],
+                ),
             )
             .returning(UserScheduleSubscription.id)
         )
@@ -688,6 +712,12 @@ async def get_user_subscriptions(
                 "entity_name": s.entity_name,
                 "notification_time": s.notification_time.strftime("%H:%M"),
                 "is_active": s.is_active,
+                "profile_id": s.profile_id or f"telegram-{s.id}",
+                "timezone": s.timezone or "Europe/Moscow",
+                "delivery_mode": s.delivery_mode or "telegram",
+                "lesson_mode": s.lesson_mode or "all",
+                "calendar_enabled": s.calendar_enabled is not False,
+                "selected_modules": list(s.selected_modules or []),
             }
             for s in subs
         ], total_count
@@ -728,6 +758,12 @@ async def get_chat_subscriptions(
                 "entity_name": s.entity_name,
                 "notification_time": s.notification_time.strftime("%H:%M"),
                 "is_active": s.is_active,
+                "profile_id": s.profile_id or f"telegram-{s.id}",
+                "timezone": s.timezone or "Europe/Moscow",
+                "delivery_mode": s.delivery_mode or "telegram",
+                "lesson_mode": s.lesson_mode or "all",
+                "calendar_enabled": s.calendar_enabled is not False,
+                "selected_modules": list(s.selected_modules or []),
             }
             for s in subs
         ], total_count
@@ -841,6 +877,11 @@ async def get_subscriptions_for_notification(notification_time: str) -> list:
                 "entity_id": s.entity_id,
                 "entity_name": s.entity_name,
                 "last_schedule_hash": s.last_schedule_hash,
+                "profile_id": s.profile_id or f"telegram-{s.id}",
+                "timezone": s.timezone or "Europe/Moscow",
+                "delivery_mode": s.delivery_mode or "telegram",
+                "lesson_mode": s.lesson_mode or "all",
+                "selected_modules": list(s.selected_modules or []),
             }
             for s in subs
         ]
@@ -861,11 +902,63 @@ async def get_all_active_subscriptions() -> list:
                 "entity_id": s.entity_id,
                 "entity_name": s.entity_name,
                 "last_schedule_hash": s.last_schedule_hash,
+                "profile_id": s.profile_id or f"telegram-{s.id}",
+                "timezone": s.timezone or "Europe/Moscow",
+                "delivery_mode": s.delivery_mode or "telegram",
+                "lesson_mode": s.lesson_mode or "all",
+                "calendar_enabled": s.calendar_enabled is not False,
+                "selected_modules": list(s.selected_modules or []),
             }
             for s in subs
         ]
 
 
+async def get_subscriptions_due_for_notification(now_utc: datetime.datetime | None = None) -> list:
+    """Return Telegram-delivery subscriptions whose local time is now.
+
+    ``notification_time`` is a wall-clock value in each profile's timezone;
+    legacy rows without a timezone use Moscow by design.
+    """
+    now_utc = now_utc or datetime.datetime.now(datetime.UTC)
+    async with get_session() as session:
+        result = await session.execute(
+            select(UserScheduleSubscription).where(
+                and_(
+                    UserScheduleSubscription.is_active.is_(True),
+                    UserScheduleSubscription.delivery_mode == "telegram",
+                )
+            )
+        )
+        due = []
+        for s in result.scalars().all():
+            timezone_name = s.timezone or "Europe/Moscow"
+            try:
+                local_now = now_utc.astimezone(ZoneInfo(timezone_name))
+            except Exception:
+                local_now = now_utc.astimezone(ZoneInfo("Europe/Moscow"))
+            if s.notification_time and s.notification_time.strftime("%H:%M") != local_now.strftime(
+                "%H:%M"
+            ):
+                continue
+            due.append(
+                {
+                    "id": s.id,
+                    "user_id": s.user_id,
+                    "chat_id": s.chat_id,
+                    "message_thread_id": s.message_thread_id,
+                    "entity_type": s.entity_type,
+                    "entity_id": s.entity_id,
+                    "entity_name": s.entity_name,
+                    "last_schedule_hash": s.last_schedule_hash,
+                    "profile_id": s.profile_id or f"telegram-{s.id}",
+                    "timezone": timezone_name,
+                    "lesson_mode": s.lesson_mode or "all",
+                    "selected_modules": list(s.selected_modules or []),
+                }
+            )
+        return due
+
+
 async def get_unique_active_subscription_entities() -> list:
     async with get_session() as session:
         stmt = text(
@@ -1694,6 +1787,12 @@ async def get_subscription_by_id(subscription_id: int) -> dict | None:
                 "entity_name": sub.entity_name,
                 "is_active": sub.is_active,
                 "notification_time": sub.notification_time,
+                "profile_id": sub.profile_id or f"telegram-{sub.id}",
+                "timezone": sub.timezone or "Europe/Moscow",
+                "delivery_mode": sub.delivery_mode or "telegram",
+                "lesson_mode": sub.lesson_mode or "all",
+                "calendar_enabled": sub.calendar_enabled is not False,
+                "selected_modules": list(sub.selected_modules or []),
             }
         return None
 

{matplobbot_shared-0.1.332 → matplobbot_shared-0.1.334}/shared_lib/models.py

@@ -97,6 +97,12 @@ class UserScheduleSubscription(Base):
     message_thread_id = Column(BigInteger, nullable=True)
     added_at = Column(DateTime(timezone=True), server_default=func.now())
     selected_modules = Column(JSON, server_default="[]", nullable=False)
+    # Canonical profile fields shared by Telegram notifications and WebCal.
+    profile_id = Column(String(128), nullable=True, index=True)
+    timezone = Column(String(64), nullable=False, server_default="Europe/Moscow")
+    delivery_mode = Column(String(16), nullable=False, server_default="telegram")
+    lesson_mode = Column(String(16), nullable=False, server_default="all")
+    calendar_enabled = Column(Boolean, nullable=False, server_default="true")
 
     __table_args__ = (
         UniqueConstraint(

{matplobbot_shared-0.1.332 → matplobbot_shared-0.1.334}/shared_lib/redis_client.py

@@ -8,6 +8,11 @@ logger = logging.getLogger(__name__)
 
 # TTL для кэша в секундах (например, 1 час)
 CACHE_TTL = 3600
+CALLBACK_PATH_KEY_PREFIX = "callback_path:"
+
+
+def _is_callback_path_hash(value: str) -> bool:
+    return len(value) == 16 and all(char in "0123456789abcdef" for char in value)
 
 
 class RedisClient:
@@ -66,6 +71,40 @@ class RedisClient:
         except Exception as e:
             logger.error(f"Ошибка при очистке кэша Redis: {e}")
 
+    async def set_callback_path(self, path_hash: str, path: str, ttl: int):
+        """Persist a Telegram callback hash mapping without serializing secrets."""
+        if not _is_callback_path_hash(path_hash):
+            raise ValueError("invalid callback path hash")
+        if ttl <= 0:
+            raise ValueError("callback path TTL must be positive")
+        try:
+            await self.client.set(
+                f"{CALLBACK_PATH_KEY_PREFIX}{path_hash}",
+                path,
+                ex=ttl,
+            )
+        except Exception as e:
+            logger.error("Ошибка при записи callback path в Redis для hash=%s: %s", path_hash, e)
+
+    async def get_callback_path(self, path_hash: str) -> str | None:
+        """Load a callback mapping created by this application."""
+        if not _is_callback_path_hash(path_hash):
+            return None
+        try:
+            return await self.client.get(f"{CALLBACK_PATH_KEY_PREFIX}{path_hash}")
+        except Exception as e:
+            logger.error("Ошибка при чтении callback path из Redis для hash=%s: %s", path_hash, e)
+            return None
+
+    async def clear_callback_paths(self):
+        """Remove persistent callback mappings during an explicit admin cache clear."""
+        try:
+            async for key in self.client.scan_iter(f"{CALLBACK_PATH_KEY_PREFIX}*"):
+                await self.client.delete(key)
+            logger.info("Все callback path mappings в Redis очищены.")
+        except Exception as e:
+            logger.error("Ошибка при очистке callback path mappings в Redis: %s", e)
+
 
 # Создаем единственный экземпляр клиента
 redis_client = RedisClient(

{matplobbot_shared-0.1.332 → matplobbot_shared-0.1.334}/shared_lib/schemas.py

@@ -313,6 +313,8 @@ class CalendarSubscriptionProfile(BaseModel):
     name: str
     kind: Literal["built_in", "custom"] = "built_in"
     lesson_mode: Literal["all", "exams_only"] = "all"
+    timezone: str = "Europe/Moscow"
+    timezone_label: str = "GMT+3"
     selected: bool = False
     can_delete: bool = False
     entity_type: str | None = None
@@ -333,6 +335,7 @@ class CalendarSubscriptionResponse(BaseModel):
     sync_enabled: bool = True
     selected_profile_id: str | None = None
     profile_limit: int = 0
+    timezone_options: list[dict[str, str]] = Field(default_factory=list)
     http_url: str | None = None
     webcal_url: str | None = None
     download_url: str | None = None
@@ -359,12 +362,14 @@ class CalendarSubscriptionProfileCreateRequest(BaseModel):
     entity_name: str = Field(..., min_length=1, max_length=255)
     lesson_mode: Literal["all", "exams_only"] = "all"
     modules: list[str] = Field(default_factory=list)
+    timezone: str = Field(default="Europe/Moscow", max_length=64)
 
 
 class CalendarSubscriptionProfileUpdateRequest(BaseModel):
     name: str | None = Field(default=None, min_length=1, max_length=255)
     lesson_mode: Literal["all", "exams_only"] | None = None
     modules: list[str] | None = None
+    timezone: str | None = Field(default=None, max_length=64)
 
 
 class CalendarSubscriptionProfileSelectRequest(BaseModel):

{matplobbot_shared-0.1.332 → matplobbot_shared-0.1.334}/shared_lib/services/calendar_sync_state.py

@@ -8,6 +8,7 @@ from urllib.parse import quote
 CALENDAR_SYNC_KEY = "calendar_sync"
 CALENDAR_PROFILE_LIMIT = 6
 DEFAULT_PROFILE_ID = "all"
+DEFAULT_TIMEZONE = "Europe/Moscow"
 
 BUILT_IN_PROFILES = (
     {
@@ -36,6 +37,19 @@ class CalendarProfilePayload:
     entity_name: str
     lesson_mode: str = "all"
     modules: tuple[str, ...] = ()
+    timezone: str = DEFAULT_TIMEZONE
+
+
+def normalize_timezone(value: str | None) -> str:
+    candidate = str(value or DEFAULT_TIMEZONE).strip()
+    if candidate in {DEFAULT_TIMEZONE, "UTC"} or re.fullmatch(
+        r"Etc/GMT[+-](?:0|[1-9]|1[0-2]|1[3-4])", candidate
+    ):
+        return candidate
+    match = re.fullmatch(r"GMT\s*([+-])\s*(\d{1,2})", candidate, re.IGNORECASE)
+    if match and int(match.group(2)) <= 14:
+        return f"Etc/GMT-{'%d' % int(match.group(2))}" if match.group(1) == "+" else f"Etc/GMT+{int(match.group(2))}"
+    return DEFAULT_TIMEZONE
 
 
 def default_calendar_sync_state() -> dict:
@@ -92,6 +106,7 @@ def normalize_custom_profile(raw_profile: object) -> dict | None:
         "entity_name": entity_name,
         "modules": modules,
         "can_delete": True,
+        "timezone": normalize_timezone(raw_profile.get("timezone")),
     }
 
 
@@ -137,6 +152,7 @@ def serialize_calendar_sync_state(state: dict) -> dict:
                 "entity_name": profile["entity_name"],
                 "lesson_mode": profile["lesson_mode"],
                 "modules": list(profile.get("modules", [])),
+                "timezone": normalize_timezone(profile.get("timezone")),
             }
             for profile in state.get("custom_profiles", [])
             if profile.get("id")
@@ -239,6 +255,7 @@ def upsert_custom_profile(
                 entity_name=payload.entity_name,
                 lesson_mode=payload.lesson_mode,
                 modules=tuple(normalized_modules),
+                timezone=payload.timezone,
             )
         ),
         "kind": "custom",
@@ -248,6 +265,7 @@ def upsert_custom_profile(
         "entity_name": payload.entity_name,
         "modules": normalized_modules,
         "can_delete": True,
+        "timezone": normalize_timezone(payload.timezone),
     }
     next_state["custom_profiles"].append(profile)
     next_state["selected_profile_id"] = profile["id"]

{matplobbot_shared-0.1.332 → matplobbot_shared-0.1.334}/shared_lib/services/schedule_service.py

@@ -478,6 +478,7 @@ async def format_schedule(
     start_date: date,
     is_week_view: bool = False,
     subscription_id: int | None = None,
+    lesson_mode: str = "all",
 ) -> str:
     """Formats a list of lessons into a readable daily schedule using Variant B (Subgroup Hierarchy)."""
     if not schedule_data:
@@ -532,6 +533,13 @@ async def format_schedule(
 
             schedule_data = filtered_data
 
+    if lesson_mode == "exams_only":
+        schedule_data = [
+            lesson
+            for lesson in schedule_data
+            if _get_simple_lesson_type(lesson.get("kindOfWork", "")) in {"Exam", "Consultation"}
+        ]
+
     # --- 1. Fetch Settings ---
     user_settings = await get_user_settings(user_id)
     use_short_names = user_settings.get("use_short_names", True)

{matplobbot_shared-0.1.332 → matplobbot_shared-0.1.334}/shared_lib/services/semantic_search.py

@@ -1,3 +1,10 @@
+"""PostgreSQL full-text search implementation.
+
+The historical module name is kept for import compatibility. The product
+feature is called *text search*: it uses PostgreSQL FTS and intentionally does
+not create embeddings or depend on a vector store.
+"""
+
 import json
 import logging
 import re

{matplobbot_shared-0.1.332 → matplobbot_shared-0.1.334}/shared_lib/services/university_api.py

@@ -78,9 +78,7 @@ class RuzAPIClient:
 
     async def search(self, term: str, search_type: str) -> list[dict[str, Any]]:
         """Generic search function."""
-        return await self._request(
-            "/api/search", params={"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

{matplobbot_shared-0.1.332 → matplobbot_shared-0.1.334}/tests/test_keyboards.py

@@ -1,7 +1,9 @@
+import asyncio
 import importlib
 import sys
 import types
 import unittest
+from unittest.mock import AsyncMock, patch
 
 
 def _install_matplobblib_stub() -> None:
@@ -90,3 +92,41 @@ class TestTelegramWebAppKeyboards(unittest.IsolatedAsyncioTestCase):
         buttons = [button for row in help_markup.inline_keyboard for button in row]
         self.assertFalse(any(button.web_app for button in buttons))
         self.assertIn("help_btn_matp_all", [button.text for button in buttons])
+
+
+@unittest.skipUnless(KEYBOARDS_AVAILABLE, "bot keyboard dependencies are not installed")
+class TestCallbackPathPersistence(unittest.IsolatedAsyncioTestCase):
+    async def asyncSetUp(self):
+        kb.code_path_cache.clear()
+
+    async def asyncTearDown(self):
+        kb.code_path_cache.clear()
+
+    async def test_resolve_code_path_restores_mapping_from_redis(self):
+        path_hash = "a" * 16
+        with patch.object(
+            kb.redis_client,
+            "get_callback_path",
+            new=AsyncMock(return_value="owner/repo/README.md"),
+        ) as get_callback_path:
+            value = await kb.resolve_code_path(path_hash)
+
+        self.assertEqual(value, "owner/repo/README.md")
+        self.assertEqual(kb.code_path_cache.get(path_hash), "owner/repo/README.md")
+        get_callback_path.assert_awaited_once_with(path_hash)
+
+    async def test_cache_write_persists_mapping_to_redis(self):
+        path_hash = "b" * 16
+        with patch.object(
+            kb.redis_client,
+            "set_callback_path",
+            new=AsyncMock(),
+        ) as set_callback_path:
+            kb.code_path_cache[path_hash] = "owner/repo/src/main.py"
+            await asyncio.sleep(0)
+
+        set_callback_path.assert_awaited_once_with(
+            path_hash,
+            "owner/repo/src/main.py",
+            ttl=kb.CALLBACK_PATH_TTL_SECONDS,
+        )

{matplobbot_shared-0.1.332 → matplobbot_shared-0.1.334}/tests/test_schedule_search_api.py

@@ -566,9 +566,7 @@ class TestRuzAPIClient(unittest.IsolatedAsyncioTestCase):
         await client.get_schedule("group", "M80/101", "2026-04-01", "2026-04-30")
 
         self.assertEqual(session.calls[0][0], "https://ruz.fa.ru/api/search")
-        self.assertEqual(
-            session.calls[0][1]["params"], {"term": "М80 & 101", "type": "group"}
-        )
+        self.assertEqual(session.calls[0][1]["params"], {"term": "М80 & 101", "type": "group"})
         self.assertEqual(session.calls[1][0], "https://ruz.fa.ru/api/schedule/group/M80/101")
         self.assertEqual(
             session.calls[1][1]["params"],
@@ -578,9 +576,7 @@ class TestRuzAPIClient(unittest.IsolatedAsyncioTestCase):
 
 class TestCachedScheduleLabels(unittest.TestCase):
     def test_cached_entity_name_uses_type_specific_display_field(self):
-        self.assertEqual(
-            _cached_entity_name("group", [{"group": "M80-101"}], "group-1"), "M80-101"
-        )
+        self.assertEqual(_cached_entity_name("group", [{"group": "M80-101"}], "group-1"), "M80-101")
         self.assertEqual(
             _cached_entity_name("person", [{"lecturer_title": "Ivan Petrov"}], "person-1"),
             "Ivan Petrov",

{matplobbot_shared-0.1.332 → matplobbot_shared-0.1.334}/tests/test_studio_router_api.py

@@ -82,9 +82,7 @@ class TestStudioRouterAPI(unittest.TestCase):
         self.app.dependency_overrides.clear()
 
     def test_project_filename_rejects_paths_and_control_characters(self):
-        self.assertEqual(
-            studio_router._sanitize_project_filename("diagram.png"), "diagram.png"
-        )
+        self.assertEqual(studio_router._sanitize_project_filename("diagram.png"), "diagram.png")
         for filename in ("../secret.txt", "nested/image.png", r"nested\image.png", "bad\x00.txt"):
             with self.subTest(filename=filename), self.assertRaises(HTTPException) as raised:
                 studio_router._sanitize_project_filename(filename)