pycityagent 2.0.0a1__py3-none-any.whl → 2.0.0a3__py3-none-any.whl

pycityagent/workflow/trigger.py

@@ -1,10 +1,38 @@
 import asyncio
-from typing import Any, Callable, Dict, List, Optional, Union
+from typing import Any, Callable, Dict, List, Optional, Union, Type
 import socket
 from ..memory import Memory
+from ..environment import Simulator
+
+KEY_TRIGGER_COMPONENTS = [Memory, Simulator]
     
 class EventTrigger:
     """Base class for event triggers that wait for specific conditions to be met."""
+    # 定义该trigger需要的组件类型
+    required_components: List[Type] = []
+    
+    def __init__(self, block=None):
+        self.block = block
+        if block is not None:
+            self.initialize()
+    
+    def initialize(self) -> None:
+        """Initialize the trigger with necessary dependencies."""
+        if not self.block:
+            raise RuntimeError("Block not set for trigger")
+            
+        # 检查所需组件是否都存在
+        missing_components = []
+        for component_type in self.required_components:
+            component_name = component_type.__name__.lower()
+            if not hasattr(self.block, component_name):
+                missing_components.append(component_type.__name__)
+        
+        if missing_components:
+            raise RuntimeError(
+                f"Block is missing required components for {self.__class__.__name__}: "
+                f"{', '.join(missing_components)}"
+            )
     
     async def wait_for_trigger(self) -> None:
         """Wait for the event trigger to be activated.
@@ -16,51 +44,107 @@ class EventTrigger:
     
 class MemoryChangeTrigger(EventTrigger):
     """Event trigger that activates when a specific key in memory changes."""
+    required_components = [Memory]
     
-    def __init__(self, memory: Memory, key: str) -> None:
+    def __init__(self, key: str) -> None:
         """Initialize the memory change trigger.
 
         Args:
-            memory (Memory): The memory object to watch.
             key (str): The key in memory to monitor for changes.
         """
-        self.memory = memory
         self.key = key
         self.trigger_event = asyncio.Event()
-        asyncio.create_task(self.memory.add_watcher(key, self.trigger_event.set))
+        self._initialized = False
+        super().__init__()
+
+    def initialize(self) -> None:
+        """Initialize the trigger with memory from block."""
+        super().initialize()  # 首先检查必需组件
+        self.memory = self.block.memory
+        asyncio.create_task(self.memory.add_watcher(self.key, self.trigger_event.set))
+        self._initialized = True
 
     async def wait_for_trigger(self) -> None:
         """Wait for the memory change trigger to be activated."""
+        if not self._initialized:
+            raise RuntimeError("Trigger not properly initialized")
         await self.trigger_event.wait()
         self.trigger_event.clear()
 
-class PortMessageTrigger(EventTrigger):
-    """Event trigger that activates upon receiving a message on a specified UDP port."""
+
+class TimeTrigger(EventTrigger):
+    """Event trigger that activates periodically based on time intervals."""
+    required_components = [Simulator]
     
-    def __init__(self, port: int) -> None:
-        """Initialize the port message trigger.
+    def __init__(self, 
+                 days: Optional[int] = None, 
+                 hours: Optional[int] = None, 
+                 minutes: Optional[int] = None) -> None:
+        """Initialize the time trigger with interval settings.
 
         Args:
-            port (int): The UDP port to listen for incoming messages.
+            days (Optional[int]): Execute every N days
+            hours (Optional[int]): Execute every N hours
+            minutes (Optional[int]): Execute every N minutes
+
+        Raises:
+            ValueError: If all interval parameters are None or negative
         """
-        self.port = port
+        if all(param is None for param in (days, hours, minutes)):
+            raise ValueError("At least one time interval must be specified")
+        
+        # 验证参数有效性
+        for param_name, param_value in [('days', days), ('hours', hours), ('minutes', minutes)]:
+            if param_value is not None and param_value < 0:
+                raise ValueError(f"{param_name} cannot be negative")
+            
+        # 将所有时间间隔转换为秒
+        self.interval = 0
+        if days is not None:
+            self.interval += days * 24 * 60 * 60
+        if hours is not None:
+            self.interval += hours * 60 * 60
+        if minutes is not None:
+            self.interval += minutes * 60
+            
         self.trigger_event = asyncio.Event()
