pycityagent 2.0.0a96__cp311-cp311-macosx_11_0_arm64.whl → 2.0.0a98__cp311-cp311-macosx_11_0_arm64.whl

pycityagent/agent/agent_base.py

@@ -245,12 +245,12 @@ class Agent(ABC):
             config = json.load(f)
             return cls.import_block_config(config)
 
-    def load_from_config(self, config: dict[str, list[dict]]) -> None:
+    def load_from_config(self, config: dict[str, Any]) -> None:
         """
         Update the current Agent instance's Block hierarchy using the provided configuration.
 
         - **Args**:
-            - `config` (`dict[str, list[dict]]`): A dictionary containing the configuration for updating the agent and its blocks.
+            - `config` (`dict[str, Any]`): A dictionary containing the configuration for updating the agent and its blocks.
 
         - **Returns**:
             - `None`

pycityagent/cityagent/blocks/mobility_block.py

@@ -13,9 +13,10 @@ from pycityagent.llm import LLM
 from pycityagent.memory import Memory
 from pycityagent.workflow.block import Block
 from pycityagent.workflow.prompt import FormatPrompt
-
+from .utils import clean_json_response
 from .dispatcher import BlockDispatcher
 
+
 logger = logging.getLogger("pycityagent")
 
 
@@ -166,10 +167,11 @@ class PlaceSelectionBlock(Block):
         )
         levelOneType = await self.llm.atext_request(self.typeSelectionPrompt.to_dialog(), response_format={"type": "json_object"})  # type: ignore
         try:
+            levelOneType = clean_json_response(levelOneType)
             levelOneType = json.loads(levelOneType)["place_type"]
             sub_category = poi_cate[levelOneType]
         except Exception as e:
-            logger.warning(f"Wrong type of poi, raw response: {levelOneType}")
+            logger.warning(f"Level One Type Selection: wrong type of poi, raw response: {levelOneType}")
             levelOneType = random.choice(list(poi_cate.keys()))
             sub_category = poi_cate[levelOneType]
         self.secondTypeSelectionPrompt.format(
@@ -177,9 +179,10 @@ class PlaceSelectionBlock(Block):
         )
         levelTwoType = await self.llm.atext_request(self.secondTypeSelectionPrompt.to_dialog(), response_format={"type": "json_object"})  # type: ignore
         try:
+            levelTwoType = clean_json_response(levelTwoType)
             levelTwoType = json.loads(levelTwoType)["place_type"]
         except Exception as e:
-            logger.warning(f"Wrong type of poi, raw response: {levelTwoType}")
+            logger.warning(f"Level Two Type Selection: wrong type of poi, raw response: {levelTwoType}")
             levelTwoType = random.choice(sub_category)
         center = await self.memory.status.get("position")
         center = (center["xy_position"]["x"], center["xy_position"]["y"])
@@ -260,19 +263,18 @@ class MoveBlock(Block):
         self.placeAnalysisPrompt = FormatPrompt(PLACE_ANALYSIS_PROMPT)
 
     async def forward(self, step, context):
-        # 这里应该添加移动的具体逻辑
         agent_id = await self.memory.status.get("id")
         self.placeAnalysisPrompt.format(
             plan=context["plan"], intention=step["intention"]
         )
         response = await self.llm.atext_request(self.placeAnalysisPrompt.to_dialog(), response_format={"type": "json_object"})  # type: ignore
         try:
+            response = clean_json_response(response)
             response = json.loads(response)["place_type"]
         except Exception as e:
-            logger.warning(f"Wrong type of poi, raw response: {response}")
+            logger.warning(f"Place Analysis: wrong type of place, raw response: {response}")
             response = "home"
         if response == "home":
-            # 返回到家
             home = await self.memory.status.get("home")
             home = home["aoi_position"]["aoi_id"]
             nowPlace = await self.memory.status.get("position")

pycityagent/cityagent/blocks/needs_block.py

@@ -8,6 +8,7 @@ from pycityagent.llm import LLM
 from pycityagent.memory import Memory
 from pycityagent.workflow.block import Block
 from pycityagent.workflow.prompt import FormatPrompt
+from .utils import clean_json_response
 
 logger = logging.getLogger("pycityagent")
 
@@ -126,7 +127,7 @@ class NeedsBlock(Block):
                 now_time=await self.simulator.get_time(format_time=True),
             )
             response = await self.llm.atext_request(self.initial_prompt.to_dialog(), response_format={"type": "json_object"})
-            response = self.clean_json_response(response)
+            response = clean_json_response(response)
             retry = 3
             while retry > 0:
                 try:
@@ -309,7 +310,7 @@ class NeedsBlock(Block):
         while retry > 0:
             response = await self.llm.atext_request(self.evaluation_prompt.to_dialog(), response_format={"type": "json_object"})
             try:
-                new_satisfaction = json.loads(self.clean_json_response(response))  # type: ignore
+                new_satisfaction = json.loads(clean_json_response(response))  # type: ignore
                 # 更新所有需求的数值
                 for need_type, new_value in new_satisfaction.items():
                     if need_type in [
@@ -330,11 +331,6 @@ class NeedsBlock(Block):
                 logger.warning(f"Original response: {response}")
                 retry -= 1
 
-    def clean_json_response(self, response: str) -> str:
-        """清理LLM响应中的特殊字符"""
-        response = response.replace("```json", "").replace("```", "")
-        return response.strip()
-
     async def forward(self):
         await self.initialize()
 

pycityagent/cityagent/blocks/plan_block.py

@@ -10,7 +10,7 @@ from pycityagent.llm import LLM
 from pycityagent.memory import Memory
 from pycityagent.workflow import Block
 from pycityagent.workflow.prompt import FormatPrompt
-
+from .utils import clean_json_response
 logger = logging.getLogger("pycityagent")
 
 GUIDANCE_SELECTION_PROMPT = """As an intelligent agent's decision system, please select the most suitable option from the following choices to satisfy the current need.
