pycityagent 2.0.0a53__cp311-cp311-macosx_11_0_arm64.whl → 2.0.0a55__cp311-cp311-macosx_11_0_arm64.whl

pycityagent/simulation/simulation.py

@@ -18,12 +18,15 @@ from ..cityagent import (BankAgent, FirmAgent, GovernmentAgent, NBSAgent,
                          memory_config_government, memory_config_nbs,
                          memory_config_societyagent)
 from ..cityagent.initial import bind_agent_info, initialize_social_network
-from ..environment.simulator import Simulator
-from ..llm import SimpleEmbedding
-from ..message.messager import Messager
-from ..metrics import MlflowClient, init_mlflow_connection
+from ..environment import Simulator
+from ..llm import LLM, LLMConfig, SimpleEmbedding
+from ..memory import Memory
+from ..message import (MessageBlockBase, MessageBlockListenerBase,
+                       MessageInterceptor, Messager)
+from ..metrics import init_mlflow_connection
+from ..metrics.mlflow_client import MlflowClient
 from ..survey import Survey
-from ..utils import TO_UPDATE_EXP_INFO_KEYS_AND_TYPES
+from ..utils import SURVEY_SENDER_UUID, TO_UPDATE_EXP_INFO_KEYS_AND_TYPES
 from .agentgroup import AgentGroup
 from .storage.pg import PgWriter, create_pg_tables
 
@@ -80,6 +83,15 @@ class AgentSimulation:
         self.config = config
         self.exp_name = exp_name
         self._simulator = Simulator(config["simulator_request"])
+        if enable_economy:
+            self._economy_env = self._simulator._sim_env
+            _req_dict = self.config["simulator_request"]
+            if "economy" in _req_dict:
+                _req_dict["economy"]["server"] = self._economy_env.sim_addr
+            else:
+                _req_dict["economy"] = {
+                    "server": self._economy_env.sim_addr,
+                }
         self.agent_prefix = agent_prefix
         self._groups: dict[str, AgentGroup] = {}  # type:ignore
         self._agent_uuid2group: dict[str, AgentGroup] = {}  # type:ignore
@@ -117,15 +129,17 @@ class AgentSimulation:
 
         # mlflow
         _mlflow_config: dict[str, Any] = config.get("metric_request", {}).get("mlflow")
-        mlflow_run_id, _ = init_mlflow_connection(
-            config=_mlflow_config,
-            mlflow_run_name=f"EXP_{self.exp_name}_{1000*int(time.time())}",
-            experiment_name=self.exp_name,
-        )
         if _mlflow_config:
             logger.info(f"-----Creating Mlflow client...")