-        self.message: Optional[str] = None
-        asyncio.create_task(self._listen_on_port())
+        self._initialized = False
+        self._monitoring_task = None
+        self._last_trigger_time = None
+        super().__init__()
 
-    async def _listen_on_port(self) -> None:
-        """Listen for incoming UDP messages on the specified port.
+    def initialize(self) -> None:
+        """Initialize the trigger with necessary dependencies."""
+        super().initialize()  # 首先检查必需组件
+        self.memory = self.block.memory
+        self.simulator = self.block.simulator
+        # 启动时间监控任务
+        self._monitoring_task = asyncio.create_task(self._monitor_time())
+        self._initialized = True
 
-        Activates the trigger event when a message is received.
-        """
-        with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as s:
-            s.bind(("", self.port))
-            while True:
-                data, _ = s.recvfrom(1024)
-                self.message = data.decode()
-                self.trigger_event.set()
+    async def _monitor_time(self):
+        """持续监控时间并在达到间隔时触发事件"""
+        # 第一次调用时直接触发
+        self.trigger_event.set()
+        
+        while True:
+            try:
+                current_time = await self.simulator.GetTime()
+                
+                # 如果是第一次或者已经过了指定的时间间隔
+                if (self._last_trigger_time is None or 
+                    current_time - self._last_trigger_time >= self.interval):
+                    self._last_trigger_time = current_time
+                    self.trigger_event.set()
+                
+                await asyncio.sleep(5)  # 避免过于频繁的检查
+            except Exception as e:
+                print(f"Error in time monitoring: {e}")
+                await asyncio.sleep(10)  # 发生错误时等待较长时间
 
     async def wait_for_trigger(self) -> None:
-        """Wait for the port message trigger to be activated."""
+        """Wait for the time trigger to be activated."""
+        if not self._initialized:
+            raise RuntimeError("Trigger not properly initialized")
         await self.trigger_event.wait()
         self.trigger_event.clear()

{pycityagent-2.0.0a1.dist-info → pycityagent-2.0.0a3.dist-info}/METADATA

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

