pycityagent 2.0.0a61__cp312-cp312-macosx_11_0_arm64.whl → 2.0.0a63__cp312-cp312-macosx_11_0_arm64.whl

pycityagent/cityagent/message_intercept.py

@@ -1,4 +1,5 @@
 import asyncio
+import json
 
 from pycityagent.llm import LLM
 from pycityagent.message import MessageBlockBase, MessageBlockListenerBase
@@ -12,7 +13,7 @@ async def check_message(
     返回: (是否合规, from_uuid, to_uuid)
     """
     print(f"\n检查消息: {from_uuid} -> {to_uuid}: {content}")
-
+    is_valid = True
     prompt = f"""
         请判断以下消息是否具有情绪煽动性：
         发送者ID: {from_uuid}
@@ -21,11 +22,21 @@ async def check_message(
         
         如果消息具有情绪煽动性，请返回 False；如果消息正常，请返回 True。
         """
-
-    if "test" in content.lower():
-        is_valid = False
+    for _ in range(10):
+        try:
+            response: str = await llm_client.atext_request(
+                prompt, timeout=300
+            )  # type:ignore
+            if "false" in response.lower():
+                is_valid = False
+                break
+            elif "true" in response.lower():
+                is_valid = True
+                break
+        except:
+            pass
     else:
-        is_valid = True
+        raise RuntimeError(f"Request for message interception prompt=`{prompt}` failed")
     print(f"消息检查结果: {'合规' if is_valid else '不合规'}")
     return is_valid
 

pycityagent/cityagent/societyagent.py

@@ -36,11 +36,19 @@ class PlanAndActionBlock(Block):
         memory: Memory,
         simulator: Simulator,
         economy_client: EconomyClient,
+        enable_mobility: bool = True,
+        enable_social: bool = True,
+        enable_economy: bool = True,
+        enable_cognition: bool = True,
     ):
         super().__init__(
             name="plan_and_action_block", llm=llm, memory=memory, simulator=simulator
         )
         self._agent = agent
+        self.enable_mobility = enable_mobility
+        self.enable_social = enable_social
+        self.enable_economy = enable_economy
+        self.enable_cognition = enable_cognition
         self.longTermDecisionBlock = MonthPlanBlock(
             llm=llm, memory=memory, simulator=simulator, economy_client=economy_client
         )
@@ -73,9 +81,6 @@ class PlanAndActionBlock(Block):
             if "aoi_position" in position:
                 current_step["position"] = position["aoi_position"]["aoi_id"]
             current_step["start_time"] = int(await self.simulator.get_time())
-            logger.info(
-                f"Executing step: {current_step['intention']} - Type: {step_type}"
-            )
             result = None
             if step_type == "mobility":
                 if self.enable_mobility:  # type:ignore
@@ -116,7 +121,7 @@ class PlanAndActionBlock(Block):
             elif step_type == "other":
                 result = await self.otherBlock.forward(current_step, execution_context)
             if result != None:
-                logger.info(f"Execution result: {result}")
+                logger.warning(f"Execution result: {result}")
                 current_step["evaluation"] = result
 
             # Update current_step, plan, and execution_context information
@@ -199,6 +204,13 @@ class SocietyAgent(CitizenAgent):
             memory=memory,
             economy_client=economy_client,
         )
+
+        # config
+        self.enable_cognition = True
+        self.enable_mobility = True
+        self.enable_social = True
+        self.enable_economy = True
+        
         self.mindBlock = MindBlock(
             llm=self.llm, memory=self.memory, simulator=self.simulator
         )
@@ -208,16 +220,14 @@ class SocietyAgent(CitizenAgent):
             memory=self.memory,
             simulator=self.simulator,
             economy_client=self.economy_client,
+            enable_mobility=self.enable_mobility,
+            enable_social=self.enable_social,
+            enable_economy=self.enable_economy,
+            enable_cognition=self.enable_cognition,
         )
         self.step_count = -1
         self.cognition_update = -1
 
-        # config
-        self.enable_cognition = True
-        self.enable_mobility = True
-        self.enable_social = True
-        self.enable_economy = True
-
     # Main workflow
     async def forward(self):
         self.step_count += 1
@@ -239,92 +249,6 @@ class SocietyAgent(CitizenAgent):
         status = await self.memory.status.get("status")
         if status == 2:
             # Agent is moving
-            logger.info("Agent is moving")
-            await asyncio.sleep(1)
-            return False
-
-        # Get the previous step information
-        current_step = await self.memory.status.get("current_step")
-        if current_step["intention"] == "" or current_step["type"] == "":
-            # No previous step, return directly
-            return True
-        time_now = int(await self.simulator.get_time())
-        step_start_time = current_step["start_time"]
-        step_consumed_time = current_step["evaluation"]["consumed_time"]
-        time_end_plan = step_start_time + int(step_consumed_time) * 60
-        if time_now >= time_end_plan:
-            # The previous step has been completed
-            current_plan = await self.memory.status.get("current_plan")
-            current_step["evaluation"]["consumed_time"] = (
-                time_now - step_start_time
-            ) / 60
-            current_plan["stream_nodes"].append(current_step["evaluation"]["node_id"])
-            if current_step["evaluation"]["success"]:
-                # Last step is completed
-                current_step_index = next(
-                    (
-                        i
-                        for i, step in enumerate(current_plan["steps"])
-                        if step["intention"] == current_step["intention"]
-                        and step["type"] == current_step["type"]
-                    ),
-                    None,
-                )
-                current_plan["steps"][current_step_index] = current_step
-                await self.memory.status.update("current_plan", current_plan)
-                if current_step_index is not None and current_step_index + 1 < len(
-                    current_plan["steps"]
-                ):
-                    next_step = current_plan["steps"][current_step_index + 1]
-                    await self.memory.status.update("current_step", next_step)
-                else:
-                    # Whole plan is completed
-                    current_plan["completed"] = True
-                    current_plan["end_time"] = await self.simulator.get_time(
-                        format_time=True
-                    )
-                    if self.enable_cognition:
-                        # Update emotion for the plan
-                        related_memories = await self.memory.stream.get_by_ids(current_plan["stream_nodes"])
-                        incident = f"You have successfully completed the plan: {related_memories}"
-                        conclusion = await self.mindBlock.cognitionBlock.emotion_update(incident)
-                        await self.memory.stream.add_cognition(description=conclusion)
-                        await self.memory.stream.add_cognition_to_memory(current_plan["stream_nodes"], conclusion)
-                    await self.memory.status.update("current_plan", current_plan)
-                    await self.memory.status.update("current_step", {"intention": "", "type": ""})
-                return True
-            else:
-                current_plan["failed"] = True
-                current_plan["end_time"] = await self.simulator.get_time(
-                    format_time=True
-                )
-                if self.enable_cognition:
-                    # Update emotion for the plan
-                    related_memories = await self.memory.stream.get_by_ids(current_plan["stream_nodes"])
-                    incident = f"You have failed to complete the plan: {related_memories}"
-                    conclusion = await self.mindBlock.cognitionBlock.emotion_update(incident)
-                    await self.memory.stream.add_cognition(description=conclusion)
-                    await self.memory.stream.add_cognition_to_memory(current_plan["stream_nodes"], conclusion)
-                await self.memory.status.update("current_plan", current_plan)
-                await self.memory.status.update("current_step", {"intention": "", "type": ""})
-        # The previous step has not been completed
-        return False
-
-        # check last step
-        if not await self.check_and_update_step():
-            return
-
-        await self.planAndActionBlock.forward()
-
-        if self.enable_cognition:
-            await self.mindBlock.forward()
-
-    async def check_and_update_step(self):
-        """Check if the previous step has been completed"""
-        status = await self.memory.status.get("status")
-        if status == 2:
-            # Agent is moving
-            logger.info("Agent is moving")
             await asyncio.sleep(1)
             return False
 
@@ -420,7 +344,6 @@ class SocietyAgent(CitizenAgent):
     async def process_agent_chat_response(self, payload: dict) -> str:  # type:ignore
         if payload["type"] == "social":
             resp = f"Agent {self._uuid} received agent chat response: {payload}"
-            logger.info(resp)
             try:
                 # Extract basic info
                 sender_id = payload.get("from")
@@ -463,9 +386,6 @@ class SocietyAgent(CitizenAgent):
                 # Check propagation limit
                 if propagation_count > 5:
                     await self.memory.status.update("chat_histories", chat_histories)
-                    logger.info(
-                        f"Message propagation limit reached ({propagation_count} > 5), stopping propagation"
-                    )
                     return ""
 
                 # Get relationship score
@@ -550,8 +470,6 @@ class SocietyAgent(CitizenAgent):
                         ensure_ascii=False,
                     )
                     await self.send_message_to_agent(sender_id, serialized_response)
-                    logger.info("sender_id", sender_id)
-                    logger.info("message", serialized_response)
                 return response  # type:ignore
 
             except Exception as e:

{pycityagent-2.0.0a61.dist-info → pycityagent-2.0.0a63.dist-info}/METADATA

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

@@ -1,6 +1,6 @@
 pycityagent/pycityagent-sim,sha256=vskCJGHJEh0B2dUfmYlVyrcy3sDZ3kBNwjqcYUZpmO8,35449490
 pycityagent/__init__.py,sha256=PUKWTXc-xdMG7px8oTNclodsILUgypANj2Z647sY63k,808
-pycityagent/pycityagent-ui,sha256=cHZjqtrQ4Fh4qtRahFNCNbT2DNHLmUexiDAa-72Z3RQ,40333378
+pycityagent/pycityagent-ui,sha256=K2XXJhxIoIk4QWty5i-0FuzZJekkFlbeqrJgPX3tbdE,41225346
 pycityagent/metrics/mlflow_client.py,sha256=bTrqYsRfNfjJd6l91hU8vN7JXzJC7DHiM2XbkhMuXIU,4613
 pycityagent/metrics/__init__.py,sha256=X08PaBbGVAd7_PRGLREXWxaqm7nS82WBQpD1zvQzcqc,128
 pycityagent/metrics/utils/const.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -81,8 +81,8 @@ pycityagent/cityagent/__init__.py,sha256=gcBQ-a50XegFtjigQ7xDXRBZrywBKqifiQFSRnE
 pycityagent/cityagent/firmagent.py,sha256=UVlNN0lpa4cC4PZVqYzQhbc5VJ2oGsA1731mhbCjnR8,4109
 pycityagent/cityagent/nbsagent.py,sha256=WIXW__6dZ5IrqBqDCjvGbrCshpXzuFRV3Ww6gkYw7p4,4387
 pycityagent/cityagent/initial.py,sha256=7hgCt_tGdnVTXGfEQOn1GTW5dAs1b-ru_FwXxRLI6tM,4549
-pycityagent/cityagent/societyagent.py,sha256=DKkPtCPXTpHs83hi3bvXxkQYxKqZI0YldYCyFu4yjsk,24811
-pycityagent/cityagent/message_intercept.py,sha256=2RI4--5SVQy9aLXulxxldzmwOynwAKFqtmBaFUnEtsk,3511
+pycityagent/cityagent/societyagent.py,sha256=2J2LWiEHie-NXDQAOBBe_dmb9Zk8mJsLB2SY820W6Ng,20441
+pycityagent/cityagent/message_intercept.py,sha256=KqwW19zpPG8WMpiU91GAhJc9Gox3YgjFkTDokUFWAkw,3940
 pycityagent/cityagent/governmentagent.py,sha256=HJLuhvEmllu_1KnFEJsYCIasaBJT0BV9Cn_4Y2QGPqg,2791
 pycityagent/cityagent/blocks/dispatcher.py,sha256=mEa1r3tRS3KI1BMZR_w_sbUGzOj6aUJuiUrsHv1n2n0,2943
 pycityagent/cityagent/blocks/needs_block.py,sha256=s8LikgtKORfo_Sw9SQ5_3biNPTof15QuUs4cDynXCyM,15332
@@ -97,9 +97,9 @@ pycityagent/cityagent/blocks/mobility_block.py,sha256=xWbARMfJ3-6fddrW3VOUKJrXfM
 pycityagent/survey/models.py,sha256=YE50UUt5qJ0O_lIUsSY6XFCGUTkJVNu_L1gAhaCJ2fs,3546
 pycityagent/survey/__init__.py,sha256=rxwou8U9KeFSP7rMzXtmtp2fVFZxK4Trzi-psx9LPIs,153
 pycityagent/survey/manager.py,sha256=S5IkwTdelsdtZETChRcfCEczzwSrry_Fly9MY4s3rbk,1681
-pycityagent-2.0.0a61.dist-info/RECORD,,
-pycityagent-2.0.0a61.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
-pycityagent-2.0.0a61.dist-info/WHEEL,sha256=VujM3ypTCyUW6hcTDdK2ej0ARVMxlU1Djlh_zWnDgqk,109
-pycityagent-2.0.0a61.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
-pycityagent-2.0.0a61.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
-pycityagent-2.0.0a61.dist-info/METADATA,sha256=hvkHrK65VERp64_mKCo6cwULjsAl_GTwsui2NCwOek4,9110
+pycityagent-2.0.0a63.dist-info/RECORD,,
+pycityagent-2.0.0a63.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
+pycityagent-2.0.0a63.dist-info/WHEEL,sha256=VujM3ypTCyUW6hcTDdK2ej0ARVMxlU1Djlh_zWnDgqk,109
+pycityagent-2.0.0a63.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
+pycityagent-2.0.0a63.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
+pycityagent-2.0.0a63.dist-info/METADATA,sha256=bu9VH3Ht_PsoCbGdsQFGVSaPo0GcxtNE57QQ9HqMT1I,9110