From 6328f17307bd1850b48fde0b20ec6398b7988091 Mon Sep 17 00:00:00 2001
From: Robert Sivilli <robert.sivilli@gmail.com>
Date: Mon, 14 Aug 2023 07:30:45 -0400
Subject: [PATCH 01/15] initial cut

---
 twitchio/ext/routines/__init__.py | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/twitchio/ext/routines/__init__.py b/twitchio/ext/routines/__init__.py
index 89d4867c..990e03dd 100644
--- a/twitchio/ext/routines/__init__.py
+++ b/twitchio/ext/routines/__init__.py
@@ -99,6 +99,7 @@ def __init__(
 
         self._args: tuple | None = None
         self._kwargs: dict | None = None
+        self.next_event_time:datetime.datetime|None = None #type : ignore
 
     def __get__(self, instance, owner):
         if instance is None:
@@ -174,6 +175,8 @@ def cancel(self) -> None:
             Consider using :meth:`stop` if a graceful stop, which will complete the current iteration, is desired.
         """
         if self._can_be_cancelled():
+            self.next_event_time =None 
+
             self._task.cancel()
 
         if not self._restarting:
@@ -319,7 +322,17 @@ def completed_iterations(self) -> int:
     def remaining_iterations(self) -> Optional[int]:
         """A count of remaining iterations."""
         return self._remaining_iterations
-
+    
+    @property
+    def time_till_execution(self) -> datetime.timedelta:
+        """Return the time left as a datetime object before the next execution."""
+        
+        if self.next_event_time is None:
+            #this might be misleading...
+            return datetime.timedelta(seconds=0)
+        return max(self.next_event_time - datetime.datetime.now(),datetime.timedelta(seconds=0))
+        
+    
     @property
     def start_time(self) -> Optional[datetime.datetime]:
         """The time the routine was started.
@@ -351,10 +364,12 @@ async def _routine(self, *args, **kwargs) -> None:
                 return self.cancel()
 
         if self._time:
+            self.next_event_time = self._time
             wait = compute_timedelta(self._time)
             await asyncio.sleep(wait)
 
         if self._wait_first and not self._time:
+            self.next_event_time = self._delta+datetime.datetime.now()
             await asyncio.sleep(self._delta)
 
         if self._remaining_iterations == 0:
@@ -394,6 +409,7 @@ async def _routine(self, *args, **kwargs) -> None:
                 sleep = max((start - datetime.datetime.now(datetime.timezone.utc)).total_seconds() + self._delta, 0)
 
             self._completed_loops += 1
+            self.next_event_time = datetime.datetime.now() + datetime.timedelta(seconds=sleep)
             await asyncio.sleep(sleep)
 
         try:
@@ -452,7 +468,7 @@ def routine(
 
     def decorator(coro: Callable) -> Routine:
         time_ = time
-
+        
         if any((seconds, minutes, hours)) and time_:
             raise RuntimeError(
                 "Argument <time> can not be used in conjunction with any <seconds>, <minutes> or <hours> argument(s)."

From 5032128fbfd257caaa4bd9d17419f15639ca63ba Mon Sep 17 00:00:00 2001
From: Robert Sivilli <robert.sivilli@gmail.com>
Date: Mon, 14 Aug 2023 07:36:24 -0400
Subject: [PATCH 02/15] updating changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 7a773eeb..d90d1dbf 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -24,6 +24,7 @@ Master
         - Added :func:`~twitchio.Client.fetch_content_classification_labels` along with :class:`~twitchio.ContentClassificationLabel`
         - Added :attr:`~twitchio.ChannelInfo.content_classification_labels` and :attr:`~twitchio.ChannelInfo.is_branded_content` to :class:`~twitchio.ChannelInfo`
         - Added new parameters to :func:`~twitchio.PartialUser.modify_stream` for ``is_branded_content`` and ``content_classification_labels``
+        - Added :attr:`~twitchio.ext.routines.Routine.time_till_execution` and :attr:`~twitchio.ext.routines.Routine.next_event_time` for monitoring
             
     - Bug fixes
         - Fix :func:`~twitchio.Client.search_categories` due to :attr:`~twitchio.Game.igdb_id` being added to :class:`~twitchio.Game`

From 9f4ccd1d67a42041f6ff33704c8f5d99444e315a Mon Sep 17 00:00:00 2001
From: Robert Sivilli <robert.sivilli@gmail.com>
Date: Mon, 14 Aug 2023 08:01:48 -0400
Subject: [PATCH 03/15] updating comments to reflect train of thought

---
 twitchio/ext/routines/__init__.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/twitchio/ext/routines/__init__.py b/twitchio/ext/routines/__init__.py
index 990e03dd..003d43a2 100644
--- a/twitchio/ext/routines/__init__.py
+++ b/twitchio/ext/routines/__init__.py
@@ -328,8 +328,9 @@ def time_till_execution(self) -> datetime.timedelta:
         """Return the time left as a datetime object before the next execution."""
         
         if self.next_event_time is None:
-            #this might be misleading...
+            #This might be misleading for stopped routines. Consider None return? 
             return datetime.timedelta(seconds=0)
+        # For long running routines (ie the action takes a while), 
         return max(self.next_event_time - datetime.datetime.now(),datetime.timedelta(seconds=0))
         
     
@@ -379,6 +380,13 @@ async def _routine(self, *args, **kwargs) -> None:
         while True:
             iteration += 1
             start = datetime.datetime.now(datetime.timezone.utc)
+            
+            # This will give a move accurate estimate during the sleep. HOWEVER - it will also be misleading as you could have a routine that runs longer than the sleep time
+            # as it would imply that a second invoke will be called during the execution of the current one 
+            # if self._time:
+            #     self.next_event_time =  compute_timedelta(self._time + datetime.timedelta(days=self._completed_loops))
+            # else:
+            #     self.next_event_time = max(start + self._delta, 0)
 
             try:
                 if self._instance:
@@ -409,6 +417,7 @@ async def _routine(self, *args, **kwargs) -> None:
                 sleep = max((start - datetime.datetime.now(datetime.timezone.utc)).total_seconds() + self._delta, 0)
 
             self._completed_loops += 1
+            # I believe this will provide a more realistic capture of what is happening
             self.next_event_time = datetime.datetime.now() + datetime.timedelta(seconds=sleep)
             await asyncio.sleep(sleep)
 

From 5dd5564669cb40340f107a1ae9fe64e24cbf0e6f Mon Sep 17 00:00:00 2001
From: Robert Sivilli <robert.sivilli@gmail.com>
Date: Mon, 14 Aug 2023 10:22:30 -0400
Subject: [PATCH 04/15] updates based on feedback in draft PR

---
 twitchio/ext/routines/__init__.py | 41 ++++++++++++++-----------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/twitchio/ext/routines/__init__.py b/twitchio/ext/routines/__init__.py
index 003d43a2..88a1a660 100644
--- a/twitchio/ext/routines/__init__.py
+++ b/twitchio/ext/routines/__init__.py
@@ -99,7 +99,7 @@ def __init__(
 
         self._args: tuple | None = None
         self._kwargs: dict | None = None
-        self.next_event_time:datetime.datetime|None = None #type : ignore
+        self.next_event_time: datetime.datetime | None = None
 
     def __get__(self, instance, owner):
         if instance is None:
@@ -175,7 +175,7 @@ def cancel(self) -> None:
             Consider using :meth:`stop` if a graceful stop, which will complete the current iteration, is desired.
         """
         if self._can_be_cancelled():
-            self.next_event_time =None 
+            self.next_event_time = None
 
             self._task.cancel()
 
@@ -322,18 +322,19 @@ def completed_iterations(self) -> int:
     def remaining_iterations(self) -> Optional[int]:
         """A count of remaining iterations."""
         return self._remaining_iterations
-    
+
     @property
-    def time_till_execution(self) -> datetime.timedelta:
-        """Return the time left as a datetime object before the next execution."""
-        
+    def next_execution_time(self) -> datetime.timedelta | None:
+        """Return the time left as a datetime object before the next execution.
+
+        None will be returned if the routine is not scheduled
+        """
+
         if self.next_event_time is None:
-            #This might be misleading for stopped routines. Consider None return? 
-            return datetime.timedelta(seconds=0)
-        # For long running routines (ie the action takes a while), 
-        return max(self.next_event_time - datetime.datetime.now(),datetime.timedelta(seconds=0))
-        
-    
+            return None
+
+        return max(self.next_event_time - datetime.datetime.now(datetime.timezone.utc), datetime.timedelta(seconds=0))
+
     @property
     def start_time(self) -> Optional[datetime.datetime]:
         """The time the routine was started.
@@ -370,7 +371,7 @@ async def _routine(self, *args, **kwargs) -> None:
             await asyncio.sleep(wait)
 
         if self._wait_first and not self._time:
-            self.next_event_time = self._delta+datetime.datetime.now()
+            self.next_event_time = self._delta + datetime.datetime.now(datetime.timezone.utc)
             await asyncio.sleep(self._delta)
 
         if self._remaining_iterations == 0:
@@ -380,13 +381,6 @@ async def _routine(self, *args, **kwargs) -> None:
         while True:
             iteration += 1
             start = datetime.datetime.now(datetime.timezone.utc)
-            
-            # This will give a move accurate estimate during the sleep. HOWEVER - it will also be misleading as you could have a routine that runs longer than the sleep time
-            # as it would imply that a second invoke will be called during the execution of the current one 
-            # if self._time:
-            #     self.next_event_time =  compute_timedelta(self._time + datetime.timedelta(days=self._completed_loops))
-            # else:
-            #     self.next_event_time = max(start + self._delta, 0)
 
             try:
                 if self._instance:
@@ -417,8 +411,9 @@ async def _routine(self, *args, **kwargs) -> None:
                 sleep = max((start - datetime.datetime.now(datetime.timezone.utc)).total_seconds() + self._delta, 0)
 
             self._completed_loops += 1
-            # I believe this will provide a more realistic capture of what is happening
-            self.next_event_time = datetime.datetime.now() + datetime.timedelta(seconds=sleep)
+
+            self.next_event_time = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(seconds=sleep)
+
             await asyncio.sleep(sleep)
 
         try:
@@ -477,7 +472,7 @@ def routine(
 
     def decorator(coro: Callable) -> Routine:
         time_ = time
-        
+
         if any((seconds, minutes, hours)) and time_:
             raise RuntimeError(
                 "Argument <time> can not be used in conjunction with any <seconds>, <minutes> or <hours> argument(s)."

From 43dd728298acd43d8836415129b391cc52214369 Mon Sep 17 00:00:00 2001
From: Robert Sivilli <robert.sivilli@gmail.com>
Date: Mon, 14 Aug 2023 10:29:37 -0400
Subject: [PATCH 05/15] syncing with new name

---
 docs/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d90d1dbf..06d27f99 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -24,7 +24,7 @@ Master
         - Added :func:`~twitchio.Client.fetch_content_classification_labels` along with :class:`~twitchio.ContentClassificationLabel`
         - Added :attr:`~twitchio.ChannelInfo.content_classification_labels` and :attr:`~twitchio.ChannelInfo.is_branded_content` to :class:`~twitchio.ChannelInfo`
         - Added new parameters to :func:`~twitchio.PartialUser.modify_stream` for ``is_branded_content`` and ``content_classification_labels``
-        - Added :attr:`~twitchio.ext.routines.Routine.time_till_execution` and :attr:`~twitchio.ext.routines.Routine.next_event_time` for monitoring
+        - Added :attr:`~twitchio.ext.routines.Routine.next_execution_time` and :attr:`~twitchio.ext.routines.Routine.next_event_time` for monitoring
             
     - Bug fixes
         - Fix :func:`~twitchio.Client.search_categories` due to :attr:`~twitchio.Game.igdb_id` being added to :class:`~twitchio.Game`

From 6e7ca4d44ec94a529ef1d726609bafac654ef14f Mon Sep 17 00:00:00 2001
From: Robert Sivilli <robert.sivilli@gmail.com>
Date: Sat, 19 Aug 2023 13:56:53 -0400
Subject: [PATCH 06/15] handling cases where time for routine doesn't include
 tzinfo

---
 twitchio/ext/routines/__init__.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/twitchio/ext/routines/__init__.py b/twitchio/ext/routines/__init__.py
index 88a1a660..7c28fa57 100644
--- a/twitchio/ext/routines/__init__.py
+++ b/twitchio/ext/routines/__init__.py
@@ -332,8 +332,9 @@ def next_execution_time(self) -> datetime.timedelta | None:
 
         if self.next_event_time is None:
             return None
-
-        return max(self.next_event_time - datetime.datetime.now(datetime.timezone.utc), datetime.timedelta(seconds=0))
+        
+        return max(self.next_event_time - datetime.datetime.now(self.next_event_time.tzinfo), datetime.timedelta(seconds=0))
+        
 
     @property
     def start_time(self) -> Optional[datetime.datetime]:
@@ -369,7 +370,7 @@ async def _routine(self, *args, **kwargs) -> None:
             self.next_event_time = self._time
             wait = compute_timedelta(self._time)
             await asyncio.sleep(wait)
-
+            
         if self._wait_first and not self._time:
             self.next_event_time = self._delta + datetime.datetime.now(datetime.timezone.utc)
             await asyncio.sleep(self._delta)

From 403fb542ce412b6d1f4738cc547cc86aff0e0677 Mon Sep 17 00:00:00 2001
From: Robert Sivilli <robert.sivilli@gmail.com>
Date: Sat, 19 Aug 2023 14:10:47 -0400
Subject: [PATCH 07/15] using Optional for typing for 3.7 compatibility

---
 newtest.py                        | 34 ++++++++++++++++
 test.py                           | 68 +++++++++++++++++++++++++++++++
 twitchio/ext/routines/__init__.py | 16 ++++----
 3 files changed, 111 insertions(+), 7 deletions(-)
 create mode 100644 newtest.py
 create mode 100644 test.py

diff --git a/newtest.py b/newtest.py
new file mode 100644
index 00000000..382cad8c
--- /dev/null
+++ b/newtest.py
@@ -0,0 +1,34 @@
+from twitchio.ext import routines, commands
+from dotenv import load_dotenv
+import os
+
+load_dotenv()
+from datetime import datetime, timedelta
+
+
+THRESHOLD = 0.1
+
+
+class Bot(commands.Bot):
+    call_count = 0
+
+    def __init__(self):
+        super().__init__(
+            token=os.getenv("access_token"),
+            prefix="#!",
+            initial_channels=["dreamingofelectricsheep"],
+        )
+
+    async def event_ready(self):
+        print(f"Logged in as | {self.nick}")
+        print(f"User id is | {self.user_id}")
+        bot.basic_scheduled_routine.start()
+
+    @routines.routine(time=datetime.now() + timedelta(seconds=5), wait_first=True)
+    async def basic_scheduled_routine(self):
+        self.call_count += 1
+        print(f"{self.call_count} the time is now {datetime.now()}")
+
+
+bot = Bot()
+bot.run()
diff --git a/test.py b/test.py
new file mode 100644
index 00000000..c1655573
--- /dev/null
+++ b/test.py
@@ -0,0 +1,68 @@
+import asyncio
+from twitchio.ext import routines, commands
+from dotenv import load_dotenv
+import os
+
+load_dotenv()
+from datetime import datetime, timedelta
+
+
+THRESHOLD = 0.1
+
+
+class Bot(commands.Bot):
+    call_count = 0
+
+    def __init__(self):
+        super().__init__(
+            token=os.getenv("access_token"),
+            prefix="#!",
+            initial_channels=["dreamingofelectricsheep"],
+        )
+
+    async def event_ready(self):
+        print(f"Logged in as | {self.nick}")
+        print(f"User id is | {self.user_id}")
+
+    @routines.routine(seconds=1.0, iterations=5)
+    async def basic_timed_routine(self, arg: str):
+        print(f"Hello {arg}!")
+
+    @routines.routine(seconds=0.1)
+    async def basic_test(self):
+        print(self.basic_timed_routine.next_execution_time)
+        if self.basic_timed_routine.remaining_iterations == 0:
+            self.basic_timed_routine.start("Restarted")
+
+    @routines.routine(seconds=1.0, iterations=5, wait_first=True)
+    async def basic_timed_wait_routine(self, arg: str):
+        print(f"Hello {arg}!")
+
+    @routines.routine(seconds=0.1)
+    async def basic_wait_test(self):
+        print(self.basic_timed_wait_routine.next_execution_time)
+        if self.basic_timed_wait_routine.remaining_iterations == 0:
+            self.basic_timed_wait_routine.start("Restarted")
+
+    @routines.routine(time=datetime.now() + timedelta(seconds=5), wait_first=True)
+    async def basic_scheduled_routine(self):
+        # Note this seems to get called twice in execution. I don't think this is a result of my changes
+        self.call_count += 1
+        print(f"{self.call_count} the time is now {datetime.now()}")
+
+    @routines.routine(seconds=0.1)
+    async def basic_schedule_test(self):
+        print(self.basic_scheduled_routine.next_execution_time)
+
+    @routines.routine(seconds=2)
+    async def restart_schedule_test(self):
+        pass
+
+
+bot = Bot()
+# bot.basic_timed_wait_routine.start("Test")
+# bot.basic_wait_test.start()
+
+bot.basic_scheduled_routine.start()
+
+bot.run()
diff --git a/twitchio/ext/routines/__init__.py b/twitchio/ext/routines/__init__.py
index 7c28fa57..0563dd16 100644
--- a/twitchio/ext/routines/__init__.py
+++ b/twitchio/ext/routines/__init__.py
@@ -97,9 +97,10 @@ def __init__(
 
         self._instance = None
 
-        self._args: tuple | None = None
-        self._kwargs: dict | None = None
-        self.next_event_time: datetime.datetime | None = None
+        self._args: Optional[tuple] = None
+        self._kwargs: Optional[dict] = None
+
+        self.next_event_time: Optional[datetime.datetime] = None
 
     def __get__(self, instance, owner):
         if instance is None:
@@ -332,9 +333,10 @@ def next_execution_time(self) -> datetime.timedelta | None:
 
         if self.next_event_time is None:
             return None
-        
-        return max(self.next_event_time - datetime.datetime.now(self.next_event_time.tzinfo), datetime.timedelta(seconds=0))
-        
+
+        return max(
+            self.next_event_time - datetime.datetime.now(self.next_event_time.tzinfo), datetime.timedelta(seconds=0)
+        )
 
     @property
     def start_time(self) -> Optional[datetime.datetime]:
@@ -370,7 +372,7 @@ async def _routine(self, *args, **kwargs) -> None:
             self.next_event_time = self._time
             wait = compute_timedelta(self._time)
             await asyncio.sleep(wait)
-            
+
         if self._wait_first and not self._time:
             self.next_event_time = self._delta + datetime.datetime.now(datetime.timezone.utc)
             await asyncio.sleep(self._delta)

From 3b017b05a309ab3d499ad1863fab19969f7d312a Mon Sep 17 00:00:00 2001
From: Robert Sivilli <robert.sivilli@gmail.com>
Date: Sat, 19 Aug 2023 14:30:55 -0400
Subject: [PATCH 08/15] typo

---
 newtest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/newtest.py b/newtest.py
index 382cad8c..b384073f 100644
--- a/newtest.py
+++ b/newtest.py
@@ -22,7 +22,7 @@ def __init__(self):
     async def event_ready(self):
         print(f"Logged in as | {self.nick}")
         print(f"User id is | {self.user_id}")
-        bot.basic_scheduled_routine.start()
+        self.basic_scheduled_routine.start()
 
     @routines.routine(time=datetime.now() + timedelta(seconds=5), wait_first=True)
     async def basic_scheduled_routine(self):

From a32cae70c0fc1c123c5130ae912f7e6498b14f63 Mon Sep 17 00:00:00 2001
From: Robert Sivilli <robert.sivilli@gmail.com>
Date: Sat, 19 Aug 2023 16:19:54 -0400
Subject: [PATCH 09/15] deleting

---
 newtest.py | 34 ----------------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 newtest.py

diff --git a/newtest.py b/newtest.py
deleted file mode 100644
index b384073f..00000000
--- a/newtest.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from twitchio.ext import routines, commands
-from dotenv import load_dotenv
-import os
-
-load_dotenv()
-from datetime import datetime, timedelta
-
-
-THRESHOLD = 0.1
-
-
-class Bot(commands.Bot):
-    call_count = 0
-
-    def __init__(self):
-        super().__init__(
-            token=os.getenv("access_token"),
-            prefix="#!",
-            initial_channels=["dreamingofelectricsheep"],
-        )
-
-    async def event_ready(self):
-        print(f"Logged in as | {self.nick}")
-        print(f"User id is | {self.user_id}")
-        self.basic_scheduled_routine.start()
-
-    @routines.routine(time=datetime.now() + timedelta(seconds=5), wait_first=True)
-    async def basic_scheduled_routine(self):
-        self.call_count += 1
-        print(f"{self.call_count} the time is now {datetime.now()}")
-
-
-bot = Bot()
-bot.run()

From 227533fa65b98aea493a263649a4a1f420b64636 Mon Sep 17 00:00:00 2001
From: Robert Sivilli <robert.sivilli@gmail.com>
Date: Sat, 19 Aug 2023 17:20:41 -0400
Subject: [PATCH 10/15] changes based on tests

---
 test.py                           | 38 +++++++++++++++++++++----------
 twitchio/ext/routines/__init__.py |  5 ++--
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/test.py b/test.py
index c1655573..6639f98e 100644
--- a/test.py
+++ b/test.py
@@ -6,6 +6,7 @@
 load_dotenv()
 from datetime import datetime, timedelta
 
+import random
 
 THRESHOLD = 0.1
 
@@ -23,6 +24,9 @@ def __init__(self):
     async def event_ready(self):
         print(f"Logged in as | {self.nick}")
         print(f"User id is | {self.user_id}")
+        bot.low_freq_routine.start()
+        bot.reschedule_schedule_nowait_test.start()
+        bot.test_low_freq_restart.start()
 
     @routines.routine(seconds=1.0, iterations=5)
     async def basic_timed_routine(self, arg: str):
@@ -34,35 +38,45 @@ async def basic_test(self):
         if self.basic_timed_routine.remaining_iterations == 0:
             self.basic_timed_routine.start("Restarted")
 
-    @routines.routine(seconds=1.0, iterations=5, wait_first=True)
+    @routines.routine(seconds=1.0, wait_first=True)
     async def basic_timed_wait_routine(self, arg: str):
         print(f"Hello {arg}!")
 
     @routines.routine(seconds=0.1)
     async def basic_wait_test(self):
         print(self.basic_timed_wait_routine.next_execution_time)
-        if self.basic_timed_wait_routine.remaining_iterations == 0:
-            self.basic_timed_wait_routine.start("Restarted")
 
-    @routines.routine(time=datetime.now() + timedelta(seconds=5), wait_first=True)
+    @routines.routine(time=datetime.now() + timedelta(seconds=5))
     async def basic_scheduled_routine(self):
-        # Note this seems to get called twice in execution. I don't think this is a result of my changes
-        self.call_count += 1
         print(f"{self.call_count} the time is now {datetime.now()}")
 
     @routines.routine(seconds=0.1)
     async def basic_schedule_test(self):
         print(self.basic_scheduled_routine.next_execution_time)
 
-    @routines.routine(seconds=2)
+    @routines.routine(minutes=5, wait_first=True)
+    async def low_freq_routine(self):
+        print("I ran")
+
+    @routines.routine(seconds=5)
     async def restart_schedule_test(self):
-        pass
+        self.low_freq_routine.restart(force=True)
 
+    @routines.routine(seconds=1)
+    async def test_low_freq_restart(self):
+        print(self.low_freq_routine.next_execution_time)
 
-bot = Bot()
-# bot.basic_timed_wait_routine.start("Test")
-# bot.basic_wait_test.start()
+    @routines.routine(seconds=5, iterations=2, wait_first=True)
+    async def reschedule_schedule_wait_test(self):
+        print("Rescheduling")
+        self.low_freq_routine.change_interval(wait_first=True, minutes=random.random() * 2)
+
+    @routines.routine(seconds=5, iterations=2, wait_first=True)
+    async def reschedule_schedule_nowait_test(self):
+        print("Rescheduling")
+        self.low_freq_routine.change_interval(wait_first=False, minutes=random.random() * 2)
 
-bot.basic_scheduled_routine.start()
+
+bot = Bot()
 
 bot.run()
diff --git a/twitchio/ext/routines/__init__.py b/twitchio/ext/routines/__init__.py
index 0563dd16..601df57a 100644
--- a/twitchio/ext/routines/__init__.py
+++ b/twitchio/ext/routines/__init__.py
@@ -215,7 +215,6 @@ def restart_when_over(fut, *, args=args, kwargs=kwargs):
 
         if self._can_be_cancelled():
             self._task.add_done_callback(restart_when_over)
-
             if force:
                 self._task.cancel()
             else:
@@ -374,7 +373,9 @@ async def _routine(self, *args, **kwargs) -> None:
             await asyncio.sleep(wait)
 
         if self._wait_first and not self._time:
-            self.next_event_time = self._delta + datetime.datetime.now(datetime.timezone.utc)
+            self.next_event_time = datetime.timedelta(seconds=self._delta) + datetime.datetime.now(
+                datetime.timezone.utc
+            )
             await asyncio.sleep(self._delta)
 
         if self._remaining_iterations == 0:

From 0bfb988627a9beab52b592b1cdf0a5e85f2ae523 Mon Sep 17 00:00:00 2001
From: Robert Sivilli <robert.sivilli@gmail.com>
Date: Sat, 19 Aug 2023 17:23:09 -0400
Subject: [PATCH 11/15] changing property name to better reflect what it is

---
 test.py                           | 8 ++++----
 twitchio/ext/routines/__init__.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test.py b/test.py
index 6639f98e..4cf9de83 100644
--- a/test.py
+++ b/test.py
@@ -34,7 +34,7 @@ async def basic_timed_routine(self, arg: str):
 
     @routines.routine(seconds=0.1)
     async def basic_test(self):
-        print(self.basic_timed_routine.next_execution_time)
+        print(self.basic_timed_routine.time_until_next_execution)
         if self.basic_timed_routine.remaining_iterations == 0:
             self.basic_timed_routine.start("Restarted")
 
@@ -44,7 +44,7 @@ async def basic_timed_wait_routine(self, arg: str):
 
     @routines.routine(seconds=0.1)
     async def basic_wait_test(self):
-        print(self.basic_timed_wait_routine.next_execution_time)
+        print(self.basic_timed_wait_routine.time_until_next_execution)
 
     @routines.routine(time=datetime.now() + timedelta(seconds=5))
     async def basic_scheduled_routine(self):
@@ -52,7 +52,7 @@ async def basic_scheduled_routine(self):
 
     @routines.routine(seconds=0.1)
     async def basic_schedule_test(self):
-        print(self.basic_scheduled_routine.next_execution_time)
+        print(self.basic_scheduled_routine.time_until_next_execution)
 
     @routines.routine(minutes=5, wait_first=True)
     async def low_freq_routine(self):
@@ -64,7 +64,7 @@ async def restart_schedule_test(self):
 
     @routines.routine(seconds=1)
     async def test_low_freq_restart(self):
-        print(self.low_freq_routine.next_execution_time)
+        print(self.low_freq_routine.time_until_next_execution)
 
     @routines.routine(seconds=5, iterations=2, wait_first=True)
     async def reschedule_schedule_wait_test(self):
diff --git a/twitchio/ext/routines/__init__.py b/twitchio/ext/routines/__init__.py
index 601df57a..b42a90b6 100644
--- a/twitchio/ext/routines/__init__.py
+++ b/twitchio/ext/routines/__init__.py
@@ -324,7 +324,7 @@ def remaining_iterations(self) -> Optional[int]:
         return self._remaining_iterations
 
     @property
-    def next_execution_time(self) -> datetime.timedelta | None:
+    def time_until_next_execution(self) -> datetime.timedelta | None:
         """Return the time left as a datetime object before the next execution.
 
         None will be returned if the routine is not scheduled

From a6766007fbd2ea5f67d425c824cd6f40147f67a7 Mon Sep 17 00:00:00 2001
From: Robert Sivilli <robert.sivilli@gmail.com>
Date: Sat, 19 Aug 2023 17:26:01 -0400
Subject: [PATCH 12/15] updating changelog

---
 docs/changelog.rst | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 06d27f99..f6949aa8 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,11 +1,12 @@
-:orphan:
+orphan:
 
 Master
 ======
 - TwitchIO
     - Bug fixes
         - Fix IndexError when getting prefix when empty message is sent in a reply.
-
+    - Additioons
+        - Added :attr:`~twitchio.ext.routines.Routine.time_until_next_execution` and :attr:`~twitchio.ext.routines.Routine.next_event_time` for monitoring
 
 2.7.0
 ======
@@ -24,7 +25,7 @@ Master
         - Added :func:`~twitchio.Client.fetch_content_classification_labels` along with :class:`~twitchio.ContentClassificationLabel`
         - Added :attr:`~twitchio.ChannelInfo.content_classification_labels` and :attr:`~twitchio.ChannelInfo.is_branded_content` to :class:`~twitchio.ChannelInfo`
         - Added new parameters to :func:`~twitchio.PartialUser.modify_stream` for ``is_branded_content`` and ``content_classification_labels``
-        - Added :attr:`~twitchio.ext.routines.Routine.next_execution_time` and :attr:`~twitchio.ext.routines.Routine.next_event_time` for monitoring
+        
             
     - Bug fixes
         - Fix :func:`~twitchio.Client.search_categories` due to :attr:`~twitchio.Game.igdb_id` being added to :class:`~twitchio.Game`

From 02cc9c0bf76bba75c3deb72a6dbf90d0f1685195 Mon Sep 17 00:00:00 2001
From: Robert Sivilli <robert.sivilli@gmail.com>
Date: Sat, 19 Aug 2023 17:29:38 -0400
Subject: [PATCH 13/15] accounting for stopping and ending iterations

---
 twitchio/ext/routines/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/twitchio/ext/routines/__init__.py b/twitchio/ext/routines/__init__.py
index b42a90b6..5fcdbee0 100644
--- a/twitchio/ext/routines/__init__.py
+++ b/twitchio/ext/routines/__init__.py
@@ -403,10 +403,12 @@ async def _routine(self, *args, **kwargs) -> None:
                 pass
             else:
                 if self._remaining_iterations == 0:
+                    self.next_event_time = None
                     break
 
             if self._stop_set:
                 self._stop_set = False
+                self.next_event_time = None
                 break
 
             if self._time:

From 899dafcefe3feccffb2af69b839bd3b355c9019d Mon Sep 17 00:00:00 2001
From: Robert Sivilli <robert.sivilli@gmail.com>
Date: Sun, 20 Aug 2023 06:50:28 -0400
Subject: [PATCH 14/15] missed a |

---
 twitchio/ext/routines/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/twitchio/ext/routines/__init__.py b/twitchio/ext/routines/__init__.py
index 5fcdbee0..5099d870 100644
--- a/twitchio/ext/routines/__init__.py
+++ b/twitchio/ext/routines/__init__.py
@@ -324,7 +324,7 @@ def remaining_iterations(self) -> Optional[int]:
         return self._remaining_iterations
 
     @property
-    def time_until_next_execution(self) -> datetime.timedelta | None:
+    def time_until_next_execution(self) -> Optional[datetime.timedelta]:
         """Return the time left as a datetime object before the next execution.
 
         None will be returned if the routine is not scheduled

From 766b9dbfe022f1f4a3f0ca5b09fbad6107d58c2f Mon Sep 17 00:00:00 2001
From: Robert Sivilli <robert.sivilli@gmail.com>
Date: Mon, 21 Aug 2023 10:40:55 -0400
Subject: [PATCH 15/15] removing test.py in prep for final review

---
 test.py | 82 ---------------------------------------------------------
 1 file changed, 82 deletions(-)
 delete mode 100644 test.py

diff --git a/test.py b/test.py
deleted file mode 100644
index 4cf9de83..00000000
--- a/test.py
+++ /dev/null
@@ -1,82 +0,0 @@
-import asyncio
-from twitchio.ext import routines, commands
-from dotenv import load_dotenv
-import os
-
-load_dotenv()
-from datetime import datetime, timedelta
-
-import random
-
-THRESHOLD = 0.1
-
-
-class Bot(commands.Bot):
-    call_count = 0
-
-    def __init__(self):
-        super().__init__(
-            token=os.getenv("access_token"),
-            prefix="#!",
-            initial_channels=["dreamingofelectricsheep"],
-        )
-
-    async def event_ready(self):
-        print(f"Logged in as | {self.nick}")
-        print(f"User id is | {self.user_id}")
-        bot.low_freq_routine.start()
-        bot.reschedule_schedule_nowait_test.start()
-        bot.test_low_freq_restart.start()
-
-    @routines.routine(seconds=1.0, iterations=5)
-    async def basic_timed_routine(self, arg: str):
-        print(f"Hello {arg}!")
-
-    @routines.routine(seconds=0.1)
-    async def basic_test(self):
-        print(self.basic_timed_routine.time_until_next_execution)
-        if self.basic_timed_routine.remaining_iterations == 0:
-            self.basic_timed_routine.start("Restarted")
-
-    @routines.routine(seconds=1.0, wait_first=True)
-    async def basic_timed_wait_routine(self, arg: str):
-        print(f"Hello {arg}!")
-
-    @routines.routine(seconds=0.1)
-    async def basic_wait_test(self):
-        print(self.basic_timed_wait_routine.time_until_next_execution)
-
-    @routines.routine(time=datetime.now() + timedelta(seconds=5))
-    async def basic_scheduled_routine(self):
-        print(f"{self.call_count} the time is now {datetime.now()}")
-
-    @routines.routine(seconds=0.1)
-    async def basic_schedule_test(self):
-        print(self.basic_scheduled_routine.time_until_next_execution)
-
-    @routines.routine(minutes=5, wait_first=True)
-    async def low_freq_routine(self):
-        print("I ran")
-
-    @routines.routine(seconds=5)
-    async def restart_schedule_test(self):
-        self.low_freq_routine.restart(force=True)
-
-    @routines.routine(seconds=1)
-    async def test_low_freq_restart(self):
-        print(self.low_freq_routine.time_until_next_execution)
-
-    @routines.routine(seconds=5, iterations=2, wait_first=True)
-    async def reschedule_schedule_wait_test(self):
-        print("Rescheduling")
-        self.low_freq_routine.change_interval(wait_first=True, minutes=random.random() * 2)
-
-    @routines.routine(seconds=5, iterations=2, wait_first=True)
-    async def reschedule_schedule_nowait_test(self):
-        print("Rescheduling")
-        self.low_freq_routine.change_interval(wait_first=False, minutes=random.random() * 2)
-
-
-bot = Bot()
-
-bot.run()