pycityagent 2.0.0a25__tar.gz → 2.0.0a27__tar.gz

{pycityagent-2.0.0a25 → pycityagent-2.0.0a27}/PKG-INFO

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

{pycityagent-2.0.0a25 → pycityagent-2.0.0a27}/pycityagent/environment/simulator.py

@@ -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)
 
@@ -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}}

{pycityagent-2.0.0a25 → pycityagent-2.0.0a27}/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.0a25 → pycityagent-2.0.0a27}/pycityagent/simulation/agentgroup.py

@@ -271,7 +271,6 @@ class AgentGroup:
                     elif "lane_position" in position:
                         parent_id = position["lane_position"]["lane_id"]
                     else:
-                        # BUG: 需要处理
                         parent_id = -1
                     needs = await agent.memory.get("needs")
                     action = await agent.memory.get("current_step")
@@ -297,23 +296,66 @@ class AgentGroup:
             else:
                 for agent in self.agents:
                     _date_time = datetime.now(timezone.utc)
+                    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 = []
                     avro = {
                         "id": agent._uuid,
                         "day": await self.simulator.get_simulator_day(),
                         "t": await self.simulator.get_simulator_second_from_start_of_day(),
                         "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,
                     }
                     avros.append(avro)
                     _statuses_time_list.append((avro, _date_time))

{pycityagent-2.0.0a25 → pycityagent-2.0.0a27}/pyproject.toml

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