meerschaum 2.9.5__py3-none-any.whl → 3.0.0__py3-none-any.whl

meerschaum/utils/formatting/__init__.py

@@ -209,6 +209,8 @@ def get_console():
     try:
         console = rich_console.Console(force_terminal=True, color_system='truecolor')
     except Exception:
+        import traceback
+        traceback.print_exc()
         console = None
     return console
 
@@ -247,7 +249,7 @@ def print_tuple(
         If `True`, use the default emoji and color scheme.
 
     """
-    from meerschaum.config.static import STATIC_CONFIG
+    from meerschaum._internal.static import STATIC_CONFIG
     do_print = True
 
     omit_messages = STATIC_CONFIG['system']['success']['ignore']
@@ -488,8 +490,9 @@ def fill_ansi(string: str, style: str = '') -> str:
         msg = Text.from_ansi(string)
     except AttributeError:
         import traceback
-        traceback.print_stack()
+        traceback.print_exc()
         msg = ''
+
     plain_indices = []
     for left_span, right_span in iterate_chunks(msg.spans, 2, fillvalue=len(msg)):
         left = left_span.end

meerschaum/utils/formatting/_jobs.py

@@ -97,7 +97,7 @@ def pprint_jobs(
             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)
+                format_success_tuple(success_tuple, left_padding=0)
                 if success_tuple is not None
                 else None
             )

meerschaum/utils/formatting/_pipes.py

@@ -12,6 +12,7 @@ import meerschaum as mrsm
 from meerschaum.utils.typing import PipesDict, Dict, Union, Optional, SuccessTuple, Any, List
 from meerschaum.config import get_config
 
+
 def pprint_pipes(pipes: PipesDict) -> None:
     """Print a stylized tree of a Pipes dictionary.
     Supports ANSI and UNICODE global settings."""
@@ -276,18 +277,31 @@ def pprint_pipe_columns(
 
 
 def pipe_repr(
-    pipe: mrsm.Pipe,
+    pipe: Union[mrsm.Pipe, Dict[str, Any]],
     as_rich_text: bool = False,
     ansi: Optional[bool] = None,
 ) -> Union[str, 'rich.text.Text']:
     """
     Return a formatted string for representing a `meerschaum.Pipe`.
     """
-    from meerschaum.utils.formatting import UNICODE, ANSI, CHARSET, colored, rich_text_to_str
+    from meerschaum.utils.formatting import ANSI, colored, rich_text_to_str
     from meerschaum.utils.packages import import_rich, attempt_import
-    rich = import_rich()
+    import meerschaum as mrsm
+
+    _ = import_rich()
     Text = attempt_import('rich.text').Text
 
+    if isinstance(pipe, mrsm.Pipe):
+        connector_keys = pipe.connector_keys
+        metric_key = pipe.metric_key
+        location_key = pipe.location_key
+        instance_keys = pipe.instance_keys
+    else:
+        connector_keys = pipe.get('connector_keys')
+        metric_key = pipe.get('metric_key')
+        location_key = pipe.get('location_key')
+        instance_keys = pipe.get('instance_keys', get_config('meerschaum', 'instance'))
+
     styles = get_config('formatting', 'pipes', '__repr__', 'ansi', 'styles')
     if not ANSI or (ansi is False):
         styles = {k: '' for k in styles}
@@ -297,26 +311,26 @@ def pipe_repr(
     )
     text_obj = (
         Text.from_markup(_pipe_style_prefix + "Pipe(" + _pipe_style_suffix)
-        + colored(("'" + pipe.connector_keys + "'"), style=styles['connector'], as_rich_text=True)
+        + colored(("'" + connector_keys + "'"), style=styles['connector'], as_rich_text=True)
         + Text.from_markup(_pipe_style_prefix + ", " + _pipe_style_suffix)
-        + colored(("'" + pipe.metric_key + "'"), style=styles['metric'], as_rich_text=True)
+        + colored(("'" + metric_key + "'"), style=styles['metric'], as_rich_text=True)
         + (
             (
                 colored(', ', style=styles['punctuation'], as_rich_text=True)
                 + colored(
-                    ("'" + pipe.location_key + "'"),
+                    ("'" + location_key + "'"),
                     style=styles['location'], as_rich_text=True
                 )
-            ) if pipe.location_key is not None
+            ) if location_key is not None
             else colored('', style='', as_rich_text=True)
         ) + (
             ( ### Add the `instance=` argument.
                 colored(', instance=', style=styles['punctuation'], as_rich_text=True)
                 + colored(
-                    ("'" + pipe.instance_keys + "'"),
+                    ("'" + instance_keys + "'"),
                     style=styles['instance'], as_rich_text=True
                 )
-            ) if pipe.instance_keys != get_config('meerschaum', 'instance')
+            ) if instance_keys != get_config('meerschaum', 'instance')
             else colored('', style='', as_rich_text=True)
         )
         + Text.from_markup(_pipe_style_prefix + ")" + _pipe_style_suffix)
@@ -326,6 +340,7 @@ def pipe_repr(
     return rich_text_to_str(text_obj).replace('\n', '')
 
 
+
 def highlight_pipes(message: str) -> str:
     """
     Add syntax highlighting to an info message containing stringified `meerschaum.Pipe` objects.
@@ -333,56 +348,43 @@ def highlight_pipes(message: str) -> str:
     if 'Pipe(' not in message:
         return message
 
-    from meerschaum import Pipe
+    from meerschaum.utils.misc import parse_arguments_str
     segments = message.split('Pipe(')
     msg = ''
-    _d = {}
     for i, segment in enumerate(segments):
-        comma_index = segment.find(',')
-        paren_index = segment.find(')')
-        single_quote_index = segment.find("'")
-        double_quote_index = segment.find('"')
-
-        has_comma = comma_index != -1
-        has_paren = paren_index != -1
-        has_single_quote = single_quote_index != -1
-        has_double_quote = double_quote_index != -1
-        has_quote = has_single_quote or has_double_quote
-        quote_index = (
-            min(single_quote_index, double_quote_index)
-            if has_double_quote and has_single_quote
-            else (single_quote_index if has_single_quote else double_quote_index)
-        )
-
-        has_pipe = (
-            has_comma
-            and
-            has_paren
-            and
-            has_quote
-            and not
-            (comma_index > paren_index or quote_index > paren_index)
-        )
+        if i == 0:
+            msg += segment
+            continue
 
-        if has_pipe:
-            code = "_d['pipe'] = Pipe(" + segment[:paren_index + 1]
-            try:
-                exec(code)
-                _to_add = pipe_repr(_d['pipe']) + segment[paren_index + 1:]
-                _ = _d.pop('pipe', None)
-            except Exception as e:
-                _to_add = 'Pipe(' + segment
-            msg += _to_add
+        paren_index = segment.find(')')
+        if paren_index == -1:
+            msg += 'Pipe(' + segment
             continue
-        msg += segment
+        
+        pipe_args_str = segment[:paren_index]
+        try:
+            args, kwargs = parse_arguments_str(pipe_args_str)
+            pipe_dict = {
+                'connector_keys': args[0],
+                'metric_key': args[1],
+            }
+            if len(args) > 2:
+                pipe_dict['location_key'] = args[2]
+            if 'instance' in kwargs:
+                pipe_dict['instance_keys'] = kwargs['instance']
+            
+            _to_add = pipe_repr(pipe_dict) + segment[paren_index + 1:]
+        except Exception:
+            _to_add = 'Pipe(' + segment
+        msg += _to_add
     return msg
 
 
 def format_pipe_success_tuple(
-        pipe: mrsm.Pipe,
-        success_tuple: SuccessTuple,
-        nopretty: bool = False,
-    ) -> str:
+    pipe: mrsm.Pipe,
+    success_tuple: SuccessTuple,
+    nopretty: bool = False,
+) -> str:
     """
     Return a formatted string of a pipe and its resulting SuccessTuple.
 

meerschaum/utils/formatting/_pprint.py

@@ -66,6 +66,7 @@ def pprint(
     except Exception:
         args_copy = args
         modify = False
+
     _args = []
     for a in args:
         c = a

meerschaum/utils/formatting/_shell.py

@@ -6,20 +6,19 @@
 Formatting functions for the interactive shell
 """
 
