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

meerschaum/actions/show.py

@@ -54,7 +54,7 @@ def _complete_show(
     """
     Override the default Meerschaum `complete_` function.
     """
-    from meerschaum.actions.start import _complete_start_jobs
+    from meerschaum.actions.delete import _complete_delete_jobs
 
     if action is None:
         action = []
@@ -65,10 +65,10 @@ def _complete_show(
         'config'    : _complete_show_config,
         'package'   : _complete_show_packages,
         'packages'  : _complete_show_packages,
-        'job'       : _complete_start_jobs,
-        'jobs'      : _complete_start_jobs,
-        'log'       : _complete_start_jobs,
-        'logs'      : _complete_start_jobs,
+        'job'       : _complete_delete_jobs,
+        'jobs'      : _complete_delete_jobs,
+        'log'       : _complete_delete_jobs,
+        'logs'      : _complete_delete_jobs,
     }
 
     if (
@@ -560,7 +560,7 @@ def _show_jobs(
     """
     Show the currently running and stopped jobs.
     """
-    from meerschaum.utils.jobs import get_filtered_jobs
+    from meerschaum.jobs import get_filtered_jobs
     from meerschaum.utils.formatting._jobs import pprint_jobs
 
     jobs = get_filtered_jobs(executor_keys, action, debug=debug)
@@ -575,7 +575,7 @@ def _show_jobs(
                 "      - start api -d\n" +
                 "      - start job sync pipes --loop"
             )
-        return False, "No jobs to show."
+        return True, "No jobs to show."
 
     pprint_jobs(jobs, nopretty=nopretty)
     return True, "Success"
@@ -602,7 +602,7 @@ def _show_logs(
     from functools import partial
     from datetime import datetime, timezone
     from meerschaum.utils.packages import attempt_import, import_rich
-    from meerschaum.utils.jobs import get_filtered_jobs, Job
+    from meerschaum.jobs import get_filtered_jobs, Job
     from meerschaum.utils.warnings import warn, info
     from meerschaum.utils.formatting import get_console, ANSI, UNICODE
     from meerschaum.utils.misc import tail

meerschaum/actions/start.py

@@ -10,9 +10,9 @@ from __future__ import annotations
 from meerschaum.utils.typing import SuccessTuple, Optional, List, Any
 
 def start(
-        action: Optional[List[str]] = None,
-        **kw: Any,
-    ) -> SuccessTuple:
+    action: Optional[List[str]] = None,
+    **kw: Any,
+) -> SuccessTuple:
     """
     Start subsystems (API server, background job, etc.).
     """
@@ -28,16 +28,23 @@ def start(
 
 
 def _complete_start(
-        action: Optional[List[str]] = None,
-        **kw: Any
-    ) -> List[str]:
+    action: Optional[List[str]] = None,
+    **kw: Any
+) -> List[str]:
     """
     Override the default Meerschaum `complete_` function.
     """
+    from meerschaum.actions.delete import _complete_delete_jobs
+    from functools import partial
 
     if action is None:
         action = []
 
+    _complete_start_jobs = partial(
+        _complete_delete_jobs,
+        _get_job_method=['stopped', 'paused'],
+    )
+
     options = {
         'job': _complete_start_jobs,
         'jobs': _complete_start_jobs,
@@ -75,14 +82,15 @@ def _start_api(action: Optional[List[str]] = None, **kw):
     from meerschaum.actions import actions
     return actions['api'](action=['start'], **kw)
 
+
 def _start_jobs(
-        action: Optional[List[str]] = None,
-        name: Optional[str] = None,
-        sysargs: Optional[List[str]] = None,
-        executor_keys: Optional[str] = None,
-        debug: bool = False,
-        **kw
-    ) -> SuccessTuple:
+    action: Optional[List[str]] = None,
+    name: Optional[str] = None,
+    sysargs: Optional[List[str]] = None,
+    executor_keys: Optional[str] = None,
+    debug: bool = False,
+    **kw
+) -> SuccessTuple:
     """
     Run a Meerschaum action as a background job.
     
@@ -112,28 +120,24 @@ def _start_jobs(
                 Start the job 'happy_seal' but via the `--name` flag.
                 This only applies when no text follows the words 'start job'.
     """
-    import textwrap
     from meerschaum.utils.warnings import warn, info
     from meerschaum.utils.daemon._names import get_new_daemon_name
-    from meerschaum.utils.jobs import (
+    from meerschaum.jobs import (
         Job,
-        get_jobs,
         get_filtered_jobs,
         get_stopped_jobs,
         get_running_jobs,
         get_paused_jobs,
-        get_restart_jobs,
+        _install_healthcheck_job,
     )
-    from meerschaum._internal.arguments._parse_arguments import parse_arguments
     from meerschaum.actions import actions
     from meerschaum.utils.prompt import yes_no
     from meerschaum.utils.formatting import print_tuple
-    from meerschaum.utils.formatting._jobs import pprint_job, pprint_jobs
-    from meerschaum.utils.formatting._shell import clear_screen
+    from meerschaum.utils.formatting._jobs import pprint_jobs
     from meerschaum.utils.misc import items_str
 
     names = []
-    jobs = get_filtered_jobs(executor_keys, debug=debug)
+    jobs = get_filtered_jobs(executor_keys, action, debug=debug)
 
     new_job = len(list(action)) > 0
     _potential_jobs = {'known': [], 'unknown': []}
@@ -166,7 +170,7 @@ def _start_jobs(
                         + items_str(_potential_jobs['unknown'])
                         + " will be ignored."
                     ),
-                    stack = False
+                    stack=False
                 )
 
         ### Determine the `names` list.
@@ -294,33 +298,10 @@ def _start_jobs(
         + ("Failed to start job" + ("s" if len(_failures) != 1 else '')
             + f" {items_str(_failures)}." if _failures else '')
     )
+    _install_healthcheck_job()
     return len(_failures) == 0, msg
 
 
-def _complete_start_jobs(
-    action: Optional[List[str]] = None,
-    executor_keys: Optional[str] = None,
-    line: str = '',
-    **kw
-) -> List[str]:
-    from meerschaum.utils.jobs import get_filtered_jobs
-    jobs = get_filtered_jobs(executor_keys, action)
-    if not action:
-        return list(jobs)
-
-    possibilities = []
-    _line_end = line.split(' ')[-1]
-    for name in jobs:
-        if name in action:
-            continue
-        if _line_end == '':
-            possibilities.append(name)
-            continue
-        if name.startswith(action[-1]):
-            possibilities.append(name)
-    return possibilities
-
-
 def _start_gui(
         action: Optional[List[str]] = None,
         mrsm_instance: Optional[str] = None,

meerschaum/actions/stop.py

@@ -27,13 +27,20 @@ def _complete_stop(
     """
     Override the default Meerschaum `complete_` function.
     """
-    from meerschaum.actions.start import _complete_start_jobs
+    from meerschaum.actions.delete import _complete_delete_jobs
+    from functools import partial
+
     if action is None:
         action = []
 
+    _complete_stop_jobs = partial(
+        _complete_delete_jobs,
+        _get_job_method=('running', 'paused', 'restart'),
+    )
+
     options = {
-        'job' : _complete_start_jobs,
-        'jobs' : _complete_start_jobs,
+        'job' : _complete_stop_jobs,
+        'jobs' : _complete_stop_jobs,
     }
 
     if (
@@ -64,7 +71,7 @@ def _stop_jobs(
     
     To see running processes, run `show jobs`.
     """
-    from meerschaum.utils.jobs import (
+    from meerschaum.jobs import (
         get_filtered_jobs,
         get_running_jobs,
         get_paused_jobs,

meerschaum/api/_events.py

@@ -19,7 +19,11 @@ from meerschaum.utils.debug import dprint
 from meerschaum.connectors.poll import retry_connect
 from meerschaum.utils.warnings import warn
 from meerschaum._internal.term.tools import is_webterm_running
-from meerschaum.utils.jobs import start_check_jobs_thread, stop_check_jobs_thread
+from meerschaum.jobs import (
+    start_check_jobs_thread,
+    stop_check_jobs_thread,
+    get_executor_keys_from_context,
+)
 
 _check_jobs_thread = None
 
@@ -47,7 +51,8 @@ async def startup():
         await shutdown()
         os._exit(1)
 
-    start_check_jobs_thread()
+    if get_executor_keys_from_context() == 'local':
+        start_check_jobs_thread()
 
 
 @app.on_event("shutdown")
@@ -60,7 +65,9 @@ async def shutdown():
     if get_api_connector().type == 'sql':
         get_api_connector().engine.dispose()
 
-    stop_check_jobs_thread()
+    if get_executor_keys_from_context() == 'local':
+        stop_check_jobs_thread()
+
     from meerschaum.api.routes._actions import _temp_jobs
     for name, job in _temp_jobs.items():
         job.delete()

meerschaum/api/dash/jobs.py

@@ -16,13 +16,12 @@ 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.utils.jobs import get_jobs, Job
-from meerschaum.utils.daemon import (
-    get_daemons,
-    get_running_daemons,
-    get_paused_daemons,
-    get_stopped_daemons,
-    Daemon,
+from meerschaum.jobs import (
+    get_jobs,
+    get_running_jobs,
+    get_paused_jobs,
+    get_stopped_jobs,
+    Job,
 )
 from meerschaum.config import get_config
 from meerschaum.utils.misc import sorted_dict
@@ -38,27 +37,25 @@ def get_jobs_cards(state: WebState):
     """
     Build cards and alerts lists for jobs.
     """
-    daemons = get_daemons()
-    jobs = get_jobs()
+    jobs = get_jobs(include_hidden=False)
     session_id = state['session-store.data'].get('session-id', None)
     is_authenticated = is_session_authenticated(session_id)
 
-    alert = alert_from_success_tuple(daemons)
     cards = []
 
     for name, job in jobs.items():
         d = job.daemon
         footer_children = html.Div(
             build_process_timestamps_children(d),
-            id = {'type': 'process-timestamps-div', 'index': d.daemon_id},
+            id = {'type': 'process-timestamps-div', 'index': name},
         )
         follow_logs_button = dbc.DropdownMenuItem(
             "Follow logs",
-            id = {'type': 'follow-logs-button', 'index': d.daemon_id},
+            id = {'type': 'follow-logs-button', 'index': name},
         )
         download_logs_button = dbc.DropdownMenuItem(
             "Download logs",
-            id = {'type': 'job-download-logs-button', 'index': d.daemon_id},
+            id = {'type': 'job-download-logs-button', 'index': name},
         )
         logs_menu_children = (
             ([follow_logs_button] if is_authenticated else []) + [download_logs_button]
@@ -66,19 +63,19 @@ def get_jobs_cards(state: WebState):
         header_children = [
             html.Div(
                 build_status_children(d),
-                id = {'type': 'manage-job-status-div', 'index': d.daemon_id},
-                style = {'float': 'left'},
+                id={'type': 'manage-job-status-div', 'index': name},
+                style={'float': 'left'},
             ),
             html.Div(
                 dbc.DropdownMenu(
                     logs_menu_children,
-                    label = "Logs",
-                    size = "sm",
-                    align_end = True,
-                    color = "secondary",
-                    menu_variant = 'dark',
+                    label="Logs",
+                    size="sm",
+                    align_end=True,
+                    color="secondary",
+                    menu_variant='dark',
                 ),
-                style = {'float': 'right'},
+                style={'float': 'right'},
             ),
         ]
 
@@ -87,10 +84,10 @@ def get_jobs_cards(state: WebState):
             html.Div(
                 html.P(
                     d.label,
-                    className = "card-text job-card-text", 
-                    style = {"word-wrap": "break-word"}
+                    className="card-text job-card-text",
+                    style={"word-wrap": "break-word"},
                 ),
-                style = {"white-space": "pre-wrap"},
+                style={"white-space": "pre-wrap"},
             ),
             html.Div(
                 (
@@ -98,9 +95,9 @@ def get_jobs_cards(state: WebState):
                     if is_authenticated
                     else []
                 ),
-                id = {'type': 'manage-job-buttons-div', 'index': d.daemon_id},
+                id={'type': 'manage-job-buttons-div', 'index': name},
             ),
-            html.Div(id={'type': 'manage-job-alert-div', 'index': d.daemon_id}),
+            html.Div(id={'type': 'manage-job-alert-div', 'index': name}),
         ]
 
         cards.append(
@@ -114,11 +111,11 @@ def get_jobs_cards(state: WebState):
     return cards, []
 
 
-def build_manage_job_buttons_div_children(daemon: Daemon):
+def build_manage_job_buttons_div_children(job: Job):
     """
     Return the children for the manage job buttons div.
     """
-    buttons = build_manage_job_buttons(daemon)
+    buttons = build_manage_job_buttons(job)
     if not buttons:
         return []
     return [
@@ -130,96 +127,98 @@ def build_manage_job_buttons_div_children(daemon: Daemon):
     ]
 
 
-def build_manage_job_buttons(daemon: Daemon):
+def build_manage_job_buttons(job: Job):
     """
-    Return the currently available job management buttons for a given Daemon.
+    Return the currently available job management buttons for a given Job.
     """
-    if daemon is None:
+    if job is None:
         return []
+
     start_button = dbc.Button(
         'Start',
-        size = 'sm',
-        color = 'success',
-        style = {'width': '100%'},
-        id = {
+        size='sm',
+        color='success',
+        style={'width': '100%'},
+        id={
             'type': 'manage-job-button',
             'action': 'start',
-            'index': daemon.daemon_id,
+            'index': job.name,
         },
     )
     pause_button = dbc.Button(
         'Pause',
-        size = 'sm',
-        color = 'warning',
-        style = {'width': '100%'},
-        id = {
+        size='sm',
+        color='warning',
+        style={'width': '100%'},
+        id={
             'type': 'manage-job-button',
             'action': 'pause',
-            'index': daemon.daemon_id,
+            'index': job.name,
         },
     )
     stop_button = dbc.Button(
         'Stop',
-        size = 'sm',
-        color = 'danger',
-        style = {'width': '100%'},
-        id = {
+        size='sm',
+        color='danger',
+        style={'width': '100%'},
+        id={
             'type': 'manage-job-button',
             'action': 'stop',
-            'index': daemon.daemon_id,
+            'index': job.name,
         },
     )
     delete_button = dbc.Button(
         'Delete',
-        size = 'sm',
-        color = 'danger',
-        style = {'width': '100%'},
-        id = {
+        size='sm',
+        color='danger',
+        style={'width': '100%'},
+        id={
             'type': 'manage-job-button',
             'action': 'delete',
-            'index': daemon.daemon_id,
+            'index': job.name,
         },
     )
     buttons = []
-    if daemon.status in ('stopped', 'paused'):
+    if job.status in ('stopped', 'paused'):
         buttons.append(start_button)
-    if daemon.status == 'stopped':
+    if job.status == 'stopped':
         buttons.append(delete_button)
-    if daemon.status in ('running',):
+    if job.status in ('running',):
         buttons.append(pause_button)
-    if daemon.status in ('running', 'paused'):
+    if job.status in ('running', 'paused'):
         buttons.append(stop_button)
 
     return buttons
 
 
-def build_status_children(daemon: Daemon) -> List[html.P]:
+def build_status_children(job: Job) -> List[html.P]:
     """
     Return the status HTML component for this daemon.
     """
-    if daemon is None:
+    if job is None:
         return STATUS_EMOJI['dne']
 
     status_str = (
-        STATUS_EMOJI.get(daemon.status, STATUS_EMOJI['stopped'])
+        STATUS_EMOJI.get(job.status, STATUS_EMOJI['stopped'])
         + ' '
-        + daemon.status.capitalize()
+        + job.status.capitalize()
     )
     return html.P(
         html.B(status_str),
-        className = f"{daemon.status}-job",
+        className=f"{job.status}-job",
     )
 
 
-def build_process_timestamps_children(daemon: Daemon) -> List[dbc.Row]:
+def build_process_timestamps_children(job: Job) -> List[dbc.Row]:
     """
     Return the children to the process timestamps in the footer of the job card.
     """
-    if daemon is None:
+    if job is None:
         return []
+
     children = []
     for timestamp_key, timestamp_val in sorted_dict(
-        daemon.properties.get('process', {})
+        job.daemon.properties.get('process', {})
     ).items():
         timestamp = dateutil_parser.parse(timestamp_val)
         timestamp_str = timestamp.strftime('%Y-%m-%d %H:%M UTC')
@@ -229,21 +228,21 @@ def build_process_timestamps_children(daemon: Daemon) -> List[dbc.Row]:
                     dbc.Col(
                         html.P(
                             timestamp_key.capitalize(),
-                            style = {'font-size': 'small'},
-                            className = 'text-muted mb-0',
+                            style={'font-size': 'small'},
+                            className='text-muted mb-0',
                         ),
-                        width = 4,
+                        width=4,
                     ),
                     dbc.Col(
                         html.P(
                             timestamp_str,
-                            style = {'font-size': 'small', 'text-align': 'right'},
-                            className = 'text-muted mb-0',
+                            style={'font-size': 'small', 'text-align': 'right'},
+                            className='text-muted mb-0',
                         ),
-                        width = 8,
+                        width=8,
                     ),
                 ],
-                justify = 'between', 
+                justify='between',
             )
         )
     return children

meerschaum/api/routes/_actions.py

@@ -16,7 +16,7 @@ from datetime import datetime, timezone
 from fastapi import WebSocket, WebSocketDisconnect
 
 from meerschaum.utils.misc import generate_password
-from meerschaum.utils.jobs import Job
+from meerschaum.jobs import Job
 from meerschaum.utils.warnings import warn
 from meerschaum.utils.typing import SuccessTuple, Union, List, Dict
 from meerschaum.api import (
@@ -92,6 +92,7 @@ async def do_action_websocket(websocket: WebSocket):
         )
 
     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
@@ -101,7 +102,11 @@ async def do_action_websocket(websocket: WebSocket):
                 detail="Invalid credentials.",
             )
 
-        auth_success, auth_msg = is_user_allowed_to_execute(user)
+        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(),
@@ -116,10 +121,10 @@ async def do_action_websocket(websocket: WebSocket):
         _ = kwargs.pop('shell', None)
         sysargs = parse_dict_to_sysargs(kwargs)
 
-        job_name = '.' + generate_password(12)
         job = Job(
             job_name,
             sysargs,
+            executor_keys='local',
             _properties={
                 'logs': {
                     'write_timestamps': False,