matplobbot-shared 0.1.31__tar.gz → 0.1.35__tar.gz

{matplobbot_shared-0.1.31 → matplobbot_shared-0.1.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: matplobbot-shared
-Version: 0.1.31
+Version: 0.1.35
 Summary: Shared library for the Matplobbot ecosystem (database, services, i18n).
 Author: Ackrome
 Author-email: ivansergeyevich@gmail.com
@@ -8,6 +8,7 @@ Requires-Python: >=3.11
 Requires-Dist: asyncpg
 Requires-Dist: aiohttp
 Requires-Dist: certifi
+Requires-Dist: redis
 Dynamic: author
 Dynamic: author-email
 Dynamic: requires-dist

{matplobbot_shared-0.1.31 → matplobbot_shared-0.1.35}/matplobbot_shared.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: matplobbot-shared
-Version: 0.1.31
+Version: 0.1.35
 Summary: Shared library for the Matplobbot ecosystem (database, services, i18n).
 Author: Ackrome
 Author-email: ivansergeyevich@gmail.com
@@ -8,6 +8,7 @@ Requires-Python: >=3.11
 Requires-Dist: asyncpg
 Requires-Dist: aiohttp
 Requires-Dist: certifi
+Requires-Dist: redis
 Dynamic: author
 Dynamic: author-email
 Dynamic: requires-dist

{matplobbot_shared-0.1.31 → matplobbot_shared-0.1.35}/matplobbot_shared.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ matplobbot_shared.egg-info/top_level.txt
 shared_lib/__init__.py
 shared_lib/database.py
 shared_lib/i18n.py
+shared_lib/redis_client.py
 shared_lib/services/__init__.py
 shared_lib/services/schedule_service.py
 shared_lib/services/university_api.py

{matplobbot_shared-0.1.31 → matplobbot_shared-0.1.35}/matplobbot_shared.egg-info/requires.txt

@@ -1,3 +1,4 @@
 asyncpg
 aiohttp
 certifi
+redis

{matplobbot_shared-0.1.31 → matplobbot_shared-0.1.35}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="matplobbot-shared",
-    version="0.1.31", # Let's use the version from your requirements.txt
+    version="0.1.35", # Let's use the version from your requirements.txt
     packages=find_packages(include=['shared_lib', 'shared_lib.*']),
     description="Shared library for the Matplobbot ecosystem (database, services, i18n).",
     author="Ackrome",
@@ -11,7 +11,8 @@ setup(
     install_requires=[
         "asyncpg",
         "aiohttp", # Specify versions as needed
-        "certifi"
+        "certifi",
+        "redis"
     ],
     # This tells setuptools that the package data (like .json files) should be included
     package_data={

{matplobbot_shared-0.1.31 → matplobbot_shared-0.1.35}/shared_lib/database.py

@@ -108,10 +108,16 @@ async def init_db():
                 entity_id TEXT NOT NULL,
                 entity_name TEXT NOT NULL,
                 notification_time TIME NOT NULL,
+                last_schedule_hash TEXT,
                 is_active BOOLEAN DEFAULT TRUE,
                 UNIQUE(user_id, entity_type, entity_id)
             )
             ''')
+            # Add the last_schedule_hash column if it doesn't exist, for backward compatibility
+            await connection.execute('''
+            ALTER TABLE user_schedule_subscriptions
+            ADD COLUMN IF NOT EXISTS last_schedule_hash TEXT;
+            ''')
     logger.info("Database tables initialized.")
 
 async def log_user_action(user_id: int, username: str | None, full_name: str, avatar_pic_url: str | None, action_type: str, action_details: str | None):
@@ -254,13 +260,32 @@ async def remove_schedule_subscription(subscription_id: int, user_id: int) -> st
 
 async def get_subscriptions_for_notification(notification_time: str) -> list:
     async with pool.acquire() as connection:
+        # Modified to select the subscription ID and the last hash
         rows = await connection.fetch("""
-            SELECT user_id, entity_type, entity_id, entity_name
+            SELECT id, user_id, entity_type, entity_id, entity_name, last_schedule_hash
             FROM user_schedule_subscriptions
             WHERE is_active = TRUE AND TO_CHAR(notification_time, 'HH24:MI') = $1
         """, notification_time)
         return [dict(row) for row in rows]
 
+async def get_all_active_subscriptions() -> list:
+    """Fetches all active schedule subscriptions from the database."""
+    if not pool:
+        raise ConnectionError("Database pool is not initialized.")
+    async with pool.acquire() as connection:
+        rows = await connection.fetch("""
+            SELECT id, user_id, entity_type, entity_id, entity_name, last_schedule_hash
+            FROM user_schedule_subscriptions WHERE is_active = TRUE
+        """)
+        return [dict(row) for row in rows]
+
+async def update_subscription_hash(subscription_id: int, new_hash: str):
+    """Updates the schedule hash for a specific subscription."""
+    if not pool:
+        raise ConnectionError("Database pool is not initialized.")
+    async with pool.acquire() as connection:
+        await connection.execute("UPDATE user_schedule_subscriptions SET last_schedule_hash = $1 WHERE id = $2", new_hash, subscription_id)
+
 # --- FastAPI Specific Queries ---
 async def get_leaderboard_data_from_db(db_conn):
     # The timestamp is stored in UTC (TIMESTAMPTZ). We convert it to Moscow time for display.

matplobbot_shared-0.1.35/shared_lib/redis_client.py

@@ -0,0 +1,46 @@
+import redis.asyncio as redis
+import json
+import logging
+
+logger = logging.getLogger(__name__)
+
+# TTL для кэша в секундах (например, 1 час)
+CACHE_TTL = 3600
+
+class RedisClient:
+    def __init__(self, host='localhost', port=6379):
+        # Используем connection_pool для более эффективного управления соединениями
+        self.pool = redis.ConnectionPool(host=host, port=port, db=0, decode_responses=True)
+        self.client = redis.Redis(connection_pool=self.pool)
+
+    async def set_user_cache(self, user_id: int, key: str, data: dict, ttl: int = CACHE_TTL):
+        """Сохраняет данные в кэш для конкретного пользователя."""
+        try:
+            redis_key = f"user_cache:{user_id}:{key}"
+            await self.client.set(redis_key, json.dumps(data), ex=ttl)
+        except Exception as e:
+            logger.error(f"Ошибка при записи в Redis для user_id={user_id}, key={key}: {e}")
+
+    async def get_user_cache(self, user_id: int, key: str) -> dict | None:
+        """Получает данные из кэша для конкретного пользователя."""
+        try:
+            redis_key = f"user_cache:{user_id}:{key}"
+            data = await self.client.get(redis_key)
+            if data:
+                return json.loads(data)
+            return None
+        except Exception as e:
+            logger.error(f"Ошибка при чтении из Redis для user_id={user_id}, key={key}: {e}")
+            return None
+
+    async def clear_all_user_cache(self):
+        """Очищает весь пользовательский кэш (ключи, начинающиеся с 'user_cache:')."""
+        try:
+            async for key in self.client.scan_iter("user_cache:*"):
+                await self.client.delete(key)
+            logger.info("Весь пользовательский кэш в Redis очищен.")
+        except Exception as e:
+            logger.error(f"Ошибка при очистке кэша Redis: {e}")
+
+# Создаем единственный экземпляр клиента
+redis_client = RedisClient(host='redis')

{matplobbot_shared-0.1.31 → matplobbot_shared-0.1.35}/shared_lib/services/schedule_service.py

@@ -23,8 +23,8 @@ def format_schedule(schedule_data: List[Dict[str, Any]], lang: str, entity_name:
     """Formats a list of lessons into a readable daily schedule."""
     if not schedule_data:
         # Different message for single day vs week
-        no_lessons_key = "schedule_no_lessons_week" if is_week_view else "schedule_no_lessons_day"
-        return f"🗓 *Расписание для \"{entity_name}\"*\n\n{translator.gettext(lang, no_lessons_key)}"
+        no_lessons_key = "schedule_no_lessons_week" if is_week_view else "schedule_no_lessons_day" # This was Russian text
+        return translator.gettext(lang, "schedule_header_for", entity_name=entity_name) + f"\n\n{translator.gettext(lang, no_lessons_key)}"
 
     # Group lessons by date
     days = defaultdict(list)
@@ -41,24 +41,24 @@ def format_schedule(schedule_data: List[Dict[str, Any]], lang: str, entity_name:
         formatted_lessons = []
         for lesson in sorted(lessons, key=lambda x: x['beginLesson']):
             lesson_details = [
-                f"`{lesson['beginLesson']} - {lesson['endLesson']}`",
+                f"`{lesson['beginLesson']} - {lesson['endLesson']} | {lesson['auditorium']}`",
                 f"{lesson['discipline']} | {names_shorter[lesson['kindOfWork']]}"
             ]
 
             if entity_type == 'group':
-                lesson_details.append(f"*{lesson['auditorium']}* | {lesson['lecturer_title'].replace('_',' ')}")
+                lesson_details.append(f"{lesson['lecturer_title'].replace('_',' ')}\n{lesson.get('lecturerEmail', 'Почта не указана')}")
             elif entity_type == 'person': # Lecturer
-                lesson_details.append(f"*{lesson['auditorium']}* | {lesson.get('group', 'Группа не указана')}")
+                lesson_details.append(f" {lesson.get('group', 'Группа не указана')}")
             elif entity_type == 'auditorium':
-                lesson_details.append(f"{lesson.get('group', 'Группа не указана')} | {lesson['lecturer_title'].replace('_',' ')}")
+                lesson_details.append(f"{lesson.get('group', 'Группа не указана')} | {lesson['lecturer_title'].replace('_',' ')}\n{lesson.get('lecturerEmail', 'Почта не указана')}")
             else: # Fallback to a generic format
-                lesson_details.append(f"*{lesson['auditorium']}* | {lesson['lecturer_title'].replace('_',' ')}")
+                lesson_details.append(f"{lesson['lecturer_title'].replace('_',' ')}")
 
             formatted_lessons.append("\n".join(lesson_details))
         
         formatted_days.append(f"{day_header}\n" + "\n\n".join(formatted_lessons))
 
-    main_header = f"🗓 *Расписание для \"{entity_name}\"*"
+    main_header = translator.gettext(lang, "schedule_header_for", entity_name=entity_name)
     return f"{main_header}\n\n" + "\n\n---\n\n".join(formatted_days)
 
 def generate_ical_from_schedule(schedule_data: List[Dict[str, Any]], entity_name: str) -> str: