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

pycityagent/agent/agent.py

@@ -331,6 +331,8 @@ class InstitutionAgent(Agent):
                 working_hours = await _status.get("working_hours", [])
                 employees = await _status.get("employees", [])
                 citizens = await _status.get("citizens", [])
+                demand = await _status.get("demand", 0)
+                sales = await _status.get("sales", 0)
                 await self._economy_client.add_orgs(
                     {
                         "id": _id,
@@ -354,6 +356,8 @@ class InstitutionAgent(Agent):
                         "working_hours": working_hours,
                         "employees": employees,
                         "citizens": citizens,
+                        "demand": demand,
+                        "sales": sales,
                     }
                 )
             except Exception as e:

pycityagent/cityagent/bankagent.py

@@ -81,12 +81,12 @@ class BankAgent(InstitutionAgent):
 
     async def forward(self):
         if await self.month_trigger():
+            print("bank forward")
             interest_rate = await self.economy_client.get(self._agent_id, 'interest_rate')
             citizens = await self.economy_client.get(self._agent_id, 'citizens')
             for citizen in citizens:
-                wealth = self.economy_client.get(citizen, 'currency')
+                wealth = await self.economy_client.get(citizen, 'currency')
                 await self.economy_client.add_delta_value(citizen, 'currency', interest_rate*wealth)
-                
             nbs_id = await self.economy_client.get_org_entity_ids(economyv2.ORG_TYPE_NBS)
             nbs_id = nbs_id[0]
             prices = await self.economy_client.get(nbs_id, 'prices')
@@ -101,4 +101,5 @@ class BankAgent(InstitutionAgent):
                 interest_rate = natural_interest_rate + target_inflation + inflation_coeff * (avg_inflation - target_inflation)
             else:
                 interest_rate = natural_interest_rate + target_inflation
-            await self.economy_client.update(self._agent_id, 'interest_rate', interest_rate)
+            await self.economy_client.update(self._agent_id, 'interest_rate', interest_rate)
+            print("bank forward end")

pycityagent/cityagent/blocks/cognition_block.py

@@ -36,7 +36,7 @@ class CognitionBlock(Block):
     def __init__(self, llm: LLM, memory: Memory, simulator: Simulator):
         super().__init__("CognitionBlock", llm=llm, memory=memory, simulator=simulator)
         self.top_k = 20
-
+        self.last_check_time = 0
     async def set_status(self, status):
         for key in status:
             await self.memory.status.update(key, status[key])
