pycityagent 2.0.0a73__cp39-cp39-macosx_11_0_arm64.whl → 2.0.0a75__cp39-cp39-macosx_11_0_arm64.whl

pycityagent/simulation/agentgroup.py

@@ -22,12 +22,18 @@ from ..llm.llmconfig import LLMConfig
 from ..memory import FaissQuery, Memory
 from ..message import Messager
 from ..metrics import MlflowClient
-from ..utils import (DIALOG_SCHEMA, INSTITUTION_STATUS_SCHEMA, PROFILE_SCHEMA,
-                     STATUS_SCHEMA, SURVEY_SCHEMA)
+from ..utils import (
+    DIALOG_SCHEMA,
+    INSTITUTION_STATUS_SCHEMA,
+    PROFILE_SCHEMA,
+    STATUS_SCHEMA,
+    SURVEY_SCHEMA,
+)
 
 logger = logging.getLogger("pycityagent")
 __all__ = ["AgentGroup"]
 
+
 @ray.remote
 class AgentGroup:
     def __init__(
@@ -36,6 +42,7 @@ class AgentGroup:
         number_of_agents: Union[int, list[int]],
         memory_config_function_group: dict[type[Agent], Callable],
         config: dict,
+        map_ref: ray.ObjectRef,
         exp_name: str,
         exp_id: Union[str, UUID],
         enable_avro: bool,
@@ -47,8 +54,8 @@ class AgentGroup:
         embedding_model: Embeddings,
         logging_level: int,
         agent_config_file: Optional[dict[type[Agent], str]] = None,
-        environment: Optional[dict[str, str]] = None,
         llm_semaphore: int = 200,
+        environment: Optional[dict] = None,
     ):
         """
         Represents a group of agents that can be deployed in a Ray distributed environment.
@@ -64,6 +71,7 @@ class AgentGroup:
             - `number_of_agents` (Union[int, List[int]]): Number of instances to create for each agent class.
             - `memory_config_function_group` (Dict[Type[Agent], Callable]): Functions to configure memory for each agent type.
             - `config` (dict): Configuration settings for the agent group.
+            - `map_ref` (ray.ObjectRef): Reference to the map object.
             - `exp_name` (str): Name of the experiment.
             - `exp_id` (str | UUID): Identifier for the experiment.
             - `enable_avro` (bool): Flag to enable AVRO file support.
@@ -143,10 +151,12 @@ class AgentGroup:
         self.llm.set_semaphore(llm_semaphore)
 
         # prepare Simulator
-        logger.info(f"-----Creating Simulator in AgentGroup {self._uuid} ...")
+        logger.info(f"-----Initializing Simulator in AgentGroup {self._uuid} ...")
         self.simulator = Simulator(config["simulator_request"])
-        self.projector = pyproj.Proj(self.simulator.map.header["projection"])
-        self.simulator.set_environment(environment)  # type:ignore
+        self.simulator.set_map(map_ref)
+        self.projector = pyproj.Proj(
+            ray.get(self.simulator.map.get_projector.remote())  # type:ignore
+        )
         # prepare Economy client
         logger.info(f"-----Creating Economy client in AgentGroup {self._uuid} ...")
         self.economy_client = EconomyClient(
@@ -206,7 +216,7 @@ class AgentGroup:
     @property
     def agent_type(self):
         return self.agent_class
-    
+
     async def get_economy_ids(self):
         return await self.economy_client.get_ids()
 
@@ -430,16 +440,6 @@ class AgentGroup:
         agent = self.id2agent[target_agent_uuid]
         await agent.status.update(target_key, content)
 
-    async def update_environment(self, key: str, value: str):
-        """
-        Updates the environment with a given key-value pair.
-
-        - **Args**:
-            - `key` (str): The key to update in the environment.
-            - `value` (str): The value to set for the specified key.
-        """
-        self.simulator.update_environment(key, value)
-
     async def message_dispatch(self):
         """
         Dispatches messages received via MQTT to the appropriate agents.
