meerschaum 2.2.6__py3-none-any.whl → 2.3.0.dev1__py3-none-any.whl

meerschaum/utils/formatting/_jobs.py

@@ -7,86 +7,133 @@ Print jobs information.
 """
 
 from __future__ import annotations
-from meerschaum.utils.typing import List, Optional, Any
-from meerschaum.utils.daemon import (
-    Daemon,
-    get_daemons,
-    get_running_daemons,
-    get_stopped_daemons,
-    get_paused_daemons,
+
+from datetime import datetime, timezone
+
+import meerschaum as mrsm
+from meerschaum.utils.typing import List, Optional, Any, is_success_tuple, Dict
+from meerschaum.utils.jobs import (
+    Job,
+    get_jobs,
+    get_running_jobs,
+    get_stopped_jobs,
+    get_paused_jobs,
 )
+from meerschaum.config import get_config
+
 
 def pprint_jobs(
-        daemons: List[Daemon],
-        nopretty: bool = False,
-    ):
+    jobs: Dict[str, Job],
+    nopretty: bool = False,
+):
     """Pretty-print a list of Daemons."""
     from meerschaum.utils.formatting import make_header
     
-    running_daemons = get_running_daemons(daemons)
-    paused_daemons = get_paused_daemons(daemons)
-    stopped_daemons = get_stopped_daemons(daemons)
+    running_jobs = get_running_jobs(jobs=jobs)
+    paused_jobs = get_paused_jobs(jobs=jobs)
+    stopped_jobs = get_stopped_jobs(jobs=jobs)
+    executor_keys = (list(jobs.values())[0].executor_keys if jobs else None) or 'local'
 
     def _nopretty_print():
         from meerschaum.utils.misc import print_options
-        if running_daemons:
+        if running_jobs:
             if not nopretty:
                 print('\n' + make_header('Running jobs'))
-            for d in running_daemons:
-                pprint_job(d, nopretty=nopretty)
+            for name, job in running_jobs.items():
+                pprint_job(job, nopretty=nopretty)
 
-        if paused_daemons:
+        if paused_jobs:
             if not nopretty:
                 print('\n' + make_header('Paused jobs'))
-            for d in paused_daemons:
-                pprint_job(d, nopretty=nopretty)
+            for name, job in paused_jobs.items():
+                pprint_job(job, nopretty=nopretty)
 
-        if stopped_daemons:
+        if stopped_jobs:
             if not nopretty:
                 print('\n' + make_header('Stopped jobs'))
-            for d in stopped_daemons:
-                pprint_job(d, nopretty=nopretty)
+            for name, job in stopped_jobs.items():
+                pprint_job(job, nopretty=nopretty)
 
     def _pretty_print():
-        from meerschaum.utils.formatting import get_console, UNICODE, ANSI
+        from meerschaum.utils.formatting import get_console, UNICODE, ANSI, format_success_tuple
         from meerschaum.utils.packages import import_rich, attempt_import
         rich = import_rich()
-        rich_table, rich_text, rich_box = attempt_import('rich.table', 'rich.text', 'rich.box')
+        rich_table, rich_text, rich_box, rich_json, rich_panel, rich_console = attempt_import(
+            'rich.table', 'rich.text', 'rich.box', 'rich.json', 'rich.panel', 'rich.console',
+        )
         table = rich_table.Table(
-            title = rich_text.Text('Jobs'),
-            box = (rich_box.ROUNDED if UNICODE else rich_box.ASCII),
-            show_lines = True,
-            show_header = ANSI,
+            title=rich_text.Text(f"\nJobs on Executor '{executor_keys}'"),
+            box=(rich_box.ROUNDED if UNICODE else rich_box.ASCII),
+            show_lines=True,
+            show_header=ANSI,
         )
         table.add_column("Name", justify='right', style=('magenta' if ANSI else ''))
         table.add_column("Command")
         table.add_column("Status")
 
-        for d in running_daemons:
-            if d.hidden:
+        def get_success_text(job):
+            success_tuple = job.result
+            if not is_success_tuple(success_tuple):
+                return rich_text.Text('')
+
+            success = success_tuple[0]
+            msg = success_tuple[1]
+            lines = msg.split('\n')
+            msg = '\n'.join(line.lstrip().rstrip() for line in lines)
+            success_tuple = success, msg
+            success_tuple_str = (
+                format_success_tuple(success_tuple, left_padding=1)
+                if success_tuple is not None
+                else None
+            )
+            success_tuple_text = (
+                rich_text.Text.from_ansi(success_tuple_str)
+            ) if success_tuple_str is not None else None
+
+            if success_tuple_text is None:
+                return rich_text.Text('')
+
+            return rich_text.Text('\n') + success_tuple_text
+
+
+        for name, job in running_jobs.items():
+            if job.hidden:
                 continue
+
+            status_text = (
+                rich_text.Text(job.status, style=('green' if ANSI else ''))
+                if not job.is_blocking_on_stdin()
+                else rich_text.Text('waiting for input', style=('yellow' if ANSI else ''))
+            )
+
             table.add_row(
-                d.daemon_id,
-                d.label,
-                rich_text.Text(d.status, style=('green' if ANSI else ''))
+                job.name,
+                job.label,
+                rich_console.Group(status_text),
             )
 
-        for d in paused_daemons:
-            if d.hidden:
+        for name, job in paused_jobs.items():
+            if job.hidden:
                 continue
             table.add_row(
-                d.daemon_id,
-                d.label,
-                rich_text.Text(d.status, style=('yellow' if ANSI else ''))
+                job.name,
+                job.label,
+                rich_console.Group(
+                    rich_text.Text(job.status, style=('yellow' if ANSI else '')),
+                ),
             )
 
-        for d in stopped_daemons:
-            if d.hidden:
+        for name, job in stopped_jobs.items():
+            if job.hidden:
                 continue
+
             table.add_row(
-                d.daemon_id,
-                d.label,
-                rich_text.Text(d.status, style=('red' if ANSI else ''))
+                job.name,
+                job.label,
+                rich_console.Group(
+                    rich_text.Text(job.status, style=('red' if ANSI else '')),
+                    get_success_text(job)
+                ),
             )
         get_console().print(table)
 
@@ -95,15 +142,35 @@ def pprint_jobs(
 
 
 def pprint_job(
-        daemon: Daemon,
-        nopretty: bool = False,
-    ):
-    """Pretty-print a single Daemon."""
-    if daemon.hidden:
+    job: Job,
+    nopretty: bool = False,
+):
+    """Pretty-print a single `Job`."""
+    if job.hidden:
         return
+
     from meerschaum.utils.warnings import info
     if not nopretty:
-        info(f"Command for job '{daemon.daemon_id}':")
-        print('\n' + daemon.label + '\n')
+        info(f"Command for job '{job.name}':")
+        print('\n' + job.label + '\n')
     else:
-        print(daemon.daemon_id)
+        print(job.name)
+
+
+def strip_timestamp_from_line(line: str) -> str:
+    """
+    Remove the leading timestamp from a job's line (if present).
+    """
+    now = datetime.now(timezone.utc)
+    timestamp_format = get_config('jobs', 'logs', 'timestamps', 'format')
+    now_str = now.strftime(timestamp_format)
+
+    date_prefix_str = line[:len(now_str)]
+    try:
+        line_timestamp = datetime.strptime(date_prefix_str, timestamp_format)
+    except Exception:
+        line_timestamp = None
+    if line_timestamp:
+        line = line[(len(now_str) + 3):]
+
+    return line

meerschaum/utils/formatting/_shell.py

@@ -47,9 +47,15 @@ def clear_screen(debug: bool = False) -> bool:
     from meerschaum.utils.formatting import ANSI, get_console
     from meerschaum.utils.debug import dprint
     from meerschaum.config import get_config
+    from meerschaum.utils.daemon import running_in_daemon
     global _tried_clear_command
+
+    if running_in_daemon():
+        return True
+
     if not get_config('shell', 'clear_screen'):
         return True
+
     print("", end="", flush=True)
     if debug:
         dprint("Skipping screen clear.")