@@ -75,7 +75,7 @@ class CognitionBlock(Block):
             In the following 21 words, I have chosen {emotion_types} to represent your current status:
             Joy, Distress, Resentment, Pity, Hope, Fear, Satisfaction, Relief, Disappointment, Pride, Admiration, Shame, Reproach, Liking, Disliking, Gratitude, Anger, Gratification, Remorse, Love, Hate.
             """
-            incident_str = await self.memory.stream.search_today(top_k=self.top_k)
+            incident_str = await self.memory.stream.search(query=topic, top_k=self.top_k)
             if incident_str:
                 incident_prompt = "Today, these incidents happened:"
                 incident_prompt += incident_str
@@ -202,17 +202,22 @@ class CognitionBlock(Block):
 
         return thought
 
-    async def end_of_day(self):
-        """Cognition - end of day workflow"""
+    async def cross_day(self):
+        """Cognition - cross day workflow"""
         time = await self.simulator.get_simulator_second_from_start_of_day()
-        if time >= 86400 - 10 * 60:
+        if self.last_check_time == 0:
+            self.last_check_time = time
+            return False
+        if time < self.last_check_time:
+            self.last_check_time = time
             return True
+        self.last_check_time = time
         return False
 
     async def forward(self):
         """Cognition workflow: Daily update"""
         # cognition update: thought and attitude
-        if await self.end_of_day():
+        if await self.cross_day():
             await self.thought_update()
             await self.attitude_update()
 

pycityagent/cityagent/firmagent.py

@@ -66,12 +66,14 @@ class FirmAgent(InstitutionAgent):
 
     async def forward(self):
         if await self.month_trigger():
+            print("firm forward")
             employees = await self.economy_client.get(self._agent_id, "employees")
             total_demand = await self.economy_client.get(self._agent_id, "demand")
             goods_consumption = await self.economy_client.get(self._agent_id, "sales")
             last_inventory = goods_consumption + await self.economy_client.get(self._agent_id, "inventory")
             max_change_rate = (total_demand - last_inventory) / (max(total_demand, last_inventory) + 1e-8)
-            skills = np.array(await self.economy_client.get(employees, "skill"))
+            skills = await self.economy_client.get(employees, "skill")
+            skills = np.array(skills)
             skill_change_ratio = np.random.uniform(0, max_change_rate*self.max_wage_inflation)
             await self.economy_client.update(employees, "skill", list(np.maximum(skills*(1 + skill_change_ratio), 1)))
             price = await self.economy_client.get(self._agent_id, "price")
@@ -89,6 +91,6 @@ class FirmAgent(InstitutionAgent):
                     1,
                 ),
             )
-                
             await self.economy_client.update(self._agent_id, 'demand', 0)
             await self.economy_client.update(self._agent_id, 'sales', 0)
+            print("firm forward end")

pycityagent/cityagent/initial.py

@@ -141,5 +141,7 @@ async def bind_agent_info(simulation):
         await simulation.economy_update(uid2agent[government_uuid], "citizens", citizen_agent_ids)
     for bank_uuid in bank_uuids:
         await simulation.economy_update(uid2agent[bank_uuid], "citizens", citizen_agent_ids)
+    for nbs_uuid in nbs_uuids:
+        await simulation.economy_update(uid2agent[nbs_uuid], "citizens", citizen_agent_ids)
     logger.info("Agent info binding completed!")
 

pycityagent/cityagent/memory_config.py

@@ -235,6 +235,8 @@ def memory_config_firm():
         "real_gdp": (list, []),
         "unemployment": (list, []),
         "wages": (list, []),
+        "demand": (int, 0),
+        "sales": (int, 0),
         "prices": (list, [float(np.mean(agent_skills))]),
         "working_hours": (list, []),
         "depression": (list, []),

pycityagent/cityagent/nbsagent.py

@@ -70,26 +70,37 @@ class NBSAgent(InstitutionAgent):
 
     async def forward(self):
         if await self.month_trigger():
-            await self.economy_client.calculate_real_gdp()
+            print("nbs forward")
+            await self.economy_client.calculate_real_gdp(self._agent_id)
             citizens_uuid = await self.memory.status.get("citizens")
             citizens = await self.economy_client.get(self._agent_id, "citizens")
             work_propensity = await self.gather_messages(citizens_uuid, "work_propensity")
-            working_hours = np.mean(work_propensity) * self.num_labor_hours
+            if sum(work_propensity) == 0.0:
+                working_hours = 0.0
+            else:
+                working_hours = np.mean(work_propensity) * self.num_labor_hours
             await self.economy_client.update(
                 self._agent_id, "working_hours", [working_hours], mode="merge"
             )
             firms_id = await self.economy_client.get_org_entity_ids(economyv2.ORG_TYPE_FIRM)
             prices = await self.economy_client.get(firms_id, "price")
+
             await self.economy_client.update(
                 self._agent_id, "prices", [float(np.mean(prices))], mode="merge"
             )
             depression = await self.gather_messages(citizens_uuid, "depression")
-            depression = np.mean(depression)
+            if sum(depression) == 0.0:
+                depression = 0.0
+            else:
+                depression = np.mean(depression)
             await self.economy_client.update(
                 self._agent_id, "depression", [depression], mode="merge"
             )
             consumption_currency = await self.economy_client.get(citizens, "consumption")
-            consumption_currency = np.mean(consumption_currency)
+            if sum(consumption_currency) == 0.0:
+                consumption_currency = 0.0
+            else:
+                consumption_currency = np.mean(consumption_currency)
             await self.economy_client.update(
                 self._agent_id,
                 "consumption_currency",
@@ -97,7 +108,11 @@ class NBSAgent(InstitutionAgent):
                 mode="merge",
             )
             income_currency = await self.economy_client.get(citizens, "income")
-            income_currency = np.mean(income_currency)
+            if sum(income_currency) == 0.0:
+                income_currency = 0.0
+            else:
+                income_currency = np.mean(income_currency)
             await self.economy_client.update(
                 self._agent_id, "income_currency", [income_currency], mode="merge"
-            )
+            )
+            print("nbs forward end")

pycityagent/economy/econ_client.py

@@ -2,6 +2,7 @@ import asyncio
 import logging
 import re
 import time
+from collections.abc import Sequence
 from typing import Any, Literal, Union
 
 import grpc
@@ -27,11 +28,17 @@ def _snake_to_pascal(snake_str):
             _res = _res.replace(_word, _word.upper())
     return _res
 
+
 def camel_to_snake(d):
     if not isinstance(d, dict):
         return d
-    return {re.sub('([a-z0-9])([A-Z])', r'\1_\2', k).lower(): camel_to_snake(v) if isinstance(v, dict) else v 
-            for k, v in d.items()}
+    return {
+        re.sub("([a-z0-9])([A-Z])", r"\1_\2", k).lower(): (
+            camel_to_snake(v) if isinstance(v, dict) else v
+        )
+        for k, v in d.items()
+    }
+
 
 def _create_aio_channel(server_address: str, secure: bool = False) -> grpc.aio.Channel:
     """