@@ -788,15 +788,18 @@ class AgentGroup:
         """
         try:
             tasks = [agent.run() for agent in self.agents]
-            await asyncio.gather(*tasks)
-            simulator_log = self.simulator.get_log_list() + self.economy_client.get_log_list()
+            agent_time_log = await asyncio.gather(*tasks)
+            simulator_log = (
+                self.simulator.get_log_list() + self.economy_client.get_log_list()
+            )
             group_logs = {
                 "llm_log": self.llm.get_log_list(),
-                "mqtt_log": ray.get(self.messager.get_log_list.remote()),
-                "simulator_log": simulator_log
+                "mqtt_log": ray.get(self.messager.get_log_list.remote()),  # type:ignore
+                "simulator_log": simulator_log,
+                "agent_time_log": agent_time_log,
             }
             self.llm.clear_log_list()
-            self.messager.clear_log_list.remote()
+            self.messager.clear_log_list.remote()  # type:ignore
             self.simulator.clear_log_list()
             self.economy_client.clear_log_list()
             return group_logs

pycityagent/simulation/simulation.py

@@ -13,30 +13,21 @@ import yaml
 from langchain_core.embeddings import Embeddings
 
 from ..agent import Agent, InstitutionAgent
-from ..cityagent import BankAgent, FirmAgent, GovernmentAgent, NBSAgent, SocietyAgent
-from ..cityagent.memory_config import (
-    memory_config_bank,
-    memory_config_firm,
-    memory_config_government,
-    memory_config_nbs,
-    memory_config_societyagent,
-    memory_config_init,
-)
+from ..cityagent import (BankAgent, FirmAgent, GovernmentAgent, NBSAgent,
+                         SocietyAgent)
 from ..cityagent.initial import bind_agent_info, initialize_social_network
-from ..cityagent.message_intercept import (
-    EdgeMessageBlock,
-    MessageBlockListener,
-    PointMessageBlock,
-)
+from ..cityagent.memory_config import (memory_config_bank, memory_config_firm,
+                                       memory_config_government,
+                                       memory_config_init, memory_config_nbs,
+                                       memory_config_societyagent)
+from ..cityagent.message_intercept import (EdgeMessageBlock,
+                                           MessageBlockListener,
+                                           PointMessageBlock)
 from ..economy.econ_client import EconomyClient
 from ..environment import Simulator
 from ..llm import SimpleEmbedding
-from ..message import (
-    MessageBlockBase,
-    MessageBlockListenerBase,
-    MessageInterceptor,
-    Messager,
-)
+from ..message import (MessageBlockBase, MessageBlockListenerBase,
+                       MessageInterceptor, Messager)
 from ..metrics import init_mlflow_connection
 from ..metrics.mlflow_client import MlflowClient
 from ..survey import Survey
@@ -49,6 +40,7 @@ logger = logging.getLogger("pycityagent")
 
 __all__ = ["AgentSimulation"]
 
+
 class AgentSimulation:
     """
     A class to simulate a multi-agent system.
@@ -130,12 +122,16 @@ class AgentSimulation:
         _simulator_config = config["simulator_request"].get("simulator", {})
         if "server" in _simulator_config:
             raise ValueError(f"Passing Traffic Simulation address is not supported!")
-        self._simulator = Simulator(config["simulator_request"])
+        simulator = Simulator(config["simulator_request"], create_map=True)
+        self._simulator = simulator
+        self._map_ref = self._simulator.map
+        server_addr = self._simulator.get_server_addr()
+        config["simulator_request"]["simulator"]["server"] = server_addr
         self._economy_client = EconomyClient(
             config["simulator_request"]["simulator"]["server"]
         )
         if enable_institution:
-            self._economy_addr = economy_addr = self._simulator.server_addr
+            self._economy_addr = economy_addr = server_addr
             if economy_addr is None:
                 raise ValueError(
                     f"`simulator` not provided in `simulator_request`, thus unable to activate economy!"
@@ -312,7 +308,7 @@ class AgentSimulation:
                 "crime": "The crime rate is low",
                 "pollution": "The pollution level is low",
                 "temperature": "The temperature is normal",
-                "day": "Workday" 
+                "day": "Workday",
             },
         )
         simulation._simulator.set_environment(environment)
