meerschaum 2.2.5.dev3__py3-none-any.whl → 2.2.7__py3-none-any.whl

meerschaum/utils/daemon/RotatingFile.py

@@ -32,14 +32,14 @@ class RotatingFile(io.IOBase):
     SEEK_BACK_ATTEMPTS: int = 5
 
     def __init__(
-            self,
-            file_path: pathlib.Path,
-            num_files_to_keep: Optional[int] = None,
-            max_file_size: Optional[int] = None,
-            redirect_streams: bool = False,
-            write_timestamps: bool = False,
-            timestamp_format: str = '%Y-%m-%d %H:%M',
-        ):
+        self,
+        file_path: pathlib.Path,
+        num_files_to_keep: Optional[int] = None,
+        max_file_size: Optional[int] = None,
+        redirect_streams: bool = False,
+        write_timestamps: bool = False,
+        timestamp_format: str = '%Y-%m-%d %H:%M',
+    ):
         """
         Create a file-like object which manages other files.
 
@@ -79,11 +79,7 @@ class RotatingFile(io.IOBase):
         self.redirect_streams = redirect_streams
         self.write_timestamps = write_timestamps
         self.timestamp_format = timestamp_format
-        self.subfile_regex_pattern = re.compile(
-            r'^'
-            + self.file_path.name
-            + r'(?:\.\d+)?$'
-        )
+        self.subfile_regex_pattern = re.compile(r'(.*)\.log(?:\.\d+)?$')
 
         ### When subfiles are opened, map from their index to the file objects.
         self.subfile_objects = {}
@@ -173,7 +169,7 @@ class RotatingFile(io.IOBase):
         latest_index = (
             self.get_index_from_subfile_name(existing_subfile_paths[-1].name)
             if existing_subfile_paths
-            else -1
+            else 0
         )
         return latest_index
 
@@ -222,9 +218,12 @@ class RotatingFile(io.IOBase):
             [
                 (file_name, self.get_index_from_subfile_name(file_name))
                 for file_name in os.listdir(self.file_path.parent)
-                if re.match(self.subfile_regex_pattern, file_name)
+                if (
+                    file_name.startswith(self.file_path.name)
+                    and re.match(self.subfile_regex_pattern, file_name)
+                )
             ],
-            key = lambda x: x[1],
+            key=lambda x: x[1],
         )
         return [
             (self.file_path.parent / file_name)
@@ -372,6 +371,9 @@ class RotatingFile(io.IOBase):
                 self._current_file_obj.write(data)
                 if suffix_str:
                     self._current_file_obj.write(suffix_str)
+            except BrokenPipeError:
+                warn("BrokenPipeError encountered. The daemon may have been terminated.")
+                return
             except Exception as e:
                 warn(f"Failed to write to subfile:\n{traceback.format_exc()}")
             self.flush()
@@ -582,10 +584,14 @@ class RotatingFile(io.IOBase):
         if self.redirect_streams:
             try:
                 sys.stdout.flush()
+            except BrokenPipeError:
+                pass
             except Exception as e:
                 warn(f"Failed to flush STDOUT:\n{traceback.format_exc()}")
             try:
                 sys.stderr.flush()
+            except BrokenPipeError:
+                pass
             except Exception as e:
                 warn(f"Failed to flush STDERR:\n{traceback.format_exc()}")
 
@@ -597,7 +603,6 @@ class RotatingFile(io.IOBase):
         if not self.write_timestamps:
             return
 
-        threads = self.__dict__.get('_interceptor_threads', [])
         self._stdout_interceptor = FileDescriptorInterceptor(
             sys.stdout.fileno(),
             self.get_timestamp_prefix_str,
@@ -640,6 +645,7 @@ class RotatingFile(io.IOBase):
         """
         if not self.write_timestamps:
             return
+
         interceptors = self.__dict__.get('_interceptors', [])
         interceptor_threads = self.__dict__.get('_interceptor_threads', [])
 

meerschaum/utils/daemon/__init__.py

@@ -67,19 +67,17 @@ def daemon_entry(sysargs: Optional[List[str]] = None) -> SuccessTuple:
             if daemon.status == 'running':
                 return True, f"Daemon '{daemon}' is already running."
             return daemon.run(
-                debug = debug,
-                allow_dirty_run = True,
+                debug=debug,
+                allow_dirty_run=True,
             )
 
     success_tuple = run_daemon(
         entry,
         filtered_sysargs,
-        daemon_id = _args.get('name', None) if _args else None,
-        label = label,
-        keep_daemon_output = ('--rm' not in sysargs)
+        daemon_id=_args.get('name', None) if _args else None,
+        label=label,
+        keep_daemon_output=('--rm' not in sysargs),
     )
