pycityagent 2.0.0a4__py3-none-any.whl → 2.0.0a5__py3-none-any.whl

pycityagent/agent.py

@@ -1,10 +1,19 @@
 """智能体模板类及其定义"""
 
 from abc import ABC, abstractmethod
+import asyncio
+from copy import deepcopy
 from datetime import datetime
 from enum import Enum
+import logging
 from typing import Dict, List, Optional
 
+from pycityagent.environment.sim.person_service import PersonService
+from mosstool.util.format_converter import dict2pb
+from pycityproto.city.person.v2 import person_pb2 as person_pb2
+
+from pycityagent.message.messager import Messager
+
 from .economy import EconomyClient
 from .environment import Simulator
 from .llm import LLM
@@ -35,6 +44,7 @@ class Agent(ABC):
         type: AgentType = AgentType.Unspecified,
         llm_client: Optional[LLM] = None,
         economy_client: Optional[EconomyClient] = None,
+        messager: Optional[Messager] = None,
         simulator: Optional[Simulator] = None,
         memory: Optional[Memory] = None,
     ) -> None:
@@ -46,6 +56,7 @@ class Agent(ABC):
             type (AgentType): The type of the agent. Defaults to `AgentType.Unspecified`
             llm_client (LLM): The language model client. Defaults to None.
             economy_client (EconomyClient): The `EconomySim` client. Defaults to None.
+            messager (Messager, optional): The messager object. Defaults to None.
             simulator (Simulator, optional): The simulator object. Defaults to None.
             memory (Memory, optional): The memory of the agent. Defaults to None.
         """
@@ -53,16 +64,36 @@ class Agent(ABC):
         self._type = type
         self._llm_client = llm_client
         self._economy_client = economy_client
+        self._messager = messager
         self._simulator = simulator
         self._memory = memory
         self._has_bound_to_simulator = False
+        self._has_bound_to_economy = False
+        self._blocked = False
         self._interview_history: List[Dict] = []  # 存储采访历史
+        self._person_template = PersonService.default_dict_person()
 
-    def set_memory(self, memory: Memory):
+    def __getstate__(self):
+        state = self.__dict__.copy()
+        # 排除锁对象
+        del state['_llm_client']
+        return state
+
+    async def bind_to_simulator(self):
+        await self._bind_to_simulator()
+        await self._bind_to_economy()
+
+    def set_messager(self, messager: Messager):
         """
-        Set the memory of the agent.
+        Set the messager of the agent.
         """
-        self._memory = memory
+        self._messager = messager
+
+    def set_llm_client(self, llm_client: LLM):
+        """
+        Set the llm_client of the agent.
+        """
+        self._llm_client = llm_client
 
     def set_simulator(self, simulator: Simulator):
         """
@@ -76,6 +107,83 @@ class Agent(ABC):
         """
         self._economy_client = economy_client
 
+    def set_memory(self, memory: Memory):
+        """
+        Set the memory of the agent.
+        """
+        self._memory = memory
+
+    async def _bind_to_simulator(self):
+        """
+        Bind Agent to Simulator
+
+        Args:
+            person_template (dict, optional): The person template in dict format. Defaults to PersonService.default_dict_person().
+        """
+        if self._simulator is None:
+            logging.warning("Simulator is not set")
+            return
+        if not self._has_bound_to_simulator:
+            FROM_MEMORY_KEYS = {
+                "attribute",
+                "home",
+                "work",
+                "vehicle_attribute",
+                "bus_attribute",
+                "pedestrian_attribute",
+                "bike_attribute",
+            }
+            simulator = self._simulator
+            memory = self._memory
+            person_id = await memory.get("id")
+            # ATTENTION:模拟器分配的id从0开始
+            if person_id >= 0:
+                await simulator.get_person(person_id)
+                logging.debug(f"Binding to Person `{person_id}` already in Simulator")
+            else:
+                dict_person = deepcopy(self._person_template)
+                for _key in FROM_MEMORY_KEYS:
+                    try:
+                        _value = await memory.get(_key)
+                        if _value:
+                            dict_person[_key] = _value
+                    except KeyError as e:
+                        continue
+                resp = await simulator.add_person(
+                    dict2pb(dict_person, person_pb2.Person())
+                )
+                person_id = resp["person_id"]
+                await memory.update("id", person_id, protect_llm_read_only_fields=False)
+                logging.debug(
+                    f"Binding to Person `{person_id}` just added to Simulator"
+                )
+                # 防止模拟器还没有到prepare阶段导致get_person出错
+            self._has_bound_to_simulator = True
+            self._agent_id = person_id
+
+    async def _bind_to_economy(self):
+        if self._economy_client is None:
+            logging.warning("Economy client is not set")
+            return
+        if not self._has_bound_to_economy:
+            if self._has_bound_to_simulator:
+                try:
+                    await self._economy_client.remove_agents([self._agent_id])
+                except:
+                    pass
+                person_id = await self._memory.get("id")
+                await self._economy_client.add_agents(
+                    {
+                        "id": person_id,
+                        "currency": await self._memory.get("currency"),
+                    }
+                )
+                self._has_bound_to_economy = True
+            else:
+                logging.debug(
+                    f"Binding to Economy before binding to Simulator, skip binding to Economy Simulator"
+                )
+
     @property
     def LLM(self):
         """The Agent's LLM"""