@@ -382,24 +378,43 @@ class AgentSimulation:
         llm_log_lists = []
         mqtt_log_lists = []
         simulator_log_lists = []
+        agent_time_log_lists = []
         for step in config["workflow"]:
             logger.info(
                 f"Running step: type: {step['type']} - description: {step.get('description', 'no description')}"
             )
-            if step["type"] not in ["run", "step", "interview", "survey", "intervene", "pause", "resume", "function"]:
+            if step["type"] not in [
+                "run",
+                "step",
+                "interview",
+                "survey",
+                "intervene",
+                "pause",
+                "resume",
+                "function",
+            ]:
                 raise ValueError(f"Invalid step type: {step['type']}")
             if step["type"] == "run":
-                llm_log_list, mqtt_log_list, simulator_log_list = await simulation.run(step.get("days", 1))
+                llm_log_list, mqtt_log_list, simulator_log_list, agent_time_log_list = (
+                    await simulation.run(step.get("days", 1))
+                )
                 llm_log_lists.extend(llm_log_list)
                 mqtt_log_lists.extend(mqtt_log_list)
                 simulator_log_lists.extend(simulator_log_list)
+                agent_time_log_lists.extend(agent_time_log_list)
             elif step["type"] == "step":
                 times = step.get("times", 1)
                 for _ in range(times):
-                    llm_log_list, mqtt_log_list, simulator_log_list = await simulation.step()
+                    (
+                        llm_log_list,
+                        mqtt_log_list,
+                        simulator_log_list,
+                        agent_time_log_list,
+                    ) = await simulation.step()
                     llm_log_lists.extend(llm_log_list)
                     mqtt_log_lists.extend(mqtt_log_list)
                     simulator_log_lists.extend(simulator_log_list)
+                    agent_time_log_lists.extend(agent_time_log_list)
             elif step["type"] == "pause":
                 await simulation.pause_simulator()
             elif step["type"] == "resume":
@@ -407,8 +422,8 @@ class AgentSimulation:
             else:
                 await step["func"](simulation)
         logger.info("Simulation finished")
-        return llm_log_lists, mqtt_log_lists, simulator_log_lists
-    
+        return llm_log_lists, mqtt_log_lists, simulator_log_lists, agent_time_log_lists
+
     @property
     def enable_avro(
         self,
@@ -742,6 +757,7 @@ class AgentSimulation:
                 number_of_agents,
                 memory_config_function_group,
                 self.config,
+                self._map_ref,
                 self.exp_name,
                 self.exp_id,
                 self.enable_avro,
@@ -753,8 +769,8 @@ class AgentSimulation:
                 embedding_model,
                 self.logging_level,
                 config_file,
-                environment,
                 llm_semaphore,
+                environment,
             )
             creation_tasks.append((group_name, group))
 
@@ -1018,7 +1034,9 @@ class AgentSimulation:
 
             # step
             simulator_day = await self._simulator.get_simulator_day()
-            simulator_time = int(await self._simulator.get_time())
+            simulator_time = int(
+                await self._simulator.get_simulator_second_from_start_of_day()
+            )
             logger.info(
                 f"Start simulation day {simulator_day} at {simulator_time}, step {self._total_steps}"
             )
@@ -1029,14 +1047,17 @@ class AgentSimulation:
             llm_log_list = []
             mqtt_log_list = []
             simulator_log_list = []
+            agent_time_log_list = []
             for log_messages_group in log_messages_groups:
-                llm_log_list.extend(log_messages_group['llm_log'])
-                mqtt_log_list.extend(log_messages_group['mqtt_log'])
-                simulator_log_list.extend(log_messages_group['simulator_log'])
-            
+                llm_log_list.extend(log_messages_group["llm_log"])
+                mqtt_log_list.extend(log_messages_group["mqtt_log"])
+                simulator_log_list.extend(log_messages_group["simulator_log"])
+                agent_time_log_list.extend(log_messages_group["agent_time_log"])
             # save
             simulator_day = await self._simulator.get_simulator_day()
