meerschaum 2.2.0rc3__tar.gz → 2.2.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.2.0rc3
+Version: 2.2.1
 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: 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.0a5; 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: 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.10.0; 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"
+Requires-Dist: duckdb>=1.0.0; extra == "drivers"
+Requires-Dist: duckdb-engine>=0.13.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"
@@ -133,8 +133,8 @@ 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.10.0; extra == "sql"
-Requires-Dist: duckdb-engine>=0.9.2; extra == "sql"
+Requires-Dist: duckdb>=1.0.0; extra == "sql"
+Requires-Dist: duckdb-engine>=0.13.0; extra == "sql"
 Requires-Dist: wheel>=0.34.2; extra == "sql"
 Requires-Dist: setuptools>=63.3.0; extra == "sql"
 Requires-Dist: PyYAML>=5.3.1; extra == "sql"
@@ -190,8 +190,8 @@ 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.10.0; extra == "api"
-Requires-Dist: duckdb-engine>=0.9.2; extra == "api"
+Requires-Dist: duckdb>=1.0.0; extra == "api"
+Requires-Dist: duckdb-engine>=0.13.0; extra == "api"
 Requires-Dist: wheel>=0.34.2; extra == "api"
 Requires-Dist: setuptools>=63.3.0; extra == "api"
 Requires-Dist: PyYAML>=5.3.1; extra == "api"
@@ -266,8 +266,8 @@ 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.10.0; extra == "full"
-Requires-Dist: duckdb-engine>=0.9.2; extra == "full"
+Requires-Dist: duckdb>=1.0.0; extra == "full"
+Requires-Dist: duckdb-engine>=0.13.0; 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"

{meerschaum-2.2.0rc3 → meerschaum-2.2.1}/meerschaum/_internal/entry.py

@@ -47,9 +47,9 @@ 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)
+    #  if args.get('schedule', None):
+        #  from meerschaum.utils.schedule import schedule_function
+        #  return schedule_function(entry_with_args, **args)
     return entry_with_args(**args)
 
 