@@ -104,7 +111,7 @@ class EconomyClient:
 
     def get_log_list(self):
         return self._log_list
-    
+
     def clear_log_list(self):
         self._log_list = []
 
@@ -120,7 +127,7 @@ class EconomyClient:
         return state
 
     def __setstate__(self, state):
-        """ 
+        """
         Restore instance attributes (i.e., filename and mode) from the
         unpickled state dictionary.
         """
@@ -134,7 +141,7 @@ class EconomyClient:
         Get the ids of agents and orgs
         """
         return self._agent_ids, self._org_ids
-    
+
     async def set_ids(self, agent_ids: set[int], org_ids: set[int]):
         """
         Set the ids of agents and orgs
@@ -142,12 +149,12 @@ class EconomyClient:
         self._agent_ids = agent_ids
         self._org_ids = org_ids
 
-    async def get_agent(self, id: int) -> economyv2.Agent:
+    async def get_agent(self, id: Union[list[int], int]) -> economyv2.Agent:
         """
         Get agent by id
 
         - **Args**:
-            - `id` (`int`): The id of the agent.
+            - `id` (`Union[list[int], int]`): The id of the agent.
 
         - **Returns**:
             - `economyv2.Agent`: The agent object.
@@ -158,22 +165,35 @@ class EconomyClient:
             "start_time": start_time,
             "consumption": 0
         }
-        agent = await self._aio_stub.GetAgent(
-            org_service.GetAgentRequest(
-                agent_id=id
+        if isinstance(id, list):
+            agents = await self._aio_stub.BatchGet(
+                org_service.BatchGetRequest(
+                    ids=id,
+                    type="agent"
+                )
             )
-        )
-        agent_dict = MessageToDict(agent)["agent"]
-        log["consumption"] = time.time() - start_time
-        self._log_list.append(log)
-        return camel_to_snake(agent_dict)
+            agents = MessageToDict(agents)["agents"]
+            agent_dicts = [camel_to_snake(agent) for agent in agents]
+            log["consumption"] = time.time() - start_time
+            self._log_list.append(log)
+            return agent_dicts
+        else:
+            agent = await self._aio_stub.GetAgent(
+                org_service.GetAgentRequest(
+                    agent_id=id
+                )
+            )
+            agent_dict = MessageToDict(agent)["agent"]
+            log["consumption"] = time.time() - start_time
+            self._log_list.append(log)
+            return camel_to_snake(agent_dict)
 
-    async def get_org(self, id: int) -> economyv2.Org:
+    async def get_org(self, id: Union[list[int], int]) -> economyv2.Org:
         """
         Get org by id
 
         - **Args**:
-            - `id` (`int`): The id of the org.
+            - `id` (`Union[list[int], int]`): The id of the org.
 
         - **Returns**:
             - `economyv2.Org`: The org object.
@@ -184,26 +204,39 @@ class EconomyClient:
             "start_time": start_time,
             "consumption": 0
         }
-        org = await self._aio_stub.GetOrg(
-            org_service.GetOrgRequest(
-                org_id=id
+        if isinstance(id, list):
+            orgs = await self._aio_stub.BatchGet(
+                org_service.BatchGetRequest(
+                    ids=id,
+                    type="org"
+                )
             )
-        )
-        org_dict = MessageToDict(org)["org"]
-        log["consumption"] = time.time() - start_time
-        self._log_list.append(log)
-        return camel_to_snake(org_dict)
+            orgs = MessageToDict(orgs)["orgs"]
+            org_dicts = [camel_to_snake(org) for org in orgs]
+            log["consumption"] = time.time() - start_time
+            self._log_list.append(log)
+            return org_dicts
+        else:
+            org = await self._aio_stub.GetOrg(
+                org_service.GetOrgRequest(
+                    org_id=id
+                )
+            )
+            org_dict = MessageToDict(org)["org"]
+            log["consumption"] = time.time() - start_time
+            self._log_list.append(log)
+            return camel_to_snake(org_dict)
 
     async def get(
         self,
-        id: int,
+        id: Union[list[int], int],
         key: str,
     ) -> Any:
         """
         Get specific value
 
         - **Args**:
-            - `id` (`int`): The id of `Org` or `Agent`.
+            - `id` (`Union[list[int], int]`): The id of `Org` or `Agent`.
             - `key` (`str`): The attribute to fetch.
 
         - **Returns**:
@@ -215,30 +248,73 @@ class EconomyClient:
             "start_time": start_time,
             "consumption": 0
         }