@@ -203,7 +203,7 @@ class PlanBlock(Block):
         retry = 3
         while retry > 0:
             try:
-                result = json.loads(self.clean_json_response(response))  # type: ignore
+                result = json.loads(clean_json_response(response))  # type: ignore
                 if "selected_option" not in result or "evaluation" not in result:
                     raise ValueError("Invalid guidance selection format")
                 if (
@@ -255,7 +255,7 @@ class PlanBlock(Block):
         retry = 3
         while retry > 0:
             try:
-                result = json.loads(self.clean_json_response(response))  # type: ignore
+                result = json.loads(clean_json_response(response))  # type: ignore
                 if (
                     "plan" not in result
                     or "target" not in result["plan"]
@@ -316,8 +316,3 @@ Execution Steps: \n{formated_steps}
             "current_step", steps[0] if steps else {"intention": "", "type": ""}
         )
         await self.memory.status.update("execution_context", {"plan": formated_plan})
-
-    def clean_json_response(self, response: str) -> str:
-        """Clean special characters in LLM response"""
-        response = response.replace("```json", "").replace("```", "")
-        return response.strip()

pycityagent/cityagent/blocks/utils.py

@@ -57,6 +57,6 @@ def extract_dict_from_string(input_string):
 
 
 def clean_json_response(response: str) -> str:
-    """清理LLM响应中的特殊字符"""
+    """remove the special characters in the response"""
     response = response.replace("```json", "").replace("```", "")
-    return response.strip()
+    return response.strip()

pycityagent/simulation/agentgroup.py

@@ -47,7 +47,7 @@ class AgentGroup:
         mlflow_run_id: str,
         embedding_model: Embeddings,
         logging_level: int,
-        agent_config_file: Optional[dict[type[Agent], str]] = None,
+        agent_config_file: Optional[dict[type[Agent], Any]] = None,
         llm_semaphore: int = 200,
         environment: Optional[dict] = None,
     ):
@@ -76,7 +76,7 @@ class AgentGroup:
             - `mlflow_run_id` (str): Run identifier for MLflow tracking.
             - `embedding_model` (Embeddings): Model used for generating embeddings.
             - `logging_level` (int): Logging level for the agent group.
