pycityagent 2.0.0a85__cp311-cp311-macosx_11_0_arm64.whl → 2.0.0a88__cp311-cp311-macosx_11_0_arm64.whl

pycityagent/cityagent/blocks/economy_block.py

@@ -112,14 +112,6 @@ 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, 
@@ -175,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):
@@ -192,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()
@@ -262,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):
@@ -281,8 +275,8 @@ class MonthPlanBlock(Block):
             work_propensity = await self.memory.status.get('work_propensity')
             consumption_propensity = await self.memory.status.get('consumption_propensity')
             work_hours = work_propensity * self.num_labor_hours
-            income = await self.economy_client.get(agent_id, 'income')
-            income += work_hours * work_skill
+            # 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
@@ -348,7 +342,7 @@ class MonthPlanBlock(Block):
                 except:
                     self.llm_error += 1
 
-            if self.UBI and self.forward_times >= 96 and self.forward_times % 12:
+            if self.UBI and self.forward_times >= 96 and self.forward_times % 12 == 0:
                 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}%. 
@@ -357,4 +351,5 @@ class MonthPlanBlock(Block):
                 obs_prompt = prettify_document(obs_prompt)
                 content = await self.llm.atext_request([{'role': 'user', 'content': obs_prompt}], timeout=300)
                 await self.memory.status.update('ubi_opinion', [content], mode='merge')
-            
+
+            self.forward_times += 1

pycityagent/cityagent/memory_config.py

@@ -343,5 +343,6 @@ def memory_config_nbs():
         "price": (float, float(np.mean(agent_skills))),
         "employees": (list, []),
         "employees_agent_id": (list, []),
+        "forward_times": (int, 0),
     }
     return EXTRA_ATTRIBUTES, {}, {}

pycityagent/cityagent/metrics.py

@@ -1,5 +1,5 @@
 import pycityproto.city.economy.v2.economy_pb2 as economyv2
-from pycityagent.cityagent import SocietyAgent
+from pycityagent.cityagent import SocietyAgent, NBSAgent
 
 async def mobility_metric(simulation):
     # 使用函数属性来存储计数
@@ -22,20 +22,31 @@ async def mobility_metric(simulation):
 async def economy_metric(simulation):
     # 使用函数属性来存储计数
     if not hasattr(economy_metric, 'step_count'):
-        economy_metric.step_count = 0
+        economy_metric.nbs_id = None
+        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
+        nbs_uuids = await simulation.filter(types=[NBSAgent])
+        economy_metric.nbs_uuid = nbs_uuids[0]
     
-    nbs_id = await simulation.economy_client.get_org_entity_ids(economyv2.ORG_TYPE_NBS)
-    nbs_id = nbs_id[0]
     try:
         real_gdp = await simulation.economy_client.get(nbs_id, 'real_gdp')
     except:
         real_gdp = []
     if len(real_gdp) > 0:
         real_gdp = real_gdp[0]
-        await simulation.mlflow_client.log_metric(key="real_gdp", value=real_gdp, step=economy_metric.step_count)
+        forward_times_info = await simulation.gather("forward_times", [economy_metric.nbs_uuid])
+        step_count = 0
+        for group_gather in forward_times_info:
+            for agent_uuid, forward_times in group_gather.items():
+                if agent_uuid == economy_metric.nbs_uuid:
+                    step_count = forward_times
+        await simulation.mlflow_client.log_metric(key="real_gdp", value=real_gdp, step=step_count)
         other_metrics = ['prices', 'working_hours', 'depression', 'consumption_currency', 'income_currency']
         other_metrics_names = ['price', 'working_hours', 'depression', 'consumption', 'income']
         for metric, metric_name in zip(other_metrics, other_metrics_names):
             metric_value = (await simulation.economy_client.get(nbs_id, metric))[-1]
