fix OrTrigger fire endless (#1438)

* fix ortrigger fire endless

setting "last_call_time" in _fire() change it for the OrTrigger but not for the relevant Triggers.
the function set_last_call_time() set it for normal Trigger and in case of OrTrigger to the "current_trigger".
The current_trigger is the trigger for which triggers next.

* ci: correct from checks.

* Update return statement

Co-authored-by: LordOfPolls <[email protected]>
Signed-off-by: Donbur4156 <[email protected]>

---------

Signed-off-by: Donbur4156 <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: LordOfPolls <[email protected]>

Author: 3 people

interactions/models/internal/tasks/task.py

@@ -89,7 +89,7 @@ async def __call__(self) -> None:
 
     def _fire(self, fire_time: datetime) -> None:
         """Called when the task is being fired."""
-        self.trigger.last_call_time = fire_time
+        self.trigger.set_last_call_time(fire_time)
         _ = asyncio.create_task(self())
         self.iteration += 1
 

interactions/models/internal/tasks/triggers.py

@@ -19,6 +19,9 @@ def reschedule(self) -> None:
         """Update the last call time to now"""
         self.last_call_time = datetime.now()
 
+    def set_last_call_time(self, call_time: datetime) -> None:
+        self.last_call_time = call_time
+
     @abstractmethod
     def next_fire(self) -> datetime | None:
         """
@@ -114,6 +117,10 @@ class OrTrigger(BaseTrigger):
 
     def __init__(self, *trigger: BaseTrigger) -> None:
         self.triggers: list[BaseTrigger] = list(trigger)
+        self.current_trigger: BaseTrigger = None
+
+    def set_last_call_time(self, call_time: datetime) -> None:
+        self.current_trigger.last_call_time = call_time
 
     def _get_delta(self, d: BaseTrigger) -> timedelta:
         next_fire = d.next_fire()
@@ -123,8 +130,9 @@ def __or__(self, other: "BaseTrigger") -> "OrTrigger":
         self.triggers.append(other)
         return self
 
+    def _set_current_trigger(self) -> BaseTrigger | None:
+        self.current_trigger = self.triggers[0] if len(self.triggers) == 1 else min(self.triggers, key=self._get_delta)
+        return self.current_trigger
+
     def next_fire(self) -> datetime | None:
-        if len(self.triggers) == 1:
-            return self.triggers[0].next_fire()
-        trigger = min(self.triggers, key=self._get_delta)
-        return trigger.next_fire()
+        return self.current_trigger.next_fire() if self._set_current_trigger() else None