-            simulator_time = int(await self._simulator.get_time())
+            simulator_time = int(
+                await self._simulator.get_simulator_second_from_start_of_day()
+            )
             save_tasks = []
             for group in self._groups.values():
                 save_tasks.append(group.save.remote(simulator_day, simulator_time))
@@ -1050,7 +1071,7 @@ class AgentSimulation:
                 ]
                 await self.extract_metric(to_excute_metric)
 
-            return llm_log_list, mqtt_log_list, simulator_log_list
+            return llm_log_list, mqtt_log_list, simulator_log_list, agent_time_log_list
         except Exception as e:
             import traceback
 
@@ -1081,6 +1102,7 @@ class AgentSimulation:
         llm_log_lists = []
         mqtt_log_lists = []
         simulator_log_lists = []
+        agent_time_log_lists = []
         try:
             self._exp_info["num_day"] += day
             await self._update_exp_status(1)  # 更新状态为运行中
@@ -1098,10 +1120,16 @@ class AgentSimulation:
                     current_time = await self._simulator.get_time()
                     if current_time >= end_time:  # type:ignore
                         break
-                    llm_log_list, mqtt_log_list, simulator_log_list = await self.step()
+                    (
+                        llm_log_list,
+                        mqtt_log_list,
+                        simulator_log_list,
+                        agent_time_log_list,
+                    ) = await self.step()
                     llm_log_lists.extend(llm_log_list)
                     mqtt_log_lists.extend(mqtt_log_list)
                     simulator_log_lists.extend(simulator_log_list)
+                    agent_time_log_lists.extend(agent_time_log_list)
             finally:
                 # 设置停止事件
                 stop_event.set()
@@ -1110,7 +1138,12 @@ class AgentSimulation:
 
             # 运行成功后更新状态
             await self._update_exp_status(2)
-            return llm_log_lists, mqtt_log_lists, simulator_log_lists
+            return (
+                llm_log_lists,
+                mqtt_log_lists,
+                simulator_log_lists,
+                agent_time_log_lists,
+            )
         except Exception as e:
             error_msg = f"模拟器运行错误: {str(e)}"
             logger.error(error_msg)

pycityagent/tools/tool.py

@@ -5,6 +5,7 @@ from collections.abc import Callable, Sequence
 from typing import Any, Optional, Union
 
 from mlflow.entities import Metric
+import ray
 
 from ..agent import Agent
 from ..environment import AoiService, PersonService

{pycityagent-2.0.0a73.dist-info → pycityagent-2.0.0a75.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pycityagent
-Version: 2.0.0a73
+Version: 2.0.0a75
 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.0a73.dist-info → pycityagent-2.0.0a75.dist-info}/RECORD

@@ -1,10 +1,4 @@
-pycityagent-2.0.0a73.dist-info/RECORD,,
-pycityagent-2.0.0a73.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
-pycityagent-2.0.0a73.dist-info/WHEEL,sha256=md3JO_ifs5j508p3TDNMgtQVtnQblpGEt_Wo4W56l8Y,107
-pycityagent-2.0.0a73.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
-pycityagent-2.0.0a73.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
-pycityagent-2.0.0a73.dist-info/METADATA,sha256=6YwxQbl14QnhjbHMwMPu4RoaBquNt8mSIXGJFaoD_CQ,9110
-pycityagent/pycityagent-sim,sha256=MYlRyvlpybVbiqKehzfV3GUbhatuQHNrxNWRBOs3nsU,35884466
+pycityagent/pycityagent-sim,sha256=SKLQqFopRD0jOmZJUDtoo3l3Vuzqf_sfV1xeHPjchO8,35884466
 pycityagent/__init__.py,sha256=PUKWTXc-xdMG7px8oTNclodsILUgypANj2Z647sY63k,808
 pycityagent/pycityagent-ui,sha256=Ur95yZygIaZ5l_CDqP9394M5GQ66iV5PkcNPYFWqzvk,41225346
 pycityagent/metrics/mlflow_client.py,sha256=-iyh4BPVnBkluhmfucUzibCUnBX2iftkz4tVJJVxwHw,6958
