pbesa 4.0.3__tar.gz → 4.0.4__tar.gz

{pbesa-4.0.3 → pbesa-4.0.4}/PKG-INFO

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

{pbesa-4.0.3 → pbesa-4.0.4}/pbesa/cognitive.py

@@ -466,6 +466,8 @@ class Dialog(ABC):
         # Define deep
         self.__deep_count = 0
         self.__deep_limit = 3
+        # Define knowledge
+        self.knowledge = None
 
     def setup_world(self):
         """ Set up model method """
@@ -473,10 +475,14 @@ class Dialog(ABC):
         instrucciones = f"Instrucciones:\n{self.__role.description}\n Tu tarea: {self.__role.objective}\n"
         requisitos = f"Requisitos:\n{self.__role.arquetype}\n"
         ejemplo = f"Ejemplo:\n{self.__role.example}\n"
+        if self.knowledge:
+            conocimiento = f"Conocimiento:\n{self.knowledge}\n"
         continuar = "Ahora, evalúa el siguiente caso:\n"
         self.__work_memory.append({"role": "user", "content": instrucciones})
         self.__work_memory.append({"role": "user", "content": requisitos})
         self.__work_memory.append({"role": "user", "content": ejemplo})
+        if self.knowledge:
+            self.__work_memory.append({"role": "user", "content": conocimiento})
         self.__work_memory.append({"role": "user", "content": continuar})
         
     def get_model(self) -> any:
@@ -721,7 +727,10 @@ class Dialog(ABC):
                     self.__work_memory.append({"role": "user", "content": node.text})
                     logging.info(f"-> node team -> envia: {query}")
                     text = self.team_inquiry(node.team, query, node.tool, False)
-            logging.info(f"-> node team -> text: {text}")
+                logging.info(f"-> node team -> text: {text}")
+                if text:
+                    logging.info(f"-> Adicion WM node team -> text: {text}")
+                    self.__work_memory.append({"role": "system", "content": text})
             self.__deep_count += 1
             if self.__deep_count < self.__deep_limit:
                 return self.transition(owner, node.performative, text, True)
@@ -765,3 +774,10 @@ class Dialog(ABC):
 
         logging.info(f"$$$> new_owner: {owner} new_dialog_state: {new_dialog_state}")
         return owner, new_dialog_state, res, owner
+
+    def set_knowledge(self, knowledge) -> str:
+        """ Set knowledge method
+        :param query: query
+        :return: str
+        """
+        self.knowledge = knowledge

{pbesa-4.0.3 → pbesa-4.0.4}/pbesa/social/collaborative_team.py

@@ -33,6 +33,7 @@ clear and unified results.
 # Define resources
 # --------------------------------------------------------
 
+import logging
 from threading import Timer
 from abc import abstractmethod
 from ..kernel.agent import Agent
@@ -94,7 +95,7 @@ class DelegateAction(Action):
         self.agent.reset()
         self.delegate(data['dto'])
         
-    def activeTimeout(self, time:int) -> None:
+    def active_timeout(self, time:int) -> None:
         """ Active timeout
         @param time: Time
         """
@@ -109,6 +110,27 @@ class DelegateAction(Action):
             self.adm.send_event(ag, 'task', data)
         else:
             raise CollaborativeException('[Warn, toAssign]: The number of data packets exceeds the number of agents')
+        
+    def get_list_agents(self) -> list:
+        """ Get list of agents
+        @return: List of agents
+        """
+        return self.agent.get_free_list()
+    
+    def to_individual_assign(self, ag_id, data:any) -> bool:
+        """ Assign data to an agent
+        @param data: Data
+        """
+        if len(self.agent.get_free_list()) > 0:
+            index = self.agent.get_free_list().index(ag_id)
+            if index >= 0:
+                self.agent.get_free_list().pop(index)
+                self.adm.send_event(ag_id, 'task', data)
+            else:
+                return False
+        else:
+            raise CollaborativeException('[Warn, toAssign]: The number of data packets exceeds the number of agents')
+        return True
 
     @abstractmethod
     def delegate(self, data:any) -> None:
@@ -129,17 +151,24 @@ class ResponseAction(Action):
         @param data: Event data
         """
         if 'timeout' == data:
+            logging.info('Stopping timeout')
             results = {}
             for key, res in self.agent.get_check_dict().items():
                 results[key] = res
             self.end_of_process(results, True)
         else:
+            logging.info("Response received")
+            logging.info(data)
             result = 'None'
             agentID = data['source']
-            if data['result']:
+            if 'result' in data and data['result']:
                 result =  data['result']
-            self.agent.get_check_dict()[agentID] = result
+                self.agent.get_check_dict()[agentID] = result
+            else:
+                logging.warning(f"No result received for agent {agentID}")
+                self.agent.get_check_dict()[agentID] = "None"
             if self.check():
+                logging.info("All agents have responded")
                 results = {}
                 for key, res in self.agent.get_check_dict().items():
                     results[key] = res

{pbesa-4.0.3 → pbesa-4.0.4}/pbesa.egg-info/PKG-INFO

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

{pbesa-4.0.3 → pbesa-4.0.4}/setup.py

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