pycityagent 2.0.0a25__py3-none-any.whl → 2.0.0a27__py3-none-any.whl

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/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/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.dist-info → pycityagent-2.0.0a27.dist-info}/METADATA

@@ -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.dist-info → pycityagent-2.0.0a27.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=Vm8Rvczv20ETpAWhCYyxbnN25uoRyAv6DX7WoavjEVU,12446
+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
@@ -50,7 +50,7 @@ pycityagent/metrics/__init__.py,sha256=X08PaBbGVAd7_PRGLREXWxaqm7nS82WBQpD1zvQzc
 pycityagent/metrics/mlflow_client.py,sha256=g_tHxWkWTDijtbGL74-HmiYzWVKb1y8-w12QrY9jL30,4449
 pycityagent/metrics/utils/const.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycityagent/simulation/__init__.py,sha256=P5czbcg2d8S0nbbnsQXFIhwzO4CennAhZM8OmKvAeYw,194
-pycityagent/simulation/agentgroup.py,sha256=r8arCAQkKMhv3yr35XsYJL-MfG6o6rWwHItBmxfDtA4,20589
+pycityagent/simulation/agentgroup.py,sha256=0uMoRBektdK9WEXmqYT2gASg42CtS6JjaQ7slP8IWkY,22011
 pycityagent/simulation/simulation.py,sha256=9kkdgXSEOAN8wiewVFyORksti4IdVNU0opObV6ZYa9k,23344
 pycityagent/simulation/storage/pg.py,sha256=Ws04mUgRcbbvWi_eQm3PXYa6w7AQUbDPWhSU7HFtsD8,6026
 pycityagent/survey/__init__.py,sha256=rxwou8U9KeFSP7rMzXtmtp2fVFZxK4Trzi-psx9LPIs,153
@@ -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.0a25.dist-info/METADATA,sha256=lB0qL357khfixTBH-M-cX2-FxCGhsD3IuUyPqVY07uI,8033
-pycityagent-2.0.0a25.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pycityagent-2.0.0a25.dist-info/RECORD,,
+pycityagent-2.0.0a27.dist-info/METADATA,sha256=a0J5mbDiwBkYcPqDwPFJCwwkSTAU1g-g-jqVCwDYVhE,8033
+pycityagent-2.0.0a27.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+pycityagent-2.0.0a27.dist-info/RECORD,,