pycityagent 2.0.0a31__tar.gz → 2.0.0a33__tar.gz

{pycityagent-2.0.0a31 → pycityagent-2.0.0a33}/PKG-INFO

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

{pycityagent-2.0.0a31 → pycityagent-2.0.0a33}/pycityagent/simulation/agentgroup.py

@@ -9,6 +9,7 @@ from typing import Any
 from uuid import UUID
 
 import fastavro
+import pyproj
 import ray
 from langchain_core.embeddings import Embeddings
 
@@ -80,6 +81,7 @@ class AgentGroup:
         # Step:2 prepare Simulator
         logger.info(f"-----Creating Simulator in AgentGroup {self._uuid} ...")
         self.simulator = Simulator(config["simulator_request"])
+        self.projector = pyproj.Proj(self.simulator.map.header["projection"])
 
         # Step:3 prepare Economy client
         if "economy" in config["simulator_request"]:
@@ -264,8 +266,9 @@ class AgentGroup:
                 for agent in self.agents:
                     _date_time = datetime.now(timezone.utc)
                     position = await agent.memory.get("position")
-                    lng = position["longlat_position"]["longitude"]
-                    lat = position["longlat_position"]["latitude"]
+                    x = position["xy_position"]["x"]
+                    y = position["xy_position"]["y"]
+                    lng, lat = self.projector(x, y, inverse=True)
                     if "aoi_position" in position:
                         parent_id = position["aoi_position"]["aoi_id"]
                     elif "lane_position" in position:
@@ -379,8 +382,9 @@ class AgentGroup:
                     for agent in self.agents:
                         _date_time = datetime.now(timezone.utc)
                         position = await agent.memory.get("position")
-                        lng = position["longlat_position"]["longitude"]
-                        lat = position["longlat_position"]["latitude"]
+                        x = position["xy_position"]["x"]
+                        y = position["xy_position"]["y"]
+                        lng, lat = self.projector(x, y, inverse=True)
                         if "aoi_position" in position:
                             parent_id = position["aoi_position"]["aoi_id"]
                         elif "lane_position" in position:
@@ -407,8 +411,12 @@ class AgentGroup:
                         }
                         _statuses_time_list.append((_status_dict, _date_time))
                 else:
+                    # institution
                     for agent in self.agents:
                         _date_time = datetime.now(timezone.utc)
+                        # ATTENTION: no valid position for an institution
+                        lng, lat = -1, -1
+                        parent_id = -1
                         try:
                             nominal_gdp = await agent.memory.get("nominal_gdp")
                         except:
@@ -457,9 +465,9 @@ class AgentGroup:
                             "id": agent._uuid,
                             "day": await self.simulator.get_simulator_day(),
                             "t": await self.simulator.get_simulator_second_from_start_of_day(),
-                            "lng": -1,
-                            "lat": -1,
-                            "parent_id": -1,
+                            "lng": lng,
+                            "lat": lat,
+                            "parent_id": parent_id,
                             "action": "",
                             "type": await agent.memory.get("type"),
                             "nominal_gdp": nominal_gdp,

{pycityagent-2.0.0a31 → pycityagent-2.0.0a33}/pycityagent/workflow/block.py

@@ -148,9 +148,9 @@ class Block:
         trigger: Optional[EventTrigger] = None,
     ):
         self.name = name
-        self.llm = llm
-        self.memory = memory
-        self.simulator = simulator
+        self._llm = llm
+        self._memory = memory
+        self._simulator = simulator
         # 如果传入trigger，将block注入到trigger中并立即初始化
         if trigger is not None:
             trigger.block = self
@@ -163,3 +163,21 @@ class Block:
         To be overridden by specific block implementations.
         """
         raise NotImplementedError("Subclasses should implement this method")
+
+    @property
+    def llm(
+        self,
+    ) -> LLM:
+        return self._llm  # type: ignore
+
+    @property
+    def memory(
+        self,
+    ) -> Memory:
+        return self._memory  # type: ignore
+
+    @property
+    def simulator(
+        self,
+    ) -> Simulator:
+        return self._simulator  # type: ignore

{pycityagent-2.0.0a31 → pycityagent-2.0.0a33}/pyproject.toml

@@ -3,7 +3,7 @@ in-project = true
 
 [tool.poetry]
 name = "pycityagent"
-version = "2.0.0a31"
+version = "2.0.0a33"
 description = "LLM-based城市环境agent构建库"
 authors = ["Yuwei Yan <pinkgranite86@gmail.com>","Junbo Yan <yanjb20thu@gmali.com>"]
 license = "MIT"