pycityagent 2.0.0a82__cp310-cp310-macosx_11_0_arm64.whl → 2.0.0a84__cp310-cp310-macosx_11_0_arm64.whl

pycityagent/cityagent/blocks/economy_block.py

@@ -112,6 +112,14 @@ class ConsumptionBlock(Block):
         for i in range(len(firms_id)):
             demand_each_firm.append(int(consumption_each_firm[i]//prices[i]))
         real_consumption = await self.economy_client.calculate_consumption(firms_id, agent_id, demand_each_firm)
+        if real_consumption == -1:
+            node_id = await self.memory.stream.add_economy(description=f"I failed to buy goods, cause I do not have enough money.")
+            return {
+                'success': False, 
+                'evaluation': f"I failed to buy goods, cause I do not have enough money.", 
+                'consumed_time': 0,
+                'node_id': node_id
+            }
         node_id = await self.memory.stream.add_economy(description=f"I bought some goods, and spent {real_consumption:.1f} on {intention}")
         evaluation = {
             'success': True, 
@@ -163,6 +171,22 @@ class EconomyBlock(Block):
     
 class MonthPlanBlock(Block):
     """Monthly Planning"""
+    configurable_fields = [
+        "UBI",
+        "num_labor_hours",
+        "productivity_per_labor",
+    ]
+    default_values = {
+        "UBI": 0,
+        "num_labor_hours": 168,
+        "productivity_per_labor": 1,
+    }
+    fields_description = {
+        "UBI": "Universal Basic Income",
+        "num_labor_hours": "Number of labor hours per month",
+        "productivity_per_labor": "Productivity per labor hour",
+    }
+
     def __init__(self, llm: LLM, memory: Memory, simulator: Simulator, economy_client: EconomyClient):
         super().__init__("MonthPlanBlock", llm=llm, memory=memory, simulator=simulator)
         self.economy_client = economy_client
@@ -170,6 +194,12 @@ class MonthPlanBlock(Block):
         self.last_time_trigger = None
         self.time_diff = 30 * 24 * 60 * 60
         self.forward_times = 0
+
+        # configurable fields
+        self.UBI = 0
+        self.num_labor_hours = 168
+        self.productivity_per_labor = 1
+
         
     async def month_trigger(self):
         now_time = await self.simulator.get_time()
@@ -216,8 +246,8 @@ class MonthPlanBlock(Block):
                             Besides, your consumption was ${consumption:.2f}.
                         '''
             tax_prompt = f'''Your tax deduction amounted to ${tax_paid:.2f}, and the government uses the tax revenue to provide social services to all citizens.'''
-            if UBI and self.forward_times >= 96:
-                tax_prompt = f'{tax_prompt} Specifically, the government directly provides ${UBI} per capita in each month.'
+            if self.UBI and self.forward_times >= 96:
+                tax_prompt = f'{tax_prompt} Specifically, the government directly provides ${self.UBI} per capita in each month.'
             price_prompt = f'''Meanwhile, in the consumption market, the average price of essential goods is now at ${price:.2f}.'''
             job_prompt = prettify_document(job_prompt)
             obs_prompt = f'''
@@ -250,18 +280,18 @@ class MonthPlanBlock(Block):
             work_skill = await self.economy_client.get(agent_id, 'skill')
             work_propensity = await self.memory.status.get('work_propensity')
             consumption_propensity = await self.memory.status.get('consumption_propensity')
-            work_hours = work_propensity * num_labor_hours
+            work_hours = work_propensity * self.num_labor_hours
             income = await self.economy_client.get(agent_id, 'income')
             income += work_hours * work_skill
             
             wealth = await self.economy_client.get(agent_id, 'currency')
             wealth += work_hours * work_skill
             await self.economy_client.update(agent_id, 'currency', wealth)
-            await self.economy_client.add_delta_value(firm_id, 'inventory', int(work_hours*productivity_per_labor))
+            await self.economy_client.add_delta_value(firm_id, 'inventory', int(work_hours*self.productivity_per_labor))
             
-            if UBI and self.forward_times >= 96:
-                income += UBI
-                wealth += UBI
+            if self.UBI and self.forward_times >= 96:
+                income += self.UBI
+                wealth += self.UBI
 
             await self.memory.status.update('to_consumption_currency', consumption_propensity*wealth)
             
@@ -318,7 +348,7 @@ class MonthPlanBlock(Block):
                 except:
                     self.llm_error += 1
 
-            if UBI and self.forward_times >= 96 and self.forward_times % 12:
+            if self.UBI and self.forward_times >= 96 and self.forward_times % 12:
                 obs_prompt = f'''
                                 {problem_prompt} {job_prompt} {consumption_prompt} {tax_prompt} {price_prompt}
                                 Your current savings account balance is ${wealth:.2f}. Interest rates, as set by your bank, stand at {interest_rate*100:.2f}%. 

pycityagent/cityagent/blocks/utils.py

@@ -23,19 +23,6 @@ Please return the result in JSON format (Do not return any other text):
 }}
 """
 
-num_labor_hours = 168
-productivity_per_labor = 1
-max_price_inflation = 0.1
-max_wage_inflation = 0.05
-natural_interest_rate = 0.01
-target_inflation = 0.02
-natural_unemployment_rate = 0.04
-inflation_coeff, unemployment_coeff = 0.5, 0.5
-tao = 1
-period = 3
-UBI = 0
-
-
 def prettify_document(document: str) -> str:
     # Remove sequences of whitespace characters (including newlines)
     cleaned = re.sub(r"\s+", " ", document).strip()

pycityagent/cityagent/societyagent.py

@@ -22,7 +22,7 @@ logger = logging.getLogger("pycityagent")
 class PlanAndActionBlock(Block):
     """Active workflow based on needs model and plan behavior model"""
 
-    longTermDecisionBlock: MonthPlanBlock
+    monthPlanBlock: MonthPlanBlock
     needsBlock: NeedsBlock
     planBlock: PlanBlock
     mobilityBlock: MobilityBlock
@@ -50,7 +50,7 @@ class PlanAndActionBlock(Block):
         self.enable_social = enable_social
         self.enable_economy = enable_economy
         self.enable_cognition = enable_cognition
-        self.longTermDecisionBlock = MonthPlanBlock(
+        self.monthPlanBlock = MonthPlanBlock(
             llm=llm, memory=memory, simulator=simulator, economy_client=economy_client
         )
         self.needsBlock = NeedsBlock(llm=llm, memory=memory, simulator=simulator)
@@ -141,7 +141,7 @@ class PlanAndActionBlock(Block):
 
     async def forward(self):
         # Long-term decision
-        await self.longTermDecisionBlock.forward()
+        await self.monthPlanBlock.forward()
 
         # update needs
         await self.needsBlock.forward()

pycityagent/economy/econ_client.py

@@ -504,7 +504,7 @@ class EconomyClient:
 
     async def calculate_taxes_due(
         self,
-        org_id: Union[int, list[int]],
+        org_id: int,
         agent_ids: list[int],
         incomes: list[float],
         enable_redistribution: bool,
@@ -523,7 +523,6 @@ class EconomyClient:
         """
         start_time = time.time()
         log = {"req": "calculate_taxes_due", "start_time": start_time, "consumption": 0}
-        # TODO: support multiple org
         request = org_service.CalculateTaxesDueRequest(
             government_id=org_id,
             agent_ids=agent_ids,
@@ -569,7 +568,11 @@ class EconomyClient:
         )
         log["consumption"] = time.time() - start_time
         self._log_list.append(log)
-        return response.actual_consumption
+        if response.success:
+            return response.actual_consumption
+        else:
+            return -1
+        
     
     async def calculate_real_gdp(self, nbs_id: int):
         start_time = time.time()

pycityagent/environment/simulator.py

@@ -114,7 +114,7 @@ class Simulator:
                     map_file=_map_pb_path,
                     max_day=config["simulator"].get("max_day", 1000),
                     start_step=config["simulator"].get("start_step", 28800),
-                    total_step=24*60*60,
+                    total_step=config["simulator"].get("total_step", 24*60*60*365),
                     log_dir=config["simulator"].get("log_dir", "./log"),
                     min_step_time=config["simulator"].get("min_step_time", 1000),
                     sim_addr=config["simulator"].get("server", None),
@@ -363,7 +363,7 @@ class Simulator:
         log = {"req": "get_simulator_day", "start_time": start_time, "consumption": 0}
         now = await self._client.clock_service.Now({})
         now = cast(dict[str, int], now)
-        day = now["day"]
+        day = int(now["t"]//(24*60*60))
         log["consumption"] = time.time() - start_time
         self._log_list.append(log)
         return day
@@ -385,7 +385,7 @@ class Simulator:
         now = cast(dict[str, int], now)
         log["consumption"] = time.time() - start_time
         self._log_list.append(log)
-        return now["t"] % 86400
+        return now["t"]%(24*60*60)
 
     async def get_person(self, person_id: int) -> dict:
         """

pycityagent/simulation/simulation.py

@@ -1019,24 +1019,9 @@ class AgentSimulation:
             - None
         """
         try:
-            # check whether insert agents
-            simulator_day = await self._simulator.get_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_agent.remote())
-                await asyncio.gather(*insert_tasks)
-
             # step
             simulator_day = await self._simulator.get_simulator_day()
-            simulator_time = int(
-                await self._simulator.get_simulator_second_from_start_of_day()
-            )
+            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}"
             )
@@ -1113,12 +1098,20 @@ class AgentSimulation:
             monitor_task = asyncio.create_task(self._monitor_exp_status(stop_event))
 
             try:
-                end_time = (
-                    await self._simulator.get_time() + day * 24 * 3600
-                )  # type:ignore
+                end_day = self._simulator_day + day
                 while True:
-                    current_time = await self._simulator.get_time()
-                    if current_time >= end_time:  # type:ignore
+                    current_day = await self._simulator.get_simulator_day()
+                    # check whether insert agents
+                    need_insert_agents = False
+                    if current_day > self._simulator_day:
+                        self._simulator_day = current_day
+                    # if need_insert_agents:
+                    #     insert_tasks = []
+                    #     for group in self._groups.values():
+                    #         insert_tasks.append(group.insert_agent.remote())
+                    #     await asyncio.gather(*insert_tasks)
+
+                    if current_day >= end_day:  # type:ignore
                         break
                     (
                         llm_log_list,

{pycityagent-2.0.0a82.dist-info → pycityagent-2.0.0a84.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pycityagent
-Version: 2.0.0a82
+Version: 2.0.0a84
 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.2.3
+Requires-Dist: pycityproto>=2.2.4
 Requires-Dist: requests>=2.32.3
 Requires-Dist: Shapely>=2.0.6
 Requires-Dist: PyYAML>=6.0.2

{pycityagent-2.0.0a82.dist-info → pycityagent-2.0.0a84.dist-info}/RECORD

@@ -1,10 +1,10 @@
-pycityagent/pycityagent-sim,sha256=MmiGNhZgGjXYLJ2EYTGMhfGAZU8TnU7ORsJ6kdtzjDs,36973378
+pycityagent/pycityagent-sim,sha256=Ax6cjHjT8VcT5t07VboL_Ruor2eXSdSEml4Jvv-L5dQ,36972594
 pycityagent/__init__.py,sha256=PUKWTXc-xdMG7px8oTNclodsILUgypANj2Z647sY63k,808
 pycityagent/pycityagent-ui,sha256=Ur95yZygIaZ5l_CDqP9394M5GQ66iV5PkcNPYFWqzvk,41225346
 pycityagent/metrics/mlflow_client.py,sha256=-iyh4BPVnBkluhmfucUzibCUnBX2iftkz4tVJJVxwHw,6958
 pycityagent/metrics/__init__.py,sha256=X08PaBbGVAd7_PRGLREXWxaqm7nS82WBQpD1zvQzcqc,128
 pycityagent/economy/__init__.py,sha256=aonY4WHnx-6EGJ4WKrx4S-2jAkYNLtqUA04jp6q8B7w,75
-pycityagent/economy/econ_client.py,sha256=jDF_KAqFwM-vrFNRHiinYJEPEbzfaU2gRp_hIMk27O4,29208
+pycityagent/economy/econ_client.py,sha256=NUzrFzl0EL4UkMscGRRSu1JQmeCPwIkPvTbJDRefUcQ,29231
 pycityagent/tools/__init__.py,sha256=y7sMVMHf0AbivlczM2h-kr7mkgXK-WAx3S9BXLXkWvw,235
 pycityagent/tools/tool.py,sha256=4ZJSHbNM8dfAVwZEw8T0a2_9OuPsPQpKSVL4WxZVBUc,9022
 pycityagent/llm/llmconfig.py,sha256=6AqCMV4B_JqBD2mb98bLGzpUdlOCnziQKae-Hhxxp-E,469
@@ -21,7 +21,7 @@ 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=_dmTQDVaKHpmAljKxQBFkVk9FDSBJg_PA5PMyphQ5D4,49525
+pycityagent/simulation/simulation.py,sha256=08xtIVwmO35r5XbUW9nMDo9rL_6mtDtjWbeXnUyNR6c,49340
 pycityagent/simulation/__init__.py,sha256=u1WpgwVxPboXWMxrUQKMXJNmTKQYAeCaqZv9HmSxESY,118
 pycityagent/simulation/agentgroup.py,sha256=oXo2iRUThh_96JhXHMufT8_BPx0PrlwqbMpiVqK_viA,36957
 pycityagent/simulation/storage/pg.py,sha256=xRshSOGttW-p0re0fNBOjOpb-nQ5msIE2LsdT79_E_Y,8425
@@ -46,7 +46,7 @@ pycityagent/workflow/prompt.py,sha256=rzenP4EFGxbWE1aq-x2036b6umKvi5cQx2xtWULwgI
 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=I5xDg-1Cn32qvKN7X_6SklA_d_iPFS9THsZqbZreJDU,22606
+pycityagent/environment/simulator.py,sha256=qiqeRQDm7cprFJhAkxtdBNAvohiGGUaNIPGyFXmPdZU,22667
 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
@@ -73,7 +73,7 @@ pycityagent/cityagent/__init__.py,sha256=gcBQ-a50XegFtjigQ7xDXRBZrywBKqifiQFSRnE
 pycityagent/cityagent/firmagent.py,sha256=vZr7kdjnxcCZ5qX7hmUIYuQQWd44GcRPbdi76WGSFy4,3760
 pycityagent/cityagent/nbsagent.py,sha256=knSaQbCNkWi7bZjwwEr_hTKj44_q67eHif6HI3W9i1M,4558
 pycityagent/cityagent/initial.py,sha256=0DSOWnVVknMw6xoJWfdZUFBH3yti8y800wnkXXCocxY,6194
-pycityagent/cityagent/societyagent.py,sha256=dY8coUMtrTrcATCYDdI0MvVt42YXSyP-ZWi24H9xg7o,20090
+pycityagent/cityagent/societyagent.py,sha256=1c6k3RgxQ7AAYCiBXwiSZLDkCDMgCrBzNF6vi6lK2Yc,20069
 pycityagent/cityagent/message_intercept.py,sha256=dyT1G-nMxKb2prhgtyFFHFz593qBrkk5DnHsHvG1OIc,4418
 pycityagent/cityagent/governmentagent.py,sha256=XIyggG83FWUTZdOuoqc6ClCP3hhfkxNmtYRu9TFo0dU,3063
 pycityagent/cityagent/blocks/dispatcher.py,sha256=U5BPeUrjrTyDaznYfT6YUJIW8vfKVRDF4EO0oOn6Td4,2886
@@ -81,17 +81,17 @@ pycityagent/cityagent/blocks/needs_block.py,sha256=NYKrGDoYCuXoupMNMuSNhx4Ci1paC
 pycityagent/cityagent/blocks/cognition_block.py,sha256=yzjB0D_95vytpa5xiVdmTSpGp8H9HXcjWzzFN0OpP0k,15398
 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=1yHUdCSAzvvhdGFzMfSM_wtbW_3D6YeYSNlVV3yQqsA,19083
-pycityagent/cityagent/blocks/utils.py,sha256=BVOTtZC8dJIc0eGGNmL0LQ_WnMfXr54q1gyrrDwRn-Y,2079
+pycityagent/cityagent/blocks/economy_block.py,sha256=SSqb2qX5cVQ1zM8hyxvhnyTwgGwUrV2YViKtGRXmJhQ,20079
+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=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.0a82.dist-info/RECORD,,
-pycityagent-2.0.0a82.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
-pycityagent-2.0.0a82.dist-info/WHEEL,sha256=ezfKMaDztqf77C8lvQ0NCnZxkTaOaKLprqJ8q932MhU,109
-pycityagent-2.0.0a82.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
-pycityagent-2.0.0a82.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
-pycityagent-2.0.0a82.dist-info/METADATA,sha256=a48d_5hO9dLaPc6fmDJ4N-T83VWIwdmEJQFGMk1rlxw,9110
+pycityagent-2.0.0a84.dist-info/RECORD,,
+pycityagent-2.0.0a84.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
+pycityagent-2.0.0a84.dist-info/WHEEL,sha256=ezfKMaDztqf77C8lvQ0NCnZxkTaOaKLprqJ8q932MhU,109
+pycityagent-2.0.0a84.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
+pycityagent-2.0.0a84.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
+pycityagent-2.0.0a84.dist-info/METADATA,sha256=wK7JDsxgO5pTlH_YLtftS9-nmD9T97_6-YZp8zru9dA,9110