pycityagent 2.0.0a94__cp39-cp39-macosx_11_0_arm64.whl → 2.0.0a96__cp39-cp39-macosx_11_0_arm64.whl

pycityagent/agent/agent.py

@@ -6,12 +6,10 @@ import random
 from copy import deepcopy
 from typing import Any, Optional
 
-from mosstool.util.format_converter import dict2pb
-from pycityproto.city.person.v2 import person_pb2 as person_pb2
 import ray
+from pycityproto.city.person.v2 import person_pb2 as person_pb2
 
-from ..economy import EconomyClient
-from ..environment import Simulator
+from ..environment import EconomyClient, Simulator
 from ..llm import LLM
 from ..memory import Memory
 from ..message import MessageInterceptor, Messager
@@ -281,7 +279,9 @@ class InstitutionAgent(Agent):
             _id = random.randint(100000, 999999)
             self._agent_id = _id
             self.status.set_agent_id(_id)
-            map_header = ray.get(self.simulator.map.get_map_header.remote())
+            map_header: dict = ray.get(
+                self.simulator.map.get_map_header.remote()  # type:ignore
+            )
             # TODO: remove random position assignment
             await self.status.update(
                 "position",

pycityagent/agent/agent_base.py

@@ -14,8 +14,7 @@ import fastavro
 import ray
 from pycityproto.city.person.v2 import person_pb2 as person_pb2
 
-from ..economy import EconomyClient
-from ..environment import Simulator
+from ..environment import EconomyClient, Simulator
 from ..environment.sim.person_service import PersonService
 from ..llm import LLM
 from ..memory import Memory
@@ -261,20 +260,16 @@ class Agent(ABC):
             - Recursively updates or creates top-level Blocks as specified in the configuration.
             - Raises a `KeyError` if a required Block is not found in the agent.
         """
-        # 使用配置更新当前Agent实例的Block层次结构。
-        # 更新当前Agent的基础参数
         for field in self.configurable_fields:
             if field in config["config"]:
                 if config["config"][field] != "default_value":
                     setattr(self, field, config["config"][field])
 
-        # 递归更新或创建顶层Block
         for block_data in config.get("blocks", []):
             block_name = block_data["name"]
             existing_block = getattr(self, block_name, None)  # type:ignore
 
             if existing_block:
-                # 如果Block已经存在，则递归更新
                 existing_block.load_from_config(block_data)
             else:
                 raise KeyError(

pycityagent/cityagent/__init__.py

@@ -1,9 +1,11 @@
-from .societyagent import SocietyAgent
-from .firmagent import FirmAgent
 from .bankagent import BankAgent
-from .nbsagent import NBSAgent
+from .firmagent import FirmAgent
 from .governmentagent import GovernmentAgent
-from .memory_config import memory_config_societyagent, memory_config_government, memory_config_firm, memory_config_bank, memory_config_nbs
+from .memory_config import (memory_config_bank, memory_config_firm,
+                            memory_config_government, memory_config_nbs,
+                            memory_config_societyagent)
+from .nbsagent import NBSAgent
+from .societyagent import SocietyAgent
 
 __all__ = [
     "SocietyAgent",
@@ -17,4 +19,3 @@ __all__ = [
     "memory_config_bank",
     "memory_config_nbs",
 ]
-

pycityagent/cityagent/bankagent.py

@@ -4,7 +4,7 @@ from typing import Optional
 import numpy as np
 from pycityagent import Simulator, InstitutionAgent
 from pycityagent.llm.llm import LLM
-from pycityagent.economy import EconomyClient
+from pycityagent.environment import EconomyClient
 from pycityagent.message import Messager
 from pycityagent.memory import Memory
 import logging
@@ -102,4 +102,4 @@ class BankAgent(InstitutionAgent):
             else:
                 interest_rate = natural_interest_rate + target_inflation
             await self.economy_client.update(self._agent_id, 'interest_rate', interest_rate)
-            print("bank forward end")
+            print("bank forward end")

pycityagent/cityagent/blocks/__init__.py

@@ -1,10 +1,10 @@
-from .mobility_block import MobilityBlock
 from .cognition_block import CognitionBlock
-from .plan_block import PlanBlock
-from .needs_block import NeedsBlock
-from .social_block import SocialBlock
 from .economy_block import EconomyBlock
+from .mobility_block import MobilityBlock
+from .needs_block import NeedsBlock
 from .other_block import OtherBlock
+from .plan_block import PlanBlock
+from .social_block import SocialBlock
 
 __all__ = [
     "MobilityBlock",

pycityagent/cityagent/blocks/cognition_block.py

@@ -37,6 +37,7 @@ class CognitionBlock(Block):
         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 +76,9 @@ 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(query=topic, 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
@@ -110,7 +113,7 @@ class CognitionBlock(Block):
             for retry in range(10):
                 try:
                     _response = await self.llm.atext_request(
-                        question_prompt.to_dialog(), timeout=300
+                        question_prompt.to_dialog(), timeout=300, response_format={"type": "json_object"}
                     )
                     response = json.loads(extract_json(_response))  # type:ignore
                     evaluation = False
@@ -186,7 +189,7 @@ class CognitionBlock(Block):
         for retry in range(10):
             try:
                 _response = await self.llm.atext_request(
-                    question_prompt.to_dialog(), timeout=300
+                    question_prompt.to_dialog(), timeout=300, response_format={"type": "json_object"}
                 )
                 response = json.loads(extract_json(_response))  # type:ignore
                 evaluation = False
@@ -280,7 +283,7 @@ class CognitionBlock(Block):
         for retry in range(10):
             try:
                 _response = await self.llm.atext_request(
-                    question_prompt.to_dialog(), timeout=300
+                    question_prompt.to_dialog(), timeout=300, response_format={"type": "json_object"}
                 )
                 response = json.loads(extract_json(_response))  # type:ignore
                 evaluation = False