pycityagent 2.0.0a88__cp312-cp312-macosx_11_0_arm64.whl → 2.0.0a90__cp312-cp312-macosx_11_0_arm64.whl

pycityagent/cityagent/blocks/mobility_block.py

@@ -46,7 +46,7 @@ Current temperature: {temperature}
 Your current emotion: {emotion_types}
 Your current thought: {thought}
 
-Please analyze how these emotions would affect travel willingness and return only a single integer number between 3000-100000 representing the maximum travel radius in meters. A more positive emotional state generally leads to greater willingness to travel further.
+Please analyze how these emotions would affect travel willingness and return only a single integer number between 3000-200000 representing the maximum travel radius in meters. A more positive emotional state generally leads to greater willingness to travel further.
 
 Return only the integer number without any additional text or explanation."""
 
@@ -121,7 +121,7 @@ class PlaceSelectionBlock(Block):
     """
 
     configurable_fields: List[str] = ["search_limit"]
-    default_values = {"search_limit": 10000}
+    default_values = {"search_limit": 1000}
 
     def __init__(self, llm: LLM, memory: Memory, simulator: Simulator):
         super().__init__(
@@ -134,7 +134,7 @@ class PlaceSelectionBlock(Block):
         )
         self.radiusPrompt = FormatPrompt(RADIUS_PROMPT)
         # configurable fields
-        self.search_limit = 100
+        self.search_limit = 1000
 
     async def forward(self, step, context):
         poi_cate = self.simulator.get_poi_cate()

pycityagent/cityagent/blocks/needs_block.py

@@ -333,26 +333,30 @@ class NeedsBlock(Block):
             social_satisfaction=await self.memory.status.get("social_satisfaction"),
         )
 
-        response = await self.llm.atext_request(self.evaluation_prompt.to_dialog())
-
-        try:
-            new_satisfaction = json.loads(self.clean_json_response(response))  # type: ignore
-            # 更新所有需求的数值
-            for need_type, new_value in new_satisfaction.items():
-                if need_type in [
-                    "hunger_satisfaction",
-                    "energy_satisfaction",
-                    "safety_satisfaction",
-                    "social_satisfaction",
-                ]:
-                    await self.memory.status.update(need_type, new_value)
-        except json.JSONDecodeError:
-            logger.warning(
-                f"Evaluation response is not a valid JSON format: {response}"
-            )
-        except Exception as e:
-            logger.warning(f"Error processing evaluation response: {str(e)}")
-            logger.warning(f"Original response: {response}")
+        retry = 3
+        while retry > 0:
+            response = await self.llm.atext_request(self.evaluation_prompt.to_dialog())
+            try:
+                new_satisfaction = json.loads(self.clean_json_response(response))  # type: ignore
+                # 更新所有需求的数值
+                for need_type, new_value in new_satisfaction.items():
+                    if need_type in [
+                        "hunger_satisfaction",
+                        "energy_satisfaction",
+                        "safety_satisfaction",
+                        "social_satisfaction",
+                    ]:
+                        await self.memory.status.update(need_type, new_value)
+                        return
+            except json.JSONDecodeError:
+                logger.warning(
+                    f"Evaluation response is not a valid JSON format: {response}"
+                )
+                retry -= 1
+            except Exception as e:
+                logger.warning(f"Error processing evaluation response: {str(e)}")
+                logger.warning(f"Original response: {response}")
+                retry -= 1
 
     def clean_json_response(self, response: str) -> str:
         """清理LLM响应中的特殊字符"""

pycityagent/cityagent/blocks/plan_block.py

@@ -213,13 +213,19 @@ class PlanBlock(Block):
         response = await self.llm.atext_request(
             self.guidance_prompt.to_dialog()
         )  # type: ignore
