pycityagent 2.0.0a67__cp310-cp310-macosx_11_0_arm64.whl → 2.0.0a69__cp310-cp310-macosx_11_0_arm64.whl

pycityagent/cityagent/blocks/economy_block.py

@@ -110,8 +110,7 @@ class ConsumptionBlock(Block):
         consumption_each_firm = consumption*softmax(prices, gamma=-0.01)
         demand_each_firm = []
         for i in range(len(firms_id)):
-            demand_each_firm.append(int(consumption_each_firm//prices[i]))
-
+            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)
         node_id = await self.memory.stream.add_economy(description=f"I bought some goods, and spent {real_consumption:.1f} on {intention}")
         evaluation = {

pycityagent/cityagent/blocks/social_block.py

@@ -299,6 +299,7 @@ class MessageBlock(Block):
                         "success": False,
                         "evaluation": "Could not find target for message",
                         "consumed_time": 5,
+                        "node_id": result["node_id"],
                     }
                 target = result["target"]
 

pycityagent/cityagent/governmentagent.py

@@ -13,6 +13,13 @@ logger = logging.getLogger("pycityagent")
 
 
 class GovernmentAgent(InstitutionAgent):
+    configurable_fields = ["time_diff"]
+    default_values = {
+        "time_diff": 30 * 24 * 60 * 60,
+    }
+    fields_description = {
+        "time_diff": "Time difference between each forward, day * hour * minute * second",
+    }
     def __init__(
         self,
         name: str,

pycityagent/economy/econ_client.py

@@ -473,7 +473,7 @@ class EconomyClient:
         )
         log["consumption"] = time.time() - start_time
         self._log_list.append(log)
-        return (int(response.remain_inventory), list(response.updated_currencies))
+        return response.actual_consumption
 
     async def calculate_interest(self, org_id: int, agent_ids: list[int]):
         """

pycityagent/simulation/agentgroup.py

@@ -49,6 +49,7 @@ class AgentGroup:
         logging_level: int,
         agent_config_file: Optional[dict[type[Agent], str]] = None,
         environment: Optional[dict[str, str]] = None,
+        llm_semaphore: int = 200,
     ):
         """
         Represents a group of agents that can be deployed in a Ray distributed environment.
@@ -140,7 +141,7 @@ class AgentGroup:
         llmConfig = LLMConfig(config["llm_request"])
         logger.info(f"-----Creating LLM client in AgentGroup {self._uuid} ...")
         self.llm = LLM(llmConfig)
-        self.llm.set_semaphore(200)
+        self.llm.set_semaphore(llm_semaphore)
 
         # prepare Simulator
         logger.info(f"-----Creating Simulator in AgentGroup {self._uuid} ...")

pycityagent/simulation/simulation.py

@@ -253,7 +253,8 @@ class AgentSimulation:
         """Directly run from config file
         Basic config file should contain:
         - simulation_config: file_path
-        - enable_institution: bool, default is True
+        - enable_institution: Optional[bool], default is True
+        - llm_semaphore: Optional[int], default is 200
         - agent_config:
             - agent_config_file: Optional[dict[type[Agent], str]]
             - memory_config_init_func: Optional[Callable]
@@ -268,7 +269,7 @@ class AgentSimulation:
             - number_of_bank: required, int
             - number_of_nbs: required, int
         - environment: Optional[dict[str, str]]
-            - default: {'weather': 'The weather is normal', 'crime': 'The crime rate is low', 'pollution': 'The pollution level is low', 'temperature': 'The temperature is normal'}
+            - default: {'weather': 'The weather is normal', 'crime': 'The crime rate is low', 'pollution': 'The pollution level is low', 'temperature': 'The temperature is normal', 'day': 'Workday'}
         - workflow:
             - list[Step]
             - Step:
@@ -370,6 +371,7 @@ class AgentSimulation:
             ),
             **_message_intercept_kwargs,
             environment=environment,
+            llm_semaphore=config.get("llm_semaphore", 200),
         )
         logger.info("Running Init Functions...")
         for init_func in config["agent_config"].get(
@@ -406,6 +408,7 @@ class AgentSimulation:
                 await step["func"](simulation)
         logger.info("Simulation finished")
         return llm_log_lists, mqtt_log_lists, simulator_log_lists
+    
     @property
     def enable_avro(
         self,
@@ -533,7 +536,8 @@ class AgentSimulation:
         embedding_model: Embeddings = SimpleEmbedding(),
         memory_config_init_func: Optional[Callable] = None,
         memory_config_func: Optional[dict[type[Agent], Callable]] = None,
-        environment: Optional[dict[str, str]] = None,
+        environment: dict[str, str] = {},
+        llm_semaphore: int = 200,
     ) -> None:
         """
         Initialize agents within the simulation.
@@ -750,6 +754,7 @@ class AgentSimulation:
                 self.logging_level,
                 config_file,
                 environment,
+                llm_semaphore,
             )
             creation_tasks.append((group_name, group))
 

{pycityagent-2.0.0a67.dist-info → pycityagent-2.0.0a69.dist-info}/METADATA

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

@@ -1,16 +1,10 @@
-pycityagent-2.0.0a67.dist-info/RECORD,,
-pycityagent-2.0.0a67.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
-pycityagent-2.0.0a67.dist-info/WHEEL,sha256=ezfKMaDztqf77C8lvQ0NCnZxkTaOaKLprqJ8q932MhU,109
-pycityagent-2.0.0a67.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
-pycityagent-2.0.0a67.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
-pycityagent-2.0.0a67.dist-info/METADATA,sha256=c4r6nC0hBaQ9ux_-fHHvugj-ReCAlqoKDbWew9PE1f8,9110
 pycityagent/pycityagent-sim,sha256=7AF-sHfnUfVBbiBMOWc11C_5xc9rfEip9lg_7vUieUU,35884466
 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=9kzGMhzoTsOXzyv6vBPscc7LbU3gvN5yiuofMUBOgvE,24797