-            await simulation.mlflow_client.log_metric(key=metric_name, value=metric_value, step=economy_metric.step_count)
-    economy_metric.step_count += 1
+            await simulation.mlflow_client.log_metric(key=metric_name, value=metric_value, step=step_count)

pycityagent/cityagent/nbsagent.py

@@ -115,4 +115,6 @@ class NBSAgent(InstitutionAgent):
             await self.economy_client.update(
                 self._agent_id, "income_currency", [income_currency], mode="merge"
             )
-            print("nbs forward end")
+            print("nbs forward end")
+            self.forward_times += 1
+            await self.memory.status.update("forward_times", self.forward_times)

pycityagent/environment/simulator.py

@@ -128,7 +128,8 @@ class Simulator:
                     min_step_time=config["simulator"].get("min_step_time", 1000),
                     sim_addr=config["simulator"].get("server", None),
                 )
-                self.server_addr = sim_env.sim_addr
+                primary_node_ip = config["simulator"].get("ad", "http://localhost")
+                self.server_addr = primary_node_ip.rstrip("/")+f":{sim_env.sim_port}"
                 config["simulator"]["server"] = self.server_addr
                 config["simulator"]["_server_activated"] = True
                 # using local client

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.0a85.dist-info → pycityagent-2.0.0a88.dist-info}/METADATA

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

@@ -1,9 +1,9 @@
-pycityagent-2.0.0a85.dist-info/RECORD,,
-pycityagent-2.0.0a85.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
-pycityagent-2.0.0a85.dist-info/WHEEL,sha256=NW1RskY9zow1Y68W-gXg0oZyBRAugI1JHywIzAIai5o,109
-pycityagent-2.0.0a85.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
-pycityagent-2.0.0a85.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
-pycityagent-2.0.0a85.dist-info/METADATA,sha256=KKmALYa8DummI6EtxRIqeGaH5Fg_lS4yElcWAOdV2wU,9110
+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=NW1RskY9zow1Y68W-gXg0oZyBRAugI1JHywIzAIai5o,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
@@ -15,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
@@ -52,7 +52,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=sbM0FMjR_q2mssbpMI7Lx9QI2iFj1Hbzg48fbRMd4tY,23206
+pycityagent/environment/simulator.py,sha256=ubOsoeyo81LZKfOSeS4eGrpn-7lC-hrdCBbcLH9NbK8,23324
 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
@@ -72,12 +72,12 @@ 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=yXZ4uRXARjDAvPKyquut7YWs363nDcIV0J1KQgYacZE,2169
-pycityagent/cityagent/memory_config.py,sha256=T21XdQ-um16LMMirLO2W14LcbJp3afnYF-AsUZKfxWM,11923
+pycityagent/cityagent/metrics.py,sha256=SdCxEuO-wgsPGo3H6xywnOAfP5Lre-bc7HNAQ-n53mA,2687
+pycityagent/cityagent/memory_config.py,sha256=lCySjh8jpE3Sj-_XTCPizxJN8rjfcYD54sed7wi2EDw,11958
 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=knSaQbCNkWi7bZjwwEr_hTKj44_q67eHif6HI3W9i1M,4558
+pycityagent/cityagent/nbsagent.py,sha256=rrzL-Ep-gWB8kvoPA8nBokY1zoEZGpyQjP9oy7ZuVL4,4676
 pycityagent/cityagent/initial.py,sha256=0DSOWnVVknMw6xoJWfdZUFBH3yti8y800wnkXXCocxY,6194
 pycityagent/cityagent/societyagent.py,sha256=1c6k3RgxQ7AAYCiBXwiSZLDkCDMgCrBzNF6vi6lK2Yc,20069
 pycityagent/cityagent/message_intercept.py,sha256=dyT1G-nMxKb2prhgtyFFHFz593qBrkk5DnHsHvG1OIc,4418
@@ -87,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=SSqb2qX5cVQ1zM8hyxvhnyTwgGwUrV2YViKtGRXmJhQ,20079
+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