meerschaum 2.3.0rc2__py3-none-any.whl → 2.3.0rc3__py3-none-any.whl

meerschaum/actions/delete.py

@@ -512,6 +512,7 @@ def _complete_delete_jobs(
         get_executor_keys_from_context,
     )
     from meerschaum.utils.misc import remove_ansi
+    from meerschaum.connectors.parse import parse_executor_keys
 
     executor_keys = (
         executor_keys
@@ -520,6 +521,9 @@ def _complete_delete_jobs(
         )
     )
 
+    if parse_executor_keys(executor_keys, construct=False) is None:
+        return []
+
     jobs = get_jobs(executor_keys, include_hidden=False)
     if _get_job_method:
         method_keys = [_get_job_method] if isinstance(_get_job_method, str) else _get_job_method

meerschaum/api/dash/callbacks/jobs.py

@@ -24,13 +24,13 @@ from dash import Patch
 html, dcc = import_html(check_update=CHECK_UPDATE), import_dcc(check_update=CHECK_UPDATE)
 import dash_bootstrap_components as dbc
 from meerschaum.api.dash.components import alert_from_success_tuple, build_cards_grid
-from meerschaum.utils.daemon import Daemon
 from dash.exceptions import PreventUpdate
 from meerschaum.api.dash.jobs import (
     build_manage_job_buttons_div_children,
     build_status_children,
     build_process_timestamps_children,
 )
+from meerschaum.jobs import Job
 from meerschaum.api.dash.users import is_session_authenticated
 
 @dash_app.callback(
@@ -53,15 +53,11 @@ def download_job_logs(n_clicks):
         raise PreventUpdate
 
     component_dict = json.loads(ctx[0]['prop_id'].split('.' + 'n_clicks')[0])
-    daemon_id = component_dict['index']
-    daemon = Daemon(daemon_id=daemon_id)
+    job_name = component_dict['index']
     now = datetime.now(timezone.utc)
-    filename = (
-        daemon.rotating_log.file_path.name[:(-1 * len('.log'))]
-        + '_' + str(int(now.timestamp())) + '.log'
-    )
+    filename = job_name + '_' + str(int(now.timestamp())) + '.log'
     return {
-        'content': daemon.log_text,
+        'content': job.get_logs(),
         'filename': filename,
     }
 
@@ -73,12 +69,14 @@ def download_job_logs(n_clicks):
     Output({'type': 'process-timestamps-div', 'index': MATCH}, 'children'),
     Input({'type': 'manage-job-button', 'action': ALL, 'index': MATCH}, 'n_clicks'),
     State('session-store', 'data'),
+    State({'type': 'job-label-p', 'index': MATCH}, 'children'),
     prevent_initial_call = True,
 )
 def manage_job_button_click(
-        n_clicks: Optional[int] = None,
-        session_data: Optional[Dict[str, Any]] = None,
-    ):
+    n_clicks: Optional[int] = None,
+    session_data: Optional[Dict[str, Any]] = None,
+    job_label: Optional[str] = None,
+):
     """
     Start, stop, pause, or delete the given job.
     """
