pycityagent 2.0.0a87__cp310-cp310-macosx_11_0_arm64.whl → 2.0.0a88__cp310-cp310-macosx_11_0_arm64.whl

pycityagent/cityagent/blocks/economy_block.py

@@ -167,16 +167,19 @@ class MonthPlanBlock(Block):
         "UBI",
         "num_labor_hours",
         "productivity_per_labor",
+        "time_diff"
     ]
     default_values = {
         "UBI": 0,
         "num_labor_hours": 168,
         "productivity_per_labor": 1,
+        "time_diff": 30 * 24 * 60 * 60
     }
     fields_description = {
         "UBI": "Universal Basic Income",
         "num_labor_hours": "Number of labor hours per month",
         "productivity_per_labor": "Productivity per labor hour",
+        "time_diff": "Time difference between two triggers"
     }
 
     def __init__(self, llm: LLM, memory: Memory, simulator: Simulator, economy_client: EconomyClient):
@@ -184,14 +187,13 @@ class MonthPlanBlock(Block):
         self.economy_client = economy_client
         self.llm_error = 0
         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
-
+        self.time_diff = 30 * 24 * 60 * 60
         
     async def month_trigger(self):
         now_time = await self.simulator.get_time()
@@ -254,11 +256,11 @@ class MonthPlanBlock(Block):
                             Any other output words are NOT allowed.
                         '''
             obs_prompt = prettify_document(obs_prompt)
-            await self.memory.status.update('dialog_queue', [{'role': 'user', 'content': obs_prompt}], mode='merge')
-            dialog_queue = await self.memory.status.get('dialog_queue')
-            content = await self.llm.atext_request(list(dialog_queue), timeout=300)
-            await self.memory.status.update('dialog_queue', [{'role': 'assistant', 'content': content}], mode='merge')
             try:
+                await self.memory.status.update('dialog_queue', [{'role': 'user', 'content': obs_prompt}], mode='merge')
+                dialog_queue = await self.memory.status.get('dialog_queue')
+                content = await self.llm.atext_request(list(dialog_queue), timeout=300)
+                await self.memory.status.update('dialog_queue', [{'role': 'assistant', 'content': content}], mode='merge')
                 propensity_dict = extract_dict_from_string(content)[0]
                 work_propensity, consumption_propensity = propensity_dict['work'], propensity_dict['consumption']
                 if isinstance(work_propensity, numbers.Number) and isinstance(consumption_propensity, numbers.Number):

pycityagent/llm/llm.py

@@ -203,7 +203,7 @@ class LLM:
         frequency_penalty: Optional[float] = None,
         presence_penalty: Optional[float] = None,
         timeout: int = 300,
-        retries=3,
+        retries=10,
         tools: Optional[list[dict[str, Any]]] = None,
         tool_choice: Optional[dict[str, Any]] = None,
     ):

{pycityagent-2.0.0a87.dist-info → pycityagent-2.0.0a88.dist-info}/METADATA

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

@@ -1,3 +1,9 @@
+pycityagent-2.0.0a88.dist-info/RECORD,,
+pycityagent-2.0.0a88.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
+pycityagent-2.0.0a88.dist-info/WHEEL,sha256=ezfKMaDztqf77C8lvQ0NCnZxkTaOaKLprqJ8q932MhU,109
+pycityagent-2.0.0a88.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
+pycityagent-2.0.0a88.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
+pycityagent-2.0.0a88.dist-info/METADATA,sha256=RX-Ot6Yyl_W0-bl9cJur9nQVLlAoI3WQ2YKiz37qTwk,9110
 pycityagent/pycityagent-sim,sha256=Ax6cjHjT8VcT5t07VboL_Ruor2eXSdSEml4Jvv-L5dQ,36972594
 pycityagent/__init__.py,sha256=PUKWTXc-xdMG7px8oTNclodsILUgypANj2Z647sY63k,808
 pycityagent/pycityagent-ui,sha256=Ur95yZygIaZ5l_CDqP9394M5GQ66iV5PkcNPYFWqzvk,41225346
@@ -9,7 +15,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=A1Q-dKEXHJKhBnElI7Ci6eIK-A7I-UZNQxC_hEgEa-4,20018
+pycityagent/llm/llm.py,sha256=vMw9AVftrsmbGkhRIwJ7jftFWpzTofhfQmu7TazDCaQ,20019
 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
@@ -81,7 +87,7 @@ 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=ZhNzhkXxzFidQQRLS5jNv5msHSdoASouKBqvAzecJU4,19709
+pycityagent/cityagent/blocks/economy_block.py,sha256=l47x2Iq15Rjj9WsH3p398dtpcejat4aCkC3X160xBlE,19843
 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
@@ -89,9 +95,3 @@ pycityagent/cityagent/blocks/mobility_block.py,sha256=qkRiV0nkGOUUoo9lGIjAFE_Hl0
 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.0a87.dist-info/RECORD,,
-pycityagent-2.0.0a87.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
-pycityagent-2.0.0a87.dist-info/WHEEL,sha256=ezfKMaDztqf77C8lvQ0NCnZxkTaOaKLprqJ8q932MhU,109
-pycityagent-2.0.0a87.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
-pycityagent-2.0.0a87.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
-pycityagent-2.0.0a87.dist-info/METADATA,sha256=nhB__BcNLDfb1PCA7Wjb5GWYo7mRegc1KPQFypOERlk,9110