pycityagent 2.0.0a91__cp312-cp312-macosx_11_0_arm64.whl → 2.0.0a93__cp312-cp312-macosx_11_0_arm64.whl

pycityagent/agent/agent.py

@@ -147,8 +147,8 @@ class CitizenAgent(Agent):
             person_id = await self.status.get("id")
             currency = await self.status.get("currency")
             skill = await self.status.get("work_skill")
-            consumption = await self.status.get("consumption")
-            income = await self.status.get("income")
+            consumption = 0.0
+            income = 0.0
             await self._economy_client.add_agents(
                 {
                     "id": person_id,

pycityagent/cityagent/blocks/dispatcher.py

@@ -9,10 +9,10 @@ from pycityagent.workflow.prompt import FormatPrompt
 logger = logging.getLogger("pycityagent")
 
 DISPATCHER_PROMPT = """
-Based on the step information, select the most appropriate block to handle the task.
+Based on the task information (which describes the needs of the user), select the most appropriate block to handle the task.
 Each block has its specific functionality as described in the function schema.
         
-Step information:
+Task information:
 {step}
 """
 
@@ -60,7 +60,7 @@ class BlockDispatcher:
         """Dispatch the step to appropriate block based on LLM function call"""
         try:
             function_schema = self._get_function_schema()
-            self.prompt.format(step=step)
+            self.prompt.format(step=step["intention"])
 
             # Call LLM with tools schema
             function_args = await self.llm.atext_request(

pycityagent/cityagent/blocks/economy_block.py

@@ -104,8 +104,8 @@ class ConsumptionBlock(Block):
             }
         consumption = min(month_consumption/1, month_consumption-consumption_currency)
         prices = []
-        for firm_id in firms_id:
-            price = await self.economy_client.get(firm_id, 'price')
+        for this_firm_id in firms_id:
+            price = await self.economy_client.get(this_firm_id, 'price')
             prices.append(price)
         consumption_each_firm = consumption*softmax(prices, gamma=-0.01)
         demand_each_firm = []
@@ -217,8 +217,8 @@ class MonthPlanBlock(Block):
             consumption = await self.economy_client.get(agent_id, 'consumption')
             tax_paid = await self.memory.status.get('tax_paid')
             prices = []
-            for firm_id in firms_id:
-                price = await self.economy_client.get(firm_id, 'price')
+            for this_firm_id in firms_id:
+                price = await self.economy_client.get(this_firm_id, 'price')
                 prices.append(price)
             price = np.mean(prices)
             wealth = await self.economy_client.get(agent_id, 'currency')

pycityagent/cityagent/blocks/needs_block.py

@@ -25,24 +25,12 @@ Current Time: {now_time}
 
 Please initialize the agent's satisfaction levels and parameters based on the profile above. Return the values in JSON format with the following structure:
 
-1. Current satisfaction levels (0-1 float values, lower means less satisfied):
+Current satisfaction levels (0-1 float values, lower means less satisfied):
 - hunger_satisfaction: Hunger satisfaction level (Normally, the agent will be less satisfied with hunger at eating time)
 - energy_satisfaction: Energy satisfaction level (Normally, at night, the agent will be less satisfied with energy)
 - safety_satisfaction: Safety satisfaction level (Normally, the agent will be more satisfied with safety when they have high income and currency)
 - social_satisfaction: Social satisfaction level
 
-2. Natural decay rates per hour (0-1 float values):
-- alpha_H: Hunger satisfaction decay rate
-- alpha_D: Energy satisfaction decay rate  
-- alpha_P: Safety satisfaction decay rate
-- alpha_C: Social satisfaction decay rate
-
-3. Threshold values (0-1 float values, below which the agent will try to improve):
-- T_H: Hunger satisfaction threshold
-- T_D: Energy satisfaction threshold
-- T_S: Safety satisfaction threshold  
-- T_C: Social satisfaction threshold
-
 Example response format (Do not return any other text):
 {{
     "current_satisfaction": {{
@@ -50,18 +38,6 @@ Example response format (Do not return any other text):
         "energy_satisfaction": 0.7,
         "safety_satisfaction": 0.9,
         "social_satisfaction": 0.6
-    }},
-    "decay_rates": {{
-        "alpha_H": 0.2,
-        "alpha_D": 0.08,
-        "alpha_P": 0.05,
-        "alpha_C": 0.03
-    }},
-    "thresholds": {{
-        "T_H": 0.4,
-        "T_D": 0.2,
-        "T_S": 0.2,
-        "T_C": 0.2
     }}
 }}
 """
@@ -120,13 +96,13 @@ class NeedsBlock(Block):
             0.2,
             0.08,
             0.05,
-            0.03,
+            0.1,
         )  # Hunger decay rate, Energy decay rate, Safety decay rate, Social decay rate
         self.T_H, self.T_D, self.T_P, self.T_C = (
-            0.4,
-            0.2,
+            0.1,
             0.2,
             0.2,
+            0.4,
         )  # Hunger threshold, Energy threshold, Safety threshold, Social threshold
 
     async def initialize(self):
@@ -151,31 +127,28 @@ class NeedsBlock(Block):
                 now_time=await self.simulator.get_time(format_time=True),
             )
             response = await self.llm.atext_request(self.initial_prompt.to_dialog())
-            response = await self.llm.atext_request(self.initial_prompt.to_dialog())
             response = self.clean_json_response(response)
-            try:
-                satisfaction = json.loads(response)
-                satisfactions = satisfaction["current_satisfaction"]
-                await self.memory.status.update(
-                    "hunger_satisfaction", satisfactions["hunger_satisfaction"]
-                )
-                await self.memory.status.update(
-                    "energy_satisfaction", satisfactions["energy_satisfaction"]
-                )
-                await self.memory.status.update(
-                    "safety_satisfaction", satisfactions["safety_satisfaction"]
-                )
-                await self.memory.status.update(
-                    "social_satisfaction", satisfactions["social_satisfaction"]
-                )
-                self.alpha_H, self.alpha_D, self.alpha_P, self.alpha_C = satisfaction[
-                    "decay_rates"
-                ].values()
-                self.T_H, self.T_D, self.T_P, self.T_C = satisfaction[
-                    "thresholds"
-                ].values()
-            except json.JSONDecodeError:
-                logger.warning(f"初始化响应不是有效的JSON格式: {response}")
+            retry = 3
+            while retry > 0:
+                try:
+                    satisfaction = json.loads(response)
+                    satisfactions = satisfaction["current_satisfaction"]
+                    await self.memory.status.update(
+                        "hunger_satisfaction", satisfactions["hunger_satisfaction"]
+                    )
+                    await self.memory.status.update(
+                        "energy_satisfaction", satisfactions["energy_satisfaction"]
+                    )
+                    await self.memory.status.update(
+                        "safety_satisfaction", satisfactions["safety_satisfaction"]
+                    )
+                    await self.memory.status.update(
+                        "social_satisfaction", satisfactions["social_satisfaction"]
+                    )
+                    break
+                except json.JSONDecodeError:
+                    logger.warning(f"初始化响应不是有效的JSON格式: {response}")
+                    retry -= 1
 
             current_plan = await self.memory.status.get("current_plan")
             history = await self.memory.status.get("plan_history")

pycityagent/cityagent/blocks/plan_block.py

@@ -174,8 +174,8 @@ class PlanBlock(Block):
             "hungry": ["Eat at home", "Eat outside"],
             "tired": ["Sleep", "Take a nap"],
             "safe": ["Go to work"],
-            "social": ["Online social", "Shopping"],
-            "whatever": ["Learning", "Entertainment", "Hang out", "Exercise"],
+            "social": ["Contact with friends", "Shopping"],
+            "whatever": ["Contact with friends", "Hang out"],
         }
 
         # configurable fields

pycityagent/cityagent/blocks/social_block.py

@@ -151,7 +151,7 @@ class FindPersonBlock(Block):
 
             if not friends:
                 node_id = await self.memory.stream.add_social(
-                    description=f"I can't find any friends to socialize with."
+                    description=f"I can't find any friends to contact with."
                 )
                 return {
                     "success": False,
@@ -250,7 +250,7 @@ class MessageBlock(Block):
     def __init__(self, agent, llm: LLM, memory: Memory, simulator: Simulator):
         super().__init__("MessageBlock", llm=llm, memory=memory, simulator=simulator)
         self.agent = agent
-        self.description = "Generate and send a message to someone"
+        self.description = "Send a message to someone"
         self.find_person_block = FindPersonBlock(llm, memory, simulator)
 
         # configurable fields
@@ -327,6 +327,7 @@ class MessageBlock(Block):
 
             # Send message
             serialized_message = self._serialize_message(message, 1)
+            await self.agent.send_message_to_agent(target, serialized_message)
             node_id = await self.memory.stream.add_social(
                 description=f"I sent a message to {target}: {message}"
             )
@@ -387,20 +388,12 @@ class SocialBlock(Block):
             # Execute the selected sub-block and get the result
             result = await selected_block.forward(step, context)
 
-            consumption_end = (
-                self.llm.prompt_tokens_used + self.llm.completion_tokens_used
-            )
-            self.token_consumption += consumption_end - consumption_start
-
             return result
 
-        except:
-            consumption_end = (
-                self.llm.prompt_tokens_used + self.llm.completion_tokens_used
-            )
-            self.token_consumption += consumption_end - consumption_start
+        except Exception as e:
             return {
-                "success": True,
-                "evaluation": "Completed social interaction with default behavior",
+                "success": False,
+                "evaluation": "Failed to complete social interaction with default behavior",
                 "consumed_time": 15,
+                "node_id": None,
             }

pycityagent/cityagent/initial.py

@@ -27,11 +27,11 @@ async def initialize_social_network(simulation):
         relation_types = ["family", "colleague", "friend"]
 
         # Get all agent IDs
-        agent_ids = simulation.agent_uuids
-        for agent_id in agent_ids:
+        citizen_uuids = await simulation.filter(types=[SocietyAgent])
+        for agent_id in citizen_uuids:
             # Randomly select 2-5 friends for each agent
             num_friends = random.randint(2, 5)
-            possible_friends = [aid for aid in agent_ids if aid != agent_id]
+            possible_friends = [aid for aid in citizen_uuids if aid != agent_id]
             friends = random.sample(
                 possible_friends, min(num_friends, len(possible_friends))
             )
@@ -114,7 +114,7 @@ async def bind_agent_info(simulation):
     - **Returns**:
         - None
     """
-    logger.info("Binding agent info...")
+    logger.info("Binding economy relationship...")
     infos = await simulation.gather("id")
     citizen_uuids = await simulation.filter(types=[SocietyAgent])
     firm_uuids = await simulation.filter(types=[FirmAgent])

pycityagent/cityagent/memory_config.py

@@ -66,8 +66,6 @@ def memory_config_societyagent():
         "goods_consumption": (int, 0, False),
         "work_propensity": (float, 0.0, False),
         "consumption_propensity": (float, 0.0, False),
-        "income_currency": (float, 0.0, False),  # monthly income
-        "to_income": (float, 0.0, False),
         "to_consumption_currency": (float, 0.0, False),
         "firm_id": (int, 0, False),
         "government_id": (int, 0, False),
@@ -168,13 +166,13 @@ def memory_config_societyagent():
             True,
         ),
         "family_consumption": (str, random.choice(["low", "medium", "high"]), True),
-        "consumption": (float, 0, True),
+        "consumption": (str, random.choice(["low", "slightly low", "medium", "slightly high", "high"]), True),
         "personality": (
             str,
             random.choice(["outgoint", "introvert", "ambivert", "extrovert"]),
             True,
         ),
-        "income": (float, 0, True),
+        "income": (float, random.randint(1000, 20000), True),
         "currency": (float, random.randint(1000, 100000), True),
         "residence": (str, random.choice(["city", "suburb", "rural"]), True),
         "race": (

pycityagent/cityagent/metrics.py

@@ -21,14 +21,16 @@ async def mobility_metric(simulation):
 
 async def economy_metric(simulation):
     # 使用函数属性来存储计数
-    if not hasattr(economy_metric, 'step_count'):
+    if not hasattr(economy_metric, 'nbs_id'):
         economy_metric.nbs_id = None
+    if not hasattr(economy_metric, 'nbs_uuid'):
         economy_metric.nbs_uuid = None
 
     if economy_metric.nbs_id is None:
         nbs_id = await simulation.economy_client.get_org_entity_ids(economyv2.ORG_TYPE_NBS)
         nbs_id = nbs_id[0]
         economy_metric.nbs_id = nbs_id
+    if economy_metric.nbs_uuid is None:
         nbs_uuids = await simulation.filter(types=[NBSAgent])
         economy_metric.nbs_uuid = nbs_uuids[0]
     

pycityagent/cityagent/societyagent.py

@@ -57,7 +57,7 @@ class PlanAndActionBlock(Block):
         self.planBlock = PlanBlock(llm=llm, memory=memory, simulator=simulator)
         self.mobilityBlock = MobilityBlock(llm=llm, memory=memory, simulator=simulator)
         self.socialBlock = SocialBlock(
-            agent=self, llm=llm, memory=memory, simulator=simulator
+            agent=agent, llm=llm, memory=memory, simulator=simulator
         )
         self.economyBlock = EconomyBlock(
             llm=llm, memory=memory, simulator=simulator, economy_client=economy_client

pycityagent/llm/llm.py

@@ -280,14 +280,15 @@ class LLM:
                         if hasattr(e, "http_status"):
                             print(f"HTTP status code: {e.http_status}")  # type: ignore
                         else:
-                            print("An error occurred:", e)
+                            print("OpenAIError:", e)
                         if attempt < retries - 1:
                             await asyncio.sleep(2**attempt)
                         else:
                             raise e
                     except Exception as e:
-                        print("An error occurred:", e)
+                        print("LLM Error (OpenAI):", e)
                         if attempt < retries - 1:
+                            print(dialog)
                             await asyncio.sleep(2**attempt)
                         else:
                             raise e
@@ -342,7 +343,7 @@ class LLM:
                         else:
                             raise e
                     except Exception as e:
-                        print("An error occurred:", e)
+                        print("LLM Error:", e)
                         if attempt < retries - 1:
                             await asyncio.sleep(2**attempt)
                         else:

pycityagent/memory/const.py

@@ -8,7 +8,7 @@ PROFILE_ATTRIBUTES = {
     "skill": str(),
     "occupation": str(),
     "family_consumption": str(),
-    "consumption": float(),
+    "consumption": str(),
     "personality": str(),
     "income": float(),
     "currency": float(),

pycityagent/simulation/simulation.py

@@ -779,6 +779,7 @@ class AgentSimulation:
             self._groups[group_name] = group
             group_agent_uuids = ray.get(group.get_agent_uuids.remote())
             for agent_uuid in group_agent_uuids:
+                self._agent_uuids.append(agent_uuid)
                 self._agent_uuid2group[agent_uuid] = group
                 self._user_chat_topics[agent_uuid] = (
                     f"exps/{self.exp_id}/agents/{agent_uuid}/user-chat"

pycityagent/utils/avro_schema.py

@@ -12,7 +12,7 @@ PROFILE_SCHEMA = {
         {"name": "skill", "type": "string"},
         {"name": "occupation", "type": "string"},
         {"name": "family_consumption", "type": "string"},
-        {"name": "consumption", "type": "float"},
+        {"name": "consumption", "type": "string"},
         {"name": "personality", "type": "string"},
         {"name": "income", "type": "float"},
         {"name": "currency", "type": "float"},

pycityagent/workflow/block.py

@@ -259,7 +259,7 @@ class Block:
                     setattr(self, field, config["config"][field])
 
         def build_or_update_block(block_data: dict) -> Block:
-            block_name = block_data["name"].lower()  # type:ignore
+            block_name = block_data["name"]  # type:ignore
             existing_block = getattr(self, block_name, None)
 
             if existing_block:
@@ -276,7 +276,7 @@ class Block:
                 return block_instance
 
         # 递归遍历子Block配置
-        for block_data in config.get("blocks", []):
+        for block_data in config.get("children", []):
             build_or_update_block(block_data)
 
     async def forward(self):

{pycityagent-2.0.0a91.dist-info → pycityagent-2.0.0a93.dist-info}/METADATA

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

@@ -1,9 +1,3 @@
-pycityagent-2.0.0a91.dist-info/RECORD,,
-pycityagent-2.0.0a91.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
-pycityagent-2.0.0a91.dist-info/WHEEL,sha256=VujM3ypTCyUW6hcTDdK2ej0ARVMxlU1Djlh_zWnDgqk,109
-pycityagent-2.0.0a91.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
-pycityagent-2.0.0a91.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
-pycityagent-2.0.0a91.dist-info/METADATA,sha256=p0o_OmiXN5jeCeFL-Yp9qt5TVb0nj2bmu-HSkagl9r8,9110
 pycityagent/pycityagent-sim,sha256=Ax6cjHjT8VcT5t07VboL_Ruor2eXSdSEml4Jvv-L5dQ,36972594
 pycityagent/__init__.py,sha256=PUKWTXc-xdMG7px8oTNclodsILUgypANj2Z647sY63k,808
 pycityagent/pycityagent-ui,sha256=Ur95yZygIaZ5l_CDqP9394M5GQ66iV5PkcNPYFWqzvk,41225346
@@ -15,7 +9,7 @@ pycityagent/tools/__init__.py,sha256=y7sMVMHf0AbivlczM2h-kr7mkgXK-WAx3S9BXLXkWvw
 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=vMw9AVftrsmbGkhRIwJ7jftFWpzTofhfQmu7TazDCaQ,20019
+pycityagent/llm/llm.py,sha256=YJy5SleUpHvS5v0S-wnnrY4zTbu_2RL36LH-zCYKPEI,20048
 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=5mUweo-BgQYbXmVRAk7HTUXsar6O6iYz79VbLuMAvjo,45063
@@ -24,17 +18,17 @@ pycityagent/memory/__init__.py,sha256=NClJAXC4G6I8kFWkPEcU2lbVDfyrRb5HrrBHgCXrzO
 pycityagent/memory/memory_base.py,sha256=av_sbD62PZbJyM8E9wmVuqYqgsutghcO7nJdAxGpHi0,9784
 pycityagent/memory/self_define.py,sha256=rndjWvQfi4x_90jtQWuCtWwLFBKqe7sExsDqs4I-KEw,5224
 pycityagent/memory/utils.py,sha256=oJWLdPeJy_jcdKcDTo9JAH9kDZhqjoQhhv_zT9qWC0w,877
-pycityagent/memory/const.py,sha256=nFmjvt-8FEB0hc0glOH3lliqJhkhf3D_NKxWI0pf6TY,936
+pycityagent/memory/const.py,sha256=Wgsx0oztDrJDEpI9Dr6XeI6GXrABcP0UTOuEvMp1AD8,934
 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=bHpR3FtUM6ewurwByRr57OgdTWXTPq9-knIjGt2GHlo,49370
+pycityagent/simulation/simulation.py,sha256=AjN-cT-SqdPbuXJAIczWr17hNC8fBzSLG8MrRbYC-9g,49423
 pycityagent/simulation/__init__.py,sha256=u1WpgwVxPboXWMxrUQKMXJNmTKQYAeCaqZv9HmSxESY,118
 pycityagent/simulation/agentgroup.py,sha256=rPloocCwB6rfjWbIz3T052mYq2lEcBp97mblkMD2y0A,36955
 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
 pycityagent/message/messager.py,sha256=UdOyEMLmaF3ZUvXHmratZxKNEb3BpmN7VyRdvGJWTL4,9060
-pycityagent/utils/avro_schema.py,sha256=dzytGiDy5tDFTi5QJ8pHySl9xrbXZ0Qwrc1ONUhfzwk,4150
+pycityagent/utils/avro_schema.py,sha256=hReb58T9teiNS9_YS36n1iiaBLW6jS4MRmcaWsL3Iu8,4151
 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
@@ -45,11 +39,11 @@ pycityagent/utils/parsers/parser_base.py,sha256=ZbqRcqOBL9hfHVZSltQSQmJnWrtuJS9a
 pycityagent/utils/parsers/json_parser.py,sha256=sakKohUuMcUH2toR85CAG_37D02ZoAn6LlzLgftUjmo,2923
 pycityagent/agent/agent_base.py,sha256=nz9QNfNjWVDza1yd8OwqmjZM3sq4fqONnVpcI8mA8cI,39488
 pycityagent/agent/__init__.py,sha256=U20yKu9QwSqAx_PHk5JwipfODkDfxONtumVfnsKjWFg,180
-pycityagent/agent/agent.py,sha256=Ymv3CtEPGcayVWrNnXkeWQXRNYEuvniWCqUfn2UZy8Y,19073
+pycityagent/agent/agent.py,sha256=TMusq6As7gfZAiFr2XB1H-4tlHrWFEOm7ytPjvxl6K4,19012
 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/block.py,sha256=zOoMgCvjrOXyAUQRCU7Qo_diRZaPGjgsfO0vraSJ9b0,12289
 pycityagent/workflow/trigger.py,sha256=4nzAwywGQsFabgo6gzp-vD2EV4wII7Z0LHGEAsflSEY,7608
 pycityagent/environment/__init__.py,sha256=fFIth2jxxgZ92cXm-aoM2igHgaSqsYGwtBhyb7opjzk,166
 pycityagent/environment/simulator.py,sha256=4QVwi40I9AwJ9YIDK3-fqmlz2Q5ykkWBHpz78xAo22c,23299
@@ -72,26 +66,32 @@ pycityagent/environment/sim/social_service.py,sha256=Y4A56aKXsjSv18UFumGPjQoJVMc
 pycityagent/environment/sim/light_service.py,sha256=q4pKcGrm7WU0h29I1dFIDOz2OV0BM-2s37uC6zokkoA,4290
 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=wVxLpk4jvVoPf2baiK-jMIi2rPPMRnFpSjOVyj1k74A,2718
-pycityagent/cityagent/memory_config.py,sha256=lCySjh8jpE3Sj-_XTCPizxJN8rjfcYD54sed7wi2EDw,11958
+pycityagent/cityagent/metrics.py,sha256=R_2Iv6l2yd6i43pkcg6n3qBm4Jdfsgg36_VWudnW8xA,2802
+pycityagent/cityagent/memory_config.py,sha256=IRjLINqIU-HWwwXljh1Air4n8hVEbQ-KqUdDRZLZu8o,11946
 pycityagent/cityagent/bankagent.py,sha256=I6MNG1fUbxKyWCLxCtvOjeVahong_LhHQKmJdRPhQL8,4097
 pycityagent/cityagent/__init__.py,sha256=gcBQ-a50XegFtjigQ7xDXRBZrywBKqifiQFSRnEF8gM,572
 pycityagent/cityagent/firmagent.py,sha256=vZr7kdjnxcCZ5qX7hmUIYuQQWd44GcRPbdi76WGSFy4,3760
 pycityagent/cityagent/nbsagent.py,sha256=rrzL-Ep-gWB8kvoPA8nBokY1zoEZGpyQjP9oy7ZuVL4,4676
-pycityagent/cityagent/initial.py,sha256=tVcO9ECGvsFatpxQirZbZf0ESFBxSpSxkm4p0x2kiO0,6263
-pycityagent/cityagent/societyagent.py,sha256=i7V7BeCb_pMJpxwiR5AOUcNHRw0SXHXltt_DtCxE6pE,20121
+pycityagent/cityagent/initial.py,sha256=X558KNRfoyuztNjvbGIX6ahUPzqnW9XiBQ_WQ9bTztY,6308
+pycityagent/cityagent/societyagent.py,sha256=i2Khr9LU-7XI5Mhaiu89yoBKYsN7U4RvgS2u4GXNz6M,20122
 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=eFWDgsqjh4FYaGeb8wL5R9ndaXN3977ymexoItDUki8,16112
+pycityagent/cityagent/blocks/dispatcher.py,sha256=gd3lyggvtkCq9Ou_icgua60H0UjHTzwHoynLl_iZoes,2939
+pycityagent/cityagent/blocks/needs_block.py,sha256=YRJACcxZbbPrQWdArAakf_H7BKm24EbWaI8NTiXiDdE,15227
 pycityagent/cityagent/blocks/cognition_block.py,sha256=yzjB0D_95vytpa5xiVdmTSpGp8H9HXcjWzzFN0OpP0k,15398
-pycityagent/cityagent/blocks/social_block.py,sha256=eedOlwRTGI47QFELYmfe2a_aj0GuHJweSyDxA6AYXcU,15493
+pycityagent/cityagent/blocks/social_block.py,sha256=pGQxumQ8FUpTqWRFcoDkNxnMtyToWXUnjIKYgUAA3vk,15218
 pycityagent/cityagent/blocks/__init__.py,sha256=h6si6WBcVVuglIskKQKA8Cxtf_VKen1sNPqOFKI311Q,420
-pycityagent/cityagent/blocks/economy_block.py,sha256=l47x2Iq15Rjj9WsH3p398dtpcejat4aCkC3X160xBlE,19843
+pycityagent/cityagent/blocks/economy_block.py,sha256=cQePU1kfJzmO9j_vnitQATsV-ztf8SHSWqRKiJVNlM0,19863
 pycityagent/cityagent/blocks/utils.py,sha256=K--6odjUDUu9YrwrHPaiPIHryo7m_MBmcBqDAy3cV5M,1816
 pycityagent/cityagent/blocks/other_block.py,sha256=LdtL6248xvMvvRQx6NvdlJrWWZFu8Xusjxb9yEh1M0k,4365
-pycityagent/cityagent/blocks/plan_block.py,sha256=AFyjj-RimYNkZ8x6sU-ZMWwB1jqJxSvr1j0vEKmhG4w,11967
+pycityagent/cityagent/blocks/plan_block.py,sha256=sM6FII0ubFj5eOifSf422RV8ry7RUQZfeDylVh4n7Bo,11957
 pycityagent/cityagent/blocks/mobility_block.py,sha256=OZoA-swFdX0Ezpzkyp8jJMNPQ533JpeeTCdLupoqRjI,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.0a93.dist-info/RECORD,,
+pycityagent-2.0.0a93.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
+pycityagent-2.0.0a93.dist-info/WHEEL,sha256=VujM3ypTCyUW6hcTDdK2ej0ARVMxlU1Djlh_zWnDgqk,109
+pycityagent-2.0.0a93.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
+pycityagent-2.0.0a93.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
+pycityagent-2.0.0a93.dist-info/METADATA,sha256=p5FYOWipjHs7S50Kd0R-kNN5NB-vWfLgDbyIzFLYW0Q,9110