pycityagent 2.0.0a44__cp311-cp311-macosx_11_0_arm64.whl → 2.0.0a46__cp311-cp311-macosx_11_0_arm64.whl

pycityagent/agent.py

@@ -53,7 +53,7 @@ class Agent(ABC):
         type: AgentType = AgentType.Unspecified,
         llm_client: Optional[LLM] = None,
         economy_client: Optional[EconomyClient] = None,
-        messager: Optional[Messager] = None,
+        messager: Optional[Messager] = None,  # type:ignore
         simulator: Optional[Simulator] = None,
         mlflow_client: Optional[MlflowClient] = None,
         memory: Optional[Memory] = None,
@@ -101,7 +101,7 @@ class Agent(ABC):
         del state["_llm_client"]
         return state
 
-    def set_messager(self, messager: Messager):
+    def set_messager(self, messager: Messager):  # type:ignore
         """
         Set the messager of the agent.
         """
@@ -544,7 +544,7 @@ class CitizenAgent(Agent):
         mlflow_client: Optional[MlflowClient] = None,
         memory: Optional[Memory] = None,
         economy_client: Optional[EconomyClient] = None,
-        messager: Optional[Messager] = None,
+        messager: Optional[Messager] = None,  # type:ignore
         avro_file: Optional[dict] = None,
     ) -> None:
         super().__init__(
@@ -659,7 +659,7 @@ class InstitutionAgent(Agent):
         mlflow_client: Optional[MlflowClient] = None,
         memory: Optional[Memory] = None,
         economy_client: Optional[EconomyClient] = None,
-        messager: Optional[Messager] = None,
+        messager: Optional[Messager] = None,  # type:ignore
         avro_file: Optional[dict] = None,
     ) -> None:
         super().__init__(
@@ -680,6 +680,7 @@ class InstitutionAgent(Agent):
         await self._bind_to_economy()
 
     async def _bind_to_economy(self):
+        print("Debug:", self._economy_client, self._has_bound_to_economy)
         if self._economy_client is None:
             logger.debug("Economy client is not set")
             return

pycityagent/message/messager.py

@@ -3,15 +3,17 @@ import json
 import logging
 import math
 from typing import Any, List, Union
-from aiomqtt import Client
+
 import ray
+from aiomqtt import Client
 
 logger = logging.getLogger("pycityagent")
 
+
 @ray.remote
 class Messager:
     def __init__(
-        self, hostname:str, port:int=1883, username=None, password=None, timeout=60
+        self, hostname: str, port: int = 1883, username=None, password=None, timeout=60
     ):
         self.client = Client(
             hostname, port=port, username=username, password=password, timeout=timeout
@@ -19,7 +21,7 @@ class Messager:
         self.connected = False  # 是否已连接标志
         self.message_queue = asyncio.Queue()  # 用于存储接收到的消息
         self.receive_messages_task = None
-    
+
     async def __aexit__(self, exc_type, exc_value, traceback):
         await self.stop()
 
@@ -45,7 +47,9 @@ class Messager:
         """检查是否成功连接到 Broker"""
         return self.connected
 
-    async def subscribe(self, topics: Union[str, List[str]], agents: Union[Any, List[Any]]):
+    async def subscribe(
+        self, topics: Union[str, List[str]], agents: Union[Any, List[Any]]
+    ):
         if not self.is_connected():
             logger.error(
                 f"Cannot subscribe to {topics} because not connected to the Broker."
@@ -83,6 +87,9 @@ class Messager:
             logger.error("Cannot start listening because not connected to the Broker.")
 
     async def stop(self):
+        assert self.receive_messages_task is not None
         self.receive_messages_task.cancel()
-        await asyncio.gather(self.receive_messages_task, return_exceptions=True)
+        await asyncio.gather(
+            self.receive_messages_task, return_exceptions=True
+        )
         await self.disconnect()

pycityagent/simulation/agentgroup.py

@@ -5,7 +5,7 @@ import time
 import uuid
 from datetime import datetime, timezone
 from pathlib import Path
-from typing import Any
+from typing import Any, Optional
 from uuid import UUID
 
 import fastavro
@@ -64,7 +64,7 @@ class AgentGroup:
             pass
 
         self.messager = Messager.remote(
-            hostname=config["simulator_request"]["mqtt"]["server"], # type:ignore
+            hostname=config["simulator_request"]["mqtt"]["server"],  # type:ignore
             port=config["simulator_request"]["mqtt"]["port"],
             username=config["simulator_request"]["mqtt"].get("username", None),
             password=config["simulator_request"]["mqtt"].get("password", None),
@@ -290,11 +290,21 @@ class AgentGroup:
 
             await asyncio.sleep(0.5)
 
-    async def save_status(self):
+    async def save_status(
+        self, simulator_day: Optional[int] = None, simulator_t: Optional[int] = None
+    ):
         _statuses_time_list: list[tuple[dict, datetime]] = []
         if self.enable_avro:
-            logger.debug(f"-----Saving status for group {self._uuid}")
+            logger.debug(f"-----Saving status for group {self._uuid} with Avro")
             avros = []
+            if simulator_day is not None:
+                _day = simulator_day
+            else:
+                _day = await self.simulator.get_simulator_day()
+            if simulator_t is not None:
+                _t = await self.simulator.get_simulator_second_from_start_of_day()
+            else:
+                _t = simulator_t
             if not issubclass(type(self.agents[0]), InstitutionAgent):
                 for agent in self.agents:
                     _date_time = datetime.now(timezone.utc)
@@ -313,8 +323,8 @@ class AgentGroup:
                     action = action["intention"]
                     avro = {
                         "id": agent._uuid,
-                        "day": await self.simulator.get_simulator_day(),
-                        "t": await self.simulator.get_simulator_second_from_start_of_day(),
+                        "day": _day,
+                        "t": _t,
                         "lng": lng,
                         "lat": lat,
                         "parent_id": parent_id,
@@ -378,8 +388,8 @@ class AgentGroup:
                         employees = []
                     avro = {
                         "id": agent._uuid,
-                        "day": await self.simulator.get_simulator_day(),
-                        "t": await self.simulator.get_simulator_second_from_start_of_day(),
+                        "day": _day,
+                        "t": _t,
                         "type": await agent.memory.get("type"),
                         "nominal_gdp": nominal_gdp,
                         "real_gdp": real_gdp,
@@ -398,6 +408,15 @@ class AgentGroup:
                 with open(self.avro_file["status"], "a+b") as f:
                     fastavro.writer(f, INSTITUTION_STATUS_SCHEMA, avros, codec="snappy")
         if self.enable_pgsql:
+            logger.debug(f"-----Saving status for group {self._uuid} with PgSQL")
+            if simulator_day is not None:
+                _day = simulator_day
+            else:
+                _day = await self.simulator.get_simulator_day()
+            if simulator_t is not None:
+                _t = await self.simulator.get_simulator_second_from_start_of_day()
+            else:
+                _t = simulator_t
             # data already acquired from Avro part
             if len(_statuses_time_list) > 0:
                 for _status_dict, _date_time in _statuses_time_list:
@@ -430,8 +449,8 @@ class AgentGroup:
                         action = action["intention"]
                         _status_dict = {
                             "id": agent._uuid,
-                            "day": await self.simulator.get_simulator_day(),
-                            "t": await self.simulator.get_simulator_second_from_start_of_day(),
+                            "day": _day,
+                            "t": _t,
                             "lng": lng,
                             "lat": lat,
                             "parent_id": parent_id,
@@ -499,8 +518,8 @@ class AgentGroup:
                             employees = []
                         _status_dict = {
                             "id": agent._uuid,
-                            "day": await self.simulator.get_simulator_day(),
-                            "t": await self.simulator.get_simulator_second_from_start_of_day(),
+                            "day": _day,
+                            "t": _t,
                             "lng": lng,
                             "lat": lat,
                             "parent_id": parent_id,
@@ -577,5 +596,6 @@ class AgentGroup:
 
         except Exception as e:
             import traceback
+
             logger.error(f"模拟器运行错误: {str(e)}\n{traceback.format_exc()}")
             raise RuntimeError(str(e)) from e

{pycityagent-2.0.0a44.dist-info → pycityagent-2.0.0a46.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycityagent
-Version: 2.0.0a44
+Version: 2.0.0a46
 Summary: LLM-based城市环境agent构建库
 Author-email: Yuwei Yan <pinkgranite86@gmail.com>, Junbo Yan <yanjb20thu@gmali.com>, Jun Zhang <zhangjun990222@gmali.com>
 License: MIT License

{pycityagent-2.0.0a44.dist-info → pycityagent-2.0.0a46.dist-info}/RECORD

@@ -1,7 +1,13 @@
+pycityagent-2.0.0a46.dist-info/RECORD,,
+pycityagent-2.0.0a46.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
+pycityagent-2.0.0a46.dist-info/WHEEL,sha256=DQkJubmXvyOE1DlaPsfq9czNuGB2yvzYGbMABjt_JVM,109
+pycityagent-2.0.0a46.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
+pycityagent-2.0.0a46.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
+pycityagent-2.0.0a46.dist-info/METADATA,sha256=h9PjpSlP8GxC4R8wnt_cTYmBWgmIcyn-U0EEppW9xUU,9125
 pycityagent/pycityagent-sim,sha256=n96jlVZRINlBec5SPOGAdUmeLWMoEKGgoH29iOVJ0wE,34081890
 pycityagent/__init__.py,sha256=fv0mzNGbHBF6m550yYqnuUpB8iQPWS-7EatYRK7DO4s,693
 pycityagent/pycityagent-ui,sha256=cHZjqtrQ4Fh4qtRahFNCNbT2DNHLmUexiDAa-72Z3RQ,40333378
-pycityagent/agent.py,sha256=KO8yJiVOZTWlYAd57gLEgbSNzQ26cw27k1NT8pAFHNY,29917
+pycityagent/agent.py,sha256=A40nN1xUJ6AqhoQ4pXt5yAehc15BYHwLMRpIGAmMLLc,30051
 pycityagent/metrics/mlflow_client.py,sha256=g_tHxWkWTDijtbGL74-HmiYzWVKb1y8-w12QrY9jL30,4449
 pycityagent/metrics/__init__.py,sha256=X08PaBbGVAd7_PRGLREXWxaqm7nS82WBQpD1zvQzcqc,128
 pycityagent/metrics/utils/const.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -23,10 +29,10 @@ pycityagent/memory/faiss_query.py,sha256=Z0JS4udyPYCIzHMq464QtHscnswu35gh9fQptik
 pycityagent/memory/state.py,sha256=TYItiyDtehMEQaSBN7PpNrnNxdDM5jGppr9R9Ufv3kA,5134
 pycityagent/simulation/simulation.py,sha256=Vrt2hr9AsKG9VEwY90R9mmUR9TxifshUfSYpzW5LOXo,23317
 pycityagent/simulation/__init__.py,sha256=P5czbcg2d8S0nbbnsQXFIhwzO4CennAhZM8OmKvAeYw,194
-pycityagent/simulation/agentgroup.py,sha256=0YxdiUCBDeHaiYQ4c2jk72rpOgVxBSh4QnkykEgcKE4,25453
+pycityagent/simulation/agentgroup.py,sha256=BY6J3zwYvYTlOPycszcKxSYeq3E5LK8qeYzD2oL7VOE,25933
 pycityagent/simulation/storage/pg.py,sha256=5itxKOkNPlOzN7z2_3oKU1ZK0uLTDugfld8ZkRbD69I,8407
 pycityagent/message/__init__.py,sha256=TCjazxqb5DVwbTu1fF0sNvaH_EPXVuj2XQ0p6W-QCLU,55
-pycityagent/message/messager.py,sha256=ePu1LDZZBDMhxoVoX4-LGTcizCVsOuw4T1GRBXHdM7E,3125
+pycityagent/message/messager.py,sha256=uKXArXOMZGK2fE86XiMtVrI_N0yTLA1EL3KdtCVK5uk,3217
 pycityagent/utils/avro_schema.py,sha256=AlADbzV8FxiSfvhQhiX9KhrwMjrx0lGT-lED4TI1gJM,4152
 pycityagent/utils/__init__.py,sha256=xli0FuRffR9Wp4aRcMnlfeDHuGxB8Y5paDjyAt0UoeE,462
 pycityagent/utils/survey_util.py,sha256=Be9nptmu2JtesFNemPgORh_2GsN7rcDYGQS9Zfvc5OI,2169
@@ -73,9 +79,3 @@ pycityagent/environment/interact/interact.py,sha256=ifxPPzuHeqLHIZ_6zvfXMoBOnBsX
 pycityagent/survey/models.py,sha256=YE50UUt5qJ0O_lIUsSY6XFCGUTkJVNu_L1gAhaCJ2fs,3546
 pycityagent/survey/__init__.py,sha256=rxwou8U9KeFSP7rMzXtmtp2fVFZxK4Trzi-psx9LPIs,153
 pycityagent/survey/manager.py,sha256=S5IkwTdelsdtZETChRcfCEczzwSrry_Fly9MY4s3rbk,1681
-pycityagent-2.0.0a44.dist-info/RECORD,,
-pycityagent-2.0.0a44.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
-pycityagent-2.0.0a44.dist-info/WHEEL,sha256=DQkJubmXvyOE1DlaPsfq9czNuGB2yvzYGbMABjt_JVM,109
-pycityagent-2.0.0a44.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
-pycityagent-2.0.0a44.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
-pycityagent-2.0.0a44.dist-info/METADATA,sha256=x-LLU7rf5y1qTIScRBY7gosF2Cx2Th0Ga380F_SMOpU,9125