@@ -163,12 +271,33 @@ class Agent(ABC):
     def get_interview_history(self) -> List[Dict]:
         """获取采访历史记录"""
         return self._interview_history
+    
+    async def handle_message(self, payload: str):
+        """处理收到的消息，识别发送者"""
+        # 从消息中解析发送者 ID 和消息内容
+        message, sender_id = payload.split("|from:")
+        print(f"Agent {self._agent_id} received message: '{message}' from Agent {sender_id}")
+
+    async def send_message(self, to_agent_id: int, message: str):
+        """通过 Messager 发送消息，附带发送者的 ID"""
+        if self._messager is None:
+            raise RuntimeError("Messager is not set")
+        topic = f"/agents/{to_agent_id}/chat"
+        await self._messager.send_message(topic, message, self._agent_id)
 
     @abstractmethod
     async def forward(self) -> None:
         """智能体行为逻辑"""
         raise NotImplementedError
 
+    async def run(self) -> None:
+        """
+        统一的Agent执行入口
+        当_blocked为True时，不执行forward方法
+        """
+        if not self._blocked:
+            await self.forward()
+
 
 class CitizenAgent(Agent):
     """
@@ -181,12 +310,15 @@ class CitizenAgent(Agent):
         llm_client: Optional[LLM] = None,
         simulator: Optional[Simulator] = None,
         memory: Optional[Memory] = None,
+        economy_client: Optional[EconomyClient] = None,
+        messager: Optional[Messager] = None,
     ) -> None:
         super().__init__(
             name,
             AgentType.Citizen,
             llm_client,
-            None,
+            economy_client,
+            messager,
             simulator,
             memory,
         )
@@ -203,12 +335,15 @@ class InstitutionAgent(Agent):
         llm_client: Optional[LLM] = None,
         simulator: Optional[Simulator] = None,
         memory: Optional[Memory] = None,
+        economy_client: Optional[EconomyClient] = None,
+        messager: Optional[Messager] = None,
     ) -> None:
         super().__init__(
             name,
             AgentType.Institution,
             llm_client,
-            None,
+            economy_client,
+            messager,
             simulator,
             memory,
         )

pycityagent/environment/simulator.py

@@ -74,7 +74,6 @@ class Simulator:
                 self._client = CityClient(config['simulator']['server'], secure=False)
         else:
             logging.warning("No simulator config found, no simulator client will be used")
-
         self.map = SimMap(
             mongo_uri=_mongo_uri,
             mongo_db=_mongo_db,
@@ -107,7 +106,7 @@ class Simulator:
         self.set_poi_tree()
 
     # * Agent相关
-    def FindAgentsByArea(self, req: dict, status=None):
+    def find_agents_by_area(self, req: dict, status=None):
         """
         通过区域范围查找agent/person
         Get agents/persons in the provided area
@@ -148,7 +147,7 @@ class Simulator:
         self.tree_id_2_poi_and_catg = tree_id_2_poi_and_catg
         self.pois_tree = STRtree(poi_geos)
 