@@ -12,13 +6,13 @@ pycityagent/metrics/__init__.py,sha256=X08PaBbGVAd7_PRGLREXWxaqm7nS82WBQpD1zvQzc
 pycityagent/economy/__init__.py,sha256=aonY4WHnx-6EGJ4WKrx4S-2jAkYNLtqUA04jp6q8B7w,75
 pycityagent/economy/econ_client.py,sha256=FUE-7Kxpa3u41eH_4Xye7IYquk1i25Hfv8Smq0nR1-o,24757
 pycityagent/tools/__init__.py,sha256=y7sMVMHf0AbivlczM2h-kr7mkgXK-WAx3S9BXLXkWvw,235
-pycityagent/tools/tool.py,sha256=-HZvKeq4gFMo2wJPk6vcr8EdXubM7kA0qC82zv_yS-s,9011
+pycityagent/tools/tool.py,sha256=4ZJSHbNM8dfAVwZEw8T0a2_9OuPsPQpKSVL4WxZVBUc,9022
 pycityagent/llm/llmconfig.py,sha256=6AqCMV4B_JqBD2mb98bLGzpUdlOCnziQKae-Hhxxp-E,469
 pycityagent/llm/__init__.py,sha256=iWs6FLgrbRVIiqOf4ILS89gkVCTvS7HFC3vG-MWuyko,205
-pycityagent/llm/llm.py,sha256=DvrgrnrmR2JAQRVOvvRo3w4aD8M-qLAqVSD5pXZHr4M,19019
+pycityagent/llm/llm.py,sha256=8f7hNbdcCjZHri5Fkmnd7s1p5hfFujIuv_wB1ykjLH8,19470
 pycityagent/llm/embeddings.py,sha256=3610I-_scAy8HwRNpT8hVJpH9_8_pTLCPptqnzSq10o,11322
 pycityagent/llm/utils.py,sha256=rSx_fp-_Gh0vZ-x2rqAUqnpS56BVTZ4ChfAMarB8S1A,195
-pycityagent/memory/memory.py,sha256=4vztwJ6dterLJxAWHkqawEBnYtvxp7VUAm0btsCLvic,45057
+pycityagent/memory/memory.py,sha256=5mUweo-BgQYbXmVRAk7HTUXsar6O6iYz79VbLuMAvjo,45063
 pycityagent/memory/profile.py,sha256=Z1shwFc6MqakorbiY6rGqVAgCJP4YTpDrqnMQZcYQno,5227
 pycityagent/memory/__init__.py,sha256=NClJAXC4G6I8kFWkPEcU2lbVDfyrRb5HrrBHgCXrzOU,125
 pycityagent/memory/memory_base.py,sha256=av_sbD62PZbJyM8E9wmVuqYqgsutghcO7nJdAxGpHi0,9784
@@ -27,9 +21,9 @@ pycityagent/memory/utils.py,sha256=oJWLdPeJy_jcdKcDTo9JAH9kDZhqjoQhhv_zT9qWC0w,8
 pycityagent/memory/const.py,sha256=nFmjvt-8FEB0hc0glOH3lliqJhkhf3D_NKxWI0pf6TY,936
 pycityagent/memory/faiss_query.py,sha256=KPeyzIjD0dzkxr-TlOeCiIlkdh1WAyyipCAXUEt97Lk,17350
 pycityagent/memory/state.py,sha256=JFCBuK1AS-HqscvdGS9ATF9AUU8t29_2leDY_6iO2_4,5158
-pycityagent/simulation/simulation.py,sha256=K4u2tikxreRPyC4xAQQKgtlh-0wc9valjP6uvO6LTuE,47972
+pycityagent/simulation/simulation.py,sha256=b4sFPVAMdCi1aiG6GX2cSE3vYa2Q14XfyRkxHp1GRCc,49526
 pycityagent/simulation/__init__.py,sha256=u1WpgwVxPboXWMxrUQKMXJNmTKQYAeCaqZv9HmSxESY,118