-    if not isinstance(success_tuple, tuple):
-        success_tuple = False, str(success_tuple)
     return success_tuple
 
 
@@ -109,25 +107,25 @@ def daemon_action(**kw) -> SuccessTuple:
 
 
 def run_daemon(
-        func: Callable[[Any], Any],
-        *args,
-        daemon_id: Optional[str] = None,
-        keep_daemon_output: bool = False,
-        allow_dirty_run: bool = False,
-        label: Optional[str] = None,
-        **kw
-    ) -> Any:
+    func: Callable[[Any], Any],
+    *args,
+    daemon_id: Optional[str] = None,
+    keep_daemon_output: bool = True,
+    allow_dirty_run: bool = False,
+    label: Optional[str] = None,
+    **kw
+) -> Any:
     """Execute a function as a daemon."""
     daemon = Daemon(
         func,
-        daemon_id = daemon_id,
-        target_args = [arg for arg in args],
-        target_kw = kw,
-        label = label,
+        daemon_id=daemon_id,
+        target_args=[arg for arg in args],
+        target_kw=kw,
+        label=label,
     )
     return daemon.run(
-        keep_daemon_output = keep_daemon_output,
-        allow_dirty_run = allow_dirty_run,
+        keep_daemon_output=keep_daemon_output,
+        allow_dirty_run=allow_dirty_run,
     )
 
 