@@ -102,20 +100,20 @@ def manage_job_button_click(
         raise PreventUpdate
 
     component_dict = json.loads(ctx[0]['prop_id'].split('.' + 'n_clicks')[0])
-    daemon_id = component_dict['index']
+    job_name = component_dict['index']
     manage_job_action = component_dict['action']
     try:
-        daemon = Daemon(daemon_id=daemon_id)
+        job = Job(job_name, job_label.replace('\n', ' ') if job_label else None)
     except Exception as e:
-        daemon = None
-    if daemon is None:
+        job = None
+    if job is None:
         raise PreventUpdate
 
     manage_functions = {
-        'start': functools.partial(daemon.run, allow_dirty_run=True),
-        'stop': daemon.quit,
-        'pause': daemon.pause,
-        'delete': daemon.cleanup,
+        'start': job.start,
+        'stop': job.stop,
+        'pause': job.pause,
+        'delete': job.delete,
     }
     if manage_job_action not in manage_functions:
         return (
@@ -125,7 +123,7 @@ def manage_job_button_click(
             dash.no_update,
         )
 
-    old_status = daemon.status
+    old_status = job.status
     try:
         success, msg = manage_functions[manage_job_action]()
     except Exception as e:
@@ -136,15 +134,15 @@ def manage_job_button_click(
     check_interval_seconds = 0.01
     begin = time.perf_counter()
     while (time.perf_counter() - begin) < timeout_seconds:
-        if daemon.status != old_status:
+        if job.status != old_status:
             break
         time.sleep(check_interval_seconds)
 
     return (
         alert_from_success_tuple((success, msg)),
-        build_manage_job_buttons_div_children(daemon),
-        build_status_children(daemon),
-        build_process_timestamps_children(daemon),
+        build_manage_job_buttons_div_children(job),
+        build_status_children(job),
+        build_process_timestamps_children(job),
     )
 
 dash_app.clientside_callback(
@@ -165,7 +163,7 @@ dash_app.clientside_callback(
         }
 
         const triggered_id = dash_clientside.callback_context.triggered_id;
-        const job_daemon_id = triggered_id["index"];
+        const job_name = triggered_id["index"];
 
         iframe = document.getElementById('webterm-iframe');
         if (!iframe){ return dash_clientside.no_update; }
@@ -174,7 +172,7 @@ dash_app.clientside_callback(
             {
                action: "show",
                subaction: "logs",
-               subaction_text: job_daemon_id,
+               subaction_text: job_name,
             },
             url
         );
@@ -197,44 +195,38 @@ dash_app.clientside_callback(
     prevent_initial_call = True,
 )
 def refresh_jobs_on_interval(
-        n_intervals: Optional[int] = None,
-        session_data: Optional[Dict[str, Any]] = None,
-    ):
+    n_intervals: Optional[int] = None,
+    session_data: Optional[Dict[str, Any]] = None,
+):
     """
     When the jobs refresh interval fires, rebuild the jobs' onscreen components.
     """
     session_id = session_data.get('session-id', None)
     is_authenticated = is_session_authenticated(session_id)
 
-    daemon_ids = [
+    job_names = [
         component_dict['id']['index']
         for component_dict in dash.callback_context.outputs_grouping[0]
     ]
 
-    ### NOTE: The daemon may have been deleted, but the card may still exist.
-    daemons = []
-    for daemon_id in daemon_ids:
-        try:
-            daemon = Daemon(daemon_id=daemon_id)
-        except Exception as e:
-            daemon = None
-        daemons.append(daemon)
+    ### NOTE: The job may have been deleted, but the card may still exist.
+    jobs = [Job(name) for name in job_names]
 
     return (
         [
             (
-                build_manage_job_buttons_div_children(daemon)
+                build_manage_job_buttons_div_children(job)
                 if is_authenticated
                 else []
             )
-            for daemon in daemons
+            for job in jobs
         ],
         [
-            build_status_children(daemon)
-            for daemon in daemons
+            build_status_children(job)
+            for job in jobs
         ],
         [
-            build_process_timestamps_children(daemon)
-            for daemon in daemons
+            build_process_timestamps_children(job)
+            for job in jobs
         ],
     )

meerschaum/api/dash/jobs.py

@@ -15,12 +15,12 @@ from meerschaum.api.dash.users import is_session_authenticated
 from meerschaum.api import CHECK_UPDATE
 dbc = attempt_import('dash_bootstrap_components', lazy=False, check_update=CHECK_UPDATE)
 html, dcc = import_html(), import_dcc()
-dateutil_parser = attempt_import('dateutil.parser', check_update=CHECK_UPDATE)
 from meerschaum.jobs import (
     get_jobs,
     get_running_jobs,
     get_paused_jobs,
     get_stopped_jobs,
+    get_executor_keys_from_context,
     Job,
 )
 from meerschaum.config import get_config
@@ -33,20 +33,21 @@ STATUS_EMOJI: Dict[str, str] = {
     'dne': get_config('formatting', 'emoji', 'failure')
 }
 
+EXECUTOR_KEYS: str = get_executor_keys_from_context()
+
 def get_jobs_cards(state: WebState):
     """
     Build cards and alerts lists for jobs.
     """
-    jobs = get_jobs(include_hidden=False)
+    jobs = get_jobs(executor_keys=EXECUTOR_KEYS, include_hidden=False)
     session_id = state['session-store.data'].get('session-id', None)
     is_authenticated = is_session_authenticated(session_id)
 
     cards = []
 
     for name, job in jobs.items():
-        d = job.daemon
         footer_children = html.Div(
-            build_process_timestamps_children(d),
+            build_process_timestamps_children(job),
             id = {'type': 'process-timestamps-div', 'index': name},
         )
         follow_logs_button = dbc.DropdownMenuItem(
@@ -62,7 +63,7 @@ def get_jobs_cards(state: WebState):
         )
         header_children = [
             html.Div(
-                build_status_children(d),
+                build_status_children(job),
                 id={'type': 'manage-job-status-div', 'index': name},
                 style={'float': 'left'},
             ),
@@ -83,15 +84,16 @@ def get_jobs_cards(state: WebState):
             html.H4(html.B(name), className="card-title"),
             html.Div(
                 html.P(
-                    d.label,
+                    job.label,
                     className="card-text job-card-text",
                     style={"word-wrap": "break-word"},
+                    id={'type': 'job-label-p', 'index': name},
                 ),
                 style={"white-space": "pre-wrap"},
             ),
             html.Div(
                 (
-                    build_manage_job_buttons_div_children(d)
+                    build_manage_job_buttons_div_children(job)
                     if is_authenticated
                     else []
                 ),
@@ -179,13 +181,14 @@ def build_manage_job_buttons(job: Job):
         },
     )
     buttons = []
-    if job.status in ('stopped', 'paused'):
+    status = job.status
+    if status in ('stopped', 'paused'):
         buttons.append(start_button)
-    if job.status == 'stopped':
+    if status == 'stopped':
         buttons.append(delete_button)
-    if job.status in ('running',):
+    if status in ('running',):
         buttons.append(pause_button)
-    if job.status in ('running', 'paused'):
+    if status in ('running', 'paused'):
         buttons.append(stop_button)
 
     return buttons
@@ -193,7 +196,7 @@ def build_manage_job_buttons(job: Job):
 
 def build_status_children(job: Job) -> List[html.P]:
     """
-    Return the status HTML component for this daemon.
+    Return the status HTML component for this Job.
     """
     if job is None:
         return STATUS_EMOJI['dne']
@@ -217,10 +220,16 @@ def build_process_timestamps_children(job: Job) -> List[dbc.Row]:
         return []
 
     children = []
-    for timestamp_key, timestamp_val in sorted_dict(
-        job.daemon.properties.get('process', {})
+    for timestamp_key, timestamp in sorted_dict(
+        {
+            'began': job.began,
+            'paused': job.paused,
+            'ended': job.ended,
+        }
     ).items():
-        timestamp = dateutil_parser.parse(timestamp_val)
+        if timestamp is None:
+            continue
+
         timestamp_str = timestamp.strftime('%Y-%m-%d %H:%M UTC')
         children.append(
             dbc.Row(

meerschaum/api/routes/_actions.py

@@ -26,6 +26,7 @@ from meerschaum.actions import actions
 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
 
 actions_endpoint = endpoints['actions']
 
@@ -115,11 +116,11 @@ async def do_action_websocket(websocket: WebSocket):
         if not auth_success:
             await websocket.close()
 
-        sysargs = await websocket.receive_json()
-        kwargs = parse_arguments(sysargs)
-        _ = kwargs.pop('executor_keys', None)
-        _ = kwargs.pop('shell', None)
-        sysargs = parse_dict_to_sysargs(kwargs)
+        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,

meerschaum/api/routes/_jobs.py

@@ -107,6 +107,24 @@ def get_job(
     }
 
 
+def clean_sysargs(sysargs: List[str]) -> List[str]:
+    """
+    Remove the executor flag or leading `api {label}` action.
+    """
+    clean_sysargs = []
+    executor_flag = False
+    for arg in sysargs:
+        if arg in ('-e', '--executor', 'api'):
+            executor_flag = True
+            continue
+        if executor_flag:
+            executor_flag = False
+            continue
+
+        clean_sysargs.append(arg)
+    return clean_sysargs
+
+
 @app.post(endpoints['jobs'] + '/{name}', tags=['Jobs'])
 def create_job(
     name: str,
@@ -118,7 +136,7 @@ def create_job(
     """
     Create and start a new job.
     """
-    job = Job(name, sysargs, executor_keys=EXECUTOR_KEYS)
+    job = Job(name, clean_sysargs(sysargs), executor_keys=EXECUTOR_KEYS)
     if job.exists():
         raise fastapi.HTTPException(
             status_code=409,

meerschaum/config/_jobs.py

@@ -7,7 +7,7 @@ Default configuration for jobs.
 """
 
 default_jobs_config = {
-    'timeout_seconds': 8,
+    'timeout_seconds': 4,
     'check_timeout_interval_seconds': 0.1,
     'terminal': {
         'lines': 40,

meerschaum/config/_version.py

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

meerschaum/connectors/api/APIConnector.py

@@ -90,6 +90,7 @@ class APIConnector(Connector):
         get_job_is_blocking_on_stdin,
         get_job_began,
         get_job_ended,
+        get_job_paused,
         get_job_status,
     )
 

meerschaum/connectors/api/_jobs.py

@@ -112,7 +112,7 @@ def get_job_status(self, name: str, debug: bool = False) -> str:
     metadata = self.get_job_metadata(name, debug=debug)
     return metadata.get('status', 'stopped')
 
-def get_job_began(self, name: str, debug: bool = False) -> str:
+def get_job_began(self, name: str, debug: bool = False) -> Union[str, None]:
     """
     Return a job's `began` timestamp, if it exists.
     """
@@ -123,7 +123,7 @@ def get_job_began(self, name: str, debug: bool = False) -> str:
 
     return began_str
 
-def get_job_ended(self, name: str, debug: bool = False) -> str:
+def get_job_ended(self, name: str, debug: bool = False) -> Union[str, None]:
     """
     Return a job's `ended` timestamp, if it exists.
     """
@@ -134,6 +134,17 @@ def get_job_ended(self, name: str, debug: bool = False) -> str:
 
     return ended_str
 
+def get_job_paused(self, name: str, debug: bool = False) -> Union[str, None]:
+    """
+    Return a job's `paused` timestamp, if it exists.
+    """
+    properties = self.get_job_properties(name, debug=debug)
+    paused_str = properties.get('daemon', {}).get('paused', None)
+    if paused_str is None:
+        return None
+
+    return paused_str
+
 def get_job_exists(self, name: str, debug: bool = False) -> bool:
     """
     Return whether a job exists.

meerschaum/jobs/_Job.py

@@ -740,7 +740,7 @@ class Job:
         The datetime when the job began running.
         """
         if self.executor is not None:
-            began_str = self.executor.get_job_began(name)
+            began_str = self.executor.get_job_began(self.name)
             if began_str is None:
                 return None
             return (
@@ -762,6 +762,8 @@ class Job:
         """
         if self.executor is not None:
             ended_str = self.executor.get_job_ended(self.name)
+            if ended_str is None:
+                return None
             return (
                 datetime.fromisoformat(ended_str)
                 .astimezone(timezone.utc)
@@ -779,6 +781,16 @@ class Job:
         """
         The datetime when the job was suspended while running.
         """
+        if self.executor is not None:
+            paused_str = self.executor.get_job_paused(self.name)
+            if paused_str is None:
+                return None
+            return (
+                datetime.fromisoformat(paused_str)
+                .astimezone(timezone.utc)
+                .replace(tzinfo=None)
+            )
+
         paused_str = self.daemon.properties.get('process', {}).get('paused', None)
         if paused_str is None:
             return None
@@ -796,11 +808,8 @@ class Job:
         if not self.daemon.stop_path.exists():
             return None
 
-        try:
-            with open(self.daemon.stop_path, 'r', encoding='utf-8') as f:
-                stop_data = json.load(f)
-        except Exception as e:
-            warn(f"Failed to read stop file for {self}:\n{e}")
+        stop_data = self.daemon._read_stop_file()
+        if not stop_data:
             return None
 
         stop_time_str = stop_data.get('stop_time', None)

meerschaum/jobs/_SystemdExecutor.py

@@ -19,6 +19,7 @@ from functools import partial
 import meerschaum as mrsm
 from meerschaum.jobs import Job, Executor, make_executor
 from meerschaum.utils.typing import Dict, Any, List, SuccessTuple, Union, Optional, Callable
+from meerschaum.config import get_config
 from meerschaum.config.static import STATIC_CONFIG
 from meerschaum.utils.warnings import warn, dprint
 from meerschaum._internal.arguments._parse_arguments import parse_arguments
@@ -141,7 +142,8 @@ 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(),
-
+            'LINES': get_config('jobs', 'terminal', 'lines'),
+            'COLUMNS': get_config('jobs', 'terminal', 'columns'),
         })
         environment_lines = [
             f"Environment={key}={val}"
@@ -259,7 +261,10 @@ class SystemdExecutor(Executor):
             return None
 
         psutil = mrsm.attempt_import('psutil')
-        return psutil.Process(pid)
+        try:
+            return psutil.Process(pid)
+        except Exception:
+            return None
 
     def get_job_status(self, name: str, debug: bool = False) -> str:
         """
@@ -271,13 +276,19 @@ class SystemdExecutor(Executor):
             debug=debug,
         )
 
+        if output == 'activating':
+            return 'running'
+
         if output == 'active':
             process = self.get_job_process(name, debug=debug)
             if process is None:
                 return 'stopped'
 
-            if process.status() == 'stopped':
-                return 'paused'
+            try:
+                if process.status() == 'stopped':
+                    return 'paused'
+            except Exception:
+                return 'stopped'
 
             return 'running'
 
@@ -310,7 +321,7 @@ class SystemdExecutor(Executor):
         
         return None
 
-    def get_job_began(self, name: str, debug: bool = False) -> Union[datetime, None]:
+    def get_job_began(self, name: str, debug: bool = False) -> Union[str, None]:
         """
         Return when a job began running.
         """
@@ -326,10 +337,62 @@ class SystemdExecutor(Executor):
         if not output.startswith('ActiveEnterTimestamp'):
             return None
 
+        dt_str = output.split('=')[-1]
+        if not dt_str:
+            return None
+
         dateutil_parser = mrsm.attempt_import('dateutil.parser')
-        dt = dateutil_parser.parse(output.split('=')[-1])
+        try:
+            dt = dateutil_parser.parse(dt_str)
+        except Exception as e:
+            warn(f"Cannot parse '{output}' as a datetime:\n{e}")
+            return None
+
         return dt.astimezone(timezone.utc).isoformat()
 
+    def get_job_ended(self, name: str, debug: bool = False) -> Union[str, None]:
+        """
+        Return when a job began running.
+        """
+        output = self.run_command(
+            [
+                'show',
+                self.get_service_name(name, debug=debug),
+                '--property=InactiveEnterTimestamp'
+            ],
+            as_output=True,
+            debug=debug,
+        )
+        if not output.startswith('InactiveEnterTimestamp'):
+            return None
+
+        dt_str = output.split('=')[-1]
+        if not dt_str:
+            return None
+
+        dateutil_parser = mrsm.attempt_import('dateutil.parser')
+
+        try:
+            dt = dateutil_parser.parse(dt_str)
+        except Exception as e:
+            warn(f"Cannot parse '{output}' as a datetime:\n{e}")
+            return None
+        return dt.astimezone(timezone.utc).isoformat()
+
+    def get_job_paused(self, name: str, debug: bool = False) -> Union[str, None]:
+        """
+        Return when a job was paused.
+        """
+        job = self.get_hidden_job(name, debug=debug)
+        if self.get_job_status(name, debug=debug) != 'paused':
+            return None
+
+        stop_time = job.stop_time
+        if stop_time is None:
+            return None
+
+        return stop_time.isoformat()
+
     def get_job_result(self, name: str, debug: bool = False) -> SuccessTuple:
         """
         Return the job's result SuccessTuple.
@@ -495,12 +558,13 @@ class SystemdExecutor(Executor):
             debug=debug,
         )
 
+        check_timeout_interval = get_config('jobs', 'check_timeout_interval_seconds')
         loop_start = time.perf_counter()
-        while (time.perf_counter() - loop_start) < 5:
+        while (time.perf_counter() - loop_start) < get_config('jobs', 'timeout_seconds'):
             if self.get_job_status(name, debug=debug) == 'stopped':
                 return True, 'Success'
 
-            time.sleep(0.1)
+            time.sleep(check_timeout_interval)
 
         return self.run_command(
             ['stop', self.get_service_name(name, debug=debug)],

meerschaum/jobs/__init__.py

@@ -102,6 +102,12 @@ def get_jobs(
             )
         return {**local_jobs, **systemd_jobs}
 
+    if executor_keys == 'local':
+        return _get_local_jobs()
+
+    if executor_keys == 'systemd':
+        return _get_systemd_jobs()
+
     try:
         _ = parse_executor_keys(executor_keys, construct=False)
         conn = parse_executor_keys(executor_keys)

meerschaum/utils/daemon/Daemon.py

@@ -623,6 +623,20 @@ class Daemon:
 
         return True, "Success"
 
+    def _read_stop_file(self) -> Dict[str, Any]:
+        """
+        Read the stop file if it exists.
+        """
+        if not self.stop_path.exists():
+            return {}
+
+        try:
+            with open(self.stop_path, 'r', encoding='utf-8') as f:
+                data = json.load(f)
+            return data
+        except Exception:
+            return {}
+
     def _handle_sigterm(self, signal_number: int, stack_frame: 'frame') -> None:
         """
         Handle `SIGTERM` within the `Daemon` context.

meerschaum/utils/daemon/_names.py

@@ -84,7 +84,7 @@ _nouns: List[str] = []
 for category, items in _bank['nouns'].items():
     _nouns += items
 
-def generate_random_name(separator: str = '_'):
+def generate_random_name(separator: str = '-'):
     """
     Return a random adjective and noun combination.
 

{meerschaum-2.3.0rc2.dist-info → meerschaum-2.3.0rc3.dist-info}/METADATA

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

{meerschaum-2.3.0rc2.dist-info → meerschaum-2.3.0rc3.dist-info}/RECORD

@@ -28,7 +28,7 @@ meerschaum/actions/bootstrap.py,sha256=9D3cBHzgZbZyWy-Y7iQgk9bpTbKEhumFKbIIThZgP
 meerschaum/actions/clear.py,sha256=OoFZE0bK5m8s3GLNZcixuVT0DMj1izXVxGCATcmUGbI,4851
 meerschaum/actions/copy.py,sha256=hLRc81oVBjnV22lpeSDb-HsDX2on9K2u6C1H8qJITNQ,6844
 meerschaum/actions/deduplicate.py,sha256=puYyxeFYEUy1Sd2IOcZB2e6MrNxAZl2bTLmNzFDkCiw,1167
-meerschaum/actions/delete.py,sha256=GRokg2NRzlow2UMYXNs9xwBu-9AuJdK6kAxsxgwp-E0,18823
+meerschaum/actions/delete.py,sha256=OidLnYT4E3OEHGHOeHOHbL3FFJonE7iR_3sPCj0azK0,18974
 meerschaum/actions/drop.py,sha256=Hd5h4rrWd7qL2rTqglsTonUsEoH7qQlsfqNFSHGeqr0,2453
 meerschaum/actions/edit.py,sha256=6d1Y8Ejd4zQWVARvx04cvbGyRA2r4ihJXWqMFiFX0aM,11740
 meerschaum/actions/install.py,sha256=jdhOrR_KlvinTKr0YJNkUHsnh5EY6OzA7cRq0Vnp1oU,7494
@@ -61,7 +61,7 @@ meerschaum/api/dash/actions.py,sha256=eUClPPdNVNSCtyq8Ecr1saasxj5VBgd1gcXejvQxXE
 meerschaum/api/dash/components.py,sha256=oGX7HFzNCi37iMww747iL3bbB52ZTt9tFa2iLohffg4,6399
 meerschaum/api/dash/connectors.py,sha256=nJxBOFldtCMJLYjUSVYZwX5BO-LNjTNHgoEaXe-0XMo,843
 meerschaum/api/dash/graphs.py,sha256=wJUDWzcLN8-C3xko6rj0F2v7Rt8YDkSXoVkkXJjYGIk,2046
-meerschaum/api/dash/jobs.py,sha256=Y3XM7aG_hWQsQLoQfgUVlH5V2vNGA6qkfN0OX6sX04g,7302
+meerschaum/api/dash/jobs.py,sha256=PbQgo1i3iPyysMJkkMRzZZOuV9vHzFShjJltiWsWUKo,7456
 meerschaum/api/dash/keys.py,sha256=hzEVeN60SAfVTVSO5lajGaykxRIKGhj9Ph00HRJnNoE,12598
 meerschaum/api/dash/pipes.py,sha256=RVVYIJJy4G01cXou9OT8Gr5ZsygQ_GUqJDDhU1akhi8,20615
 meerschaum/api/dash/plugins.py,sha256=JiQjeeCT21MoPDo81pkTXw9viqIH6xpivQgZEO4qtzQ,3676
@@ -78,7 +78,7 @@ meerschaum/api/dash/assets/logo_500x500.png,sha256=9EUtf6wQcEZTXHKfQ2kjNXod6Rn_4
 meerschaum/api/dash/callbacks/__init__.py,sha256=CKOkt7PIHbYxX9aDab2xPDuufIAQjSR5MVX-hU8Zi2w,450
 meerschaum/api/dash/callbacks/custom.py,sha256=N9pVolAF8sIuJD3V6xBSgS7k8THJo_f8d1qAoh1Kg60,1161
 meerschaum/api/dash/callbacks/dashboard.py,sha256=8Rjxuw8uGww6oRfwRUC_mjm6i7aD0dVW0CeY2a7r7Yo,33101
-meerschaum/api/dash/callbacks/jobs.py,sha256=OEYxJRlmnxqbsvHb5jBJJCsRvVCsMNusm9AClCT9Pm0,7689
+meerschaum/api/dash/callbacks/jobs.py,sha256=Xvw17za3tNvgu-yHzNku_0pZVK17vfEWKEy_DLtgo70,7407
 meerschaum/api/dash/callbacks/login.py,sha256=oUGAo7gokAQDFgF4dBHaGf-An04JjkrGFHxSGB-ZMqU,2825
 meerschaum/api/dash/callbacks/plugins.py,sha256=7CrwwbBI2N3DR4Yb1bKmrtJ3cAQ3dVv1l6E_AtZ6Wng,2777
 meerschaum/api/dash/callbacks/register.py,sha256=9AgTcl--TPt6oETKzirQCkH9Azlm3XrU9U6XJM2b8Lk,3600
@@ -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=glmLj2CzZvrwKKyJwuBzYLvzs1hwzh8vo-9Hcy82yeE,4511
+meerschaum/api/routes/_actions.py,sha256=-UYsRkDvdv9HG9AkaaLjAGWXkdBYYGLFWz85vkvHtKc,4592
 meerschaum/api/routes/_connectors.py,sha256=NNbcn5xWhKqw2PqueSEaqRaZ95hFGDKazG5lE7gsssc,1849
 meerschaum/api/routes/_index.py,sha256=QI6CBo6pI2Zi0a6fJHDjZfiLa9f4okb0BGe3A_JD0kM,578
-meerschaum/api/routes/_jobs.py,sha256=0G7IhQpRenFJ9OSKo25lqCuJonNzK_q-XMXSD_pjdv0,10515
+meerschaum/api/routes/_jobs.py,sha256=593jLAdF2N28USjLEfyIABpD3c4CuajLDbVZu41WuOU,10977
 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
@@ -133,14 +133,14 @@ meerschaum/config/_default.py,sha256=8ryAQV9yYkpIZaVYe9W7dm5c-WAu_lX1jSKGLLo4FtQ
 meerschaum/config/_edit.py,sha256=_kabgFbJdI5kcLs-JIsoaTo0JdyxnPnBdrlTyTAgPm8,8236
 meerschaum/config/_environment.py,sha256=Vv4DLDfc2vKLbCLsMvkQDj77K4kEvHKEBmUBo-wCrgo,4419
 meerschaum/config/_formatting.py,sha256=OMuqS1EWOsj_34wSs2tOqGIWci3bTMIZ5l-uelZgsIM,6672
-meerschaum/config/_jobs.py,sha256=2bEikO48qVSguFS3lrbWz6uiKt_0b3oSRWhwyz8RRDM,1279
+meerschaum/config/_jobs.py,sha256=gS_4mMGdmVP7WB4V5Sz8kYP0HmhWcMY2jSWGR7jX6cw,1279
 meerschaum/config/_patch.py,sha256=21N30q1ANmWMDQ-2RUjpMx7KafWfPQ3lKx9rrMqg1s4,1526
 meerschaum/config/_paths.py,sha256=d6CKJfMmc9JrAW0E9Kpyy6bKQiB6yeHqZx91-cxKJIQ,9677
 meerschaum/config/_preprocess.py,sha256=-AEA8m_--KivZwTQ1sWN6LTn5sio_fUr2XZ51BO6wLs,1220
 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=bfQh2_v-HpBVdlfw2zoIhMos9XaCBgtxmAFNwHxb3HM,74
+meerschaum/config/_version.py,sha256=Z6PjBfAKMgVlUvxdR1JT93ZJZE4LQbhVOjo8PSU0nm4,74
 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
@@ -153,11 +153,11 @@ meerschaum/connectors/Connector.py,sha256=utNV3Fy5DhUVbQE-vtm7enH5rH2gxQERmgmP7P
 meerschaum/connectors/__init__.py,sha256=b1RdpMUNWtA5Q4KbymeUt9HtEiMWUHf0BBXzcl4itkc,12557
 meerschaum/connectors/parse.py,sha256=sDeI2OIS9Inwhbn9jkFAXxOPnmmAHqsuHiiHfWjVnSA,4307
 meerschaum/connectors/poll.py,sha256=gIY9TvFBqMvMNQvR0O2No7koLLz2PjfExBr_Dsosgpg,7363
-meerschaum/connectors/api/APIConnector.py,sha256=xe1Bsbnh5PBNR2r5yr6iqJ1UozEKXWJBZnUU0qdXC7c,4934
+meerschaum/connectors/api/APIConnector.py,sha256=S_QL44WODA2uisIcC8wk_mix_3GhBzUXZjfon29P5lk,4958
 meerschaum/connectors/api/__init__.py,sha256=JwKrGtuE5aOd2VnsRwudFBYyBf5IxczOwPVdNvCUgSQ,205
 meerschaum/connectors/api/_actions.py,sha256=KS2Ib5_yHuN0Fw86wyg0bXORV2xY4m3DQrBtcqIIjnY,2343
 meerschaum/connectors/api/_fetch.py,sha256=Khq9AFr1nk8Dsmcedb77aWhAuHw0JGgVeahDG95Q5MQ,2072
-meerschaum/connectors/api/_jobs.py,sha256=sieFAgk38PdyAnCbgzA-gOWdGK1gyzLhxbapxr4Hg04,10696
+meerschaum/connectors/api/_jobs.py,sha256=XlZXuTbkqDzrp6WgoD8OskGUfrKf2VbayhuB_WbRkzw,11066
 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=wf-_jqFBiTNw2s2msp0Ye6IyTl5JWiyC9aLBI0PQuPs,20962
@@ -201,10 +201,10 @@ 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=ZUsQl0hgU0HW_F9bQCfm8KwrdyTBLCrfxsSnbJOwtWI,1575
-meerschaum/jobs/_Job.py,sha256=a0bND2kun57FZk8lthO7J6SQseVpkGhn7hmCo0_am-E,28759
+meerschaum/jobs/_Job.py,sha256=x1KXKOewv1hutf89i31yvRx_zlHnxn03ZbISHLXNbLM,29013
 meerschaum/jobs/_LocalExecutor.py,sha256=v_zvU1vgJDy-iiztXS5gnMayJ0UZnW48qJj3OSB6o-k,2195
-meerschaum/jobs/_SystemdExecutor.py,sha256=Us3MH3KmAJxjLJPJPmegBlZy8HExgRIylNPb7Wro-qk,20933
-meerschaum/jobs/__init__.py,sha256=Lhox8AboqyKmRyq13elSHq85rSDEuz0AQkoFW3PVzr8,10662
+meerschaum/jobs/_SystemdExecutor.py,sha256=ek2pO7u8qt0PTbfPPJLXM_j5rlP3ScUUzPBwXK5HhII,22960
+meerschaum/jobs/__init__.py,sha256=hGlyB80olsP1BSkYhmHHyg6hi0UuIOU7pWMX7Ry8EFU,10800
 meerschaum/plugins/_Plugin.py,sha256=q1B4gVAO2BGA-PIR0HI3-O9q1n8BaT7tSANIyW7gUPg,34084
 meerschaum/plugins/__init__.py,sha256=3Hg9yyfkN0TxPPTnlt6pi53znjRIAR92WpG3zEKYm10,26152
 meerschaum/plugins/bootstrap.py,sha256=qg9MQ1YAU8ShwGqWDl38WjiXLIxDPl95pSIGDLN9rOw,11423
@@ -224,12 +224,12 @@ meerschaum/utils/threading.py,sha256=3N8JXPAnwqJiSjuQcbbJg3Rv9-CCUMJpeQRfKFR7MaA
 meerschaum/utils/typing.py,sha256=U3MC347sh1umpa3Xr1k71eADyDmk4LB6TnVCpq8dVzI,2830
 meerschaum/utils/warnings.py,sha256=IDiwYspsfjIi1gtk3V9cSo9vNLckB9bCsHhRClpPJTc,6639
 meerschaum/utils/yaml.py,sha256=Da9ZtNdT8f68sqz6g4eLQM3jz8QQ2J9_FglX-fw5VXY,3901
-meerschaum/utils/daemon/Daemon.py,sha256=mQG-bJNvATM0TDxyZVvXkQ1X3H9NZb3hlg3wEUB75bs,41274
+meerschaum/utils/daemon/Daemon.py,sha256=8MPsHwZT_X9zZ9nxNlwa80PpwkB_NJYp3aBsfxTEW54,41640
 meerschaum/utils/daemon/FileDescriptorInterceptor.py,sha256=MJKMO0Syf3d8yWUs6xXcQzg8Ptsuvh2aCRRoglOjusA,5257
 meerschaum/utils/daemon/RotatingFile.py,sha256=ePm_svjwyFDWh6V1k-bp1RHXCSWlyxDtlFu4SU4XvPU,24369
 meerschaum/utils/daemon/StdinFile.py,sha256=CECjb40If-TKTXwj_3nFkUfY2xTrrIx73M32mcn5hS8,3172
 meerschaum/utils/daemon/__init__.py,sha256=o9jWb4lRTIyny4EPt7fPXFgV_vIf1mUofsTwoE1ZecA,8751
-meerschaum/utils/daemon/_names.py,sha256=Prf7xA2GWDbKR_9Xq9_5RTTIf9GNWY3Yt0s4tEU3JgM,4330
+meerschaum/utils/daemon/_names.py,sha256=QInmWQHBA8P8d3lEjVb-ukYvXXK8T87G7xljjOJtL1Q,4330
 meerschaum/utils/dtypes/__init__.py,sha256=JR9PViJTzhukZhq0QoPIs73HOnXZZr8OmfhAAD4OAUA,6261
 meerschaum/utils/dtypes/sql.py,sha256=IkEOyB63je-rCLHM6WwFzGbCerYk1zobL1cXkWqmTa4,14638
 meerschaum/utils/formatting/__init__.py,sha256=NcNPxXRSnKZAIBxAD0ictCjVBzYzFtOwpf2CDMfr4_Y,15354
@@ -242,11 +242,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.0rc2.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
-meerschaum-2.3.0rc2.dist-info/METADATA,sha256=e_ahh83m8FwVMO1VezxSC_WnK-XJoDUNzmIkFgXbFs8,24009
-meerschaum-2.3.0rc2.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
-meerschaum-2.3.0rc2.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-meerschaum-2.3.0rc2.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
-meerschaum-2.3.0rc2.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
-meerschaum-2.3.0rc2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-meerschaum-2.3.0rc2.dist-info/RECORD,,
+meerschaum-2.3.0rc3.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
+meerschaum-2.3.0rc3.dist-info/METADATA,sha256=sOTBNkKdN7uRPVbNXQUXxGb2gDU1q30FWsl3KqZtxyE,24009
+meerschaum-2.3.0rc3.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
+meerschaum-2.3.0rc3.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+meerschaum-2.3.0rc3.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
+meerschaum-2.3.0rc3.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
+meerschaum-2.3.0rc3.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+meerschaum-2.3.0rc3.dist-info/RECORD,,