pycityagent 2.0.0a12__tar.gz → 2.0.0a13__tar.gz

{pycityagent-2.0.0a12 → pycityagent-2.0.0a13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycityagent
-Version: 2.0.0a12
+Version: 2.0.0a13
 Summary: LLM-based城市环境agent构建库
 License: MIT
 Author: Yuwei Yan

{pycityagent-2.0.0a12 → pycityagent-2.0.0a13}/pycityagent/agent.py

@@ -427,7 +427,9 @@ class InstitutionAgent(Agent):
             simulator,
             memory,
         )
-
+        # 添加响应收集器
+        self._gather_responses: Dict[str, asyncio.Future] = {}
+        
     async def bind_to_simulator(self):
         await self._bind_to_economy()
 
@@ -514,18 +516,47 @@ class InstitutionAgent(Agent):
 
     async def handle_gather_message(self, payload: dict):
         """处理收到的消息，识别发送者"""
-        # 从消息中解析发送者 ID 和消息内容
         content = payload["content"]
         sender_id = payload["from"]
-        print(
-            f"Agent {self._uuid} received gather message: '{content}' from Agent {sender_id}"
-        )
-
-    async def gather_messages(self, agent_ids: list[UUID], target: str):
-        """从多个智能体收集消息"""
+        
+        # 将响应存储到对应的Future中
+        response_key = str(sender_id)
+        if response_key in self._gather_responses:
+            self._gather_responses[response_key].set_result({
+                "from": sender_id,
+                "content": content,
+            })
+
+    async def gather_messages(self, agent_ids: list[UUID], target: str) -> List[dict]:
+        """从多个智能体收集消息
+        
+        Args:
+            agent_ids: 目标智能体ID列表
+            target: 要收集的信息类型
+            
+        Returns:
+            List[dict]: 收集到的所有响应
+        """
+        # 为每个agent创建Future
+        futures = {}
+        for agent_id in agent_ids:
+            response_key = str(agent_id)
+            futures[response_key] = asyncio.Future()
+            self._gather_responses[response_key] = futures[response_key]
+            
+        # 发送gather请求
         payload = {
             "from": self._uuid,
             "target": target,
         }
         for agent_id in agent_ids:
             await self._send_message(agent_id, payload, "gather")
+            
+        try:
+            # 等待所有响应
+            responses = await asyncio.gather(*futures.values())
+            return responses
+        finally:
+            # 清理Future
+            for key in futures:
+                self._gather_responses.pop(key, None)

{pycityagent-2.0.0a12 → pycityagent-2.0.0a13}/pycityagent/simulation/agentgroup.py

@@ -71,7 +71,8 @@ class AgentGroup:
                 topic = f"exps/{self.exp_id}/agents/{agent._uuid}/gather"
                 await self.messager.subscribe(topic, agent)
         self.initialized = True
-
+        self.message_dispatch_task = asyncio.create_task(self.message_dispatch())
+        
     async def gather(self, content: str):
         results = {}
         for agent in self.agents:
@@ -82,49 +83,46 @@ class AgentGroup:
         agent = self.id2agent[target_agent_uuid]
         await agent.memory.update(target_key, content)
 
+    async def message_dispatch(self):
+        while True:
+            if not self.messager.is_connected():
+                logging.warning("Messager is not connected. Skipping message processing.")
+
+            # Step 1: 获取消息
+            messages = await self.messager.fetch_messages()
+            logging.info(f"Group {self._uuid} received {len(messages)} messages")
+
+            # Step 2: 分发消息到对应的 Agent
+            for message in messages:
+                topic = message.topic.value
+                payload = message.payload
+
+                # 添加解码步骤，将bytes转换为str
+                if isinstance(payload, bytes):
+                    payload = payload.decode("utf-8")
+                    payload = json.loads(payload)
+
+                # 提取 agent_id（主题格式为 "exps/{exp_id}/agents/{agent_uuid}/{topic_type}"）
+                _, _, _, agent_uuid, topic_type = topic.strip("/").split("/")
+                    
+                if uuid.UUID(agent_uuid) in self.id2agent:
+                    agent = self.id2agent[uuid.UUID(agent_uuid)]
+                    # topic_type: agent-chat, user-chat, user-survey, gather
+                    if topic_type == "agent-chat":
+                        await agent.handle_agent_chat_message(payload)
+                    elif topic_type == "user-chat":
+                        await agent.handle_user_chat_message(payload)
+                    elif topic_type == "user-survey":
+                        await agent.handle_user_survey_message(payload)
+                    elif topic_type == "gather":
+                        await agent.handle_gather_message(payload)
+
+            await asyncio.sleep(1)
+
     async def step(self):
         if not self.initialized:
             await self.init_agents()
 
-        # Step 1: 如果 Messager 无法连接，则跳过消息接收
-        if not self.messager.is_connected():
-            logging.warning("Messager is not connected. Skipping message processing.")
-            # 跳过接收和分发消息
-            tasks = [agent.run() for agent in self.agents]
-            await asyncio.gather(*tasks)
-            return
-
-        # Step 2: 从 Messager 获取消息
-        messages = await self.messager.fetch_messages()
-
-        logging.info(f"Group {self._uuid} received {len(messages)} messages")
-
-        # Step 3: 分发消息到对应的 Agent
-        for message in messages:
-            topic = message.topic.value
-            payload = message.payload
-
-            # 添加解码步骤，将bytes转换为str
-            if isinstance(payload, bytes):
-                payload = payload.decode("utf-8")
-                payload = json.loads(payload)
-
-            # 提取 agent_id（主题格式为 "exps/{exp_id}/agents/{agent_uuid}/{topic_type}"）
-            _, _, _, agent_uuid, topic_type = topic.strip("/").split("/")
-                
-            if uuid.UUID(agent_uuid) in self.id2agent:
-                agent = self.id2agent[uuid.UUID(agent_uuid)]
-                # topic_type: agent-chat, user-chat, user-survey, gather
-                if topic_type == "agent-chat":
-                    await agent.handle_agent_chat_message(payload)
-                elif topic_type == "user-chat":
-                    await agent.handle_user_chat_message(payload)
-                elif topic_type == "user-survey":
-                    await agent.handle_user_survey_message(payload)
-                elif topic_type == "gather":
-                    await agent.handle_gather_message(payload)
-
-        # Step 4: 调用每个 Agent 的运行逻辑
         tasks = [agent.run() for agent in self.agents]
         await asyncio.gather(*tasks)
 

{pycityagent-2.0.0a12 → pycityagent-2.0.0a13}/pyproject.toml

@@ -3,7 +3,7 @@ in-project = true
 
 [tool.poetry]
 name = "pycityagent"
-version = "2.0.0a12"
+version = "2.0.0a13"
 description = "LLM-based城市环境agent构建库"
 authors = ["Yuwei Yan <pinkgranite86@gmail.com>","Junbo Yan <yanjb20thu@gmali.com>"]
 license = "MIT"