pycityagent 2.0.0a82__cp39-cp39-macosx_11_0_arm64.whl → 2.0.0a83__cp39-cp39-macosx_11_0_arm64.whl

pycityagent/cityagent/blocks/economy_block.py

@@ -163,6 +163,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 +186,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 +238,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 +272,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 +340,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-2.0.0a82.dist-info → pycityagent-2.0.0a83.dist-info}/METADATA

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

@@ -1,3 +1,9 @@
+pycityagent-2.0.0a83.dist-info/RECORD,,
+pycityagent-2.0.0a83.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
+pycityagent-2.0.0a83.dist-info/WHEEL,sha256=md3JO_ifs5j508p3TDNMgtQVtnQblpGEt_Wo4W56l8Y,107
+pycityagent-2.0.0a83.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
+pycityagent-2.0.0a83.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
+pycityagent-2.0.0a83.dist-info/METADATA,sha256=XmwytGxXKWAS-M9uFrfJ3Csu1jkQhXN1Po0ZBUyc5nI,9110
 pycityagent/pycityagent-sim,sha256=MmiGNhZgGjXYLJ2EYTGMhfGAZU8TnU7ORsJ6kdtzjDs,36973378
 pycityagent/__init__.py,sha256=PUKWTXc-xdMG7px8oTNclodsILUgypANj2Z647sY63k,808
 pycityagent/pycityagent-ui,sha256=Ur95yZygIaZ5l_CDqP9394M5GQ66iV5PkcNPYFWqzvk,41225346
@@ -73,7 +79,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 +87,11 @@ 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=qu7OlQvFIL9m6jv7IHLXBQVHjC8noSuPB6Gd31Thjvc,19679
+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=md3JO_ifs5j508p3TDNMgtQVtnQblpGEt_Wo4W56l8Y,107
-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