+pycityagent/economy/econ_client.py,sha256=FUE-7Kxpa3u41eH_4Xye7IYquk1i25Hfv8Smq0nR1-o,24757
 pycityagent/tools/__init__.py,sha256=y7sMVMHf0AbivlczM2h-kr7mkgXK-WAx3S9BXLXkWvw,235
 pycityagent/tools/tool.py,sha256=-HZvKeq4gFMo2wJPk6vcr8EdXubM7kA0qC82zv_yS-s,9011
 pycityagent/llm/llmconfig.py,sha256=6AqCMV4B_JqBD2mb98bLGzpUdlOCnziQKae-Hhxxp-E,469
@@ -27,9 +21,9 @@ 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=WlCs76fvLdZNzmAJvAsKdXiTH7eyvVmqOG9xK-OhQWk,47719
+pycityagent/simulation/simulation.py,sha256=U0Cptnn4kahp6xvDfo1g3NkXat9a1GcgXizoxszQr2c,47920
 pycityagent/simulation/__init__.py,sha256=u1WpgwVxPboXWMxrUQKMXJNmTKQYAeCaqZv9HmSxESY,118
-pycityagent/simulation/agentgroup.py,sha256=TlZekAZBjJsch2ZlvDWgRNyFmyc6kwzd_S550s2Lflw,36796
+pycityagent/simulation/agentgroup.py,sha256=5oJwMqkvWoB_tt0k14YtXY0NqesymatXlsgtJDiUvW0,36840
 pycityagent/simulation/storage/pg.py,sha256=xRshSOGttW-p0re0fNBOjOpb-nQ5msIE2LsdT79_E_Y,8425
 pycityagent/message/message_interceptor.py,sha256=QWuTUqi1Cu214fhFs0f78tD2zflMnb6zEAGB4RutXxs,17736
 pycityagent/message/__init__.py,sha256=f5QH7DKPqEAMyfSlBMnl3uouOKlsoel909STlIe7nUk,276
@@ -81,13 +75,13 @@ pycityagent/cityagent/nbsagent.py,sha256=2021QjPm2JFhDJ0KKNpEZwtTT8GaGyj2zf6KCKH
 pycityagent/cityagent/initial.py,sha256=a8ed-vvagYw8tJY-uzYm_sAja2545QRAEa58Tp4DHck,6130
 pycityagent/cityagent/societyagent.py,sha256=2WSXh-eElgigXfDHOh9KoDU2KCmIatwD2D57cZlh0Fs,20253
 pycityagent/cityagent/message_intercept.py,sha256=dyT1G-nMxKb2prhgtyFFHFz593qBrkk5DnHsHvG1OIc,4418
-pycityagent/cityagent/governmentagent.py,sha256=YoydTQ-LMOF5ZbisxG4vQFaFT9ZS0DzDjb3hQg87YzM,2830
+pycityagent/cityagent/governmentagent.py,sha256=XIyggG83FWUTZdOuoqc6ClCP3hhfkxNmtYRu9TFo0dU,3063
 pycityagent/cityagent/blocks/dispatcher.py,sha256=U5BPeUrjrTyDaznYfT6YUJIW8vfKVRDF4EO0oOn6Td4,2886
 pycityagent/cityagent/blocks/needs_block.py,sha256=LwoH-4WcAF5L8IOW2ytf51QeIghq9D9KspQ92s5k4Nk,15897
 pycityagent/cityagent/blocks/cognition_block.py,sha256=5QWhX2vg1VqYYzm-qBITBhVntaaetePQoa7OqvmXJug,15170
-pycityagent/cityagent/blocks/social_block.py,sha256=QwmfVYa0Q0anMTYsJe8IxMRecJCNEpCuTsm9bo27eEM,15439
+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=CCF2xPxwAiMy0PhFis11_tjH0NMYwSnbUx9VUNfIbGg,19061
+pycityagent/cityagent/blocks/economy_block.py,sha256=zQzZ_A-VrvCNuGu_SdIKr0PAnmUAvOcLBM7eWkN0n9g,19063
 pycityagent/cityagent/blocks/utils.py,sha256=uu4iQOYKwIT87AqbT5KT4W8p_UI_dZfuXkyxWto_EQ0,2097
 pycityagent/cityagent/blocks/other_block.py,sha256=LdtL6248xvMvvRQx6NvdlJrWWZFu8Xusjxb9yEh1M0k,4365
 pycityagent/cityagent/blocks/plan_block.py,sha256=LcmG7d9oMezq9TiEerFJyUZytZRg5Zf03B7m6aV7HCI,11465
@@ -95,3 +89,9 @@ pycityagent/cityagent/blocks/mobility_block.py,sha256=YmKhJW_srC6b6n_LvJujSO-eB-
 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.0a69.dist-info/RECORD,,
+pycityagent-2.0.0a69.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
+pycityagent-2.0.0a69.dist-info/WHEEL,sha256=ezfKMaDztqf77C8lvQ0NCnZxkTaOaKLprqJ8q932MhU,109
+pycityagent-2.0.0a69.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
+pycityagent-2.0.0a69.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
+pycityagent-2.0.0a69.dist-info/METADATA,sha256=CAOz85QkgBy69X6TCaLlZt32O_jH8bvIi7hZMzAnyk4,9110