meerschaum 3.0.0rc4__py3-none-any.whl → 3.0.0rc8__py3-none-any.whl

meerschaum/utils/formatting/_pipes.py

@@ -277,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}
@@ -298,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)
@@ -327,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.
@@ -334,48 +348,35 @@ 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
 
 

meerschaum/utils/formatting/_shell.py

@@ -6,10 +6,12 @@
 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 = '─', left_pad: int = 2) -> str:
     """Format a message string with a ruler.
@@ -51,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
@@ -81,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']:
@@ -89,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

meerschaum/utils/misc.py

@@ -6,9 +6,11 @@ Miscellaneous functions go here
 """
 
 from __future__ import annotations
+
 import sys
 import functools
-from datetime import timedelta, datetime, timezone
+from datetime import timedelta, datetime
+
 from meerschaum.utils.typing import (
     Union,
     Any,
@@ -20,13 +22,8 @@ from meerschaum.utils.typing import (
     Iterable,
     PipesDict,
     Tuple,
-    InstanceConnector,
-    Hashable,
-    Generator,
-    Iterator,
     TYPE_CHECKING,
 )
-import meerschaum as mrsm
 if TYPE_CHECKING:
     import collections
 
@@ -43,6 +40,9 @@ __pdoc__: Dict[str, bool] = {
     'df_is_chunk_generator': False,
     'choices_docstring': False,
     '_get_subaction_names': False,
+    'is_pipe_registered': False,
+    'replace_pipes_in_dict': False,
+    'round_time': False,
 }
 
 
@@ -347,37 +347,6 @@ def edit_file(
     return rc == 0
 
 
-def is_pipe_registered(
-    pipe: mrsm.Pipe,
-    pipes: PipesDict,
-    debug: bool = False
-) -> bool:
-    """
-    Check if a Pipe is inside the pipes dictionary.
-
-    Parameters
-    ----------
-    pipe: meerschaum.Pipe
-        The pipe to see if it's in the dictionary.
-
-    pipes: PipesDict
-        The dictionary to search inside.
-
-    debug: bool, default False
-        Verbosity toggle.
-
-    Returns
-    -------
-    A bool indicating whether the pipe is inside the dictionary.
-    """
-    from meerschaum.utils.debug import dprint
-    ck, mk, lk = pipe.connector_keys, pipe.metric_key, pipe.location_key
-    if debug:
-        dprint(f'{ck}, {mk}, {lk}')
-        dprint(f'{pipe}, {pipes}')
-    return ck in pipes and mk in pipes[ck] and lk in pipes[ck][mk]
-
-
 def get_cols_lines(default_cols: int = 100, default_lines: int = 120) -> Tuple[int, int]:
     """
     Determine the columns and lines in the terminal.
@@ -1263,11 +1232,15 @@ def is_systemd_available() -> bool:
     import subprocess
     try:
         has_systemctl = subprocess.call(
-            ['systemctl', '-h'],
+            ['systemctl', 'whoami'],
             stdout=subprocess.DEVNULL,
             stderr=subprocess.STDOUT,
         ) == 0
+    except FileNotFoundError:
+        has_systemctl = False
     except Exception:
+        import traceback
+        traceback.print_exc()
         has_systemctl = False
     return has_systemctl
 
@@ -1283,6 +1256,8 @@ def is_tmux_available() -> bool:
             stdout=subprocess.DEVNULL,
             stderr=subprocess.STDOUT
         ) == 0
+    except FileNotFoundError:
+        has_tmux = False
     except Exception:
         has_tmux = False
     return has_tmux
@@ -1844,6 +1819,15 @@ def replace_pipes_in_dict(*args, **kwargs):
     return replace_pipes_in_dict(*args, **kwargs)
 
 
+def is_pipe_registered(*args, **kwargs):
+    """
+    Placeholder function to prevent breaking legacy behavior.
+    See `meerschaum.utils.pipes.is_pipe_registered`.
+    """
+    from meerschaum.utils.pipes import is_pipe_registered
+    return is_pipe_registered(*args, **kwargs)
+
+
 def round_time(*args, **kwargs):
     """
     Placeholder function to prevent breaking legacy behavior.

meerschaum/utils/packages/__init__.py

@@ -136,17 +136,17 @@ def get_module_path(
 
 
 def manually_import_module(
-        import_name: str,
-        venv: Optional[str] = 'mrsm',
-        check_update: bool = True,
-        check_pypi: bool = False,
-        install: bool = True,
-        split: bool = True,
-        warn: bool = True,
-        color: bool = True,
-        debug: bool = False,
-        use_sys_modules: bool = True,
-    ) -> Union['ModuleType', None]:
+    import_name: str,
+    venv: Optional[str] = 'mrsm',
+    check_update: bool = True,
+    check_pypi: bool = False,
+    install: bool = True,
+    split: bool = True,
+    warn: bool = True,
+    color: bool = True,
+    debug: bool = False,
+    use_sys_modules: bool = True,
+) -> Union['ModuleType', None]:
     """
     Manually import a module from a virtual environment (or the base environment).
 
@@ -1179,7 +1179,8 @@ def run_python_package(
     Either a return code integer or a `subprocess.Popen` object
     (or `None` if a `KeyboardInterrupt` occurs and as_proc is `True`).
     """
-    import sys, platform
+    import sys
+    import platform
     import subprocess
     from meerschaum.config._paths import VIRTENV_RESOURCES_PATH
     from meerschaum.utils.process import run_process
@@ -1206,7 +1207,7 @@ def run_python_package(
             capture_output=capture_output,
             **kw
         )
-    except Exception as e:
+    except Exception:
         msg = f"Failed to execute {command}, will try again:\n{traceback.format_exc()}"
         warn(msg, color=False)
         stdout, stderr = (
@@ -1218,6 +1219,7 @@ def run_python_package(
             command,
             stdout=stdout,
             stderr=stderr,
+            stdin=sys.stdin,
             env=env_dict,
         )
         to_return = proc if as_proc else proc.wait()

meerschaum/utils/packages/_packages.py

@@ -175,6 +175,7 @@ packages['api'] = {
     'httpx'                          : 'httpx>=0.28.1',
     'httpcore'                       : 'httpcore>=1.0.9',
     'valkey'                         : 'valkey>=6.1.0',
+    'jose'                           : 'python-jose>=3.5.0',
 }
 packages['api'].update(packages['sql'])
 packages['api'].update(packages['formatting'])

meerschaum/utils/pipes.py

@@ -14,7 +14,7 @@ import ast
 import copy
 import uuid
 
-from meerschaum.utils.typing import PipesDict, Optional, Any
+from meerschaum.utils.typing import PipesDict, Optional
 import meerschaum as mrsm
 
 
@@ -96,9 +96,7 @@ def replace_pipes_syntax(text: str) -> Any:
     Parse a string containing the `{{ Pipe() }}` syntax.
     """
     from meerschaum.utils.warnings import warn
-    from meerschaum.utils.sql import sql_item_name
     from meerschaum.utils.dtypes import json_serialize_value
-    from meerschaum.utils.misc import parse_arguments_str
     pattern = r'\{\{\s*(?:mrsm\.)?Pipe\((.*?)\)((?:\.[\w]+|\[[^\]]+\])*)\s*\}\}'
 
     matches = list(re.finditer(pattern, text))
@@ -158,7 +156,6 @@ def replace_pipes_in_dict(
 
     debug: bool, default False
         Verbosity toggle.
-    
 
     Returns
     -------
@@ -168,7 +165,7 @@ def replace_pipes_in_dict(
     def change_dict(d: Dict[Any, Any]) -> None:
         for k, v in d.items():
             if isinstance(v, dict):
-                change_dict(v, func)
+                change_dict(v)
             elif isinstance(v, list):
                 d[k] = [func(i) for i in v]
             elif isinstance(v, tuple):
@@ -183,3 +180,34 @@ def replace_pipes_in_dict(
     result = copy.deepcopy(pipes)
     change_dict(result)
     return result
+
+
+def is_pipe_registered(
+    pipe: mrsm.Pipe,
+    pipes: PipesDict,
+    debug: bool = False
+) -> bool:
+    """
+    Check if a Pipe is inside the pipes dictionary.
+
+    Parameters
+    ----------
+    pipe: meerschaum.Pipe
+        The pipe to see if it's in the dictionary.
+
+    pipes: PipesDict
+        The dictionary to search inside.
+
+    debug: bool, default False
+        Verbosity toggle.
+
+    Returns
+    -------
+    A bool indicating whether the pipe is inside the dictionary.
+    """
+    from meerschaum.utils.debug import dprint
+    ck, mk, lk = pipe.connector_keys, pipe.metric_key, pipe.location_key
+    if debug:
+        dprint(f'{ck}, {mk}, {lk}')
+        dprint(f'{pipe}, {pipes}')
+    return ck in pipes and mk in pipes[ck] and lk in pipes[ck][mk]

meerschaum/utils/process.py

@@ -178,7 +178,7 @@ def run_process(
             # make us tty's foreground again
             try:
                 os.tcsetpgrp(sys.stdin.fileno(), old_pgrp)
-            except Exception as e:
+            except Exception:
                 pass
             # now restore the handler
             signal.signal(signal.SIGTTOU, hdlr)