meerschaum 2.2.0.dev2__py3-none-any.whl → 2.2.0rc1__py3-none-any.whl

meerschaum/_internal/entry.py

@@ -49,7 +49,7 @@ def entry(sysargs: Optional[List[str]] = None) -> SuccessTuple:
 
     if args.get('schedule', None):
         from meerschaum.utils.schedule import schedule_function
-        return schedule_function(entry_with_args, args['schedule'], **args)
+        return schedule_function(entry_with_args, **args)
     return entry_with_args(**args)
 
 

meerschaum/actions/show.py

@@ -41,6 +41,7 @@ def show(
         'jobs'       : _show_jobs,
         'logs'       : _show_logs,
         'tags'       : _show_tags,
+        'schedules'  : _show_schedules,
     }
     return choose_subaction(action, show_options, **kw)
 
@@ -577,6 +578,7 @@ def _show_logs(
         `show logs myjob myotherjob`
     """
     import os, pathlib, random, asyncio
+    from datetime import datetime
     from meerschaum.utils.packages import attempt_import, import_rich
     from meerschaum.utils.daemon import get_filtered_daemons, Daemon
     from meerschaum.utils.warnings import warn, info
@@ -622,13 +624,22 @@ def _show_logs(
         return _job_colors[daemon_id]
 
     def _follow_pretty_print():
-        watchgod = attempt_import('watchgod')
+        watchfiles = attempt_import('watchfiles')
         rich = import_rich()
         rich_text = attempt_import('rich.text')
         _watch_daemon_ids = {d.daemon_id: d for d in daemons}
         info("Watching log files...")
 
         def _print_job_line(daemon, line):
+            date_prefix_str = line[:len('YYYY-MM-DD HH:mm')]
+            try:
+                line_timestamp = datetime.fromisoformat(date_prefix_str)
+            except Exception as e:
+                line_timestamp = None
+            if line_timestamp:
+                line = line[len('YYYY-MM-DD HH:mm | '):]
+            if len(line) == 0:
+                return
             text = rich_text.Text(daemon.daemon_id)
             text.append(
                 _get_buffer_spaces(daemon.daemon_id) + '| '
@@ -676,8 +687,8 @@ def _show_logs(
             _print_log_lines(d)
 
         _quit = False
-        async def _watch_logs():
-            async for changes in watchgod.awatch(LOGS_RESOURCES_PATH):
+        def _watch_logs():
+            for changes in watchfiles.watch(LOGS_RESOURCES_PATH):
                 if _quit:
                     return
                 for change in changes:
@@ -699,10 +710,9 @@ def _show_logs(
                     if daemon is not None:
                         _print_log_lines(daemon)
 
-        loop = asyncio.new_event_loop()
         try:
-            loop.run_until_complete(_watch_logs())
-        except KeyboardInterrupt:
+            _watch_logs()
+        except KeyboardInterrupt as ki:
             _quit = True
 
     def _print_nopretty_log_text():
@@ -817,6 +827,57 @@ def _show_tags(
     return True, "Success"
 
 
+def _show_schedules(
+        action: Optional[List[str]] = None,
+        nopretty: bool = False,
+        **kwargs: Any
+    ) -> SuccessTuple:
+    """
+    Print the upcoming timestamps according to the given schedule.
+
+    Examples:
+        show schedule 'daily starting 00:00'
+        show schedule 'every 12 hours and mon-fri starting 2024-01-01'
+    """
+    from meerschaum.utils.schedule import parse_schedule
+    from meerschaum.utils.misc import is_int
+    from meerschaum.utils.formatting import print_options
+    if not action:
+        return False, "Provide a schedule to be parsed."
+    schedule = action[0]
+    default_num_timestamps = 5
+    num_timestamps_str = action[1] if len(action) >= 2 else str(default_num_timestamps)
+    num_timestamps = (
+        int(num_timestamps_str)
+        if is_int(num_timestamps_str)
+        else default_num_timestamps
+    )
+    try:
+        trigger = parse_schedule(schedule)
+    except ValueError as e:
+        return False, str(e)
+
+    next_datetimes = []
+    for _ in range(num_timestamps):
+        try:
+            next_dt = trigger.next()
+            next_datetimes.append(next_dt)
+        except Exception as e:
+            break
+
+    print_options(
+        next_datetimes,
+        num_cols = 1,
+        nopretty = nopretty,
+        header = (
+            f"Next {min(num_timestamps, len(next_datetimes))} timestamps "
+            + f"for schedule '{schedule}':"
+        ),
+    )
+
+    return True, "Success"
+        
+
 
 ### NOTE: This must be the final statement of the module.
 ###       Any subactions added below these lines will not

meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "2.2.0.dev2"
+__version__ = "2.2.0rc1"

meerschaum/utils/daemon/Daemon.py

@@ -36,7 +36,7 @@ class Daemon:
     def __new__(
         cls,
         *args,
-        daemon_id : Optional[str] = None,
+        daemon_id: Optional[str] = None,
         **kw
     ):
         """
@@ -129,7 +129,7 @@ class Daemon:
         keep_daemon_output: bool, default True
             If `False`, delete the daemon's output directory upon exiting.
             
-        allow_dirty_run :
+        allow_dirty_run, bool, default False:
             If `True`, run the daemon, even if the `daemon_id` directory exists.
             This option is dangerous because if the same `daemon_id` runs twice,
             the last to finish will overwrite the output of the first.
@@ -138,7 +138,11 @@ class Daemon:
         -------
         Nothing — this will exit the parent process.
         """
-        import platform, sys, os
+        import platform, sys, os, traceback
+        from meerschaum.config._paths import LOGS_RESOURCES_PATH
+        from meerschaum.utils.warnings import warn
+        daemons_error_log_path = LOGS_RESOURCES_PATH / 'daemons_error.log'
+
         daemon = attempt_import('daemon')
 
         if platform.system() == 'Windows':
@@ -162,29 +166,37 @@ class Daemon:
         log_refresh_seconds = get_config('jobs', 'logs', 'refresh_files_seconds')
         self._log_refresh_timer = RepeatTimer(log_refresh_seconds, self.rotating_log.refresh_files)
 
-        with self._daemon_context:
-            try:
-                with open(self.pid_path, 'w+') as f:
-                    f.write(str(os.getpid()))
-
-                self._log_refresh_timer.start()
-                result = self.target(*self.target_args, **self.target_kw)
-                self.properties['result'] = result
-            except Exception as e:
-                warn(e, stacklevel=3)
-                result = e
-            finally:
-                self._log_refresh_timer.cancel()
-                self.rotating_log.close()
-                if self.pid is None and self.pid_path.exists():
-                    self.pid_path.unlink()
+        try:
+            with self._daemon_context:
+                try:
+                    with open(self.pid_path, 'w+', encoding='utf-8') as f:
+                        f.write(str(os.getpid()))
 
-            if keep_daemon_output:
-                self._capture_process_timestamp('ended')
-            else:
-                self.cleanup()
+                    self._log_refresh_timer.start()
+                    result = self.target(*self.target_args, **self.target_kw)
+                    self.properties['result'] = result
+                except Exception as e:
+                    warn(e, stacklevel=3)
+                    result = e
+                finally:
+                    self._log_refresh_timer.cancel()
+                    self.rotating_log.close()
+                    if self.pid is None and self.pid_path.exists():
+                        self.pid_path.unlink()
+
+                if keep_daemon_output:
+                    self._capture_process_timestamp('ended')
+                else:
+                    self.cleanup()
+
+                return result
+        except Exception as e:
+            daemon_error = traceback.format_exc()
+            with open(LOGS_RESOURCES_PATH, 'a+', encoding='utf-8') as f:
+                f.write(daemon_error)
 
-            return result
+        if daemon_error:
+            warn("Encountered an error while starting the daemon '{self}':\n{daemon_error}")
 
 
     def _capture_process_timestamp(
@@ -452,10 +464,10 @@ class Daemon:
         if daemon_context is not None:
             daemon_context.close()
 
-        _close_pools()
+        self.rotating_log.stop_log_fd_interception()
 
-        ### NOTE: SystemExit() does not work here.
-        sys.exit(0)
+        _close_pools()
+        raise SystemExit(0)
 
 
     def _handle_sigterm(self, signal_number: int, stack_frame: 'frame') -> None:
@@ -471,9 +483,10 @@ class Daemon:
         if daemon_context is not None:
             daemon_context.close()
 
-        _close_pools()
+        self.rotating_log.stop_log_fd_interception()
 
-        raise SystemExit()
+        _close_pools()
+        raise SystemExit(1)
 
  
     def _send_signal(
@@ -650,7 +663,11 @@ class Daemon:
         if '_rotating_log' in self.__dict__:
             return self._rotating_log
 
-        self._rotating_log = RotatingFile(self.log_path, redirect_streams=True)
+        self._rotating_log = RotatingFile(
+            self.log_path,
+            redirect_streams = True,
+            write_timestamps = True,
+        )
         return self._rotating_log
 
 
@@ -663,6 +680,7 @@ class Daemon:
             self.rotating_log.file_path,
             num_files_to_keep = self.rotating_log.num_files_to_keep,
             max_file_size = self.rotating_log.max_file_size,
+            write_timestamps = True,
         )
         return new_rotating_log.read()
 
@@ -714,7 +732,7 @@ class Daemon:
         if not self.pid_path.exists():
             return None
         try:
-            with open(self.pid_path, 'r') as f:
+            with open(self.pid_path, 'r', encoding='utf-8') as f:
                 text = f.read()
             pid = int(text.rstrip())
         except Exception as e:
@@ -815,7 +833,7 @@ class Daemon:
         if self.properties is not None:
             try:
                 self.path.mkdir(parents=True, exist_ok=True)
-                with open(self.properties_path, 'w+') as properties_file:
+                with open(self.properties_path, 'w+', encoding='utf-8') as properties_file:
                     json.dump(self.properties, properties_file)
                 success, msg = True, 'Success'
             except Exception as e:

meerschaum/utils/daemon/FileDescriptorInterceptor.py

@@ -0,0 +1,60 @@
+#! /usr/bin/env python3
+# -*- coding: utf-8 -*-
+# vim:fenc=utf-8
+
+"""
+Intercept OS-level file descriptors.
+"""
+
+import os
+from datetime import datetime
+from meerschaum.utils.typing import Callable
+
+class FileDescriptorInterceptor:
+    """
+    A management class to intercept data written to a file descriptor.
+    """
+    def __init__(
+        self,
+        file_descriptor: int,
+        injection_hook: Callable[[], str],
+    ):
+        """
+        Parameters
+        ----------
+        file_descriptor: int
+            The OS file descriptor from which to read.
+
+        injection_hook: Callable[[], str]
+            A callable which returns a string to be injected into the written data.
+        """
+        self.injection_hook = injection_hook
+        self.original_file_descriptor = file_descriptor
+        self.new_file_descriptor = os.dup(file_descriptor)
+        self.read_pipe, self.write_pipe = os.pipe()
+        os.dup2(self.write_pipe, file_descriptor)
+
+    def start_interception(self):
+        """
+        Read from the file descriptor and write the modified data after injection.
+
+        NOTE: This is blocking and is meant to be run in a thread.
+        """
+        while True:
+            data = os.read(self.read_pipe, 1024)
+            if not data:
+                break
+            injected_str = self.injection_hook()
+            modified_data = data.replace(b'\n', f'\n{injected_str}'.encode('utf-8'))
+            os.write(self.new_file_descriptor, modified_data)
+
+    def stop_interception(self):
+        """
+        Restore the file descriptors and close the new pipes.
+        """
+        try:
+            os.dup2(self.new_file_descriptor, self.original_file_descriptor)
+            os.close(self.read_pipe)
+            os.close(self.write_pipe)
+        except OSError:
+            pass

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,
+            timestamps_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.timestamps_format = timestamps_format
         self.subfile_regex_pattern = re.compile(
             r'^'
             + self.file_path.name
@@ -87,14 +98,34 @@ class RotatingFile(io.IOBase):
         atexit.register(self.close)
 
 
+
     def fileno(self):
         """
         Return the file descriptor for the latest subfile.
         """
+        import inspect
+        stack = inspect.stack()
+        parent_level = stack[1]
+        parent_module = parent_level[0].f_globals.get('__file__')
+        #  if parent_module.endswith('daemon.py'):
+            #  self._monkey_patch_os_write()
         self.refresh_files()
         return self._current_file_obj.fileno()
 
 
+    def _monkey_patch_os_write(self):
+        import os
+        import sys
+        import pathlib
+        path = pathlib.Path('/home/bmeares/test1.log')
+        original_write = os.write
+        def intercept(*args, **kwargs):
+            with open(path, 'w', encoding='utf-8') as f:
+                f.write(str(args))
+            original_write(*args, **kwargs)
+        os.write = intercept
+
+
     def get_latest_subfile_path(self) -> pathlib.Path:
         """
         Return the path for the latest subfile to which to write into.
@@ -247,8 +278,10 @@ 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:
+                self.stop_log_fd_interception()
                 daemon.daemon.redirect_stream(sys.stdout, self._current_file_obj)
                 daemon.daemon.redirect_stream(sys.stderr, self._current_file_obj)
+                self.start_log_fd_interception()
 
         create_new_file = (
             (latest_subfile_index == -1)
@@ -269,9 +302,11 @@ class RotatingFile(io.IOBase):
             if self._previous_file_obj is not None:
                 if self.redirect_streams:
                     self._redirected_subfile_objects[old_subfile_index] = self._previous_file_obj
+                    self.stop_log_fd_interception()
                     daemon.daemon.redirect_stream(self._previous_file_obj, self._current_file_obj)
                     daemon.daemon.redirect_stream(sys.stdout, self._current_file_obj)
                     daemon.daemon.redirect_stream(sys.stderr, self._current_file_obj)
+                    self.start_log_fd_interception()
                 self.close(unused_only=True)
 
             ### Sanity check in case writing somehow fails.
@@ -279,6 +314,8 @@ class RotatingFile(io.IOBase):
                 self._previous_file_obj is None
 
             self.delete(unused_only=True)
+
+
         return self._current_file_obj
 
 
@@ -311,6 +348,13 @@ class RotatingFile(io.IOBase):
             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.timestamps_format)
+
+
     def write(self, data: str) -> None:
         """
         Write the given text into the latest subfile.
@@ -325,9 +369,15 @@ 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))
         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 +521,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
@@ -538,6 +588,43 @@ class RotatingFile(io.IOBase):
             sys.stderr.flush()
 
 
+    def start_log_fd_interception(self):
+        """
+        Start the file descriptor monitoring 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)
+        self._stderr_interceptor_thread = Thread(target=self._stderr_interceptor.start_interception)
+        self._stdout_interceptor_thread.start()
+        self._stderr_interceptor_thread.start()
+
+
+    def stop_log_fd_interception(self):
+        """
+        Stop the file descriptor monitoring threads.
+        """
+        stdout_interceptor = self.__dict__.get('_stdout_interceptor', None)
+        stderr_interceptor = self.__dict__.get('_stderr_interceptor', None)
+        stdout_interceptor_thread = self.__dict__.get('_stdout_interceptor_thread', None)
+        stderr_interceptor_thread = self.__dict__.get('_stderr_interceptor_thread', None)
+        if stdout_interceptor is None:
+            return
+        stdout_interceptor.stop_interception()
+        stderr_interceptor.stop_interception()
+        try:
+            stdout_interceptor_thread.join()
+            stderr_interceptor_thread.join()
+        except Exception:
+            pass
+
+
     def __repr__(self) -> str:
         """
         Return basic info for this `RotatingFile`.

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,30 +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
-            ):
-                print("divided hours")
-                schedule_num /= 2
-                #  divided_hours = True
-
             trigger = (
                 apscheduler_triggers_interval.IntervalTrigger(
                     **{
@@ -211,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,
                         }
                     )
                 )
@@ -224,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(
                     **{
@@ -302,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-2.2.0.dev2.dist-info → meerschaum-2.2.0rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.2.0.dev2
+Version: 2.2.0rc1
 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'
 

{meerschaum-2.2.0.dev2.dist-info → meerschaum-2.2.0rc1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 meerschaum/__init__.py,sha256=mw_PhxT7155SW8d_S51T4-WTibL5g205CwMa3qX8qyA,1487
 meerschaum/__main__.py,sha256=8XGS2sJCtz6AMfBv5vm84mH1eS36h1sN1eL8SSmYtE4,2763
 meerschaum/_internal/__init__.py,sha256=ilC7utfKtin7GAvuN34fKyUQYfPyqH0Mm3MJF5iyEf4,169
-meerschaum/_internal/entry.py,sha256=c96Q4OsozbJevpqRkJG3Zf8PKcil5pMBZlw3FQ0t88o,4824
+meerschaum/_internal/entry.py,sha256=Oga0OH808UtTJGvvkQQFRKjVCjSCRYjJe3M1A9-yf1k,4806
 meerschaum/_internal/arguments/__init__.py,sha256=HFciFQgo2ZOT19Mo6CpLhPYlpLYh2sNn1C9Lo7NMADc,519
 meerschaum/_internal/arguments/_parse_arguments.py,sha256=dNVDBvXYNgEw-TrlZJ9A6VPlG696EpQcQm6FOAhseqw,10249
 meerschaum/_internal/arguments/_parser.py,sha256=OtcrZK-_qV9a5qpdcP9NLKOGRevjmCU9fBLbB88px3c,13719
@@ -38,7 +38,7 @@ meerschaum/actions/register.py,sha256=l_21LWZCzKwJVex_xAXECC5WVW1VEuIX9HSp7CuyCw
 meerschaum/actions/reload.py,sha256=gMXeFBGVfyQ7uhKhYf6bLaDMD0fLPcA9BrLBSiuvWIc,508
 meerschaum/actions/setup.py,sha256=KkAGWcgwzl_L6A19fTmTX1KtBjW2FwD8QenLjPy0mQQ,3205
 meerschaum/actions/sh.py,sha256=fLfTJaacKu4sjLTRqEzzYlT2WbbdZBEczsKb6F-qAek,2026
-meerschaum/actions/show.py,sha256=2A_-kpCJ9h75kg2PGLvKWVfqKs3C2YS6cv2PtC3Oq78,26212
+meerschaum/actions/show.py,sha256=MtPp6PNjbQiMcxqsfvU7_0rGvB8Z59-TURmEwvpvT6I,28057
 meerschaum/actions/sql.py,sha256=wYofwk1vGO96U2ncigGEfMtYMZeprz2FR1PRRZhkAPI,4311
 meerschaum/actions/stack.py,sha256=WMRMebyYwZGNlbnj6Ja09qvCSDNteFJOTa8_joHlnVo,5886
 meerschaum/actions/start.py,sha256=mNFWqxc_o9moavvDQWE4YoZF6b-SW2nKyw5MtwIj-90,18384
@@ -134,7 +134,7 @@ meerschaum/config/_preprocess.py,sha256=-AEA8m_--KivZwTQ1sWN6LTn5sio_fUr2XZ51BO6
 meerschaum/config/_read_config.py,sha256=WFZKIXZMDe_ca0ES7ivgM_mnwShvFxLdoeisT_X5-h0,14720
 meerschaum/config/_shell.py,sha256=s74cmJl8NrhM_Y1cB_P41_JDUYXV0g4WXnKFZWMtnrY,3551
 meerschaum/config/_sync.py,sha256=Q-sz5YcjL3CJS2Dyw4rVRQsz9th9GWa9o5F9D0Jrmn8,4120
-meerschaum/config/_version.py,sha256=C1chg72mvosNVsfDxJ0TiYiWC1iqAPXO56RhWOWpGHk,76
+meerschaum/config/_version.py,sha256=N7N8FP8jZtOySQsoOturqBbQHE9lVrxPySO9oQt-NRo,74
 meerschaum/config/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerschaum/config/stack/__init__.py,sha256=pKR7aDqqrGZjjNhbWbA9AMdfBjF_-zl7xtgVXk9B9Mg,9012
 meerschaum/config/stack/grafana/__init__.py,sha256=wzuoch_AK49lcn7lH2qTSJ_PPbSagF4lcweeipz_XiE,2010
@@ -204,14 +204,15 @@ meerschaum/utils/networking.py,sha256=Sr_eYUGW8_UV9-k9LqRFf7xLtbUcsDucODyLCRsFRU
 meerschaum/utils/pool.py,sha256=vkE42af4fjrTEJTxf6Ek3xGucm1MtEkpsSEiaVzNKHs,2655
 meerschaum/utils/process.py,sha256=tbEutHAg_Kn5UetOI-fduRjsafGOYX5tkLvpzqosgvc,7098
 meerschaum/utils/prompt.py,sha256=0mBFbgi_l9rCou9UnC_6qKTHkqyl1Z_jSRzfmc0xRXM,16490
-meerschaum/utils/schedule.py,sha256=VAlNZQHjGoAzsmGTiHbUMzf3kIxriPF9GjKKZZefyHQ,10350
+meerschaum/utils/schedule.py,sha256=nXiOAHNq51WDS5NS4MPMDmv1MY7RV0TxRNXN69S_w1w,10020
 meerschaum/utils/sql.py,sha256=4sCNEpgUd6uFz6ySs4nnUMVaOT0YAvPM1ZlQYJTSF-0,46656
 meerschaum/utils/threading.py,sha256=fAXk7-FnbFvdU1FQ4vHKk5NeGbbTpTw7y9dRnlVayNI,2472
 meerschaum/utils/typing.py,sha256=L05wOXfWdn_nJ0KnZVr-2zdMYcqjdyOW_7InT3xe6-s,2807
 meerschaum/utils/warnings.py,sha256=0b5O2DBbhEAGnu6RAB1hlHSVmwL_hcR3EiMkExXmBJ0,6535
 meerschaum/utils/yaml.py,sha256=vbCrFjdapKsZ9wRRaI9Ih8dVUwZ-KHpSzfGhRcpDBgQ,3162
-meerschaum/utils/daemon/Daemon.py,sha256=vphcP9KzvJmnqjk9rHazxl6qO2YWzjyYLPdaVyyMlww,32192
-meerschaum/utils/daemon/RotatingFile.py,sha256=fNjLWENoTxbIOj9vTQcnHg2uC78ZKtel5L_snwnSbrI,19362
+meerschaum/utils/daemon/Daemon.py,sha256=pqUYMjuP08IW6nQ8Cg2g_RyP0LAYi1gAi67_3fahxJ0,33047
+meerschaum/utils/daemon/FileDescriptorInterceptor.py,sha256=avmQa43HISIAIu6dfB0FL5tnrfaIBjfp5M8tRV0nFbo,1813
+meerschaum/utils/daemon/RotatingFile.py,sha256=wKb2Q93msgc0RPQTHr-nJ1hOwQnEoNNURlLg6Ea83M8,22775
 meerschaum/utils/daemon/__init__.py,sha256=7LZeLuakprirfQ_XjnMoOp5Z96cy83vs75oBJiXU19Q,8174
 meerschaum/utils/daemon/_names.py,sha256=Prf7xA2GWDbKR_9Xq9_5RTTIf9GNWY3Yt0s4tEU3JgM,4330
 meerschaum/utils/dtypes/__init__.py,sha256=JR9PViJTzhukZhq0QoPIs73HOnXZZr8OmfhAAD4OAUA,6261
@@ -221,16 +222,16 @@ meerschaum/utils/formatting/_jobs.py,sha256=s1lVcdMkzNj5Bqw-GsUhcguUFtahi5nQ-kg1
 meerschaum/utils/formatting/_pipes.py,sha256=wy0iWJFsFl3X2VloaiA_gp9Yx9w6tD3FQZvAQAqef4A,19492
 meerschaum/utils/formatting/_pprint.py,sha256=tgrT3FyGyu5CWJYysqK3kX1xdZYorlbOk9fcU_vt9Qg,3096
 meerschaum/utils/formatting/_shell.py,sha256=ox75O7VHDAiwzSvdMSJZhXLadvAqYJVeihU6WeZ2Ogc,3677
-meerschaum/utils/packages/__init__.py,sha256=P7nASOvBEcpaz1CBl2KGVQRZ1F1zkNflL34UGPH6lKw,56682
-meerschaum/utils/packages/_packages.py,sha256=qHmYl74vfMULlia3EU6qrurpKyAsBqQcmantUxBFb4E,7970
+meerschaum/utils/packages/__init__.py,sha256=Ohwzw1GufuqQd-N2fkPSCXXGaSSDKB5_zVZ3S9atviM,57032
+meerschaum/utils/packages/_packages.py,sha256=eSTwPNe2llLZFdBSofuKz903mxL7feNNUYb8YlkYjhQ,7968
 meerschaum/utils/packages/lazy_loader.py,sha256=VHnph3VozH29R4JnSSBfwtA5WKZYZQFT_GeQSShCnuc,2540
 meerschaum/utils/venv/_Venv.py,sha256=sBnlmxHdAh2bx8btfVoD79-H9-cYsv5lP02IIXkyECs,3553
 meerschaum/utils/venv/__init__.py,sha256=sj-n8scWH2NPDJGAxfpqzsYqVUt2jMEr-7Uq9G7YUNQ,23183
-meerschaum-2.2.0.dev2.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
-meerschaum-2.2.0.dev2.dist-info/METADATA,sha256=nrTJOaYvdtJzVMeX0tBuCt_D5N8ZVOAigQdUj7b3q8c,23902
-meerschaum-2.2.0.dev2.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
-meerschaum-2.2.0.dev2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-meerschaum-2.2.0.dev2.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
-meerschaum-2.2.0.dev2.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
-meerschaum-2.2.0.dev2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-meerschaum-2.2.0.dev2.dist-info/RECORD,,
+meerschaum-2.2.0rc1.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
+meerschaum-2.2.0rc1.dist-info/METADATA,sha256=78COJ__GnuF4XKU_sijVelE7Aj1KC0DxGf4RjOEz3Po,23964
+meerschaum-2.2.0rc1.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
+meerschaum-2.2.0rc1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+meerschaum-2.2.0rc1.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
+meerschaum-2.2.0rc1.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
+meerschaum-2.2.0rc1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+meerschaum-2.2.0rc1.dist-info/RECORD,,

{meerschaum-2.2.0.dev2.dist-info → meerschaum-2.2.0rc1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any