-pycityagent/simulation/agentgroup.py,sha256=iagtmxqBw7eyMCxYFU1SuLIHdoqkiBQV5qcE448QXpo,37068
+pycityagent/simulation/agentgroup.py,sha256=oXo2iRUThh_96JhXHMufT8_BPx0PrlwqbMpiVqK_viA,36957
 pycityagent/simulation/storage/pg.py,sha256=xRshSOGttW-p0re0fNBOjOpb-nQ5msIE2LsdT79_E_Y,8425
 pycityagent/message/message_interceptor.py,sha256=QWuTUqi1Cu214fhFs0f78tD2zflMnb6zEAGB4RutXxs,17736
 pycityagent/message/__init__.py,sha256=f5QH7DKPqEAMyfSlBMnl3uouOKlsoel909STlIe7nUk,276
@@ -43,16 +37,16 @@ pycityagent/utils/parsers/__init__.py,sha256=AN2xgiPxszWK4rpX7zrqRsqNwfGF3WnCA5-
 pycityagent/utils/parsers/code_block_parser.py,sha256=jy6wHx9zypvJTWneCKuUaLQL19d4yLK6C_awc7y8A-k,1179
 pycityagent/utils/parsers/parser_base.py,sha256=ZbqRcqOBL9hfHVZSltQSQmJnWrtuJS9aYeOJU-FlJ0E,1725
 pycityagent/utils/parsers/json_parser.py,sha256=sakKohUuMcUH2toR85CAG_37D02ZoAn6LlzLgftUjmo,2923
-pycityagent/agent/agent_base.py,sha256=s2jFdGadn9gL9WPXf-WpdaPgY-yjzsxfcZp6VVr1K8M,37996
+pycityagent/agent/agent_base.py,sha256=nz9QNfNjWVDza1yd8OwqmjZM3sq4fqONnVpcI8mA8cI,39488
 pycityagent/agent/__init__.py,sha256=U20yKu9QwSqAx_PHk5JwipfODkDfxONtumVfnsKjWFg,180
-pycityagent/agent/agent.py,sha256=CmgjlH4oBJ0elApYXbmEI33sJ_GKh2KS0bFBY0kUgVE,18874
+pycityagent/agent/agent.py,sha256=Tq6VfEahZdZtWL4tdEM-rJM1FrLgjA5X0O04-sLYH-g,18881
 pycityagent/cli/wrapper.py,sha256=bAwmfWTXbGld-uiMnIMhKp22IVRQjhLUToknyUDk9rQ,1147
 pycityagent/workflow/__init__.py,sha256=H08Ko3eliZvuuCMajbEri-IP4-SeswYU6UjHBNA4Ze0,490
 pycityagent/workflow/prompt.py,sha256=rzenP4EFGxbWE1aq-x2036b6umKvi5cQx2xtWULwgIk,3392
 pycityagent/workflow/block.py,sha256=WJfCeL8e117GzkVPJCRNsQZZinccMnVyEubkwrf-17U,12295
 pycityagent/workflow/trigger.py,sha256=4nzAwywGQsFabgo6gzp-vD2EV4wII7Z0LHGEAsflSEY,7608
 pycityagent/environment/__init__.py,sha256=fFIth2jxxgZ92cXm-aoM2igHgaSqsYGwtBhyb7opjzk,166
-pycityagent/environment/simulator.py,sha256=bZr167qLth2tK8HtQm_L82OdnG2pM5SeP-iA26A7aRo,21259
+pycityagent/environment/simulator.py,sha256=PpO4XyIbn5fSqycBlRYdGWuRumDzeXXM8ZQr8U5Mgcs,22608
 pycityagent/environment/utils/port.py,sha256=3OM6kSUt3PxvDUOlgyiendBtETaWU8Mzk_8H0TzTmYg,295
 pycityagent/environment/utils/grpc.py,sha256=_lB4-k4dTKuNvApaDiYgFxiLTPtYG42DVQtG9yOj9pQ,2022
 pycityagent/environment/utils/base64.py,sha256=hoREzQo3FXMN79pqQLO2jgsDEvudciomyKii7MWljAM,374
