pbesa 4.0.16__tar.gz → 4.0.18__tar.gz

{pbesa-4.0.16 → pbesa-4.0.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pbesa
-Version: 4.0.16
+Version: 4.0.18
 License-File: LICENSE
 License-File: LICENSE.txt
 Requires-Dist: pymongo>=4.6.3

{pbesa-4.0.16 → pbesa-4.0.18}/pbesa/cognitive.py

@@ -734,7 +734,7 @@ class Dialog(ABC):
                 }
                 # Evia mensaje a los agentes remotos
                 logging.info('>>>> Call remote agent: team.\n')
-                response = canal.post(team.lower(), dto)
+                response = canal.post(team.lower(), dto, timeout=300)
                 if response and not response['status']:
                     logging.error(f'No se pudo establecer la comunicación con el agente remoto')
                     self.update_conversation(session_manager, session['id_conversacion'], None)
@@ -759,7 +759,7 @@ class Dialog(ABC):
                             'text': data
                         },
                     }
-                response = canal.post(team.lower(), dto)
+                response = canal.post(team.lower(), dto, timeout=300)
                 if response['status']:
                     logging.info(f'>>>> Response: {response}')
                     res = response['message']['response']
@@ -789,7 +789,10 @@ class Dialog(ABC):
     
     def recovery(self, session_id, query):
         try:
-            self.__work_memory = self.system_work_memory.copy()
+            logging.info("\n\n\n")
+            logging.info(f"------------RECOVERY---------------")
+            logging.info("\n\n\n")    
+            self.__work_memory = self.__system_work_memory.copy()
             prompt = RECOVERY_PROMPT % query
             temp_work_memory = [{"role": "system", "content": prompt}]
             res = self.__ai_service.generate(temp_work_memory, max_tokens=500)
@@ -803,7 +806,9 @@ class Dialog(ABC):
                 self.notify(session_id, "STOP") 
                 return "Web", DialogState.START, self.RECOVERY_MSG, "Web"
         except Exception as e:
-            return self.RECOVERY_MSG
+            logging.error(f"Error en la recuperación: {e}")
+            msg = "Lo lamento, no puedo responder en este momento."
+            return "Web", DialogState.START, msg, "Web"
         
     def stage_one_classification(self, session_id, messages, attemps, query):
         """ Stage one classification """
@@ -1280,10 +1285,10 @@ class Dialog(ABC):
                 res = self.__ai_service.generate(self.__work_memory, max_tokens=1000)
                 res = self.get_text(res)
                 logging.info(f"[Inferencia]:[Thought]:[DEEP]: {res}")
-                self.__work_memory.append({"role": "assistant", "content": res})
                 # Check if res is empty
-                if not res or res == "":
+                if not res or res == "" or res == "ERROR":
                     return self.recovery(session['session_id'], query)
+                self.__work_memory.append({"role": "assistant", "content": res})                
                 new_dialog_state = node.performative
                 if not node.is_terminal:
                     # Verifica recursion

{pbesa-4.0.16 → pbesa-4.0.18}/pbesa/kernel/util.py

@@ -60,7 +60,7 @@ class APIClient:
         if access_token:
             self.headers['Authorization'] = f'Bearer {access_token}'
     
-    def post(self, endpoint, payload) -> dict:
+    def post(self, endpoint, payload, timeout=120) -> dict:
         """
         Make a POST request to the specified endpoint with the given data.
         :param endpoint: Endpoint to send the POST request to.
@@ -73,7 +73,8 @@ class APIClient:
                 url=f"{self.base_url}/{endpoint}",
                 headers=self.headers,
                 json=payload,
-                timeout=self.timeout
+                timeout=timeout,
+                verify=False
             )
             response.raise_for_status()
             print(f"POST request to {endpoint} succeeded: {response.status_code}")
@@ -100,7 +101,7 @@ class APIClient:
             "message": "An error occurred while making the POST request."
         }
     
-    def get(self, endpoint) -> dict:
+    def get(self, endpoint, timeout=120) -> dict:
         """
         Make a GET request to the specified endpoint.
         :param endpoint: Endpoint to send the GET request to.
@@ -111,7 +112,7 @@ class APIClient:
             response = requests.get(
                 url=f"{self.base_url}/{endpoint}",
                 headers=self.headers,
-                timeout=self.timeout
+                timeout=timeout
             )
             response.raise_for_status()
             print(f"GET request to {endpoint} succeeded: {response.status_code}")
@@ -138,7 +139,7 @@ class APIClient:
             "message": "An error occurred while making the GET request."
         }
     
