pycityagent 2.0.0a69__cp311-cp311-macosx_11_0_arm64.whl → 2.0.0a71__cp311-cp311-macosx_11_0_arm64.whl

pycityagent/environment/sim/sim_env.py

@@ -67,10 +67,6 @@ class ControlSimEnv:
         self._log_dir = log_dir
         self._min_step_time = min_step_time
         self._timeout = timeout
-        self.m = Map(pb_path=map_file)
-        """
-        地图数据
-        """
 
         self._sim_config = _generate_yaml_config(map_file, start_step, total_step)
         # sim

pycityagent/memory/memory.py

@@ -484,14 +484,22 @@ class StreamMemory:
         for target_memory in target_memories:
             target_memory.cognition_id = cognition_id
 
-    async def get_all(self) -> list[MemoryNode]:
+    async def get_all(self) -> list[dict]:
         """
-        Retrieve all stream memory nodes.
+        Retrieve all stream memory nodes as dictionaries.
 
         - **Returns**:
-            - `list[MemoryNode]`: List of all MemoryNode objects.
-        """
-        return list(self._memories)
+            - `list[dict]`: List of all memory nodes as dictionaries.
+        """
+        return [{
+            "id": memory.id,
+            "cognition_id": memory.cognition_id,
+            "tag": memory.tag.value,
+            "location": memory.location,
+            "description": memory.description,
+            "day": memory.day,
+            "t": memory.t,
+        } for memory in self._memories]
 
 
 class StatusMemory:

pycityagent/simulation/agentgroup.py

@@ -28,7 +28,6 @@ from ..utils import (DIALOG_SCHEMA, INSTITUTION_STATUS_SCHEMA, PROFILE_SCHEMA,
 logger = logging.getLogger("pycityagent")
 __all__ = ["AgentGroup"]
 
-
 @ray.remote
 class AgentGroup:
     def __init__(
@@ -406,9 +405,14 @@ class AgentGroup:
         results = {}
         if target_agent_uuids is None:
             target_agent_uuids = self.agent_uuids
-        for agent in self.agents:
-            if agent._uuid in target_agent_uuids:
-                results[agent._uuid] = await agent.status.get(content)
+        if content == "stream_memory":
+            for agent in self.agents:
+                if agent._uuid in target_agent_uuids:
+                    results[agent._uuid] = await agent.stream.get_all()
+        else:
+            for agent in self.agents:
+                if agent._uuid in target_agent_uuids:
+                    results[agent._uuid] = await agent.status.get(content)
         return results
 
     async def update(self, target_agent_uuid: str, target_key: str, content: Any):

pycityagent/simulation/simulation.py

@@ -273,11 +273,11 @@ class AgentSimulation:
         - workflow:
             - list[Step]
             - Step:
-                - type: str, "step", "run", "interview", "survey", "intervene", "pause", "resume"
+                - type: str, "step", "run", "interview", "survey", "intervene", "pause", "resume", "function"
                 - days: int if type is "run", else None
                 - times: int if type is "step", else None
                 - description: Optional[str], description of the step
-                - func: Optional[Callable[AgentSimulation, None]], only used when type is "interview", "survey" and "intervene"
+                - func: Optional[Callable[AgentSimulation, None]], only used when type is "interview", "survey", "intervene", "function"
         - message_intercept
             - mode: "point"|"edge"
             - max_violation_time: Optional[int], default to 3. The maximum time for someone to send bad message before banned. Used only in `point` mode.
@@ -386,7 +386,7 @@ class AgentSimulation:
             logger.info(
                 f"Running step: type: {step['type']} - description: {step.get('description', 'no description')}"
             )
-            if step["type"] not in ["run", "step", "interview", "survey", "intervene"]:
+            if step["type"] not in ["run", "step", "interview", "survey", "intervene", "pause", "resume", "function"]:
                 raise ValueError(f"Invalid step type: {step['type']}")
             if step["type"] == "run":
                 llm_log_list, mqtt_log_list, simulator_log_list = await simulation.run(step.get("days", 1))

{pycityagent-2.0.0a69.dist-info → pycityagent-2.0.0a71.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pycityagent
-Version: 2.0.0a69
+Version: 2.0.0a71
 Summary: LLM-based city environment agent building library
 Author-email: Yuwei Yan <pinkgranite86@gmail.com>, Junbo Yan <yanjb20thu@gmali.com>, Jun Zhang <zhangjun990222@gmali.com>
 License: MIT License

{pycityagent-2.0.0a69.dist-info → pycityagent-2.0.0a71.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pycityagent/pycityagent-sim,sha256=7AF-sHfnUfVBbiBMOWc11C_5xc9rfEip9lg_7vUieUU,35884466
+pycityagent/pycityagent-sim,sha256=hVQtSEhdZ3lFxl5i6ubPuDSv31hke_W0V_6gP8CMxBs,35884466
 pycityagent/__init__.py,sha256=PUKWTXc-xdMG7px8oTNclodsILUgypANj2Z647sY63k,808
 pycityagent/pycityagent-ui,sha256=Ur95yZygIaZ5l_CDqP9394M5GQ66iV5PkcNPYFWqzvk,41225346
 pycityagent/metrics/mlflow_client.py,sha256=-iyh4BPVnBkluhmfucUzibCUnBX2iftkz4tVJJVxwHw,6958
@@ -12,7 +12,7 @@ pycityagent/llm/__init__.py,sha256=iWs6FLgrbRVIiqOf4ILS89gkVCTvS7HFC3vG-MWuyko,2
 pycityagent/llm/llm.py,sha256=DvrgrnrmR2JAQRVOvvRo3w4aD8M-qLAqVSD5pXZHr4M,19019
 pycityagent/llm/embeddings.py,sha256=3610I-_scAy8HwRNpT8hVJpH9_8_pTLCPptqnzSq10o,11322
 pycityagent/llm/utils.py,sha256=rSx_fp-_Gh0vZ-x2rqAUqnpS56BVTZ4ChfAMarB8S1A,195
-pycityagent/memory/memory.py,sha256=Shf-8ZAPCzxcIgZM-L64OzwjkCmIlN_26ByeI-meqnE,44760
+pycityagent/memory/memory.py,sha256=4vztwJ6dterLJxAWHkqawEBnYtvxp7VUAm0btsCLvic,45057
 pycityagent/memory/profile.py,sha256=Z1shwFc6MqakorbiY6rGqVAgCJP4YTpDrqnMQZcYQno,5227
 pycityagent/memory/__init__.py,sha256=NClJAXC4G6I8kFWkPEcU2lbVDfyrRb5HrrBHgCXrzOU,125
 pycityagent/memory/memory_base.py,sha256=av_sbD62PZbJyM8E9wmVuqYqgsutghcO7nJdAxGpHi0,9784
@@ -21,9 +21,9 @@ pycityagent/memory/utils.py,sha256=oJWLdPeJy_jcdKcDTo9JAH9kDZhqjoQhhv_zT9qWC0w,8
 pycityagent/memory/const.py,sha256=nFmjvt-8FEB0hc0glOH3lliqJhkhf3D_NKxWI0pf6TY,936
 pycityagent/memory/faiss_query.py,sha256=KPeyzIjD0dzkxr-TlOeCiIlkdh1WAyyipCAXUEt97Lk,17350
 pycityagent/memory/state.py,sha256=JFCBuK1AS-HqscvdGS9ATF9AUU8t29_2leDY_6iO2_4,5158
-pycityagent/simulation/simulation.py,sha256=U0Cptnn4kahp6xvDfo1g3NkXat9a1GcgXizoxszQr2c,47920
+pycityagent/simulation/simulation.py,sha256=K4u2tikxreRPyC4xAQQKgtlh-0wc9valjP6uvO6LTuE,47972
 pycityagent/simulation/__init__.py,sha256=u1WpgwVxPboXWMxrUQKMXJNmTKQYAeCaqZv9HmSxESY,118
-pycityagent/simulation/agentgroup.py,sha256=5oJwMqkvWoB_tt0k14YtXY0NqesymatXlsgtJDiUvW0,36840
+pycityagent/simulation/agentgroup.py,sha256=iagtmxqBw7eyMCxYFU1SuLIHdoqkiBQV5qcE448QXpo,37068
 pycityagent/simulation/storage/pg.py,sha256=xRshSOGttW-p0re0fNBOjOpb-nQ5msIE2LsdT79_E_Y,8425
 pycityagent/message/message_interceptor.py,sha256=QWuTUqi1Cu214fhFs0f78tD2zflMnb6zEAGB4RutXxs,17736
 pycityagent/message/__init__.py,sha256=f5QH7DKPqEAMyfSlBMnl3uouOKlsoel909STlIe7nUk,276
@@ -58,7 +58,7 @@ pycityagent/environment/utils/const.py,sha256=1LqxnYJ8FSmq37fN5kIFlWLwycEDzFa8SF
 pycityagent/environment/sim/pause_service.py,sha256=UUTa4pTBOX_MGKki9QDgKId7scch0waAWF9xRVmNlAs,1701
 pycityagent/environment/sim/person_service.py,sha256=T1pRi5jDcivSInX7iGZoHKYZmgO7_t5MYtLhU12_LC4,10793
 pycityagent/environment/sim/aoi_service.py,sha256=bYVJDrOfDn8hgOORDU7PxMaT-fpqXA5Z0A080l2EPBc,1242
-pycityagent/environment/sim/sim_env.py,sha256=szkrZtVrm3NXBxLJ2n_ghOhYtTaDUpVak9krjBXgC8Y,4580
+pycityagent/environment/sim/sim_env.py,sha256=7HO5thoWMPQU_eZU2MolTLRgdS_x7I6F7qqdCWYxJJU,4496
 pycityagent/environment/sim/lane_service.py,sha256=bmf0zOWkxDzMEDlhTdHNRJRiTFGgzjbeqmex387gHZs,3964
 pycityagent/environment/sim/client.py,sha256=x4REWPRFG_C2s0-CWz8MnYalD_esfu2pPHf_vpsCG78,2852
 pycityagent/environment/sim/__init__.py,sha256=CyJc5Tey9MgzomZv0ynAcV0yaUlSE3bPbegYXar8wJc,601
@@ -89,9 +89,9 @@ pycityagent/cityagent/blocks/mobility_block.py,sha256=YmKhJW_srC6b6n_LvJujSO-eB-
 pycityagent/survey/models.py,sha256=g3xni4GcA1Py3vlGt6z4ltutjgQ4G0uINYAM8vKRJAw,5225
 pycityagent/survey/__init__.py,sha256=rxwou8U9KeFSP7rMzXtmtp2fVFZxK4Trzi-psx9LPIs,153
 pycityagent/survey/manager.py,sha256=tHkdeq4lTfAHwvgf4-udsXri0z2l6E00rEbvwl7SqRs,3439
-pycityagent-2.0.0a69.dist-info/RECORD,,
-pycityagent-2.0.0a69.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
-pycityagent-2.0.0a69.dist-info/WHEEL,sha256=NW1RskY9zow1Y68W-gXg0oZyBRAugI1JHywIzAIai5o,109
-pycityagent-2.0.0a69.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
-pycityagent-2.0.0a69.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
-pycityagent-2.0.0a69.dist-info/METADATA,sha256=CAOz85QkgBy69X6TCaLlZt32O_jH8bvIi7hZMzAnyk4,9110
+pycityagent-2.0.0a71.dist-info/RECORD,,
+pycityagent-2.0.0a71.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
+pycityagent-2.0.0a71.dist-info/WHEEL,sha256=NW1RskY9zow1Y68W-gXg0oZyBRAugI1JHywIzAIai5o,109
+pycityagent-2.0.0a71.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
+pycityagent-2.0.0a71.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
+pycityagent-2.0.0a71.dist-info/METADATA,sha256=_fzsl3HAFmBCT9RR8lJYhRfxfFIanoNp30WEROFPbWU,9110