@@ -64,7 +58,7 @@ pycityagent/environment/utils/const.py,sha256=1LqxnYJ8FSmq37fN5kIFlWLwycEDzFa8SF
 pycityagent/environment/sim/pause_service.py,sha256=UUTa4pTBOX_MGKki9QDgKId7scch0waAWF9xRVmNlAs,1701
 pycityagent/environment/sim/person_service.py,sha256=T1pRi5jDcivSInX7iGZoHKYZmgO7_t5MYtLhU12_LC4,10793
 pycityagent/environment/sim/aoi_service.py,sha256=bYVJDrOfDn8hgOORDU7PxMaT-fpqXA5Z0A080l2EPBc,1242
-pycityagent/environment/sim/sim_env.py,sha256=aSdr3k3Scs2Mdd6PsBrABdz_7GKmV8kV4jo1Zw5N8nY,4625
+pycityagent/environment/sim/sim_env.py,sha256=UPSMNrLJVGj1IqUPxHaoLE5NbgI200trOxCsP0RYi8s,4767
 pycityagent/environment/sim/lane_service.py,sha256=bmf0zOWkxDzMEDlhTdHNRJRiTFGgzjbeqmex387gHZs,3964
 pycityagent/environment/sim/client.py,sha256=x4REWPRFG_C2s0-CWz8MnYalD_esfu2pPHf_vpsCG78,2852
 pycityagent/environment/sim/__init__.py,sha256=CyJc5Tey9MgzomZv0ynAcV0yaUlSE3bPbegYXar8wJc,601
@@ -73,25 +67,31 @@ pycityagent/environment/sim/light_service.py,sha256=q4pKcGrm7WU0h29I1dFIDOz2OV0B
 pycityagent/environment/sim/clock_service.py,sha256=4Hly8CToghj0x_XbDgGrIZy1YYAlDH0EUGCiCDYpk_I,1375
 pycityagent/environment/sim/road_service.py,sha256=Bb1sreO0Knt9tcqH_WJF-I3P3G92bRAlzDBEa--25GE,1297
 pycityagent/cityagent/metrics.py,sha256=yXZ4uRXARjDAvPKyquut7YWs363nDcIV0J1KQgYacZE,2169
-pycityagent/cityagent/memory_config.py,sha256=52QkS_4wtM-PPTM5xR10IPvG00VOlWogFTOP6BqBrYo,11899
+pycityagent/cityagent/memory_config.py,sha256=_7ujYGgalnnulBvOT_HCuy9uITd5l6br5THkC53hgNE,11868
 pycityagent/cityagent/bankagent.py,sha256=uL9ATilEddhJR25qW0p8jX6I9QKGm3gDi1wmJNr6Hbg,4036
 pycityagent/cityagent/__init__.py,sha256=gcBQ-a50XegFtjigQ7xDXRBZrywBKqifiQFSRnEF8gM,572
 pycityagent/cityagent/firmagent.py,sha256=x9Yvrd9j0dSILUm__e9dBT7FBgJ0q7VFzbNUC10Vg5A,3677
 pycityagent/cityagent/nbsagent.py,sha256=2021QjPm2JFhDJ0KKNpEZwtTT8GaGyj2zf6KCKHdL3Y,4059
-pycityagent/cityagent/initial.py,sha256=a8ed-vvagYw8tJY-uzYm_sAja2545QRAEa58Tp4DHck,6130
-pycityagent/cityagent/societyagent.py,sha256=2WSXh-eElgigXfDHOh9KoDU2KCmIatwD2D57cZlh0Fs,20253
+pycityagent/cityagent/initial.py,sha256=Nrmwj5nflk_wg81kRU69GGZQLNM49qhQTSRFpOUBk_Y,6071
+pycityagent/cityagent/societyagent.py,sha256=dY8coUMtrTrcATCYDdI0MvVt42YXSyP-ZWi24H9xg7o,20090
 pycityagent/cityagent/message_intercept.py,sha256=dyT1G-nMxKb2prhgtyFFHFz593qBrkk5DnHsHvG1OIc,4418
 pycityagent/cityagent/governmentagent.py,sha256=XIyggG83FWUTZdOuoqc6ClCP3hhfkxNmtYRu9TFo0dU,3063
 pycityagent/cityagent/blocks/dispatcher.py,sha256=U5BPeUrjrTyDaznYfT6YUJIW8vfKVRDF4EO0oOn6Td4,2886