-    def GetPoiCategories(
+    def get_poi_categories(
         self,
         center: Optional[Union[tuple[float, float], Point]] = None,
         radius: Optional[float] = None,
@@ -165,7 +164,7 @@ class Simulator:
             categories.append(catg.split("|")[-1])
         return list(set(categories))
 
-    async def GetTime(
+    async def get_time(
         self, format_time: bool = False, format: str = "%H:%M:%S"
     ) -> Union[int, str]:
         """
@@ -192,19 +191,19 @@ class Simulator:
         else:
             return t_sec["t"]
 
-    async def GetPerson(self, person_id: int) -> dict:
+    async def get_person(self, person_id: int) -> dict:
         return await self._client.person_service.GetPerson(
             req={"person_id": person_id}
         )  # type:ignore
 
-    async def AddPerson(self, person: Any) -> dict:
+    async def add_person(self, person: Any) -> dict:
         if isinstance(person, person_pb2.Person):
             req = person_service.AddPersonRequest(person=person)
         else:
             req = person
         return await self._client.person_service.AddPerson(req)  # type:ignore
 
-    async def SetAoiSchedules(
+    async def set_aoi_schedules(
         self,
         person_id: int,
         target_positions: Union[
@@ -213,7 +212,7 @@ class Simulator:
         departure_times: Optional[list[float]] = None,
         modes: Optional[list[TripMode]] = None,
     ):
-        cur_time = float(await self.GetTime())
+        cur_time = float(await self.get_time())
         if not isinstance(target_positions, list):
             target_positions = [target_positions]
         if departure_times is None:
@@ -254,7 +253,7 @@ class Simulator:
         req = {"person_id": person_id, "schedules": _schedules}
         await self._client.person_service.SetSchedule(req)
 
-    async def ResetPersonPosition(
+    async def reset_person_position(
         self,
         person_id: int,
         aoi_id: Optional[int] = None,
@@ -291,7 +290,7 @@ class Simulator:
                 f"Neither aoi or lane pos provided for person {person_id} position reset!!"
             )
 
-    def GetAroundPoi(
+    def get_around_poi(
         self,
         center: Union[tuple[float, float], Point],
         radius: float,

pycityagent/memory/const.py

@@ -10,6 +10,7 @@ PROFILE_ATTRIBUTES = {
     "consumption": str(),
     "personality": str(),
     "income": str(),
+    "currency": float(),
     "residence": str(),
     "race": str(),
     "religion": str(),

pycityagent/message/__init__.py

@@ -0,0 +1,3 @@
+from .messager import Messager
+
+__all__ = ["Messager"]

pycityagent/message/messager.py

@@ -0,0 +1,64 @@
+import asyncio
+from collections import defaultdict
+import logging
+import math
+from aiomqtt import Client
+
+class Messager:
+    def __init__(self, broker, port=1883, timeout=math.inf):
+        self.client = Client(broker, port=port, timeout=timeout)
+        self.connected = False  # 是否已连接标志
+        self.message_queue = asyncio.Queue()  # 用于存储接收到的消息
+        self.subscribers = {}  # 订阅者信息，topic -> Agent 映射
+
+    async def connect(self):
+        try:
+            await self.client.__aenter__()
+            self.connected = True
+            logging.info("Connected to MQTT Broker")
+        except Exception as e:
+            self.connected = False
+            logging.error(f"Failed to connect to MQTT Broker: {e}")
+
+    async def disconnect(self):
+        await self.client.__aexit__(None, None, None)
+        self.connected = False
+        logging.info("Disconnected from MQTT Broker")
+
+    def is_connected(self):
+        """检查是否成功连接到 Broker"""
+        return self.connected
+
+    async def subscribe(self, topic, agent):
+        if not self.is_connected():
+            logging.error(f"Cannot subscribe to {topic} because not connected to the Broker.")
+            return
+        await self.client.subscribe(topic)
+        self.subscribers[topic] = agent
+        logging.info(f"Subscribed to {topic} for Agent {agent._agent_id}")
+
+    async def receive_messages(self):
+        """监听并将消息存入队列"""
+        async for message in self.client.messages:
+            await self.message_queue.put(message)
+
+    async def fetch_messages(self):
+        """从队列中批量获取消息"""
+        messages = []
+        while not self.message_queue.empty():
+            messages.append(await self.message_queue.get())
+        return messages
+    
+    async def send_message(self, topic: str, payload: str, sender_id: int):
+        """通过 Messager 发送消息，包含发送者 ID"""
+        # 构造消息，payload 中加入 sender_id 以便接收者识别
+        message = f"{payload}|from:{sender_id}"
+        await self.client.publish(topic, message)
+        logging.info(f"Message sent to {topic}: {message}")
+
+    async def start_listening(self):
+        """启动消息监听任务"""
+        if self.is_connected():
+            asyncio.create_task(self.receive_messages())
+        else:
+            logging.error("Cannot start listening because not connected to the Broker.")

pycityagent/simulation/agentgroup.py

@@ -0,0 +1,109 @@
+import asyncio
+import logging
+import ray
+from pycityagent.agent import Agent
+from pycityagent.economy.econ_client import EconomyClient
+from pycityagent.environment.simulator import Simulator
+from pycityagent.llm.llm import LLM
+from pycityagent.llm.llmconfig import LLMConfig
+from pycityagent.message import Messager
+
+@ray.remote
+class AgentGroup:
+    def __init__(self, agents: list[Agent], config: dict):
+        self.agents = agents
+        self.config = config
+        self.messager = Messager(config["simulator_request"]["mqtt"]["server"], config["simulator_request"]["mqtt"]["port"])
+        self.initialized = False
+
+        # Step:1 prepare LLM client
+        llmConfig = LLMConfig(config["llm_request"])
+        logging.info("-----Creating LLM client in remote...")
+        self.llm = LLM(llmConfig)
+
+        # Step:2 prepare Simulator
+        logging.info("-----Creating Simulator in remote...")
+        self.simulator = Simulator(config["simulator_request"])
+
+        # Step:3 prepare Economy client
+        logging.info("-----Creating Economy client in remote...")
+        self.economy_client = EconomyClient(config["simulator_request"]["economy"]['server'])
+
+        for agent in self.agents:
+            agent.set_llm_client(self.llm)
+            agent.set_simulator(self.simulator)
+            agent.set_economy_client(self.economy_client)
+            agent.set_messager(self.messager)
+
+    async def init_agents(self):
+        for agent in self.agents:
+            await agent.bind_to_simulator()
+        self.id2agent = {agent._agent_id: agent for agent in self.agents}
+        await self.messager.connect()
+        if self.messager.is_connected():
+            await self.messager.start_listening()
+            for agent in self.agents:
+                agent.set_messager(self.messager)
+                topic = f"/agents/{agent._agent_id}/chat"
+                await self.messager.subscribe(topic, agent)
+        self.initialized = True
+
+    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()
+
+        # 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')
+
+            # 提取 agent_id（主题格式为 "/agents/{agent_id}/chat"）
+            _, agent_id, _ = topic.strip("/").split("/")
+            agent_id = int(agent_id)
+
+            if agent_id in self.id2agent:
+                agent = self.id2agent[agent_id]
+                await agent.handle_message(payload)
+
+        # Step 4: 调用每个 Agent 的运行逻辑
+        tasks = [agent.run() for agent in self.agents]
+        await asyncio.gather(*tasks)
+
+    async def run(self, day: int = 1):
+        """运行模拟器
+
+        Args:
+            day: 运行天数,默认为1天
+        """
+        try:
+            # 获取开始时间
+            start_time = await self.simulator.get_time()
+            # 计算结束时间（秒）
+            end_time = start_time + day * 24 * 3600  # 将天数转换为秒
+            
+            while True:
+                current_time = await self.simulator.get_time()
+                if current_time >= end_time:
+                    break
+                
+                await self.step()
+
+        except Exception as e:
+            logging.error(f"模拟器运行错误: {str(e)}")
+            raise
+

pycityagent/simulation/simulation.py

@@ -6,33 +6,33 @@ import random
 from typing import Dict, List, Optional, Callable
 from mosstool.map._map_util.const import AOI_START_ID
 
-from pycityagent.llm.llm import LLM
+from pycityagent.economy.econ_client import EconomyClient
+from pycityagent.environment.simulator import Simulator
 from pycityagent.memory.memory import Memory
+from pycityagent.message.messager import Messager
 
 from ..agent import Agent
-from ..environment import Simulator
 from .interview import InterviewManager
 from .survey import QuestionType, SurveyManager
 from .ui import InterviewUI
-
+from .agentgroup import AgentGroup
 logger = logging.getLogger(__name__)
 
 
 class AgentSimulation:
     """城市智能体模拟器"""
-    def __init__(self, agent_class: type[Agent], simulator: Simulator, llm: LLM, agent_prefix: str = "agent_"):
+    def __init__(self, agent_class: type[Agent], config: dict, agent_prefix: str = "agent_"):
         """
         Args:
             agent_class: 智能体类
-            simulator: 模拟器
-            llm: 语言模型
+            config: 配置
             agent_prefix: 智能体名称前缀
         """
         self.agent_class = agent_class
-        self.simulator = simulator
-        self.llm = llm
+        self.config = config
         self.agent_prefix = agent_prefix
         self._agents: Dict[str, Agent] = {}
+        self._groups: Dict[str, AgentGroup] = {}
         self._interview_manager = InterviewManager()
         self._interview_lock = asyncio.Lock()
         self._start_time = datetime.now()
@@ -42,16 +42,17 @@ class AgentSimulation:
         self._blocked_agents: List[str] = []  # 新增：持续阻塞的智能体列表
         self._survey_manager = SurveyManager()
 
-    def init_agents(self, agent_count: int, memory_config_func: Callable = None) -> None:
+    async def init_agents(self, agent_count: int, group_size: int = 1000, memory_config_func: Callable = None) -> None:
         """初始化智能体
         
         Args:
-            agent_count: 要创建的智能体数量
+            agent_count: 要创建的总智能体数量
+            group_size: 每个组的智能体数量，每一个组为一个独立的ray actor
             memory_config_func: 返回Memory配置的函数，需要返回(EXTRA_ATTRIBUTES, PROFILE, BASE)元组
         """
         if memory_config_func is None:
-            memory_config_func = self.default_memory_config_func
-        
+            memory_config_func = self.default_memory_config_func        
+
         for i in range(agent_count):
             agent_name = f"{self.agent_prefix}{i}"
 
@@ -66,13 +67,25 @@ class AgentSimulation:
             # 创建智能体时传入Memory配置
             agent = self.agent_class(
                 name=agent_name,
-                simulator=self.simulator,
-                llm=self.llm,
-                memory=memory
+                memory=memory,
             )
-            
+
             self._agents[agent_name] = agent
 
+        # 计算需要的组数,向上取整以处理不足一组的情况
+        num_group = (agent_count + group_size - 1) // group_size
+        
+        for i in range(num_group):
+            # 计算当前组的起始和结束索引
+            start_idx = i * group_size
+            end_idx = min((i + 1) * group_size, agent_count)
+            
+            # 获取当前组的agents
+            agents = list(self._agents.values())[start_idx:end_idx]
+            group_name = f"{self.agent_prefix}_group_{i}"
+            group = AgentGroup.remote(agents, self.config)
+            self._groups[group_name] = group
+
     def default_memory_config_func(self):
         """默认的Memory配置函数"""
         EXTRA_ATTRIBUTES = {
@@ -100,16 +113,16 @@ class AgentSimulation:
             "family_consumption": random.choice(["low", "medium", "high"]),
             "personality": random.choice(["outgoint", "introvert", "ambivert", "extrovert"]),
             "income": random.randint(1000, 10000),
+            "currency": random.randint(10000, 100000),
             "residence": random.choice(["city", "suburb", "rural"]),
             "race": random.choice(["Chinese", "American", "British", "French", "German", "Japanese", "Korean", "Russian", "Other"]),
             "religion": random.choice(["none", "Christian", "Muslim", "Buddhist", "Hindu", "Other"]),
             "marital_status": random.choice(["not married", "married", "divorced", "widowed"]),
             }
 
-        aois = self.simulator.aois.keys()
         BASE = {
-            "home": {"aoi_position": {"aoi_id": random.choice(aois)}},
-            "work": {"aoi_position": {"aoi_id": random.choice(aois)}},
+            "home": {"aoi_position": {"aoi_id": AOI_START_ID + random.randint(1, 50000)}},
+            "work": {"aoi_position": {"aoi_id": AOI_START_ID + random.randint(1, 50000)}},
         }
 
         return EXTRA_ATTRIBUTES, PROFILE, BASE
@@ -177,9 +190,11 @@ class AgentSimulation:
 
         if blocking and agent_name not in self._blocked_agents:
             self._blocked_agents.append(agent_name)
+            self._agents[agent_name]._blocked = True
             return f"已阻塞智能体 {agent_name}"
         elif not blocking and agent_name in self._blocked_agents:
             self._blocked_agents.remove(agent_name)
+            self._agents[agent_name]._blocked = False
             return f"已取消阻塞智能体 {agent_name}"
 
         return f"智能体 {agent_name} 状态未变"
@@ -305,7 +320,7 @@ class AgentSimulation:
             prevent_thread_lock=True,
             quiet=True,
         )
-        print(
+        logger.info(
             f"Gradio Frontend is running on http://{server_name}:{server_port}"
         )
 
@@ -313,8 +328,8 @@ class AgentSimulation:
         """运行一步, 即每个智能体执行一次forward"""
         try:
             tasks = []
-            for agent in self._agents.values():
-                tasks.append(agent.forward())
+            for group in self._groups.values():
+                tasks.append(group.step.remote())
             await asyncio.gather(*tasks)
         except Exception as e:
             logger.error(f"运行错误: {str(e)}")
@@ -331,22 +346,12 @@ class AgentSimulation:
         """
         try:
             # 获取开始时间
-            start_time = await self.simulator.GetTime()
-            # 计算结束时间（秒）
-            end_time = start_time + day * 24 * 3600  # 将天数转换为秒
+            tasks = []
+            for group in self._groups.values():
+                tasks.append(group.run.remote(day))
             
-            while True:
-                current_time = await self.simulator.GetTime()
-                if current_time >= end_time:
-                    break
-                
-                tasks = []
-                for agent in self._agents.values():
-                    if agent._name not in self._blocked_agents:
-                        tasks.append(agent.forward())
-                
-                await asyncio.gather(*tasks)
+            await asyncio.gather(*tasks)
 
         except Exception as e:
             logger.error(f"模拟器运行错误: {str(e)}")
-            raise
+            raise

pycityagent/workflow/tool.py

@@ -3,9 +3,6 @@ import logging
 from copy import deepcopy
 from typing import Any, Callable, Dict, List, Optional, Union
 
-from mosstool.util.format_converter import dict2pb
-from pycityproto.city.person.v2 import person_pb2 as person_pb2
-
 from ..agent import Agent
 from ..environment import (LEVEL_ONE_PRE, POI_TYPE_DICT, AoiService,
                            PersonService)
@@ -136,63 +133,8 @@ class SencePOI(Tool):
 
 
 class UpdateWithSimulator(Tool):
-    def __init__(
-        self,
-        person_template_func: Callable[[], dict] = PersonService.default_dict_person,
-    ) -> None:
-        self.person_template_func = person_template_func
-
-    async def _bind_to_simulator(
-        self,
-    ):
-        """
-        Bind Agent to Simulator
-
-        Args:
-            person_template (dict, optional): The person template in dict format. Defaults to PersonService.default_dict_person().
-        """
-        agent = self.agent
-        if agent._simulator is None:
-            return
-        if not agent._has_bound_to_simulator:
-            FROM_MEMORY_KEYS = {
-                "attribute",
-                "home",
-                "work",
-                "vehicle_attribute",
-                "bus_attribute",
-                "pedestrian_attribute",
-                "bike_attribute",
-            }
-            simulator = agent.simulator
-            memory = agent.memory
-            person_id = await memory.get("id")
-            # ATTENTION:模拟器分配的id从0开始
-            if person_id >= 0:
-                await simulator.GetPerson(person_id)
-                logging.debug(f"Binding to Person `{person_id}` already in Simulator")
-            else:
-                dict_person = deepcopy(self.person_template_func())
-                for _key in FROM_MEMORY_KEYS:
-                    try:
-                        _value = await memory.get(_key)
-                        if _value:
-                            dict_person[_key] = _value
-                    except KeyError as e:
-                        continue
-                resp = await simulator.AddPerson(
-                    dict2pb(dict_person, person_pb2.Person())
-                )
-                person_id = resp["person_id"]
-                await memory.update("id", person_id, protect_llm_read_only_fields=False)
-                logging.debug(
-                    f"Binding to Person `{person_id}` just added to Simulator"
-                )
-                # 防止模拟器还没有到prepare阶段导致GetPerson出错
-                await asyncio.sleep(5)
-            agent._has_bound_to_simulator = True
-        else:
-            pass
+    def __init__(self) -> None:
+        pass
 
     async def _update_motion_with_sim(
         self,
@@ -205,7 +147,7 @@ class UpdateWithSimulator(Tool):
         simulator = agent.simulator
         memory = agent.memory
         person_id = await memory.get("id")
-        resp = await simulator.GetPerson(person_id)
+        resp = await simulator.get_person(person_id)
         resp_dict = resp["person"]
         for k, v in resp_dict.get("motion", {}).items():
             try:
@@ -220,7 +162,6 @@ class UpdateWithSimulator(Tool):
         self,
     ):
         agent = self.agent
-        await self._bind_to_simulator()
         await self._update_motion_with_sim()
 
 
@@ -237,7 +178,7 @@ class ResetAgentPosition(Tool):
     ):
         agent = self.agent
         memory = agent.memory
-        await agent.simulator.ResetPersonPosition(
+        await agent.simulator.reset_person_position(
             person_id=await memory.get("id"),
             aoi_id=aoi_id,
             poi_id=poi_id,

pycityagent/workflow/trigger.py

@@ -129,7 +129,7 @@ class TimeTrigger(EventTrigger):
         
         while True:
             try:
-                current_time = await self.simulator.GetTime()
+                current_time = await self.simulator.get_time()
                 
                 # 如果是第一次或者已经过了指定的时间间隔
                 if (self._last_trigger_time is None or 

{pycityagent-2.0.0a4.dist-info → pycityagent-2.0.0a5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycityagent
-Version: 2.0.0a4
+Version: 2.0.0a5
 Summary: LLM-based城市环境agent构建库
 License: MIT
 Author: Yuwei Yan
@@ -17,6 +17,7 @@ Requires-Dist: Pillow (==11.0.0)
 Requires-Dist: Requests (==2.32.3)
 Requires-Dist: Shapely (==2.0.6)
 Requires-Dist: aiohttp (==3.10.10)
+Requires-Dist: aiomqtt (>=2.3.0,<3.0.0)
 Requires-Dist: citystreetview (==1.2.4)
 Requires-Dist: dashscope (==1.14.1)
 Requires-Dist: geojson (==3.1.0)
@@ -32,6 +33,7 @@ Requires-Dist: protobuf (<=4.24.0)
 Requires-Dist: pycitydata (==1.0.0)
 Requires-Dist: pycityproto (==2.0.7)
 Requires-Dist: pyyaml (>=6.0.2,<7.0.0)
+Requires-Dist: ray (>=2.40.0,<3.0.0)
 Requires-Dist: sidecar (==0.7.0)
 Requires-Dist: zhipuai (>=2.1.5.20230904,<3.0.0.0)
 Description-Content-Type: text/markdown

{pycityagent-2.0.0a4.dist-info → pycityagent-2.0.0a5.dist-info}/RECORD

@@ -1,6 +1,5 @@
 pycityagent/__init__.py,sha256=n56bWkAUEcvjDsb7LcJpaGjlrriSKPnR0yBhwRfEYBA,212
-pycityagent/agent.py,sha256=QzVBgTdlwZEY0pQQB9nTruWiIc3t8mZxLzv5cId1IbY,5951
-pycityagent/config.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pycityagent/agent.py,sha256=VvNTTw5MLY8XRMdOIgstBmru7v29r7q3QY7f-UjN9Bg,11086
 pycityagent/economy/__init__.py,sha256=aonY4WHnx-6EGJ4WKrx4S-2jAkYNLtqUA04jp6q8B7w,75
 pycityagent/economy/econ_client.py,sha256=qQb_kZneEXGBRaS_y5Jdoi95I8GyjKEsDSC4s6V6R7w,10829
 pycityagent/environment/__init__.py,sha256=awHxlOud-btWbk0FCS4RmGJ13W84oVCkbGfcrhKqihA,240
@@ -22,7 +21,7 @@ pycityagent/environment/sim/person_service.py,sha256=nIvOsoBoqOTDYtsiThg07-4ZBgk
 pycityagent/environment/sim/road_service.py,sha256=Pab182YRcrjLw3UcfoD1Hdd6O8XEdi6Q2hJKzFcpSWE,1272
 pycityagent/environment/sim/sim_env.py,sha256=HI1LcS_FotDKQ6vBnx0e49prXSABOfA20aU9KM-ZkCY,4625
 pycityagent/environment/sim/social_service.py,sha256=a9mGZm95EFUIKQJUwQi9f8anmtf2SK4XqGfE2W9IXSQ,2001
-pycityagent/environment/simulator.py,sha256=lw6-T6HFeE6lOtbTQdKZLre2cX7PZkXftRt7wC4mE-8,11858
+pycityagent/environment/simulator.py,sha256=bjzn5mTmsQgePZc3hDzoVS4dXAHLaI_yJWjUCTMAdi8,11872
 pycityagent/environment/utils/__init__.py,sha256=PUx8etr2p_AA7F50ZR7g27odkgv-nOqFZa61ER8-DLg,221
 pycityagent/environment/utils/base64.py,sha256=hoREzQo3FXMN79pqQLO2jgsDEvudciomyKii7MWljAM,374
 pycityagent/environment/utils/const.py,sha256=3RMNy7_bE7-23K90j9DFW_tWEzu8s7hSTgKbV-3BFl4,5327
@@ -37,17 +36,19 @@ pycityagent/llm/llm.py,sha256=PFbGCVQOLNJEfd5KaZdXABYIoPTFOGrNXIAE2eDRCP4,19191
 pycityagent/llm/llmconfig.py,sha256=WcyyfjP6XVLCDj2aemEM6ogQCWNxbTXQBiR0WjN4E8E,457
 pycityagent/llm/utils.py,sha256=emio-WhYh6vYb5Sp7KsnW9hKKe_jStjJsGBBJfcAPgM,153
 pycityagent/memory/__init__.py,sha256=Hs2NhYpIG-lvpwPWwj4DydB1sxtjz7cuA4iDAzCXnjI,243
-pycityagent/memory/const.py,sha256=zsyz282_8gH7MiFwBlnfN8RUh7Z_JcbP7H_dtJDmnK8,888
+pycityagent/memory/const.py,sha256=m9AidLs7Zu28StpvYetclqx-1qQcy3bYvwagcXB3a04,913
 pycityagent/memory/memory.py,sha256=I5GJ77eQZBcKcWevZQcHUBTd2XNT4CotE6mmvB5mA8I,18170
 pycityagent/memory/memory_base.py,sha256=U6odnR_5teaT3N2XF0W2McCxPyxtCpw61DjRVIO6p6I,5639
 pycityagent/memory/profile.py,sha256=dJPeZ91DZcYdR7zmsfSSQx7epvvE1mrvj4-4WAT0tkM,5217
 pycityagent/memory/self_define.py,sha256=vH2PrRSIykAOc5FebKN2JFQdx17nfR-IWv4s_ZS0YJk,5214
 pycityagent/memory/state.py,sha256=xqOxo69sZX1M9eCUMbg5BUlSFe9LdMDH3oTWDXC0y64,5148
 pycityagent/memory/utils.py,sha256=97lkenn-36wgt7uWb3Z39BXdJ5zlEQTQnQBFpoND1gg,879
-pycityagent/message/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pycityagent/message/__init__.py,sha256=dEigAhYQ8e-suktavjo-Ip-nkEzf659hrFJwoFQ2ljE,54
+pycityagent/message/messager.py,sha256=Xd02IxSkVtfrC386frB5kiqlDIDhNKuh5pVM4xKIyyw,2463
 pycityagent/simulation/__init__.py,sha256=SZQzjcGR-zkTDrE81bQuEdKn7yjk4BcZ9m7o1wTc7EE,111
+pycityagent/simulation/agentgroup.py,sha256=mHW8ggwG1iQ_-dCL5t_8Nlkp4OnCshdGGKygq9jFZX8,3983
 pycityagent/simulation/interview.py,sha256=mY4Vpz0vgJo4rrMy3TZnwwM-iVDL6J0LgjOxbEuV27E,1173
-pycityagent/simulation/simulation.py,sha256=kw_jubzqAG3_5oAaiGp1kj-YPa5WkNomNlzWJLVv3zE,12693
+pycityagent/simulation/simulation.py,sha256=PcWYx8GqCypqDga9JdHg3sRux5lrGcT8b_hvapjKw34,13177
 pycityagent/simulation/survey/__init__.py,sha256=hFJ0Q1yo4jwKAIXP17sznBSWwm2Lyh3F3W3Lly40wr8,172
 pycityagent/simulation/survey/manager.py,sha256=DkNrb12Ay7TiGURoyJTFFeUdV1zh6TgRpTmpZOblADw,2158
 pycityagent/simulation/survey/models.py,sha256=-3EKe-qvkUJ2TH24ow0A_Lc4teGet7pueN2T5mOR_Qc,1308
@@ -62,8 +63,8 @@ pycityagent/utils/parsers/parser_base.py,sha256=k6DVqwAMK3jJdOP4IeLE-aFPm3V2F-St
 pycityagent/workflow/__init__.py,sha256=EyCcjB6LyBim-5iAOPe4m2qfvghEPqu1ZdGfy4KPeZ8,551
 pycityagent/workflow/block.py,sha256=IXfarqIax6yVP_DniU6ZsPTT8QA4aIDnvZbwP_MtRaw,6054
 pycityagent/workflow/prompt.py,sha256=cmzKEmlzjdwg50uwfnTnN_6xNJA8OVjo5fdmcsaTbdU,2886
-pycityagent/workflow/tool.py,sha256=4sYbH-OVNffXbK3m58f8ap6WrS_uMzhK1c_Rl2er1B0,8981
-pycityagent/workflow/trigger.py,sha256=u2aPBOzTWvdYKb45nUsQfA_uRunsmbLzB7ztSU2mlrQ,5736
-pycityagent-2.0.0a4.dist-info/METADATA,sha256=IuG2kyKohMKeLuQm-HpYiynakmYCmr4la1ZFRdmH76I,7537
-pycityagent-2.0.0a4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pycityagent-2.0.0a4.dist-info/RECORD,,
+pycityagent/workflow/tool.py,sha256=2VDzBISnx7LASdAou8Zu230j7o2SdK1oBeqHtwDHZy0,6711
+pycityagent/workflow/trigger.py,sha256=8530YfBbLsdtT1QZSqvuha64NNLVJYXVznlvknz9-xI,5737
+pycityagent-2.0.0a5.dist-info/METADATA,sha256=eGx85-Jh_-wtRP3XhlJne7IpW5gpB-4iJrLsuoe9brQ,7614
+pycityagent-2.0.0a5.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+pycityagent-2.0.0a5.dist-info/RECORD,,