chatgraph 0.1.5__py3-none-any.whl → 0.2.1__py3-none-any.whl

chatgraph/__init__.py

@@ -2,15 +2,13 @@ from .auth.credentials import Credential
 from .bot.chatbot_model import ChatbotApp
 from .bot.chatbot_router import ChatbotRouter
 from .messages.rabbitMQ_message_consumer import RabbitMessageConsumer
-from .types.message_types import Message
+from .types.message_types import Message, UserState
 from .types.output_state import ChatbotResponse, RedirectResponse, EndChatResponse, TransferToHuman
 from .types.route import Route
-from .types.user_state import SimpleUserState
 
 __all__ = [
     'ChatbotApp',
     'Credential',
-    'SimpleUserState',
     'Message',
     'ChatbotRouter',
     'ChatbotResponse',
@@ -19,4 +17,5 @@ __all__ = [
     'Route',
     'EndChatResponse',
     'TransferToHuman',
+    'UserState',
 ]

chatgraph/bot/chatbot_model.py

@@ -8,7 +8,6 @@ from ..messages.base_message_consumer import MessageConsumer
 from ..types.message_types import Message
 from ..types.output_state import ChatbotResponse, RedirectResponse, EndChatResponse, TransferToHuman
 from ..types.route import Route
-from ..types.user_state import UserState
 from .chatbot_router import ChatbotRouter
 
 
@@ -17,16 +16,14 @@ class ChatbotApp(ABC):
     Classe principal para a aplicação do chatbot, gerencia as rotas e a lógica de processamento de mensagens.
     """
 
-    def __init__(self, user_state: UserState, message_consumer: MessageConsumer):
+    def __init__(self, message_consumer: MessageConsumer):
         """
         Inicializa a classe ChatbotApp com um estado de usuário e um consumidor de mensagens.
 
         Args:
-            user_state (UserState): O estado do usuário, que contém informações persistentes sobre as interações do usuário.
             message_consumer (MessageConsumer): O consumidor de mensagens que lida com a entrada de mensagens no sistema.
         """
         self.__message_consumer = message_consumer
-        self.__user_state = user_state
         self.__routes = {}
     
     def include_router(self, router: ChatbotRouter, prefix: str):
@@ -116,9 +113,9 @@ class ChatbotApp(ABC):
         Returns:
             str: A resposta gerada pela função da rota, que pode ser uma mensagem ou o resultado de uma redireção.
         """
-        customer_id = message.customer_id
+        customer_id = message.user_state.customer_id
 
-        menu = self.__user_state.get_menu(customer_id)
+        menu = message.user_state.menu
         menu = menu.lower()
         handler = self.__routes.get(menu, None)
 
@@ -139,21 +136,15 @@ class ChatbotApp(ABC):
         message_response = func(**kwargs)
 
         if type(message_response) in (str, float, int):
-            return message_response
-        elif type(message_response) == ChatbotResponse:
-            route = self.__adjust_route(message_response.route, menu)
-            self.__user_state.set_menu(customer_id, route)
+            response = ChatbotResponse(message_response)
+            return response.json()
+        elif type(message_response) in (ChatbotResponse, EndChatResponse, TransferToHuman):
+            # route = self.__adjust_route(message_response.route, menu)
             return message_response.json()
         elif type(message_response) == RedirectResponse:
             route = self.__adjust_route(message_response.route, menu)
-            self.__user_state.set_menu(customer_id, route)
+            message.user_state.menu = route
             return self.process_message(message)
-        elif type(message_response) == EndChatResponse:
-            self.__user_state.delete_menu(customer_id)
-            return message_response.json()
-        elif type(message_response) == TransferToHuman:
-            self.__user_state.delete_menu(customer_id)
-            return message_response.json()
         else:
             raise ChatbotError('Tipo de retorno inválido!')
 

chatgraph/messages/rabbitMQ_message_consumer.py

@@ -4,7 +4,7 @@ import os
 import pika
 from typing import Callable
 from ..auth.credentials import Credential
-from ..types.message_types import Message
+from ..types.message_types import Message, UserState
 from .base_message_consumer import MessageConsumer
 
 
@@ -164,7 +164,12 @@ class RabbitMessageConsumer(MessageConsumer):
         return Message(
             type=message.get('type', ''),
             text=message.get('text', ''),
-            customer_id=message.get('customer_id', ''),
+            user_state=UserState(
+                customer_id=message.get('customer_id', ''),
+                menu=message.get('menu', ''),
+                lst_update=message.get('lst_update', ''),
+                obs=message.get('obs', {}),
+            ),
             channel=message.get('channel', ''),
             customer_phone=message.get('customer_phone', ''),
             company_phone=message.get('company_phone', ''),

chatgraph/types/message_types.py

@@ -2,6 +2,22 @@ from dataclasses import dataclass
 from typing import Optional
 
 
+@dataclass
+class UserState:
+    """
+    Representa o estado de um usuário.
+    
+    Atributos:
+        customer_id (str): O ID do cliente.
+        menu (str): O menu atual.
+        lst_update (str): A última atualização do menu.
+        obs (dict): Observações adicionais sobre o estado do usuário.
+    """
+    customer_id: str
+    menu: str
+    lst_update: str
+    obs: Optional[dict] = None
+
 @dataclass
 class Message:
     """
@@ -10,7 +26,7 @@ class Message:
     Atributos:
         type (str): O tipo da mensagem (por exemplo, texto, imagem, etc.).
         text (str): O conteúdo textual da mensagem.
-        customer_id (str): O ID do cliente que enviou ou recebeu a mensagem.
+        UserState (UserState): O estado do usuário.
         channel (str): O canal pelo qual a mensagem foi enviada ou recebida (por exemplo, WhatsApp, SMS, etc.).
         customer_phone (str): O número de telefone do cliente.
         company_phone (str): O número de telefone da empresa que está enviando ou recebendo a mensagem.
@@ -18,7 +34,7 @@ class Message:
     """
     type: str
     text: str
-    customer_id: str
+    user_state: UserState
     channel: str
     customer_phone: str
     company_phone: str

chatgraph/types/user_state.py

@@ -1,3 +1,7 @@
+"""
+Deprecated!!
+"""
+
 from abc import ABC, abstractmethod
 
 

{chatgraph-0.1.5.dist-info → chatgraph-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chatgraph
-Version: 0.1.5
+Version: 0.2.1
 Summary: A user-friendly chatbot library
 Home-page: https://github.com/irissonnlima/chatgraph
 License: MIT

{chatgraph-0.1.5.dist-info → chatgraph-0.2.1.dist-info}/RECORD

@@ -1,17 +1,17 @@
-chatgraph/__init__.py,sha256=oG_aiCUfJfhiNPuJMuDZv0yFwfTxUMWmzvwWJ6AEhWg,684
+chatgraph/__init__.py,sha256=6pDNMUOLR8iFK_3mWula1IJQcIoE8io-65mS_QheXXE,642
 chatgraph/auth/credentials.py,sha256=xsMEpLQnc66novPjL6upocMcnUnvFJ7yxINzUenkxmc,2388
-chatgraph/bot/chatbot_model.py,sha256=6tPoplS9nPHMYK0gSKFGq6cQr3dA2jOiBJTmQVuOb0I,6643
+chatgraph/bot/chatbot_model.py,sha256=F3hWjb8_oNatF052QXHYFu3buAoVHqsgRzdpKyB1UlY,6106
 chatgraph/bot/chatbot_router.py,sha256=kZ_4X5AhhE2mntx4tcHiapaSKC1T4K1jqIVjLp1Pjg0,2817
 chatgraph/error/chatbot_error.py,sha256=4sEcW8vz0eQk2QDmDygucVM4caHliZW5iH7XJvmLBuk,1897
 chatgraph/error/route_error.py,sha256=CY8m82ap7-Sr-DXPsolltRW50TqD__5RyXBmNNJCWr8,793
 chatgraph/messages/base_message_consumer.py,sha256=OSdTT4dHIzawLDOCZ-4hZ06T8UBxoJIosqvXl7gxpM0,1099
-chatgraph/messages/rabbitMQ_message_consumer.py,sha256=mRcJ1Hbd5wPFxC3v6Tj3pYvjd9yAc398Ys6cUox-CTY,7005
+chatgraph/messages/rabbitMQ_message_consumer.py,sha256=HoVS79PMXfkh0QHsZ7Zj7XuPLwEMnDXpR_9NJU78lqc,7222
 chatgraph/messages/test_message_consumer.py,sha256=9XIkbCHd1S6S8pINRT-SLEvUT0TQWBCsdPhYN6PpZ2s,518
-chatgraph/types/message_types.py,sha256=NBuebmpO2e9ilspBoFgs9O3rY_VQ2AP_Z8Q_nC70nyM,965
+chatgraph/types/message_types.py,sha256=7eB45hrlbYKV1Lp9vysR6V7OXNsySpeKYbGBc2Ux6xE,1363
 chatgraph/types/output_state.py,sha256=fpJ_hGO4aZ3wr6DV4i9ctnkHytWhK6ZDpKpJ3vSwRyY,3064
 chatgraph/types/route.py,sha256=nKTqzwGl7d_Bu8G6Sr0EmmhuuiZWKEoSozITRrdyi1g,2587
-chatgraph/types/user_state.py,sha256=B17bN300RW_9-WUbI7pWK_BUCvMbdpm6gLQHPqdGly4,2858
-chatgraph-0.1.5.dist-info/LICENSE,sha256=rVJozpRzDlplOpvI8A1GvmfVS0ReYdZvMWc1j2jV0v8,1090
-chatgraph-0.1.5.dist-info/METADATA,sha256=ZoNfC0TwLhUOtvAhs4TDdQCWjY5Wo9U6oJDPb-xzkYw,5829
-chatgraph-0.1.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-chatgraph-0.1.5.dist-info/RECORD,,
+chatgraph/types/user_state.py,sha256=nliV-kC_yOmYoFh8CQSfT92DbOv4BLF0vvn8kotnDog,2884
+chatgraph-0.2.1.dist-info/LICENSE,sha256=rVJozpRzDlplOpvI8A1GvmfVS0ReYdZvMWc1j2jV0v8,1090
+chatgraph-0.2.1.dist-info/METADATA,sha256=AETzmMjuML4Xk50Ll4yoPlXLDrBFZJwdJ4VmL1wPf0g,5829
+chatgraph-0.2.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+chatgraph-0.2.1.dist-info/RECORD,,