-pycityagent/cityagent/blocks/needs_block.py,sha256=LwoH-4WcAF5L8IOW2ytf51QeIghq9D9KspQ92s5k4Nk,15897
-pycityagent/cityagent/blocks/cognition_block.py,sha256=5QWhX2vg1VqYYzm-qBITBhVntaaetePQoa7OqvmXJug,15170
+pycityagent/cityagent/blocks/needs_block.py,sha256=NYKrGDoYCuXoupMNMuSNhx4Ci1paC_EuGRWvp5-ZSA8,15909
+pycityagent/cityagent/blocks/cognition_block.py,sha256=cCflH-1lAexWLamT412nXERoUln0tbaFMxdJKYmFpfs,15179
 pycityagent/cityagent/blocks/social_block.py,sha256=eedOlwRTGI47QFELYmfe2a_aj0GuHJweSyDxA6AYXcU,15493
 pycityagent/cityagent/blocks/__init__.py,sha256=h6si6WBcVVuglIskKQKA8Cxtf_VKen1sNPqOFKI311Q,420
-pycityagent/cityagent/blocks/economy_block.py,sha256=zQzZ_A-VrvCNuGu_SdIKr0PAnmUAvOcLBM7eWkN0n9g,19063
-pycityagent/cityagent/blocks/utils.py,sha256=uu4iQOYKwIT87AqbT5KT4W8p_UI_dZfuXkyxWto_EQ0,2097
+pycityagent/cityagent/blocks/economy_block.py,sha256=1yHUdCSAzvvhdGFzMfSM_wtbW_3D6YeYSNlVV3yQqsA,19083
+pycityagent/cityagent/blocks/utils.py,sha256=BVOTtZC8dJIc0eGGNmL0LQ_WnMfXr54q1gyrrDwRn-Y,2079
 pycityagent/cityagent/blocks/other_block.py,sha256=LdtL6248xvMvvRQx6NvdlJrWWZFu8Xusjxb9yEh1M0k,4365
-pycityagent/cityagent/blocks/plan_block.py,sha256=LcmG7d9oMezq9TiEerFJyUZytZRg5Zf03B7m6aV7HCI,11465
-pycityagent/cityagent/blocks/mobility_block.py,sha256=YmKhJW_srC6b6n_LvJujSO-eB-13G10BhDnURaVVdj8,15290
+pycityagent/cityagent/blocks/plan_block.py,sha256=A5DvtXIy98MZkRGUQmp26grNI5i0BVbl3aEM_Ebd6Z4,11271
+pycityagent/cityagent/blocks/mobility_block.py,sha256=qkRiV0nkGOUUoo9lGIjAFE_Hl0kiyMev12-Zm7JyV7o,15089
 pycityagent/survey/models.py,sha256=g3xni4GcA1Py3vlGt6z4ltutjgQ4G0uINYAM8vKRJAw,5225
 pycityagent/survey/__init__.py,sha256=rxwou8U9KeFSP7rMzXtmtp2fVFZxK4Trzi-psx9LPIs,153
 pycityagent/survey/manager.py,sha256=tHkdeq4lTfAHwvgf4-udsXri0z2l6E00rEbvwl7SqRs,3439
+pycityagent-2.0.0a75.dist-info/RECORD,,
+pycityagent-2.0.0a75.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
+pycityagent-2.0.0a75.dist-info/WHEEL,sha256=md3JO_ifs5j508p3TDNMgtQVtnQblpGEt_Wo4W56l8Y,107
+pycityagent-2.0.0a75.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
+pycityagent-2.0.0a75.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
+pycityagent-2.0.0a75.dist-info/METADATA,sha256=uxmly0-t1dIjZF7m8XBXef9tOqvHmO6MmcZavJ4i7Yc,9110