@@ -61,7 +61,7 @@ def entry_with_args(
     Use `_entry()` for parsing sysargs before executing.
     """
     import sys
-    from meerschaum.plugins import Plugin
+    import functools
     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
@@ -88,10 +88,41 @@ def entry_with_args(
             action_function.__module__.startswith('plugins.')
         ) else None
     )
-    plugin = Plugin(plugin_name) if plugin_name else None
+
+    skip_schedule = False
+    if (
+        kw['action']
+        and kw['action'][0] == 'start'
+        and kw['action'][1] in ('job', 'jobs')
+    ):
+        skip_schedule = True
 
     kw['action'] = remove_leading_action(kw['action'], _actions=_actions)
 
+    do_action = functools.partial(_do_action_wrapper, action_function, plugin_name, **kw)
+    if kw.get('schedule', None) and not skip_schedule:
+        from meerschaum.utils.schedule import schedule_function
+        from meerschaum.utils.misc import interval_str
+        import time
+        from datetime import timedelta
+        start_time = time.perf_counter()
+        schedule_function(do_action, **kw)
+        delta = timedelta(seconds=(time.perf_counter() - start_time))
+        result = True, f"Exited scheduler after {interval_str(delta)}."
+    else:
+        result = do_action()
+
+    ### Clean up stray virtual environments.
+    for venv in [venv for venv in active_venvs]:
+        deactivate_venv(venv, debug=kw.get('debug', False), force=True)
+
+    return result
+
+
+def _do_action_wrapper(action_function, plugin_name, **kw):
+    from meerschaum.plugins import Plugin
+    from meerschaum.utils.venv import Venv, active_venvs, deactivate_venv
+    plugin = Plugin(plugin_name) if plugin_name else None
     with Venv(plugin, debug=kw.get('debug', False)):
         action_name = ' '.join(action_function.__name__.split('_') + kw.get('action', []))
         try:
@@ -111,14 +142,8 @@ def entry_with_args(
             )
         except KeyboardInterrupt:
             result = False, f"Cancelled action `{action_name}`."
-
-    ### Clean up stray virtual environments.
-    for venv in [venv for venv in active_venvs]:
-        deactivate_venv(venv, debug=kw.get('debug', False), force=True)
-
     return result
 
-
 _shells = []
 _shell = None
 def get_shell(

{meerschaum-2.2.0rc3 → meerschaum-2.2.1}/meerschaum/actions/show.py

@@ -589,8 +589,8 @@ def _show_logs(
     if not ANSI:
         info = print
     colors = get_config('jobs', 'logs', 'colors')
-    timestamp_format = get_config('jobs', 'logs', 'timestamp_format')
-    follow_timestamp_format = get_config('jobs', 'logs', 'follow_timestamp_format')
+    timestamp_format = get_config('jobs', 'logs', 'timestamps', 'format')
+    follow_timestamp_format = get_config('jobs', 'logs', 'timestamps', 'follow_format')
     daemons = get_filtered_daemons(action)
     now = datetime.now(timezone.utc)
     now_str = now.strftime(timestamp_format)

{meerschaum-2.2.0rc3 → meerschaum-2.2.1}/meerschaum/api/__init__.py

@@ -46,14 +46,19 @@ endpoints = STATIC_CONFIG['api']['endpoints']
     lazy = False,
     check_update = CHECK_UPDATE,
 )
-typing_extensions = attempt_import(
-    'typing_extensions', lazy=False, check_update=CHECK_UPDATE,
+(
+    typing_extensions,
+    uvicorn_workers,
+) = attempt_import(
+    'typing_extensions',
+    'uvicorn.workers',
+    lazy = False,
+    check_update = CHECK_UPDATE,
     venv = None,
 )
 from meerschaum.api._chain import check_allow_chaining, DISALLOW_CHAINING_MESSAGE
 uvicorn_config_path = API_UVICORN_RESOURCES_PATH / SERVER_ID / 'config.json'
 
-uvicorn_workers = attempt_import('uvicorn.workers', venv=None, check_update=CHECK_UPDATE)
 uvicorn_config = None
 sys_config = get_config('system', 'api')
 permissions_config = get_config('system', 'api', 'permissions')

{meerschaum-2.2.0rc3 → meerschaum-2.2.1}/meerschaum/api/_oauth2.py

@@ -7,11 +7,11 @@ Define JWT authorization here.
 """
 
 import os
-from meerschaum.api import app, endpoints
+from meerschaum.api import app, endpoints, CHECK_UPDATE
 from meerschaum.utils.packages import attempt_import
-fastapi = attempt_import('fastapi', lazy=False)
-fastapi_responses = attempt_import('fastapi.responses', lazy=False)
-fastapi_login = attempt_import('fastapi_login')
+fastapi = attempt_import('fastapi', lazy=False, check_update=CHECK_UPDATE)
+fastapi_responses = attempt_import('fastapi.responses', lazy=False, check_update=CHECK_UPDATE)
+fastapi_login = attempt_import('fastapi_login', check_update=CHECK_UPDATE)
 
 LoginManager = fastapi_login.LoginManager
 def generate_secret_key() -> str:

{meerschaum-2.2.0rc3 → meerschaum-2.2.1}/meerschaum/api/dash/callbacks/dashboard.py

@@ -713,11 +713,11 @@ def download_pipe_csv(n_clicks):
     pipe = pipe_from_ctx(ctx, 'n_clicks')
     if pipe is None:
         raise PreventUpdate
-    filename = str(pipe.target) + '.csv'
     bounds = pipe.get_chunk_bounds(bounded=True, debug=debug)
-    begin, _ = bounds[-1]
+    begin, end = bounds[-1]
+    filename = str(pipe.target) + f" {begin} - {end}.csv"
     try:
-        df = pipe.get_data(begin=begin, end=None, debug=debug)
+        df = pipe.get_data(begin=begin, end=end, debug=debug)
     except Exception as e:
         df = None
     if df is not None:

{meerschaum-2.2.0rc3 → meerschaum-2.2.1}/meerschaum/api/dash/keys.py

@@ -108,7 +108,7 @@ action_dropdown_row = html.Div(
                             id = 'flags-dropdown',
                             multi = True,
                             placeholder = 'Boolean flags',
-                            options = [],
+                            options = ['--yes'],
                             value = ['--yes'],
                         ),
                         id = 'flags-dropdown-div',

{meerschaum-2.2.0rc3 → meerschaum-2.2.1}/meerschaum/api/dash/pages/dashboard.py

@@ -11,12 +11,22 @@ from meerschaum.config import __doc__ as doc, get_config
 from meerschaum.utils.misc import get_connector_labels
 from meerschaum.utils.packages import attempt_import, import_html, import_dcc, import_pandas
 from meerschaum.api import endpoints, CHECK_UPDATE
-dex = attempt_import('dash_extensions', lazy=False, check_update=CHECK_UPDATE)
-dbc = attempt_import('dash_bootstrap_components', lazy=False, check_update=CHECK_UPDATE)
+(
+    dex,
+    px,
+    daq,
+    dbc,
+) = attempt_import(
+    'dash_extensions',
+    'plotly.express',
+    'dash_daq',
+    'dash_bootstrap_components',
+    lazy = False,
+    warn = False,
+    check_update = CHECK_UPDATE,
+)
 html, dcc = import_html(check_update=CHECK_UPDATE), import_dcc(check_update=CHECK_UPDATE)
 pd = import_pandas(check_update=CHECK_UPDATE)
-px = attempt_import('plotly.express', warn=False, check_update=CHECK_UPDATE)
-daq = attempt_import('dash_daq', warn=False, check_update=CHECK_UPDATE)
 
 from meerschaum.api.dash.components import (
     go_button,

{meerschaum-2.2.0rc3 → meerschaum-2.2.1}/meerschaum/config/_jobs.py

@@ -14,13 +14,16 @@ default_jobs_config = {
         'columns': 70,
     },
     'logs': {
+        'timestamps': {
+            'enabled': True,
+            'format': '%Y-%m-%d %H:%M',
+            'follow_format': '%H:%M',
+        },
         'num_files_to_keep': 5,
         'max_file_size': 100_000,
         'lines_to_show': 30,
         'refresh_files_seconds': 5,
         'min_buffer_len': 5,
-        'timestamp_format': '%Y-%m-%d %H:%M',
-        'follow_timestamp_format': '%H:%M',
         'colors': [
             'cyan',
             'magenta',

{meerschaum-2.2.0rc3 → meerschaum-2.2.1}/meerschaum/config/_version.py

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

{meerschaum-2.2.0rc3 → meerschaum-2.2.1}/meerschaum/connectors/__init__.py

@@ -23,7 +23,14 @@ from meerschaum.connectors.sql.SQLConnector import SQLConnector
 from meerschaum.connectors.api.APIConnector import APIConnector
 from meerschaum.connectors.sql._create_engine import flavor_configs as sql_flavor_configs
 
-__all__ = ("Connector", "SQLConnector", "APIConnector", "get_connector", "is_connected")
+__all__ = (
+    "Connector",
+    "SQLConnector",
+    "APIConnector",
+    "get_connector",
+    "is_connected",
+    "poll",
+)
 
 ### store connectors partitioned by
 ### type, label for reuse

{meerschaum-2.2.0rc3 → meerschaum-2.2.1}/meerschaum/connectors/sql/_cli.py

@@ -42,9 +42,13 @@ def cli(
     env = copy.deepcopy(dict(os.environ))
     env[f'MRSM_SQL_{self.label.upper()}'] = json.dumps(self.meta)
     cli_code = (
+        "import sys\n"
         "import meerschaum as mrsm\n"
         f"conn = mrsm.get_connector('sql:{self.label}')\n"
-        f"conn._cli_exit()"
+        "success, msg = conn._cli_exit()\n"
+        "mrsm.pprint((success, msg))\n"
+        "if not success:\n"
+        "    raise Exception(msg)"
     )
     try:
         _ = venv_exec(cli_code, venv=None, debug=debug, capture_output=False)
@@ -91,6 +95,8 @@ def _cli_exit(
     cli_arg_str = self.DATABASE_URL
     if self.flavor in ('sqlite', 'duckdb'):
         cli_arg_str = str(self.database)
+    if cli_arg_str.startswith('postgresql+psycopg://'):
+        cli_arg_str = cli_arg_str.replace('postgresql+psycopg://', 'postgresql://')
 
     ### Define the script to execute to launch the CLI.
     ### The `mssqlcli` script is manually written to avoid telemetry

{meerschaum-2.2.0rc3 → meerschaum-2.2.1}/meerschaum/connectors/sql/_pipes.py

@@ -385,6 +385,9 @@ def get_create_index_queries(
     -------
     A dictionary of column names mapping to lists of queries.
     """
+    ### NOTE: Due to recent breaking changes in DuckDB, indices don't behave properly.
+    if self.flavor == 'duckdb':
+        return {}
     from meerschaum.utils.sql import (
         sql_item_name,
         get_distinct_col_count,
@@ -554,6 +557,9 @@ def get_drop_index_queries(
     -------
     A dictionary of column names mapping to lists of queries.
     """
+    ### NOTE: Due to breaking changes within DuckDB, indices must be skipped.
+    if self.flavor == 'duckdb':
+        return {}
     if not pipe.exists(debug=debug):
         return {}
     from meerschaum.utils.sql import sql_item_name, table_exists, hypertable_queries
@@ -763,6 +769,7 @@ def get_pipe_data(
         if typ == 'numeric' and col in dtypes
     ]
     kw['coerce_float'] = kw.get('coerce_float', (len(numeric_columns) == 0))
+    
     df = self.read(
         query,
         dtype = dtypes,

{meerschaum-2.2.0rc3 → meerschaum-2.2.1}/meerschaum/utils/daemon/Daemon.py

@@ -684,8 +684,8 @@ class Daemon:
         self._rotating_log = RotatingFile(
             self.log_path,
             redirect_streams = True,
-            write_timestamps = True,
-            timestamp_format = get_config('jobs', 'logs', 'timestamp_format'),
+            write_timestamps = get_config('jobs', 'logs', 'timestamps', 'enabled'),
+            timestamp_format = get_config('jobs', 'logs', 'timestamps', 'format'),
         )
         return self._rotating_log
 
@@ -699,7 +699,8 @@ 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,
+            write_timestamps = get_config('jobs', 'logs', 'timestamps', 'enabled'),
+            timestamp_format = get_config('jobs', 'logs', 'timestamps', 'format'),
         )
         return new_rotating_log.read()
 

{meerschaum-2.2.0rc3 → meerschaum-2.2.1}/meerschaum/utils/daemon/RotatingFile.py

@@ -272,7 +272,7 @@ class RotatingFile(io.IOBase):
                     warn(
                         f"Encountered an issue when redirecting streams:\n{traceback.format_exc()}"
                     )
-                if start_interception:
+                if start_interception and self.write_timestamps:
                     self.start_log_fd_interception()
 
         create_new_file = (
@@ -363,7 +363,7 @@ class RotatingFile(io.IOBase):
         suffix_str = "\n" if self.write_timestamps else ""
         self.refresh_files(
             potential_new_len = len(prefix_str + data + suffix_str),
-            start_interception = True,
+            start_interception = self.write_timestamps,
         )
         try:
             if prefix_str:
@@ -591,6 +591,9 @@ class RotatingFile(io.IOBase):
         """
         Start the file descriptor monitoring threads.
         """
+        if not self.write_timestamps:
+            return
+
         threads = self.__dict__.get('_interceptor_threads', [])
         self._stdout_interceptor = FileDescriptorInterceptor(
             sys.stdout.fileno(),
@@ -627,10 +630,13 @@ class RotatingFile(io.IOBase):
         ])
         self.stop_log_fd_interception(unused_only=True)
 
+
     def stop_log_fd_interception(self, unused_only: bool = False):
         """
         Stop the file descriptor monitoring threads.
         """
+        if not self.write_timestamps:
+            return
         interceptors = self.__dict__.get('_interceptors', [])
         interceptor_threads = self.__dict__.get('_interceptor_threads', [])
 

{meerschaum-2.2.0rc3 → meerschaum-2.2.1}/meerschaum/utils/packages/_packages.py

@@ -30,7 +30,7 @@ packages: Dict[str, Dict[str, str]] = {
         'more_termcolor'             : 'more-termcolor>=1.1.3',
         'humanfriendly'              : 'humanfriendly>=10.0.0',
     },
-    '_required': {
+    'core': {
         'wheel'                      : 'wheel>=0.34.2',
         'setuptools'                 : 'setuptools>=63.3.0',
         'yaml'                       : 'PyYAML>=5.3.1',
@@ -60,10 +60,10 @@ packages: Dict[str, Dict[str, str]] = {
         'pymysql'                    : 'PyMySQL>=0.9.0',
         'aiomysql'                   : 'aiomysql>=0.0.21',
         'sqlalchemy_cockroachdb'     : 'sqlalchemy-cockroachdb>=2.0.0',
-        'duckdb'                     : 'duckdb<0.10.0',
-        'duckdb_engine'              : 'duckdb-engine>=0.9.2',
+        'duckdb'                     : 'duckdb>=1.0.0',
+        'duckdb_engine'              : 'duckdb-engine>=0.13.0',
     },
-    '_drivers': {
+    'drivers-extras': {
         'pyodbc'                     : 'pyodbc>=4.0.30',
         'cx_Oracle'                  : 'cx_Oracle>=8.3.0',
     },
@@ -130,7 +130,7 @@ packages['sql'] = {
     'asyncpg'                        : 'asyncpg>=0.21.0',
 }
 packages['sql'].update(packages['drivers'])
-packages['sql'].update(packages['_required'])
+packages['sql'].update(packages['core'])
 packages['dash'] = {
     'flask_compress'                 : 'Flask-Compress>=1.10.1',
     'dash'                           : 'dash>=2.6.2',
@@ -150,7 +150,6 @@ packages['api'] = {
     'fastapi_login'                  : 'fastapi-login>=1.7.2',
     'multipart'                      : 'python-multipart>=0.0.9',
     'httpx'                          : 'httpx>=0.24.1',
-    'websockets'                     : 'websockets>=11.0.3',
 }
 packages['api'].update(packages['sql'])
 packages['api'].update(packages['formatting'])
@@ -170,7 +169,7 @@ def get_install_names():
             install_names[get_install_no_version(_install_name)] = _import_name
     return install_names
 
-skip_groups = {'docs', 'build', 'cli', 'dev-tools', 'portable', 'extras', 'stack', '_drivers'}
+skip_groups = {'docs', 'build', 'cli', 'dev-tools', 'portable', 'extras', 'stack', 'drivers-extras'}
 full = []
 _full = {}
 for group, import_names in packages.items():

{meerschaum-2.2.0rc3 → meerschaum-2.2.1}/meerschaum/utils/schedule.py

@@ -99,7 +99,7 @@ def schedule_function(
     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()
+    _scheduler = apscheduler.AsyncScheduler(identity='mrsm-scheduler')
     try:
         loop = asyncio.get_running_loop()
     except RuntimeError:
@@ -107,7 +107,14 @@ def schedule_function(
 
     async def run_scheduler():
         async with _scheduler:
-            job = await _scheduler.add_schedule(function, trigger, args=args, kwargs=kw)
+            job = await _scheduler.add_schedule(
+                function,
+                trigger,
+                args = args,
+                kwargs = kw,
+                max_running_jobs = 1, 
+                conflict_policy = apscheduler.ConflictPolicy.replace,
+            )
             try:
                 await _scheduler.run_until_stopped()
             except (KeyboardInterrupt, SystemExit) as e:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.2.0rc3
+Version: 2.2.1
 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: 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.0a5; 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: 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.10.0; 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"
+Requires-Dist: duckdb>=1.0.0; extra == "drivers"
+Requires-Dist: duckdb-engine>=0.13.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"
@@ -133,8 +133,8 @@ 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.10.0; extra == "sql"
-Requires-Dist: duckdb-engine>=0.9.2; extra == "sql"
+Requires-Dist: duckdb>=1.0.0; extra == "sql"
+Requires-Dist: duckdb-engine>=0.13.0; extra == "sql"
 Requires-Dist: wheel>=0.34.2; extra == "sql"
 Requires-Dist: setuptools>=63.3.0; extra == "sql"
 Requires-Dist: PyYAML>=5.3.1; extra == "sql"
@@ -190,8 +190,8 @@ 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.10.0; extra == "api"
-Requires-Dist: duckdb-engine>=0.9.2; extra == "api"
+Requires-Dist: duckdb>=1.0.0; extra == "api"
+Requires-Dist: duckdb-engine>=0.13.0; extra == "api"
 Requires-Dist: wheel>=0.34.2; extra == "api"
 Requires-Dist: setuptools>=63.3.0; extra == "api"
 Requires-Dist: PyYAML>=5.3.1; extra == "api"
@@ -266,8 +266,8 @@ 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.10.0; extra == "full"
-Requires-Dist: duckdb-engine>=0.9.2; extra == "full"
+Requires-Dist: duckdb>=1.0.0; extra == "full"
+Requires-Dist: duckdb-engine>=0.13.0; 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"