-            - `agent_config_file` (Optional[Dict[Type[Agent], str]], optional): File paths for loading agent configurations. Defaults to None.
+            - `agent_config_file` (Optional[Dict[Type[Agent], Any]], optional): File paths for loading agent configurations. Defaults to None.
             - `environment` (Optional[Dict[str, str]], optional): Environment variables for the simulator. Defaults to None.
         """
         logger.setLevel(logging_level)
@@ -105,8 +105,6 @@ class AgentGroup:
                 "status": self.avro_path / f"status.avro",
                 "survey": self.avro_path / f"survey.avro",
             }
-        if self.enable_pgsql:
-            pass
         # Mlflow
         metric_config = config.prop_metric_request
         if metric_config is not None and metric_config.mlflow is not None:
@@ -147,7 +145,7 @@ class AgentGroup:
         # prepare Simulator
         logger.info(f"-----Initializing Simulator in AgentGroup {self._uuid} ...")
         self.simulator = Simulator(config)
-        self.simulator.set_environment(environment)
+        self.simulator.set_environment(environment if environment else {})
         self.simulator.set_map(map_ref)
         self.projector = pyproj.Proj(
             ray.get(self.simulator.map.get_projector.remote())  # type:ignore

pycityagent/simulation/simulation.py

@@ -374,7 +374,7 @@ class AgentSimulation:
                 await simulation.pause_simulator()
             elif step.type == WorkflowType.RESUME:
                 await simulation.resume_simulator()
-            elif step.type == WorkflowType.FUNCTION:
+            else:
                 _func = cast(Callable, step.func)
                 await _func(simulation)
         logger.info("Simulation finished")

{pycityagent-2.0.0a96.dist-info → pycityagent-2.0.0a98.dist-info}/METADATA

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

@@ -18,9 +18,9 @@ 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=GrD5VWaEvrKrBFwhEKUUfQfk2rweTEZnROaBZJXSni0,47134
+pycityagent/simulation/simulation.py,sha256=YPRzB7wCL-K85W3hgvBWukefyEgZXZCi4egH6rZa6XA,47099
 pycityagent/simulation/__init__.py,sha256=u1WpgwVxPboXWMxrUQKMXJNmTKQYAeCaqZv9HmSxESY,118
-pycityagent/simulation/agentgroup.py,sha256=DYx68TckA5ox9x_GHID-3Gg19qABY-NR9QAO2BKKfMc,36814
+pycityagent/simulation/agentgroup.py,sha256=lCz1Ruuz1TtuwzCnRVSPROey7FaXObiQmvNpv3lnzZw,36790
 pycityagent/simulation/storage/pg.py,sha256=xRshSOGttW-p0re0fNBOjOpb-nQ5msIE2LsdT79_E_Y,8425
 pycityagent/message/message_interceptor.py,sha256=Z7I1vqs4BrKadPAtQi-nfbkgboBAflXDSIcbIpDAxB8,17777
 pycityagent/message/__init__.py,sha256=f5QH7DKPqEAMyfSlBMnl3uouOKlsoel909STlIe7nUk,276
@@ -35,7 +35,7 @@ pycityagent/utils/parsers/__init__.py,sha256=AN2xgiPxszWK4rpX7zrqRsqNwfGF3WnCA5-
 pycityagent/utils/parsers/code_block_parser.py,sha256=jy6wHx9zypvJTWneCKuUaLQL19d4yLK6C_awc7y8A-k,1179
 pycityagent/utils/parsers/parser_base.py,sha256=ZbqRcqOBL9hfHVZSltQSQmJnWrtuJS9aYeOJU-FlJ0E,1725
 pycityagent/utils/parsers/json_parser.py,sha256=sakKohUuMcUH2toR85CAG_37D02ZoAn6LlzLgftUjmo,2923
-pycityagent/agent/agent_base.py,sha256=Fmp9wYwiDskEQxslweO3Jc-1OwbB9vgjv1VfZZIHSGI,39252
+pycityagent/agent/agent_base.py,sha256=jYatA3gxdJTRRqvtcKBABD7NywwhlV18qUDnUiw8qRM,39238
 pycityagent/agent/__init__.py,sha256=U20yKu9QwSqAx_PHk5JwipfODkDfxONtumVfnsKjWFg,180
 pycityagent/agent/agent.py,sha256=zJs09Tzz53av59SzmrlJj6Yd-XId6voCYaxguLbbq3s,18991
 pycityagent/cli/wrapper.py,sha256=bAwmfWTXbGld-uiMnIMhKp22IVRQjhLUToknyUDk9rQ,1147
@@ -81,21 +81,21 @@ pycityagent/cityagent/societyagent.py,sha256=z1i7yPRz7Uupw5oGpMlFwyDi-8R4wHSCjgh
 pycityagent/cityagent/message_intercept.py,sha256=Am0u-hGFOBcvcNXE_WJos5iwh2QoJLihdSIz3sr_U9Y,4439
 pycityagent/cityagent/governmentagent.py,sha256=P3ufIfM5ldh2KC9y_y1ONowsV3FsFF5LWe0iQ3MVmgA,3067
 pycityagent/cityagent/blocks/dispatcher.py,sha256=gd3lyggvtkCq9Ou_icgua60H0UjHTzwHoynLl_iZoes,2939
-pycityagent/cityagent/blocks/needs_block.py,sha256=PDReR1GjF3qafR06Wfw_mizzBZ6xRQRq6KqgA9r8WOA,15321
+pycityagent/cityagent/blocks/needs_block.py,sha256=1Mnr2vStBxSbmh2WByJdefOvTToKOENYDhyZFuL0KiM,15142
 pycityagent/cityagent/blocks/cognition_block.py,sha256=vy7wEvK72-sOieSSWidIXd5nKPLR-4f-ZYL7gyvje-0,15552
 pycityagent/cityagent/blocks/social_block.py,sha256=C1zMcN3RZBYewqw0MEYgtTf5Jzsol1Up3Ew9ovTSm1Y,15169
 pycityagent/cityagent/blocks/__init__.py,sha256=Tmy1CyQ8s3Iltp4xYWNg73Y28UWQv_LNWgMzgzquQT0,420
 pycityagent/cityagent/blocks/economy_block.py,sha256=w1rbTb4CqqXD9BDQuOAtCmrJ4KJjJYiQ5hJHEmCs6CA,20924
-pycityagent/cityagent/blocks/utils.py,sha256=YQkthaMkSCnT-1yfOkioGDvi2c-NLc5B-08BBlW4z0k,1781
+pycityagent/cityagent/blocks/utils.py,sha256=dNIQGv7Br3hWOFznW1JRrFVeGw2vn3QRiPq732we5kQ,1792
 pycityagent/cityagent/blocks/other_block.py,sha256=-H2umOQ-l7_9SjP-SHu7J4oHDh4V-r649_4kGS9Qrng,4447
-pycityagent/cityagent/blocks/plan_block.py,sha256=-3ww7WPzEoDHXJp_WRudllL9GphAQw_-nR426OUEiGY,11897
-pycityagent/cityagent/blocks/mobility_block.py,sha256=rrWzJO6mCMxUFfl1txOqq9BY7FmQ3LE3-Kr0d-4jnCc,16669
+pycityagent/cityagent/blocks/plan_block.py,sha256=3TfXg6Iqa9Z_fh22KV2ZLNffNFglIV22vgCfGmorNe4,11710
+pycityagent/cityagent/blocks/mobility_block.py,sha256=bUoExMdxlMzbnWHe1hx6bkR2Jjc1CZglux8RAXrWaRE,16876
 pycityagent/survey/models.py,sha256=g3xni4GcA1Py3vlGt6z4ltutjgQ4G0uINYAM8vKRJAw,5225
 pycityagent/survey/__init__.py,sha256=rxwou8U9KeFSP7rMzXtmtp2fVFZxK4Trzi-psx9LPIs,153
 pycityagent/survey/manager.py,sha256=QZEApC6tKe-g1waDa_O4Eg4CFkyL8KWa7tUGZnT_7WI,3397
-pycityagent-2.0.0a96.dist-info/RECORD,,
-pycityagent-2.0.0a96.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
-pycityagent-2.0.0a96.dist-info/WHEEL,sha256=NW1RskY9zow1Y68W-gXg0oZyBRAugI1JHywIzAIai5o,109
-pycityagent-2.0.0a96.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
-pycityagent-2.0.0a96.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
-pycityagent-2.0.0a96.dist-info/METADATA,sha256=DAlWpG0FCdi2l-ae2kPICBXklMtezwsG1H_lFKHpi2E,8657
+pycityagent-2.0.0a98.dist-info/RECORD,,
+pycityagent-2.0.0a98.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
+pycityagent-2.0.0a98.dist-info/WHEEL,sha256=NW1RskY9zow1Y68W-gXg0oZyBRAugI1JHywIzAIai5o,109
+pycityagent-2.0.0a98.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
+pycityagent-2.0.0a98.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
+pycityagent-2.0.0a98.dist-info/METADATA,sha256=n8hlDfjXb8yJTLVUOsIdUc2XpEYSc8yyO8lfJ3aL8XU,8657