+            mlflow_run_id, _ = init_mlflow_connection(
+                config=_mlflow_config,
+                experiment_uuid=self.exp_id,
+                mlflow_run_name=f"EXP_{self.exp_name}_{1000*int(time.time())}",
+                experiment_name=self.exp_name,
+            )
             self.mlflow_client = MlflowClient(
                 config=_mlflow_config,
+                experiment_uuid=self.exp_id,
                 mlflow_run_name=f"EXP_{exp_name}_{1000*int(time.time())}",
                 experiment_name=exp_name,
                 run_id=mlflow_run_id,
@@ -225,6 +239,7 @@ class AgentSimulation:
         agent_count.append(config["agent_config"]["number_of_government"])
         agent_count.append(config["agent_config"]["number_of_bank"])
         agent_count.append(config["agent_config"]["number_of_nbs"])
+        # TODO(yanjunbo): support MessageInterceptor
         await simulation.init_agents(
             agent_count=agent_count,
             group_size=config["agent_config"].get("group_size", 10000),
@@ -290,9 +305,13 @@ class AgentSimulation:
         return self._agent_uuid2group
 
     @property
-    def messager(self):
+    def messager(self) -> ray.ObjectRef:
         return self._messager
 
+    @property
+    def message_interceptor(self) -> ray.ObjectRef:
+        return self._message_interceptors[0]  # type:ignore
+
     async def _save_exp_info(self) -> None:
         """异步保存实验信息到YAML文件"""
         try:
@@ -371,6 +390,10 @@ class AgentSimulation:
         agent_count: Union[int, list[int]],
         group_size: int = 10000,
         pg_sql_writers: int = 32,
+        message_interceptors: int = 1,
+        message_interceptor_blocks: Optional[list[MessageBlockBase]] = None,
+        social_black_list: Optional[list[tuple[str, str]]] = None,
+        message_listener: Optional[MessageBlockListenerBase] = None,
         embedding_model: Embeddings = SimpleEmbedding(),
         memory_config_func: Optional[Union[Callable, list[Callable]]] = None,
     ) -> None:
@@ -379,6 +402,8 @@ class AgentSimulation:
         Args:
             agent_count: 要创建的总智能体数量, 如果为列表，则每个元素表示一个智能体类创建的智能体数量
             group_size: 每个组的智能体数量，每一个组为一个独立的ray actor
+            pg_sql_writers: 独立的PgSQL writer数量
+            message_interceptors: message拦截器数量
             memory_config_func: 返回Memory配置的函数，需要返回(EXTRA_ATTRIBUTES, PROFILE, BASE)元组, 如果为列表，则每个元素表示一个智能体类创建的Memory配置函数
         """
         if not isinstance(agent_count, list):
@@ -499,7 +524,17 @@ class AgentSimulation:
                         config_files,
                     )
                 )
-
+        # 初始化mlflow连接
+        _mlflow_config = self.config.get("metric_request", {}).get("mlflow")
+        if _mlflow_config:
+            mlflow_run_id, _ = init_mlflow_connection(
+                experiment_uuid=self.exp_id,
+                config=_mlflow_config,
+                mlflow_run_name=f"{self.exp_name}_{1000*int(time.time())}",
+                experiment_name=self.exp_name,
+            )
+        else:
+            mlflow_run_id = None
         # 建表
         if self.enable_pgsql:
             _num_workers = min(1, pg_sql_writers)
@@ -514,7 +549,31 @@ class AgentSimulation:
         else:
             _num_workers = 1
             self._pgsql_writers = _workers = [None for _ in range(_num_workers)]
-
+        # message interceptor
+        if message_listener is not None:
+            self._message_abort_listening_queue = _queue = ray.util.queue.Queue()  # type: ignore
+            await message_listener.set_queue(_queue)
+        else:
+            self._message_abort_listening_queue = _queue = None
+        _interceptor_blocks = message_interceptor_blocks
+        _black_list = [] if social_black_list is None else social_black_list
+        _llm_config = self.config.get("llm_request", {})
+        if message_interceptor_blocks is not None:
+            _num_interceptors = min(1, message_interceptors)
+            self._message_interceptors = _interceptors = [
+                MessageInterceptor.remote(
+                    _interceptor_blocks,  # type:ignore
+                    _black_list,
+                    _llm_config,
+                    _queue,
+                )
+                for _ in range(_num_interceptors)
+            ]
+        else:
+            _num_interceptors = 1
+            self._message_interceptors = _interceptors = [
+                None for _ in range(_num_interceptors)
+            ]
         creation_tasks = []
         for i, (
             agent_class,
@@ -529,11 +588,14 @@ class AgentSimulation:
                 number_of_agents,
                 memory_config_function_group,
                 self.config,
+                self.exp_name,
                 self.exp_id,
                 self.enable_avro,
                 self.avro_path,
                 self.enable_pgsql,
                 _workers[i % _num_workers],  # type:ignore
+                self.message_interceptor,
+                mlflow_run_id,
                 embedding_model,
                 self.logging_level,
                 config_file,
@@ -564,11 +626,15 @@ class AgentSimulation:
         for group in self._groups.values():
             init_tasks.append(group.init_agents.remote())
         ray.get(init_tasks)
-        await self.messager.connect.remote()
-        await self.messager.subscribe.remote([(f"exps/{self.exp_id}/user_payback", 1)], [self.exp_id])
-        await self.messager.start_listening.remote()
+        await self.messager.connect.remote()  # type:ignore
+        await self.messager.subscribe.remote(  # type:ignore
+            [(f"exps/{self.exp_id}/user_payback", 1)], [self.exp_id]
+        )
+        await self.messager.start_listening.remote()  # type:ignore
 
-    async def gather(self, content: str, target_agent_uuids: Optional[list[str]] = None):
+    async def gather(
+        self, content: str, target_agent_uuids: Optional[list[str]] = None
+    ):
         """收集智能体的特定信息"""
         gather_tasks = []
         for group in self._groups.values():
@@ -612,12 +678,13 @@ class AgentSimulation:
         self, survey: Survey, agent_uuids: Optional[list[str]] = None
     ):
         """发送问卷"""
+        await self.messager.connect.remote()  # type:ignore
         survey_dict = survey.to_dict()
         if agent_uuids is None:
             agent_uuids = self._agent_uuids
         _date_time = datetime.now(timezone.utc)
         payload = {
-            "from": "none",
+            "from": SURVEY_SENDER_UUID,
             "survey_id": survey_dict["id"],
             "timestamp": int(_date_time.timestamp() * 1000),
             "data": survey_dict,
@@ -625,10 +692,10 @@ class AgentSimulation:
         }
         for uuid in agent_uuids:
             topic = self._user_survey_topics[uuid]
-            await self.messager.send_message.remote(topic, payload)
+            await self.messager.send_message.remote(topic, payload)  # type:ignore
         remain_payback = len(agent_uuids)
         while True:
-            messages = await self.messager.fetch_messages.remote()
+            messages = await self.messager.fetch_messages.remote()  # type:ignore
             logger.info(f"Received {len(messages)} payback messages [survey]")
             remain_payback -= len(messages)
             if remain_payback <= 0:
@@ -641,7 +708,7 @@ class AgentSimulation:
         """发送采访消息"""
         _date_time = datetime.now(timezone.utc)
         payload = {
-            "from": "none",
+            "from": SURVEY_SENDER_UUID,
             "content": content,
             "timestamp": int(_date_time.timestamp() * 1000),
             "_date_time": _date_time,
@@ -650,19 +717,19 @@ class AgentSimulation:
             agent_uuids = [agent_uuids]
         for uuid in agent_uuids:
             topic = self._user_chat_topics[uuid]
-            await self.messager.send_message.remote(topic, payload)
+            await self.messager.send_message.remote(topic, payload)  # type:ignore
         remain_payback = len(agent_uuids)
         while True:
-            messages = await self.messager.fetch_messages.remote()
+            messages = await self.messager.fetch_messages.remote()  # type:ignore
             logger.info(f"Received {len(messages)} payback messages [interview]")
             remain_payback -= len(messages)
             if remain_payback <= 0:
                 break
             await asyncio.sleep(3)
 
-    async def extract_metric(self, metric_extractor: list[Callable]):
+    async def extract_metric(self, metric_extractors: list[Callable]):
         """提取指标"""
-        for metric_extractor in metric_extractor:
+        for metric_extractor in metric_extractors:
             await metric_extractor(self)
 
     async def step(self):
@@ -670,7 +737,9 @@ class AgentSimulation:
         try:
             # check whether insert agents
             simulator_day = await self._simulator.get_simulator_day()
-            print(f"simulator_day: {simulator_day}, self._simulator_day: {self._simulator_day}")
+            print(
+                f"simulator_day: {simulator_day}, self._simulator_day: {self._simulator_day}"
+            )
             need_insert_agents = False
             if simulator_day > self._simulator_day:
                 need_insert_agents = True
@@ -698,11 +767,14 @@ class AgentSimulation:
             if self.metric_extractor is not None:
                 print(f"total_steps: {self._total_steps}, excute metric")
                 to_excute_metric = [
-                    metric[1] for metric in self.metric_extractor if self._total_steps % metric[0] == 0
+                    metric[1]
+                    for metric in self.metric_extractor
+                    if self._total_steps % metric[0] == 0
                 ]
                 await self.extract_metric(to_excute_metric)
         except Exception as e:
             import traceback
+
             logger.error(f"模拟器运行错误: {str(e)}\n{traceback.format_exc()}")
             raise RuntimeError(str(e)) from e
 
@@ -721,10 +793,12 @@ class AgentSimulation:
             monitor_task = asyncio.create_task(self._monitor_exp_status(stop_event))
 
             try:
-                end_time = await self._simulator.get_time() + day * 24 * 3600
+                end_time = (
+                    await self._simulator.get_time() + day * 24 * 3600
+                )  # type:ignore
                 while True:
                     current_time = await self._simulator.get_time()
-                    if current_time >= end_time:
+                    if current_time >= end_time:  # type:ignore
                         break
                     await self.step()
             finally:

pycityagent/simulation/storage/pg.py

@@ -71,11 +71,11 @@ class PgWriter:
 
     @lock_decorator
     async def async_write_status(self, rows: list[tuple]):
-        _tuple_types = [str, int, float, float, float, int, str, str, None]
+        _tuple_types = [str, int, float, float, float, int, list, str, str, None]
         table_name = f"socialcity_{self.exp_id.replace('-', '_')}_agent_status"
         async with await psycopg.AsyncConnection.connect(self._dsn) as aconn:
             copy_sql = psycopg.sql.SQL(
-                "COPY {} (id, day, t, lng, lat, parent_id, action, status, created_at) FROM STDIN"
+                "COPY {} (id, day, t, lng, lat, parent_id, friend_ids, action, status, created_at) FROM STDIN"
             ).format(psycopg.sql.Identifier(table_name))
             _rows: list[Any] = []
             async with aconn.cursor() as cur:

pycityagent/utils/__init__.py

@@ -1,11 +1,16 @@
 from .avro_schema import (DIALOG_SCHEMA, INSTITUTION_STATUS_SCHEMA,
                           PROFILE_SCHEMA, STATUS_SCHEMA, SURVEY_SCHEMA)
 from .pg_query import PGSQL_DICT, TO_UPDATE_EXP_INFO_KEYS_AND_TYPES
-from .survey_util import process_survey_for_llm
+from .survey_util import SURVEY_SENDER_UUID, process_survey_for_llm
 
 __all__ = [
-    "PROFILE_SCHEMA", "DIALOG_SCHEMA", "STATUS_SCHEMA", "SURVEY_SCHEMA", "INSTITUTION_STATUS_SCHEMA",
+    "PROFILE_SCHEMA",
+    "DIALOG_SCHEMA",
+    "STATUS_SCHEMA",
+    "SURVEY_SCHEMA",
+    "INSTITUTION_STATUS_SCHEMA",
     "process_survey_for_llm",
     "TO_UPDATE_EXP_INFO_KEYS_AND_TYPES",
     "PGSQL_DICT",
+    "SURVEY_SENDER_UUID",
 ]

pycityagent/utils/pg_query.py

@@ -54,6 +54,7 @@ PGSQL_DICT: dict[str, list[Any]] = {
         lng DOUBLE PRECISION,
         lat DOUBLE PRECISION,
         parent_id INT4,
+        friend_ids UUID[],
         action TEXT,
         status JSONB,
         created_at TIMESTAMPTZ

pycityagent/utils/survey_util.py

@@ -8,40 +8,40 @@ Survey Description: {survey_dict['description']}
 Please answer each question in the following format:
 
 """
-    
+
     question_count = 1
-    for page in survey_dict['pages']:
-        for question in page['elements']:
+    for page in survey_dict["pages"]:
+        for question in page["elements"]:
             prompt += f"Question {question_count}: {question['title']}\n"
-            
+
             # 根据不同类型的问题生成不同的提示
-            if question['type'] == 'radiogroup':
-                prompt += "Options: " + ", ".join(question['choices']) + "\n"
+            if question["type"] == "radiogroup":
+                prompt += "Options: " + ", ".join(question["choices"]) + "\n"
                 prompt += "Please select ONE option\n"
-            
-            elif question['type'] == 'checkbox':
-                prompt += "Options: " + ", ".join(question['choices']) + "\n"
+
+            elif question["type"] == "checkbox":
+                prompt += "Options: " + ", ".join(question["choices"]) + "\n"
                 prompt += "You can select MULTIPLE options\n"
-                
-            elif question['type'] == 'rating':
+
+            elif question["type"] == "rating":
                 prompt += f"Rating range: {question.get('min_rating', 1)} - {question.get('max_rating', 5)}\n"
                 prompt += "Please provide a rating within the range\n"
-                
-            elif question['type'] == 'matrix':
-                prompt += "Rows: " + ", ".join(question['rows']) + "\n"
-                prompt += "Columns: " + ", ".join(question['columns']) + "\n"
+
+            elif question["type"] == "matrix":
+                prompt += "Rows: " + ", ".join(question["rows"]) + "\n"
+                prompt += "Columns: " + ", ".join(question["columns"]) + "\n"
                 prompt += "Please select ONE column option for EACH row\n"
-                
-            elif question['type'] == 'text':
+
+            elif question["type"] == "text":
                 prompt += "Please provide a text response\n"
-                
-            elif question['type'] == 'boolean':
+
+            elif question["type"] == "boolean":
                 prompt += "Options: Yes, No\n"
                 prompt += "Please select either Yes or No\n"
-                
+
             prompt += "\nAnswer: [Your response here]\n\n---\n\n"
             question_count += 1
-            
+
     # 添加总结提示
     prompt += """Please ensure:
 1. All required questions are answered
@@ -49,5 +49,8 @@ Please answer each question in the following format:
 3. Answers are clear and specific
 
 Format your responses exactly as requested above."""
-    
-    return prompt
+
+    return prompt
+
+
+SURVEY_SENDER_UUID = "none"

pycityagent/workflow/block.py

@@ -187,7 +187,7 @@ class Block:
 
     @classmethod
     def import_config(cls, config: dict[str, Union[str, dict]]) -> Block:
-        instance = cls(name=config["name"])
+        instance = cls(name=config["name"])  # type: ignore
         assert isinstance(config["config"], dict)
         for field, value in config["config"].items():
             if field in cls.configurable_fields:
@@ -195,12 +195,12 @@ class Block:
 
         # 递归创建子Block
         for child_config in config.get("children", []):
-            child_block = Block.import_config(child_config)
+            child_block = Block.import_config(child_config)  # type: ignore
             setattr(instance, child_block.name.lower(), child_block)
 
         return instance
 
-    def load_from_config(self, config: dict[str, list[Dict]]) -> None:
+    def load_from_config(self, config: dict[str, list[dict]]) -> None:
         """
         使用配置更新当前Block实例的参数，并递归更新子Block。
         """

{pycityagent-2.0.0a53.dist-info → pycityagent-2.0.0a55.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pycityagent
-Version: 2.0.0a53
+Version: 2.0.0a55
 Summary: LLM-based city environment agent building library
 Author-email: Yuwei Yan <pinkgranite86@gmail.com>, Junbo Yan <yanjb20thu@gmali.com>, Jun Zhang <zhangjun990222@gmali.com>
 License: MIT License
@@ -45,7 +45,7 @@ Requires-Dist: openai>=1.58.1
 Requires-Dist: Pillow<12.0.0,>=11.0.0
 Requires-Dist: protobuf<5.0.0,<=4.24.0
 Requires-Dist: pycitydata>=1.0.3
-Requires-Dist: pycityproto>=2.1.5
+Requires-Dist: pycityproto>=2.2.0
 Requires-Dist: requests>=2.32.3
 Requires-Dist: Shapely>=2.0.6
 Requires-Dist: PyYAML>=6.0.2

{pycityagent-2.0.0a53.dist-info → pycityagent-2.0.0a55.dist-info}/RECORD

@@ -1,25 +1,25 @@
-pycityagent-2.0.0a53.dist-info/RECORD,,
-pycityagent-2.0.0a53.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
-pycityagent-2.0.0a53.dist-info/WHEEL,sha256=NW1RskY9zow1Y68W-gXg0oZyBRAugI1JHywIzAIai5o,109
-pycityagent-2.0.0a53.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
-pycityagent-2.0.0a53.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
-pycityagent-2.0.0a53.dist-info/METADATA,sha256=7iSDzvMMlwpY7leIIjVm-3V7lZ92R0uHetTQlk0PCb0,9110
+pycityagent-2.0.0a55.dist-info/RECORD,,
+pycityagent-2.0.0a55.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
+pycityagent-2.0.0a55.dist-info/WHEEL,sha256=NW1RskY9zow1Y68W-gXg0oZyBRAugI1JHywIzAIai5o,109
+pycityagent-2.0.0a55.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
+pycityagent-2.0.0a55.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
+pycityagent-2.0.0a55.dist-info/METADATA,sha256=NI-t0FkdHsFWQ4aFpPz0i7Jg0qOS16AGo2IOiMwYG44,9110
 pycityagent/pycityagent-sim,sha256=1Nu-QYC0AuZyVWciGNa2XkYsUntbwAS15Bo7l-y6eok,35449490
 pycityagent/__init__.py,sha256=PUKWTXc-xdMG7px8oTNclodsILUgypANj2Z647sY63k,808
 pycityagent/pycityagent-ui,sha256=cHZjqtrQ4Fh4qtRahFNCNbT2DNHLmUexiDAa-72Z3RQ,40333378
-pycityagent/metrics/mlflow_client.py,sha256=g_tHxWkWTDijtbGL74-HmiYzWVKb1y8-w12QrY9jL30,4449
+pycityagent/metrics/mlflow_client.py,sha256=bTrqYsRfNfjJd6l91hU8vN7JXzJC7DHiM2XbkhMuXIU,4613
 pycityagent/metrics/__init__.py,sha256=X08PaBbGVAd7_PRGLREXWxaqm7nS82WBQpD1zvQzcqc,128
 pycityagent/metrics/utils/const.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycityagent/economy/__init__.py,sha256=aonY4WHnx-6EGJ4WKrx4S-2jAkYNLtqUA04jp6q8B7w,75
-pycityagent/economy/econ_client.py,sha256=GuHK9ZBnhqW3Z7F8ViDJn_iN73yOBbbwFyJv1wLEBDk,12211
+pycityagent/economy/econ_client.py,sha256=Nf73GPFJgiDbisi8ghmv_Dz6iUlNE2Ey62B-eJ-tQ84,12186
 pycityagent/tools/__init__.py,sha256=XtdtGyWeFyK1YOUvWkykBWxemtmwQjWUIuuyU1-gosQ,261
 pycityagent/tools/tool.py,sha256=D-ESFlX7EESm5mcvs2zRlGEQTzXbVfQc8G7Vpz8TmAw,8651
 pycityagent/llm/llmconfig.py,sha256=4Ylf4OFSBEFy8jrOneeX0HvPhWEaF5jGvy1HkXK08Ro,436
 pycityagent/llm/__init__.py,sha256=iWs6FLgrbRVIiqOf4ILS89gkVCTvS7HFC3vG-MWuyko,205
-pycityagent/llm/llm.py,sha256=owTYuXmnHZnvXaAvwiiyD511P3wpU3K04xZArhhiJF0,15700
+pycityagent/llm/llm.py,sha256=4AJlTj9llT909gzx9SfcBvbUJrWqHzEo3DaHWgQ3-3I,15852
 pycityagent/llm/embeddings.py,sha256=2_P4TWm3sJKFdGDx2Q1a2AEapFopDctIXsGuntvmP6E,6816
 pycityagent/llm/utils.py,sha256=hoNPhvomb1u6lhFX0GctFipw74hVKb7bvUBDqwBzBYw,160
-pycityagent/memory/memory.py,sha256=suU6mZIYvGySQGyNrYiqdobuTgjSHyI_PahIeRVShiQ,34506
+pycityagent/memory/memory.py,sha256=MusbnD-Us5IF16CkYRSlcer-TEbaPsHxQEYzcugo0N4,34589
 pycityagent/memory/profile.py,sha256=q8ZS9IBmHCg_X1GONUvXK85P6tCepTKQgXKuvuXYNXw,5203
 pycityagent/memory/__init__.py,sha256=_Vfdo1HcLWsuuz34_i8e91nnLVYADpMlHHSVaB3xgIk,297
 pycityagent/memory/memory_base.py,sha256=QG_j3BxZvkadFEeE3uBR_kjl_xcXD1aHUVs8GEF3d6w,5654
@@ -28,31 +28,32 @@ pycityagent/memory/utils.py,sha256=oJWLdPeJy_jcdKcDTo9JAH9kDZhqjoQhhv_zT9qWC0w,8
 pycityagent/memory/const.py,sha256=6zpJPJXWoH9-yf4RARYYff586agCoud9BRn7sPERB1g,932
 pycityagent/memory/faiss_query.py,sha256=V3rIw6d1_xcpNqZBbAYz3qfjVNE7NfJ7xOS5SibPtVU,13180
 pycityagent/memory/state.py,sha256=TYItiyDtehMEQaSBN7PpNrnNxdDM5jGppr9R9Ufv3kA,5134
-pycityagent/simulation/simulation.py,sha256=Fm6Y54gc4wAlVhMvqlUhbDRG0tKt6OpHdGsI8as9jqs,29662
+pycityagent/simulation/simulation.py,sha256=hoWOXcc5bqt-_S2MiYrtg2YWuw3A-KlBG9D_kFzk-fU,32936
 pycityagent/simulation/__init__.py,sha256=P5czbcg2d8S0nbbnsQXFIhwzO4CennAhZM8OmKvAeYw,194
-pycityagent/simulation/agentgroup.py,sha256=F1LJq-4xq3E7NmhmBT8j9wsJuuRmU5rGFzNgeOCwOSI,29701
-pycityagent/simulation/storage/pg.py,sha256=5itxKOkNPlOzN7z2_3oKU1ZK0uLTDugfld8ZkRbD69I,8407
-pycityagent/message/__init__.py,sha256=TCjazxqb5DVwbTu1fF0sNvaH_EPXVuj2XQ0p6W-QCLU,55
-pycityagent/message/messager.py,sha256=78K31EPKfC5IxbISc-Lc2babC7VOh9Vbe3c0sO-YDLA,3333
+pycityagent/simulation/agentgroup.py,sha256=ANTQA2OFQpuNZBz2VRhy60pTPUM1lXHFJLzFgK1SvxQ,31633
+pycityagent/simulation/storage/pg.py,sha256=xRshSOGttW-p0re0fNBOjOpb-nQ5msIE2LsdT79_E_Y,8425
+pycityagent/message/message_interceptor.py,sha256=w8XTyZStQtMjILpeAX3VMhAWcYAuaxCgSMwXQU1OryM,8951
+pycityagent/message/__init__.py,sha256=f5QH7DKPqEAMyfSlBMnl3uouOKlsoel909STlIe7nUk,276
+pycityagent/message/messager.py,sha256=8mhTU2bb9K405_lwd9tN2ha7cCQ9m6hPFxf2fYxRjVg,4368
 pycityagent/utils/avro_schema.py,sha256=AlADbzV8FxiSfvhQhiX9KhrwMjrx0lGT-lED4TI1gJM,4152
-pycityagent/utils/__init__.py,sha256=xli0FuRffR9Wp4aRcMnlfeDHuGxB8Y5paDjyAt0UoeE,462
-pycityagent/utils/survey_util.py,sha256=Be9nptmu2JtesFNemPgORh_2GsN7rcDYGQS9Zfvc5OI,2169
-pycityagent/utils/pg_query.py,sha256=Nm2U1SZtWf6oFeDJV-zLnG0PxyL3xIRTGX1yX3EE-gw,2198
+pycityagent/utils/__init__.py,sha256=GQEa4x_uJBK19Z57vfm9Omvqg1c4ysi3QJ9wx8xiDhI,524
+pycityagent/utils/survey_util.py,sha256=o-gvmmfus3vMIN-EMWPzfLbHkDH4DfZb8B-yBd_mGYk,2076
+pycityagent/utils/pg_query.py,sha256=KAcnBDLyzUu2il18SGXxk8dySdBen_8ejfpxiWuKUMA,2225
 pycityagent/utils/decorators.py,sha256=Gk3r41hfk6awui40tbwpq3C7wC7jHaRmLRlcJFlLQCE,3160
 pycityagent/utils/parsers/__init__.py,sha256=AN2xgiPxszWK4rpX7zrqRsqNwfGF3WnCA5-PFTvbaKk,281
 pycityagent/utils/parsers/code_block_parser.py,sha256=Cs2Z_hm9VfNCpPPll1TwteaJF-HAQPs-3RApsOekFm4,1173
 pycityagent/utils/parsers/parser_base.py,sha256=KBKO4zLZPNdGjPAGqIus8LseZ8W3Tlt2y0QxqeCd25Q,1713
 pycityagent/utils/parsers/json_parser.py,sha256=tjwyPluYfkWgsvLi0hzfJwFhO3L6yQfZMKza20HaGrY,2911
-pycityagent/agent/agent_base.py,sha256=FP2h3abIQ1Kp9qCzrzwa7tO82graDAWVg30HqYaQcPE,23620
+pycityagent/agent/agent_base.py,sha256=vC1nMWahwi_nVBUXVdC1CnZpqimKZApixD2m2Iqu_bg,24196
 pycityagent/agent/__init__.py,sha256=U20yKu9QwSqAx_PHk5JwipfODkDfxONtumVfnsKjWFg,180
-pycityagent/agent/agent.py,sha256=rYUC6idFb2dCRa7H7-0ZFPn4UB7MSTigHXOjNSK5B2Y,10702
-pycityagent/cli/wrapper.py,sha256=2Tb52gOlEVgn11Ekt6ZkRXr_BGzte-EPyBKnR6g6hQ4,1143
+pycityagent/agent/agent.py,sha256=FNon_OPvGrh976AEHpaAQyLQN7erbGOX-BxGnCVZza8,12038
+pycityagent/cli/wrapper.py,sha256=9aG6D2cnmh6aIhiVXKPGKuMjVcdAa-TwzANudb2q_FU,1147
 pycityagent/workflow/__init__.py,sha256=H08Ko3eliZvuuCMajbEri-IP4-SeswYU6UjHBNA4Ze0,490
 pycityagent/workflow/prompt.py,sha256=6jI0Rq54JLv3-IXqZLYug62vse10wTI83xvf4ZX42nk,2929
-pycityagent/workflow/block.py,sha256=REetWNdCF_fUGKVH-LWgDZ1lK2Bt0tJJ0kV20eWa4_A,9890
+pycityagent/workflow/block.py,sha256=4QufS8XnyP6SYp8g1gDODW-H0nAHA7lvivrPGUq1p-w,9922
 pycityagent/workflow/trigger.py,sha256=Df-MOBEDWBbM-v0dFLQLXteLsipymT4n8vqexmK2GiQ,5643
-pycityagent/environment/__init__.py,sha256=awHxlOud-btWbk0FCS4RmGJ13W84oVCkbGfcrhKqihA,240
-pycityagent/environment/simulator.py,sha256=pARK08PzqiAysy6VOR2KZAgEG7auVzt_Tecy5MBL55Q,12157
+pycityagent/environment/__init__.py,sha256=MyZBwsweDIHOKSX2iSZs748foNtaiyEcyg6sc747T2g,263
+pycityagent/environment/simulator.py,sha256=gqkECMzhXRh4WHTyLFEL1_X1R7F1aX4g9881zUFv7DI,12136
 pycityagent/environment/message/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycityagent/environment/utils/port.py,sha256=3OM6kSUt3PxvDUOlgyiendBtETaWU8Mzk_8H0TzTmYg,295
 pycityagent/environment/utils/grpc.py,sha256=6EJwKXXktIWb1NcUiJzIRmfrY0S03QAXXGcCDHqAT00,1998
@@ -69,7 +70,7 @@ pycityagent/environment/sidecar/sidecarv2.py,sha256=beKlYZgt38EQbV1x6NWQo7xVXyB-
 pycityagent/environment/sim/pause_service.py,sha256=DcAOVRxNkHGk4jyzFkxHMUPgp0Ck4mYHoPh6qxjhhLQ,1744
 pycityagent/environment/sim/person_service.py,sha256=5r1F2Itn7dKJ2U4hSLovrk5p4qy-2n77MTAv_OlTIwA,10673
 pycityagent/environment/sim/aoi_service.py,sha256=2UjvUTF4CW4E_L30IRcdwv6t_q1ZdXN3TTLOKSOaaXE,1230
-pycityagent/environment/sim/sim_env.py,sha256=HI1LcS_FotDKQ6vBnx0e49prXSABOfA20aU9KM-ZkCY,4625
+pycityagent/environment/sim/sim_env.py,sha256=V3Pf_nsebs07-ZaXPSCaA1HBGv4n7v8yxMz6GKQaZPk,3908
 pycityagent/environment/sim/lane_service.py,sha256=N2dUe-3XuqqKLsNXt1k4NN8uV-J_ruo08yhaUd_hwOI,3916
 pycityagent/environment/sim/client.py,sha256=j0f8qjR1nIava4VkoZNEPqW5h08WPdcC5wzM9DP3tIs,3772
 pycityagent/environment/sim/__init__.py,sha256=JVG6sSD2Hbohl1TtKjuQi7_M7tKMrFh9vl3QV3VA5O0,724
@@ -86,7 +87,8 @@ pycityagent/cityagent/__init__.py,sha256=gcBQ-a50XegFtjigQ7xDXRBZrywBKqifiQFSRnE
 pycityagent/cityagent/firmagent.py,sha256=UVlNN0lpa4cC4PZVqYzQhbc5VJ2oGsA1731mhbCjnR8,4109
 pycityagent/cityagent/nbsagent.py,sha256=WIXW__6dZ5IrqBqDCjvGbrCshpXzuFRV3Ww6gkYw7p4,4387
 pycityagent/cityagent/initial.py,sha256=7hgCt_tGdnVTXGfEQOn1GTW5dAs1b-ru_FwXxRLI6tM,4549
-pycityagent/cityagent/societyagent.py,sha256=QKzZecyN5npMi2IJlxei9MrJ1yJWJPCogXrNIP1VnFQ,19598
+pycityagent/cityagent/societyagent.py,sha256=vvFGAr8wlZ82f4qHvpawa1VsHungDegjKn1E51bDUnc,24767
+pycityagent/cityagent/message_intercept.py,sha256=HiNOtBXKq40LCmvsw2KMLxMsbmXSVcbRytAO-eI-1sU,3279
 pycityagent/cityagent/governmentagent.py,sha256=HJLuhvEmllu_1KnFEJsYCIasaBJT0BV9Cn_4Y2QGPqg,2791
 pycityagent/cityagent/blocks/dispatcher.py,sha256=mEa1r3tRS3KI1BMZR_w_sbUGzOj6aUJuiUrsHv1n2n0,2943
 pycityagent/cityagent/blocks/needs_block.py,sha256=s8LikgtKORfo_Sw9SQ5_3biNPTof15QuUs4cDynXCyM,15332
@@ -96,7 +98,7 @@ pycityagent/cityagent/blocks/__init__.py,sha256=wydR0s-cCRWgdvQetkfQnD_PU8vC3eTm
 pycityagent/cityagent/blocks/economy_block.py,sha256=m5B67cgGZ9nKWtrYeak5gxMoCoKlRbATAsXpFajYKyg,19129
 pycityagent/cityagent/blocks/utils.py,sha256=8O5p1B8JlreIJTGXKAP03rTcn7MvFSR8qJ1_hhszboU,2065
 pycityagent/cityagent/blocks/other_block.py,sha256=NnDwxQAO5XZ7Uxe-n3qtrfNItHlwFYk2MQsh2GYDKMQ,4338
-pycityagent/cityagent/blocks/plan_block.py,sha256=Mtbc26xZjx-HpmBYZD12rVNK09WgDPCkwLseLiJ1mS0,10995
+pycityagent/cityagent/blocks/plan_block.py,sha256=YEU0pHK_fB1lvvml9u7bGz-2bzM2axE9jW-aSgPYs6M,10996
 pycityagent/cityagent/blocks/mobility_block.py,sha256=xWbARMfJ3-6fddrW3VOUKJrXfMGmroiSN0B8t8lVYXA,12725
 pycityagent/survey/models.py,sha256=YE50UUt5qJ0O_lIUsSY6XFCGUTkJVNu_L1gAhaCJ2fs,3546
 pycityagent/survey/__init__.py,sha256=rxwou8U9KeFSP7rMzXtmtp2fVFZxK4Trzi-psx9LPIs,153