multibotkit 0.1.34__tar.gz → 0.2.0__tar.gz

{multibotkit-0.1.34 → multibotkit-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: multibotkit
-Version: 0.1.34
+Version: 0.2.0
 Summary: Functional library for developing multiplatform chatbots
 Home-page: https://github.com/Appvelox/multibotkit
 Author: Appvelox LLC
@@ -9,11 +9,28 @@ Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.9
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: httpx>=0.28.1
+Requires-Dist: pydantic<3
+Requires-Dist: tenacity>=9.1.2
+Requires-Dist: aiofiles>=22.1.0
 Provides-Extra: mongo
+Requires-Dist: motor>=3.7.0; extra == "mongo"
 Provides-Extra: redis
-License-File: LICENSE
+Requires-Dist: redis>=7.1.0; extra == "redis"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # multibotkit
 Functional library for developing multiplatform chatbots

multibotkit-0.2.0/multibotkit/dispatchers/yandexmessenger.py

@@ -0,0 +1,87 @@
+import inspect
+from datetime import datetime
+
+from multibotkit.dispatchers.base_dispatcher import BaseDispatcher
+from multibotkit.schemas.yandexmessenger.incoming import Update
+
+
+class YandexMessengerDispatcher(BaseDispatcher):
+    """
+    Dispatcher для обработки событий Yandex Messenger.
+
+    Логика работы:
+    1. Получает Update событие
+    2. Определяет sender_id (из login или id)
+    3. Загружает/создает state объект для пользователя
+    4. Проходит по зарегистрированным handlers
+    5. Выполняет handler если условия (func + state_object_func) выполнены
+    6. Логирует событие если logger настроен
+    """
+
+    async def process_event(self, event: Update):
+        """
+        Обработка входящего события Update.
+
+        Args:
+            event: Update объект с входящим сообщением
+        """
+        # 1. Определение sender_id
+        sender = event.from_
+        if sender.login:
+            sender_id = sender.login
+        elif sender.id:
+            sender_id = sender.id
+        else:
+            sender_id = "unknown"  # fallback
+
+        # 2. Формирование state_id
+        # ВАЖНО: использовать "yandexmessenger" (одно слово)
+        # чтобы state.id = state_id.split("_")[1] работало корректно
+        state_id = f"yandexmessenger_{sender_id}"
+        state_object = await self.state_manager.get_state(state_id)
+
+        # 3. Обработка handlers
+        for (func, state_func, handler) in self._handlers:
+            state_func_result = True
+            if state_func is not None:
+                try:
+                    if inspect.iscoroutinefunction(state_func):
+                        state_func_result = await state_func(state_object)
+                    else:
+                        state_func_result = state_func(state_object)
+                except Exception:
+                    continue
+
+            func_result = True
+            if func is not None:
+                try:
+                    if inspect.iscoroutinefunction(func):
+                        func_result = await func(event)
+                    else:
+                        func_result = func(event)
+                except Exception:
+                    continue
+
+            summary_result = state_func_result * func_result
+
+            if summary_result:
+                await handler(event, state_object)
+
+                # 4. Логирование
+                if self.logger:
+                    new_state_object = await self.state_manager.get_state(state_id)
+                    event_log = {
+                        "created_at": datetime.now(),
+                        "user_id": state_object.id,
+                        "platform": "YandexMessenger",
+                        "old_state": state_object.state,
+                        "old_state_data": state_object.data,
+                        "new_state": new_state_object.state,
+                        "new_state_data": new_state_object.data,
+                        "event": event.dict(),
+                    }
+                    if callable(self.logger):
+                        await self.logger(event_log)
+                        return
+                    self.logger.info(f"Incoming YandexMessenger event: {event_log}")
+                return

{multibotkit-0.1.34 → multibotkit-0.2.0}/multibotkit/helpers/fb.py

@@ -62,7 +62,7 @@ a list of quick replies"
             quick_replies=quick_replies,
         )
 
-        data = message.json(exclude_none=True)
+        data = message.model_dump_json(exclude_none=True)
         r = self._perform_sync_request(url=self.MESSAGES_URL, data=data)
         return r
 
@@ -88,7 +88,7 @@ a list of quick replies"
             quick_replies=quick_replies,
         )
 
-        data = message.json(exclude_none=True)
+        data = message.model_dump_json(exclude_none=True)
         r = await self._perform_async_request(url=self.MESSAGES_URL, data=data)
         return r
 
@@ -113,11 +113,11 @@ a list of quick replies"
         return r
 
     def sync_send_persistent_menu(self, persistent_menu: PersistentMenu):
-        data = persistent_menu.dict(exclude_none=True)
+        data = persistent_menu.model_dump(exclude_none=True)
         r = self._perform_sync_request(self.PROFILE_URL, data=data)
         return r
 
     async def async_send_persistent_menu(self, persistent_menu: PersistentMenu):
-        data = persistent_menu.dict(exclude_none=True)
+        data = persistent_menu.model_dump(exclude_none=True)
         r = await self._perform_async_request(self.PROFILE_URL, data=data)
         return r