-        if id not in self._agent_ids and id not in self._org_ids:
-            raise ValueError(f"Invalid id {id}, this id does not exist!")
-        request_type = "Org" if id in self._org_ids else "Agent"
-        if request_type == "Org":
-            response = await self.get_org(id)
+        if isinstance(id, list):
+            requests = "Org" if id[0] in self._org_ids else "Agent"
+            if requests == "Org":
+                response = await self.get_org(id)
+            else:
+                response = await self.get_agent(id)
+            results = []
+            for res in response:
+                results.append(res[key])
+            log["consumption"] = time.time() - start_time
+            self._log_list.append(log)
+            return results
         else:
-            response = await self.get_agent(id)
-        log["consumption"] = time.time() - start_time
-        self._log_list.append(log)
-        return response[key]
+            if id not in self._agent_ids and id not in self._org_ids:
+                raise ValueError(f"Invalid id {id}, this id does not exist!")
+            request_type = "Org" if id in self._org_ids else "Agent"
+            if request_type == "Org":
+                response = await self.get_org(id)
+            else:
+                response = await self.get_agent(id)
+            log["consumption"] = time.time() - start_time
+            self._log_list.append(log)
+            return response[key]
+        
+    def _merge(self, original_value, key, value):
+        try:
+            orig_value = original_value[key]
+            _orig_type = type(orig_value)
+            _new_type = type(value)
+        except:
+            type_ = type(value)
+            _orig_type = type_
+            _new_type = type_
+            orig_value = type_()
+        if _orig_type != _new_type:
+            logger.debug(
+                f"Inconsistent type of original value {_orig_type.__name__} and to-update value {_new_type.__name__}"
+            )
+        else:
+            if isinstance(orig_value, set):
+                orig_value.update(set(value))
+                original_value[key] = orig_value
+            elif isinstance(orig_value, dict):
+                orig_value.update(dict(value))
+                original_value[key] = orig_value
+            elif isinstance(orig_value, list):
+                orig_value.extend(list(value))
+                original_value[key] = orig_value
+            else:
+                logger.warning(
+                    f"Type of {type(orig_value)} does not support mode `merge`, using `replace` instead!"
+                )
 
     async def update(
         self,
-        id: int,
+        id: Union[list[int], int],
         key: str,
-        value: Any,
+        value: Union[Any, list[Any]],
         mode: Union[Literal["replace"], Literal["merge"]] = "replace",
     ) -> Any:
         """
         Update key-value pair
 
         - **Args**:
-            - `id` (`int`): The id of `Org` or `Agent`.
+            - `id` (`Union[list[int], int]`): The id of `Org` or `Agent`.
             - `key` (`str`): The attribute to update.
+            - `value` (`Union[Any, list[Any]]`): The value to update.
             - `mode` (Union[Literal["replace"], Literal["merge"]], optional): Update mode. Defaults to "replace".
 
         - **Returns**:
@@ -250,51 +326,78 @@ class EconomyClient:
             "start_time": start_time,
             "consumption": 0
         }
-        if id not in self._agent_ids and id not in self._org_ids:
-            raise ValueError(f"Invalid id {id}, this id does not exist!")
-        request_type = "Org" if id in self._org_ids else "Agent"
+        if isinstance(id, list):
+            if not isinstance(value, list):
+                raise ValueError(f"Invalid value, the value must be a list!")
+            if len(id) != len(value):
+                raise ValueError(f"Invalid ids and values, the length of ids and values must be the same!")
+            request_type = "Org" if id[0] in self._org_ids else "Agent"
+        else:
+            if id not in self._agent_ids and id not in self._org_ids:
+                raise ValueError(f"Invalid id {id}, this id does not exist!")
+            request_type = "Org" if id in self._org_ids else "Agent"
         if request_type == "Org":
             original_value = await self.get_org(id)
         else:
             original_value = await self.get_agent(id)
         if mode == "merge":
-            orig_value = original_value[key]
-            _orig_type = type(orig_value)
-            _new_type = type(value)
-            if _orig_type != _new_type:
-                logger.debug(
-                    f"Inconsistent type of original value {_orig_type.__name__} and to-update value {_new_type.__name__}"
-                )
+            if isinstance(original_value, list):
+                for i in range(len(original_value)):
+                    self._merge(original_value[i], key, value[i])
             else:
-                if isinstance(orig_value, set):
-                    orig_value.update(set(value))
-                    original_value[key] = orig_value
-                elif isinstance(orig_value, dict):
-                    orig_value.update(dict(value))
-                    original_value[key] = orig_value
-                elif isinstance(orig_value, list):
-                    orig_value.extend(list(value))
-                    original_value[key] = orig_value
-                else:
-                    logger.warning(
-                        f"Type of {type(orig_value)} does not support mode `merge`, using `replace` instead!"
-                    )
+                self._merge(original_value, key, value)
         else:
-            original_value[key] = value
+            if isinstance(original_value, list):
+                for i in range(len(original_value)):
+                    original_value[i][key] = value[i]
+            else:
+                original_value[key] = value
         if request_type == "Org":
-            await self._aio_stub.UpdateOrg(
-                org_service.UpdateOrgRequest(
-                    org=original_value
+            if isinstance(original_value, list):
+                # batch_update_tasks = []
+                # for org in original_value:
+                #     batch_update_tasks.append(self._aio_stub.UpdateOrg(
+                #         org_service.UpdateOrgRequest(
+                #             org=org
+                #         )
+                #     ))
+                # await asyncio.gather(*batch_update_tasks)
+                await self._aio_stub.BatchUpdate(
+                    org_service.BatchUpdateRequest(
+                        orgs=original_value,
+                        agents=None
+                    )
+                )
+            else:
+                await self._aio_stub.UpdateOrg(
+                    org_service.UpdateOrgRequest(
+                        org=original_value
+                    )
                 )
-            )
             log["consumption"] = time.time() - start_time
             self._log_list.append(log)
         else:
-            await self._aio_stub.UpdateAgent(
-                org_service.UpdateAgentRequest(
-                    agent=original_value
+            if isinstance(original_value, list):
+                # batch_update_tasks = []
+                # for agent in original_value:
+                #     batch_update_tasks.append(self._aio_stub.UpdateAgent(
+                #         org_service.UpdateAgentRequest(
+                #             agent=agent
+                #         )
+                #     ))
+                # await asyncio.gather(*batch_update_tasks)
+                await self._aio_stub.BatchUpdate(
+                    org_service.BatchUpdateRequest(
+                        orgs=None,
+                        agents=original_value
+                    )
+                )
+            else:
+                await self._aio_stub.UpdateAgent(
+                    org_service.UpdateAgentRequest(
+                        agent=original_value
+                    )
                 )
-            )
             log["consumption"] = time.time() - start_time
             self._log_list.append(log)
 
@@ -315,11 +418,7 @@ class EconomyClient:
             - All tasks are executed concurrently, and their results are gathered and returned.
         """
         start_time = time.time()
