chatgraph 0.3.11__tar.gz → 0.3.12__tar.gz

{chatgraph-0.3.11 → chatgraph-0.3.12}/PKG-INFO

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

{chatgraph-0.3.11 → chatgraph-0.3.12}/chatgraph/messages/message_consumer.py

@@ -170,10 +170,13 @@ class MessageConsumer:
             type=message.get('type', ''),
             text=message.get('text', ''),
             user_state=UserState(
-                customer_id=user_state.get('customer_phone', ''),
+                customer_id=user_state.get('customer_id', ''),
                 menu=user_state.get('menu', ''),
                 route=user_state.get('route', ''),
                 lst_update=user_state.get('lst_update', ''),
+                direction_in=user_state.get('direction_in', ''),
+                voll_id=user_state.get('voll_id', ''),
+                platform=user_state.get('platform', ''),
                 obs=obs,
             ),
             channel=message.get('channel', ''),

{chatgraph-0.3.11 → chatgraph-0.3.12}/chatgraph/pb/userstate.proto

@@ -22,7 +22,9 @@ message UserState {
     string route = 3;
     string obs = 4;
     string date = 5;
-    string direction = 6;
+    bool direction = 6;
+    string voll_id = 7;
+    string platform = 8;
 }
 
 message UserStateId {

{chatgraph-0.3.11 → chatgraph-0.3.12}/chatgraph/pb/voll.proto

@@ -27,14 +27,15 @@ message MessageRequest {
   string hook_id = 1;
   string enterprise_id = 2;
   string unique_customer_id = 3;
-  string message_title = 4;
-  string message_text = 5;
-  string platform = 6;
-  string message_caption = 7;
-  string button_title = 8;
-  string campaign_name = 9;
-  string tabulation_name = 10;
-  repeated QuickOption options = 11;
+  string voll_id = 4;
+  string message_title = 5;
+  string message_text = 6;
+  string platform = 7;
+  string message_caption = 8;
+  string button_title = 9;
+  string campaign_name = 10;
+  string tabulation_name = 11;
+  repeated QuickOption options = 12;
 }
 
 message MessageResponse {

chatgraph-0.3.12/chatgraph/pb/voll_pb2.py

@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: voll.proto
+# Protobuf Python Version: 5.27.2
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    5,
+    27,
+    2,
+    '',
+    'voll.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\nvoll.proto\x12\x0bmessagevoll\"\x06\n\x04Void\"\xae\x02\n\x0eMessageRequest\x12\x0f\n\x07hook_id\x18\x01 \x01(\t\x12\x15\n\renterprise_id\x18\x02 \x01(\t\x12\x1a\n\x12unique_customer_id\x18\x03 \x01(\t\x12\x0f\n\x07voll_id\x18\x04 \x01(\t\x12\x15\n\rmessage_title\x18\x05 \x01(\t\x12\x14\n\x0cmessage_text\x18\x06 \x01(\t\x12\x10\n\x08platform\x18\x07 \x01(\t\x12\x17\n\x0fmessage_caption\x18\x08 \x01(\t\x12\x14\n\x0c\x62utton_title\x18\t \x01(\t\x12\x15\n\rcampaign_name\x18\n \x01(\t\x12\x17\n\x0ftabulation_name\x18\x0b \x01(\t\x12)\n\x07options\x18\x0c \x03(\x0b\x32\x18.messagevoll.QuickOption\"2\n\x0fMessageResponse\x12\x0e\n\x06status\x18\x01 \x01(\x08\x12\x0f\n\x07message\x18\x02 \x01(\t\"1\n\x0bQuickOption\x12\r\n\x05title\x18\x01 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x02 \x01(\t\"%\n\x0c\x43\x61mpaignName\x12\x15\n\rcampaign_name\x18\x01 \x01(\t\")\n\x0eTabulationName\x12\x17\n\x0ftabulation_name\x18\x01 \x01(\t\"=\n\x0f\x43\x61mpaignDetails\x12\x15\n\rcampaign_name\x18\x01 \x01(\t\x12\x13\n\x0b\x63\x61mpaign_id\x18\x02 \x01(\t\"R\n\x0f\x43\x61mpaignElement\x12\x13\n\x0b\x63\x61mpaign_id\x18\x01 \x01(\t\x12\x15\n\rcampaign_name\x18\x02 \x01(\t\x12\x13\n\x0blast_update\x18\x03 \x01(\t\"@\n\rCampaignsList\x12/\n\tcampaigns\x18\x01 \x03(\x0b\x32\x1c.messagevoll.CampaignElement\"C\n\x11TabulationDetails\x12\x17\n\x0ftabulation_name\x18\x01 \x01(\t\x12\x15\n\rtabulation_id\x18\x02 \x01(\t\"\xa9\x01\n\x11TabulationElement\x12\x15\n\rtabulation_id\x18\x01 \x01(\t\x12\x17\n\x0ftabulation_name\x18\x02 \x01(\t\x12\x17\n\x0ftabulation_type\x18\x03 \x01(\t\x12\x12\n\ngroup_name\x18\x04 \x01(\t\x12\"\n\x1a\x63ustomer_service_survey_id\x18\x05 \x01(\t\x12\x13\n\x0blast_update\x18\x06 \x01(\t\"F\n\x0fTabulationsList\x12\x33\n\x0btabulations\x18\x01 \x03(\x0b\x32\x1e.messagevoll.TabulationElement2\xfb\x02\n\x0eMessageService\x12G\n\nSendButton\x12\x1b.messagevoll.MessageRequest\x1a\x1c.messagevoll.MessageResponse\x12\x45\n\x08SendList\x12\x1b.messagevoll.MessageRequest\x1a\x1c.messagevoll.MessageResponse\x12\x45\n\x08SendText\x12\x1b.messagevoll.MessageRequest\x1a\x1c.messagevoll.MessageResponse\x12L\n\x0fTransferToHuman\x12\x1b.messagevoll.MessageRequest\x1a\x1c.messagevoll.MessageResponse\x12\x44\n\x07\x45ndChat\x12\x1b.messagevoll.MessageRequest\x1a\x1c.messagevoll.MessageResponse2\xb4\x02\n\x0e\x41\x63tionsService\x12H\n\rGetCampaignID\x12\x19.messagevoll.CampaignName\x1a\x1c.messagevoll.CampaignDetails\x12\x41\n\x10GetCampaignsList\x12\x11.messagevoll.Void\x1a\x1a.messagevoll.CampaignsList\x12N\n\x0fGetTabulationID\x12\x1b.messagevoll.TabulationName\x1a\x1e.messagevoll.TabulationDetails\x12\x45\n\x12GetTabulationsList\x12\x11.messagevoll.Void\x1a\x1c.messagevoll.TabulationsListB\x12Z\x10./pb/messagevollb\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'voll_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'Z\020./pb/messagevoll'
+  _globals['_VOID']._serialized_start=27
+  _globals['_VOID']._serialized_end=33
+  _globals['_MESSAGEREQUEST']._serialized_start=36
+  _globals['_MESSAGEREQUEST']._serialized_end=338
+  _globals['_MESSAGERESPONSE']._serialized_start=340
+  _globals['_MESSAGERESPONSE']._serialized_end=390
+  _globals['_QUICKOPTION']._serialized_start=392
+  _globals['_QUICKOPTION']._serialized_end=441
+  _globals['_CAMPAIGNNAME']._serialized_start=443
+  _globals['_CAMPAIGNNAME']._serialized_end=480
+  _globals['_TABULATIONNAME']._serialized_start=482
+  _globals['_TABULATIONNAME']._serialized_end=523
+  _globals['_CAMPAIGNDETAILS']._serialized_start=525
+  _globals['_CAMPAIGNDETAILS']._serialized_end=586
+  _globals['_CAMPAIGNELEMENT']._serialized_start=588
+  _globals['_CAMPAIGNELEMENT']._serialized_end=670
+  _globals['_CAMPAIGNSLIST']._serialized_start=672
+  _globals['_CAMPAIGNSLIST']._serialized_end=736
+  _globals['_TABULATIONDETAILS']._serialized_start=738
+  _globals['_TABULATIONDETAILS']._serialized_end=805
+  _globals['_TABULATIONELEMENT']._serialized_start=808
+  _globals['_TABULATIONELEMENT']._serialized_end=977
+  _globals['_TABULATIONSLIST']._serialized_start=979
+  _globals['_TABULATIONSLIST']._serialized_end=1049
+  _globals['_MESSAGESERVICE']._serialized_start=1052
+  _globals['_MESSAGESERVICE']._serialized_end=1431
+  _globals['_ACTIONSSERVICE']._serialized_start=1434
+  _globals['_ACTIONSSERVICE']._serialized_end=1742
+# @@protoc_insertion_point(module_scope)

{chatgraph-0.3.11 → chatgraph-0.3.12}/chatgraph/types/message_types.py

@@ -82,9 +82,9 @@ class ListElements:
     def __init__(
         self, 
         text:str,
+        button_title: str,
+        elements: dict,
         title: Optional[str] = None,
-        button_title: Optional[str] = None,
-        elements: dict = None,
         caption: Optional[str] = None,
         absolute_text: bool = False,
         ) -> None:

{chatgraph-0.3.11 → chatgraph-0.3.12}/chatgraph/types/request_types.py

@@ -20,9 +20,11 @@ class UserState:
         customer_id: str,
         menu: str,
         route: str,
+        voll_id: str,
+        platform: str,
+        direction_in: bool,
         lst_update: Optional[str]=None,
         obs: Optional[dict] = None,
-        direction_in: Optional[bool] = True,
     ) -> None:
         
         self.customer_id = customer_id
@@ -31,6 +33,8 @@ class UserState:
         self.lst_update = lst_update
         self.obs = obs
         self.direction_in = direction_in
+        self.voll_id = voll_id
+        self.platform = platform
 
     def __str__(self):
         return f"UserState:\n\tcustomer_id={self.customer_id},\n\tmenu={self.menu},\n\troute={self.route},\n\tlst_update={self.lst_update},\n\tobs={self.obs},\n\tdirection_in={self.direction_in}"
@@ -45,6 +49,9 @@ class UserState:
             'menu_id': self.menu,
             'route': self.route,
             'obs': json.dumps(self.obs),
+            'direction': self.direction_in,
+            'voll_id': self.voll_id,
+            'platform': self.platform,
         })
     
     def update(self, grpc_uri: Optional[str] = None) -> None:
@@ -127,11 +134,11 @@ class UserCall:
             
         elif isinstance(message, ListElements):
             self.__send_list(
-                message.text, 
-                message.title, 
-                message.button_title, 
-                message.elements, 
-                message.caption
+                text=message.text,
+                title=message.title, 
+                button_title=message.button_title, 
+                caption=message.caption,
+                element_list=message.elements, 
             )
         else:
             raise ValueError("Tipo de mensagem inválido.")
@@ -144,7 +151,7 @@ class UserCall:
             {
                 "hook_id": self.company_phone,
                 "enterprise_id": self.customer_phone,
-                "unique_customer_id": self.__user_state.customer_id,
+                "unique_customer_id": self.__user_state.voll_id,
                 "message_text": text,
                 "platform": self.channel,
             }
@@ -167,7 +174,7 @@ class UserCall:
             {
                 "hook_id": self.company_phone,
                 "enterprise_id": self.customer_phone,
-                "unique_customer_id": self.__user_state.customer_id,
+                "unique_customer_id": self.__user_state.voll_id,
                 "message_text": text,
                 "button_title": title,
                 "message_caption": caption,
@@ -182,12 +189,15 @@ class UserCall:
     def __send_list(
         self, 
         text:str,
+        button_title: str,
         title: str|None = None,
-        button_title: str|None = None,
         element_list: list[dict] = None,
         caption: str|None = None,
         ) -> None:
         
+        if not button_title:
+            raise NameError('Button Title é um parâmetro obrigatório!')
+        
         if len(element_list) > 20:
             raise ValueError("O número máximo de elementos é 20.")
         
@@ -195,7 +205,7 @@ class UserCall:
             {
                 "hook_id": self.company_phone,
                 "enterprise_id": self.customer_phone,
-                "unique_customer_id": self.__user_state.customer_id,
+                "unique_customer_id": self.__user_state.voll_id,
                 "message_text": text,
                 "button_title": button_title,
                 "message_caption": caption,
@@ -213,6 +223,7 @@ class UserCall:
                 "hook_id": self.company_phone,
                 "enterprise_id": self.customer_phone,
                 "unique_customer_id": self.__user_state.customer_id,
+                "voll_id": self.__user_state.voll_id,
                 "message_text": message,
                 "platform": self.channel,
                 "campaign_name": campaign_name,
@@ -222,15 +233,15 @@ class UserCall:
         if not response.status:
             raise ValueError("Erro ao transferir chat para humano.")
     
-    def end_chat(self, message:str, campaign_name:str) -> None:
+    def end_chat(self, message:str, tabulation_name:str) -> None:
         response = self.__wpp_server_client.end_chat(
             {
+                "tabulation_name": tabulation_name,
                 "hook_id": self.company_phone,
-                "enterprise_id": self.customer_phone,
                 "unique_customer_id": self.__user_state.customer_id,
+                "voll_id": self.__user_state.voll_id,
                 "message_text": message,
                 "platform": self.channel,
-                "campaign_name": campaign_name,
             }
         )
 

{chatgraph-0.3.11 → chatgraph-0.3.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "chatgraph"
-version = "0.3.11"
+version = "0.3.12"
 description = "A user-friendly chatbot library"
 authors = ["Irisson N. Lima <irisson.lima@verdecard.com.br>"]
 readme = "README.md"

chatgraph-0.3.11/chatgraph/pb/voll_pb2.py

@@ -1,63 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# NO CHECKED-IN PROTOBUF GENCODE
-# source: voll.proto
-# Protobuf Python Version: 5.27.2
-"""Generated protocol buffer code."""
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import runtime_version as _runtime_version
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
-_runtime_version.ValidateProtobufRuntimeVersion(
-    _runtime_version.Domain.PUBLIC,
-    5,
-    27,
-    2,
-    '',
-    'voll.proto'
-)
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\nvoll.proto\x12\x0bmessagevoll\"\x06\n\x04Void\"\x9d\x02\n\x0eMessageRequest\x12\x0f\n\x07hook_id\x18\x01 \x01(\t\x12\x15\n\renterprise_id\x18\x02 \x01(\t\x12\x1a\n\x12unique_customer_id\x18\x03 \x01(\t\x12\x15\n\rmessage_title\x18\x04 \x01(\t\x12\x14\n\x0cmessage_text\x18\x05 \x01(\t\x12\x10\n\x08platform\x18\x06 \x01(\t\x12\x17\n\x0fmessage_caption\x18\x07 \x01(\t\x12\x14\n\x0c\x62utton_title\x18\x08 \x01(\t\x12\x15\n\rcampaign_name\x18\t \x01(\t\x12\x17\n\x0ftabulation_name\x18\n \x01(\t\x12)\n\x07options\x18\x0b \x03(\x0b\x32\x18.messagevoll.QuickOption\"2\n\x0fMessageResponse\x12\x0e\n\x06status\x18\x01 \x01(\x08\x12\x0f\n\x07message\x18\x02 \x01(\t\"1\n\x0bQuickOption\x12\r\n\x05title\x18\x01 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x02 \x01(\t\"%\n\x0c\x43\x61mpaignName\x12\x15\n\rcampaign_name\x18\x01 \x01(\t\")\n\x0eTabulationName\x12\x17\n\x0ftabulation_name\x18\x01 \x01(\t\"=\n\x0f\x43\x61mpaignDetails\x12\x15\n\rcampaign_name\x18\x01 \x01(\t\x12\x13\n\x0b\x63\x61mpaign_id\x18\x02 \x01(\t\"R\n\x0f\x43\x61mpaignElement\x12\x13\n\x0b\x63\x61mpaign_id\x18\x01 \x01(\t\x12\x15\n\rcampaign_name\x18\x02 \x01(\t\x12\x13\n\x0blast_update\x18\x03 \x01(\t\"@\n\rCampaignsList\x12/\n\tcampaigns\x18\x01 \x03(\x0b\x32\x1c.messagevoll.CampaignElement\"C\n\x11TabulationDetails\x12\x17\n\x0ftabulation_name\x18\x01 \x01(\t\x12\x15\n\rtabulation_id\x18\x02 \x01(\t\"\xa9\x01\n\x11TabulationElement\x12\x15\n\rtabulation_id\x18\x01 \x01(\t\x12\x17\n\x0ftabulation_name\x18\x02 \x01(\t\x12\x17\n\x0ftabulation_type\x18\x03 \x01(\t\x12\x12\n\ngroup_name\x18\x04 \x01(\t\x12\"\n\x1a\x63ustomer_service_survey_id\x18\x05 \x01(\t\x12\x13\n\x0blast_update\x18\x06 \x01(\t\"F\n\x0fTabulationsList\x12\x33\n\x0btabulations\x18\x01 \x03(\x0b\x32\x1e.messagevoll.TabulationElement2\xfb\x02\n\x0eMessageService\x12G\n\nSendButton\x12\x1b.messagevoll.MessageRequest\x1a\x1c.messagevoll.MessageResponse\x12\x45\n\x08SendList\x12\x1b.messagevoll.MessageRequest\x1a\x1c.messagevoll.MessageResponse\x12\x45\n\x08SendText\x12\x1b.messagevoll.MessageRequest\x1a\x1c.messagevoll.MessageResponse\x12L\n\x0fTransferToHuman\x12\x1b.messagevoll.MessageRequest\x1a\x1c.messagevoll.MessageResponse\x12\x44\n\x07\x45ndChat\x12\x1b.messagevoll.MessageRequest\x1a\x1c.messagevoll.MessageResponse2\xb4\x02\n\x0e\x41\x63tionsService\x12H\n\rGetCampaignID\x12\x19.messagevoll.CampaignName\x1a\x1c.messagevoll.CampaignDetails\x12\x41\n\x10GetCampaignsList\x12\x11.messagevoll.Void\x1a\x1a.messagevoll.CampaignsList\x12N\n\x0fGetTabulationID\x12\x1b.messagevoll.TabulationName\x1a\x1e.messagevoll.TabulationDetails\x12\x45\n\x12GetTabulationsList\x12\x11.messagevoll.Void\x1a\x1c.messagevoll.TabulationsListB\x12Z\x10./pb/messagevollb\x06proto3')
-
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'voll_pb2', _globals)
-if not _descriptor._USE_C_DESCRIPTORS:
-  _globals['DESCRIPTOR']._loaded_options = None
-  _globals['DESCRIPTOR']._serialized_options = b'Z\020./pb/messagevoll'
-  _globals['_VOID']._serialized_start=27
-  _globals['_VOID']._serialized_end=33
-  _globals['_MESSAGEREQUEST']._serialized_start=36
-  _globals['_MESSAGEREQUEST']._serialized_end=321
-  _globals['_MESSAGERESPONSE']._serialized_start=323
-  _globals['_MESSAGERESPONSE']._serialized_end=373
-  _globals['_QUICKOPTION']._serialized_start=375
-  _globals['_QUICKOPTION']._serialized_end=424
-  _globals['_CAMPAIGNNAME']._serialized_start=426
-  _globals['_CAMPAIGNNAME']._serialized_end=463
-  _globals['_TABULATIONNAME']._serialized_start=465
-  _globals['_TABULATIONNAME']._serialized_end=506
-  _globals['_CAMPAIGNDETAILS']._serialized_start=508
-  _globals['_CAMPAIGNDETAILS']._serialized_end=569
-  _globals['_CAMPAIGNELEMENT']._serialized_start=571
-  _globals['_CAMPAIGNELEMENT']._serialized_end=653
-  _globals['_CAMPAIGNSLIST']._serialized_start=655
-  _globals['_CAMPAIGNSLIST']._serialized_end=719
-  _globals['_TABULATIONDETAILS']._serialized_start=721
-  _globals['_TABULATIONDETAILS']._serialized_end=788
-  _globals['_TABULATIONELEMENT']._serialized_start=791
-  _globals['_TABULATIONELEMENT']._serialized_end=960
-  _globals['_TABULATIONSLIST']._serialized_start=962
-  _globals['_TABULATIONSLIST']._serialized_end=1032
-  _globals['_MESSAGESERVICE']._serialized_start=1035
-  _globals['_MESSAGESERVICE']._serialized_end=1414
-  _globals['_ACTIONSSERVICE']._serialized_start=1417
-  _globals['_ACTIONSSERVICE']._serialized_end=1725
-# @@protoc_insertion_point(module_scope)