pycityagent 2.0.0a92__cp311-cp311-macosx_11_0_arm64.whl → 2.0.0a93__cp311-cp311-macosx_11_0_arm64.whl

pycityagent/cityagent/blocks/needs_block.py

@@ -99,10 +99,10 @@ class NeedsBlock(Block):
             0.1,
         )  # Hunger decay rate, Energy decay rate, Safety decay rate, Social decay rate
         self.T_H, self.T_D, self.T_P, self.T_C = (
-            0.3,
-            0.2,
+            0.1,
             0.2,
             0.2,
+            0.4,
         )  # Hunger threshold, Energy threshold, Safety threshold, Social threshold
 
     async def initialize(self):

pycityagent/cityagent/blocks/plan_block.py

@@ -174,7 +174,7 @@ class PlanBlock(Block):
             "hungry": ["Eat at home", "Eat outside"],
             "tired": ["Sleep", "Take a nap"],
             "safe": ["Go to work"],
-            "social": ["Online social", "Shopping"],
+            "social": ["Contact with friends", "Shopping"],
             "whatever": ["Contact with friends", "Hang out"],
         }
 

pycityagent/cityagent/blocks/social_block.py

@@ -151,7 +151,7 @@ class FindPersonBlock(Block):
 
             if not friends:
                 node_id = await self.memory.stream.add_social(
-                    description=f"I can't find any friends to socialize with."
+                    description=f"I can't find any friends to contact with."
                 )
                 return {
                     "success": False,
@@ -327,6 +327,7 @@ class MessageBlock(Block):
 
             # Send message
             serialized_message = self._serialize_message(message, 1)
+            await self.agent.send_message_to_agent(target, serialized_message)
             node_id = await self.memory.stream.add_social(
                 description=f"I sent a message to {target}: {message}"
             )

pycityagent/cityagent/initial.py

@@ -27,11 +27,11 @@ async def initialize_social_network(simulation):
         relation_types = ["family", "colleague", "friend"]
 
         # Get all agent IDs
-        agent_ids = simulation.agent_uuids
-        for agent_id in agent_ids:
+        citizen_uuids = await simulation.filter(types=[SocietyAgent])
+        for agent_id in citizen_uuids:
             # Randomly select 2-5 friends for each agent
             num_friends = random.randint(2, 5)
-            possible_friends = [aid for aid in agent_ids if aid != agent_id]
+            possible_friends = [aid for aid in citizen_uuids if aid != agent_id]
             friends = random.sample(
                 possible_friends, min(num_friends, len(possible_friends))
             )
@@ -114,7 +114,7 @@ async def bind_agent_info(simulation):
     - **Returns**:
         - None
     """
-    logger.info("Binding agent info...")
+    logger.info("Binding economy relationship...")
     infos = await simulation.gather("id")
     citizen_uuids = await simulation.filter(types=[SocietyAgent])
     firm_uuids = await simulation.filter(types=[FirmAgent])

pycityagent/cityagent/societyagent.py

@@ -57,7 +57,7 @@ class PlanAndActionBlock(Block):
         self.planBlock = PlanBlock(llm=llm, memory=memory, simulator=simulator)
         self.mobilityBlock = MobilityBlock(llm=llm, memory=memory, simulator=simulator)
         self.socialBlock = SocialBlock(
-            agent=self, llm=llm, memory=memory, simulator=simulator
+            agent=agent, llm=llm, memory=memory, simulator=simulator
         )
         self.economyBlock = EconomyBlock(
             llm=llm, memory=memory, simulator=simulator, economy_client=economy_client

pycityagent/simulation/simulation.py

@@ -779,6 +779,7 @@ class AgentSimulation:
             self._groups[group_name] = group
             group_agent_uuids = ray.get(group.get_agent_uuids.remote())
             for agent_uuid in group_agent_uuids:
+                self._agent_uuids.append(agent_uuid)
                 self._agent_uuid2group[agent_uuid] = group
                 self._user_chat_topics[agent_uuid] = (
                     f"exps/{self.exp_id}/agents/{agent_uuid}/user-chat"

pycityagent/workflow/block.py

@@ -259,7 +259,7 @@ class Block:
                     setattr(self, field, config["config"][field])
 
         def build_or_update_block(block_data: dict) -> Block:
-            block_name = block_data["name"].lower()  # type:ignore
+            block_name = block_data["name"]  # type:ignore
             existing_block = getattr(self, block_name, None)
 
             if existing_block:
@@ -276,7 +276,7 @@ class Block:
                 return block_instance
 
         # 递归遍历子Block配置
-        for block_data in config.get("blocks", []):
+        for block_data in config.get("children", []):
             build_or_update_block(block_data)
 
     async def forward(self):

{pycityagent-2.0.0a92.dist-info → pycityagent-2.0.0a93.dist-info}/METADATA

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

@@ -21,7 +21,7 @@ pycityagent/memory/utils.py,sha256=oJWLdPeJy_jcdKcDTo9JAH9kDZhqjoQhhv_zT9qWC0w,8
 pycityagent/memory/const.py,sha256=Wgsx0oztDrJDEpI9Dr6XeI6GXrABcP0UTOuEvMp1AD8,934
 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=bHpR3FtUM6ewurwByRr57OgdTWXTPq9-knIjGt2GHlo,49370
+pycityagent/simulation/simulation.py,sha256=AjN-cT-SqdPbuXJAIczWr17hNC8fBzSLG8MrRbYC-9g,49423
 pycityagent/simulation/__init__.py,sha256=u1WpgwVxPboXWMxrUQKMXJNmTKQYAeCaqZv9HmSxESY,118
 pycityagent/simulation/agentgroup.py,sha256=rPloocCwB6rfjWbIz3T052mYq2lEcBp97mblkMD2y0A,36955
 pycityagent/simulation/storage/pg.py,sha256=xRshSOGttW-p0re0fNBOjOpb-nQ5msIE2LsdT79_E_Y,8425
@@ -43,7 +43,7 @@ pycityagent/agent/agent.py,sha256=TMusq6As7gfZAiFr2XB1H-4tlHrWFEOm7ytPjvxl6K4,19
 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/block.py,sha256=zOoMgCvjrOXyAUQRCU7Qo_diRZaPGjgsfO0vraSJ9b0,12289
 pycityagent/workflow/trigger.py,sha256=4nzAwywGQsFabgo6gzp-vD2EV4wII7Z0LHGEAsflSEY,7608
 pycityagent/environment/__init__.py,sha256=fFIth2jxxgZ92cXm-aoM2igHgaSqsYGwtBhyb7opjzk,166
 pycityagent/environment/simulator.py,sha256=4QVwi40I9AwJ9YIDK3-fqmlz2Q5ykkWBHpz78xAo22c,23299
@@ -72,26 +72,26 @@ pycityagent/cityagent/bankagent.py,sha256=I6MNG1fUbxKyWCLxCtvOjeVahong_LhHQKmJdR
 pycityagent/cityagent/__init__.py,sha256=gcBQ-a50XegFtjigQ7xDXRBZrywBKqifiQFSRnEF8gM,572
 pycityagent/cityagent/firmagent.py,sha256=vZr7kdjnxcCZ5qX7hmUIYuQQWd44GcRPbdi76WGSFy4,3760
 pycityagent/cityagent/nbsagent.py,sha256=rrzL-Ep-gWB8kvoPA8nBokY1zoEZGpyQjP9oy7ZuVL4,4676
-pycityagent/cityagent/initial.py,sha256=tVcO9ECGvsFatpxQirZbZf0ESFBxSpSxkm4p0x2kiO0,6263
-pycityagent/cityagent/societyagent.py,sha256=i7V7BeCb_pMJpxwiR5AOUcNHRw0SXHXltt_DtCxE6pE,20121
+pycityagent/cityagent/initial.py,sha256=X558KNRfoyuztNjvbGIX6ahUPzqnW9XiBQ_WQ9bTztY,6308
+pycityagent/cityagent/societyagent.py,sha256=i2Khr9LU-7XI5Mhaiu89yoBKYsN7U4RvgS2u4GXNz6M,20122
 pycityagent/cityagent/message_intercept.py,sha256=dyT1G-nMxKb2prhgtyFFHFz593qBrkk5DnHsHvG1OIc,4418
 pycityagent/cityagent/governmentagent.py,sha256=XIyggG83FWUTZdOuoqc6ClCP3hhfkxNmtYRu9TFo0dU,3063
 pycityagent/cityagent/blocks/dispatcher.py,sha256=gd3lyggvtkCq9Ou_icgua60H0UjHTzwHoynLl_iZoes,2939
-pycityagent/cityagent/blocks/needs_block.py,sha256=S8d1spgpzPZEVYa-avUD8102_oMY0yocu2uebt-Li4I,15227
+pycityagent/cityagent/blocks/needs_block.py,sha256=YRJACcxZbbPrQWdArAakf_H7BKm24EbWaI8NTiXiDdE,15227
 pycityagent/cityagent/blocks/cognition_block.py,sha256=yzjB0D_95vytpa5xiVdmTSpGp8H9HXcjWzzFN0OpP0k,15398
-pycityagent/cityagent/blocks/social_block.py,sha256=ut3bhQUxBOzhan1OCffAeRa8nDPV1qhDCVJxSN0bizw,15141
+pycityagent/cityagent/blocks/social_block.py,sha256=pGQxumQ8FUpTqWRFcoDkNxnMtyToWXUnjIKYgUAA3vk,15218
 pycityagent/cityagent/blocks/__init__.py,sha256=h6si6WBcVVuglIskKQKA8Cxtf_VKen1sNPqOFKI311Q,420
 pycityagent/cityagent/blocks/economy_block.py,sha256=cQePU1kfJzmO9j_vnitQATsV-ztf8SHSWqRKiJVNlM0,19863
 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=FsFZI2SzuWbGC0X_TKwLaQA-2dqAJ0nZpex1--Hmzyo,11950
+pycityagent/cityagent/blocks/plan_block.py,sha256=sM6FII0ubFj5eOifSf422RV8ry7RUQZfeDylVh4n7Bo,11957
 pycityagent/cityagent/blocks/mobility_block.py,sha256=OZoA-swFdX0Ezpzkyp8jJMNPQ533JpeeTCdLupoqRjI,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.0a92.dist-info/RECORD,,
-pycityagent-2.0.0a92.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
-pycityagent-2.0.0a92.dist-info/WHEEL,sha256=NW1RskY9zow1Y68W-gXg0oZyBRAugI1JHywIzAIai5o,109
-pycityagent-2.0.0a92.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
-pycityagent-2.0.0a92.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
-pycityagent-2.0.0a92.dist-info/METADATA,sha256=pIMS51ZKWteISekc3mpx5djjsgKcOHbvcitI4AVcBrE,9110
+pycityagent-2.0.0a93.dist-info/RECORD,,
+pycityagent-2.0.0a93.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
+pycityagent-2.0.0a93.dist-info/WHEEL,sha256=NW1RskY9zow1Y68W-gXg0oZyBRAugI1JHywIzAIai5o,109
+pycityagent-2.0.0a93.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
+pycityagent-2.0.0a93.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
+pycityagent-2.0.0a93.dist-info/METADATA,sha256=p5FYOWipjHs7S50Kd0R-kNN5NB-vWfLgDbyIzFLYW0Q,9110