-        log = {
-            "req": "add_agents",
-            "start_time": start_time,
-            "consumption": 0
-        }
+        log = {"req": "add_agents", "start_time": start_time, "consumption": 0}
         if isinstance(configs, dict):
             configs = [configs]
         for config in configs:
@@ -362,11 +461,7 @@ class EconomyClient:
             - Executes all tasks concurrently and gathers their results.
         """
         start_time = time.time()
-        log = {
-            "req": "add_orgs",
-            "start_time": start_time,
-            "consumption": 0
-        }
+        log = {"req": "add_orgs", "start_time": start_time, "consumption": 0}
         if isinstance(configs, dict):
             configs = [configs]
         for config in configs:
@@ -396,6 +491,8 @@ class EconomyClient:
                         working_hours=config.get("working_hours", []),
                         employees=config.get("employees", []),
                         citizens=config.get("citizens", []),
+                        demand=config.get("demand", 0),
+                        sales=config.get("sales", 0),
                     )
                 )
             )
@@ -425,11 +522,8 @@ class EconomyClient:
             - `Tuple[float, List[float]]`: A tuple containing the total taxes due and updated incomes after tax calculation.
         """
         start_time = time.time()
-        log = {
-            "req": "calculate_taxes_due",
-            "start_time": start_time,
-            "consumption": 0
-        }
+        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,
@@ -461,8 +555,10 @@ class EconomyClient:
         log = {
             "req": "calculate_consumption",
             "start_time": start_time,
-            "consumption": 0
+            "consumption": 0,
         }
