meerschaum 2.2.0.dev3__py3-none-any.whl → 2.2.0rc2__py3-none-any.whl

meerschaum/utils/daemon/RotatingFile.py

@@ -13,9 +13,13 @@ import pathlib
 import traceback
 import sys
 import atexit
+from datetime import datetime, timezone, timedelta
 from typing import List, Union, Optional, Tuple
 from meerschaum.config import get_config
 from meerschaum.utils.warnings import warn
+from meerschaum.utils.misc import round_time
+from meerschaum.utils.daemon.FileDescriptorInterceptor import FileDescriptorInterceptor
+from meerschaum.utils.threading import Thread
 import meerschaum as mrsm
 daemon = mrsm.attempt_import('daemon')
 
@@ -33,6 +37,8 @@ class RotatingFile(io.IOBase):
             num_files_to_keep: Optional[int] = None,
             max_file_size: Optional[int] = None,
             redirect_streams: bool = False,
+            write_timestamps: bool = False,
+            timestamp_format: str = '%Y-%m-%d %H:%M',
         ):
         """
         Create a file-like object which manages other files.
@@ -54,6 +60,9 @@ class RotatingFile(io.IOBase):
             
             NOTE: Only set this to `True` if you are entering into a daemon context.
             Doing so will redirect `sys.stdout` and `sys.stderr` into the log files.
+
+        write_timestamps: bool, default False
+            If `True`, prepend the current UTC timestamp to each line of the file.
         """
         self.file_path = pathlib.Path(file_path)
         if num_files_to_keep is None:
@@ -68,6 +77,8 @@ class RotatingFile(io.IOBase):
         self.num_files_to_keep = num_files_to_keep
         self.max_file_size = max_file_size
         self.redirect_streams = redirect_streams
+        self.write_timestamps = write_timestamps
+        self.timestamp_format = timestamp_format
         self.subfile_regex_pattern = re.compile(
             r'^'
             + self.file_path.name
@@ -91,7 +102,7 @@ class RotatingFile(io.IOBase):
         """
         Return the file descriptor for the latest subfile.
         """
-        self.refresh_files()
+        self.refresh_files(start_interception=False)
         return self._current_file_obj.fileno()
 
 
@@ -221,7 +232,11 @@ class RotatingFile(io.IOBase):
         ]
 
 
-    def refresh_files(self, potential_new_len: int = 0) -> '_io.TextUIWrapper':
+    def refresh_files(
+            self,
+            potential_new_len: int = 0,
+            start_interception: bool = False,
+        ) -> '_io.TextUIWrapper':
         """
         Check the state of the subfiles.
         If the latest subfile is too large, create a new file and delete old ones.
@@ -229,6 +244,9 @@ class RotatingFile(io.IOBase):
         Parameters
         ----------
         potential_new_len: int, default 0
+
+        start_interception: bool, default False
+            If `True`, kick off the file interception threads.
         """
         self.flush()
 
@@ -247,8 +265,15 @@ class RotatingFile(io.IOBase):
         if is_first_run_with_logs or lost_latest_handle:
             self._current_file_obj = open(latest_subfile_path, 'a+', encoding='utf-8')
             if self.redirect_streams:
-                daemon.daemon.redirect_stream(sys.stdout, self._current_file_obj)
-                daemon.daemon.redirect_stream(sys.stderr, self._current_file_obj)
+                try:
+                    daemon.daemon.redirect_stream(sys.stdout, self._current_file_obj)
+                    daemon.daemon.redirect_stream(sys.stderr, self._current_file_obj)
+                except OSError as e:
+                    warn(
+                        f"Encountered an issue when redirecting streams:\n{traceback.format_exc()}"
+                    )
+                if start_interception:
+                    self.start_log_fd_interception()
 
         create_new_file = (
             (latest_subfile_index == -1)
@@ -276,9 +301,10 @@ class RotatingFile(io.IOBase):
 
             ### Sanity check in case writing somehow fails.
             if self._previous_file_obj is self._current_file_obj:
-                self._previous_file_obj is None
+                self._previous_file_obj = None
 
             self.delete(unused_only=True)
+
         return self._current_file_obj
 
 
@@ -291,6 +317,7 @@ class RotatingFile(io.IOBase):
         unused_only: bool, default False
             If `True`, only close file descriptors not currently in use.
         """
+        self.stop_log_fd_interception(unused_only=unused_only)
         subfile_indices = sorted(self.subfile_objects.keys())
         for subfile_index in subfile_indices:
             subfile_object = self.subfile_objects[subfile_index]
@@ -298,19 +325,26 @@ class RotatingFile(io.IOBase):
                 continue
             try:
                 if not subfile_object.closed:
-                    #  subfile_object.flush()
                     subfile_object.close()
-                _ = self.subfile_objects.pop(subfile_index, None)
-                if self.redirect_streams:
-                    _ = self._redirected_subfile_objects.pop(subfile_index, None)
             except Exception as e:
                 warn(f"Failed to close an open subfile:\n{traceback.format_exc()}")
 
+            _ = self.subfile_objects.pop(subfile_index, None)
+            if self.redirect_streams:
+                _ = self._redirected_subfile_objects.pop(subfile_index, None)
+
         if not unused_only:
             self._previous_file_obj = None
             self._current_file_obj = None
 
 
+    def get_timestamp_prefix_str(self) -> str:
+        """
+        Return the current minute prefixm string.
+        """
+        return datetime.now(timezone.utc).strftime(self.timestamp_format) + ' | '
+
+
     def write(self, data: str) -> None:
         """
         Write the given text into the latest subfile.
@@ -325,9 +359,18 @@ class RotatingFile(io.IOBase):
         if isinstance(data, bytes):
             data = data.decode('utf-8')
 
-        self.refresh_files(potential_new_len=len(data))
+        prefix_str = self.get_timestamp_prefix_str() if self.write_timestamps else ""
+        suffix_str = "\n" if self.write_timestamps else ""
+        self.refresh_files(
+            potential_new_len = len(prefix_str + data + suffix_str),
+            start_interception = True,
+        )
         try:
+            if prefix_str:
+                self._current_file_obj.write(prefix_str)
             self._current_file_obj.write(data)
+            if suffix_str:
+                self._current_file_obj.write(suffix_str)
         except Exception as e:
             warn(f"Failed to write to subfile:\n{traceback.format_exc()}")
         self.flush()
@@ -471,7 +514,7 @@ class RotatingFile(io.IOBase):
                 subfile_object = self.subfile_objects[subfile_index]
                 for i in range(self.SEEK_BACK_ATTEMPTS):
                     try:
-                        subfile_object.seek(max(seek_ix - i), 0)
+                        subfile_object.seek(max((seek_ix - i), 0))
                         subfile_lines = subfile_object.readlines()
                     except UnicodeDecodeError:
                         continue
@@ -532,10 +575,73 @@ class RotatingFile(io.IOBase):
                 try:
                     subfile_object.flush()
                 except Exception as e:
-                    warn(f"Failed to flush subfile:\n{traceback.format_exc()}")
+                    warn(f"Failed to flush subfile {subfile_index}:\n{traceback.format_exc()}")
         if self.redirect_streams:
-            sys.stdout.flush()
-            sys.stderr.flush()
+            try:
+                sys.stdout.flush()
+            except Exception as e:
+                warn(f"Failed to flush STDOUT:\n{traceback.format_exc()}")
+            try:
+                sys.stderr.flush()
+            except Exception as e:
+                warn(f"Failed to flush STDERR:\n{traceback.format_exc()}")
+
+
+    def start_log_fd_interception(self):
+        """
+        Start the file descriptor monitoring threads.
+        """
+        threads = self.__dict__.get('_interceptor_threads', [])
+        self._stdout_interceptor = FileDescriptorInterceptor(
+            sys.stdout.fileno(),
+            self.get_timestamp_prefix_str,
+        )
+        self._stderr_interceptor = FileDescriptorInterceptor(
+            sys.stderr.fileno(),
+            self.get_timestamp_prefix_str,
+        )
+
+        self._stdout_interceptor_thread = Thread(
+            target = self._stdout_interceptor.start_interception,
+            daemon = True,
+        )
+        self._stderr_interceptor_thread = Thread(
+            target = self._stderr_interceptor.start_interception,
+            daemon = True,
+        )
+        self._stdout_interceptor_thread.start()
+        self._stderr_interceptor_thread.start()
+        self._intercepting = True
+
+        if '_interceptor_threads' not in self.__dict__:
+            self._interceptor_threads = []
+        if '_interceptors' not in self.__dict__:
+            self._interceptors = []
+        self._interceptor_threads.extend([
+            self._stdout_interceptor_thread,
+            self._stderr_interceptor_thread,
+        ])
+        self.stop_log_fd_interception(unused_only=True)
+
+    def stop_log_fd_interception(self, unused_only: bool = False):
+        """
+        Stop the file descriptor monitoring threads.
+        """
+        interceptors = self.__dict__.get('_interceptors', [])
+        interceptor_threads = self.__dict__.get('_interceptor_threads', [])
+
+        end_ix = len(interceptors) if not unused_only else -2
+
+        for interceptor in interceptors[:end_ix]:
+            interceptor.stop_interception()
+        del interceptors[:end_ix]
+
+        for thread in interceptor_threads[:end_ix]:
+            try:
+                thread.join()
+            except Exception as e:
+                warn(f"Failed to join interceptor threads:\n{traceback.format_exc()}")
+        del interceptor_threads[:end_ix]
 
 
     def __repr__(self) -> str:

meerschaum/utils/daemon/__init__.py

@@ -12,6 +12,7 @@ from meerschaum.utils.typing import SuccessTuple, List, Optional, Callable, Any,
 from meerschaum.config._paths import DAEMON_RESOURCES_PATH
 from meerschaum.utils.daemon.Daemon import Daemon
 from meerschaum.utils.daemon.RotatingFile import RotatingFile
+from meerschaum.utils.daemon.FileDescriptorInterceptor import FileDescriptorInterceptor
 
 
 def daemon_entry(sysargs: Optional[List[str]] = None) -> SuccessTuple:

meerschaum/utils/packages/__init__.py

@@ -35,6 +35,7 @@ _locks = {
 }
 _checked_for_updates = set()
 _is_installed_first_check: Dict[str, bool] = {}
+_MRSM_PACKAGE_ARCHIVES_PREFIX: str = "https://meerschaum.io/files/archives/"
 
 def get_module_path(
         import_name: str,
@@ -640,9 +641,15 @@ def need_update(
 
     ### We might be depending on a prerelease.
     ### Sanity check that the required version is not greater than the installed version. 
+    required_version = (
+        required_version.replace(_MRSM_PACKAGE_ARCHIVES_PREFIX, '')
+        .replace(' @ ', '').replace('wheels', '').replace('+mrsm', '').replace('/-', '')
+        .replace('-py3-none-any.whl', '')
+    )
+
     if 'a' in required_version:
-        required_version = required_version.replace('a', '-dev')
-        version = version.replace('a', '-dev')
+        required_version = required_version.replace('a', '-dev').replace('+mrsm', '')
+        version = version.replace('a', '-dev').replace('+mrsm', '')
     try:
         return (
             (not semver.Version.parse(version).match(required_version))

meerschaum/utils/packages/_packages.py

@@ -49,10 +49,10 @@ packages: Dict[str, Dict[str, str]] = {
         'daemon'                     : 'python-daemon>=0.2.3',
         'fasteners'                  : 'fasteners>=0.18.0',
         'psutil'                     : 'psutil>=5.8.0',
-        'watchgod'                   : 'watchgod>=0.7.0',
+        'watchfiles'                 : 'watchfiles>=0.21.0',
         'dill'                       : 'dill>=0.3.3',
         'virtualenv'                 : 'virtualenv>=20.1.0',
-        'apscheduler'                : 'apscheduler>=4.0.0a4',
+        'apscheduler'                : 'APScheduler>=4.0.0a5',
     },
     'drivers': {
         'cryptography'               : 'cryptography>=38.0.1',
@@ -89,6 +89,7 @@ packages: Dict[str, Dict[str, str]] = {
         'pytest'                     : 'pytest>=6.2.2',
         'pytest_xdist'               : 'pytest-xdist>=3.2.1',
         'heartrate'                  : 'heartrate>=0.2.1',
+        'build'                      : 'build>=1.2.1',
     },
     'setup': {
     },
@@ -149,7 +150,6 @@ packages['api'] = {
     'passlib'                        : 'passlib>=1.7.4',
     'fastapi_login'                  : 'fastapi-login>=1.7.2',
     'multipart'                      : 'python-multipart>=0.0.5',
-    #  'pydantic'                       : 'pydantic>2.0.0',
     'httpx'                          : 'httpx>=0.24.1',
     'websockets'                     : 'websockets>=11.0.3',
 }

meerschaum/utils/schedule.py

@@ -12,7 +12,8 @@ from datetime import datetime, timezone, timedelta, timedelta
 import meerschaum as mrsm
 from meerschaum.utils.typing import Callable, Any, Optional, List, Dict
 
-INTERVAL_UNITS: List[str] = ['months', 'weeks', 'days', 'hours', 'minutes', 'seconds']
+STARTING_KEYWORD: str = 'starting'
+INTERVAL_UNITS: List[str] = ['months', 'weeks', 'days', 'hours', 'minutes', 'seconds', 'years']
 FREQUENCY_ALIASES: Dict[str, str] = {
     'daily': 'every 1 day',
     'hourly': 'every 1 hour',
@@ -20,6 +21,7 @@ FREQUENCY_ALIASES: Dict[str, str] = {
     'weekly': 'every 1 week',
     'monthly': 'every 1 month',
     'secondly': 'every 1 second',
+    'yearly': 'every 1 year',
 }
 LOGIC_ALIASES: Dict[str, str] = {
     'and': '&',
@@ -27,7 +29,7 @@ LOGIC_ALIASES: Dict[str, str] = {
     ' through ': '-',
     ' thru ': '-',
     ' - ': '-',
-    'beginning': 'starting',
+    'beginning': STARTING_KEYWORD,
 }
 CRON_DAYS_OF_WEEK: List[str] = ['mon', 'tue', 'wed', 'thu', 'fri', 'sat', 'sun']
 CRON_DAYS_OF_WEEK_ALIASES: Dict[str, str] = {
@@ -65,8 +67,8 @@ SCHEDULE_ALIASES: Dict[str, str] = {
     **CRON_DAYS_OF_WEEK_ALIASES,
     **CRON_MONTHS_ALIASES,
 }
-STARTING_KEYWORD: str = 'starting'
 
+_scheduler = None
 def schedule_function(
         function: Callable[[Any], Any],
         schedule: str,
@@ -87,23 +89,35 @@ def schedule_function(
         The frequency schedule at which `function` should be executed (e.g. `'daily'`).
 
     """
-    import warnings
+    import asyncio
     from meerschaum.utils.warnings import warn
     from meerschaum.utils.misc import filter_keywords, round_time
+    global _scheduler
     kw['debug'] = debug
     kw = filter_keywords(function, **kw)
 
     apscheduler = mrsm.attempt_import('apscheduler', lazy=False)
     now = round_time(datetime.now(timezone.utc), timedelta(minutes=1))
     trigger = parse_schedule(schedule, now=now)
+    _scheduler = apscheduler.AsyncScheduler()
+    try:
+        loop = asyncio.get_running_loop()
+    except RuntimeError:
+        loop = asyncio.new_event_loop()
+
+    async def run_scheduler():
+        async with _scheduler:
+            job = await _scheduler.add_schedule(function, trigger, args=args, kwargs=kw)
+            try:
+                await _scheduler.run_until_stopped()
+            except (KeyboardInterrupt, SystemExit) as e:
+                await _stop_scheduler()
+                raise e
 
-    with apscheduler.Scheduler() as scheduler:
-        job = scheduler.add_schedule(function, trigger, args=args, kwargs=kw)
-        try:
-            scheduler.run_until_stopped()
-        except KeyboardInterrupt as e:
-            scheduler.stop()
-            scheduler.wait_until_stopped()
+    try:
+        loop.run_until_complete(run_scheduler())
+    except (KeyboardInterrupt, SystemExit) as e:
+        loop.run_until_complete(_stop_scheduler())
 
 
 def parse_schedule(schedule: str, now: Optional[datetime] = None):
@@ -134,7 +148,7 @@ def parse_schedule(schedule: str, now: Optional[datetime] = None):
 
     ### TODO Allow for combining `and` + `or` logic.
     if '&' in schedule and '|' in schedule:
-        error(f"Cannot accept both 'and' + 'or' logic in the schedule frequency.", ValueError)
+        raise ValueError(f"Cannot accept both 'and' + 'or' logic in the schedule frequency.")
 
     join_str = '|' if '|' in schedule else '&'
     join_trigger = (
@@ -152,12 +166,6 @@ def parse_schedule(schedule: str, now: Optional[datetime] = None):
 
     has_seconds = 'second' in schedule
     has_minutes = 'minute' in schedule
-    has_days = 'day' in schedule
-    has_weeks = 'week' in schedule
-    has_hours = 'hour' in schedule
-    num_hourly_intervals = schedule.count('hour')
-    divided_days = False
-    divided_hours = False
 
     for schedule_part in schedule_parts:
 
@@ -168,10 +176,9 @@ def parse_schedule(schedule: str, now: Optional[datetime] = None):
             )
             schedule_unit = schedule_unit.rstrip('s') + 's'
             if schedule_unit not in INTERVAL_UNITS:
-                error(
+                raise ValueError(
                     f"Invalid interval '{schedule_unit}'.\n"
-                    + f"    Accepted values are {items_str(INTERVAL_UNITS)}.",
-                    ValueError,
+                    + f"    Accepted values are {items_str(INTERVAL_UNITS)}."
                 )
 
             schedule_num = (
@@ -180,29 +187,6 @@ def parse_schedule(schedule: str, now: Optional[datetime] = None):
                 else float(schedule_num_str)
             )
 
-            ### NOTE: When combining days or weeks with other schedules,
-            ### we must divide one of the day-schedules by 2.
-            ### TODO Remove this when APScheduler is patched.
-            if (
-                join_str == '&'
-                and (has_days or has_weeks)
-                and len(schedule_parts) > 1
-                and not divided_days
-            ):
-                schedule_num /= 2
-                divided_days = True
-
-            ### NOTE: When combining multiple hourly intervals,
-            ### one must be divided by 2.
-            if (
-                join_str == '&'
-                #  and num_hourly_intervals > 1
-                and len(schedule_parts) > 1
-                and not divided_hours
-            ):
-                schedule_num /= 2
-                #  divided_hours = True
-
             trigger = (
                 apscheduler_triggers_interval.IntervalTrigger(
                     **{
@@ -210,12 +194,12 @@ def parse_schedule(schedule: str, now: Optional[datetime] = None):
                         'start_time': starting_ts,
                     }
                 )
-                if schedule_unit != 'months' else (
+                if schedule_unit not in ('months', 'years') else (
                     apscheduler_triggers_calendarinterval.CalendarIntervalTrigger(
                         **{
                             schedule_unit: schedule_num,
                             'start_date': starting_ts,
-                            #  'timezone': starting_ts.tzinfo, TODO Re-enable once APScheduler updates.
+                            'timezone': starting_ts.tzinfo,
                         }
                     )
                 )
@@ -223,12 +207,15 @@ def parse_schedule(schedule: str, now: Optional[datetime] = None):
 
         ### Determine whether this is a pure cron string or a cron subset (e.g. 'may-aug')_.
         else:
-            first_three_prefix = schedule_part[:3] 
+            first_three_prefix = schedule_part[:3].lower()
+            first_four_prefix = schedule_part[:4].lower()
             cron_kw = {}
             if first_three_prefix in CRON_DAYS_OF_WEEK:
                 cron_kw['day_of_week'] = schedule_part
             elif first_three_prefix in CRON_MONTHS:
                 cron_kw['month'] = schedule_part
+            elif is_int(first_four_prefix) and len(first_four_prefix) == 4:
+                cron_kw['year'] = int(first_four_prefix)
             trigger = (
                 apscheduler_triggers_cron.CronTrigger(
                     **{
@@ -301,3 +288,10 @@ def parse_start_time(schedule: str, now: Optional[datetime] = None) -> datetime:
     if not starting_ts.tzinfo:
         starting_ts = starting_ts.replace(tzinfo=timezone.utc)
     return starting_ts
+
+
+async def _stop_scheduler():
+    if _scheduler is None:
+        return
+    await _scheduler.stop()
+    await _scheduler.wait_until_stopped()

meerschaum/utils/threading.py

@@ -10,6 +10,7 @@ from __future__ import annotations
 from meerschaum.utils.typing import Optional
 
 import threading
+import traceback
 Lock = threading.Lock
 RLock = threading.RLock
 Event = threading.Event

{meerschaum-2.2.0.dev3.dist-info → meerschaum-2.2.0rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.2.0.dev3
+Version: 2.2.0rc2
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares
@@ -53,10 +53,10 @@ Requires-Dist: more-itertools >=8.7.0 ; extra == '_required'
 Requires-Dist: python-daemon >=0.2.3 ; extra == '_required'
 Requires-Dist: fasteners >=0.18.0 ; extra == '_required'
 Requires-Dist: psutil >=5.8.0 ; extra == '_required'
-Requires-Dist: watchgod >=0.7.0 ; extra == '_required'
+Requires-Dist: watchfiles >=0.21.0 ; extra == '_required'
 Requires-Dist: dill >=0.3.3 ; extra == '_required'
 Requires-Dist: virtualenv >=20.1.0 ; extra == '_required'
-Requires-Dist: apscheduler >=4.0.0a4 ; extra == '_required'
+Requires-Dist: APScheduler >=4.0.0a5 ; extra == '_required'
 Provides-Extra: api
 Requires-Dist: uvicorn[standard] >=0.22.0 ; extra == 'api'
 Requires-Dist: gunicorn >=20.1.0 ; extra == 'api'
@@ -102,10 +102,10 @@ Requires-Dist: more-itertools >=8.7.0 ; extra == 'api'
 Requires-Dist: python-daemon >=0.2.3 ; extra == 'api'
 Requires-Dist: fasteners >=0.18.0 ; extra == 'api'
 Requires-Dist: psutil >=5.8.0 ; extra == 'api'
-Requires-Dist: watchgod >=0.7.0 ; extra == 'api'
+Requires-Dist: watchfiles >=0.21.0 ; extra == 'api'
 Requires-Dist: dill >=0.3.3 ; extra == 'api'
 Requires-Dist: virtualenv >=20.1.0 ; extra == 'api'
-Requires-Dist: apscheduler >=4.0.0a4 ; extra == 'api'
+Requires-Dist: APScheduler >=4.0.0a5 ; extra == 'api'
 Requires-Dist: pprintpp >=0.4.0 ; extra == 'api'
 Requires-Dist: asciitree >=0.3.3 ; extra == 'api'
 Requires-Dist: typing-extensions >=4.7.1 ; extra == 'api'
@@ -148,6 +148,7 @@ Requires-Dist: mypy >=0.812.0 ; extra == 'dev-tools'
 Requires-Dist: pytest >=6.2.2 ; extra == 'dev-tools'
 Requires-Dist: pytest-xdist >=3.2.1 ; extra == 'dev-tools'
 Requires-Dist: heartrate >=0.2.1 ; extra == 'dev-tools'
+Requires-Dist: build >=1.2.1 ; extra == 'dev-tools'
 Provides-Extra: docs
 Requires-Dist: mkdocs >=1.1.2 ; extra == 'docs'
 Requires-Dist: mkdocs-material >=6.2.5 ; extra == 'docs'
@@ -208,10 +209,10 @@ Requires-Dist: more-itertools >=8.7.0 ; extra == 'full'
 Requires-Dist: python-daemon >=0.2.3 ; extra == 'full'
 Requires-Dist: fasteners >=0.18.0 ; extra == 'full'
 Requires-Dist: psutil >=5.8.0 ; extra == 'full'
-Requires-Dist: watchgod >=0.7.0 ; extra == 'full'
+Requires-Dist: watchfiles >=0.21.0 ; extra == 'full'
 Requires-Dist: dill >=0.3.3 ; extra == 'full'
 Requires-Dist: virtualenv >=20.1.0 ; extra == 'full'
-Requires-Dist: apscheduler >=4.0.0a4 ; extra == 'full'
+Requires-Dist: APScheduler >=4.0.0a5 ; extra == 'full'
 Requires-Dist: cryptography >=38.0.1 ; extra == 'full'
 Requires-Dist: psycopg[binary] >=3.1.18 ; extra == 'full'
 Requires-Dist: PyMySQL >=0.9.0 ; extra == 'full'
@@ -292,10 +293,10 @@ Requires-Dist: more-itertools >=8.7.0 ; extra == 'sql'
 Requires-Dist: python-daemon >=0.2.3 ; extra == 'sql'
 Requires-Dist: fasteners >=0.18.0 ; extra == 'sql'
 Requires-Dist: psutil >=5.8.0 ; extra == 'sql'
-Requires-Dist: watchgod >=0.7.0 ; extra == 'sql'
+Requires-Dist: watchfiles >=0.21.0 ; extra == 'sql'
 Requires-Dist: dill >=0.3.3 ; extra == 'sql'
 Requires-Dist: virtualenv >=20.1.0 ; extra == 'sql'
-Requires-Dist: apscheduler >=4.0.0a4 ; extra == 'sql'
+Requires-Dist: APScheduler >=4.0.0a5 ; extra == 'sql'
 Provides-Extra: stack
 Requires-Dist: docker-compose >=1.29.2 ; extra == 'stack'