chatgraph 0.3.15__tar.gz → 0.4.1__tar.gz

{chatgraph-0.3.15 → chatgraph-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chatgraph
-Version: 0.3.15
+Version: 0.4.1
 Summary: A user-friendly chatbot library
 Home-page: https://github.com/irissonnlima/chatgraph
 License: MIT
@@ -13,6 +13,8 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: grpcio (>=1.67.0,<2.0.0)
 Requires-Dist: grpcio-tools (>=1.67.0,<2.0.0)
+Requires-Dist: matplotlib (>=3.10.0,<4.0.0)
+Requires-Dist: networkx (>=3.4.2,<4.0.0)
 Requires-Dist: pika (>=1.3.2,<2.0.0)
 Requires-Dist: python-dotenv (>=1.0.1,<2.0.0)
 Requires-Dist: rich (>=13.8.1,<14.0.0)

{chatgraph-0.3.15 → chatgraph-0.4.1}/chatgraph/bot/chatbot_model.py

@@ -31,7 +31,7 @@ class ChatbotApp:
         self.__message_consumer = message_consumer
         self.__routes = {}
     
-    def include_router(self, router: ChatbotRouter, prefix: str):
+    def include_router(self, router: ChatbotRouter):
         """
         Inclui um roteador de chatbot com um prefixo nas rotas da aplicação.
 
@@ -42,18 +42,7 @@ class ChatbotApp:
         Raises:
             ChatbotError: Se a rota 'start' não for encontrada no roteador.
         """
-        if 'start' not in router.routes.keys():
-            raise ChatbotError('Erro ao incluir rota, start não encontrado!')
-
-        prefixed_routes = {
-            (
-                f'start{prefix.lower()}'
-                if key.lower() == 'start'
-                else f'start{prefix.lower()}{key.lower().replace("start", "")}'
-            ): value
-            for key, value in router.routes.items()
-        }
-        self.__routes.update(prefixed_routes)
+        self.__routes.update(router.routes)
 
     def route(self, route_name: str):
         """
@@ -67,9 +56,6 @@ class ChatbotApp:
         """
         route_name = route_name.strip().lower()
 
-        if 'start' not in route_name:
-            route_name = f'start{route_name}'
-
         def decorator(func):
             params = dict()
             signature = inspect.signature(func)
@@ -121,9 +107,10 @@ class ChatbotApp:
         """
         customer_id = userCall.customer_id
         route = userCall.route.lower()
+        route_handler = route.split('.')[-1]
         menu = userCall.menu.lower()
         obs = userCall.obs
-        handler = self.__routes.get(route, None)
+        handler = self.__routes.get(route_handler, None)
 
         if not handler:
             raise ChatbotMessageError(
@@ -172,7 +159,7 @@ class ChatbotApp:
             return
 
         elif isinstance(userCall_response, RedirectResponse):
-            route = self.__adjust_route(userCall_response.route, route)
+            route = route + '.' + userCall_response.route
             userCall.route = route
             return self.process_message(userCall)
 

{chatgraph-0.3.15 → chatgraph-0.4.1}/chatgraph/bot/chatbot_router.py

@@ -18,7 +18,17 @@ class ChatbotRouter:
         """
         Inicializa a classe ChatbotRouter com um dicionário vazio de rotas.
         """
-        self.routes = {}
+        self.__routes = {}
+    
+    @property
+    def routes(self):
+        """
+        Retorna as rotas registradas no roteador.
+
+        Returns:
+            dict: Um dicionário contendo as rotas e funções associadas.
+        """
+        return self.__routes
 
     def route(self, route_name: str):
         """
@@ -30,15 +40,14 @@ class ChatbotRouter:
         Returns:
             function: O decorador que adiciona a função à rota especificada.
         """
-        if 'start' not in route_name:
-            route_name = f'start{route_name}'
+
+        route_name = route_name.strip().lower()
 
         def decorator(func):
             params = dict()
             signature = inspect.signature(func)
             output_param = signature.return_annotation
 
-            # Itera sobre os parâmetros da função e extrai seus tipos
             for name, param in signature.parameters.items():
                 param_type = (
                     param.annotation
@@ -48,8 +57,7 @@ class ChatbotRouter:
                 params[param_type] = name
                 debug(f'Parameter: {name}, Type: {param_type}')
 
-            # Adiciona a função e seus parâmetros à rota especificada
-            self.routes[route_name.strip().lower()] = {
+            self.__routes[route_name] = {
                 'function': func,
                 'params': params,
                 'return': output_param,
@@ -63,7 +71,7 @@ class ChatbotRouter:
 
         return decorator
 
-    def include_router(self, router: 'ChatbotRouter', prefix: str):
+    def include_router(self, router: 'ChatbotRouter'):
         """
         Inclui outro roteador com um prefixo nas rotas do roteador atual.
 
@@ -74,16 +82,4 @@ class ChatbotRouter:
         Raises:
             ChatbotError: Se a rota 'start' não for encontrada no roteador fornecido.
         """
-        if 'start' not in router.routes.keys():
-            raise ChatbotError('Erro ao incluir rota, start não encontrado!')
-
-        # Adiciona prefixo às rotas do roteador incluído
-        prefixed_routes = {
-            (
-                f'{prefix.lower()}'
-                if key.lower() == 'start'
-                else f'start{prefix.lower()}{key.lower().replace("start", "")}'
-            ): value
-            for key, value in router.routes.items()
-        }
-        self.routes.update(prefixed_routes)
+        self.__routes.update(router.__routes)

{chatgraph-0.3.15 → chatgraph-0.4.1}/chatgraph/messages/message_consumer.py

@@ -178,6 +178,7 @@ class MessageConsumer:
                 voll_id=user_state.get('voll_id', ''),
                 platform=user_state.get('platform', ''),
                 obs=obs,
+                protocol=user_state.get('protocol', ''),
             ),
             channel=message.get('channel', ''),
             customer_phone=message.get('customer_phone', ''),

{chatgraph-0.3.15 → chatgraph-0.4.1}/chatgraph/types/request_types.py

@@ -26,6 +26,7 @@ class UserState:
         voll_id: Optional[str]=None,
         lst_update: Optional[str]=None,
         obs: Optional[dict] = None,
+        protocol: Optional[str] = None,
     ) -> None:
         
         self.customer_id = customer_id
@@ -36,6 +37,7 @@ class UserState:
         self.direction_in = direction_in
         self.voll_id = voll_id
         self.platform = platform
+        self.protocol = protocol
 
     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}"
@@ -53,6 +55,7 @@ class UserState:
             'direction': self.direction_in,
             'voll_id': self.voll_id,
             'platform': self.platform,
+            'protocol': self.protocol,
         })
     
     def update(self, grpc_uri: Optional[str] = None) -> None:
@@ -318,6 +321,26 @@ class UserCall:
     def customer_id(self):
         return self.__user_state.customer_id
     
+    @property
+    def voll_id(self):
+        return self.__user_state.voll_id
+    
+    @property
+    def platform(self):
+        return self.__user_state.platform
+    
+    @property
+    def direction_in(self):
+        return self.__user_state.direction_in
+    
+    @property
+    def lst_update(self):
+        return self.__user_state.lst_update
+    
+    @property
+    def protocol(self):
+        return self.__user_state.protocol
+    
     @menu.setter
     def menu(self, menu):
         

{chatgraph-0.3.15 → chatgraph-0.4.1}/chatgraph/types/route.py

@@ -24,13 +24,20 @@ class Route:
         self.separator = separator
 
     @property
-    def previous(self)->str:
+    def previous(self)->'Route':
         """
         Retorna a rota anterior a atual do usuário
         """
         return self.get_previous()
     
-    def get_previous(self) -> str:
+    @property
+    def current_node(self)->str:
+        """
+        Retorna o nó atual do usuário
+        """
+        return self.current.split(self.separator)[-1]
+    
+    def get_previous(self) -> 'Route':
         """
         Retorna o caminho anterior ao caminho atual.
 
@@ -41,10 +48,10 @@ class Route:
             str: O caminho anterior à rota atual.
         """
         if self.current == 'start':
-            raise RouteError('Não há caminho anterior ao start')
+            return Route(self.current, self.routes, self.separator)
 
         previous_route = self.separator.join(self.current.split(self.separator)[:-1])
-        return previous_route
+        return Route(previous_route, self.routes, self.separator)
 
     def get_next(self, next_part: str) -> 'Route':
         """
@@ -60,9 +67,9 @@ class Route:
             Route: O próximo caminho montado.
         """
         next_part = next_part.strip().lower()
-        next_route = f"{self.current.rstrip(self.separator)}{next_part}"
-        if next_route not in self.routes:
-            raise RouteError(f'Rota não encontrada: {next_route}')
+        next_route = f"{self.current.rstrip(self.separator)}.{next_part}"
+        if next_part not in self.routes:
+            raise RouteError(f'Rota não encontrada: {next_part}')
         
         return Route(next_route, self.routes, self.separator)
 

{chatgraph-0.3.15 → chatgraph-0.4.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "chatgraph"
-version = "0.3.15"
+version = "0.4.1"
 description = "A user-friendly chatbot library"
 authors = ["Irisson N. Lima <irisson.lima@verdecard.com.br>"]
 readme = "README.md"
@@ -17,6 +17,8 @@ grpcio = "^1.67.0"
 grpcio-tools = "^1.67.0"
 python-dotenv = "^1.0.1"
 typer = "^0.12.5"
+matplotlib = "^3.10.0"
+networkx = "^3.4.2"
 
 [tool.poetry.group.dev.dependencies]
 ruff = "^0.5.1"