@@ -268,3 +266,12 @@ def get_filtered_daemons(
             pass
         daemons.append(d)
     return daemons
+
+
+def running_in_daemon() -> bool:
+    """
+    Return whether the current thread is running in a Daemon context.
+    """
+    from meerschaum.config.static import STATIC_CONFIG
+    daemon_env_var = STATIC_CONFIG['environment']['daemon_id']
+    return daemon_env_var in os.environ

meerschaum/utils/dataframe.py

@@ -8,13 +8,21 @@ Utility functions for working with DataFrames.
 
 from __future__ import annotations
 from datetime import datetime
+
+import meerschaum as mrsm
 from meerschaum.utils.typing import (
     Optional, Dict, Any, List, Hashable, Generator,
-    Iterator, Iterable, Union, Tuple,
+    Iterator, Iterable, Union, TYPE_CHECKING,
 )
 
+if TYPE_CHECKING:
+    pd, dask = mrsm.attempt_import('pandas', 'dask')
+
 
-def add_missing_cols_to_df(df: 'pd.DataFrame', dtypes: Dict[str, Any]) -> pd.DataFrame:
+def add_missing_cols_to_df(
+    df: 'pd.DataFrame',
+    dtypes: Dict[str, Any],
+) -> 'pd.DataFrame':
     """
     Add columns from the dtypes dictionary as null columns to a new DataFrame.
 
@@ -723,7 +731,7 @@ def get_datetime_bound_from_df(
         df: Union['pd.DataFrame', dict, list],
         datetime_column: str,
         minimum: bool = True,
-    ) -> Union[int, 'datetime.datetime', None]:
+    ) -> Union[int, datetime, None]:
     """
     Return the minimum or maximum datetime (or integer) from a DataFrame.
 
@@ -818,7 +826,7 @@ def chunksize_to_npartitions(chunksize: Optional[int]) -> int:
 
 
 def df_from_literal(
-        pipe: Optional['meerschaum.Pipe'] = None,
+        pipe: Optional[mrsm.Pipe] = None,
         literal: str = None,
         debug: bool = False
     ) -> 'pd.DataFrame':

meerschaum/utils/debug.py

@@ -93,22 +93,16 @@ def _checkpoint(
     ) -> None:
     """If the `_progress` and `_task` objects are provided, increment the task by one step.
     If `_total` is provided, update the total instead.
-
-    Parameters
-    ----------
-    _progress: Optional['rich.progress.Progress'] :
-         (Default value = None)
-    _task: Optional[int] :
-         (Default value = None)
-    _total: Optional[int] :
-         (Default value = None)
-    **kw :
-        
-
-    Returns
-    -------
-
     """
     if _progress is not None and _task is not None:
         _kw = {'total': _total} if _total is not None else {'advance': 1}
         _progress.update(_task, **_kw)
+
+
+def trace(browser: bool = True):
+    """
+    Open a web-based debugger to trace the execution of the program.
+    """
+    from meerschaum.utils.packages import attempt_import
+    heartrate = attempt_import('heartrate')
+    heartrate.trace(files=heartrate.files.all, browser=browser)

meerschaum/utils/formatting/__init__.py

@@ -10,6 +10,7 @@ from __future__ import annotations
 import platform
 import os
 import sys
+import meerschaum as mrsm
 from meerschaum.utils.typing import Optional, Union, Any, Dict
 from meerschaum.utils.formatting._shell import make_header
 from meerschaum.utils.formatting._pprint import pprint
@@ -33,6 +34,7 @@ __all__ = sorted([
     'colored',
     'translate_rich_to_termcolor',
     'get_console',
+    'format_success_tuple',
     'print_tuple',
     'print_options',
     'fill_ansi',
@@ -222,16 +224,17 @@ def get_console():
 
 
 def print_tuple(
-        tup: tuple,
-        skip_common: bool = True,
-        common_only: bool = False,
-        upper_padding: int = 0,
-        lower_padding: int = 0,
-        calm: bool = False,
-        _progress: Optional['rich.progress.Progress'] = None,
-    ) -> None:
+    tup: mrsm.SuccessTuple,
+    skip_common: bool = True,
+    common_only: bool = False,
+    upper_padding: int = 0,
+    lower_padding: int = 0,
+    left_padding: int = 1,
+    calm: bool = False,
+    _progress: Optional['rich.progress.Progress'] = None,
+) -> None:
     """
-    Print `meerschaum.utils.typing.SuccessTuple`.
+    Format `meerschaum.utils.typing.SuccessTuple`.
 
     Parameters
     ----------
@@ -247,6 +250,59 @@ def print_tuple(
     lower_padding: int, default 0
         How many newlines to append to the message.
 
+    left_padding: int, default 1
+        How mant spaces to preprend to the message.
+
+    calm: bool, default False
+        If `True`, use the default emoji and color scheme.
+
+    """
+    from meerschaum.config.static import STATIC_CONFIG
+    do_print = True
+
+    omit_messages = STATIC_CONFIG['system']['success']['ignore']
+
+    if common_only:
+        skip_common = False
+        do_print = tup[1] in omit_messages
+
+    if skip_common:
+        do_print = tup[1] not in omit_messages
+
+    if not do_print:
+        return
+
+    print(format_success_tuple(
+        tup,
+        upper_padding=upper_padding,
+        lower_padding=lower_padding,
+        calm=calm,
+        _progress=_progress,
+    ))
+
+
+def format_success_tuple(
+    tup: mrsm.SuccessTuple,
+    upper_padding: int = 0,
+    lower_padding: int = 0,
+    left_padding: int = 1,
+    calm: bool = False,
+    _progress: Optional['rich.progress.Progress'] = None,
+) -> str:
+    """
+    Format `meerschaum.utils.typing.SuccessTuple`.
+
+    Parameters
+    ----------
+    upper_padding: int, default 0
+        How many newlines to prepend to the message.
+
+    lower_padding: int, default 0
+        How many newlines to append to the message.
+
+    left_padding: int, default 1
+        How mant spaces to preprend to the message.
+
     calm: bool, default False
         If `True`, use the default emoji and color scheme.
     """
@@ -261,46 +317,35 @@ def print_tuple(
     if calm:
         status += '_calm'
 
-    omit_messages = STATIC_CONFIG['system']['success']['ignore']
+    ANSI, CHARSET = __getattr__('ANSI'), __getattr__('CHARSET')
+    from meerschaum.config import get_config
+    status_config = get_config('formatting', status, patch=True)
 
-    do_print = True
+    msg = (' ' * left_padding) + status_config[CHARSET]['icon'] + ' ' + str(tup[1])
+    lines = msg.split('\n')
+    lines = [lines[0]] + [
+        (('    ' + line if not line.startswith(' ') else line))
+        for line in lines[1:]
+    ]
+    if ANSI:
+        lines[0] = fill_ansi(highlight_pipes(lines[0]), **status_config['ansi']['rich'])
 
-    if common_only:
-        skip_common = False
-        do_print = tup[1] in omit_messages
-
-    if skip_common:
-        do_print = tup[1] not in omit_messages
-
-    if do_print:
-        ANSI, CHARSET = __getattr__('ANSI'), __getattr__('CHARSET')
-        from meerschaum.config import get_config
-        status_config = get_config('formatting', status, patch=True)
-
-        msg = ' ' + status_config[CHARSET]['icon'] + ' ' + str(tup[1])
-        lines = msg.split('\n')
-        lines = [lines[0]] + [
-            (('    ' + line if not line.startswith(' ') else line))
-            for line in lines[1:]
-        ]
-        if ANSI:
-            lines[0] = fill_ansi(highlight_pipes(lines[0]), **status_config['ansi']['rich'])
-        msg = '\n'.join(lines)
-        msg = ('\n' * upper_padding) + msg + ('\n' * lower_padding)
-        print(msg)
+    msg = '\n'.join(lines)
+    msg = ('\n' * upper_padding) + msg + ('\n' * lower_padding)
+    return msg
 
 
 def print_options(
-        options: Optional[Dict[str, Any]] = None,
-        nopretty: bool = False,
-        no_rich: bool = False,
-        name: str = 'options',
-        header: Optional[str] = None,
-        num_cols: Optional[int] = None,
-        adjust_cols: bool = True,
-        sort_options: bool = False,
-        **kw
-    ) -> None:
+    options: Optional[Dict[str, Any]] = None,
+    nopretty: bool = False,
+    no_rich: bool = False,
+    name: str = 'options',
+    header: Optional[str] = None,
+    num_cols: Optional[int] = None,
+    adjust_cols: bool = True,
+    sort_options: bool = False,
+    **kw
+) -> None:
     """
     Print items in an iterable as a fancy table.
 
@@ -342,7 +387,7 @@ def print_options(
         _options.append(str(o))
     if sort_options:
         _options = sorted(_options)
-    _header = f"Available {name}" if header is None else header
+    _header = f"\nAvailable {name}" if header is None else header
 
     if num_cols is None:
         num_cols = 8
@@ -388,7 +433,7 @@ def print_options(
 
     if _header is not None:
         table = Table(
-            title = ('\n' + _header) if header else header,
+            title = _header,
             box = box.SIMPLE,
             show_header = False,
             show_footer = False,
@@ -467,6 +512,7 @@ def fill_ansi(string: str, style: str = '') -> str:
 
     return rich_text_to_str(msg)
 
+
 def __getattr__(name: str) -> str:
     """
     Lazily load module-level variables.

meerschaum/utils/formatting/_jobs.py

@@ -7,7 +7,8 @@ Print jobs information.
 """
 
 from __future__ import annotations
-from meerschaum.utils.typing import List, Optional, Any
+import meerschaum as mrsm
+from meerschaum.utils.typing import List, Optional, Any, is_success_tuple
 from meerschaum.utils.daemon import (
     Daemon,
     get_daemons,
@@ -17,9 +18,9 @@ from meerschaum.utils.daemon import (
 )
 
 def pprint_jobs(
-        daemons: List[Daemon],
-        nopretty: bool = False,
-    ):
+    daemons: List[Daemon],
+    nopretty: bool = False,
+):
     """Pretty-print a list of Daemons."""
     from meerschaum.utils.formatting import make_header
     
@@ -48,10 +49,12 @@ def pprint_jobs(
                 pprint_job(d, 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),
@@ -62,13 +65,42 @@ def pprint_jobs(
         table.add_column("Command")
         table.add_column("Status")
 
+        def get_success_text(d):
+            success_tuple = d.properties.get('result', None)
+            if isinstance(success_tuple, list):
+                success_tuple = tuple(success_tuple)
+            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 d in running_daemons:
             if d.hidden:
                 continue
             table.add_row(
                 d.daemon_id,
                 d.label,
-                rich_text.Text(d.status, style=('green' if ANSI else ''))
+                rich_console.Group(
+                    rich_text.Text(d.status, style=('green' if ANSI else '')),
+                ),
             )
 
         for d in paused_daemons:
@@ -77,16 +109,22 @@ def pprint_jobs(
             table.add_row(
                 d.daemon_id,
                 d.label,
-                rich_text.Text(d.status, style=('yellow' if ANSI else ''))
+                rich_console.Group(
+                    rich_text.Text(d.status, style=('yellow' if ANSI else '')),
+                ),
             )
 
         for d in stopped_daemons:
             if d.hidden:
                 continue
+
             table.add_row(
                 d.daemon_id,
                 d.label,
-                rich_text.Text(d.status, style=('red' if ANSI else ''))
+                rich_console.Group(
+                    rich_text.Text(d.status, style=('red' if ANSI else '')),
+                    get_success_text(d)
+                ),
             )
         get_console().print(table)