+        if not isinstance(org_ids, Sequence):
+            org_ids = [org_ids]
         request = org_service.CalculateConsumptionRequest(
             firm_ids=org_ids,
             agent_id=agent_id,
@@ -474,6 +570,23 @@ class EconomyClient:
         log["consumption"] = time.time() - start_time
         self._log_list.append(log)
         return response.actual_consumption
+    
+    async def calculate_real_gdp(self, nbs_id: int):
+        start_time = time.time()
+        log = {
+            "req": "calculate_real_gdp",
+            "start_time": start_time,
+            "consumption": 0
+        }
+        request = org_service.CalculateRealGDPRequest(
+            nbs_agent_id=nbs_id
+        )
+        response: org_service.CalculateRealGDPResponse = (
+            await self._aio_stub.CalculateRealGDP(request)
+        )
+        log["consumption"] = time.time() - start_time
+        self._log_list.append(log)
+        return response.real_gdp
 
     async def calculate_interest(self, org_id: int, agent_ids: list[int]):
         """
@@ -487,11 +600,7 @@ class EconomyClient:
             - `Tuple[float, List[float]]`: A tuple containing the total interest and updated currencies for each agent.
         """
         start_time = time.time()
-        log = {
-            "req": "calculate_interest",
-            "start_time": start_time,
-            "consumption": 0
-        }
+        log = {"req": "calculate_interest", "start_time": start_time, "consumption": 0}
         request = org_service.CalculateInterestRequest(
             bank_id=org_id,
             agent_ids=agent_ids,
@@ -511,11 +620,7 @@ class EconomyClient:
             - `org_ids` (`Union[int, List[int]]`): A single ID or a list of IDs for the agents to be removed.
         """
         start_time = time.time()
-        log = {
-            "req": "remove_agents",
-            "start_time": start_time,
-            "consumption": 0
-        }
+        log = {"req": "remove_agents", "start_time": start_time, "consumption": 0}
         if isinstance(agent_ids, int):
             agent_ids = [agent_ids]
         tasks = [
@@ -536,11 +641,7 @@ class EconomyClient:
             - `org_ids` (`Union[int, List[int]]`): A single ID or a list of IDs for the organizations to be removed.
         """
         start_time = time.time()
-        log = {
-            "req": "remove_orgs",
-            "start_time": start_time,
-            "consumption": 0
-        }
+        log = {"req": "remove_orgs", "start_time": start_time, "consumption": 0}
         if isinstance(org_ids, int):
             org_ids = [org_ids]
         tasks = [
@@ -562,11 +663,7 @@ class EconomyClient:
             - `Tuple[List[int], List[int]]`: A tuple containing lists of agent IDs and organization IDs that were saved.
         """
         start_time = time.time()
-        log = {
-            "req": "save",
-            "start_time": start_time,
-            "consumption": 0
-        }
+        log = {"req": "save", "start_time": start_time, "consumption": 0}
         request = org_service.SaveEconomyEntitiesRequest(
             file_path=file_path,
         )
@@ -589,11 +686,7 @@ class EconomyClient:
             - `Tuple[List[int], List[int]]`: A tuple containing lists of agent IDs and organization IDs that were loaded.
         """
         start_time = time.time()
-        log = {
-            "req": "load",
-            "start_time": start_time,
-            "consumption": 0
-        }
+        log = {"req": "load", "start_time": start_time, "consumption": 0}
         request = org_service.LoadEconomyEntitiesRequest(
             file_path=file_path,
         )
@@ -616,11 +709,7 @@ class EconomyClient:
             - `List[int]`: A list of organization IDs matching the specified type.
         """
         start_time = time.time()
-        log = {
-            "req": "get_org_entity_ids",
-            "start_time": start_time,
-            "consumption": 0
-        }
+        log = {"req": "get_org_entity_ids", "start_time": start_time, "consumption": 0}
         request = org_service.GetOrgEntityIdsRequest(
             type=org_type,
         )
@@ -648,22 +737,12 @@ class EconomyClient:
             - Any
         """
         start_time = time.time()
-        log = {
-            "req": "add_delta_value",
-            "start_time": start_time,
-            "consumption": 0
-        }
+        log = {"req": "add_delta_value", "start_time": start_time, "consumption": 0}
         pascal_key = _snake_to_pascal(key)
         _request_type = getattr(org_service, f"Add{pascal_key}Request")
         _request_func = getattr(self._aio_stub, f"Add{pascal_key}")
 
-        _available_keys = {
-            "inventory",
-            "price",
-            "interest_rate",
-            "currency",
-            "income"
-        }
+        _available_keys = {"inventory", "price", "interest_rate", "currency", "income"}
         if key not in _available_keys:
             raise ValueError(f"Invalid key `{key}`, can only be {_available_keys}!")
         response = await _request_func(
@@ -676,4 +755,4 @@ class EconomyClient:
         )
         log["consumption"] = time.time() - start_time
         self._log_list.append(log)
-        return response
+        return response

pycityagent/environment/sim/sim_env.py

@@ -24,11 +24,8 @@ input:
 control:
   day: {max_day}
   step:
-    # 模拟器起始步
     start: {start_step}
-    # 模拟总步数，结束步为起始步+总步数
     total: {total_step}
-    # 每步的时间间隔
     interval: 1
   skip_overtime_trip_when_init: true
   enable_platoon: false

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=2147000000,
+                    total_step=24*60*60,
                     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),

pycityagent/llm/llm.py

@@ -285,6 +285,12 @@ class LLM:
                             await asyncio.sleep(2**attempt)
                         else:
                             raise e
+                    except Exception as e:
+                        print("An error occurred:", e)
+                        if attempt < retries - 1:
+                            await asyncio.sleep(2**attempt)
+                        else:
+                            raise e
             elif self.config.text["request_type"] == "zhipuai":
                 for attempt in range(retries):
                     try:
@@ -335,6 +341,12 @@ class LLM:
                             await asyncio.sleep(2**attempt)
                         else:
                             raise e
+                    except Exception as e:
+                        print("An error occurred:", e)
+                        if attempt < retries - 1:
+                            await asyncio.sleep(2**attempt)
+                        else:
+                            raise e
             else:
                 print("ERROR: Wrong Config")
                 return "wrong config"

pycityagent/simulation/simulation.py

@@ -1029,7 +1029,7 @@ class AgentSimulation:
                 await self.resume_simulator()
                 insert_tasks = []
                 for group in self._groups.values():
-                    insert_tasks.append(group.insert_agents.remote())
+                    insert_tasks.append(group.insert_agent.remote())
                 await asyncio.gather(*insert_tasks)
 
             # step

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

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

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

@@ -1,15 +1,15 @@
-pycityagent/pycityagent-sim,sha256=Bz7hBBEltPOOFAWuRFy7i_O6etwlABDxq0pHberDCU0,35884466
+pycityagent/pycityagent-sim,sha256=MmiGNhZgGjXYLJ2EYTGMhfGAZU8TnU7ORsJ6kdtzjDs,36973378
 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=FUE-7Kxpa3u41eH_4Xye7IYquk1i25Hfv8Smq0nR1-o,24757
+pycityagent/economy/econ_client.py,sha256=jDF_KAqFwM-vrFNRHiinYJEPEbzfaU2gRp_hIMk27O4,29208
 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
 pycityagent/llm/__init__.py,sha256=iWs6FLgrbRVIiqOf4ILS89gkVCTvS7HFC3vG-MWuyko,205
-pycityagent/llm/llm.py,sha256=8f7hNbdcCjZHri5Fkmnd7s1p5hfFujIuv_wB1ykjLH8,19470
+pycityagent/llm/llm.py,sha256=A1Q-dKEXHJKhBnElI7Ci6eIK-A7I-UZNQxC_hEgEa-4,20018
 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
@@ -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=b4sFPVAMdCi1aiG6GX2cSE3vYa2Q14XfyRkxHp1GRCc,49526
+pycityagent/simulation/simulation.py,sha256=_dmTQDVaKHpmAljKxQBFkVk9FDSBJg_PA5PMyphQ5D4,49525
 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
@@ -39,14 +39,14 @@ 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=Tq6VfEahZdZtWL4tdEM-rJM1FrLgjA5X0O04-sLYH-g,18881
+pycityagent/agent/agent.py,sha256=Ymv3CtEPGcayVWrNnXkeWQXRNYEuvniWCqUfn2UZy8Y,19073
 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/trigger.py,sha256=4nzAwywGQsFabgo6gzp-vD2EV4wII7Z0LHGEAsflSEY,7608
 pycityagent/environment/__init__.py,sha256=fFIth2jxxgZ92cXm-aoM2igHgaSqsYGwtBhyb7opjzk,166
-pycityagent/environment/simulator.py,sha256=PpO4XyIbn5fSqycBlRYdGWuRumDzeXXM8ZQr8U5Mgcs,22608
+pycityagent/environment/simulator.py,sha256=I5xDg-1Cn32qvKN7X_6SklA_d_iPFS9THsZqbZreJDU,22606
 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
@@ -58,7 +58,7 @@ pycityagent/environment/utils/const.py,sha256=1LqxnYJ8FSmq37fN5kIFlWLwycEDzFa8SF
 pycityagent/environment/sim/pause_service.py,sha256=UUTa4pTBOX_MGKki9QDgKId7scch0waAWF9xRVmNlAs,1701
 pycityagent/environment/sim/person_service.py,sha256=T1pRi5jDcivSInX7iGZoHKYZmgO7_t5MYtLhU12_LC4,10793
 pycityagent/environment/sim/aoi_service.py,sha256=bYVJDrOfDn8hgOORDU7PxMaT-fpqXA5Z0A080l2EPBc,1242
-pycityagent/environment/sim/sim_env.py,sha256=UPSMNrLJVGj1IqUPxHaoLE5NbgI200trOxCsP0RYi8s,4767
+pycityagent/environment/sim/sim_env.py,sha256=4CW9lv9CyRUFsa0mwZ3AQsBps3i1Qh1KIRSgHdZWy0U,4658
 pycityagent/environment/sim/lane_service.py,sha256=bmf0zOWkxDzMEDlhTdHNRJRiTFGgzjbeqmex387gHZs,3964
 pycityagent/environment/sim/client.py,sha256=x4REWPRFG_C2s0-CWz8MnYalD_esfu2pPHf_vpsCG78,2852
 pycityagent/environment/sim/__init__.py,sha256=CyJc5Tey9MgzomZv0ynAcV0yaUlSE3bPbegYXar8wJc,601
@@ -67,18 +67,18 @@ pycityagent/environment/sim/light_service.py,sha256=q4pKcGrm7WU0h29I1dFIDOz2OV0B
 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=_7ujYGgalnnulBvOT_HCuy9uITd5l6br5THkC53hgNE,11868
-pycityagent/cityagent/bankagent.py,sha256=uL9ATilEddhJR25qW0p8jX6I9QKGm3gDi1wmJNr6Hbg,4036
+pycityagent/cityagent/memory_config.py,sha256=T21XdQ-um16LMMirLO2W14LcbJp3afnYF-AsUZKfxWM,11923
+pycityagent/cityagent/bankagent.py,sha256=I6MNG1fUbxKyWCLxCtvOjeVahong_LhHQKmJdRPhQL8,4097
 pycityagent/cityagent/__init__.py,sha256=gcBQ-a50XegFtjigQ7xDXRBZrywBKqifiQFSRnEF8gM,572
-pycityagent/cityagent/firmagent.py,sha256=x9Yvrd9j0dSILUm__e9dBT7FBgJ0q7VFzbNUC10Vg5A,3677
-pycityagent/cityagent/nbsagent.py,sha256=2021QjPm2JFhDJ0KKNpEZwtTT8GaGyj2zf6KCKHdL3Y,4059
-pycityagent/cityagent/initial.py,sha256=Nrmwj5nflk_wg81kRU69GGZQLNM49qhQTSRFpOUBk_Y,6071
+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/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=NYKrGDoYCuXoupMNMuSNhx4Ci1paC_EuGRWvp5-ZSA8,15909
-pycityagent/cityagent/blocks/cognition_block.py,sha256=cCflH-1lAexWLamT412nXERoUln0tbaFMxdJKYmFpfs,15179
+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
@@ -89,9 +89,9 @@ 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.0a80.dist-info/RECORD,,
-pycityagent-2.0.0a80.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
-pycityagent-2.0.0a80.dist-info/WHEEL,sha256=md3JO_ifs5j508p3TDNMgtQVtnQblpGEt_Wo4W56l8Y,107
-pycityagent-2.0.0a80.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
-pycityagent-2.0.0a80.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
-pycityagent-2.0.0a80.dist-info/METADATA,sha256=IUJKnqJ9ln8u6OypJKDFHt1BiR3ylWZoTVxBz3j3JHE,9110
+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