chatgraph 0.2.0__py3-none-any.whl → 0.2.3__py3-none-any.whl

chatgraph/bot/chatbot_model.py

@@ -2,6 +2,7 @@ import inspect
 from abc import ABC
 from functools import wraps
 from logging import debug
+import json
 
 from ..error.chatbot_error import ChatbotError, ChatbotMessageError
 from ..messages.base_message_consumer import MessageConsumer
@@ -113,8 +114,8 @@ 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
+        user_state = message.user_state
         menu = message.user_state.menu
         menu = menu.lower()
         handler = self.__routes.get(menu, None)
@@ -138,9 +139,17 @@ class ChatbotApp(ABC):
         if type(message_response) in (str, float, int):
             response = ChatbotResponse(message_response)
             return response.json()
+        elif type(message_response) == ChatbotResponse:
+            route = self.__adjust_route(message_response.route, menu)
+            response = message_response.json()
+            response['user_state'] = {
+                'customer_id': customer_id,
+                'menu': route,
+                'obs': user_state.obs,
+            }
+            return json.dumps(response)            
         elif type(message_response) in (ChatbotResponse, EndChatResponse, TransferToHuman):
-            # route = self.__adjust_route(message_response.route, menu)
-            return message_response.json()
+            return json.dumps(message_response.json())
         elif type(message_response) == RedirectResponse:
             route = self.__adjust_route(message_response.route, menu)
             message.user_state.menu = route

chatgraph/types/output_state.py

@@ -28,10 +28,10 @@ class ChatbotResponse:
         '''
         Retorna o objeto em formato json.
         '''
-        return json.dumps({
+        return {
             'type': 'message',
             'message': self.message,
-        })
+        }
 
 
 class RedirectResponse:
@@ -71,11 +71,11 @@ class EndChatResponse:
         '''
         Retorna o objeto em formato json.
         '''
-        return json.dumps({
+        return {
             'type': 'tabulate',
             'tabulation_id': self.tabulation_id,
             'observations': self.observations,
-        })
+        }
         
 class TransferToHuman:
     """
@@ -92,8 +92,8 @@ class TransferToHuman:
         '''
         Retorna o objeto em formato json.
         '''
-        return json.dumps({
+        return {
             'type': 'transfer',
             'campaign_id': self.campaign_id,
             'observations': self.observations,
-        })
+        }

{chatgraph-0.2.0.dist-info → chatgraph-0.2.3.dist-info}/METADATA

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

{chatgraph-0.2.0.dist-info → chatgraph-0.2.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
 chatgraph/__init__.py,sha256=6pDNMUOLR8iFK_3mWula1IJQcIoE8io-65mS_QheXXE,642
 chatgraph/auth/credentials.py,sha256=xsMEpLQnc66novPjL6upocMcnUnvFJ7yxINzUenkxmc,2388
-chatgraph/bot/chatbot_model.py,sha256=cy_IzeM8rZps9LxPKvEm9EWBQ_DlMBRm7iViQCxYy7s,6095
+chatgraph/bot/chatbot_model.py,sha256=9EPl6XJKNlu5eZHTnZylSXHu_ANyeUkeSsksSkWyAyI,6498
 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
@@ -8,10 +8,10 @@ chatgraph/messages/base_message_consumer.py,sha256=OSdTT4dHIzawLDOCZ-4hZ06T8UBxo
 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=7eB45hrlbYKV1Lp9vysR6V7OXNsySpeKYbGBc2Ux6xE,1363
-chatgraph/types/output_state.py,sha256=fpJ_hGO4aZ3wr6DV4i9ctnkHytWhK6ZDpKpJ3vSwRyY,3064
+chatgraph/types/output_state.py,sha256=C8kNy3bqSKBW3jAF-37Jrph-1Kqw08cY5dS3_bo3czA,3028
 chatgraph/types/route.py,sha256=nKTqzwGl7d_Bu8G6Sr0EmmhuuiZWKEoSozITRrdyi1g,2587
 chatgraph/types/user_state.py,sha256=nliV-kC_yOmYoFh8CQSfT92DbOv4BLF0vvn8kotnDog,2884
-chatgraph-0.2.0.dist-info/LICENSE,sha256=rVJozpRzDlplOpvI8A1GvmfVS0ReYdZvMWc1j2jV0v8,1090
-chatgraph-0.2.0.dist-info/METADATA,sha256=QCo3qrEPo-qPcxIekYUq5jkt-8pgKoDI2Xzp_gASERM,5829
-chatgraph-0.2.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-chatgraph-0.2.0.dist-info/RECORD,,
+chatgraph-0.2.3.dist-info/LICENSE,sha256=rVJozpRzDlplOpvI8A1GvmfVS0ReYdZvMWc1j2jV0v8,1090
+chatgraph-0.2.3.dist-info/METADATA,sha256=C5mhEHmgEPYBv3opwU6XKObWHwhv0rB6kYMbRJn2DHU,5829
+chatgraph-0.2.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+chatgraph-0.2.3.dist-info/RECORD,,