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

pycityagent/agent.py

@@ -67,6 +67,7 @@ class Agent(ABC):
         self._messager = messager
         self._simulator = simulator
         self._memory = memory
+        self._exp_id = -1
         self._has_bound_to_simulator = False
         self._has_bound_to_economy = False
         self._blocked = False
@@ -113,6 +114,12 @@ class Agent(ABC):
         """
         self._memory = memory
 
+    def set_exp_id(self, exp_id: str):
+        """
+        Set the exp_id of the agent.
+        """
+        self._exp_id = exp_id
+
     async def _bind_to_simulator(self):
         """
         Bind Agent to Simulator
@@ -185,7 +192,7 @@ class Agent(ABC):
                 )
 
     @property
-    def LLM(self):
+    def llm(self):
         """The Agent's LLM"""
         if self._llm_client is None:
             raise RuntimeError(
@@ -282,7 +289,7 @@ class Agent(ABC):
         """通过 Messager 发送消息，附带发送者的 ID"""
         if self._messager is None:
             raise RuntimeError("Messager is not set")
-        topic = f"/agents/{to_agent_id}/chat"
+        topic = f"/exps/{self._exp_id}/agents/{to_agent_id}/chat"
         await self._messager.send_message(topic, message, self._agent_id)
 
     @abstractmethod

pycityagent/simulation/agentgroup.py

@@ -10,9 +10,10 @@ from pycityagent.message import Messager
 
 @ray.remote
 class AgentGroup:
-    def __init__(self, agents: list[Agent], config: dict):
+    def __init__(self, agents: list[Agent], config: dict, exp_id: str):
         self.agents = agents
         self.config = config
+        self.exp_id = exp_id
         self.messager = Messager(config["simulator_request"]["mqtt"]["server"], config["simulator_request"]["mqtt"]["port"])
         self.initialized = False
 
@@ -30,6 +31,7 @@ class AgentGroup:
         self.economy_client = EconomyClient(config["simulator_request"]["economy"]['server'])
 
         for agent in self.agents:
+            agent.set_exp_id(self.exp_id)
             agent.set_llm_client(self.llm)
             agent.set_simulator(self.simulator)
             agent.set_economy_client(self.economy_client)
@@ -44,7 +46,7 @@ class AgentGroup:
             await self.messager.start_listening()
             for agent in self.agents:
                 agent.set_messager(self.messager)
-                topic = f"/agents/{agent._agent_id}/chat"
+                topic = f"/exps/{self.exp_id}/agents/{agent._agent_id}/chat"
                 await self.messager.subscribe(topic, agent)
         self.initialized = True
 
@@ -71,9 +73,8 @@ class AgentGroup:
             # 添加解码步骤，将bytes转换为str
             if isinstance(payload, bytes):
                 payload = payload.decode('utf-8')
-
-            # 提取 agent_id（主题格式为 "/agents/{agent_id}/chat"）
-            _, agent_id, _ = topic.strip("/").split("/")
+            # 提取 agent_id（主题格式为 "/exps/{exp_id}/agents/{agent_id}/chat"）
+            _, _, _, agent_id, _ = topic.strip("/").split("/")
             agent_id = int(agent_id)
 
             if agent_id in self.id2agent:

pycityagent/simulation/simulation.py

@@ -1,15 +1,13 @@
 import asyncio
 import json
 import logging
+import uuid
 from datetime import datetime
 import random
 from typing import Dict, List, Optional, Callable
 from mosstool.map._map_util.const import AOI_START_ID
 
-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 .interview import InterviewManager
@@ -28,6 +26,7 @@ class AgentSimulation:
             config: 配置
             agent_prefix: 智能体名称前缀
         """
+        self.exp_id = uuid.uuid4()
         self.agent_class = agent_class
         self.config = config
         self.agent_prefix = agent_prefix
@@ -83,7 +82,7 @@ class AgentSimulation:
             # 获取当前组的agents
             agents = list(self._agents.values())[start_idx:end_idx]
             group_name = f"{self.agent_prefix}_group_{i}"
-            group = AgentGroup.remote(agents, self.config)
+            group = AgentGroup.remote(agents, self.config, self.exp_id)
             self._groups[group_name] = group
 
     def default_memory_config_func(self):

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

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

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

@@ -1,5 +1,5 @@
 pycityagent/__init__.py,sha256=n56bWkAUEcvjDsb7LcJpaGjlrriSKPnR0yBhwRfEYBA,212
-pycityagent/agent.py,sha256=VvNTTw5MLY8XRMdOIgstBmru7v29r7q3QY7f-UjN9Bg,11086
+pycityagent/agent.py,sha256=U1cdyRl_ZURnPLC31uP8auvSa4TWupK_SZ5nuff3Ryk,11263
 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
@@ -46,9 +46,9 @@ pycityagent/memory/utils.py,sha256=97lkenn-36wgt7uWb3Z39BXdJ5zlEQTQnQBFpoND1gg,8
 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/agentgroup.py,sha256=G2aRk1d3d5Ja4QPNJagNKz8a_9_JzSmQXqmDrteYkkg,4105
 pycityagent/simulation/interview.py,sha256=mY4Vpz0vgJo4rrMy3TZnwwM-iVDL6J0LgjOxbEuV27E,1173
-pycityagent/simulation/simulation.py,sha256=PcWYx8GqCypqDga9JdHg3sRux5lrGcT8b_hvapjKw34,13177
+pycityagent/simulation/simulation.py,sha256=98_dxWAUNhbVyDQlsGq7SB_QpXF2r8vezVk1C54P6IY,13073
 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
@@ -65,6 +65,6 @@ pycityagent/workflow/block.py,sha256=IXfarqIax6yVP_DniU6ZsPTT8QA4aIDnvZbwP_MtRaw
 pycityagent/workflow/prompt.py,sha256=cmzKEmlzjdwg50uwfnTnN_6xNJA8OVjo5fdmcsaTbdU,2886
 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,,
+pycityagent-2.0.0a6.dist-info/METADATA,sha256=u-2FElVNMV8-kXaAz5V8paLzLs3REC-gP_zO5DL6jkQ,7614
+pycityagent-2.0.0a6.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+pycityagent-2.0.0a6.dist-info/RECORD,,