-
-        try:
-            result = json.loads(self.clean_json_response(response))  # type: ignore
-            return result
-        except Exception as e:
-            logger.warning(f"Error parsing guidance selection response: {str(e)}")
-            return None  # type: ignore
+        retry = 3
+        while retry > 0:
+            try:
+                result = json.loads(self.clean_json_response(response))  # type: ignore
+                if "selected_option" not in result or "evaluation" not in result:
+                    raise ValueError("Invalid guidance selection format")
+                if "attitude" not in result["evaluation"] or "subjective_norm" not in result["evaluation"] or "perceived_control" not in result["evaluation"] or "reasoning" not in result["evaluation"]:
+                    raise ValueError("Evaluation must include attitude, subjective_norm, perceived_control, and reasoning")
+                return result
+            except Exception as e:
+                logger.warning(f"Error parsing guidance selection response: {str(e)}")
+                retry -= 1
+        return None
 
     async def generate_detailed_plan(
         self, current_need: str, selected_option: str
@@ -252,20 +258,22 @@ class PlanBlock(Block):
         )
 
         response = await self.llm.atext_request(self.detail_prompt.to_dialog())
-
-        try:
-            result = json.loads(self.clean_json_response(response))  # type: ignore
-            return result
-        except Exception as e:
-            logger.warning(f"Error parsing detailed plan: {str(e)}")
-            return None  # type: ignore
+        retry = 3
+        while retry > 0:
+            try:
+                result = json.loads(self.clean_json_response(response))  # type: ignore
+                if "plan" not in result or "target" not in result["plan"] or "steps" not in result["plan"]:
+                    raise ValueError("Invalid plan format")
+                for step in result["plan"]["steps"]:
+                    if "intention" not in step or "type" not in step:
+                        raise ValueError("Each step must have an intention and a type")
+                return result
+            except Exception as e:
+                logger.warning(f"Error parsing detailed plan: {str(e)}")
+                retry -= 1
+        return None
 
     async def forward(self):
-        self.trigger_time += 1
-        consumption_start = (
-            self.llm.prompt_tokens_used + self.llm.completion_tokens_used
-        )
-
         # Step 1: Select guidance plan
         current_need = await self.memory.status.get("current_need")
         guidance_result = await self.select_guidance(current_need)
@@ -278,7 +286,7 @@ class PlanBlock(Block):
         )
 
         if not detailed_plan or "plan" not in detailed_plan:
-            await self.memory.status.update("current_plan", [])
+            await self.memory.status.update("current_plan", None)
             await self.memory.status.update(
                 "current_step", {"intention": "", "type": ""}
             )
@@ -311,9 +319,6 @@ Execution Steps: \n{formated_steps}
         )
         await self.memory.status.update("execution_context", {"plan": formated_plan})
 
-        consumption_end = self.llm.prompt_tokens_used + self.llm.completion_tokens_used
-        self.token_consumption += consumption_end - consumption_start
-
     def clean_json_response(self, response: str) -> str:
         """Clean special characters in LLM response"""
         response = response.replace("```json", "").replace("```", "")

pycityagent/cityagent/initial.py

@@ -142,6 +142,7 @@ async def bind_agent_info(simulation):
     for bank_uuid in bank_uuids:
         await simulation.economy_update(uid2agent[bank_uuid], "citizens", citizen_agent_ids)
     for nbs_uuid in nbs_uuids:
+        await simulation.update(nbs_uuid, "citizens", citizen_uuids)
         await simulation.economy_update(uid2agent[nbs_uuid], "citizens", citizen_agent_ids)
     logger.info("Agent info binding completed!")
 

pycityagent/cityagent/metrics.py

@@ -33,11 +33,11 @@ async def economy_metric(simulation):
         economy_metric.nbs_uuid = nbs_uuids[0]
     
     try:
-        real_gdp = await simulation.economy_client.get(nbs_id, 'real_gdp')
+        real_gdp = await simulation.economy_client.get(economy_metric.nbs_id, 'real_gdp')
     except:
         real_gdp = []
     if len(real_gdp) > 0:
-        real_gdp = real_gdp[0]
+        real_gdp = real_gdp[-1]
         forward_times_info = await simulation.gather("forward_times", [economy_metric.nbs_uuid])
         step_count = 0
         for group_gather in forward_times_info:
@@ -48,5 +48,5 @@ async def economy_metric(simulation):
         other_metrics = ['prices', 'working_hours', 'depression', 'consumption_currency', 'income_currency']
         other_metrics_names = ['price', 'working_hours', 'depression', 'consumption', 'income']
         for metric, metric_name in zip(other_metrics, other_metrics_names):
