pycityagent 2.0.0a32__tar.gz → 2.0.0a34__tar.gz

{pycityagent-2.0.0a32 → pycityagent-2.0.0a34}/PKG-INFO

@@ -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 → pycityagent-2.0.0a34}/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-2.0.0a32 → pycityagent-2.0.0a34}/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 → pycityagent-2.0.0a34}/pyproject.toml

@@ -3,7 +3,7 @@ in-project = true
 
 [tool.poetry]
 name = "pycityagent"
-version = "2.0.0a32"
+version = "2.0.0a34"
 description = "LLM-based城市环境agent构建库"
 authors = ["Yuwei Yan <pinkgranite86@gmail.com>","Junbo Yan <yanjb20thu@gmali.com>"]
 license = "MIT"