pycityagent 2.0.0a32__py3-none-any.whl → 2.0.0a34__py3-none-any.whl

pycityagent/simulation/agentgroup.py

@@ -411,19 +411,12 @@ class AgentGroup:
                         }
                         _statuses_time_list.append((_status_dict, _date_time))
                 else:
+                    # institution
                     for agent in self.agents:
                         _date_time = datetime.now(timezone.utc)
-                        position = await agent.memory.get("position")
-                        x = position["xy_position"]["x"]
-                        y = position["xy_position"]["y"]
-                        lng, lat = self.projector(x, y, inverse=True)
-                        if "aoi_position" in position:
-                            parent_id = position["aoi_position"]["aoi_id"]
-                        elif "lane_position" in position:
-                            parent_id = position["lane_position"]["lane_id"]
-                        else:
-                            # BUG: 需要处理
-                            parent_id = -1
+                        # ATTENTION: no valid position for an institution
+                        lng, lat = -1, -1
+                        parent_id = -1
                         try:
                             nominal_gdp = await agent.memory.get("nominal_gdp")
                         except:

pycityagent/workflow/block.py

@@ -148,9 +148,9 @@ class Block:
         trigger: Optional[EventTrigger] = None,
     ):
         self.name = name
-        self.llm = llm
-        self.memory = memory
-        self.simulator = simulator
+        self._llm = llm
+        self._memory = memory
+        self._simulator = simulator
         # 如果传入trigger，将block注入到trigger中并立即初始化
         if trigger is not None:
             trigger.block = self
@@ -163,3 +163,49 @@ class Block:
         To be overridden by specific block implementations.
         """
         raise NotImplementedError("Subclasses should implement this method")
+
+    @property
+    def llm(
+        self,
+    ) -> LLM:
+        if self._llm is None:
+            raise RuntimeError(f"LLM access before assignment, please `set_llm` first!")
+        return self._llm
+
+    @property
+    def memory(
+        self,
+    ) -> Memory:
+        if self._memory is None:
+            raise RuntimeError(
+                f"Memory access before assignment, please `set_memory` first!"
+            )
+        return self._memory
+
+    @property
+    def simulator(
+        self,
+    ) -> Simulator:
+        if self._simulator is None:
+            raise RuntimeError(
+                f"Simulator access before assignment, please `set_simulator` first!"
+            )
+        return self._simulator
+
+    def set_llm_client(self, llm: LLM):
+        """
+        Set the llm_client of the block.
+        """
+        self._llm = llm
+
+    def set_simulator(self, simulator: Simulator):
+        """
+        Set the simulator of the block.
+        """
+        self._simulator = simulator
+
+    def set_memory(self, memory: Memory):
+        """
+        Set the memory of the block.
+        """
+        self._memory = memory

{pycityagent-2.0.0a32.dist-info → pycityagent-2.0.0a34.dist-info}/METADATA

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

{pycityagent-2.0.0a32.dist-info → pycityagent-2.0.0a34.dist-info}/RECORD

@@ -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=ARqycTmVR8kLmLojhTqP6GU1JCjjnwQ_T5SOb5-Spew,24406
+pycityagent/simulation/agentgroup.py,sha256=QwVbgqKYp42_wRS3K6C6E7Aq8cYBacabHmXIKRaxYyw,23955
 pycityagent/simulation/simulation.py,sha256=9kkdgXSEOAN8wiewVFyORksti4IdVNU0opObV6ZYa9k,23344
 pycityagent/simulation/storage/pg.py,sha256=qGrYzJIAzjv8-d3-cle0rY0AN6XB6MgnHkFLBoLmKWU,7251
 pycityagent/survey/__init__.py,sha256=rxwou8U9KeFSP7rMzXtmtp2fVFZxK4Trzi-psx9LPIs,153
@@ -66,10 +66,10 @@ pycityagent/utils/parsers/parser_base.py,sha256=KBKO4zLZPNdGjPAGqIus8LseZ8W3Tlt2
 pycityagent/utils/pg_query.py,sha256=h5158xcrxjUTR0nKwAaG1neFfTHPbN5guLmaXpC8yvs,1918
 pycityagent/utils/survey_util.py,sha256=Be9nptmu2JtesFNemPgORh_2GsN7rcDYGQS9Zfvc5OI,2169
 pycityagent/workflow/__init__.py,sha256=QNkUV-9mACMrR8c0cSKna2gC1mMZdxXbxWzjE-Uods0,621
-pycityagent/workflow/block.py,sha256=l-z9iJo9_USZQRyj4TLMfihK0-tnNDG0a6jVk9WhG0o,6048
+pycityagent/workflow/block.py,sha256=C2aWdVRffb3LknP955GvPcBMsm3VPXN9ZuAtCgITFTo,7181
 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.0a32.dist-info/METADATA,sha256=V94OUuB_US8D7UljUrG8MHFqx27PUDQ2qMIX_XYNJSg,8033
-pycityagent-2.0.0a32.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pycityagent-2.0.0a32.dist-info/RECORD,,
+pycityagent-2.0.0a34.dist-info/METADATA,sha256=za2dplTaxTwxYovvgF_HioNdjMXvmpTdg6v4Nx8Q2vI,8033
+pycityagent-2.0.0a34.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+pycityagent-2.0.0a34.dist-info/RECORD,,