smart-bot-factory 0.3.6__tar.gz → 0.3.7__tar.gz

{smart_bot_factory-0.3.6 → smart_bot_factory-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smart-bot-factory
-Version: 0.3.6
+Version: 0.3.7
 Summary: Библиотека для создания умных чат-ботов
 Author-email: Kopatych <eserov73@gmail.com>
 License: MIT

{smart_bot_factory-0.3.6 → smart_bot_factory-0.3.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "smart-bot-factory"
-version = "0.3.6"
+version = "0.3.7"
 description = "Библиотека для создания умных чат-ботов"
 authors = [
     {name = "Kopatych", email = "eserov73@gmail.com"}

{smart_bot_factory-0.3.6 → smart_bot_factory-0.3.7}/smart_bot_factory/core/bot_utils.py

@@ -255,6 +255,10 @@ async def process_events(session_id: str, events: list, user_id: int) -> bool:
                         # if session_id:
                         #     check_query = check_query.eq('session_id', session_id)
                         
+                        # 🆕 Фильтруем по bot_id если указан
+                        if supabase_client.bot_id:
+                            check_query = check_query.eq('bot_id', supabase_client.bot_id)
+                        
                         existing = check_query.execute()
                         
                         logger.info(f"   🔍 Проверка БД: найдено {len(existing.data) if existing.data else 0} выполненных событий '{event_type}' для user_id={user_id}")
@@ -291,6 +295,11 @@ async def process_events(session_id: str, events: list, user_id: int) -> bool:
                             'result_data': __import__('json').dumps(result, ensure_ascii=False) if result else None,
                             'info_dashboard': info_dashboard_json  # Добавится только если есть поле 'info'
                         }
+                        
+                        # 🆕 Добавляем bot_id если указан
+                        if supabase_client.bot_id:
+                            event_record['bot_id'] = supabase_client.bot_id
+                        
                         response = supabase_client.client.table('scheduled_events').insert(event_record).execute()
                         event_id = response.data[0]['id']
                         
@@ -311,6 +320,11 @@ async def process_events(session_id: str, events: list, user_id: int) -> bool:
                             'session_id': session_id,
                             'last_error': str(e)
                         }
+                        
+                        # 🆕 Добавляем bot_id если указан
+                        if supabase_client.bot_id:
+                            event_record['bot_id'] = supabase_client.bot_id
+                        
                         supabase_client.client.table('scheduled_events').insert(event_record).execute()
                         raise
                 

{smart_bot_factory-0.3.6 → smart_bot_factory-0.3.7}/smart_bot_factory/core/decorators.py

@@ -1135,6 +1135,10 @@ async def save_immediate_event(
         'session_id': session_id
     }
     
+    # 🆕 Добавляем bot_id если указан
+    if supabase_client.bot_id:
+        event_record['bot_id'] = supabase_client.bot_id
+    
     try:
         response = supabase_client.client.table('scheduled_events').insert(event_record).execute()
         event_id = response.data[0]['id']
@@ -1187,6 +1191,10 @@ async def save_scheduled_task(
         'session_id': session_id
     }
     
+    # 🆕 Добавляем bot_id если указан
+    if supabase_client.bot_id:
+        event_record['bot_id'] = supabase_client.bot_id
+    
     try:
         response = supabase_client.client.table('scheduled_events').insert(event_record).execute()
         event_id = response.data[0]['id']
@@ -1241,6 +1249,10 @@ async def save_global_event(
         'status': status
     }
     
+    # 🆕 Добавляем bot_id если указан (глобальные события тоже привязаны к боту)
+    if supabase_client.bot_id:
+        event_record['bot_id'] = supabase_client.bot_id
+    
     try:
         response = supabase_client.client.table('scheduled_events').insert(event_record).execute()
         event_id = response.data[0]['id']
@@ -1303,13 +1315,18 @@ async def get_pending_events(limit: int = 50) -> list:
     try:
         now = datetime.now(timezone.utc).isoformat()
         
-        response = supabase_client.client.table('scheduled_events')\
+        query = supabase_client.client.table('scheduled_events')\
             .select('*')\
             .in_('status', ['pending', 'immediate'])\
             .or_(f'scheduled_at.is.null,scheduled_at.lte.{now}')\
             .order('created_at')\
-            .limit(limit)\
-            .execute()
+            .limit(limit)
+        
+        # 🆕 Фильтруем по bot_id если указан
+        if supabase_client.bot_id:
+            query = query.eq('bot_id', supabase_client.bot_id)
+        
+        response = query.execute()
         
         return response.data
     except Exception as e:
@@ -1328,13 +1345,18 @@ async def get_pending_events_in_next_minute(limit: int = 100) -> list:
         now = datetime.now(timezone.utc)
         next_minute = now + timedelta(seconds=60)
         
-        response = supabase_client.client.table('scheduled_events')\
+        query = supabase_client.client.table('scheduled_events')\
             .select('*')\
             .in_('status', ['pending', 'immediate'])\
             .or_(f'scheduled_at.is.null,scheduled_at.lte.{next_minute.isoformat()}')\
             .order('created_at')\
-            .limit(limit)\
-            .execute()
+            .limit(limit)
+        
+        # 🆕 Фильтруем по bot_id если указан
+        if supabase_client.bot_id:
+            query = query.eq('bot_id', supabase_client.bot_id)
+        
+        response = query.execute()
         
         return response.data
     except Exception as e:
@@ -1705,6 +1727,10 @@ async def check_event_already_processed(event_type: str, user_id: int = None, se
         if session_id:
             query = query.eq('session_id', session_id)
         
+        # 🆕 Фильтруем по bot_id если указан
+        if supabase_client.bot_id:
+            query = query.eq('bot_id', supabase_client.bot_id)
+        
         response = query.execute()
         
         if response.data:

{smart_bot_factory-0.3.6 → smart_bot_factory-0.3.7}/smart_bot_factory/handlers/handlers.py

@@ -77,14 +77,26 @@ async def timeup_handler(message: Message, state: FSMContext):
         
         # Получаем события для этого пользователя И глобальные события (user_id = null)
         # 1. События пользователя
-        user_events = supabase_client.client.table('scheduled_events').select(
+        user_events_query = supabase_client.client.table('scheduled_events').select(
             '*'
-        ).eq('user_id', message.from_user.id).in_('status', ['pending', 'immediate']).execute()
+        ).eq('user_id', message.from_user.id).in_('status', ['pending', 'immediate'])
+        
+        # 🆕 Фильтруем по bot_id если указан
+        if supabase_client.bot_id:
+            user_events_query = user_events_query.eq('bot_id', supabase_client.bot_id)
+        
+        user_events = user_events_query.execute()
         
         # 2. Глобальные события (без user_id)
-        global_events = supabase_client.client.table('scheduled_events').select(
+        global_events_query = supabase_client.client.table('scheduled_events').select(
             '*'
-        ).is_('user_id', 'null').in_('status', ['pending', 'immediate']).execute()
+        ).is_('user_id', 'null').in_('status', ['pending', 'immediate'])
+        
+        # 🆕 Фильтруем по bot_id если указан
+        if supabase_client.bot_id:
+            global_events_query = global_events_query.eq('bot_id', supabase_client.bot_id)
+        
+        global_events = global_events_query.execute()
         
         # Объединяем события
         all_events = (user_events.data or []) + (global_events.data or [])

{smart_bot_factory-0.3.6 → smart_bot_factory-0.3.7}/uv.lock

@@ -1637,7 +1637,7 @@ wheels = [
 
 [[package]]
 name = "smart-bot-factory"
-version = "0.3.5"
+version = "0.3.6"
 source = { editable = "." }
 dependencies = [
     { name = "aiofiles" },