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

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

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

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

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

{matplobbot_shared-0.1.332 → matplobbot_shared-0.1.333}/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.333",  # 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.333}/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.333}/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.333}/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.333}/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.333}/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)