pycityagent 2.0.0a30__tar.gz → 2.0.0a32__tar.gz

{pycityagent-2.0.0a30 → pycityagent-2.0.0a32}/PKG-INFO

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

{pycityagent-2.0.0a30 → pycityagent-2.0.0a32}/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:
@@ -409,29 +413,81 @@ class AgentGroup:
                 else:
                     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)
+                        if "aoi_position" in position:
+                            parent_id = position["aoi_position"]["aoi_id"]
+                        elif "lane_position" in position:
+                            parent_id = position["lane_position"]["lane_id"]
+                        else:
+                            # BUG: 需要处理
+                            parent_id = -1
+                        try:
+                            nominal_gdp = await agent.memory.get("nominal_gdp")
+                        except:
+                            nominal_gdp = []
+                        try:
+                            real_gdp = await agent.memory.get("real_gdp")
+                        except:
+                            real_gdp = []
+                        try:
+                            unemployment = await agent.memory.get("unemployment")
+                        except:
+                            unemployment = []
+                        try:
+                            wages = await agent.memory.get("wages")
+                        except:
+                            wages = []
+                        try:
+                            prices = await agent.memory.get("prices")
+                        except:
+                            prices = []
+                        try:
+                            inventory = await agent.memory.get("inventory")
+                        except:
+                            inventory = 0
+                        try:
+                            price = await agent.memory.get("price")
+                        except:
+                            price = 0.0
+                        try:
+                            interest_rate = await agent.memory.get("interest_rate")
+                        except:
+                            interest_rate = 0.0
+                        try:
+                            bracket_cutoffs = await agent.memory.get("bracket_cutoffs")
+                        except:
+                            bracket_cutoffs = []
+                        try:
+                            bracket_rates = await agent.memory.get("bracket_rates")
+                        except:
+                            bracket_rates = []
+                        try:
+                            employees = await agent.memory.get("employees")
+                        except:
+                            employees = []
                         _status_dict = {
                             "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": await agent.memory.get("nominal_gdp"),
-                            "real_gdp": await agent.memory.get("real_gdp"),
-                            "unemployment": await agent.memory.get("unemployment"),
-                            "wages": await agent.memory.get("wages"),
-                            "prices": await agent.memory.get("prices"),
-                            "inventory": await agent.memory.get("inventory"),
-                            "price": await agent.memory.get("price"),
-                            "interest_rate": await agent.memory.get("interest_rate"),
-                            "bracket_cutoffs": await agent.memory.get(
-                                "bracket_cutoffs"
-                            ),
-                            "bracket_rates": await agent.memory.get("bracket_rates"),
-                            "employees": await agent.memory.get("employees"),
-                            "customers": await agent.memory.get("customers"),
+                            "nominal_gdp": nominal_gdp,
+                            "real_gdp": real_gdp,
+                            "unemployment": unemployment,
+                            "wages": wages,
+                            "prices": prices,
+                            "inventory": inventory,
+                            "price": price,
+                            "interest_rate": interest_rate,
+                            "bracket_cutoffs": bracket_cutoffs,
+                            "bracket_rates": bracket_rates,
+                            "employees": employees,
                             "created_at": _date_time,
                         }
                         _statuses_time_list.append((_status_dict, _date_time))

{pycityagent-2.0.0a30 → pycityagent-2.0.0a32}/pyproject.toml

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