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

meerschaum/api/dash/callbacks/dashboard.py

@@ -516,9 +516,9 @@ def update_keys_options(
     if location_keys:
         num_filter += 1
 
-    _ck_alone, _mk_alone, _lk_alone = False, False, False
-    _ck_filter, _mk_filter, _lk_filter = connector_keys, metric_keys, location_keys
-
+    _ck_filter = connector_keys
+    _mk_filter = metric_keys
+    _lk_filter = location_keys
     _ck_alone = (connector_keys and num_filter == 1) or instance_click
     _mk_alone = (metric_keys and num_filter == 1) or instance_click
     _lk_alone = (location_keys and num_filter == 1) or instance_click
@@ -528,8 +528,11 @@ def update_keys_options(
     try:
         _all_keys = fetch_pipes_keys('registered', get_web_connector(ctx.states))
         _keys = fetch_pipes_keys(
-            'registered', get_web_connector(ctx.states),
-            connector_keys=_ck_filter, metric_keys=_mk_filter, location_keys=_lk_filter
+            'registered',
+            get_web_connector(ctx.states),
+            connector_keys = _ck_filter,
+            metric_keys = _mk_filter,
+            location_keys = _lk_filter,
         )
     except Exception as e:
         instance_alerts += [alert_from_success_tuple((False, str(e)))]
@@ -551,30 +554,33 @@ def update_keys_options(
     add_options(_connectors_options, _all_keys if _ck_alone else _keys, 'ck')
     add_options(_metrics_options, _all_keys if _mk_alone else _keys, 'mk')
     add_options(_locations_options, _all_keys if _lk_alone else _keys, 'lk')
-    connector_keys = sorted([
+    _connectors_options.sort(key=lambda x: str(x).lower())
+    _metrics_options.sort(key=lambda x: str(x).lower())
+    _locations_options.sort(key=lambda x: str(x).lower())
+    connector_keys = [
         ck
-        for ck in connector_keys 
+        for ck in connector_keys
         if ck in [
             _ck['value']
             for _ck in _connectors_options
         ]
-    ])
-    metric_keys = sorted([
+    ]
+    metric_keys = [
         mk
         for mk in metric_keys
         if mk in [
             _mk['value']
             for _mk in _metrics_options
         ]
-    ])
-    location_keys = sorted([
+    ]
+    location_keys = [
         lk
         for lk in location_keys
         if lk in [
             _lk['value']
             for _lk in _locations_options
         ]
-    ])
+    ]
     _connectors_datalist = [html.Option(value=o['value']) for o in _connectors_options]
     _metrics_datalist = [html.Option(value=o['value']) for o in _metrics_options]
     _locations_datalist = [html.Option(value=o['value']) for o in _locations_options]

meerschaum/api/dash/pipes.py

@@ -124,11 +124,11 @@ def get_pipes_cards(*keys, session_data: Optional[Dict[str, Any]] = None):
                             label = "Manage",
                             children = [
                                 dbc.DropdownMenuItem(
-                                    'Sync',
+                                    'Delete',
                                     id = {
                                         'type': 'manage-pipe-button',
                                         'index': meta_str,
-                                        'action': 'sync',
+                                        'action': 'delete',
                                     },
                                 ),
                                 dbc.DropdownMenuItem(
@@ -140,15 +140,31 @@ def get_pipes_cards(*keys, session_data: Optional[Dict[str, Any]] = None):
                                     },
                                 ),
                                 dbc.DropdownMenuItem(
-                                    'Delete',
+                                    'Clear',
                                     id = {
                                         'type': 'manage-pipe-button',
                                         'index': meta_str,
-                                        'action': 'delete',
+                                        'action': 'clear',
+                                    },
+                                ),
+                                dbc.DropdownMenuItem(
+                                    'Verify',
+                                    id = {
+                                        'type': 'manage-pipe-button',
+                                        'index': meta_str,
+                                        'action': 'verify',
+                                    },
+                                ),
+                                dbc.DropdownMenuItem(
+                                    'Sync',
+                                    id = {
+                                        'type': 'manage-pipe-button',
+                                        'index': meta_str,
+                                        'action': 'sync',
                                     },
                                 ),
                             ],
-                            direction = "end",
+                            direction = "up",
                             menu_variant = "dark",
                             size = 'sm',
                             color = 'secondary',
@@ -156,21 +172,10 @@ def get_pipes_cards(*keys, session_data: Optional[Dict[str, Any]] = None):
                     ) if authenticated else [],
                     width = 2,
                 ),
