pycityagent 2.0.0a52__cp310-cp310-macosx_11_0_arm64.whl → 2.0.0a53__cp310-cp310-macosx_11_0_arm64.whl

pycityagent/simulation/simulation.py

@@ -20,9 +20,8 @@ from ..cityagent import (BankAgent, FirmAgent, GovernmentAgent, NBSAgent,
 from ..cityagent.initial import bind_agent_info, initialize_social_network
 from ..environment.simulator import Simulator
 from ..llm import SimpleEmbedding
-from ..memory import Memory
 from ..message.messager import Messager
-from ..metrics import init_mlflow_connection
+from ..metrics import MlflowClient, init_mlflow_connection
 from ..survey import Survey
 from ..utils import TO_UPDATE_EXP_INFO_KEYS_AND_TYPES
 from .agentgroup import AgentGroup
@@ -39,6 +38,7 @@ class AgentSimulation:
         config: dict,
         agent_class: Union[None, type[Agent], list[type[Agent]]] = None,
         agent_config_file: Optional[dict] = None,
+        metric_extractor: Optional[list[tuple[int, Callable]]] = None,
         enable_economy: bool = True,
         agent_prefix: str = "agent_",
         exp_name: str = "default_experiment",
@@ -89,6 +89,8 @@ class AgentSimulation:
         self._user_survey_topics: dict[str, str] = {}
         self._user_interview_topics: dict[str, str] = {}
         self._loop = asyncio.get_event_loop()
+        self._total_steps = 0
+        self._simulator_day = 0
         # self._last_asyncio_pg_task = None  # 将SQL写入的IO隐藏到计算任务后
 
         self._messager = Messager.remote(
@@ -102,6 +104,7 @@ class AgentSimulation:
         _storage_config: dict[str, Any] = config.get("storage", {})
         if _storage_config is None:
             _storage_config = {}
+
         # avro
         _avro_config: dict[str, Any] = _storage_config.get("avro", {})
         self._enable_avro = _avro_config.get("enabled", False)
@@ -112,6 +115,27 @@ class AgentSimulation:
             self._avro_path = Path(_avro_config["path"]) / f"{self.exp_id}"
             self._avro_path.mkdir(parents=True, exist_ok=True)
 
+        # 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...")
+            self.mlflow_client = MlflowClient(
+                config=_mlflow_config,
+                mlflow_run_name=f"EXP_{exp_name}_{1000*int(time.time())}",
+                experiment_name=exp_name,
+                run_id=mlflow_run_id,
+            )
+            self.metric_extractor = metric_extractor
+        else:
+            logger.warning("Mlflow is not enabled, NO MLFLOW STORAGE")
+            self.mlflow_client = None
+            self.metric_extractor = None
+
         # pg
         _pgsql_config: dict[str, Any] = _storage_config.get("pgsql", {})
         self._enable_pgsql = _pgsql_config.get("enabled", False)
@@ -167,11 +191,11 @@ class AgentSimulation:
         - workflow:
             - list[Step]
             - Step:
-                - type: str, "step", "run", "interview", "survey", "intervene"
+                - type: str, "step", "run", "interview", "survey", "intervene", "pause", "resume"
                 - day: int if type is "run", else None
-                - time: int if type is "step", else None
+                - times: int if type is "step", else None
                 - description: Optional[str], description of the step
-                - step_func: Optional[Callable[AgentSimulation, None]], only used when type is "interview", "survey" and "intervene"
+                - func: Optional[Callable[AgentSimulation, None]], only used when type is "interview", "survey" and "intervene"
         - logging_level: Optional[int]
         - exp_name: Optional[str]
         """
@@ -224,10 +248,15 @@ class AgentSimulation:
             if step["type"] == "run":
                 await simulation.run(step.get("day", 1))
             elif step["type"] == "step":
-                # await simulation.step(step.get("time", 1))
-                await simulation.step()
+                times = step.get("times", 1)
+                for _ in range(times):
+                    await simulation.step()
+            elif step["type"] == "pause":
+                await simulation.pause_simulator()
+            elif step["type"] == "resume":
+                await simulation.resume_simulator()
             else:
-                await step["step_func"](simulation)
+                await step["func"](simulation)
         logger.info("Simulation finished")
 
     @property
@@ -331,6 +360,12 @@ class AgentSimulation:
             # 如果没有发生异常且状态不是错误，则更新为完成
             await self._update_exp_status(2)
 
+    async def pause_simulator(self):
+        await self._simulator.pause()
+
+    async def resume_simulator(self):
+        await self._simulator.resume()
+
     async def init_agents(
         self,
         agent_count: Union[int, list[int]],
@@ -353,12 +388,12 @@ class AgentSimulation:
             raise ValueError("agent_class和agent_count的长度不一致")
 
         if memory_config_func is None:
-            logger.warning(
-                "memory_config_func is None, using default memory config function"
-            )
             memory_config_func = self.default_memory_config_func
 
         elif not isinstance(memory_config_func, list):
+            logger.warning(
+                "memory_config_func is not a list, using specific memory config function"
+            )
             memory_config_func = [memory_config_func]
 
         if len(memory_config_func) != len(agent_count):
@@ -465,16 +500,6 @@ class AgentSimulation:
                     )
                 )
 
-        # 初始化mlflow连接
-        _mlflow_config = self.config.get("metric_request", {}).get("mlflow")
-        if _mlflow_config:
-            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,
-            )
-        else:
-            mlflow_run_id = None
         # 建表
         if self.enable_pgsql:
             _num_workers = min(1, pg_sql_writers)
@@ -505,12 +530,10 @@ class AgentSimulation:
                 memory_config_function_group,
                 self.config,
                 self.exp_id,
-                self.exp_name,
                 self.enable_avro,
                 self.avro_path,
                 self.enable_pgsql,
                 _workers[i % _num_workers],  # type:ignore
-                mlflow_run_id,  # type:ignore
                 embedding_model,
                 self.logging_level,
                 config_file,
@@ -536,16 +559,20 @@ class AgentSimulation:
                 self._type2group[agent_type].append(group)
 
         # 并行初始化所有组的agents
+        await self.resume_simulator()
         init_tasks = []
         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()
 
-    async def gather(self, content: str):
+    async def gather(self, content: str, target_agent_uuids: Optional[list[str]] = None):
         """收集智能体的特定信息"""
         gather_tasks = []
         for group in self._groups.values():
-            gather_tasks.append(group.gather.remote(content))
+            gather_tasks.append(group.gather.remote(content, target_agent_uuids))
         return await asyncio.gather(*gather_tasks)
 
     async def filter(
@@ -585,7 +612,6 @@ class AgentSimulation:
         self, survey: Survey, agent_uuids: Optional[list[str]] = None
     ):
         """发送问卷"""
-        await self.messager.connect()
         survey_dict = survey.to_dict()
         if agent_uuids is None:
             agent_uuids = self._agent_uuids
@@ -599,13 +625,20 @@ class AgentSimulation:
         }
         for uuid in agent_uuids:
             topic = self._user_survey_topics[uuid]
-            await self.messager.send_message(topic, payload)
+            await self.messager.send_message.remote(topic, payload)
+        remain_payback = len(agent_uuids)
+        while True:
+            messages = await self.messager.fetch_messages.remote()
+            logger.info(f"Received {len(messages)} payback messages [survey]")
+            remain_payback -= len(messages)
+            if remain_payback <= 0:
+                break
+            await asyncio.sleep(3)
 
     async def send_interview_message(
         self, content: str, agent_uuids: Union[str, list[str]]
     ):
         """发送采访消息"""
-        await self.messager.connect()
         _date_time = datetime.now(timezone.utc)
         payload = {
             "from": "none",
@@ -617,24 +650,67 @@ class AgentSimulation:
             agent_uuids = [agent_uuids]
         for uuid in agent_uuids:
             topic = self._user_chat_topics[uuid]
-            await self.messager.send_message(topic, payload)
+            await self.messager.send_message.remote(topic, payload)
+        remain_payback = len(agent_uuids)
+        while True:
+            messages = await self.messager.fetch_messages.remote()
+            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]):
+        """提取指标"""
+        for metric_extractor in metric_extractor:
+            await metric_extractor(self)
 
     async def step(self):
-        """运行一步, 即每个智能体执行一次forward"""
+        """Run one step, each agent execute one forward"""
         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}")
+            need_insert_agents = False
+            if simulator_day > self._simulator_day:
+                need_insert_agents = True
+                self._simulator_day = simulator_day
+            if need_insert_agents:
+                await self.resume_simulator()
+                insert_tasks = []
+                for group in self._groups.values():
+                    insert_tasks.append(group.insert_agents.remote())
+                await asyncio.gather(*insert_tasks)
+
+            # step
             tasks = []
             for group in self._groups.values():
                 tasks.append(group.step.remote())
             await asyncio.gather(*tasks)
+            # save
+            simulator_day = await self._simulator.get_simulator_day()
+            simulator_time = int(await self._simulator.get_time())
+            save_tasks = []
+            for group in self._groups.values():
+                save_tasks.append(group.save.remote(simulator_day, simulator_time))
+            await asyncio.gather(*save_tasks)
+            self._total_steps += 1
+            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
+                ]
+                await self.extract_metric(to_excute_metric)
         except Exception as e:
-            logger.error(f"运行错误: {str(e)}")
-            raise
+            import traceback
+            logger.error(f"模拟器运行错误: {str(e)}\n{traceback.format_exc()}")
+            raise RuntimeError(str(e)) from e
 
     async def run(
         self,
         day: int = 1,
     ):
-        """运行模拟器"""
+        """Run the simulation by days"""
         try:
             self._exp_info["num_day"] += day
             await self._update_exp_status(1)  # 更新状态为运行中
@@ -645,13 +721,12 @@ class AgentSimulation:
             monitor_task = asyncio.create_task(self._monitor_exp_status(stop_event))
 
             try:
-                for _ in range(day):
-                    tasks = []
-                    for group in self._groups.values():
-                        tasks.append(group.run.remote())
-                    # 等待所有group运行完成
-                    await asyncio.gather(*tasks)
-
+                end_time = await self._simulator.get_time() + day * 24 * 3600
+                while True:
+                    current_time = await self._simulator.get_time()
+                    if current_time >= end_time:
+                        break
+                    await self.step()
             finally:
                 # 设置停止事件
                 stop_event.set()

pycityagent/tools/tool.py

@@ -119,7 +119,7 @@ class SencePOI(Tool):
         if agent.memory is None or agent.simulator is None:
             raise ValueError("Memory or Simulator is not set.")
         if radius is None and category_prefix is None:
-            position = await agent.memory.get("position")
+            position = await agent.status.get("position")
             resp = []
             for prefix in self.category_prefix:
                 resp += agent.simulator.map.query_pois(
@@ -146,17 +146,15 @@ class UpdateWithSimulator(Tool):
         agent = self.agent
         if agent._simulator is None:
             return
-        if not agent._has_bound_to_simulator:
-            await agent._bind_to_simulator()  # type: ignore
         simulator = agent.simulator
-        memory = agent.memory
-        person_id = await memory.get("id")
+        status = agent.status
+        person_id = await status.get("id")
         resp = await simulator.get_person(person_id)
         resp_dict = resp["person"]
         for k, v in resp_dict.get("motion", {}).items():
             try:
-                await memory.get(k)
-                await memory.update(
+                await status.get(k)
+                await status.update(
                     k, v, mode="replace", protect_llm_read_only_fields=False
                 )
             except KeyError as e:
@@ -183,9 +181,9 @@ class ResetAgentPosition(Tool):
         s: Optional[float] = None,
     ):
         agent = self.agent
-        memory = agent.memory
+        status = agent.status
         await agent.simulator.reset_person_position(
-            person_id=await memory.get("id"),
+            person_id=await status.get("id"),
             aoi_id=aoi_id,
             poi_id=poi_id,
             lane_id=lane_id,

pycityagent/workflow/block.py

@@ -146,6 +146,7 @@ def trigger_class():
 class Block:
     configurable_fields: list[str] = []
     default_values: dict[str, Any] = {}
+    fields_description: dict[str, str] = {}
 
     def __init__(
         self,
@@ -173,10 +174,16 @@ class Block:
 
     @classmethod
     def export_class_config(cls) -> dict[str, str]:
-        return {
-            field: cls.default_values.get(field, "default_value")
-            for field in cls.configurable_fields
-        }
+        return (
+            {
+                field: cls.default_values.get(field, "default_value")
+                for field in cls.configurable_fields
+            },
+            {
+                field: cls.fields_description.get(field, "")
+                for field in cls.configurable_fields
+            }
+        )
 
     @classmethod
     def import_config(cls, config: dict[str, Union[str, dict]]) -> Block:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pycityagent
-Version: 2.0.0a52
+Version: 2.0.0a53
 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

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

@@ -1,10 +1,10 @@
-pycityagent-2.0.0a52.dist-info/RECORD,,
-pycityagent-2.0.0a52.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
-pycityagent-2.0.0a52.dist-info/WHEEL,sha256=ezfKMaDztqf77C8lvQ0NCnZxkTaOaKLprqJ8q932MhU,109
-pycityagent-2.0.0a52.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
-pycityagent-2.0.0a52.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
-pycityagent-2.0.0a52.dist-info/METADATA,sha256=WBBdIOQzkArKVtcDejBHFlvBAyVJlfpBhIN3e8kvOQE,9110
-pycityagent/pycityagent-sim,sha256=n96jlVZRINlBec5SPOGAdUmeLWMoEKGgoH29iOVJ0wE,34081890
+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=ezfKMaDztqf77C8lvQ0NCnZxkTaOaKLprqJ8q932MhU,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/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
@@ -13,24 +13,24 @@ pycityagent/metrics/utils/const.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 pycityagent/economy/__init__.py,sha256=aonY4WHnx-6EGJ4WKrx4S-2jAkYNLtqUA04jp6q8B7w,75
 pycityagent/economy/econ_client.py,sha256=GuHK9ZBnhqW3Z7F8ViDJn_iN73yOBbbwFyJv1wLEBDk,12211
 pycityagent/tools/__init__.py,sha256=XtdtGyWeFyK1YOUvWkykBWxemtmwQjWUIuuyU1-gosQ,261
-pycityagent/tools/tool.py,sha256=qhjvPMKsGQ02oIGLl6ZdETTAR0q_av2qK2Ovf1XS_so,8758
+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/embeddings.py,sha256=Nhf_tUIlaYJAZ93wW2QTCtS1wq7e8fUgdn2JketEAuQ,7600
+pycityagent/llm/embeddings.py,sha256=2_P4TWm3sJKFdGDx2Q1a2AEapFopDctIXsGuntvmP6E,6816
 pycityagent/llm/utils.py,sha256=hoNPhvomb1u6lhFX0GctFipw74hVKb7bvUBDqwBzBYw,160
-pycityagent/memory/memory.py,sha256=RV54r9uE3H7RIfz5ifaeXiD7RrOJotxJNhAOguZrYUk,17273
+pycityagent/memory/memory.py,sha256=suU6mZIYvGySQGyNrYiqdobuTgjSHyI_PahIeRVShiQ,34506
 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
 pycityagent/memory/self_define.py,sha256=vpZ6CIxR2grNXEIOScdpsSc59FBg0mOKelwQuTElbtQ,5200
 pycityagent/memory/utils.py,sha256=oJWLdPeJy_jcdKcDTo9JAH9kDZhqjoQhhv_zT9qWC0w,877
 pycityagent/memory/const.py,sha256=6zpJPJXWoH9-yf4RARYYff586agCoud9BRn7sPERB1g,932
-pycityagent/memory/faiss_query.py,sha256=Z0JS4udyPYCIzHMq464QtHscnswu35gh9fQptikAwkQ,12976
+pycityagent/memory/faiss_query.py,sha256=V3rIw6d1_xcpNqZBbAYz3qfjVNE7NfJ7xOS5SibPtVU,13180
 pycityagent/memory/state.py,sha256=TYItiyDtehMEQaSBN7PpNrnNxdDM5jGppr9R9Ufv3kA,5134
-pycityagent/simulation/simulation.py,sha256=DkTYkdNknz2d7hIdYhxxLewUkYwmS9uOxnmEGTwbL_Q,26098
+pycityagent/simulation/simulation.py,sha256=Fm6Y54gc4wAlVhMvqlUhbDRG0tKt6OpHdGsI8as9jqs,29662
 pycityagent/simulation/__init__.py,sha256=P5czbcg2d8S0nbbnsQXFIhwzO4CennAhZM8OmKvAeYw,194
-pycityagent/simulation/agentgroup.py,sha256=fMTN9xDC-PdTGZ4KCMovZeGjzv8HIQJ1AGVG7iAJnD4,29351
+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
@@ -43,16 +43,16 @@ pycityagent/utils/parsers/__init__.py,sha256=AN2xgiPxszWK4rpX7zrqRsqNwfGF3WnCA5-
 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=78J6np8XrFXTUXTC9x_O28EUmyWsdgtARd1KfNcC0cI,23073
+pycityagent/agent/agent_base.py,sha256=FP2h3abIQ1Kp9qCzrzwa7tO82graDAWVg30HqYaQcPE,23620
 pycityagent/agent/__init__.py,sha256=U20yKu9QwSqAx_PHk5JwipfODkDfxONtumVfnsKjWFg,180
-pycityagent/agent/agent.py,sha256=8biuC44Yx4T8Fntlj_RGTlnKWwS0XDNkfYQrv5xXUwE,11548
+pycityagent/agent/agent.py,sha256=rYUC6idFb2dCRa7H7-0ZFPn4UB7MSTigHXOjNSK5B2Y,10702
 pycityagent/cli/wrapper.py,sha256=2Tb52gOlEVgn11Ekt6ZkRXr_BGzte-EPyBKnR6g6hQ4,1143
 pycityagent/workflow/__init__.py,sha256=H08Ko3eliZvuuCMajbEri-IP4-SeswYU6UjHBNA4Ze0,490
 pycityagent/workflow/prompt.py,sha256=6jI0Rq54JLv3-IXqZLYug62vse10wTI83xvf4ZX42nk,2929
-pycityagent/workflow/block.py,sha256=3X6qzpYmmMyZyXA6Dxl4lS-mNR0eLzLoiRhHY-H1rzE,9667
+pycityagent/workflow/block.py,sha256=REetWNdCF_fUGKVH-LWgDZ1lK2Bt0tJJ0kV20eWa4_A,9890
 pycityagent/workflow/trigger.py,sha256=Df-MOBEDWBbM-v0dFLQLXteLsipymT4n8vqexmK2GiQ,5643
 pycityagent/environment/__init__.py,sha256=awHxlOud-btWbk0FCS4RmGJ13W84oVCkbGfcrhKqihA,240
-pycityagent/environment/simulator.py,sha256=1OUfODDzM4EN6Lw_Wzq4KeQb-EpcUBioZYc9fxfSPn0,12070
+pycityagent/environment/simulator.py,sha256=pARK08PzqiAysy6VOR2KZAgEG7auVzt_Tecy5MBL55Q,12157
 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
@@ -66,38 +66,38 @@ pycityagent/environment/sence/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 pycityagent/environment/sence/static.py,sha256=9s7jz8HitstTrk-GqpnVB26oPrjuTyNeL7hcoxjPhV4,29104
 pycityagent/environment/sidecar/__init__.py,sha256=RFbOf40aYBP4WwRpFkua5tlRE_OtMcMNyp1Lew_aaAU,235
 pycityagent/environment/sidecar/sidecarv2.py,sha256=beKlYZgt38EQbV1x6NWQo7xVXyB-5QHfbwJexyXu7Tg,3252
+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/lane_service.py,sha256=N2dUe-3XuqqKLsNXt1k4NN8uV-J_ruo08yhaUd_hwOI,3916
-pycityagent/environment/sim/client.py,sha256=MHR7Hhu-Cr7B61d3K_QDpSJh4HrUU9JQf6Cu7_8pdsE,3493
+pycityagent/environment/sim/client.py,sha256=j0f8qjR1nIava4VkoZNEPqW5h08WPdcC5wzM9DP3tIs,3772
 pycityagent/environment/sim/__init__.py,sha256=JVG6sSD2Hbohl1TtKjuQi7_M7tKMrFh9vl3QV3VA5O0,724
 pycityagent/environment/sim/social_service.py,sha256=9EFJAwVdUuUQkNkFRn9qZRDfD1brh2fqkvasnXUEBhQ,2014
 pycityagent/environment/sim/economy_services.py,sha256=xoc-1_H8JmQwJ24oWRS1fD-hGYtz2I-x6BOkQ4yENzU,7106
 pycityagent/environment/sim/light_service.py,sha256=KVwt7ii_iLGA7gANZe3n6-4RiiPQt1w9H6ZOoizMI04,4242
-pycityagent/environment/sim/clock_service.py,sha256=fgYXacf_-ixhVAn5uKUvqvemBS6A0oQK8JOZukkhXyY,1353
+pycityagent/environment/sim/clock_service.py,sha256=gBUujvX_vIFMKVfcLRyk1GcpRRL606opLhNjCYL7Gt4,1363
 pycityagent/environment/sim/road_service.py,sha256=bKyn3_me0sGmaJVyF6eNeFbdU-9C1yWsa9L7pieDJzg,1285
 pycityagent/environment/interact/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycityagent/environment/interact/interact.py,sha256=ifxPPzuHeqLHIZ_6zvfXMoBOnBsXNIP4bYp7OJ7pnEQ,6588
-pycityagent/cityagent/memory_config.py,sha256=6dkgqPczANUqZpqGXDOt7wrS6vHdFSMNkWvEVwo6VIQ,10672
-pycityagent/cityagent/bankagent.py,sha256=9J0c_r6m0OJH2KpXxeCWstLqZVpjQ67xuWmDTbVm7KM,2217
+pycityagent/cityagent/memory_config.py,sha256=yZdtfXz5VaASKRUiiotHXGVc8axCiCsTNGvoSkTWWgk,10861
+pycityagent/cityagent/bankagent.py,sha256=lr4GEcqt-iwA7DXoDry0WXkV6benmdaAyLpswqSpKlY,2120
 pycityagent/cityagent/__init__.py,sha256=gcBQ-a50XegFtjigQ7xDXRBZrywBKqifiQFSRnEF8gM,572
-pycityagent/cityagent/firmagent.py,sha256=Mtb58YfW3V696gXA6TRw1qUL1WIzthahDBv2X5x_Iyg,4176
-pycityagent/cityagent/nbsagent.py,sha256=SIOigR8eiSHC0Gi8kg32hLxsqPKDgCHWF0HA89EU7eA,5202
+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=oVDWt-DDGMDxh_LpqMs4_CX-5hVQORyPC1ZW2a8CrhI,14960
-pycityagent/cityagent/governmentagent.py,sha256=9fjGueVmYok7zca14E1VL4N3ENEhnq2nubI6ab7Hzp0,2825
+pycityagent/cityagent/societyagent.py,sha256=QKzZecyN5npMi2IJlxei9MrJ1yJWJPCogXrNIP1VnFQ,19598
+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=pPPjdVFCqFvAV0RM1LVevQIH5d0GALnB6xLekvplutE,13113
-pycityagent/cityagent/blocks/cognition_block.py,sha256=CGIYwuF1twS5g3DNhCkaSFT2s1IQXF5NjJO38EX6FLg,15633
-pycityagent/cityagent/blocks/time_block.py,sha256=M7ng1jQ14gz4Xle0DC-kWeZmetq9lYQ2HzgEgsu-eX8,4337
-pycityagent/cityagent/blocks/social_block.py,sha256=AkI9wLm9WUEFe5Hc5uDfLfwJtWe1TpLLsWdjm__9KM0,14012
-pycityagent/cityagent/blocks/__init__.py,sha256=j8aKIrSEkoMjoWKPQbyRqmeHaB-bjaJObyfrEagq8MI,503
-pycityagent/cityagent/blocks/economy_block.py,sha256=yysi4E_k47sNmeMorbHVJydYymyTqo9J6hdQnzJ4HN8,20793
-pycityagent/cityagent/blocks/utils.py,sha256=BYf15pDynAQw8eeXyn1iVfVDDdkkoRz9e6eiSGUnz4g,2031
-pycityagent/cityagent/blocks/other_block.py,sha256=ETgtj_EpYbAocIJq12LB-SPcHAY-b7TRsm9llo3ZIrc,3845
-pycityagent/cityagent/blocks/plan_block.py,sha256=Ad_K2m0gYwH5qJi1HOETgEe83uRX06TXconAR8RIZHU,11479
-pycityagent/cityagent/blocks/mobility_block.py,sha256=ZebloDhvZJYbV0YSWhAbnOLToiL-4fG7vKNq3kh37M4,10788
+pycityagent/cityagent/blocks/needs_block.py,sha256=s8LikgtKORfo_Sw9SQ5_3biNPTof15QuUs4cDynXCyM,15332
+pycityagent/cityagent/blocks/cognition_block.py,sha256=aeDIWbEmlcqmXyxeEiewXJyV0te3L6k95Kec12mUSM0,14954
+pycityagent/cityagent/blocks/social_block.py,sha256=y46mPK9SLvcOHYB64l6qz5ZgT0dWNmX-C3Cusj_44mE,15540
+pycityagent/cityagent/blocks/__init__.py,sha256=wydR0s-cCRWgdvQetkfQnD_PU8vC3eTmt2zntcb4fSA,452
+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/mobility_block.py,sha256=xWbARMfJ3-6fddrW3VOUKJrXfMGmroiSN0B8t8lVYXA,12725
 pycityagent/survey/models.py,sha256=YE50UUt5qJ0O_lIUsSY6XFCGUTkJVNu_L1gAhaCJ2fs,3546
 pycityagent/survey/__init__.py,sha256=rxwou8U9KeFSP7rMzXtmtp2fVFZxK4Trzi-psx9LPIs,153
 pycityagent/survey/manager.py,sha256=S5IkwTdelsdtZETChRcfCEczzwSrry_Fly9MY4s3rbk,1681

pycityagent/cityagent/blocks/time_block.py

@@ -1,116 +0,0 @@
-import asyncio
-from datetime import datetime
-import json
-from pycityagent.workflow import Block
-from pycityagent.llm.llm import LLM
-from pycityagent.memory import Memory
-from pycityagent.environment import Simulator
-from pycityagent.workflow.prompt import FormatPrompt
-from .utils import clean_json_response
-    
-class WorkReflectionBlock(Block):
-    """
-    反馈工作感受
-    WorkReflectionBlock
-    """
-    def __init__(self, llm: LLM, memory: Memory, simulator: Simulator):
-        super().__init__("WorkReflectionBlock", llm, memory, simulator)
-        self.description = "Feedback on work experience"
-
-    async def forward(self):
-        prompt = """
-You are a {gender}, your consumption level is {consumption} and your education level is {education}.
-Today's working experience:
-{working_experience}
-
-How is your feeling of work today?
-
-Your answer should be one of the following:
-- excellent
-- good
-- soso
-- bad
-- very bad
-Answer in JSON format:
-{{
-    "evaluation": "good",
-}}
-"""
-        prompt = FormatPrompt(prompt)
-        prompt.format(
-            **{key: await self.memory.get(key) for key in prompt.variables}
-        )
-        evaluation = await self.llm.atext_request(prompt.to_dialog(), timeout=300)
-        evaluation = clean_json_response(evaluation)
-        try:
-            evaluation = json.loads(evaluation)
-        except Exception as e:
-            evaluation = {'evaluation': 'soso'}
-        if evaluation['evaluation'] == 'excellent':
-            safe_improve = 0.2
-        elif evaluation['evaluation'] == 'good':
-            safe_improve = 0.1
-        elif evaluation['evaluation'] == 'soso':
-            safe_improve = 0.0
-        elif evaluation['evaluation'] == 'bad':
-            safe_improve = -0.1
-        elif evaluation['evaluation'] == 'very bad':
-            safe_improve = -0.2
-        else:
-            safe_improve = 0.0
-
-        needs = await self.memory.get("needs")
-        needs['safe'] += safe_improve
-        await self.memory.update("needs", needs)
-        await self.memory.update("working_experience", [])
-        return
-
-
-class TimeBlock(Block):
-    """固定时间trigger的工作流"""
-    def __init__(self, llm: LLM, memory: Memory, simulator: Simulator):
-        super().__init__(name="time_block", llm=llm, memory=memory, simulator=simulator)
-        self.blocks = []
-        self.work_reflection_block = WorkReflectionBlock(llm, memory, simulator)
-        self.blocks.append((self.work_reflection_block, self.str_to_time('23:59:59'))) # end of day
-        self.last_check_time = None
-        self.trigger_time = 0
-        self.token_consumption = 0
-
-    def str_to_time(self, time_str: str):
-        time_obj = datetime.strptime(time_str, '%H:%M:%S')
-        return time_obj.hour * 3600 + time_obj.minute * 60 + time_obj.second
-
-    async def blocks_to_trigger(self):
-        trigger_blocks = []
-        now_time = await self.simulator.get_time(format_time=True)
-        now_time = self.str_to_time(now_time)
-        if self.last_check_time is None:
-            self.last_check_time = now_time
-        else:
-            whether_cross_day = True if now_time < self.last_check_time else False
-            for block, trigger_time in self.blocks:
-                if whether_cross_day and trigger_time > self.last_check_time:
-                    trigger_blocks.append(block)
-                elif not whether_cross_day and trigger_time > self.last_check_time and trigger_time <= now_time:
-                    trigger_blocks.append(block)
-            self.last_check_time = now_time
-        return trigger_blocks
-
-    async def forward(self):
-        while True:
-            if len(self.blocks) == 0:
-                await asyncio.sleep(30)
-                continue
-            trigger_blocks = await self.blocks_to_trigger()
-            if len(trigger_blocks) == 0:
-                await asyncio.sleep(30)
-                continue
-            self.trigger_time += 1
-            consumption_start = self.llm.prompt_tokens_used + self.llm.completion_tokens_used
-            tasks = []
-            for block in trigger_blocks:
-                tasks.append(block.forward())
-            await asyncio.gather(*tasks)
-            consumption_end = self.llm.prompt_tokens_used + self.llm.completion_tokens_used
-            self.token_consumption += consumption_end - consumption_start