-    def put(self, endpoint, payload) -> dict:
+    def put(self, endpoint, payload, timeout=120) -> dict:
         """
         Make a PUT request to the specified endpoint with the given data.
         :param endpoint: Endpoint to send the PUT request to.
@@ -151,7 +152,7 @@ class APIClient:
                 url=f"{self.base_url}/{endpoint}",
                 headers=self.headers,
                 json=payload,
-                timeout=self.timeout
+                timeout=timeout
             )
             response.raise_for_status()
             print(f"PUT request to {endpoint} succeeded: {response.status_code}")
@@ -178,7 +179,7 @@ class APIClient:
             "message": "An error occurred while making the PUT request."
         }
     
-    def delete(self, endpoint) -> dict:
+    def delete(self, endpoint, timeout=120) -> dict:
         """
         Make a DELETE request to the specified endpoint.
         :param endpoint: Endpoint to send the DELETE request to.
@@ -189,7 +190,7 @@ class APIClient:
             response = requests.delete(
                 url=f"{self.base_url}/{endpoint}",
                 headers=self.headers,
-                timeout=self.timeout
+                timeout=timeout
             )
             response.raise_for_status()
             print(f"DELETE request to {endpoint} succeeded: {response.status_code}")

{pbesa-4.0.16 → pbesa-4.0.18}/pbesa/models.py

@@ -141,44 +141,51 @@ class AzureInference(AIService):
             self.deployment = self.model_conf['DEPLOYMENT_NAME']
 
     def generate(self, work_memory, max_tokens=2000, temperature=0, top_p=0.9) -> str:
+        again = False
         try:
             response = self.model.complete(
                 messages= work_memory,
                 model= self.deployment,
                 max_tokens= self.max_tokens
             )
-            return response.choices[0].message.content
+            res = response.choices[0].message.content
+            if not res or res == "" or res == "ERROR":
+                again = True
+            else:
+                return res
         except Exception as e:
             # Maneja otros errores
+            again = True
             trace_err = traceback.format_exc()
             err = str(e) + " - " + trace_err
             logging.info(f"Error en la respuesta de Azure: {err}")
+        if again:
             if self.model_conf['SUBSTITUDE_DEPLOYMENT_NAME'] == "Llama-3.3-70B-Instruct":
                 logging.info("\n\n\n")
                 logging.info("----------------------------------------")
-                logging.info("Entra a jugar el sustituto")
+                logging.info("Sustitudo atiendendo Llama-3.3-70B-Instruct")
                 try:
                     logging.info("\n\n\n.............................................")
                     logging.info("\n%s", json.dumps(work_memory, indent=4))
                     logging.info("........................................\n\n\n")
-
                     response = self.model.complete(
                         messages= work_memory,
                         model =self.model_conf['SUBSTITUDE_DEPLOYMENT_NAME'],
                         max_tokens=self.model_conf['MAX_TOKENS']
                     )
                     logging.info("----------------------------------------")
-                    logging.info("\n\n\n")
-                    
+                    logging.info("\n\n\n")                    
                     return response.choices[0].message.content
                 except Exception as e2:
                     trace_err2 = traceback.format_exc()
                     err2 = str(e2) + " - " + trace_err2
                     logging.info(f"Error en la respuesta de Azure: {err2}")
                     logging.info("----------------------------------------")
-                    logging.info("\n\n\n")
-                    
+                    logging.info("\n\n\n")                    
                     raise e2
+        logging.error("\n\n\n****************************************")
+        logging.error("No se pudo generar una respuesta válida.")
+        return ""
                     
 class AzureOpenAIInference(AIService):
 
@@ -231,7 +238,8 @@ class AzureOpenAIInference(AIService):
             self.wait_time = 2 ** (self.wait_time // 60)
         
     def generate(self, work_memory, max_tokens=4096, temperature=0, top_p=0.9) -> str:
-        try:
+        again = False
+        try:            
             if self.main_model_enable:
                 response = self.model.chat.completions.create(
                     messages=work_memory,
@@ -268,14 +276,19 @@ class AzureOpenAIInference(AIService):
                             logging.info(f"Esperando {self.wait_time} segundos antes de reintentar.")
                     logging.info("---------------------\n")                    
                 else:
-                    logging.info("\n--- Uso de Tokens no disponible en la respuesta ---")        
-                return response.choices[0].message.content
+                    logging.info("\n--- Uso de Tokens no disponible en la respuesta ---")
+                res = response.choices[0].message.content
+                if not res or res == "" or res == "ERROR":
+                    again = True
+                else:  
+                    return response.choices[0].message.content
         except Exception as e:
             self.wait_strategy_for_rate_limit(e)
         #----------------------------------
         # Exception mode
         #----------------------------------
-        if not self.main_model_enable:
+        if not self.main_model_enable or again:
+            again = False
             # Si ha pasado más de 1 minuto desde la última excepción, reinicia el modelo principal
             current_t = time.time()
             elapsed_time = current_t - self.exception_time

{pbesa-4.0.16 → pbesa-4.0.18}/pbesa.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pbesa
-Version: 4.0.16
+Version: 4.0.18
 License-File: LICENSE
 License-File: LICENSE.txt
 Requires-Dist: pymongo>=4.6.3

{pbesa-4.0.16 → pbesa-4.0.18}/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='pbesa',
-    version='4.0.16',
+    version='4.0.18',
     packages=find_packages(),
     install_requires=[
         'pymongo>=4.6.3',