-                #  dbc.Col(
-                    #  (
-                        #  dbc.Button(
-                            #  'Sync',
-                            #  size = 'sm',
-                            #  style = {'width': '100%'},
-                            #  id = {'type': 'pipe-sync-button', 'index': meta_str},
-                        #  ) if authenticated else []
-                    #  ),
-                    #  width = 2,
-                #  ),
                 dbc.Col(width=6),
                 dbc.Col(
                     dbc.Button(
-                        'Download recent data',
+                        'Download CSV',
                         size = 'sm',
                         color = 'link',
                         style = {'float': 'right'},
@@ -244,14 +249,28 @@ def accordion_items_from_pipe(
         overview_header = [html.Thead(html.Tr([html.Th("Attribute"), html.Th("Value")]))]
         dt_name, id_name, val_name = pipe.get_columns('datetime', 'id', 'value', error=False)
         overview_rows = [
-            html.Tr([html.Td("Connector"), html.Td(f"{pipe.connector_keys}")]),
-            html.Tr([html.Td("Metric"), html.Td(f"{pipe.metric_key}")]),
-            html.Tr([html.Td("Location"), html.Td(f"{pipe.location_key}")]),
-            html.Tr([html.Td("Instance"), html.Td(f"{pipe.instance_keys}")]),
-            html.Tr([html.Td("Target Table"), html.Td(f"{pipe.target}")]),
+            html.Tr([html.Td("Connector"), html.Td(html.Pre(f"{pipe.connector_keys}"))]),
+            html.Tr([html.Td("Metric"), html.Td(html.Pre(f"{pipe.metric_key}"))]),
+            html.Tr([html.Td("Location"), html.Td(html.Pre(f"{pipe.location_key}"))]),
+            html.Tr([html.Td("Instance"), html.Td(html.Pre(f"{pipe.instance_keys}"))]),
+            html.Tr([html.Td("Target Table"), html.Td(html.Pre(f"{pipe.target}"))]),
         ]
-        for col_key, col in pipe.columns.items():
-            overview_rows.append(html.Tr([html.Td(f"'{col_key}' Index"), html.Td(col)]))
+        columns = pipe.columns.copy()
+        if columns:
+            datetime_index = columns.pop('datetime', None)
+            columns_items = []
+            if datetime_index:
+                columns_items.append(html.Li(f"{datetime_index} (datetime)"))
+            columns_items.extend([
+                html.Li(f"{col}")
+                for col_key, col in columns.items()
+            ])
+            overview_rows.append(
+                html.Tr([
+                    html.Td("Indices" if len(columns_items) != 1 else "Index"),
+                    html.Td(html.Pre(html.Ul(columns_items))),
+                ])
+            )
         tags = pipe.tags
         if tags:
             tags_items = html.Ul([
@@ -261,7 +280,7 @@ def accordion_items_from_pipe(
             overview_rows.append(
                 html.Tr([
                     html.Td("Tags"),
-                    html.Td(tags_items),
+                    html.Td(html.Pre(tags_items)),
                 ])
             )
 

meerschaum/config/_version.py

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

meerschaum/config/stack/__init__.py

@@ -97,7 +97,6 @@ compose_header = """
 
 
 default_docker_compose_config = {
-    'version': '3.9',
     'services': {
         'db': {
             'environment': {

meerschaum/utils/packages/__init__.py

@@ -8,7 +8,7 @@ Functions for managing packages and virtual environments reside here.
 
 from __future__ import annotations
 
-import importlib.util, os, pathlib
+import importlib.util, os, pathlib, re
 from meerschaum.utils.typing import Any, List, SuccessTuple, Optional, Union, Tuple, Dict, Iterable
 from meerschaum.utils.threading import Lock, RLock
 from meerschaum.utils.packages._packages import packages, all_packages, get_install_names
@@ -640,6 +640,9 @@ def need_update(
 
     ### We might be depending on a prerelease.
     ### Sanity check that the required version is not greater than the installed version. 
+    if 'a' in required_version:
+        required_version = required_version.replace('a', '-dev')
+        version = version.replace('a', '-dev')
     try:
         return (
             (not semver.Version.parse(version).match(required_version))

meerschaum/utils/packages/_packages.py

@@ -52,7 +52,7 @@ packages: Dict[str, Dict[str, str]] = {
         'watchgod'                   : 'watchgod>=0.7.0',
         'dill'                       : 'dill>=0.3.3',
         'virtualenv'                 : 'virtualenv>=20.1.0',
-        'rocketry'                   : 'rocketry>=2.5.1',
+        'apscheduler'                : 'apscheduler>=4.0.0a4',
     },
     'drivers': {
         'cryptography'               : 'cryptography>=38.0.1',
@@ -75,11 +75,11 @@ packages: Dict[str, Dict[str, str]] = {
         'gadwall'                    : 'gadwall>=0.2.0',
     },
     'stack': {
-        'compose'                    : 'docker-compose>=1.27.4',
+        'compose'                    : 'docker-compose>=1.29.2',
     },
     'build': {
-        'cx_Freeze'                  : 'cx_Freeze>=6.5.1',
-        'PyInstaller'                : 'pyinstaller>=5.0.0-dev0',
+        'cx_Freeze'                  : 'cx_Freeze>=7.0.0',
+        'PyInstaller'                : 'pyinstaller>6.6.0',
     },
     'dev-tools': {
         'twine'                      : 'twine>=3.2.0',
@@ -149,7 +149,7 @@ 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',
+    #  'pydantic'                       : 'pydantic>2.0.0',
     'httpx'                          : 'httpx>=0.24.1',
     'websockets'                     : 'websockets>=11.0.3',
 }

meerschaum/utils/schedule.py

@@ -7,11 +7,69 @@ Schedule processes and threads.
 """
 
 from __future__ import annotations
-from meerschaum.utils.typing import Callable, Any, Optional
+import sys
+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']
+FREQUENCY_ALIASES: Dict[str, str] = {
+    'daily': 'every 1 day',
+    'hourly': 'every 1 hour',
+    'minutely': 'every 1 minute',
+    'weekly': 'every 1 week',
+    'monthly': 'every 1 month',
+    'secondly': 'every 1 second',
+}
+LOGIC_ALIASES: Dict[str, str] = {
+    'and': '&',
+    'or': '|',
+    ' through ': '-',
+    ' thru ': '-',
+    ' - ': '-',
+    'beginning': 'starting',
+}
+CRON_DAYS_OF_WEEK: List[str] = ['mon', 'tue', 'wed', 'thu', 'fri', 'sat', 'sun']
+CRON_DAYS_OF_WEEK_ALIASES: Dict[str, str] = {
+    'monday': 'mon',
+    'tuesday': 'tue',
+    'tues': 'tue',
+    'wednesday': 'wed',
+    'thursday': 'thu',
+    'thurs': 'thu',
+    'friday': 'fri',
+    'saturday': 'sat',
+    'sunday': 'sun',
+}
+CRON_MONTHS: List[str] = [
+    'jan', 'feb', 'mar', 'apr', 'may', 'jun',
+    'jul', 'aug', 'sep', 'oct', 'nov', 'dec',
+]
+CRON_MONTHS_ALIASES: Dict[str, str] = {
+    'january': 'jan',
+    'february': 'feb',
+    'march': 'mar',
+    'april': 'apr',
+    'may': 'may',
+    'june': 'jun',
+    'july': 'jul',
+    'august': 'aug',
+    'september': 'sep',
+    'october': 'oct',
+    'november': 'nov',
+    'december': 'dec',
+}
+SCHEDULE_ALIASES: Dict[str, str] = {
+    **FREQUENCY_ALIASES,
+    **LOGIC_ALIASES,
+    **CRON_DAYS_OF_WEEK_ALIASES,
+    **CRON_MONTHS_ALIASES,
+}
+STARTING_KEYWORD: str = 'starting'
 
 def schedule_function(
         function: Callable[[Any], Any],
-        frequency: str,
+        schedule: str,
         *args,
         debug: bool = False,
         **kw
@@ -25,41 +83,222 @@ def schedule_function(
     function: Callable[[Any], Any]
         The function to execute.
 
-    frequency: str
-        The frequency at which `function` should be executed (e.g. `'daily'`).
+    schedule: str
+        The frequency schedule at which `function` should be executed (e.g. `'daily'`).
 
     """
     import warnings
     from meerschaum.utils.warnings import warn
-    from meerschaum.utils.packages import attempt_import
-    from meerschaum.utils.misc import filter_keywords
-    from concurrent.futures._base import CancelledError
+    from meerschaum.utils.misc import filter_keywords, round_time
     kw['debug'] = debug
     kw = filter_keywords(function, **kw)
 
-    def _wrapper():
-        return function(*args, **kw)
+    apscheduler = mrsm.attempt_import('apscheduler', lazy=False)
+    now = round_time(datetime.now(timezone.utc), timedelta(minutes=1))
+    trigger = parse_schedule(schedule, now=now)
 
-    pydantic = attempt_import('pydantic', debug=debug, lazy=False)
-    rocketry = attempt_import('rocketry', debug=debug, lazy=False)
-    try:
-        app = rocketry.Rocketry()
-        FuncTask = rocketry.tasks.FuncTask
-        with warnings.catch_warnings():
-            warnings.filterwarnings('ignore', 'Task\'s session not defined.')
-            task = FuncTask(_wrapper, start_cond=frequency)
-            app.session.add_task(task)
-        return app.run(debug=debug)
-    except (KeyboardInterrupt, CancelledError):
+    with apscheduler.Scheduler() as scheduler:
+        job = scheduler.add_schedule(function, trigger, args=args, kwargs=kw)
         try:
-            app.session.shut_down(force=True)
-        except CancelledError:
-            pass
-        return None
-    except AttributeError:
-        warn(
-            "Failed to import scheduler.\n\n   "
-            + "Run `mrsm install package 'pydantic<2.0.0'` and try again.",
-            stack = False,
+            scheduler.run_until_stopped()
+        except KeyboardInterrupt as e:
+            scheduler.stop()
+            scheduler.wait_until_stopped()
+
+
+def parse_schedule(schedule: str, now: Optional[datetime] = None):
+    """
+    Parse a schedule string (e.g. 'daily') into a Trigger object.
+    """
+    from meerschaum.utils.warnings import error
+    from meerschaum.utils.misc import items_str, is_int
+    (
+        apscheduler_triggers_cron,
+        apscheduler_triggers_interval,
+        apscheduler_triggers_calendarinterval,
+        apscheduler_triggers_combining,
+    ) = (
+        mrsm.attempt_import(
+            'apscheduler.triggers.cron',
+            'apscheduler.triggers.interval',
+            'apscheduler.triggers.calendarinterval',
+            'apscheduler.triggers.combining',
+            lazy = False,
         )
+    )
+
+    starting_ts = parse_start_time(schedule, now=now)
+    schedule = schedule.split(STARTING_KEYWORD)[0].strip()
+    for alias_keyword, true_keyword in SCHEDULE_ALIASES.items():
+        schedule = schedule.replace(alias_keyword, true_keyword)
+
+    ### 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)
+
+    join_str = '|' if '|' in schedule else '&'
+    join_trigger = (
+        apscheduler_triggers_combining.OrTrigger
+        if join_str == '|'
+        else apscheduler_triggers_combining.AndTrigger
+    )
+    join_kwargs = {
+        'max_iterations': 1_000_000,
+        'threshold': 0,
+    } if join_str == '&' else {}
+
+    schedule_parts = [part.strip() for part in schedule.split(join_str)]
+    triggers = []
+
+    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:
+
+        ### Intervals must begin with 'every' (after alias substitution).
+        if schedule_part.lower().startswith('every '):
+            schedule_num_str, schedule_unit = (
+                schedule_part[len('every '):].split(' ', maxsplit=1)
+            )
+            schedule_unit = schedule_unit.rstrip('s') + 's'
+            if schedule_unit not in INTERVAL_UNITS:
+                error(
+                    f"Invalid interval '{schedule_unit}'.\n"
+                    + f"    Accepted values are {items_str(INTERVAL_UNITS)}.",
+                    ValueError,
+                )
+
+            schedule_num = (
+                int(schedule_num_str)
+                if is_int(schedule_num_str)
+                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(
+                    **{
+                        schedule_unit: schedule_num,
+                        'start_time': starting_ts,
+                    }
+                )
+                if schedule_unit != 'months' else (
+                    apscheduler_triggers_calendarinterval.CalendarIntervalTrigger(
+                        **{
+                            schedule_unit: schedule_num,
+                            'start_date': starting_ts,
+                            #  'timezone': starting_ts.tzinfo, TODO Re-enable once APScheduler updates.
+                        }
+                    )
+                )
+            )
+
+        ### Determine whether this is a pure cron string or a cron subset (e.g. 'may-aug')_.
+        else:
+            first_three_prefix = schedule_part[:3] 
+            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
+            trigger = (
+                apscheduler_triggers_cron.CronTrigger(
+                    **{
+                        **cron_kw,
+                        'hour': '*',
+                        'minute': '*' if has_minutes else starting_ts.minute,
+                        'second': '*' if has_seconds else starting_ts.second,
+                        'start_time': starting_ts,
+                        'timezone': starting_ts.tzinfo,
+                    }
+                )
+                if cron_kw
+                else apscheduler_triggers_cron.CronTrigger.from_crontab(
+                    schedule_part, 
+                    timezone = starting_ts.tzinfo,
+                )
+            )
+            ### Explicitly set the `start_time` after building with `from_crontab`.
+            if trigger.start_time != starting_ts:
+                trigger.start_time = starting_ts
+
+        triggers.append(trigger)
+
+    return (
+        join_trigger(triggers, **join_kwargs)
+        if len(triggers) != 1
+        else triggers[0]
+    )
+
+
+def parse_start_time(schedule: str, now: Optional[datetime] = None) -> datetime:
+    """
+    Return the datetime to use for the given schedule string.
+
+    Parameters
+    ----------
+    schedule: str
+        The schedule frequency to be parsed into a starting datetime.
+
+    now: Optional[datetime], default None
+        If provided, use this value as a default if no start time is explicitly stated.
+
+    Returns
+    -------
+    A `datetime` object, either `now` or the datetime embedded in the schedule string.
+
+    Examples
+    --------
+    >>> parse_start_time('daily starting 2024-01-01')
+    datetime.datetime(2024, 1, 1, 0, 0, tzinfo=datetime.timezone.utc)
+    >>> parse_start_time('monthly starting 1st')
+    datetime.datetime(2024, 5, 1, 0, 0, tzinfo=datetime.timezone.utc)
+    >>> parse_start_time('hourly starting 00:30')
+    datetime.datetime(2024, 5, 13, 0, 30, tzinfo=datetime.timezone.utc)
+    """
+    from meerschaum.utils.misc import round_time
+    from meerschaum.utils.warnings import error, warn
+    dateutil_parser = mrsm.attempt_import('dateutil.parser')
+    starting_parts = schedule.split(STARTING_KEYWORD)
+    starting_str = ('now' if len(starting_parts) == 1 else starting_parts[-1]).strip()
+    now = now or round_time(datetime.now(timezone.utc), timedelta(minutes=1))
+    try:
+        starting_ts = now if starting_str == 'now' else dateutil_parser.parse(starting_str)
+        schedule_parse_error = None
+    except Exception as e:
+        warn(f"Unable to parse starting time from '{starting_str}'.", stack=False)
+        schedule_parse_error = str(e)
+    if schedule_parse_error:
+        error(schedule_parse_error, ValueError, stack=False)
+    if not starting_ts.tzinfo:
+        starting_ts = starting_ts.replace(tzinfo=timezone.utc)
+    return starting_ts

{meerschaum-2.2.0.dev1.dist-info → meerschaum-2.2.0.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.2.0.dev1
+Version: 2.2.0.dev2
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares
@@ -56,7 +56,7 @@ 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'
+Requires-Dist: apscheduler >=4.0.0a4 ; extra == '_required'
 Provides-Extra: api
 Requires-Dist: uvicorn[standard] >=0.22.0 ; extra == 'api'
 Requires-Dist: gunicorn >=20.1.0 ; extra == 'api'
@@ -66,7 +66,6 @@ Requires-Dist: fastapi >=0.100.0 ; extra == 'api'
 Requires-Dist: passlib >=1.7.4 ; 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: httpx >=0.24.1 ; extra == 'api'
 Requires-Dist: numpy >=1.18.5 ; extra == 'api'
 Requires-Dist: pandas[parquet] >=2.0.1 ; extra == 'api'
@@ -106,7 +105,7 @@ Requires-Dist: psutil >=5.8.0 ; extra == 'api'
 Requires-Dist: watchgod >=0.7.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.0a4 ; 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'
@@ -124,8 +123,8 @@ Requires-Dist: dash-daq >=0.5.0 ; extra == 'api'
 Requires-Dist: terminado >=0.12.1 ; extra == 'api'
 Requires-Dist: tornado >=6.1.0 ; extra == 'api'
 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: cli
 Requires-Dist: pgcli >=3.1.0 ; extra == 'cli'
 Requires-Dist: mycli >=1.23.2 ; extra == 'cli'
@@ -212,7 +211,7 @@ Requires-Dist: psutil >=5.8.0 ; extra == 'full'
 Requires-Dist: watchgod >=0.7.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.0a4 ; 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'
@@ -249,7 +248,6 @@ Requires-Dist: fastapi >=0.100.0 ; extra == 'full'
 Requires-Dist: passlib >=1.7.4 ; 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: httpx >=0.24.1 ; extra == 'full'
 Provides-Extra: gui
 Requires-Dist: toga >=0.3.0-dev29 ; extra == 'gui'
@@ -297,9 +295,9 @@ Requires-Dist: psutil >=5.8.0 ; extra == 'sql'
 Requires-Dist: watchgod >=0.7.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.0a4 ; extra == 'sql'
 Provides-Extra: stack
-Requires-Dist: docker-compose >=1.27.4 ; extra == 'stack'
+Requires-Dist: docker-compose >=1.29.2 ; extra == 'stack'
 
 <img src="https://meerschaum.io/assets/banner_1920x320.png" alt="Meerschaum banner" style="width: 100%"/>
 

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

@@ -60,7 +60,7 @@ meerschaum/api/dash/connectors.py,sha256=nJxBOFldtCMJLYjUSVYZwX5BO-LNjTNHgoEaXe-
 meerschaum/api/dash/graphs.py,sha256=wJUDWzcLN8-C3xko6rj0F2v7Rt8YDkSXoVkkXJjYGIk,2046
 meerschaum/api/dash/jobs.py,sha256=htqnrtAGCOgn2-THezMGYM8n1E-M-sM5A5qNmOGfHzg,7529
 meerschaum/api/dash/keys.py,sha256=anGVwK5pVR5alVQS0oStl7iq9c6klsocENfSjCRdGyQ,12591
-meerschaum/api/dash/pipes.py,sha256=QFznPYi5drleN03sWNnf6i2jJ_j_eLviRFplqR7fZ2M,17599
+meerschaum/api/dash/pipes.py,sha256=weaxEodeTVcZJPxgnEkN0mFP9tKlzObaoK9ubQ1BAlY,18496
 meerschaum/api/dash/plugins.py,sha256=Ib9z9jFC3pSGSuqjeuSlswhHnLcBrVf30B8VFdYyV-s,3115
 meerschaum/api/dash/sync.py,sha256=9lt7IRdG-fe9gf_ZO_viPiGlerX7ic6r_VFocv3I51A,504
 meerschaum/api/dash/users.py,sha256=xfKwezl_yM4-gmCFSk4VRXR8teIEouw03c6oGVhOzns,2362
@@ -73,7 +73,7 @@ meerschaum/api/dash/assets/favicon.ico,sha256=nDEekVxwS60wEDno1nbw5GF3TJOcDV26SE
 meerschaum/api/dash/assets/logo_48x48.png,sha256=hTR5BHUHEN4yP2xiqAcDciuigoII9T3-80R-dzsxVmw,10218
 meerschaum/api/dash/assets/logo_500x500.png,sha256=9EUtf6wQcEZTXHKfQ2kjNXod6Rn_4DTB_BkTgxggq00,67702
 meerschaum/api/dash/callbacks/__init__.py,sha256=tAcK0ZX5qAN9mD5f7AYv0IBsGI6vI5r6wswPXfGgJfM,325
-meerschaum/api/dash/callbacks/dashboard.py,sha256=DCXs_98JBXPgNCEkZLPaUCNnZrT4P9HK2d-YsBTw8BM,32206
+meerschaum/api/dash/callbacks/dashboard.py,sha256=BZWMAuaSuvlEZNUChCJ_I-QK9ClQliQ8XWNbK_gstP0,32346
 meerschaum/api/dash/callbacks/jobs.py,sha256=OEYxJRlmnxqbsvHb5jBJJCsRvVCsMNusm9AClCT9Pm0,7689
 meerschaum/api/dash/callbacks/login.py,sha256=dfl0EOkEUcF7a-u8fq0WGNtwV63714ds30yWfOM2rqE,2613
 meerschaum/api/dash/callbacks/plugins.py,sha256=7CrwwbBI2N3DR4Yb1bKmrtJ3cAQ3dVv1l6E_AtZ6Wng,2777
@@ -134,9 +134,9 @@ 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=PkQljZNVFa8BNyCTXpUW8xtjTZNJ6ru--pVX3diqFcU,76
+meerschaum/config/_version.py,sha256=C1chg72mvosNVsfDxJ0TiYiWC1iqAPXO56RhWOWpGHk,76
 meerschaum/config/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meerschaum/config/stack/__init__.py,sha256=4a_up1oxkitwgIylWWk0vA4XkGhEpWazUaENOPEdYQI,9034
+meerschaum/config/stack/__init__.py,sha256=pKR7aDqqrGZjjNhbWbA9AMdfBjF_-zl7xtgVXk9B9Mg,9012
 meerschaum/config/stack/grafana/__init__.py,sha256=wzuoch_AK49lcn7lH2qTSJ_PPbSagF4lcweeipz_XiE,2010
 meerschaum/config/stack/mosquitto/__init__.py,sha256=-OwOjq8KiBoSH_pmgCAAF3Dp3CRD4KgAEdimZSadROs,186
 meerschaum/config/stack/mosquitto/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -204,7 +204,7 @@ 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=lYra4f7QpGlmV4vAhO1UvA5TWQSPdLqw7eG7ekKZtwg,1951
+meerschaum/utils/schedule.py,sha256=VAlNZQHjGoAzsmGTiHbUMzf3kIxriPF9GjKKZZefyHQ,10350
 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
@@ -221,16 +221,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=yyf-3rAyRy5XaQkNFHjOC85VIkZt0o00o7rG3ykG7XU,56534
-meerschaum/utils/packages/_packages.py,sha256=ygRG1sBps2C0_7lfwMRnD84S4cPt4KiNAGXYduiyfoI,7968
+meerschaum/utils/packages/__init__.py,sha256=P7nASOvBEcpaz1CBl2KGVQRZ1F1zkNflL34UGPH6lKw,56682
+meerschaum/utils/packages/_packages.py,sha256=qHmYl74vfMULlia3EU6qrurpKyAsBqQcmantUxBFb4E,7970
 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.dev1.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
-meerschaum-2.2.0.dev1.dist-info/METADATA,sha256=PsW8SeL9h5X0HPnnBk3tcNly1Wvl6epTWr0VRYuMRvo,23985
-meerschaum-2.2.0.dev1.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
-meerschaum-2.2.0.dev1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-meerschaum-2.2.0.dev1.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
-meerschaum-2.2.0.dev1.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
-meerschaum-2.2.0.dev1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-meerschaum-2.2.0.dev1.dist-info/RECORD,,
+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,,