pycityagent 2.0.0a35__tar.gz → 2.0.0a37__tar.gz

{pycityagent-2.0.0a35 → pycityagent-2.0.0a37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycityagent
-Version: 2.0.0a35
+Version: 2.0.0a37
 Summary: LLM-based城市环境agent构建库
 License: MIT
 Author: Yuwei Yan
@@ -29,7 +29,7 @@ Requires-Dist: langchain-community (>=0.3.13,<0.4.0)
 Requires-Dist: langchain-core (>=0.3.28,<0.4.0)
 Requires-Dist: matplotlib (==3.8.3)
 Requires-Dist: mlflow (>=2.19.0,<3.0.0)
-Requires-Dist: mosstool (==1.0.24)
+Requires-Dist: mosstool (>=1.3.0,<2.0.0)
 Requires-Dist: networkx (==3.2.1)
 Requires-Dist: numpy (>=1.20.0,<2.0.0)
 Requires-Dist: openai (>=1.58.1,<2.0.0)
@@ -37,7 +37,7 @@ Requires-Dist: pandavro (>=1.8.0,<2.0.0)
 Requires-Dist: poetry (>=1.2.2)
 Requires-Dist: protobuf (<=4.24.0)
 Requires-Dist: psycopg[binary] (>=3.2.3,<4.0.0)
-Requires-Dist: pycitydata (==1.0.0)
+Requires-Dist: pycitydata (>=1.0.3,<2.0.0)
 Requires-Dist: pycityproto (>=2.1.5,<3.0.0)
 Requires-Dist: pyyaml (>=6.0.2,<7.0.0)
 Requires-Dist: ray (>=2.40.0,<3.0.0)

{pycityagent-2.0.0a35 → pycityagent-2.0.0a37}/pycityagent/agent.py

@@ -688,6 +688,28 @@ class InstitutionAgent(Agent):
             _id = random.randint(100000, 999999)
             self._agent_id = _id
             self.memory.set_agent_id(_id)
+            map_header = self.simulator.map.header
+            # TODO: remove random position assignment
+            await self.memory.update(
+                "position",
+                {
+                    "xy_position": {
+                        "x": float(
+                            random.randrange(
+                                start=int(map_header["west"]),
+                                stop=int(map_header["east"]),
+                            )
+                        ),
+                        "y": float(
+                            random.randrange(
+                                start=int(map_header["south"]),
+                                stop=int(map_header["north"]),
+                            )
+                        ),
+                    }
+                },
+                protect_llm_read_only_fields=False,
+            )
             await self.memory.update("id", _id, protect_llm_read_only_fields=False)
             try:
                 await self._economy_client.remove_orgs([self._agent_id])

{pycityagent-2.0.0a35 → pycityagent-2.0.0a37}/pycityagent/environment/simulator.py

@@ -14,7 +14,6 @@ from pycityproto.city.person.v2 import person_pb2 as person_pb2
 from pycityproto.city.person.v2 import person_service_pb2 as person_service
 from pymongo import MongoClient
 from shapely.geometry import Point
-from shapely.strtree import STRtree
 
 from .sim import CityClient, ControlSimEnv
 from .utils.const import *
@@ -87,12 +86,6 @@ class Simulator:
         - Simulator map object
         """
 
-        self.pois_matrix: dict[str, list[list[list]]] = {}
-        """
-        pois的基于区块的划分——方便快速粗略地查询poi
-        通过Simulator.set_pois_matrix()初始化
-        """
-
         self.time: int = 0
         """
         - 模拟城市当前时间
@@ -102,12 +95,11 @@ class Simulator:
         self.map_x_gap = None
         self.map_y_gap = None
         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()
+        self.poi_id_2_aoi_id: dict[int, int] = {
+            poi["id"]: poi["aoi_id"] for _, poi in self.map.pois.items()
+        }
 
     # * Agent相关
     def find_agents_by_area(self, req: dict, status=None):
@@ -137,35 +129,21 @@ class Simulator:
             resp.motions = motions  # type: ignore
             return resp
 
-    def set_poi_tree(
-        self,
-    ):
-        """
-        初始化pois_tree
-        """
-        poi_geos = []
-        tree_id_2_poi_and_catg: dict[int, tuple[dict, str]] = {}
-        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)
-
     def get_poi_categories(
         self,
         center: Optional[Union[tuple[float, float], Point]] = None,
         radius: Optional[float] = None,
     ) -> list[str]:
-        if center is not None and radius is not None:
-            if not isinstance(center, Point):
-                center = Point(center)
-            indices = self.pois_tree.query(center.buffer(radius))
-        else:
-            indices = list(self.tree_id_2_poi_and_catg.keys())
-        categories = []
-        for index in indices:
-            _, catg = self.tree_id_2_poi_and_catg[index]
+        categories: list[str] = []
+        if center is None:
+            center = (0, 0)
+        _pois: list[dict] = self.map.query_pois(  # type:ignore
+            center=center,
+            radius=radius,
+            return_distance=False,
+        )
+        for poi in _pois:
+            catg = poi["category"]
             categories.append(catg.split("|")[-1])
         return list(set(categories))
 
@@ -327,7 +305,7 @@ class Simulator:
         center: Union[tuple[float, float], Point],
         radius: float,
         poi_type: Union[str, list[str]],
-    ):
+    ) -> list[dict]:
         if isinstance(poi_type, str):
             poi_type = [poi_type]
         transformed_poi_type = []
@@ -337,14 +315,16 @@ class Simulator:
             else:
                 transformed_poi_type += self.poi_cate[t]
         poi_type_set = set(transformed_poi_type)
-        if not isinstance(center, Point):
-            center = Point(center)
         # 获取半径内的poi
-        indices = self.pois_tree.query(center.buffer(radius))
+        _pois: list[dict] = self.map.query_pois(  # type:ignore
+            center=center,
+            radius=radius,
+            return_distance=False,
+        )
         # 过滤掉不满足类别前缀的poi
         pois = []
-        for index in indices:
-            poi, catg = self.tree_id_2_poi_and_catg[index]
+        for poi in _pois:
+            catg = poi["category"]
             if catg.split("|")[-1] not in poi_type_set:
                 continue
             pois.append(poi)

{pycityagent-2.0.0a35 → pycityagent-2.0.0a37}/pycityagent/simulation/agentgroup.py

@@ -134,8 +134,8 @@ class AgentGroup:
                 agent.memory.set_embedding_model(self.embedding_model)
 
     async def __aexit__(self, exc_type, exc_value, traceback):
-        self.message_dispatch_task.cancel()
-        await asyncio.gather(self.message_dispatch_task, return_exceptions=True)
+        self.message_dispatch_task.cancel()  # type: ignore
+        await asyncio.gather(self.message_dispatch_task, return_exceptions=True)  # type: ignore
 
     async def init_agents(self):
         logger.debug(f"-----Initializing Agents in AgentGroup {self._uuid} ...")
@@ -418,8 +418,11 @@ class AgentGroup:
                     # institution
                     for agent in self.agents:
                         _date_time = datetime.now(timezone.utc)
+                        position = await agent.memory.get("position")
+                        x = position["xy_position"]["x"]
+                        y = position["xy_position"]["y"]
+                        lng, lat = self.projector(x, y, inverse=True)
                         # ATTENTION: no valid position for an institution
-                        lng, lat = -1, -1
                         parent_id = -1
                         try:
                             nominal_gdp = await agent.memory.get("nominal_gdp")

{pycityagent-2.0.0a35 → pycityagent-2.0.0a37}/pyproject.toml

@@ -3,7 +3,7 @@ in-project = true
 
 [tool.poetry]
 name = "pycityagent"
-version = "2.0.0a35"
+version = "2.0.0a37"
 description = "LLM-based城市环境agent构建库"
 authors = ["Yuwei Yan <pinkgranite86@gmail.com>","Junbo Yan <yanjb20thu@gmali.com>"]
 license = "MIT"
@@ -31,7 +31,7 @@ numpy = "^1.20.0"
 openai = "^1.58.1"
 Pillow = "11.0.0"
 protobuf = "<=4.24.0,<5.0.0"
-pycitydata = "1.0.0"
+pycitydata = "^1.0.3"
 pycityproto = "^2.1.5"
 Requests = "2.32.3"
 Shapely = "2.0.6"
@@ -39,7 +39,7 @@ sidecar = "0.7.0"
 pyyaml = "^6.0.2"
 zhipuai = "^2.1.5.20230904"
 gradio = "^5.7.1"
-mosstool = "1.0.24"
+mosstool = "^1.3.0"
 ray = "^2.40.0"
 aiomqtt = "^2.3.0"
 fastavro = "^1.10.0"