meerschaum 2.8.2__tar.gz → 2.8.4__tar.gz

{meerschaum-2.8.2/meerschaum.egg-info → meerschaum-2.8.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: meerschaum
-Version: 2.8.2
+Version: 2.8.4
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares

{meerschaum-2.8.2 → meerschaum-2.8.4}/meerschaum/_internal/arguments/_parser.py

@@ -367,6 +367,11 @@ groups['sync'].add_argument(
         "Only compare row-counts when verifying pipes."
     ),
 )
+groups['sync'].add_argument(
+    '--skip-hooks', action='store_true', help=(
+        "Skip calling the sync hooks."
+    )
+)
 groups['sync'].add_argument(
     '--cache', action='store_true',
     help=(

{meerschaum-2.8.2 → meerschaum-2.8.4}/meerschaum/actions/drop.py

@@ -86,7 +86,7 @@ def _drop_pipes(
         pprint(success_dict)
 
     msg = (
-        f"Finished dropping {len(pipes)} pipes"
+        f"Finished dropping {len(pipes)} pipe"
         + ('s' if len(pipes) != 1 else '')
         + f"\n    ({successes} succeeded, {fails} failed)."
     )

{meerschaum-2.8.2 → meerschaum-2.8.4}/meerschaum/actions/start.py

@@ -568,9 +568,9 @@ def _start_pipeline(
     Examples
     --------
 
-    `sync pipes -i sql:local + sync pipes -i sql:main :: -s 'daily'`
+    `sync pipes -i sql:local + sync pipes -i sql:main : -s 'daily'`
 
-    `show version + show arguments :: --loop`
+    `show version + show arguments : --loop`
 
     """
     import json
@@ -580,10 +580,11 @@ def _start_pipeline(
     from meerschaum.utils.warnings import info, warn
     from meerschaum.utils.misc import is_int
     from meerschaum.utils.venv import venv_exec
-    from meerschaum.utils.process import poll_process
+    from meerschaum.utils.process import poll_process, _stop_process
     fence_begin, fence_end = '<MRSM_RESULT>', '</MRSM_RESULT>'
 
-    success, msg = False, "Did not run pipeline."
+    default_msg = "Did not pipeline."
+    success, msg = False, default_msg
     def write_line(line):
         nonlocal success, msg
         decoded = line.decode('utf-8')
@@ -610,7 +611,9 @@ def _start_pipeline(
     do_n_times = (
         int(action[0].lstrip('x'))
         if action and is_int(action[0].lstrip('x'))
-        else 1
+        else (
+            1 if not loop else -1
+        )
     )
 
     params = params or {}
@@ -623,8 +626,9 @@ def _start_pipeline(
     if min_seconds is None:
         min_seconds = 1.0
 
+    proc = None
     def do_entry() -> None:
-        nonlocal success, msg
+        nonlocal success, msg, proc
         if timeout_seconds is None:
             success, msg = entry(sub_args_line, _patch_args=patch_args)
             return
@@ -674,6 +678,10 @@ def _start_pipeline(
         run_loop()
     except KeyboardInterrupt:
         warn("Cancelled pipeline.", stack=False)
+        if proc is not None:
+            _stop_process(proc)
+        if msg == default_msg:
+            msg = "Pipeline was cancelled."
 
     if do_n_times != 1:
         info(f"Ran pipeline {ran_n_times} time" + ('s' if ran_n_times != 1 else '') + '.')

{meerschaum-2.8.2 → meerschaum-2.8.4}/meerschaum/actions/sync.py

@@ -50,6 +50,7 @@ def _pipes_lap(
     bounded: Optional[bool] = None,
     chunk_interval: Union[timedelta, int, None] = None,
     check_rowcounts_only: bool = False,
+    skip_hooks: bool = False,
     mrsm_instance: Optional[str] = None,
     timeout_seconds: Optional[int] = None,
     nopretty: bool = False,
@@ -95,6 +96,7 @@ def _pipes_lap(
         'bounded': bounded,
         'chunk_interval': chunk_interval,
         'check_rowcounts_only': check_rowcounts_only,
+        'skip_hooks': skip_hooks,
     })
     locks = {'remaining_count': Lock(), 'results_dict': Lock(), 'pipes_threads': Lock(),}
     pipes = get_pipes(
@@ -257,6 +259,7 @@ def _sync_pipes(
     bounded: Optional[bool] = None,
     chunk_interval: Union[timedelta, int, None] = None,
     check_rowcounts_only: bool = False,
+    skip_hooks: bool = False,
     shell: bool = False,
     nopretty: bool = False,
     debug: bool = False,
@@ -289,6 +292,8 @@ def _sync_pipes(
 
     noninteractive_val = os.environ.get(STATIC_CONFIG['environment']['noninteractive'], None)
     noninteractive = str(noninteractive_val).lower() in ('1', 'true', 'yes')
+    if check_rowcounts_only:
+        skip_hooks = True
 
     run = True
     msg = ""
@@ -312,6 +317,7 @@ def _sync_pipes(
                     bounded=bounded,
                     chunk_interval=chunk_interval,
                     check_rowcounts_only=check_rowcounts_only,
+                    skip_hooks=skip_hooks,
                     unblock=unblock,
                     debug=debug,
                     nopretty=nopretty,
@@ -403,6 +409,7 @@ def _wrap_pipe(
     deduplicate: bool = False,
     bounded: Optional[bool] = None,
     chunk_interval: Union[timedelta, int, None] = None,
+    skip_hooks: bool = False,
     **kw
 ):
     """
@@ -462,6 +469,8 @@ def _wrap_pipe(
 
     pre_hook_results, post_hook_results = [], []
     def apply_hooks(is_pre_sync: bool):
+        if skip_hooks:
+            return
         _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():

{meerschaum-2.8.2 → meerschaum-2.8.4}/meerschaum/api/__init__.py

@@ -9,6 +9,7 @@ from __future__ import annotations
 
 import os
 from collections import defaultdict
+from fnmatch import fnmatch
 
 import meerschaum as mrsm
 from meerschaum.utils.typing import Dict, Any, Optional, PipesDict
@@ -21,6 +22,7 @@ from meerschaum.plugins import _api_plugins
 from meerschaum.utils.warnings import warn, dprint
 from meerschaum.utils.threading import RLock
 from meerschaum.utils.misc import is_pipe_registered
+from meerschaum.connectors.parse import parse_instance_keys
 
 from meerschaum import __version__ as version
 __version__ = version
@@ -99,7 +101,6 @@ production = get_uvicorn_config().get('production', False)
 _include_dash = (not no_dash)
 docs_enabled = not production or sys_config.get('endpoints', {}).get('docs_in_production', True)
 
-connector = None
 default_instance_keys = None
 _instance_connectors = defaultdict(lambda: None)
 def get_api_connector(instance_keys: Optional[str] = None):
@@ -119,23 +120,35 @@ def get_api_connector(instance_keys: Optional[str] = None):
         )
 
     allowed_instance_keys = permissions_config.get(
-        'instance', {}
+        'instances', {}
     ).get(
         'allowed_instance_keys',
         ['*']
     )
-    if allowed_instance_keys != ['*'] and instance_keys not in allowed_instance_keys:
+    found_match: bool = False
+    for allowed_keys_pattern in allowed_instance_keys:
+        if fnmatch(instance_keys, allowed_keys_pattern):
+            found_match = True
+            break
+    if not found_match:
         raise APIPermissionError(
-            f"Instance keys '{instance_keys}' not in list of allowed instances."
+            f"Instance keys '{instance_keys}' does not match the allowed instances patterns."
         )
 
     with _locks[f'instance-{instance_keys}']:
-        connector = _instance_connectors[instance_keys]
-        if connector is None:
-            from meerschaum.connectors.parse import parse_instance_keys
-            connector = parse_instance_keys(instance_keys, debug=debug)
-            _instance_connectors[instance_keys] = connector
-    return connector
+        if _instance_connectors[instance_keys] is None:
+            try:
+                is_valid_connector = True
+                _instance_connectors[instance_keys] = parse_instance_keys(instance_keys, debug=debug)
+            except Exception:
+                is_valid_connector = False
+
+            if not is_valid_connector:
+                raise fastapi.HTTPException(
+                    status_code=422,
+                    detail="Invalid instance keys.",
+                )
+    return _instance_connectors[instance_keys]
 
 
 cache_connector = None
@@ -164,7 +177,6 @@ def get_cache_connector(connector_keys: Optional[str] = None):
         return None
 
     if cache_connector is None:
-        from meerschaum.connectors.parse import parse_instance_keys
         cache_connector = parse_instance_keys(connector_keys)
 
     if debug:

{meerschaum-2.8.2 → meerschaum-2.8.4}/meerschaum/api/routes/_pipes.py

@@ -272,7 +272,7 @@ async def get_pipes_by_connector_and_metric(
 
 
 @app.get(pipes_endpoint + '/{connector_keys}/{metric_key}/{location_key}', tags=['Pipes'])
-async def get_pipes_by_connector_and_metric_and_location(
+async def get_pipe_by_connector_and_metric_and_location(
     connector_keys: str,
     metric_key: str,
     location_key: str,
@@ -299,7 +299,7 @@ async def get_pipes_by_connector_and_metric_and_location(
             detail=f"location_key '{location_key}' not found."
         )
 
-    return str(pipes(instance_keys)[connector_keys][metric_key][location_key])
+    return pipes(instance_keys)[connector_keys][metric_key][location_key].attributes
 
 
 @app.get(pipes_endpoint + '/{connector_keys}/{metric_key}/{location_key}/sync_time', tags=['Pipes'])
@@ -311,7 +311,7 @@ def get_sync_time(
     newest: bool = True,
     remote: bool = False,
     round_down: bool = True,
-    debug: bool = False,
+    instance_keys: Optional[str] = None,
     curr_user = (
         fastapi.Depends(manager) if not no_auth else None
     ),
@@ -322,12 +322,11 @@ def get_sync_time(
     """
     if location_key == '[None]':
         location_key = None
-    pipe = get_pipe(connector_keys, metric_key, location_key)
+    pipe = get_pipe(connector_keys, metric_key, location_key, instance_keys)
     sync_time = pipe.get_sync_time(
-        params = params,
-        newest = newest,
-        debug = debug,
-        round_down = round_down,
+        params=params,
+        newest=newest,
+        round_down=round_down,
     )
     if isinstance(sync_time, datetime):
         sync_time = sync_time.isoformat()
@@ -339,7 +338,8 @@ def sync_pipe(
     connector_keys: str,
     metric_key: str,
     location_key: str,
-    data: dict = None,
+    data: Union[List[Dict[Any, Any]], Dict[Any, Any]],
+    instance_keys: Optional[str] = None,
     check_existing: bool = True,
     blocking: bool = True,
     force: bool = False,
@@ -354,9 +354,9 @@ def sync_pipe(
     Add data to an existing Pipe.
     See [`meerschaum.Pipe.sync`](https://docs.meerschaum.io/meerschaum.html#Pipe.sync).
     """
-    if data is None:
-        data = {}
-    pipe = get_pipe(connector_keys, metric_key, location_key)
+    if not data:
+        return [True, "No data to sync."]
+    pipe = get_pipe(connector_keys, metric_key, location_key, instance_keys)
     if pipe.target in ('mrsm_users', 'mrsm_plugins', 'mrsm_pipes'):
         raise fastapi.HTTPException(
             status_code=409,
@@ -365,21 +365,16 @@ def sync_pipe(
 
     if not pipe.columns and columns is not None:
         pipe.columns = json.loads(columns)
-    if not pipe.columns and not is_pipe_registered(pipe, pipes(refresh=True)):
-        raise fastapi.HTTPException(
-            status_code=409,
-            detail="Pipe must be registered with index columns specified."
-        )
 
-    result = list(pipe.sync(
+    success, msg = pipe.sync(
         data,
         debug=debug,
         check_existing=check_existing,
         blocking=blocking,
         force=force,
         workers=workers,
-    ))
-    return result
+    )
+    return list((success, msg))
 
 
 @app.get(pipes_endpoint + '/{connector_keys}/{metric_key}/{location_key}/data', tags=['Pipes'])
@@ -527,7 +522,6 @@ def get_pipe_csv(
     if params == 'null':
         params = None
     if params is not None:
-        import json
         try:
             _params = json.loads(params)
         except Exception:
@@ -543,7 +537,7 @@ def get_pipe_csv(
     if not is_pipe_registered(pipe, pipes(instance_keys, refresh=True)):
         raise fastapi.HTTPException(
             status_code=409,
-            detail="Pipe must be registered with the datetime column specified."
+            detail="Pipe must be registered."
         )
 
     dt_col = pipe.columns.get('datetime', None)

{meerschaum-2.8.2 → meerschaum-2.8.4}/meerschaum/config/_default.py

@@ -173,6 +173,9 @@ default_pipes_config = {
     'sync': {
         'filter_params_index_limit': 250,
     },
+    'verify': {
+        'max_chunks_syncs': 3,
+    },
 }
 default_plugins_config = {}
 default_experimental_config = {

{meerschaum-2.8.2 → meerschaum-2.8.4}/meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "2.8.2"
+__version__ = "2.8.4"

{meerschaum-2.8.2 → meerschaum-2.8.4}/meerschaum/config/static/__init__.py

@@ -137,7 +137,7 @@ STATIC_CONFIG: Dict[str, Any] = {
             'pbkdf2_sha256__default_rounds': 1_000_000,
         },
         'min_username_length': 1,
-        'max_username_length': 26,
+        'max_username_length': 60,
         'min_password_length': 5,
     },
     'plugins': {

{meerschaum-2.8.2 → meerschaum-2.8.4}/meerschaum/connectors/sql/_SQLConnector.py

@@ -184,7 +184,7 @@ class SQLConnector(Connector):
         ### ensure flavor and label are set accordingly
         if 'flavor' not in self.__dict__:
             if flavor is None and 'uri' not in self.__dict__:
-                raise Exception(
+                raise ValueError(
                     f"    Missing flavor. Provide flavor as a key for '{self}'."
                 )
             self.flavor = flavor or self.parse_uri(self.__dict__['uri']).get('flavor', None)

{meerschaum-2.8.2 → meerschaum-2.8.4}/meerschaum/connectors/sql/_cli.py

@@ -100,7 +100,13 @@ def _cli_exit(
     ### yet defined (e.g. 'sql:local').
     cli_arg_str = self.DATABASE_URL
     if self.flavor in ('sqlite', 'duckdb'):
-        cli_arg_str = str(self.database)
+        cli_arg_str = (
+            str(self.database)
+            if 'database' in self.__dict__
+            else self.parse_uri(self.URI).get('database', None)
+        )
+        if not cli_arg_str:
+            raise ValueError(f"Cannot determine database from connector '{self}'.")
     if cli_arg_str.startswith('postgresql+psycopg://'):
         cli_arg_str = cli_arg_str.replace('postgresql+psycopg://', 'postgresql://')
 

{meerschaum-2.8.2 → meerschaum-2.8.4}/meerschaum/connectors/sql/_create_engine.py

@@ -256,8 +256,11 @@ def create_engine(
         ) if not _uri else _uri
 
         ### Sometimes the timescaledb:// flavor can slip in.
-        if _uri and self.flavor in ('timescaledb',) and self.flavor in _uri:
-            engine_str = engine_str.replace(f'{self.flavor}', 'postgresql', 1)
+        if _uri and self.flavor in _uri:
+            if self.flavor == 'timescaledb':
+                engine_str = engine_str.replace(f'{self.flavor}', 'postgresql', 1)
+            elif _uri.startswith('postgresql://'):
+                engine_str = engine_str.replace('postgresql://', 'postgresql+psycopg2://')
 
     if debug:
         dprint(
@@ -303,7 +306,7 @@ def create_engine(
             echo         = debug,
             **_create_engine_args
         )
-    except Exception as e:
+    except Exception:
         warn(f"Failed to create connector '{self}':\n{traceback.format_exc()}", stack=False)
         engine = None
 

{meerschaum-2.8.2 → meerschaum-2.8.4}/meerschaum/connectors/sql/_users.py

@@ -43,7 +43,9 @@ def register_user(
         'password_hash': user.password_hash,
         'user_type': user.type,
         'attributes': (
-            json.dumps(user.attributes) if self.flavor not in json_flavors else user.attributes
+            json.dumps(user.attributes)
+            if self.flavor not in json_flavors
+            else user.attributes
         ),
     }
     if old_id is not None:
@@ -109,7 +111,7 @@ def edit_user(
     user_id = user.user_id if user.user_id is not None else self.get_user_id(user, debug=debug)
     if user_id is None:
         return False, (
-            f"User '{user.username}' does not exist. " +
+            f"User '{user.username}' does not exist. "
             f"Register user '{user.username}' before editing."
         )
     user.user_id = user_id

{meerschaum-2.8.2 → meerschaum-2.8.4}/meerschaum/core/Pipe/_verify.py

@@ -7,6 +7,7 @@ Verify the contents of a pipe by resyncing its interval.
 """
 
 from datetime import datetime, timedelta
+import time
 
 import meerschaum as mrsm
 from meerschaum.utils.typing import SuccessTuple, Any, Optional, Union, Tuple, Dict
@@ -118,7 +119,7 @@ def verify(
     begin, end = self.parse_date_bounds(begin, end)
     cannot_determine_bounds = bounded and begin is None and end is None
 
-    if cannot_determine_bounds:
+    if cannot_determine_bounds and not check_rowcounts_only:
         warn(f"Cannot determine sync bounds for {self}. Syncing instead...", stack=False)
         sync_success, sync_msg = self.sync(
             begin=begin,
@@ -183,9 +184,12 @@ def verify(
         )
     )
     message_header = f"{begin_to_print} - {end_to_print}"
+    max_chunks_syncs = mrsm.get_config('pipes', 'verify', 'max_chunks_syncs')
 
     info(
-        f"Verifying {self}:\n    Syncing {len(chunk_bounds)} chunk"
+        f"Verifying {self}:\n    "
+        + ("Syncing" if not check_rowcounts_only else "Checking")
+        + f" {len(chunk_bounds)} chunk"
         + ('s' if len(chunk_bounds) != 1 else '')
         + f" ({'un' if not bounded else ''}bounded)"
         + f" of size '{interval_str(chunk_interval)}'"
@@ -219,9 +223,9 @@ def verify(
                 debug=debug,
             )
             checked_rows_str = (
-                f"checked {existing_rowcount} row"
+                f"checked {existing_rowcount:,} row"
                 + ("s" if existing_rowcount != 1 else '')
-                + f" vs {remote_rowcount} remote"
+                + f" vs {remote_rowcount:,} remote"
             )
             if (
                 existing_rowcount is not None
@@ -239,19 +243,26 @@ def verify(
                     f"Row-counts are out-of-sync ({checked_rows_str})."
                 )
 
-        chunk_success, chunk_msg = self.sync(
-            begin=chunk_begin,
-            end=chunk_end,
-            params=params,
-            workers=_workers,
-            debug=debug,
-            **kwargs
-        ) if do_sync else (chunk_success, chunk_msg)
+        num_syncs = 0
+        while num_syncs < max_chunks_syncs:
+            chunk_success, chunk_msg = self.sync(
+                begin=chunk_begin,
+                end=chunk_end,
+                params=params,
+                workers=_workers,
+                debug=debug,
+                **kwargs
+            ) if do_sync else (chunk_success, chunk_msg)
+            if chunk_success:
+                break
+            num_syncs += 1
+            time.sleep(num_syncs**2)
         chunk_msg = chunk_msg.strip()
         if ' - ' not in chunk_msg:
             chunk_label = f"{chunk_begin} - {chunk_end}"
             chunk_msg = f'Verified chunk for {self}:\n{chunk_label}\n{chunk_msg}'
         mrsm.pprint((chunk_success, chunk_msg))
+
         return chunk_begin_and_end, (chunk_success, chunk_msg)
 
     ### If we have more than one chunk, attempt to sync the first one and return if its fails.
@@ -284,6 +295,17 @@ def verify(
         _batch_begin = batch_chunk_bounds[0][0]
         _batch_end = batch_chunk_bounds[-1][-1]
         batch_message_header = f"{_batch_begin} - {_batch_end}"
+
+        if check_rowcounts_only:
+            info(f"Checking row-counts for batch bounds:\n    {batch_message_header}")
+            _, (batch_init_success, batch_init_msg) = process_chunk_bounds(
+                (_batch_begin, _batch_end)
+            )
+            mrsm.pprint((batch_init_success, batch_init_msg))
+            if batch_init_success and 'up-to-date' in batch_init_msg:
+                info("Entire batch is up-to-date.")
+                return batch_init_success, batch_init_msg
+
         batch_bounds_success_tuples = dict(pool.map(process_chunk_bounds, batch_chunk_bounds))
         bounds_success_tuples.update(batch_bounds_success_tuples)
         batch_bounds_success_bools = {
@@ -395,7 +417,7 @@ def verify(
             retry_failed_batch = False
 
         batch_msg_to_print = (
-            f"{make_header('Completed batch ' + batch_counter_str + ' ' + for_self + ':')}\n{batch_msg}"
+            f"{make_header('Completed batch ' + batch_counter_str + ':')}\n{batch_msg}"
         )
         mrsm.pprint((batch_success, batch_msg_to_print))
 
@@ -471,11 +493,13 @@ def get_chunks_success_message(
     header = (header + "\n") if header else ""
     stats_msg = items_str(
         (
-            ([f'inserted {num_inserted:,}'] if num_inserted else [])
-            + ([f'updated {num_updated:,}'] if num_updated else [])
-            + ([f'upserted {num_upserted:,}'] if num_upserted else [])
-            + ([f'checked {num_checked:,}'] if num_checked else [])
-        ) or ['synced 0'],
+            (
+                ([f'inserted {num_inserted:,}'] if num_inserted else [])
+                + ([f'updated {num_updated:,}'] if num_updated else [])
+                + ([f'upserted {num_upserted:,}'] if num_upserted else [])
+                + ([f'checked {num_checked:,}'] if num_checked else [])
+            ) or ['synced 0']
+        ),
         quotes=False,
         and_=False,
     )

{meerschaum-2.8.2 → meerschaum-2.8.4}/meerschaum/jobs/systemd.py

@@ -154,7 +154,7 @@ class SystemdExecutor(Executor):
             STATIC_CONFIG['environment']['systemd_delete_job']: (
                 '1'
                 if job.delete_after_completion
-                else '0',
+                else '0'
             ),
         })
 

{meerschaum-2.8.2 → meerschaum-2.8.4}/meerschaum/utils/dataframe.py

@@ -222,7 +222,7 @@ def filter_unseen_df(
     numeric_cols_precisions_scales = {
         col: get_numeric_precision_scale(None, typ)
         for col, typ in dtypes.items()
-        if col and typ and typ.startswith('numeric')
+        if col and str(typ).lower().startswith('numeric')
     }
 
     dt_dtypes = {

{meerschaum-2.8.2 → meerschaum-2.8.4}/meerschaum/utils/packages/_packages.py

@@ -58,7 +58,7 @@ packages: Dict[str, Dict[str, str]] = {
     '_internal'                      : {
         'apscheduler'                : (
                                        f"{_MRSM_PACKAGE_ARCHIVES_PREFIX}"
-                                       "APScheduler-4.0.0a5.post75+mrsm-py3-none-any.whl>=4.0.0a5"
+                                       "APScheduler-4.0.0a5.post87+mrsm-py3-none-any.whl>=4.0.0a5"
         ),
         'dataclass_wizard'           : 'dataclass-wizard>=0.28.0',
     },

{meerschaum-2.8.2 → meerschaum-2.8.4}/meerschaum/utils/process.py

@@ -9,15 +9,25 @@ See `meerschaum.utils.pool` for multiprocessing and
 """
 
 from __future__ import annotations
-import os, signal, subprocess, sys, platform, traceback
+
+import os
+import signal
+import subprocess
+import sys
+import platform
+
+import meerschaum as mrsm
 from meerschaum.utils.typing import Union, Optional, Any, Callable, Dict, Tuple
 from meerschaum.config.static import STATIC_CONFIG
 
 _child_processes = []
 def signal_handler(sig, frame):
     for child in _child_processes:
-        child.send_signal(sig)
-        child.wait()
+        try:
+            child.send_signal(sig)
+            child.wait()
+        except Exception:
+            pass
 
 def run_process(
     *args,
@@ -223,3 +233,17 @@ def poll_process(
         watchdog_thread.cancel()
 
     return proc.poll()
+
+
+def _stop_process(
+    proc: subprocess.Popen,
+    timeout_seconds: int = 8,
+):
+    """
+    Stop a `subproccess.Popen` object.
+    """
+    proc.terminate()
+    try:
+        proc.wait(timeout=timeout_seconds)
+    except subprocess.TimeoutExpired:
+        proc.kill()

{meerschaum-2.8.2 → meerschaum-2.8.4}/meerschaum/utils/schedule.py

@@ -95,7 +95,7 @@ def schedule_function(
     A `SuccessTuple` upon exit.
     """
     import asyncio
-    from meerschaum.utils.misc import filter_keywords, round_time
+    from meerschaum.utils.misc import filter_keywords
 
     global _scheduler
     kw['debug'] = debug
@@ -103,7 +103,7 @@ def schedule_function(
 
     _ = mrsm.attempt_import('attrs', lazy=False)
     apscheduler = mrsm.attempt_import('apscheduler', lazy=False)
-    now = round_time(datetime.now(timezone.utc), timedelta(minutes=1))
+    now = datetime.now(timezone.utc)
     trigger = parse_schedule(schedule, now=now)
     _scheduler = apscheduler.AsyncScheduler(identity='mrsm-scheduler')
     try:
@@ -296,7 +296,7 @@ def parse_start_time(schedule: str, now: Optional[datetime] = None) -> datetime:
     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))
+    now = now or datetime.now(timezone.utc)
     try:
         if starting_str == 'now':
             starting_ts = now

{meerschaum-2.8.2 → meerschaum-2.8.4}/meerschaum/utils/sql.py

@@ -1548,7 +1548,7 @@ def get_update_queries(
     from meerschaum.utils.debug import dprint
     from meerschaum.utils.dtypes import are_dtypes_equal
     from meerschaum.utils.dtypes.sql import DB_FLAVORS_CAST_DTYPES, get_pd_type_from_db_type
-    flavor = flavor or (connectable.flavor if isinstance(connectable, SQLConnector) else None)
+    flavor = flavor or getattr(connectable, 'flavor', None)
     if not flavor:
         raise ValueError("Provide a flavor if using a SQLAlchemy session.")
     if (