meerschaum 2.3.3__py3-none-any.whl → 2.3.5__py3-none-any.whl

meerschaum/_internal/arguments/__init__.py

@@ -9,11 +9,8 @@ This package includes argument parsing utilities.
 from meerschaum._internal.arguments._parse_arguments import (
     parse_arguments, parse_line, remove_leading_action,
     parse_dict_to_sysargs, split_chained_sysargs, split_pipeline_sysargs,
+    sysargs_has_api_executor_keys, get_pipeline_sysargs,
+    compress_pipeline_sysargs, remove_api_executor_keys,
 )
 from meerschaum._internal.arguments._parser import parser
 from meerschaum.plugins import add_plugin_argument
-
-__all__ = [
-    'parser', 'parse_arguments', 'parse_line', 'add_plugin_argument', 'parse_dict_to_sysargs',
-    'remove_leading_action',
-]

meerschaum/_internal/arguments/_parse_arguments.py

@@ -283,18 +283,29 @@ def parse_dict_to_sysargs(
             ### Add list flags
             if isinstance(args_dict[a], (list, tuple)):
                 if len(args_dict[a]) > 0:
-                    sysargs.extend(
-                        [t[0]]
-                        + [
-                            str(item)
-                            for item in args_dict[a]
-                        ]
-                    )
+                    if a == 'sub_args' and args_dict[a] != ['']:
+                        print(f"{args_dict[a]=}")
+                        sysargs.extend(
+                            [
+                                '-A',
+                                shlex.join([
+                                    str(item) for item in args_dict[a]
+                                ]),
+                            ]
+                        )
+                    else:
+                        sysargs.extend(
+                            [t[0]]
+                            + [
+                                str(item)
+                                for item in args_dict[a]
+                            ]
+                        )
 
             ### Add dict flags
             elif isinstance(args_dict[a], dict):
                 if len(args_dict[a]) > 0:
-                    sysargs += [t[0], json.dumps(args_dict[a])]
+                    sysargs += [t[0], json.dumps(args_dict[a], separators=(',', ':'))]
 
             ### Account for None and other values
             elif (args_dict[a] is not None) or (args_dict[a] is None and a in allow_none_args):
@@ -403,4 +414,101 @@ def load_plugin_args() -> None:
             to_import.append(plugin.name)
     if not to_import:
         return
-    import_plugins(*to_import) 
+    import_plugins(*to_import)
+
+
+def sysargs_has_api_executor_keys(sysargs: List[str]) -> bool:
+    """
+    Check whether a `sysargs` list contains an `api` executor.
+    """
+    if '-e' not in sysargs and '--executor-keys' not in sysargs:
+        return False
+
+    for i, arg in enumerate(sysargs):
+        if arg not in ('-e', '--executor-keys'):
+            continue
+
+        executor_keys_ix = i + 1
+        if len(sysargs) <= executor_keys_ix:
+            return False
+
+        executor_keys = sysargs[executor_keys_ix]
+        if executor_keys.startswith('api:'):
+            return True
+
+    return False
+
+
+def remove_api_executor_keys(sysargs: List[str]) -> List[str]:
+    """
+    Remove any api executor keys from `sysargs`.
+    """
+    from meerschaum.utils.misc import flatten_list
+
+    if not sysargs_has_api_executor_keys(sysargs):
+        return sysargs
+
+    skip_indices = set(flatten_list(
+        [
+            [i, i+1]
+            for i, arg in enumerate(sysargs)
+            if arg in ('-e', '--executor-keys')
+        ]
+    ))
+
+    return [
+        arg
+        for i, arg in enumerate(sysargs)
+        if i not in skip_indices
+    ]
+
+
+def get_pipeline_sysargs(
+    sysargs: List[str],
+    pipeline_args: List[str],
+    _patch_args: Optional[Dict[str, Any]] = None,
+) -> List[str]:
+    """
+    Parse `sysargs` and `pipeline_args` into a single `start pipeline` sysargs.
+    """
+    import shlex
+    start_pipeline_params = {
+        'sub_args_line': shlex.join(sysargs),
+        'patch_args': _patch_args,
+    }
+    return (
+        ['start', 'pipeline']
+        + [str(arg) for arg in pipeline_args]
+        + ['-P', json.dumps(start_pipeline_params, separators=(',', ':'))]
+    )
+
+
+def compress_pipeline_sysargs(pipeline_sysargs: List[str]) -> List[str]:
+    """
+    Given a `start pipeline` sysargs, return a condensed syntax rendition.
+    """
+    import shlex
+
+    if pipeline_sysargs[:2] != ['start', 'pipeline']:
+        return pipeline_sysargs
+
+    if '-P' not in pipeline_sysargs:
+        return pipeline_sysargs
+
+    params_ix = pipeline_sysargs.index('-P')
+    pipeline_args = pipeline_sysargs[2:params_ix]
+    params_str = pipeline_sysargs[-1]
+    try:
+        start_pipeline_params = json.loads(params_str)
+    except Exception:
+        return pipeline_sysargs
+
+    sub_args_line = start_pipeline_params.get('sub_args_line', None)
+    if not sub_args_line:
+        return pipeline_sysargs
+
+    return (
+        shlex.split(sub_args_line)
+        + [':']
+        + pipeline_args
+    )

meerschaum/_internal/docs/index.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 # vim:fenc=utf-8
 
-"""
+r"""
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <style>
 

meerschaum/_internal/entry.py

@@ -11,6 +11,8 @@ from __future__ import annotations
 
 import os
 import sys
+import pathlib
+
 from meerschaum.utils.typing import SuccessTuple, List, Optional, Dict, Callable, Any
 from meerschaum.config.static import STATIC_CONFIG as _STATIC_CONFIG
 
@@ -19,8 +21,17 @@ if (_STATIC_CONFIG['environment']['systemd_log_path']) in os.environ:
     from meerschaum.utils.daemon import RotatingFile as _RotatingFile, StdinFile as _StdinFile
     from meerschaum.config import get_config as _get_config
 
-    _systemd_result_path = os.environ[_STATIC_CONFIG['environment']['systemd_result_path']]
-    _systemd_log_path = os.environ[_STATIC_CONFIG['environment']['systemd_log_path']]
+    _systemd_result_path = pathlib.Path(
+        os.environ[_STATIC_CONFIG['environment']['systemd_result_path']]
+    )
+    _systemd_log_path = pathlib.Path(
+        os.environ[_STATIC_CONFIG['environment']['systemd_log_path']]
+    )
+    _systemd_delete_job = (
+        (os.environ.get(_STATIC_CONFIG['environment']['systemd_delete_job'], None) or '0')
+        not in (None, '0', 'false')
+    )
+    _job_name = os.environ[_STATIC_CONFIG['environment']['daemon_id']]
     _systemd_log = _RotatingFile(
         _systemd_log_path,
         write_timestamps=True,
@@ -50,6 +61,8 @@ def entry(
         parse_arguments,
         split_chained_sysargs,
         split_pipeline_sysargs,
+        sysargs_has_api_executor_keys,
+        get_pipeline_sysargs,
     )
     from meerschaum.config.static import STATIC_CONFIG
     if sysargs is None:
@@ -63,22 +76,15 @@ def entry(
 
     has_daemon = '-d' in sysargs or '--daemon' in sysargs
     has_start_job = sysargs[:2] == ['start', 'job']
+    pipeline_has_api_executor_keys = sysargs_has_api_executor_keys(pipeline_args)
+
     chained_sysargs = (
         [sysargs]
-        if has_daemon or has_start_job
+        if has_daemon or has_start_job or pipeline_has_api_executor_keys
         else split_chained_sysargs(sysargs)
     )
     if pipeline_args:
-        chained_sysargs = [
-            ['start', 'pipeline']
-            + [str(arg) for arg in pipeline_args]
-            + (
-                ['--params', json.dumps(_patch_args)]
-                if _patch_args
-                else []
-            )
-            + ['--sub-args', shlex.join(sysargs)]
-        ]
+        chained_sysargs = [get_pipeline_sysargs(sysargs, pipeline_args, _patch_args=_patch_args)]
 
     results: List[SuccessTuple] = []
 
@@ -127,7 +133,12 @@ def entry(
             (
                 'Successfully c'
                 if success
-                else 'C'
+                else (
+                    'Failed pipeline after '
+                    + f"{len(success_messages)} step"
+                    + ('s' if len(success_messages) != 1 else '')
+                    + '.\n\nC'
+                )
             ) + 'ompleted step'
                 + ('s' if len(success_messages) != 1 else '') 
             + ':\n\n'
@@ -158,12 +169,24 @@ def entry(
         successes_msg
         + ('\n\n' if any_success else '')
         + fails_msg
-    ).rstrip()
+    ).rstrip() if len(chained_sysargs) > 1 else results[0][1]
 
     if _systemd_result_path:
         import json
-        with open(_systemd_result_path, 'w+', encoding='utf-8') as f:
-            json.dump((success, msg), f)
+        from meerschaum.utils.warnings import warn
+        import meerschaum as mrsm
+
+        job = mrsm.Job(_job_name, executor_keys='systemd')
+        if job.delete_after_completion:
+            delete_success, delete_msg = job.delete()
+            mrsm.pprint((delete_success, delete_msg))
+        else:
+            try:
+                if _systemd_result_path.parent.exists():
+                    with open(_systemd_result_path, 'w+', encoding='utf-8') as f:
+                        json.dump((success, msg), f)
+            except Exception as e:
+                warn(f"Failed to write job result:\n{e}")
 
     return success, msg
 

meerschaum/actions/api.py

@@ -89,22 +89,22 @@ def api(
     return success, message
 
 def _api_start(
-        action: Optional[List[str]] = None,
-        host: Optional[str] = None,
-        port: Optional[int] = None,
-        workers: Optional[int] = None,
-        mrsm_instance: Optional[str] = None,
-        no_dash: bool = False,
-        no_auth: bool = False,
-        private: bool = False,
-        secure: bool = False,
-        debug: bool = False,
-        nopretty: bool = False,
-        production: bool = False,
-        keyfile: Optional[str] = None,
-        certfile: Optional[str] = None,
-        **kw: Any
-    ) -> SuccessTuple:
+    action: Optional[List[str]] = None,
+    host: Optional[str] = None,
+    port: Optional[int] = None,
+    workers: Optional[int] = None,
+    mrsm_instance: Optional[str] = None,
+    no_dash: bool = False,
+    no_auth: bool = False,
+    private: bool = False,
+    secure: bool = False,
+    debug: bool = False,
+    nopretty: bool = False,
+    production: bool = False,
+    keyfile: Optional[str] = None,
+    certfile: Optional[str] = None,
+    **kw: Any
+) -> SuccessTuple:
     """Start the API server.
    
     Parameters

meerschaum/actions/python.py

@@ -14,6 +14,7 @@ def python(
     nopretty: bool = False,
     noask: bool = False,
     venv: Optional[str] = None,
+    executor_keys: Optional[str] = None,
     debug: bool = False,
     **kw: Any
 ) -> SuccessTuple:
@@ -53,6 +54,9 @@ def python(
     from meerschaum.utils.packages import run_python_package, attempt_import
     from meerschaum.utils.process import run_process
 
+    if executor_keys and executor_keys.startswith('api:'):
+        warn("Cannot open a Python REPL remotely, falling back to local...", stack=False)
+
     if action is None:
         action = []
 

meerschaum/actions/start.py

@@ -7,7 +7,7 @@ Start subsystems (API server, logging daemon, etc.).
 """
 
 from __future__ import annotations
-from meerschaum.utils.typing import SuccessTuple, Optional, List, Any, Union
+from meerschaum.utils.typing import SuccessTuple, Optional, List, Any, Union, Dict
 
 def start(
     action: Optional[List[str]] = None,
@@ -89,6 +89,7 @@ def _start_jobs(
     name: Optional[str] = None,
     sysargs: Optional[List[str]] = None,
     executor_keys: Optional[str] = None,
+    rm: bool = False,
     debug: bool = False,
     **kw
 ) -> SuccessTuple:
@@ -210,7 +211,7 @@ def _start_jobs(
 
     def _run_new_job(name: Optional[str] = None):
         name = name or get_new_daemon_name()
-        job = Job(name, sysargs, executor_keys=executor_keys)
+        job = Job(name, sysargs, executor_keys=executor_keys, delete_after_completion=rm)
         return job.start(debug=debug), name
 
     def _run_existing_job(name: str):
@@ -539,7 +540,6 @@ def _complete_start_connectors(**kw) -> List[str]:
 
 def _start_pipeline(
     action: Optional[List[str]] = None,
-    sub_args: Optional[List[str]] = None,
     loop: bool = False,
     min_seconds: Union[float, int, None] = 1.0,
     params: Optional[Dict[str, Any]] = None,
@@ -569,7 +569,11 @@ def _start_pipeline(
         else 1
     )
 
-    if not sub_args:
+    params = params or {}
+    sub_args_line = params.get('sub_args_line', None)
+    patch_args = params.get('patch_args', None)
+
+    if not sub_args_line:
         return False, "Nothing to do."
 
     if min_seconds is None:
@@ -580,7 +584,7 @@ def _start_pipeline(
     def run_loop():
         nonlocal ran_n_times, success, msg
         while True:
-            success, msg = entry(sub_args, _patch_args=params)
+            success, msg = entry(sub_args_line, _patch_args=patch_args)
             ran_n_times += 1
 
             if not loop and do_n_times == 1:

meerschaum/api/_events.py

@@ -20,12 +20,14 @@ from meerschaum.connectors.poll import retry_connect
 from meerschaum.utils.warnings import warn
 from meerschaum._internal.term.tools import is_webterm_running
 from meerschaum.jobs import (
+    get_jobs,
     start_check_jobs_thread,
     stop_check_jobs_thread,
     get_executor_keys_from_context,
 )
+from meerschaum.config.static import STATIC_CONFIG
 
-_check_jobs_thread = None
+TEMP_PREFIX: str = STATIC_CONFIG['api']['jobs']['temp_prefix']
 
 @app.on_event("startup")
 async def startup():
@@ -51,8 +53,7 @@ async def startup():
         await shutdown()
         os._exit(1)
 
-    if get_executor_keys_from_context() == 'local':
-        start_check_jobs_thread()
+    start_check_jobs_thread()
 
 
 @app.on_event("shutdown")
@@ -65,11 +66,14 @@ async def shutdown():
     if get_api_connector().type == 'sql':
         get_api_connector().engine.dispose()
 
-    if get_executor_keys_from_context() == 'local':
-        stop_check_jobs_thread()
+    stop_check_jobs_thread()
 
-    from meerschaum.api.routes._actions import _temp_jobs
-    for name, job in _temp_jobs.items():
+    temp_jobs = {
+        name: job
+        for name, job in get_jobs(include_hidden=True).items()
+        if name.startswith(TEMP_PREFIX)
+    }
+    for job in temp_jobs.values():
         job.delete()
 
     ### Terminate any running jobs left over.

meerschaum/api/routes/_actions.py

@@ -14,6 +14,7 @@ from functools import partial
 from datetime import datetime, timezone
 
 from fastapi import WebSocket, WebSocketDisconnect
+from websockets.exceptions import ConnectionClosedError
 
 from meerschaum.utils.misc import generate_password
 from meerschaum.jobs import Job
@@ -27,6 +28,7 @@ import meerschaum.core
 from meerschaum.config import get_config
 from meerschaum._internal.arguments._parse_arguments import parse_dict_to_sysargs, parse_arguments
 from meerschaum.api.routes._jobs import clean_sysargs
+from meerschaum.jobs._Job import StopMonitoringLogs
 
 actions_endpoint = endpoints['actions']
 
@@ -65,96 +67,6 @@ def get_actions(
     return list(actions)
 
 
-async def notify_client(client, content: str):
-    """
-    Send a line of text to a client.
-    """
-    try:
-        await client.send_text(content)
-    except WebSocketDisconnect:
-        pass
-
-_temp_jobs = {}
-@app.websocket(actions_endpoint + '/ws')
-async def do_action_websocket(websocket: WebSocket):
-    """
-    Execute an action and stream the output to the client.
-    """
-    await websocket.accept()
-
-    stop_event = asyncio.Event()
-
-    async def monitor_logs(job):
-        success, msg = job.start()
-        await job.monitor_logs_async(
-            partial(notify_client, websocket),
-            stop_event=stop_event,
-            stop_on_exit=True,
-        )
-
-    job = None
-    job_name = '.' + generate_password(12)
-    try:
-        token = await websocket.receive_text()
-        user = await manager.get_current_user(token) if not no_auth else None
-        if user is None and not no_auth:
-            raise fastapi.HTTPException(
-                status_code=401,
-                detail="Invalid credentials.",
-            )
-
-        auth_success, auth_msg = (
-            is_user_allowed_to_execute(user)
-            if not no_auth
-            else (True, "Success")
-        )
-        auth_payload = {
-            'is_authenticated': auth_success,
-            'timestamp': datetime.now(timezone.utc).isoformat(),
-        }
-        await websocket.send_json(auth_payload)
-        if not auth_success:
-            await websocket.close()
-
-        sysargs = clean_sysargs(await websocket.receive_json())
-        #  kwargs = parse_arguments(sysargs)
-        #  _ = kwargs.pop('executor_keys', None)
-        #  _ = kwargs.pop('shell', None)
-        #  sysargs = parse_dict_to_sysargs(kwargs)
-
-        job = Job(
-            job_name,
-            sysargs,
-            executor_keys='local',
-            _properties={
-                'logs': {
-                    'write_timestamps': False,
-                },
-            },
-        )
-        _temp_jobs[job_name] = job
-        monitor_task = asyncio.create_task(monitor_logs(job))
-        await monitor_task
-        try:
-            await websocket.close()
-        except RuntimeError:
-            pass
-    except fastapi.HTTPException:
-        await websocket.send_text("Invalid credentials.")
-        await websocket.close()
-    except WebSocketDisconnect:
-        pass
-    except asyncio.CancelledError:
-        pass
-    except Exception:
-        warn(f"Error in logs websocket:\n{traceback.format_exc()}")
-    finally:
-        if job is not None:
-            job.delete()
-        _ = _temp_jobs.pop(job_name, None)
-        stop_event.set()
-
-
 @app.post(actions_endpoint + "/{action}", tags=['Actions'])
 def do_action_legacy(
     action: str,

meerschaum/api/routes/_jobs.py

@@ -40,7 +40,15 @@ from meerschaum.config.static import STATIC_CONFIG
 
 JOBS_STDIN_MESSAGE: str = STATIC_CONFIG['api']['jobs']['stdin_message']
 JOBS_STOP_MESSAGE: str = STATIC_CONFIG['api']['jobs']['stop_message']
-EXECUTOR_KEYS: str = get_executor_keys_from_context()
+EXECUTOR_KEYS: str = 'local'
+
+
+def _get_job(name: str):
+    systemd_job = Job(name, executor_keys='systemd')
+    if systemd_job.exists():
+        return systemd_job
+
+    return Job(name, executor_keys=EXECUTOR_KEYS)
 
 
 @app.get(endpoints['jobs'], tags=['Jobs'])
@@ -52,7 +60,7 @@ def get_jobs(
     """
     Return metadata about the current jobs.
     """
-    jobs = _get_jobs(executor_keys=EXECUTOR_KEYS, combine_local_and_systemd=False)
+    jobs = _get_jobs(executor_keys=EXECUTOR_KEYS, combine_local_and_systemd=True)
     return {
         name: {
             'sysargs': job.sysargs,
@@ -83,7 +91,7 @@ def get_job(
     """
     Return metadata for a single job.
     """
-    job = Job(name, executor_keys=EXECUTOR_KEYS)
+    job = _get_job(name)
     if not job.exists():
         raise fastapi.HTTPException(
             status_code=404,
@@ -114,7 +122,7 @@ def clean_sysargs(sysargs: List[str]) -> List[str]:
     clean_sysargs = []
     executor_flag = False
     for arg in sysargs:
-        if arg in ('-e', '--executor', 'api'):
+        if arg in ('-e', '--executor-keys', 'api'):
             executor_flag = True
             continue
         if executor_flag:
@@ -163,7 +171,7 @@ def delete_job(
     """
     Delete a job.
     """
-    job = Job(name, executor_keys=EXECUTOR_KEYS)
+    job = _get_job(name)
     return job.delete()
 
 
@@ -177,7 +185,7 @@ def get_job_exists(
     """
     Return whether a job exists.
     """
-    job = Job(name, executor_keys=EXECUTOR_KEYS)
+    job = _get_job(name)
     return job.exists()
 
 
@@ -192,7 +200,7 @@ def get_logs(
     Return a job's log text.
     To stream log text, connect to the WebSocket endpoint `/logs/{name}/ws`.
     """
-    job = Job(name, executor_keys=EXECUTOR_KEYS)
+    job = _get_job(name)
     if not job.exists():
         raise fastapi.HTTPException(
             status_code=404,
@@ -212,7 +220,7 @@ def start_job(
     """
     Start a job if stopped.
     """
-    job = Job(name, executor_keys=EXECUTOR_KEYS)
+    job = _get_job(name)
     if not job.exists():
         raise fastapi.HTTPException(
             status_code=404,
@@ -231,7 +239,7 @@ def stop_job(
     """
     Stop a job if running.
     """
-    job = Job(name, executor_keys=EXECUTOR_KEYS)
+    job = _get_job(name)
     if not job.exists():
         raise fastapi.HTTPException(
             status_code=404,
@@ -250,7 +258,7 @@ def pause_job(
     """
     Pause a job if running.
     """
-    job = Job(name, executor_keys=EXECUTOR_KEYS)
+    job = _get_job(name)
     if not job.exists():
         raise fastapi.HTTPException(
             status_code=404,
@@ -269,7 +277,7 @@ def get_stop_time(
     """
     Get the timestamp when the job was manually stopped.
     """
-    job = Job(name, executor_keys=EXECUTOR_KEYS)
+    job = _get_job(name)
     return job.stop_time
 
 
@@ -283,12 +291,13 @@ def get_is_blocking_on_stdin(
     """
     Return whether a job is blocking on stdin.
     """
-    job = Job(name, executor_keys=EXECUTOR_KEYS)
+    job = _get_job(name)
     return job.is_blocking_on_stdin()
 
 
 _job_clients = defaultdict(lambda: [])
 _job_stop_events = defaultdict(lambda: asyncio.Event())
+_job_queues = defaultdict(lambda: asyncio.Queue())
 async def notify_clients(name: str, websocket: WebSocket, content: str):
     """
     Write the given content to all connected clients.
@@ -315,12 +324,16 @@ async def get_input_from_clients(name: str, websocket: WebSocket) -> str:
     async def _read_client(client):
         try:
             await client.send_text(JOBS_STDIN_MESSAGE)
-            data = await client.receive_text()
+            data = await _job_queues[name].get()
         except WebSocketDisconnect:
             if client in _job_clients[name]:
                 _job_clients[name].remove(client)
+            if not _job_clients[name]:
+                _job_stop_events[name].set()
         except Exception:
             pass
+        finally:
+            _job_queues[name].task_done()
         return data
 
     read_tasks = [
@@ -357,10 +370,12 @@ async def logs_websocket(name: str, websocket: WebSocket):
     Stream logs from a job over a websocket.
     """
     await websocket.accept()
-    job = Job(name, executor_keys=EXECUTOR_KEYS)
+    job = _get_job(name)
     _job_clients[name].append(websocket)
 
+    _task = None
     async def monitor_logs():
+        nonlocal _task
         try:
             callback_function = partial(
                 notify_clients,
@@ -377,16 +392,17 @@ async def logs_websocket(name: str, websocket: WebSocket):
                 name,
                 websocket,
             )
-            await job.monitor_logs_async(
+            _task = asyncio.create_task(job.monitor_logs_async(
                 callback_function=callback_function,
                 input_callback_function=input_callback_function,
                 stop_callback_function=stop_callback_function,
                 stop_event=_job_stop_events[name],
                 stop_on_exit=True,
                 accept_input=True,
-            )
+            ))
         except Exception:
             warn(traceback.format_exc())
+            _task.cancel()
 
     try:
         token = await websocket.receive_text()
@@ -397,13 +413,17 @@ async def logs_websocket(name: str, websocket: WebSocket):
                 detail="Invalid credentials.",
             )
         monitor_task = asyncio.create_task(monitor_logs())
-        await monitor_task
+        while True:
+            text = await websocket.receive_text()
+            await _job_queues[name].put(text)
+
     except fastapi.HTTPException:
         await websocket.send_text("Invalid credentials.")
         await websocket.close()
     except WebSocketDisconnect:
-        _job_stop_events[name].set()
-        monitor_task.cancel()
+        if not _job_clients[name]:
+            _job_stop_events[name].set()
+            monitor_task.cancel()
     except asyncio.CancelledError:
         pass
     except Exception:

meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "2.3.3"
+__version__ = "2.3.5"

meerschaum/config/static/__init__.py

@@ -46,6 +46,7 @@ STATIC_CONFIG: Dict[str, Any] = {
             'stdin_message': 'MRSM_STDIN',
             'stop_message': 'MRSM_STOP',
             'metadata_cache_seconds': 5,
+            'temp_prefix': '.api-temp-',
         },
     },
     'sql': {
@@ -73,6 +74,7 @@ STATIC_CONFIG: Dict[str, Any] = {
         'systemd_log_path': 'MRSM_SYSTEMD_LOG_PATH',
         'systemd_stdin_path': 'MRSM_SYSTEMD_STDIN_PATH',
         'systemd_result_path': 'MRSM_SYSTEMD_RESULT_PATH',
+        'systemd_delete_job': 'MRSM_SYSTEMD_DELETE_JOB',
         'uri_regex': r'MRSM_([a-zA-Z0-9]*)_(\d*[a-zA-Z][a-zA-Z0-9-_+]*$)',
         'prefix': 'MRSM_',
     },

meerschaum/connectors/api/_actions.py

@@ -17,6 +17,7 @@ from meerschaum.utils.typing import SuccessTuple, List, Callable, Optional
 from meerschaum.config.static import STATIC_CONFIG
 
 ACTIONS_ENDPOINT: str = STATIC_CONFIG['api']['endpoints']['actions']
+TEMP_PREFIX: str = STATIC_CONFIG['api']['jobs']['temp_prefix']
 
 
 def get_actions(self):
@@ -37,43 +38,28 @@ async def do_action_async(
     callback_function: Callable[[str], None] = partial(print, end=''),
 ) -> SuccessTuple:
     """
-    Monitor a job's log files and await a callback with the changes.
+    Execute an action as a temporary remote job.
     """
-    websockets, websockets_exceptions = mrsm.attempt_import('websockets', 'websockets.exceptions')
-    protocol = 'ws' if self.URI.startswith('http://') else 'wss'
-    port = self.port if 'port' in self.__dict__ else ''
-    uri = f"{protocol}://{self.host}:{port}{ACTIONS_ENDPOINT}/ws"
-    if sysargs and sysargs[0] == 'api' and len(sysargs) > 2:
-        sysargs = sysargs[2:]
-
-    sysargs_str = json.dumps(sysargs)
-
-    async with websockets.connect(uri) as websocket:
-        try:
-            await websocket.send(self.token or 'no-login')
-            response = await websocket.recv()
-            init_data = json.loads(response)
-            if not init_data.get('is_authenticated'):
-                return False, "Cannot authenticate with actions endpoint."
-
-            await websocket.send(sysargs_str)
-        except websockets_exceptions.ConnectionClosedOK:
-            return False, "Connection was closed."
-
-        while True:
-            try:
-                line = await websocket.recv()
-                if asyncio.iscoroutinefunction(callback_function):
-                    await callback_function(line)
-                else:
-                    callback_function(line)
-            except KeyboardInterrupt:
-                await websocket.close()
-                break
-            except websockets_exceptions.ConnectionClosedOK:
-                break
-
-    return True, "Success"
+    from meerschaum._internal.arguments import remove_api_executor_keys
+    from meerschaum.utils.misc import generate_password
+    sysargs = remove_api_executor_keys(sysargs)
+
+    job_name = TEMP_PREFIX + generate_password(12)
+    job = mrsm.Job(job_name, sysargs, executor_keys=str(self))
+
+    start_success, start_msg = job.start()
+    if not start_success:
+        return start_success, start_msg
+
+    await job.monitor_logs_async(
+        callback_function=callback_function,
+        stop_on_exit=True,
+        strip_timestamps=True,
+    )
+
+    success, msg = job.result
+    job.delete()
+    return success, msg
 
 
 def do_action_legacy(

meerschaum/connectors/api/_jobs.py

@@ -277,6 +277,7 @@ async def monitor_logs_async(
     """
     Monitor a job's log files and await a callback with the changes.
     """
+    import traceback
     from meerschaum.jobs import StopMonitoringLogs
     from meerschaum.utils.formatting._jobs import strip_timestamp_from_line
 

meerschaum/jobs/_Job.py

@@ -60,9 +60,10 @@ class Job:
         sysargs: Union[List[str], str, None] = None,
         env: Optional[Dict[str, str]] = None,
         executor_keys: Optional[str] = None,
+        delete_after_completion: bool = False,
         _properties: Optional[Dict[str, Any]] = None,
-        _rotating_log = None,
-        _stdin_file = None,
+        _rotating_log=None,
+        _stdin_file=None,
         _status_hook: Optional[Callable[[], str]] = None,
         _result_hook: Optional[Callable[[], SuccessTuple]] = None,
         _externally_managed: bool = False,
@@ -85,6 +86,9 @@ class Job:
         executor_keys: Optional[str], default None
             If provided, execute the job remotely on an API instance, e.g. 'api:main'.
 
+        delete_after_completion: bool, default False
+            If `True`, delete this job when it has finished executing.
+
         _properties: Optional[Dict[str, Any]], default None
             If provided, use this to patch the daemon's properties.
         """
@@ -146,6 +150,9 @@ class Job:
         if env:
             self._properties_patch.update({'env': env})
 
+        if delete_after_completion:
+            self._properties_patch.update({'delete_after_completion': delete_after_completion})
+
         daemon_sysargs = (
             self._daemon.properties.get('target', {}).get('args', [None])[0]
             if self._daemon is not None
@@ -245,7 +252,7 @@ class Job:
             return True, f"{self} is already running."
 
         success, msg = self.daemon.run(
-            keep_daemon_output=True,
+            keep_daemon_output=(not self.delete_after_completion),
             allow_dirty_run=True,
         )
         if not success:
@@ -407,7 +414,6 @@ class Job:
         )
         return asyncio.run(monitor_logs_coroutine)
 
-
     async def monitor_logs_async(
         self,
         callback_function: Callable[[str], None] = partial(print, end='', flush=True),
@@ -418,8 +424,8 @@ class Job:
         strip_timestamps: bool = False,
         accept_input: bool = True,
         _logs_path: Optional[pathlib.Path] = None,
-        _log = None,
-        _stdin_file = None,
+        _log=None,
+        _stdin_file=None,
         debug: bool = False,
     ):
         """
@@ -466,6 +472,7 @@ class Job:
                 input_callback_function=input_callback_function,
                 stop_callback_function=stop_callback_function,
                 stop_on_exit=stop_on_exit,
+                strip_timestamps=strip_timestamps,
                 accept_input=accept_input,
                 debug=debug,
             )
@@ -494,13 +501,15 @@ class Job:
                         await asyncio.sleep(sleep_time)
                         sleep_time = round(sleep_time * 1.1, 2)
                         continue
-                    
+
                     if stop_callback_function is not None:
                         try:
                             if asyncio.iscoroutinefunction(stop_callback_function):
                                 await stop_callback_function(self.result)
                             else:
                                 stop_callback_function(self.result)
+                        except asyncio.exceptions.CancelledError:
+                            break
                         except Exception:
                             warn(traceback.format_exc())
 
@@ -596,6 +605,8 @@ class Job:
         )
         try:
             _ = asyncio.gather(*tasks, return_exceptions=True)
+        except asyncio.exceptions.CancelledError:
+            raise
         except Exception:
             warn(f"Failed to run async checks:\n{traceback.format_exc()}")
 
@@ -865,7 +876,9 @@ class Job:
         """
         Return the job's Daemon label (joined sysargs).
         """
-        return shlex.join(self.sysargs).replace(' + ', '\n+ ')
+        from meerschaum._internal.arguments import compress_pipeline_sysargs
+        sysargs = compress_pipeline_sysargs(self.sysargs)
+        return shlex.join(sysargs).replace(' + ', '\n+ ')
 
     @property
     def _externally_managed_file(self) -> pathlib.Path:
@@ -911,6 +924,16 @@ class Job:
         self._env = {**default_env, **_env}
         return self._env
 
+    @property
+    def delete_after_completion(self) -> bool:
+        """
+        Return whether this job is configured to delete itself after completion.
+        """
+        if '_delete_after_completion' in self.__dict__:
+            return self.__dict__.get('_delete_after_completion', False)
+
+        self._delete_after_completion = self.daemon.properties.get('delete_after_completion', False)
+        return self._delete_after_completion
 
     def __str__(self) -> str:
         sysargs = self.sysargs

meerschaum/jobs/systemd.py

@@ -42,7 +42,12 @@ class SystemdExecutor(Executor):
         return [
             service_name[len('mrsm-'):(-1 * len('.service'))]
             for service_name in os.listdir(SYSTEMD_USER_RESOURCES_PATH)
-            if service_name.startswith('mrsm-') and service_name.endswith('.service')
+            if (
+                service_name.startswith('mrsm-')
+                and service_name.endswith('.service')
+                ### Check for broken symlinks.
+                and (SYSTEMD_USER_RESOURCES_PATH / service_name).exists()
+            )
         ]
 
     def get_job_exists(self, name: str, debug: bool = False) -> bool:
@@ -146,13 +151,18 @@ class SystemdExecutor(Executor):
             STATIC_CONFIG['environment']['systemd_log_path']: service_logs_path.as_posix(),
             STATIC_CONFIG['environment']['systemd_result_path']: result_path.as_posix(),
             STATIC_CONFIG['environment']['systemd_stdin_path']: socket_path.as_posix(),
+            STATIC_CONFIG['environment']['systemd_delete_job']: (
+                '1'
+                if job.delete_after_completion
+                else '0',
+            ),
         })
 
         ### Allow for user-defined environment variables.
         mrsm_env_vars.update(job.env)
 
         environment_lines = [
-            f"Environment={key}={val}"
+            f"Environment={key}={shlex.quote(str(val))}"
             for key, val in mrsm_env_vars.items()
         ]
         environment_str = '\n'.join(environment_lines)
@@ -603,7 +613,8 @@ class SystemdExecutor(Executor):
 
         check_timeout_interval = get_config('jobs', 'check_timeout_interval_seconds')
         loop_start = time.perf_counter()
-        while (time.perf_counter() - loop_start) < get_config('jobs', 'timeout_seconds'):
+        timeout_seconds = get_config('jobs', 'timeout_seconds')
+        while (time.perf_counter() - loop_start) < timeout_seconds:
             if self.get_job_status(name, debug=debug) == 'stopped':
                 return True, 'Success'
 
@@ -630,12 +641,14 @@ class SystemdExecutor(Executor):
         Delete a job's service.
         """
         from meerschaum.config.paths import SYSTEMD_LOGS_RESOURCES_PATH
+        job = self.get_hidden_job(name, debug=debug)
 
-        _ = self.stop_job(name, debug=debug)
-        _ = self.run_command(
-            ['disable', self.get_service_name(name, debug=debug)],
-            debug=debug,
-        )
+        if not job.delete_after_completion:
+            _ = self.stop_job(name, debug=debug)
+            _ = self.run_command(
+                ['disable', self.get_service_name(name, debug=debug)],
+                debug=debug,
+            )
 
         service_job_path = self.get_service_job_path(name, debug=debug)
         try:
@@ -666,7 +679,6 @@ class SystemdExecutor(Executor):
                     warn(e)
                     return False, str(e)
 
-        job = self.get_hidden_job(name, debug=debug)
         _ = job.delete()
 
         return self.run_command(['daemon-reload'], debug=debug)

meerschaum/utils/prompt.py

@@ -113,7 +113,7 @@ def prompt(
             ) if not noask else ''
         )
     else:
-        print(question, end='', flush=True)
+        print(question, end='\n', flush=True)
         try:
             answer = input()
         except EOFError:

{meerschaum-2.3.3.dist-info → meerschaum-2.3.5.dist-info}/METADATA

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

{meerschaum-2.3.3.dist-info → meerschaum-2.3.5.dist-info}/RECORD

@@ -1,12 +1,12 @@
 meerschaum/__init__.py,sha256=6bn5zz7VInDP4fE_FGBMzJYrM6rQhBMJNQqsf1pU7eI,1701
 meerschaum/__main__.py,sha256=r5UjYxH1WA6dGG9YGBPul5xOdgF3Iwl0X4dWDtXU-30,2646
 meerschaum/_internal/__init__.py,sha256=ilC7utfKtin7GAvuN34fKyUQYfPyqH0Mm3MJF5iyEf4,169
-meerschaum/_internal/entry.py,sha256=kjRuc8xMOrhhEwIIcHgWfHZ_nhpP6lIdTzb_FjVWeas,10992
-meerschaum/_internal/arguments/__init__.py,sha256=CbNgnlH6fqNI5n7EuQC6m3Do6ckXDqw4Vuc4T_qPJGQ,566
-meerschaum/_internal/arguments/_parse_arguments.py,sha256=6Tf9xTXZA-wH51Ep_iuG5JFLzD2rYevuA8n69FTi6Mk,12984
+meerschaum/_internal/entry.py,sha256=XtGl-PPg9dLFlfbh_Wd5DUAdpjxqwQCxQxDrVf18QEE,12026
+meerschaum/_internal/arguments/__init__.py,sha256=_nSKKVLXNsJeSv-buxEZsx8_c0BAbkhRyE4nT6Bv6q0,541
+meerschaum/_internal/arguments/_parse_arguments.py,sha256=dtGjoyuKpQJtABdkQPzK1OM3Hd9JqlL-aQl_046tNa0,15976
 meerschaum/_internal/arguments/_parser.py,sha256=LfiVDTr1akj5D31qpJAAXKxMcnLQiD3jRpZtvvHWrAo,14917
 meerschaum/_internal/docs/__init__.py,sha256=ZQYHWo6n0kfLLkyG36YXqTYvv2Pc7it5HZHMylT6cBA,126
-meerschaum/_internal/docs/index.py,sha256=LwpPMX5ODsv-CSLOmwKhJpYdEK4LBrZ260yJhYwN0L8,24389
+meerschaum/_internal/docs/index.py,sha256=LOxk1p_ChRkijfRGOB6UnoUEzt-SvtnMO56fTcSIMsU,24390
 meerschaum/_internal/gui/__init__.py,sha256=KF6Opae0aBOjIndMZ2txoPs7ozCXRlR-lcTsicLO7fc,1313
 meerschaum/_internal/gui/app/__init__.py,sha256=rKUa8hHk6Fai-PDF61tQcpT1myxKcfmvEMDHxThNp7o,1565
 meerschaum/_internal/gui/app/_windows.py,sha256=-VHdjTzA3V596fVqnbmTxemONSp_80-sTNJ0CTB8FwU,2632
@@ -22,7 +22,7 @@ meerschaum/_internal/term/TermPageHandler.py,sha256=Rt5S47Pr_3HLJc8xIXpZUczYE_Dw
 meerschaum/_internal/term/__init__.py,sha256=eXjfRzpnASWomB4xpY2AfzC_CLenkInNnVWSLZEexlg,1638
 meerschaum/_internal/term/tools.py,sha256=dXVAimKD-Yv2fg2WOTr0YGBY7XDKjQqw-RizcS65YVI,727
 meerschaum/actions/__init__.py,sha256=MHPs8aRBhbZQXnqd_6tVtisTrNCgPAPgnNcXYbn0zP8,11640
-meerschaum/actions/api.py,sha256=8wjREHNRkl8WBgtz1KfWmAVjeFR_J2j7ghXjSyYUW3g,12603
+meerschaum/actions/api.py,sha256=nRHGeMTy0njI9Qec_606GwSS0AnoxiGJodOS8uWpjfU,12539
 meerschaum/actions/attach.py,sha256=UV19d9W_2WYcrf7BRz7k3mriDoX1V4rA4AKvbLdor0o,3106
 meerschaum/actions/bootstrap.py,sha256=9D3cBHzgZbZyWy-Y7iQgk9bpTbKEhumFKbIIThZgPXI,14058
 meerschaum/actions/clear.py,sha256=OoFZE0bK5m8s3GLNZcixuVT0DMj1izXVxGCATcmUGbI,4851
@@ -35,7 +35,7 @@ meerschaum/actions/install.py,sha256=jdhOrR_KlvinTKr0YJNkUHsnh5EY6OzA7cRq0Vnp1oU
 meerschaum/actions/login.py,sha256=fNgsgkrFCn9wBQJY50SQhz2PwsN_TvEYYHnXK3JG4ig,4206
 meerschaum/actions/os.py,sha256=dtoppoBhLzW3rLNF0SFovEfNxA4WJWt_9WrOGlS5KbA,2251
 meerschaum/actions/pause.py,sha256=WI4dQFfjQ6ObWKUzwQ5FrtYPDyEcnxWwval8cSIzzJw,4221
-meerschaum/actions/python.py,sha256=aoSaDSIQ-wJixexFDtsxBMqITktba3DLkJNFIra_6qk,4546
+meerschaum/actions/python.py,sha256=k3Oo64RhyPd49W8bSjYvm6DOXuqY17NpR6BmfZb3-os,4737
 meerschaum/actions/register.py,sha256=bOQY0AlZlchsxPF27LL7G1OgdiCyj7mkBaD-PO6bFZc,14491
 meerschaum/actions/reload.py,sha256=gMXeFBGVfyQ7uhKhYf6bLaDMD0fLPcA9BrLBSiuvWIc,508
 meerschaum/actions/restart.py,sha256=6ffp3-X9eTEgunVSdD41HnOwqp71yjuSAmXJ5j39ONI,3038
@@ -44,7 +44,7 @@ meerschaum/actions/sh.py,sha256=fLfTJaacKu4sjLTRqEzzYlT2WbbdZBEczsKb6F-qAek,2026
 meerschaum/actions/show.py,sha256=Ij6v5so9GHUrYVi7AhPfhHGjABBofXTPAljLFa2xuWA,28141
 meerschaum/actions/sql.py,sha256=wYofwk1vGO96U2ncigGEfMtYMZeprz2FR1PRRZhkAPI,4311
 meerschaum/actions/stack.py,sha256=7ODAxzmCx8i9AHxvkbr5ZtzUNPpY-iqlSVo4rZHMOw4,5900
-meerschaum/actions/start.py,sha256=R3ooagL5VazTrC2yOSjakROSC3FoYT1NYhmWF1gsbFo,19262
+meerschaum/actions/start.py,sha256=eYk4rUo8LijxK-GLbuH4j0dapv4BqzE5xw7-KaVcV2M,19419
 meerschaum/actions/stop.py,sha256=5fdUw70YN-yuUWrC-NhA88cxr9FZ5NbssbQ8xXO8nFU,4632
 meerschaum/actions/sync.py,sha256=AkH-1O5bkUC-UElQGr0lRhrX-z18ZY2nBPSy9EsW1Kc,17506
 meerschaum/actions/tag.py,sha256=SJf5qFW0ccLXjqlTdkK_0MCcrCMdg6xhYrhKdco0hdA,3053
@@ -53,7 +53,7 @@ meerschaum/actions/upgrade.py,sha256=uhFhAPmguGDgxLa1UkVZnPQ-JRcbmOdExE38v-HrLvo
 meerschaum/actions/verify.py,sha256=tY5slGpHiWiE0v9TDnjbmxSKn86zBnu9WBpixUgKNQU,4885
 meerschaum/api/__init__.py,sha256=tjxyG8SQR_ymYuj3YUaadlguXBj-edL4kY_CxWYrYHk,7449
 meerschaum/api/_chain.py,sha256=h8-WXUGXX6AqzdALfsBC5uv0FkAcLdHJXCGzqzuq89k,875
-meerschaum/api/_events.py,sha256=oiF2iT79UfdEJh4YnGdKtjXbdnQVergUlXAXm2nePlY,2176
+meerschaum/api/_events.py,sha256=6Bgch1x-R82tmnixLMYunqv8NumlkOn9ergBRU5-vdI,2247
 meerschaum/api/_oauth2.py,sha256=SDdFbssy-9QoFBkuZZmep7mCX7jsn_zjqCbMXiksEVg,1647
 meerschaum/api/_websockets.py,sha256=Rso85r4Yj8yUB-Oh8T8bGBvO5vCzZboryOjY-VnxdZQ,1601
 meerschaum/api/dash/__init__.py,sha256=NkqnUP77c02J6sjWp5PGw48Hz9Dhov7gBO5f2mK2b40,2198
@@ -115,10 +115,10 @@ meerschaum/api/resources/templates/old_index.html,sha256=BDeOlcXhSsBH3-NaRtuX4Z1
 meerschaum/api/resources/templates/secret.html,sha256=0QWkm4ZoN81Aw1pd2-62rGCvx3nXPHfFUoegj3Iy8Ls,141
 meerschaum/api/resources/templates/termpage.html,sha256=qspXRuOkzqOn2mXw9mmUldzsvOHq_LyaywQ29CUevp0,4527
 meerschaum/api/routes/__init__.py,sha256=jbkeFNl51Tg8aT5gWe560ZLZLojFJsLMe5IENRjRkb0,606
-meerschaum/api/routes/_actions.py,sha256=J_d0jcBZbVDLfzqjR7Ar58oflA-dRQ2oCFYpvk5HHRE,6201
+meerschaum/api/routes/_actions.py,sha256=9vRu4dsBfIBrfhkVWurvk8n-ClerlHxggiPgQhwP1Oo,3701
 meerschaum/api/routes/_connectors.py,sha256=NNbcn5xWhKqw2PqueSEaqRaZ95hFGDKazG5lE7gsssc,1849
 meerschaum/api/routes/_index.py,sha256=QI6CBo6pI2Zi0a6fJHDjZfiLa9f4okb0BGe3A_JD0kM,578
-meerschaum/api/routes/_jobs.py,sha256=gmbgz_yqJB8K6nJVrzzPCnGRC5Kh6g5iiVGLNvZjUQM,11222
+meerschaum/api/routes/_jobs.py,sha256=znS8Pt5kvrRpv_ZOwRftbvQ1jpNfQ1-ngMy7kPgI5iM,11567
 meerschaum/api/routes/_login.py,sha256=psPKmFkXgYVX83NepqwIhaLsQ5uWgOc4F2QZtPGxY1A,2482
 meerschaum/api/routes/_misc.py,sha256=05--9ZVFeaCgZrHER2kA3SYdK4TyfkEXOCjLvPbum-w,2469
 meerschaum/api/routes/_pipes.py,sha256=1gBuE4E-QvIK_kmbmiw7uLcXjnIobFI1t4tb2skpp6E,21592
@@ -140,7 +140,7 @@ meerschaum/config/_preprocess.py,sha256=-AEA8m_--KivZwTQ1sWN6LTn5sio_fUr2XZ51BO6
 meerschaum/config/_read_config.py,sha256=WFZKIXZMDe_ca0ES7ivgM_mnwShvFxLdoeisT_X5-h0,14720
 meerschaum/config/_shell.py,sha256=46_m49Txc5q1rGfCgO49ca48BODx45DQJi8D0zz1R18,4245
 meerschaum/config/_sync.py,sha256=oK2ZujO2T1he08BXCFyiniBUevNGWSQKXLcS_jRv_7Y,4155
-meerschaum/config/_version.py,sha256=77O-JjgjLz0XGusI-Yd7mQH2SrggQbyeHPLiUIYO3K4,71
+meerschaum/config/_version.py,sha256=oyqZNQpNjf51DwGo7AplCiountsHT5TMqXee0KIj5tk,71
 meerschaum/config/paths.py,sha256=JjibeGN3YAdSNceRwsd42aNmeUrIgM6ndzC8qZAmNI0,621
 meerschaum/config/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerschaum/config/stack/__init__.py,sha256=Yt7GNzC_hz7iUDZ4gVho_lugJO2DnXgnMtsMG_ReoRg,9114
@@ -148,16 +148,16 @@ meerschaum/config/stack/grafana/__init__.py,sha256=LNXQw2FvHKrD68RDhqDmi2wJjAHaK
 meerschaum/config/stack/mosquitto/__init__.py,sha256=-OwOjq8KiBoSH_pmgCAAF3Dp3CRD4KgAEdimZSadROs,186
 meerschaum/config/stack/mosquitto/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerschaum/config/stack/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meerschaum/config/static/__init__.py,sha256=bSugcNkYKnApqUxT0LcpqE_3-2tyJfTu2fDmzbB4fVM,5127
+meerschaum/config/static/__init__.py,sha256=SLAcxX69MFiZBbonn3YiBxOHtdkPoz5Sbtz0Tt9CjKY,5225
 meerschaum/connectors/Connector.py,sha256=utNV3Fy5DhUVbQE-vtm7enH5rH2gxQERmgmP7PUzH30,6682
 meerschaum/connectors/__init__.py,sha256=fLoatCZV2hsDffYEg2aBzqPLzM_2o1_Z3X2iZvLwoqA,12503
 meerschaum/connectors/parse.py,sha256=sDeI2OIS9Inwhbn9jkFAXxOPnmmAHqsuHiiHfWjVnSA,4307
 meerschaum/connectors/poll.py,sha256=gIY9TvFBqMvMNQvR0O2No7koLLz2PjfExBr_Dsosgpg,7363
 meerschaum/connectors/api/APIConnector.py,sha256=MPYeImCBAeSpueYis5CxkfT7kkV82MnGKDLoNE8uOVw,5017
 meerschaum/connectors/api/__init__.py,sha256=JwKrGtuE5aOd2VnsRwudFBYyBf5IxczOwPVdNvCUgSQ,205
-meerschaum/connectors/api/_actions.py,sha256=Vg_ugl02MUjYtfyx0o9jt5ZoluNC0J1R-UEIRlcIpMI,4701
+meerschaum/connectors/api/_actions.py,sha256=gd3F8i5BvN8XRvMcPvPVR8sc1DeLzgoBHdDhc8PtACE,3966
 meerschaum/connectors/api/_fetch.py,sha256=Khq9AFr1nk8Dsmcedb77aWhAuHw0JGgVeahDG95Q5MQ,2072
-meerschaum/connectors/api/_jobs.py,sha256=bPQpnacqiJwXxrMEDgsv63Dn6KRprTvDqdeEmpZhkFw,11249
+meerschaum/connectors/api/_jobs.py,sha256=N5lpHFGG10jlVgaJeWAOTuLBQw3AdgjXsEPpp1YwZQE,11270
 meerschaum/connectors/api/_login.py,sha256=5GsD-B214vr5EYfM3XrTUs1sTFApxZA-9dNxq8oNSyg,2050
 meerschaum/connectors/api/_misc.py,sha256=OZRZBYOokKIEjmQaR8jUYgu6ZRn9VzXBChzR8CfDv_w,1092
 meerschaum/connectors/api/_pipes.py,sha256=Nnc-IShiTkCia548dePymKosQCcl2InFCyUX3Q-Xx6Q,20604
@@ -201,9 +201,9 @@ meerschaum/core/Plugin/__init__.py,sha256=UXg64EvJPgI1PCxkY_KM02-ZmBm4FZpLPIQR_u
 meerschaum/core/User/_User.py,sha256=CApB7Y0QJL6S9QOCCfrG4SbPuPXJ9AsAYQ5pASMP_Aw,6527
 meerschaum/core/User/__init__.py,sha256=lJ7beIZTG9sO4dAi3367fFBl17dXYEWHKi7HoaPlDyk,193
 meerschaum/jobs/_Executor.py,sha256=qM62BhFTM4tyJ7p90KOM0y3qyeRY9k3ZV_aTDJMHnO8,1682
-meerschaum/jobs/_Job.py,sha256=leyW98wPQUJwvF68zL4vSScalpy6v-e9CiDynoI6aPk,31056
+meerschaum/jobs/_Job.py,sha256=XnvS-qN12907t23OG1suBJ5k_TDuXkS1diNE_1xNAF0,32152
 meerschaum/jobs/__init__.py,sha256=ieruFbPxozkgyYMEO5wWQ4OXqfD5Pw9VtFWGub6DQxs,11970
-meerschaum/jobs/systemd.py,sha256=H1hdUh7QJs-DSZ7-jEYZ0NLNEplWmyFo2zt2LAsZO9M,24147
+meerschaum/jobs/systemd.py,sha256=Rq-tsDPslG17ZhpKMrVJ5r8Z0IPr6DEc9APObfIoXCg,24614
 meerschaum/plugins/_Plugin.py,sha256=p6j39tm-xrZENBq-eGtixBuXxLLddtEKWRCRFNqpRu0,34086
 meerschaum/plugins/__init__.py,sha256=trMQ53qgP7ikJhhV_uXzqJw6X1NDz2rPOGXFk40bb1Y,26190
 meerschaum/plugins/bootstrap.py,sha256=qg9MQ1YAU8ShwGqWDl38WjiXLIxDPl95pSIGDLN9rOw,11423
@@ -216,7 +216,7 @@ meerschaum/utils/misc.py,sha256=2f0wLQ0ymdOh5-5iP-jlyUxSUStvQAn5ot5_0GZTg-8,4638
 meerschaum/utils/networking.py,sha256=Sr_eYUGW8_UV9-k9LqRFf7xLtbUcsDucODyLCRsFRUc,1006
 meerschaum/utils/pool.py,sha256=vkE42af4fjrTEJTxf6Ek3xGucm1MtEkpsSEiaVzNKHs,2655
 meerschaum/utils/process.py,sha256=o7UtTQX87YGkg2dItPhlvN7gNQPkElXTYSzKf5Ro8Uc,7474
-meerschaum/utils/prompt.py,sha256=JCM36APVEJ6hN-ncQOD2qXtbyVlIey5OhhyWSIdRs9k,19008
+meerschaum/utils/prompt.py,sha256=0asF_ndumQIN7p5kEOzK-ldsdE4m8FFapcT3-4wgPi8,19010
 meerschaum/utils/schedule.py,sha256=WSJ0eDGvCVxkQwbUc_7vNm0uuKf9WJcY2NCZZdbnZrk,10837
 meerschaum/utils/sql.py,sha256=4sCNEpgUd6uFz6ySs4nnUMVaOT0YAvPM1ZlQYJTSF-0,46656
 meerschaum/utils/threading.py,sha256=3N8JXPAnwqJiSjuQcbbJg3Rv9-CCUMJpeQRfKFR7MaA,2489
@@ -241,11 +241,11 @@ meerschaum/utils/packages/_packages.py,sha256=GzbJ0kxW_EQogXmY4vguRkUyad42cshFs7
 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=bLAWnllKDuE_z6bLk7gLh4mI3Sp1j5hsboTqPKOQq84,24361
-meerschaum-2.3.3.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
-meerschaum-2.3.3.dist-info/METADATA,sha256=XXIvdo8w7h0jjkwTUZXj8v-l_B6T9zEN5GXokPZSPNo,24006
-meerschaum-2.3.3.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
-meerschaum-2.3.3.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-meerschaum-2.3.3.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
-meerschaum-2.3.3.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
-meerschaum-2.3.3.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-meerschaum-2.3.3.dist-info/RECORD,,
+meerschaum-2.3.5.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
+meerschaum-2.3.5.dist-info/METADATA,sha256=c4wAuUfc77pQKQBHZ0hZiSgrztA-8V5Ph9rkgiOPAyQ,24006
+meerschaum-2.3.5.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
+meerschaum-2.3.5.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+meerschaum-2.3.5.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
+meerschaum-2.3.5.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
+meerschaum-2.3.5.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+meerschaum-2.3.5.dist-info/RECORD,,

{meerschaum-2.3.3.dist-info → meerschaum-2.3.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (72.1.0)
+Generator: setuptools (72.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any