smart-bot-factory 0.3.6__py3-none-any.whl → 0.3.7__py3-none-any.whl

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/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/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.dist-info → smart_bot_factory-0.3.7.dist-info}/METADATA

@@ -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.dist-info → smart_bot_factory-0.3.7.dist-info}/RECORD

@@ -29,9 +29,9 @@ smart_bot_factory/configs/growthmed-october-24/tests/realistic_scenarios.yaml,sh
 smart_bot_factory/configs/growthmed-october-24/tests/scenario_examples.yaml,sha256=bzDulOU4a2LyWlcHzlQU8GYhOky2WTfyizGfjX4ioMY,2436
 smart_bot_factory/configs/growthmed-october-24/welcome_file/welcome_file_msg.txt,sha256=Db21Mm0r8SBWFdX9EeIF2FZtLQ2cvuwVlSRJd2KEYCg,922
 smart_bot_factory/configs/growthmed-october-24/welcome_file/Чек лист по 152ФЗ и 323ФЗ для медицины.pdf,sha256=BiAiQHNnQXJPMsks9AeL6s0beEjRFkRMJLMlAn4WorA,5284954
-smart_bot_factory/core/bot_utils.py,sha256=29y9LrwM4yLYqBqiCld4RmNW0q3cHL8psuOl4PiDEjs,47632
+smart_bot_factory/core/bot_utils.py,sha256=vblk94k8cXvc-3iS3UOZvnU2NtXXKYgt3vzkioca-ac,48395
 smart_bot_factory/core/conversation_manager.py,sha256=eoHL7MCEz68DRvTVwRwZgf2PWwGv4T6J9D-I-thETi8,28289
-smart_bot_factory/core/decorators.py,sha256=wiYyFTai7NebH7wQuxEsLbYGOExiCUmpXqz9V2FkXpM,98782
+smart_bot_factory/core/decorators.py,sha256=mYWiN9B0lrgV3uRAaFVkJTCKWZyTpVNM_AneuQcqifA,99872
 smart_bot_factory/core/message_sender.py,sha256=0-SQcK4W1x__VgvyaeVRuFlXcxV56TsR_nNK07Nr4b4,32763
 smart_bot_factory/core/router.py,sha256=ji7rzpuKaO8yKaxFW58WhlgG5ExXlbCgqCTONxAyqL4,15022
 smart_bot_factory/core/router_manager.py,sha256=dUwesog-oHk1U2EDdS8p0e4MTSkwtx5_qXn6nrJ9l9I,9700
@@ -41,7 +41,7 @@ smart_bot_factory/creation/bot_builder.py,sha256=yGRmOPD7qCMbhcBiltHWISoKxWx8eqj
 smart_bot_factory/creation/bot_testing.py,sha256=JDWXyJfZmbgo-DLdAPk8Sd9FiehtHHa4sLD17lBrTOc,55669
 smart_bot_factory/dashboard/__init__.py,sha256=bDBOWQbcAL1Bmz4KVFouAKg8FN-c6EsC_-YthTt_mP4,100
 smart_bot_factory/event/__init__.py,sha256=hPL449RULIOB-OXv1ZbGNiHctAYaOMUqhSWGPrDHYBM,212
-smart_bot_factory/handlers/handlers.py,sha256=v3ubszkN7ML-CXChveTdp68EdMjHl02NTJ3hMT2zXKA,61893
+smart_bot_factory/handlers/handlers.py,sha256=haxyVvFuyMWvfGCOiAvXPrez96bchoHnwQEEURMqiMI,62409
 smart_bot_factory/integrations/openai_client.py,sha256=fwaJpwojFdLBWChcFWpFGOHK9upG-nCIwDochkCRRlY,24291
 smart_bot_factory/integrations/supabase_client.py,sha256=XV1_caDAADnXLwCM7CkUdGfUNBNHBHYz-HBPSYmdGv4,63653
 smart_bot_factory/message/__init__.py,sha256=-ehDZweUc3uKgmLLxFVsD-KWrDtnHpHms7pCrDelWo0,1950
@@ -52,8 +52,8 @@ smart_bot_factory/utils/__init__.py,sha256=UhsJXEHfrIK8h1AHsroHSwAriijk-LvnqLyvg
 smart_bot_factory/utils/debug_routing.py,sha256=BOoDhKBg7UXe5uHQxRk3TSfPfLPOFqt0N7lAo6kjCOo,4719
 smart_bot_factory/utils/prompt_loader.py,sha256=HS_6Vf-qvRBkhvyzu-HNVS1swFgmqWOKNNv0F6We_AQ,20060
 smart_bot_factory/utils/user_prompt_loader.py,sha256=dk6P0X_3UcNqxjRtuIvb0LcPrp03zIIsstZwdmeCPaE,2519
-smart_bot_factory-0.3.6.dist-info/METADATA,sha256=1szKQIjRny6BWbsR5rNpeDUXZikcp7g4I9E8LIBYeqg,40662
-smart_bot_factory-0.3.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-smart_bot_factory-0.3.6.dist-info/entry_points.txt,sha256=ybKEAI0WSb7WoRiey7QE-HHfn88UGV7nxLDxXq7b7SU,50
-smart_bot_factory-0.3.6.dist-info/licenses/LICENSE,sha256=OrK3cwdUTzNzIhJvSPtJaVMoYIyC_sSx5EFE_FDMvGs,1092
-smart_bot_factory-0.3.6.dist-info/RECORD,,
+smart_bot_factory-0.3.7.dist-info/METADATA,sha256=cfOUXXewYMK7EomidcIP78W_yjjCnWHtmQ7efPx8FMA,40662
+smart_bot_factory-0.3.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+smart_bot_factory-0.3.7.dist-info/entry_points.txt,sha256=ybKEAI0WSb7WoRiey7QE-HHfn88UGV7nxLDxXq7b7SU,50
+smart_bot_factory-0.3.7.dist-info/licenses/LICENSE,sha256=OrK3cwdUTzNzIhJvSPtJaVMoYIyC_sSx5EFE_FDMvGs,1092
+smart_bot_factory-0.3.7.dist-info/RECORD,,