-from re import sub
 from meerschaum.utils.threading import Lock
 _locks = {'_tried_clear_command': Lock()}
 
+from meerschaum._internal.static import STATIC_CONFIG
+FLUSH_TOKEN: str = STATIC_CONFIG['jobs']['flush_token']
 
-def make_header(
-    message: str,
-    ruler: str = '─',
-) -> str:
+
+def make_header(message: str, ruler: str = '─', left_pad: int = 2) -> str:
     """Format a message string with a ruler.
     Length of the ruler is the length of the longest word.
     
     Example:
-        'My\nheader' -> 'My\nheader\n──────'
+        'My\nheader' -> '  My\n  header\n  ──────'
     """
 
     from meerschaum.utils.formatting import ANSI, UNICODE, colored
@@ -32,10 +31,15 @@ def make_header(
         if length > max_length:
             max_length = length
 
-    s = message + "\n"
-    for i in range(max_length):
-        s += ruler
-    return s
+    left_buffer = left_pad * ' '
+
+    return (
+        left_buffer
+        + message.replace('\n', '\n' + left_buffer)
+        + "\n"
+        + left_buffer
+        + (ruler * max_length)
+    )
 
 
 _tried_clear_command = None
@@ -49,28 +53,40 @@ def clear_screen(debug: bool = False) -> bool:
     from meerschaum.utils.debug import dprint
     from meerschaum.config import get_config
     from meerschaum.utils.daemon import running_in_daemon
+    from meerschaum._internal.static import STATIC_CONFIG
     global _tried_clear_command
+    clear_string = '\033[2J'
+    reset_string = '\033[0m'
+    clear_token = STATIC_CONFIG['jobs']['clear_token']
 
-    if running_in_daemon():
+    if not get_config('shell', 'clear_screen'):
         return True
 
-    if not get_config('shell', 'clear_screen'):
+    if running_in_daemon():
+        if debug:
+            dprint("Skip printing clear token.")
+            flush_stdout()
+            return True
+
+        print(clear_token, flush=True)
         return True
 
-    print("", end="", flush=True)
+
+    flush_stdout()
     if debug:
         dprint("Skipping screen clear.")
         return True
+
     if ANSI and platform.system() != 'Windows':
         if get_console() is not None:
             get_console().clear()
-            print("", end="", flush=True)
+            flush_stdout()
             return True
-        clear_string = '\033[2J'
-        reset_string = '\033[0m'
+
         print(clear_string + reset_string, end="")
-        print("", end="", flush=True)
+        flush_stdout()
         return True
+
     ### ANSI support is disabled, try system level instead
     if _tried_clear_command is not None:
         return os.system(_tried_clear_command) == 0
@@ -79,7 +95,7 @@ def clear_screen(debug: bool = False) -> bool:
     command = 'clear' if platform.system() != 'Windows' else 'cls'
     try:
         rc = os.system(command)
-    except Exception as e:
+    except Exception:
         pass
     if rc == 0:
         with _locks['_tried_clear_command']:
@@ -87,6 +103,16 @@ def clear_screen(debug: bool = False) -> bool:
     return rc == 0
 
 
+def flush_stdout():
+    """
+    Flush stdout, including printing the flush token for daemons.
+    """
+    from meerschaum.utils.daemon import running_in_daemon
+    print('', end='', flush=True)
+    if running_in_daemon():
+        print(FLUSH_TOKEN, end='', flush=True)
+
+
 def flush_with_newlines(debug: bool = False) -> None:
     """Print newlines such that the entire terminal is cleared and new text will show up at the bottom."""
     import sys