pycityagent 2.0.0a24__py3-none-any.whl → 2.0.0a26__py3-none-any.whl

pycityagent/environment/simulator.py

@@ -3,7 +3,6 @@
 import asyncio
 import logging
 import os
-from collections.abc import Sequence
 from datetime import datetime, timedelta
 from typing import Any, Optional, Union, cast
 
@@ -22,13 +21,14 @@ from .utils.const import *
 
 logger = logging.getLogger("pycityagent")
 
+
 class Simulator:
     """
     - 模拟器主类
     - Simulator Class
     """
 
-    def __init__(self, config:dict, secure: bool = False) -> None:
+    def __init__(self, config: dict, secure: bool = False) -> None:
         self.config = config
         """
         - 模拟器配置
@@ -104,6 +104,8 @@ class Simulator:
         self._bbox: tuple[float, float, float, float] = (-1, -1, -1, -1)
         self.poi_matrix_centers = []
         self._lock = asyncio.Lock()
+        # poi id dict
+        self.poi_id_2_aoi_id: dict[int, int] = {}
         # poi STRtree
         self.set_poi_tree()
 
@@ -146,6 +148,7 @@ class Simulator:
         for tree_id, poi in enumerate(self.map.pois.values()):
             tree_id_2_poi_and_catg[tree_id] = (poi, poi["category"])
             poi_geos.append(Point([poi["position"][k] for k in ["x", "y"]]))
+            self.poi_id_2_aoi_id[poi["id"]] = poi["aoi_id"]
         self.tree_id_2_poi_and_catg = tree_id_2_poi_and_catg
         self.pois_tree = STRtree(poi_geos)
 
@@ -193,7 +196,7 @@ class Simulator:
         else:
             # BUG: 返回的time是float类型
             return t_sec["t"]
-        
+
     async def get_simulator_day(self) -> int:
         """
         获取模拟器到第几日
@@ -202,7 +205,7 @@ class Simulator:
         t_sec = cast(dict[str, int], t_sec)
         day = t_sec["t"] // 86400
         return day
-    
+
     async def get_simulator_second_from_start_of_day(self) -> int:
         """
         获取模拟器从00:00:00到当前的秒数
@@ -250,12 +253,21 @@ class Simulator:
         _schedules = []
         for target_pos, _time, _mode in zip(target_positions, departure_times, modes):
             if isinstance(target_pos, int):
-                aoi_id = target_pos
-                end = {
-                    "aoi_position": {
-                        "aoi_id": aoi_id,
+                if target_pos >= POI_START_ID:
+                    poi_id = target_pos
+                    end = {
+                        "aoi_position": {
+                            "aoi_id": self.poi_id_2_aoi_id[poi_id],
+                            "poi_id": poi_id,
+                        }
+                    }
+                else:
+                    aoi_id = target_pos
+                    end = {
+                        "aoi_position": {
+                            "aoi_id": aoi_id,
+                        }
                     }
-                }
             else:
                 aoi_id, poi_id = target_pos
                 end = {"aoi_position": {"aoi_id": aoi_id, "poi_id": poi_id}}
@@ -316,7 +328,7 @@ class Simulator:
         radius: float,
         poi_type: Union[str, list[str]],
     ):
-        if not isinstance(poi_type, Sequence):
+        if isinstance(poi_type, str):
             poi_type = [poi_type]
         transformed_poi_type = []
         for t in poi_type:

pycityagent/environment/utils/const.py

@@ -1,3 +1,5 @@
+from mosstool.map._map_util.const import AOI_START_ID, POI_START_ID
+
 POI_CATG_DICT = {
     "户外活动": [
         "bandstand",

{pycityagent-2.0.0a24.dist-info → pycityagent-2.0.0a26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycityagent
-Version: 2.0.0a24
+Version: 2.0.0a26
 Summary: LLM-based城市环境agent构建库
 License: MIT
 Author: Yuwei Yan

{pycityagent-2.0.0a24.dist-info → pycityagent-2.0.0a26.dist-info}/RECORD

@@ -21,10 +21,10 @@ pycityagent/environment/sim/person_service.py,sha256=5r1F2Itn7dKJ2U4hSLovrk5p4qy
 pycityagent/environment/sim/road_service.py,sha256=bKyn3_me0sGmaJVyF6eNeFbdU-9C1yWsa9L7pieDJzg,1285
 pycityagent/environment/sim/sim_env.py,sha256=HI1LcS_FotDKQ6vBnx0e49prXSABOfA20aU9KM-ZkCY,4625
 pycityagent/environment/sim/social_service.py,sha256=9EFJAwVdUuUQkNkFRn9qZRDfD1brh2fqkvasnXUEBhQ,2014
-pycityagent/environment/simulator.py,sha256=XjcxbyBIbB3Ht9z087z_oWIPAN6pP5Eq1lyf4W5atb8,12502
+pycityagent/environment/simulator.py,sha256=KVfwSwVGXPqUHQGyD9jv_RXRgGal2k7NloUFVdmWE8I,12943
 pycityagent/environment/utils/__init__.py,sha256=1m4Q1EfGvNpUsa1bgQzzCyWhfkpElnskNImjjFD3Znc,237
 pycityagent/environment/utils/base64.py,sha256=hoREzQo3FXMN79pqQLO2jgsDEvudciomyKii7MWljAM,374
-pycityagent/environment/utils/const.py,sha256=3RMNy7_bE7-23K90j9DFW_tWEzu8s7hSTgKbV-3BFl4,5327
+pycityagent/environment/utils/const.py,sha256=1LqxnYJ8FSmq37fN5kIFlWLwycEDzFa8SFS-8plrFlU,5396
 pycityagent/environment/utils/geojson.py,sha256=LVHAdEhnZM8d0BoUnuPiIL_gaeXBIIglrLrfje5M0b4,661
 pycityagent/environment/utils/grpc.py,sha256=6EJwKXXktIWb1NcUiJzIRmfrY0S03QAXXGcCDHqAT00,1998
 pycityagent/environment/utils/map_utils.py,sha256=lYOEoCFFK6-e9N5txLMMq4HUlxMqc8Uw1YrGW5oJmgg,5749
@@ -70,6 +70,6 @@ pycityagent/workflow/block.py,sha256=l-z9iJo9_USZQRyj4TLMfihK0-tnNDG0a6jVk9WhG0o
 pycityagent/workflow/prompt.py,sha256=6jI0Rq54JLv3-IXqZLYug62vse10wTI83xvf4ZX42nk,2929
 pycityagent/workflow/tool.py,sha256=xADxhNgVsjNiMxlhdwn3xGUstFOkLEG8P67ez8VmwSI,8555
 pycityagent/workflow/trigger.py,sha256=Df-MOBEDWBbM-v0dFLQLXteLsipymT4n8vqexmK2GiQ,5643
-pycityagent-2.0.0a24.dist-info/METADATA,sha256=cHowSJH9VJmum92fAEfRvQYtWmbCJRnVgOmI2JZDlqw,8033
-pycityagent-2.0.0a24.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pycityagent-2.0.0a24.dist-info/RECORD,,
+pycityagent-2.0.0a26.dist-info/METADATA,sha256=niz64Rm2ZNvVTtcluHfdvoGcTgtqGYUGrNqVb23L2us,8033
+pycityagent-2.0.0a26.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+pycityagent-2.0.0a26.dist-info/RECORD,,