{pycityagent-2.0.0a1.dist-info → pycityagent-2.0.0a3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pycityagent/__init__.py,sha256=n56bWkAUEcvjDsb7LcJpaGjlrriSKPnR0yBhwRfEYBA,212
-pycityagent/agent.py,sha256=hfJbvZ5kxJJ3AAWjGdEzy52Rid3T5fVq8Qm0djnfxUY,6005
+pycityagent/agent.py,sha256=QzVBgTdlwZEY0pQQB9nTruWiIc3t8mZxLzv5cId1IbY,5951
 pycityagent/config.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycityagent/economy/__init__.py,sha256=aonY4WHnx-6EGJ4WKrx4S-2jAkYNLtqUA04jp6q8B7w,75
 pycityagent/economy/econ_client.py,sha256=qQb_kZneEXGBRaS_y5Jdoi95I8GyjKEsDSC4s6V6R7w,10829
@@ -11,7 +11,7 @@ pycityagent/environment/sence/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 pycityagent/environment/sence/static.py,sha256=fdBjHKacNiDCKhvQkc9WgEYYSO0peMC5lb8CcXl9iNc,29101
 pycityagent/environment/sidecar/__init__.py,sha256=RFbOf40aYBP4WwRpFkua5tlRE_OtMcMNyp1Lew_aaAU,235
 pycityagent/environment/sidecar/sidecarv2.py,sha256=beKlYZgt38EQbV1x6NWQo7xVXyB-5QHfbwJexyXu7Tg,3252
-pycityagent/environment/sim/__init__.py,sha256=tr0lFAUsbyfAN5W5GehTlJHTSDGLeseUqVJgZfWn6PY,668
+pycityagent/environment/sim/__init__.py,sha256=JVG6sSD2Hbohl1TtKjuQi7_M7tKMrFh9vl3QV3VA5O0,724
 pycityagent/environment/sim/aoi_service.py,sha256=pYSsqdGBpfQvp0-umNJir_7Yph75OJqhLjFQ2QWhSP8,1211
 pycityagent/environment/sim/client.py,sha256=MHR7Hhu-Cr7B61d3K_QDpSJh4HrUU9JQf6Cu7_8pdsE,3493
 pycityagent/environment/sim/clock_service.py,sha256=YG_A_IA7iJp9rOQE3bCPgppzuzzUwWMCzlxSUdOy088,1326
@@ -20,12 +20,16 @@ pycityagent/environment/sim/lane_service.py,sha256=6ljWiX_GbZd-a-fEcktDZncxBkraL
 pycityagent/environment/sim/light_service.py,sha256=ezYGcV_PkZ6I-yv48LNEjsytwwwQx-1Qp2QCWXWIhdQ,4215
 pycityagent/environment/sim/person_service.py,sha256=nIvOsoBoqOTDYtsiThg07-4ZBgkTUDEbb3dHyOjzyb8,10652
 pycityagent/environment/sim/road_service.py,sha256=Pab182YRcrjLw3UcfoD1Hdd6O8XEdi6Q2hJKzFcpSWE,1272
+pycityagent/environment/sim/sim_env.py,sha256=HI1LcS_FotDKQ6vBnx0e49prXSABOfA20aU9KM-ZkCY,4625
 pycityagent/environment/sim/social_service.py,sha256=a9mGZm95EFUIKQJUwQi9f8anmtf2SK4XqGfE2W9IXSQ,2001
-pycityagent/environment/simulator.py,sha256=zF6jBJLYtv-xqmFPKfrO_Z2u3FHDjRZ6segZhJbe7M8,13289
-pycityagent/environment/utils/__init__.py,sha256=sYbR0Przx6eekKXoTDDNB6u-cOaKfqsF0NYypppHuK8,116
+pycityagent/environment/simulator.py,sha256=lw6-T6HFeE6lOtbTQdKZLre2cX7PZkXftRt7wC4mE-8,11858
+pycityagent/environment/utils/__init__.py,sha256=PUx8etr2p_AA7F50ZR7g27odkgv-nOqFZa61ER8-DLg,221
+pycityagent/environment/utils/base64.py,sha256=hoREzQo3FXMN79pqQLO2jgsDEvudciomyKii7MWljAM,374
+pycityagent/environment/utils/const.py,sha256=3RMNy7_bE7-23K90j9DFW_tWEzu8s7hSTgKbV-3BFl4,5327
 pycityagent/environment/utils/geojson.py,sha256=Ieg8Bzw63kKhJlhDIOVDoh-wQO4Sbtoe47FtIOy5wWg,686
 pycityagent/environment/utils/grpc.py,sha256=6EJwKXXktIWb1NcUiJzIRmfrY0S03QAXXGcCDHqAT00,1998
 pycityagent/environment/utils/map_utils.py,sha256=oqrRgQICC3SYw6gwjjPe_MAif7_t6dlrQpY8E32Fexs,5777
+pycityagent/environment/utils/port.py,sha256=3OM6kSUt3PxvDUOlgyiendBtETaWU8Mzk_8H0TzTmYg,295
 pycityagent/environment/utils/protobuf.py,sha256=0jBvK_s96y_n7tuMbG22TOtQmg71SGV4ONDy2IGsU9o,1148
 pycityagent/llm/__init__.py,sha256=0-_q-StY0g4p9mdUNve_kqzHNXwVxedNsvxGXSQYq6o,144
 pycityagent/llm/embedding.py,sha256=vtjMUuInrtn0WRPXp3cmYEhwHXJ0q6zszdXsjTsgNeQ,4499
@@ -43,7 +47,7 @@ pycityagent/memory/utils.py,sha256=97lkenn-36wgt7uWb3Z39BXdJ5zlEQTQnQBFpoND1gg,8
 pycityagent/message/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycityagent/simulation/__init__.py,sha256=SZQzjcGR-zkTDrE81bQuEdKn7yjk4BcZ9m7o1wTc7EE,111
 pycityagent/simulation/interview.py,sha256=mY4Vpz0vgJo4rrMy3TZnwwM-iVDL6J0LgjOxbEuV27E,1173
-pycityagent/simulation/simulation.py,sha256=RXB0esX_0kS_gB8_zaVjPVQRHJYZ6iSYH44d_Uksf2s,10016
+pycityagent/simulation/simulation.py,sha256=-vm0Yhl_k4_CbGYScg-V4dD2KEyLiarN27u0ccaX8ao,12680
 pycityagent/simulation/survey/__init__.py,sha256=hFJ0Q1yo4jwKAIXP17sznBSWwm2Lyh3F3W3Lly40wr8,172
 pycityagent/simulation/survey/manager.py,sha256=DkNrb12Ay7TiGURoyJTFFeUdV1zh6TgRpTmpZOblADw,2158
 pycityagent/simulation/survey/models.py,sha256=-3EKe-qvkUJ2TH24ow0A_Lc4teGet7pueN2T5mOR_Qc,1308
@@ -55,11 +59,11 @@ pycityagent/utils/parsers/__init__.py,sha256=p5RZ4azJIpMgmKIU2evIp2moNzFabIR9X1L
 pycityagent/utils/parsers/code_block_parser.py,sha256=Cs2Z_hm9VfNCpPPll1TwteaJF-HAQPs-3RApsOekFm4,1173
 pycityagent/utils/parsers/json_parser.py,sha256=FZ3XN1g8z4Dr2TFraUOoah1oQcze4fPd2m01hHoX0Mo,2917
 pycityagent/utils/parsers/parser_base.py,sha256=k6DVqwAMK3jJdOP4IeLE-aFPm3V2F-St5qRBuRdx4aU,1742
-pycityagent/workflow/__init__.py,sha256=dQCK7diOAQAn8Fo73rb6cnw-7u2NC55JWLW02bLdHLU,495
-pycityagent/workflow/block.py,sha256=rRL4ajiRZq3el4W0n6U4Ytb4WlN_4tH9OvVgFEuh73c,5093
+pycityagent/workflow/__init__.py,sha256=EyCcjB6LyBim-5iAOPe4m2qfvghEPqu1ZdGfy4KPeZ8,551
+pycityagent/workflow/block.py,sha256=IXfarqIax6yVP_DniU6ZsPTT8QA4aIDnvZbwP_MtRaw,6054
 pycityagent/workflow/prompt.py,sha256=cmzKEmlzjdwg50uwfnTnN_6xNJA8OVjo5fdmcsaTbdU,2886
 pycityagent/workflow/tool.py,sha256=4sYbH-OVNffXbK3m58f8ap6WrS_uMzhK1c_Rl2er1B0,8981
-pycityagent/workflow/trigger.py,sha256=vweibjzGFex8IyRH7BbU-yarXcIgo6lt9v0UN3e7l5w,2352
-pycityagent-2.0.0a1.dist-info/METADATA,sha256=84-4cu5JguETBEEV63jJgKr_0XtYx78zS0ZDqpE79FE,7537
-pycityagent-2.0.0a1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pycityagent-2.0.0a1.dist-info/RECORD,,
+pycityagent/workflow/trigger.py,sha256=u2aPBOzTWvdYKb45nUsQfA_uRunsmbLzB7ztSU2mlrQ,5736
+pycityagent-2.0.0a3.dist-info/METADATA,sha256=C5Mcssb-bkqMJEBYu3MsqGTqfjgH__gFo_3w9wItFAA,7537
+pycityagent-2.0.0a3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+pycityagent-2.0.0a3.dist-info/RECORD,,