meerschaum 2.1.7__tar.gz → 2.2.0__tar.gz

{meerschaum-2.1.7/meerschaum.egg-info → meerschaum-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.1.7
+Version: 2.2.0
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares
@@ -42,40 +42,40 @@ Requires-Dist: colorama>=0.4.3; extra == "formatting"
 Requires-Dist: rich>=13.4.2; extra == "formatting"
 Requires-Dist: more-termcolor>=1.1.3; extra == "formatting"
 Requires-Dist: humanfriendly>=10.0.0; extra == "formatting"
-Provides-Extra: required
-Requires-Dist: wheel>=0.34.2; extra == "required"
-Requires-Dist: setuptools>=63.3.0; extra == "required"
-Requires-Dist: PyYAML>=5.3.1; extra == "required"
-Requires-Dist: pip>=22.0.4; extra == "required"
-Requires-Dist: update-checker>=0.18.0; extra == "required"
-Requires-Dist: semver>=3.0.0; extra == "required"
-Requires-Dist: pathspec>=0.9.0; extra == "required"
-Requires-Dist: python-dateutil>=2.7.5; extra == "required"
-Requires-Dist: requests>=2.23.0; extra == "required"
-Requires-Dist: binaryornot>=0.4.4; extra == "required"
-Requires-Dist: pyvim>=3.0.2; extra == "required"
-Requires-Dist: aiofiles>=0.6.0; extra == "required"
-Requires-Dist: packaging>=21.3.0; extra == "required"
-Requires-Dist: prompt-toolkit>=3.0.39; extra == "required"
-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: dill>=0.3.3; extra == "required"
-Requires-Dist: virtualenv>=20.1.0; extra == "required"
-Requires-Dist: rocketry>=2.5.1; extra == "required"
+Provides-Extra: core
+Requires-Dist: wheel>=0.34.2; extra == "core"
+Requires-Dist: setuptools>=63.3.0; extra == "core"
+Requires-Dist: PyYAML>=5.3.1; extra == "core"
+Requires-Dist: pip>=22.0.4; extra == "core"
+Requires-Dist: update-checker>=0.18.0; extra == "core"
+Requires-Dist: semver>=3.0.0; extra == "core"
+Requires-Dist: pathspec>=0.9.0; extra == "core"
+Requires-Dist: python-dateutil>=2.7.5; extra == "core"
+Requires-Dist: requests>=2.23.0; extra == "core"
+Requires-Dist: binaryornot>=0.4.4; extra == "core"
+Requires-Dist: pyvim>=3.0.2; extra == "core"
+Requires-Dist: aiofiles>=0.6.0; extra == "core"
+Requires-Dist: packaging>=21.3.0; extra == "core"
+Requires-Dist: prompt-toolkit>=3.0.39; extra == "core"
+Requires-Dist: more-itertools>=8.7.0; extra == "core"
+Requires-Dist: python-daemon>=0.2.3; extra == "core"
+Requires-Dist: fasteners>=0.18.0; extra == "core"
+Requires-Dist: psutil>=5.8.0; extra == "core"
+Requires-Dist: watchfiles>=0.21.0; extra == "core"
+Requires-Dist: dill>=0.3.3; extra == "core"
+Requires-Dist: virtualenv>=20.1.0; extra == "core"
+Requires-Dist: APScheduler>=4.0.0a5; extra == "core"
 Provides-Extra: drivers
 Requires-Dist: cryptography>=38.0.1; extra == "drivers"
-Requires-Dist: psycopg2-binary>=2.8.6; extra == "drivers"
+Requires-Dist: psycopg[binary]>=3.1.18; extra == "drivers"
 Requires-Dist: PyMySQL>=0.9.0; extra == "drivers"
 Requires-Dist: aiomysql>=0.0.21; extra == "drivers"
 Requires-Dist: sqlalchemy-cockroachdb>=2.0.0; extra == "drivers"
-Requires-Dist: duckdb>=0.9.0; extra == "drivers"
+Requires-Dist: duckdb<0.10.3; extra == "drivers"
 Requires-Dist: duckdb-engine>=0.9.2; extra == "drivers"
-Provides-Extra: drivers
-Requires-Dist: pyodbc>=4.0.30; extra == "drivers"
-Requires-Dist: cx_Oracle>=8.3.0; extra == "drivers"
+Provides-Extra: drivers-extras
+Requires-Dist: pyodbc>=4.0.30; extra == "drivers-extras"
+Requires-Dist: cx_Oracle>=8.3.0; extra == "drivers-extras"
 Provides-Extra: cli
 Requires-Dist: pgcli>=3.1.0; extra == "cli"
 Requires-Dist: mycli>=1.23.2; extra == "cli"
@@ -83,10 +83,10 @@ Requires-Dist: litecli>=1.5.0; extra == "cli"
 Requires-Dist: mssql-cli>=1.0.0; extra == "cli"
 Requires-Dist: gadwall>=0.2.0; extra == "cli"
 Provides-Extra: stack
-Requires-Dist: docker-compose>=1.27.4; extra == "stack"
+Requires-Dist: docker-compose>=1.29.2; extra == "stack"
 Provides-Extra: build
-Requires-Dist: cx_Freeze>=6.5.1; extra == "build"
-Requires-Dist: pyinstaller>=5.0.0-dev0; extra == "build"
+Requires-Dist: cx_Freeze>=7.0.0; extra == "build"
+Requires-Dist: pyinstaller>6.6.0; extra == "build"
 Provides-Extra: dev-tools
 Requires-Dist: twine>=3.2.0; extra == "dev-tools"
 Requires-Dist: tuna>=0.5.3; extra == "dev-tools"
@@ -95,6 +95,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: setup
 Provides-Extra: docs
 Requires-Dist: mkdocs>=1.1.2; extra == "docs"
@@ -119,8 +120,8 @@ Requires-Dist: importlib-metadata>=4.12.0; extra == "extras"
 Provides-Extra: sql
 Requires-Dist: numpy>=1.18.5; extra == "sql"
 Requires-Dist: pandas[parquet]>=2.0.1; extra == "sql"
-Requires-Dist: pyarrow>=7.0.0; extra == "sql"
-Requires-Dist: dask>=2023.5.0; extra == "sql"
+Requires-Dist: pyarrow>=16.1.0; extra == "sql"
+Requires-Dist: dask[dataframe]>=2024.5.1; extra == "sql"
 Requires-Dist: pytz; extra == "sql"
 Requires-Dist: joblib>=0.17.0; extra == "sql"
 Requires-Dist: SQLAlchemy>=2.0.5; extra == "sql"
@@ -128,11 +129,11 @@ Requires-Dist: databases>=0.4.0; extra == "sql"
 Requires-Dist: aiosqlite>=0.16.0; extra == "sql"
 Requires-Dist: asyncpg>=0.21.0; extra == "sql"
 Requires-Dist: cryptography>=38.0.1; extra == "sql"
-Requires-Dist: psycopg2-binary>=2.8.6; extra == "sql"
+Requires-Dist: psycopg[binary]>=3.1.18; extra == "sql"
 Requires-Dist: PyMySQL>=0.9.0; extra == "sql"
 Requires-Dist: aiomysql>=0.0.21; extra == "sql"
 Requires-Dist: sqlalchemy-cockroachdb>=2.0.0; extra == "sql"
-Requires-Dist: duckdb>=0.9.0; extra == "sql"
+Requires-Dist: duckdb<0.10.3; extra == "sql"
 Requires-Dist: duckdb-engine>=0.9.2; extra == "sql"
 Requires-Dist: wheel>=0.34.2; extra == "sql"
 Requires-Dist: setuptools>=63.3.0; extra == "sql"
@@ -152,10 +153,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: rocketry>=2.5.1; extra == "sql"
+Requires-Dist: APScheduler>=4.0.0a5; extra == "sql"
 Provides-Extra: dash
 Requires-Dist: Flask-Compress>=1.10.1; extra == "dash"
 Requires-Dist: dash>=2.6.2; extra == "dash"
@@ -166,20 +167,18 @@ Requires-Dist: dash-daq>=0.5.0; extra == "dash"
 Requires-Dist: terminado>=0.12.1; extra == "dash"
 Requires-Dist: tornado>=6.1.0; extra == "dash"
 Provides-Extra: api
-Requires-Dist: uvicorn[standard]>=0.22.0; extra == "api"
-Requires-Dist: gunicorn>=20.1.0; extra == "api"
+Requires-Dist: uvicorn[standard]>=0.29.0; extra == "api"
+Requires-Dist: gunicorn>=22.0.0; extra == "api"
 Requires-Dist: python-dotenv>=0.20.0; extra == "api"
 Requires-Dist: websockets>=11.0.3; extra == "api"
-Requires-Dist: fastapi>=0.100.0; extra == "api"
-Requires-Dist: passlib>=1.7.4; extra == "api"
+Requires-Dist: fastapi>=0.111.0; extra == "api"
 Requires-Dist: fastapi-login>=1.7.2; extra == "api"
-Requires-Dist: python-multipart>=0.0.5; extra == "api"
-Requires-Dist: pydantic<2.0.0; extra == "api"
+Requires-Dist: python-multipart>=0.0.9; extra == "api"
 Requires-Dist: httpx>=0.24.1; extra == "api"
 Requires-Dist: numpy>=1.18.5; extra == "api"
 Requires-Dist: pandas[parquet]>=2.0.1; extra == "api"
-Requires-Dist: pyarrow>=7.0.0; extra == "api"
-Requires-Dist: dask>=2023.5.0; extra == "api"
+Requires-Dist: pyarrow>=16.1.0; extra == "api"
+Requires-Dist: dask[dataframe]>=2024.5.1; extra == "api"
 Requires-Dist: pytz; extra == "api"
 Requires-Dist: joblib>=0.17.0; extra == "api"
 Requires-Dist: SQLAlchemy>=2.0.5; extra == "api"
@@ -187,11 +186,11 @@ Requires-Dist: databases>=0.4.0; extra == "api"
 Requires-Dist: aiosqlite>=0.16.0; extra == "api"
 Requires-Dist: asyncpg>=0.21.0; extra == "api"
 Requires-Dist: cryptography>=38.0.1; extra == "api"
-Requires-Dist: psycopg2-binary>=2.8.6; extra == "api"
+Requires-Dist: psycopg[binary]>=3.1.18; extra == "api"
 Requires-Dist: PyMySQL>=0.9.0; extra == "api"
 Requires-Dist: aiomysql>=0.0.21; extra == "api"
 Requires-Dist: sqlalchemy-cockroachdb>=2.0.0; extra == "api"
-Requires-Dist: duckdb>=0.9.0; extra == "api"
+Requires-Dist: duckdb<0.10.3; extra == "api"
 Requires-Dist: duckdb-engine>=0.9.2; extra == "api"
 Requires-Dist: wheel>=0.34.2; extra == "api"
 Requires-Dist: setuptools>=63.3.0; extra == "api"
@@ -211,10 +210,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: rocketry>=2.5.1; 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"
@@ -258,24 +257,24 @@ 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: rocketry>=2.5.1; extra == "full"
+Requires-Dist: APScheduler>=4.0.0a5; extra == "full"
 Requires-Dist: cryptography>=38.0.1; extra == "full"
-Requires-Dist: psycopg2-binary>=2.8.6; extra == "full"
+Requires-Dist: psycopg[binary]>=3.1.18; extra == "full"
 Requires-Dist: PyMySQL>=0.9.0; extra == "full"
 Requires-Dist: aiomysql>=0.0.21; extra == "full"
 Requires-Dist: sqlalchemy-cockroachdb>=2.0.0; extra == "full"
-Requires-Dist: duckdb>=0.9.0; extra == "full"
+Requires-Dist: duckdb<0.10.3; extra == "full"
 Requires-Dist: duckdb-engine>=0.9.2; extra == "full"
 Requires-Dist: toga>=0.3.0-dev29; extra == "full"
 Requires-Dist: pywebview>=3.6.3; extra == "full"
 Requires-Dist: pycparser>=2.21.0; extra == "full"
 Requires-Dist: numpy>=1.18.5; extra == "full"
 Requires-Dist: pandas[parquet]>=2.0.1; extra == "full"
-Requires-Dist: pyarrow>=7.0.0; extra == "full"
-Requires-Dist: dask>=2023.5.0; extra == "full"
+Requires-Dist: pyarrow>=16.1.0; extra == "full"
+Requires-Dist: dask[dataframe]>=2024.5.1; extra == "full"
 Requires-Dist: pytz; extra == "full"
 Requires-Dist: joblib>=0.17.0; extra == "full"
 Requires-Dist: SQLAlchemy>=2.0.5; extra == "full"
@@ -290,15 +289,13 @@ Requires-Dist: dash-extensions>=1.0.4; extra == "full"
 Requires-Dist: dash-daq>=0.5.0; extra == "full"
 Requires-Dist: terminado>=0.12.1; extra == "full"
 Requires-Dist: tornado>=6.1.0; extra == "full"
-Requires-Dist: uvicorn[standard]>=0.22.0; extra == "full"
-Requires-Dist: gunicorn>=20.1.0; extra == "full"
+Requires-Dist: uvicorn[standard]>=0.29.0; extra == "full"
+Requires-Dist: gunicorn>=22.0.0; extra == "full"
 Requires-Dist: python-dotenv>=0.20.0; extra == "full"
 Requires-Dist: websockets>=11.0.3; extra == "full"
-Requires-Dist: fastapi>=0.100.0; extra == "full"
-Requires-Dist: passlib>=1.7.4; extra == "full"
+Requires-Dist: fastapi>=0.111.0; extra == "full"
 Requires-Dist: fastapi-login>=1.7.2; extra == "full"
-Requires-Dist: python-multipart>=0.0.5; extra == "full"
-Requires-Dist: pydantic<2.0.0; extra == "full"
+Requires-Dist: python-multipart>=0.0.9; extra == "full"
 Requires-Dist: httpx>=0.24.1; extra == "full"
 
 <img src="https://meerschaum.io/assets/banner_1920x320.png" alt="Meerschaum banner" style="width: 100%"/>

{meerschaum-2.1.7 → meerschaum-2.2.0}/meerschaum/__main__.py

@@ -4,7 +4,7 @@
 # vim:fenc=utf-8
 
 """
-Copyright 2021 Bennett Meares
+Copyright 2024 Bennett Meares
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

{meerschaum-2.1.7 → meerschaum-2.2.0}/meerschaum/_internal/arguments/_parser.py

@@ -346,6 +346,9 @@ groups['misc'].add_argument(
 groups['misc'].add_argument(
     '--nopretty', action="store_true", help="Print elements without 'pretty' formatting"
 )
+groups['misc'].add_argument(
+    '--skip-deps', action="store_true", help="Skip dependencies when installing plugins.",
+)
 groups['misc'].add_argument(
     '-P', '--params', type=string_to_dict, help=(
         "Parameters dictionary in JSON format or simple format. " +

{meerschaum-2.1.7 → meerschaum-2.2.0}/meerschaum/_internal/entry.py

@@ -1,6 +1,7 @@
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
 # vim:fenc=utf-8
+# type: ignore
 
 """
 The entry point for launching Meerschaum actions.
@@ -48,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)
 
 
@@ -61,7 +62,7 @@ def entry_with_args(
     """
     import sys
     from meerschaum.plugins import Plugin
-    from meerschaum.actions import get_shell, get_action, get_main_action_name
+    from meerschaum.actions import get_action, get_main_action_name
     from meerschaum._internal.arguments import remove_leading_action
     from meerschaum.utils.venv import Venv, active_venvs, deactivate_venv
     if kw.get('trace', None):

{meerschaum-2.1.7 → meerschaum-2.2.0}/meerschaum/actions/install.py

@@ -54,6 +54,7 @@ def _complete_install(
 def _install_plugins(
         action: Optional[List[str]] = None,
         repository: Optional[str] = None,
+        skip_deps: bool = False,
         force: bool = False,
         debug: bool = False,
         **kw: Any
@@ -87,11 +88,14 @@ def _install_plugins(
 
     repo_connector = parse_repo_keys(repository)
 
-    successes = {}
     for name in action:
         info(f"Installing plugin '{name}' from Meerschaum repository '{repo_connector}'...")
-        success, msg = repo_connector.install_plugin(name, force=force, debug=debug)
-        successes[name] = (success, msg)
+        success, msg = repo_connector.install_plugin(
+            name,
+            force = force,
+            skip_deps = skip_deps,
+            debug = debug,
+        )
         print_tuple((success, msg))
 
     reload_plugins(debug=debug)

{meerschaum-2.1.7 → meerschaum-2.2.0}/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, timezone
     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
@@ -587,72 +589,106 @@ def _show_logs(
     if not ANSI:
         info = print
     colors = get_config('jobs', 'logs', 'colors')
+    timestamp_format = get_config('jobs', 'logs', 'timestamps', 'format')
+    follow_timestamp_format = get_config('jobs', 'logs', 'timestamps', 'follow_format')
     daemons = get_filtered_daemons(action)
-
-    def _build_buffer_spaces(daemons) -> Dict[str, str]:
-        _max_len_id = max([len(d.daemon_id) for d in daemons]) if daemons else 0
-        _buffer_len = max(get_config('jobs', 'logs', 'min_buffer_len'), _max_len_id + 2)
+    now = datetime.now(timezone.utc)
+    now_str = now.strftime(timestamp_format)
+    now_follow_str = now.strftime(follow_timestamp_format)
+
+    def build_buffer_spaces(daemons) -> Dict[str, str]:
+        max_len_id = max(len(d.daemon_id) for d in daemons) if daemons else 0
+        buffer_len = max(
+            get_config('jobs', 'logs', 'min_buffer_len'),
+            max_len_id 
+        )
         return {
-            d.daemon_id: ''.join([' ' for i in range(_buffer_len - len(d.daemon_id))])
+            d.daemon_id: ''.join([' ' for i in range(buffer_len - len(d.daemon_id))])
             for d in daemons
         }
 
-    def _build_job_colors(daemons, _old_job_colors = None) -> Dict[str, str]:
+    def build_job_colors(daemons, _old_job_colors = None) -> Dict[str, str]:
         return {d.daemon_id: colors[i % len(colors)] for i, d in enumerate(daemons)}
 
-    _buffer_spaces = _build_buffer_spaces(daemons)
-    _job_colors = _build_job_colors(daemons)
+    buffer_spaces = build_buffer_spaces(daemons)
+    job_colors = build_job_colors(daemons)
 
-    def _get_buffer_spaces(daemon_id):
-        nonlocal _buffer_spaces, daemons
-        if daemon_id not in _buffer_spaces:
+    def get_buffer_spaces(daemon_id):
+        nonlocal buffer_spaces, daemons
+        if daemon_id not in buffer_spaces:
             d = Daemon(daemon_id=daemon_id)
             if d not in daemons:
                 daemons = get_filtered_daemons(action)
-            _buffer_spaces = _build_buffer_spaces(daemons)
-        return _buffer_spaces[daemon_id]
+            buffer_spaces = build_buffer_spaces(daemons)
+        return buffer_spaces[daemon_id] or ' '
 
-    def _get_job_colors(daemon_id):
-        nonlocal _job_colors, daemons
-        if daemon_id not in _job_colors:
+    def get_job_colors(daemon_id):
+        nonlocal job_colors, daemons
+        if daemon_id not in job_colors:
             d = Daemon(daemon_id=daemon_id)
             if d not in daemons:
                 daemons = get_filtered_daemons(action)
-            _job_colors = _build_job_colors(daemons)
-        return _job_colors[daemon_id]
+            job_colors = build_job_colors(daemons)
+        return job_colors[daemon_id]
 
-    def _follow_pretty_print():
-        watchgod = attempt_import('watchgod')
+    def follow_pretty_print():
+        watchfiles = attempt_import('watchfiles')
         rich = import_rich()
         rich_text = attempt_import('rich.text')
-        _watch_daemon_ids = {d.daemon_id: d for d in daemons}
+        watch_daemon_ids = {d.daemon_id: d for d in daemons}
         info("Watching log files...")
 
-        def _print_job_line(daemon, line):
+        previous_line_timestamp = None
+        def print_job_line(daemon, line):
+            nonlocal previous_line_timestamp
+            date_prefix_str = line[:len(now_str)]
+            try:
+                line_timestamp = datetime.strptime(date_prefix_str, timestamp_format)
+                previous_line_timestamp = line_timestamp
+            except Exception as e:
+                line_timestamp = None
+            if line_timestamp:
+                line = line[(len(now_str) + 3):]
+            else:
+                line_timestamp = previous_line_timestamp
+
+            if len(line) == 0 or line == '\n':
+                return
+
             text = rich_text.Text(daemon.daemon_id)
-            text.append(
-                _get_buffer_spaces(daemon.daemon_id) + '| '
-                + (line[:-1] if line[-1] == '\n' else line)
+            line_prefix = (
+                get_buffer_spaces(daemon.daemon_id)
+                + (line_timestamp.strftime(follow_timestamp_format) if line_timestamp else '')
+                + ' | '
             )
+            text.append(line_prefix + (line[:-1] if line[-1] == '\n' else line))
             if ANSI:
                 text.stylize(
-                    _get_job_colors(daemon.daemon_id),
+                    get_job_colors(daemon.daemon_id),
                     0,
-                    len(daemon.daemon_id) + len(_get_buffer_spaces(daemon.daemon_id)) + 1
+                    len(daemon.daemon_id) + len(line_prefix)
                 )
             get_console().print(text)
 
 
-        def _print_log_lines(daemon):
+        def print_log_lines(daemon):
             for line in daemon.readlines():
-                _print_job_line(daemon, line)
+                print_job_line(daemon, line)
 
-        def _seek_back_offset(d) -> bool:
+        def seek_back_offset(d) -> bool:
             if d.log_offset_path.exists():
                 d.log_offset_path.unlink()
 
             latest_subfile_path = d.rotating_log.get_latest_subfile_path()
             latest_subfile_index = d.rotating_log.get_latest_subfile_index()
+
+            ### Sometimes the latest file is empty.
+            if os.stat(latest_subfile_path).st_size == 0 and latest_subfile_index > 0:
+                latest_subfile_index -= 1
+                latest_subfile_path = d.rotating_log.get_subfile_path_from_index(
+                    latest_subfile_index
+                )
+
             with open(latest_subfile_path, 'r', encoding='utf-8') as f:
                 latest_lines = f.readlines()
 
@@ -672,12 +708,12 @@ def _show_logs(
             for d in daemons
         }
         for d in daemons:
-            _seek_back_offset(d)
-            _print_log_lines(d)
+            seek_back_offset(d)
+            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:
@@ -688,7 +724,7 @@ def _show_logs(
                     if not file_path.exists():
                         continue
                     daemon_id = file_path.name.split('.log')[0]
-                    if daemon_id not in _watch_daemon_ids and action:
+                    if daemon_id not in watch_daemon_ids and action:
                         continue
                     try:
                         daemon = Daemon(daemon_id=daemon_id)
@@ -697,22 +733,21 @@ def _show_logs(
                         warn(f"Seeing new logs for non-existent job '{daemon_id}'.", stack=False)
 
                     if daemon is not None:
-                        _print_log_lines(daemon)
+                        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():
+    def print_nopretty_log_text():
         for d in daemons:
             log_text = d.log_text
             print(d.daemon_id)
             print(log_text)
 
-    _print_log_text = _follow_pretty_print if not nopretty else _print_nopretty_log_text
-    _print_log_text()
+    print_log_text = follow_pretty_print if not nopretty else print_nopretty_log_text
+    print_log_text()
 
     return True, "Success"
 
@@ -817,6 +852,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-2.1.7 → meerschaum-2.2.0}/meerschaum/actions/sync.py

@@ -453,16 +453,20 @@ def _wrap_pipe(
                 return False, msg
         return True, "Success"
 
-    hook_results = []
+    pre_hook_results, post_hook_results = [], []
     def apply_hooks(is_pre_sync: bool):
         _sync_hooks = (_pre_sync_hooks if is_pre_sync else _post_sync_hooks)
+        _hook_results = (pre_hook_results if is_pre_sync else post_hook_results)
         for module_name, sync_hooks in _sync_hooks.items():
             plugin_name = module_name.split('.')[-1] if module_name.startswith('plugins.') else None
             for sync_hook in sync_hooks:
                 hook_result = pool.apply_async(call_sync_hook, (plugin_name, sync_hook))
-                hook_results.append(hook_result)
+                _hook_results.append(hook_result)
 
     apply_hooks(True)
+    for hook_result in pre_hook_results:
+        hook_success, hook_msg = hook_result.get()
+        mrsm.pprint((hook_success, hook_msg))
    
     try:
         with Venv(get_connector_plugin(pipe.connector), debug=debug):
@@ -480,7 +484,7 @@ def _wrap_pipe(
         'sync_complete_timestamp': datetime.now(timezone.utc),
     })
     apply_hooks(False)
-    for hook_result in hook_results:
+    for hook_result in post_hook_results:
         hook_success, hook_msg = hook_result.get()
         mrsm.pprint((hook_success, hook_msg))