-            metric_value = (await simulation.economy_client.get(nbs_id, metric))[-1]
+            metric_value = (await simulation.economy_client.get(economy_metric.nbs_id, metric))[-1]
             await simulation.mlflow_client.log_metric(key=metric_name, value=metric_value, step=step_count)

pycityagent/cityagent/societyagent.py

@@ -73,6 +73,8 @@ class PlanAndActionBlock(Block):
     async def step_execution(self):
         """Execute the current step"""
         current_plan = await self.memory.status.get("current_plan")
+        if current_plan is None:
+            return
         execution_context = await self.memory.status.get("execution_context")
         current_step = await self.memory.status.get("current_step")
         # check current_step is valid (not empty)

pycityagent/environment/sim/sim_env.py

@@ -13,7 +13,9 @@ from ..utils import encode_to_base64, find_free_port
 __all__ = ["ControlSimEnv"]
 
 
-def _generate_yaml_config(map_file: str, max_day: int, start_step: int, total_step: int) -> str:
+def _generate_yaml_config(
+    map_file: str, max_day: int, start_step: int, total_step: int
+) -> str:
     map_file = os.path.abspath(map_file)
     return f"""
 input:
@@ -48,6 +50,7 @@ class ControlSimEnv:
         start_step: int,
         total_step: int,
         log_dir: str,
+        primary_node_ip: str,
         min_step_time: int = 1000,
         timeout: int = 5,
         max_process: int = 32,
@@ -68,9 +71,12 @@ class ControlSimEnv:
         self._log_dir = log_dir
         self._min_step_time = min_step_time
         self._timeout = timeout
+        self._primary_node_ip = primary_node_ip
         self._max_procs = max_process
 
-        self._sim_config = _generate_yaml_config(map_file, max_day, start_step, total_step)
+        self._sim_config = _generate_yaml_config(
+            map_file, max_day, start_step, total_step
+        )
         # sim
         self.sim_port = None
         self._sim_proc = None
@@ -102,6 +108,7 @@ class ControlSimEnv:
             self.sim_port = find_free_port()
             config_base64 = encode_to_base64(self._sim_config)
             os.environ["GOMAXPROCS"] = str(self._max_procs)
+            sim_addr = self._primary_node_ip.rstrip("/") + f":{self.sim_port}"
             self._sim_proc = Popen(
                 [
                     "pycityagent-sim",
@@ -110,7 +117,7 @@ class ControlSimEnv:
                     "-job",
                     self._task_name,
                     "-listen",
-                    f":{self.sim_port}",
+                    sim_addr,
                     "-run.min_step_time",
                     f"{self._min_step_time}",
                     "-run.pause_after_one_day",
@@ -125,9 +132,8 @@ class ControlSimEnv:
                 # stdout=DEVNULL,
             )
             logging.info(
-                f"start pycityagent-sim at localhost:{self.sim_port}, PID={self._sim_proc.pid}"
+                f"start pycityagent-sim at {sim_addr}, PID={self._sim_proc.pid}"
             )
-            sim_addr = f"http://localhost:{self.sim_port}"
             atexit.register(self.close)
             time.sleep(0.3)
         else:

pycityagent/environment/simulator.py

@@ -126,10 +126,10 @@ class Simulator:
                     ),
                     log_dir=config["simulator"].get("log_dir", "./log"),
                     min_step_time=config["simulator"].get("min_step_time", 1000),
+                    primary_node_ip=config["simulator"].get("ad", "http://localhost"),
                     sim_addr=config["simulator"].get("server", None),
                 )
-                primary_node_ip = config["simulator"].get("ad", "http://localhost")
-                self.server_addr = primary_node_ip.rstrip("/")+f":{sim_env.sim_port}"
+                self.server_addr = sim_env.sim_addr
                 config["simulator"]["server"] = self.server_addr
                 config["simulator"]["_server_activated"] = True
                 # using local client

{pycityagent-2.0.0a88.dist-info → pycityagent-2.0.0a90.dist-info}/METADATA

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

@@ -1,9 +1,3 @@
-pycityagent-2.0.0a88.dist-info/RECORD,,
-pycityagent-2.0.0a88.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
-pycityagent-2.0.0a88.dist-info/WHEEL,sha256=VujM3ypTCyUW6hcTDdK2ej0ARVMxlU1Djlh_zWnDgqk,109
-pycityagent-2.0.0a88.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
-pycityagent-2.0.0a88.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
-pycityagent-2.0.0a88.dist-info/METADATA,sha256=RX-Ot6Yyl_W0-bl9cJur9nQVLlAoI3WQ2YKiz37qTwk,9110
 pycityagent/pycityagent-sim,sha256=Ax6cjHjT8VcT5t07VboL_Ruor2eXSdSEml4Jvv-L5dQ,36972594
 pycityagent/__init__.py,sha256=PUKWTXc-xdMG7px8oTNclodsILUgypANj2Z647sY63k,808
 pycityagent/pycityagent-ui,sha256=Ur95yZygIaZ5l_CDqP9394M5GQ66iV5PkcNPYFWqzvk,41225346
@@ -52,7 +46,7 @@ pycityagent/workflow/prompt.py,sha256=rzenP4EFGxbWE1aq-x2036b6umKvi5cQx2xtWULwgI
 pycityagent/workflow/block.py,sha256=WJfCeL8e117GzkVPJCRNsQZZinccMnVyEubkwrf-17U,12295
 pycityagent/workflow/trigger.py,sha256=4nzAwywGQsFabgo6gzp-vD2EV4wII7Z0LHGEAsflSEY,7608
 pycityagent/environment/__init__.py,sha256=fFIth2jxxgZ92cXm-aoM2igHgaSqsYGwtBhyb7opjzk,166
-pycityagent/environment/simulator.py,sha256=ubOsoeyo81LZKfOSeS4eGrpn-7lC-hrdCBbcLH9NbK8,23324
+pycityagent/environment/simulator.py,sha256=evctZcl9SrRDj1-1wzuEgRwhW9iGjzXmbdlA-1dhwhg,23293
 pycityagent/environment/utils/port.py,sha256=3OM6kSUt3PxvDUOlgyiendBtETaWU8Mzk_8H0TzTmYg,295
 pycityagent/environment/utils/grpc.py,sha256=_lB4-k4dTKuNvApaDiYgFxiLTPtYG42DVQtG9yOj9pQ,2022
 pycityagent/environment/utils/base64.py,sha256=hoREzQo3FXMN79pqQLO2jgsDEvudciomyKii7MWljAM,374
@@ -64,7 +58,7 @@ pycityagent/environment/utils/const.py,sha256=1LqxnYJ8FSmq37fN5kIFlWLwycEDzFa8SF
 pycityagent/environment/sim/pause_service.py,sha256=UUTa4pTBOX_MGKki9QDgKId7scch0waAWF9xRVmNlAs,1701
 pycityagent/environment/sim/person_service.py,sha256=T1pRi5jDcivSInX7iGZoHKYZmgO7_t5MYtLhU12_LC4,10793
 pycityagent/environment/sim/aoi_service.py,sha256=bYVJDrOfDn8hgOORDU7PxMaT-fpqXA5Z0A080l2EPBc,1242
-pycityagent/environment/sim/sim_env.py,sha256=4CW9lv9CyRUFsa0mwZ3AQsBps3i1Qh1KIRSgHdZWy0U,4658
+pycityagent/environment/sim/sim_env.py,sha256=iXdM2fQo-StbB55WcRDlY4Y4MbZ7ApZp7fAv58Cg9Rk,4758
 pycityagent/environment/sim/lane_service.py,sha256=bmf0zOWkxDzMEDlhTdHNRJRiTFGgzjbeqmex387gHZs,3964
 pycityagent/environment/sim/client.py,sha256=x4REWPRFG_C2s0-CWz8MnYalD_esfu2pPHf_vpsCG78,2852
 pycityagent/environment/sim/__init__.py,sha256=CyJc5Tey9MgzomZv0ynAcV0yaUlSE3bPbegYXar8wJc,601
@@ -72,26 +66,32 @@ pycityagent/environment/sim/social_service.py,sha256=Y4A56aKXsjSv18UFumGPjQoJVMc
 pycityagent/environment/sim/light_service.py,sha256=q4pKcGrm7WU0h29I1dFIDOz2OV0BM-2s37uC6zokkoA,4290
 pycityagent/environment/sim/clock_service.py,sha256=4Hly8CToghj0x_XbDgGrIZy1YYAlDH0EUGCiCDYpk_I,1375
 pycityagent/environment/sim/road_service.py,sha256=Bb1sreO0Knt9tcqH_WJF-I3P3G92bRAlzDBEa--25GE,1297
-pycityagent/cityagent/metrics.py,sha256=SdCxEuO-wgsPGo3H6xywnOAfP5Lre-bc7HNAQ-n53mA,2687
+pycityagent/cityagent/metrics.py,sha256=wVxLpk4jvVoPf2baiK-jMIi2rPPMRnFpSjOVyj1k74A,2718
 pycityagent/cityagent/memory_config.py,sha256=lCySjh8jpE3Sj-_XTCPizxJN8rjfcYD54sed7wi2EDw,11958
 pycityagent/cityagent/bankagent.py,sha256=I6MNG1fUbxKyWCLxCtvOjeVahong_LhHQKmJdRPhQL8,4097
 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=0DSOWnVVknMw6xoJWfdZUFBH3yti8y800wnkXXCocxY,6194
-pycityagent/cityagent/societyagent.py,sha256=1c6k3RgxQ7AAYCiBXwiSZLDkCDMgCrBzNF6vi6lK2Yc,20069
+pycityagent/cityagent/initial.py,sha256=tVcO9ECGvsFatpxQirZbZf0ESFBxSpSxkm4p0x2kiO0,6263
+pycityagent/cityagent/societyagent.py,sha256=i7V7BeCb_pMJpxwiR5AOUcNHRw0SXHXltt_DtCxE6pE,20121
 pycityagent/cityagent/message_intercept.py,sha256=dyT1G-nMxKb2prhgtyFFHFz593qBrkk5DnHsHvG1OIc,4418
 pycityagent/cityagent/governmentagent.py,sha256=XIyggG83FWUTZdOuoqc6ClCP3hhfkxNmtYRu9TFo0dU,3063
 pycityagent/cityagent/blocks/dispatcher.py,sha256=U5BPeUrjrTyDaznYfT6YUJIW8vfKVRDF4EO0oOn6Td4,2886
-pycityagent/cityagent/blocks/needs_block.py,sha256=NYKrGDoYCuXoupMNMuSNhx4Ci1paC_EuGRWvp5-ZSA8,15909
+pycityagent/cityagent/blocks/needs_block.py,sha256=eFWDgsqjh4FYaGeb8wL5R9ndaXN3977ymexoItDUki8,16112
 pycityagent/cityagent/blocks/cognition_block.py,sha256=yzjB0D_95vytpa5xiVdmTSpGp8H9HXcjWzzFN0OpP0k,15398
 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=l47x2Iq15Rjj9WsH3p398dtpcejat4aCkC3X160xBlE,19843
 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=A5DvtXIy98MZkRGUQmp26grNI5i0BVbl3aEM_Ebd6Z4,11271
-pycityagent/cityagent/blocks/mobility_block.py,sha256=qkRiV0nkGOUUoo9lGIjAFE_Hl0kiyMev12-Zm7JyV7o,15089
+pycityagent/cityagent/blocks/plan_block.py,sha256=AFyjj-RimYNkZ8x6sU-ZMWwB1jqJxSvr1j0vEKmhG4w,11967
+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.0a90.dist-info/RECORD,,
+pycityagent-2.0.0a90.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
+pycityagent-2.0.0a90.dist-info/WHEEL,sha256=VujM3ypTCyUW6hcTDdK2ej0ARVMxlU1Djlh_zWnDgqk,109
+pycityagent-2.0.0a90.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
+pycityagent-2.0.0a90.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
+pycityagent-2.0.0a90.dist-info/METADATA,sha256=I5U7O4c3mvMLk0rbjGwgrfStY2sjJhK0n6gF1_5nu7g,9110