pycityagent 2.0.0a26__py3-none-any.whl → 2.0.0a28__py3-none-any.whl

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/utils/avro_schema.py

@@ -87,7 +87,6 @@ INSTITUTION_STATUS_SCHEMA = {
         {"name": "bracket_cutoffs", "type": {"type": "array", "items": ["float", "int", "string", "null"]}},
         {"name": "bracket_rates", "type": {"type": "array", "items": ["float", "int", "string", "null"]}},
         {"name": "employees", "type": {"type": "array", "items": ["float", "int", "string", "null"]}},
-        {"name": "customers", "type": {"type": "array", "items": ["float", "int", "string", "null"]}},
     ],
 }
 

{pycityagent-2.0.0a26.dist-info → pycityagent-2.0.0a28.dist-info}/METADATA

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

{pycityagent-2.0.0a26.dist-info → pycityagent-2.0.0a28.dist-info}/RECORD

@@ -50,14 +50,14 @@ 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
 pycityagent/survey/manager.py,sha256=S5IkwTdelsdtZETChRcfCEczzwSrry_Fly9MY4s3rbk,1681
 pycityagent/survey/models.py,sha256=YE50UUt5qJ0O_lIUsSY6XFCGUTkJVNu_L1gAhaCJ2fs,3546
 pycityagent/utils/__init__.py,sha256=xXEMhVfFeOJUXjczaHv9DJqYNp57rc6FibtS7CfrVbA,305
-pycityagent/utils/avro_schema.py,sha256=DHM3bOo8m0dJf8oSwyOWzVeXrH6OERmzA_a5vS4So4M,4255
+pycityagent/utils/avro_schema.py,sha256=AlADbzV8FxiSfvhQhiX9KhrwMjrx0lGT-lED4TI1gJM,4152
 pycityagent/utils/decorators.py,sha256=Gk3r41hfk6awui40tbwpq3C7wC7jHaRmLRlcJFlLQCE,3160
 pycityagent/utils/parsers/__init__.py,sha256=AN2xgiPxszWK4rpX7zrqRsqNwfGF3WnCA5-PFTvbaKk,281
 pycityagent/utils/parsers/code_block_parser.py,sha256=Cs2Z_hm9VfNCpPPll1TwteaJF-HAQPs-3RApsOekFm4,1173
@@ -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.0a26.dist-info/METADATA,sha256=niz64Rm2ZNvVTtcluHfdvoGcTgtqGYUGrNqVb23L2us,8033
-pycityagent-2.0.0a26.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pycityagent-2.0.0a26.dist-info/RECORD,,
+pycityagent-2.0.0a28.dist-info/METADATA,sha256=2M6sidbsEZfhgXLIKYTrhumMs4LM0Qq6MWDJVMWBA-s,8033
+pycityagent-2.0.0a28.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+pycityagent-2.0.0a28.dist-info/RECORD,,