meerschaum 2.2.1__py3-none-any.whl → 2.2.2__py3-none-any.whl

meerschaum/api/dash/components.py

@@ -12,7 +12,7 @@ from meerschaum.utils.packages import attempt_import, import_dcc, import_html
 from meerschaum.utils.typing import SuccessTuple, List
 from meerschaum.config.static import STATIC_CONFIG
 from meerschaum.utils.misc import remove_ansi
-from meerschaum.actions import get_shell
+from meerschaum._internal.shell.Shell import get_shell_intro
 from meerschaum.api import endpoints, CHECK_UPDATE
 from meerschaum.connectors import instance_types
 from meerschaum.utils.misc import get_connector_labels
@@ -69,7 +69,10 @@ bottom_buttons_content = dbc.Card(
         ])
     )
 )
-console_div = html.Div(id='console-div', children=[html.Pre(get_shell().intro, id='console-pre')])
+console_div = html.Div(
+    id = 'console-div',
+    children = [html.Pre(get_shell_intro(), id='console-pre')],
+)
 
 location = dcc.Location(id='location', refresh=False)
 

meerschaum/api/dash/pipes.py

@@ -22,7 +22,7 @@ from meerschaum.api.dash import (
     dash_app, debug, _get_pipes
 )
 from meerschaum.api.dash.connectors import get_web_connector
-from meerschaum.api.dash.components import alert_from_success_tuple
+from meerschaum.api.dash.components import alert_from_success_tuple, build_cards_grid
 from meerschaum.api.dash.users import is_session_authenticated
 from meerschaum.config import get_config
 import meerschaum as mrsm
@@ -101,6 +101,132 @@ def pipes_from_state(
         return False, str(e)
     return _pipes
 
+
+def build_pipe_card(
+        pipe: mrsm.Pipe,
+        authenticated: bool = False,
+        _build_children_num: int = 10,
+    ) -> 'dbc.Card':
+    """
+    Return a card for the given pipe.
+
+    Parameters
+    ----------
+    pipe: mrsm.Pipe
+        The pipe from which to build the card.
+
+    authenticated: bool, default False
+        If `True`, allow editing functionality to the card.
+
+    Returns
+    -------
+    A dash bootstrap components Card representation of the pipe.
+    """
+    meta_str = json.dumps(pipe.meta)
+    footer_children = dbc.Row(
+        [
+            dbc.Col(
+                (
+                    dbc.DropdownMenu(
+                        label = "Manage",
+                        children = [
+                            dbc.DropdownMenuItem(
+                                'Open in Python',
+                                id = {
+                                    'type': 'manage-pipe-button',
+                                    'index': meta_str,
+                                    'action': 'python',
+                                },
+                            ),
+                            dbc.DropdownMenuItem(
+                                'Delete',
+                                id = {
+                                    'type': 'manage-pipe-button',
+                                    'index': meta_str,
+                                    'action': 'delete',
+                                },
+                            ),
+                            dbc.DropdownMenuItem(
+                                'Drop',
+                                id = {
+                                    'type': 'manage-pipe-button',
+                                    'index': meta_str,
+                                    'action': 'drop',
+                                },
+                            ),
+                            dbc.DropdownMenuItem(
+                                'Clear',
+                                id = {
+                                    'type': 'manage-pipe-button',
+                                    'index': meta_str,
+                                    'action': 'clear',
+                                },
+                            ),
+                            dbc.DropdownMenuItem(
+                                'Verify',
+                                id = {
+                                    'type': 'manage-pipe-button',
+                                    'index': meta_str,
+                                    'action': 'verify',
+                                },
+                            ),
+                            dbc.DropdownMenuItem(
+                                'Sync',
+                                id = {
+                                    'type': 'manage-pipe-button',
+                                    'index': meta_str,
+                                    'action': 'sync',
+                                },
+                            ),
+                        ],
+                        direction = "up",
+                        menu_variant = "dark",
+                        size = 'sm',
+                        color = 'secondary',
+                    )
+                ) if authenticated else [],
+                width = 2,
+            ),
+            dbc.Col(width=6),
+            dbc.Col(
+                dbc.Button(
+                    'Download CSV',
+                    size = 'sm',
+                    color = 'link',
+                    style = {'float': 'right'},
+                    id = {'type': 'pipe-download-csv-button', 'index': meta_str},
+                ),
+                width = 4,
+            ),
+        ],
+        justify = 'start',
+    )
+    card_body_children = [
+        html.H5(
+            html.B(str(pipe)),
+            className = 'card-title',
+            style = {'font-family': ['monospace']}
+        ),
+        html.Div(
+            dbc.Accordion(
+                accordion_items_from_pipe(
+                    pipe,
+                    authenticated = authenticated,
+                    _build_children_num = _build_children_num,
+                ),
+                flush = True,
+                start_collapsed = True,
+                id = {'type': 'pipe-accordion', 'index': meta_str},
+            )
+        )
+
+    ]
+    return dbc.Card([
+        dbc.CardBody(children=card_body_children),
+        dbc.CardFooter(children=footer_children),
+    ])
+
+
 def get_pipes_cards(*keys, session_data: Optional[Dict[str, Any]] = None):
     """
     Returns a tuple:
@@ -120,99 +246,7 @@ def get_pipes_cards(*keys, session_data: Optional[Dict[str, Any]] = None):
     overflow_pipes = pipes[max_num_pipes_cards:]
 
     for pipe in pipes[:max_num_pipes_cards]:
-        meta_str = json.dumps(pipe.meta)
-        footer_children = dbc.Row(
-            [
-                dbc.Col(
-                    (
-                        dbc.DropdownMenu(
-                            label = "Manage",
-                            children = [
-                                dbc.DropdownMenuItem(
-                                    'Delete',
-                                    id = {
-                                        'type': 'manage-pipe-button',
-                                        'index': meta_str,
-                                        'action': 'delete',
-                                    },
-                                ),
-                                dbc.DropdownMenuItem(
-                                    'Drop',
-                                    id = {
-                                        'type': 'manage-pipe-button',
-                                        'index': meta_str,
-                                        'action': 'drop',
-                                    },
-                                ),
-                                dbc.DropdownMenuItem(
-                                    'Clear',
-                                    id = {
-                                        'type': 'manage-pipe-button',
-                                        'index': meta_str,
-                                        'action': 'clear',
-                                    },
-                                ),
-                                dbc.DropdownMenuItem(
-                                    'Verify',
-                                    id = {
-                                        'type': 'manage-pipe-button',
-                                        'index': meta_str,
-                                        'action': 'verify',
-                                    },
-                                ),
-                                dbc.DropdownMenuItem(
-                                    'Sync',
-                                    id = {
-                                        'type': 'manage-pipe-button',
-                                        'index': meta_str,
-                                        'action': 'sync',
-                                    },
-                                ),
-                            ],
-                            direction = "up",
-                            menu_variant = "dark",
-                            size = 'sm',
-                            color = 'secondary',
-                        )
-                    ) if authenticated else [],
-                    width = 2,
-                ),
-                dbc.Col(width=6),
-                dbc.Col(
-                    dbc.Button(
-                        'Download CSV',
-                        size = 'sm',
-                        color = 'link',
-                        style = {'float': 'right'},
-                        id = {'type': 'pipe-download-csv-button', 'index': meta_str},
-                    ),
-                    width = 4,
-                ),
-            ],
-            justify = 'start',
-        )
-        card_body_children = [
-            html.H5(
-                html.B(str(pipe)),
-                className = 'card-title',
-                style = {'font-family': ['monospace']}
-            ),
-            html.Div(
-                dbc.Accordion(
-                    accordion_items_from_pipe(pipe, authenticated=authenticated),
-                    flush = True,
-                    start_collapsed = True,
-                    id = {'type': 'pipe-accordion', 'index': meta_str},
-                )
-            )
-
-        ]
-        cards.append(
-            dbc.Card([
-                dbc.CardBody(children=card_body_children),
-                dbc.CardFooter(children=footer_children),
-            ])
-        )
+        cards.append(build_pipe_card(pipe, authenticated=authenticated))
 
     if overflow_pipes:
         cards.append(
@@ -239,7 +273,8 @@ def accordion_items_from_pipe(
         pipe: mrsm.Pipe,
         active_items: Optional[List[str]] = None,
         authenticated: bool = False,
-    ) -> List[dbc.AccordionItem]:
+        _build_children_num: int = 10,
+    ) -> 'List[dbc.AccordionItem]':
     """
     Build the accordion items for a given pipe.
     """
@@ -401,7 +436,7 @@ def accordion_items_from_pipe(
             size = 'sm',
             style = {'text-decoration': 'none', 'margin-left': '10px'},
         )
-        items_bodies['parameters'] = html.Div([
+        parameters_div_children = [
             parameters_editor,
             html.Br(),
             dbc.Row([
@@ -422,8 +457,21 @@ def accordion_items_from_pipe(
                 width=True,
                 )
             ]),
+        ]
+        if _build_children_num > 0 and pipe.children:
+            children_cards = [
+                build_pipe_card(
+                    child_pipe,
+                    authenticated = authenticated,
+                    _build_children_num = (_build_children_num - 1),
+                )
+                for child_pipe in pipe.children
+            ]
+            children_grid = build_cards_grid(children_cards, num_columns=1)
+            chidren_div_items = [html.Br(), html.H3('Children Pipes'), html.Br(), children_grid]
+            parameters_div_children.extend([html.Br()] + chidren_div_items)
 
-        ])
+        items_bodies['parameters'] = html.Div(parameters_div_children)
 
     if 'sql' in active_items:
         query = dedent((get_pipe_query(pipe, warn=False) or "")).lstrip().rstrip()

meerschaum/config/_default.py

@@ -110,6 +110,7 @@ default_system_config = {
         'space': False,
         'join_fetch': False,
         'inplace_sync': True,
+        'uv_pip': True,
     },
 }
 default_pipes_config = {

meerschaum/config/_paths.py

@@ -82,24 +82,24 @@ for _plugin_path in _plugins_paths_to_remove:
 
 ENVIRONMENT_VENVS_DIR = STATIC_CONFIG['environment']['venvs']
 if ENVIRONMENT_VENVS_DIR in os.environ:
-    VENVS_DIR_PATH = Path(os.environ[ENVIRONMENT_VENVS_DIR]).resolve()
-    if not VENVS_DIR_PATH.exists():
+    _VENVS_DIR_PATH = Path(os.environ[ENVIRONMENT_VENVS_DIR]).resolve()
+    if not _VENVS_DIR_PATH.exists():
         try:
-            VENVS_DIR_PATH.mkdir(parents=True, exist_ok=True)
+            _VENVS_DIR_PATH.mkdir(parents=True, exist_ok=True)
         except Exception as e:
             print(
                 f"Invalid path set for environment variable '{ENVIRONMENT_VENVS_DIR}':\n"
-                + f"{VENVS_DIR_PATH}"
+                + f"{_VENVS_DIR_PATH}"
             )
-            VENVS_DIR_PATH = (_ROOT_DIR_PATH / 'venvs').resolve()
-            print(f"Will use the following path for venvs instead:\n{VENVS_DIR_PATH}")
+            _VENVS_DIR_PATH = (_ROOT_DIR_PATH / 'venvs').resolve()
+            print(f"Will use the following path for venvs instead:\n{_VENVS_DIR_PATH}")
 else:
-    VENVS_DIR_PATH = _ROOT_DIR_PATH / 'venvs'
+    _VENVS_DIR_PATH = _ROOT_DIR_PATH / 'venvs'
 
 paths = {
-    'PACKAGE_ROOT_PATH'              : str(Path(__file__).parent.parent.resolve()),
-    'ROOT_DIR_PATH'                  : str(_ROOT_DIR_PATH),
-    'VIRTENV_RESOURCES_PATH'         : str(VENVS_DIR_PATH),
+    'PACKAGE_ROOT_PATH'              : Path(__file__).parent.parent.resolve().as_posix(),
+    'ROOT_DIR_PATH'                  : _ROOT_DIR_PATH.as_posix(),
+    'VIRTENV_RESOURCES_PATH'         : _VENVS_DIR_PATH.as_posix(),
     'CONFIG_DIR_PATH'                : ('{ROOT_DIR_PATH}', 'config'),
     'DEFAULT_CONFIG_DIR_PATH'        : ('{ROOT_DIR_PATH}', 'default_config'),
     'PATCH_DIR_PATH'                 : ('{ROOT_DIR_PATH}', 'patch_config'),
@@ -114,6 +114,7 @@ paths = {
 
     'SHELL_RESOURCES_PATH'           : ('{ROOT_DIR_PATH}', ),
     'SHELL_HISTORY_PATH'             : ('{SHELL_RESOURCES_PATH}', '.mrsm_history'),
+    'PYTHON_RESOURCES_PATH'          : ('{INTERNAL_RESOURCES_PATH}', 'python'),
 
     'API_RESOURCES_PATH'             : ('{PACKAGE_ROOT_PATH}', 'api', 'resources'),
     'API_STATIC_PATH'                : ('{API_RESOURCES_PATH}', 'static'),
@@ -186,7 +187,6 @@ def __getattr__(name: str) -> Path:
     if name.endswith('RESOURCES_PATH') or name == 'CONFIG_DIR_PATH':
         path.mkdir(parents=True, exist_ok=True)
     elif 'FILENAME' in name:
-        path = str(path)
+        path = path.as_posix()
 
     return path
-

meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "2.2.1"
+__version__ = "2.2.2"

meerschaum/config/paths.py

@@ -0,0 +1,10 @@
+#! /usr/bin/env python3
+# -*- coding: utf-8 -*-
+# vim:fenc=utf-8
+
+"""
+External API for importing Meerschaum paths.
+"""
+
+from meerschaum.config._paths import __getattr__, paths
+__all__ = tuple(paths.keys())

meerschaum/config/static/__init__.py

@@ -110,7 +110,7 @@ STATIC_CONFIG: Dict[str, Any] = {
                 'pbkdf2_sha256',
             ],
             'default': 'pbkdf2_sha256',
-            'pbkdf2_sha256__default_rounds': 3_000_000,
+            'pbkdf2_sha256__default_rounds': 1_000_000,
         },
         'min_username_length': 1,
         'max_username_length': 26,

meerschaum/connectors/__init__.py

@@ -328,7 +328,7 @@ def load_plugin_connectors():
             continue
         with open(plugin.__file__, encoding='utf-8') as f:
             text = f.read()
-        if 'make_connector' in text:
+        if 'make_connector' in text or 'Connector' in text:
             to_import.append(plugin.name)
     if not to_import:
         return

meerschaum/core/Pipe/__init__.py

@@ -436,6 +436,11 @@ class Pipe:
     def __repr__(self, **kw) -> str:
         return pipe_repr(self, **kw)
 
+    def __pt_repr__(self):
+        from meerschaum.utils.packages import attempt_import
+        prompt_toolkit_formatted_text = attempt_import('prompt_toolkit.formatted_text', lazy=False)
+        return prompt_toolkit_formatted_text.ANSI(self.__repr__())
+
     def __getstate__(self) -> Dict[str, Any]:
         """
         Define the state dictionary (pickling).

meerschaum/core/Pipe/_sync.py

@@ -215,9 +215,8 @@ def sync(
 
             ### Activate and invoke `sync(pipe)` for plugin connectors with `sync` methods.
             try:
-                if p.connector.type == 'plugin' and p.connector.sync is not None:
-                    connector_plugin = Plugin(p.connector.label)
-                    with Venv(connector_plugin, debug=debug):
+                if getattr(p.connector, 'sync', None) is not None:
+                    with Venv(get_connector_plugin(p.connector), debug=debug):
                         return_tuple = p.connector.sync(p, debug=debug, **kw)
                     p._exists = None
                     if not isinstance(return_tuple, tuple):

meerschaum/plugins/__init__.py

@@ -7,6 +7,7 @@ Expose plugin management APIs from the `meerschaum.plugins` module.
 """
 
 from __future__ import annotations
+import functools
 from meerschaum.utils.typing import Callable, Any, Union, Optional, Dict, List, Tuple
 from meerschaum.utils.threading import Lock, RLock
 from meerschaum.plugins._Plugin import Plugin
@@ -16,6 +17,7 @@ _pre_sync_hooks: Dict[str, List[Callable[[Any], Any]]] = {}
 _post_sync_hooks: Dict[str, List[Callable[[Any], Any]]] = {}
 _locks = {
     '_api_plugins': RLock(),
+    '_dash_plugins': RLock(),
     '_pre_sync_hooks': RLock(),
     '_post_sync_hooks': RLock(),
     '__path__': RLock(),
@@ -156,6 +158,71 @@ def post_sync_hook(
     return function
 
 
+_plugin_endpoints_to_pages = {}
+def web_page(
+        page: Union[str, None, Callable[[Any], Any]] = None,
+        login_required: bool = True,
+        **kwargs
+    ) -> Any:
+    """
+    Quickly add pages to the dash application.
+
+    Examples
+    --------
+    >>> import meerschaum as mrsm
+    >>> from meerschaum.plugins import web_page
+    >>> html = mrsm.attempt_import('dash.html')
+    >>> 
+    >>> @web_page('foo/bar', login_required=False)
+    >>> def foo_bar():
+    ...     return html.Div([html.H1("Hello, World!")])
+    >>> 
+    """
+    page_str = None
+
+    def _decorator(_func: Callable[[Any], Any]) -> Callable[[Any], Any]:
+        nonlocal page_str
+
+        @functools.wraps(_func)
+        def wrapper(*_args, **_kwargs):
+            return _func(*_args, **_kwargs)
+
+        if page_str is None:
+            page_str = _func.__name__
+
+        page_str = page_str.lstrip('/').rstrip('/').strip()
+        _plugin_endpoints_to_pages[page_str] = {
+            'function': _func,
+            'login_required': login_required,
+        }
+        return wrapper
+
+    if callable(page):
+        decorator_to_return = _decorator(page)
+        page_str = page.__name__
+    else:
+        decorator_to_return = _decorator
+        page_str = page
+
+    return decorator_to_return
+
+
+_dash_plugins = {}
+def dash_plugin(function: Callable[[Any], Any]) -> Callable[[Any], Any]:
+    """
+    Execute the function when starting the Dash application.
+    """
+    with _locks['_dash_plugins']:
+        try:
+            if function.__module__ not in _dash_plugins:
+                _dash_plugins[function.__module__] = []
+            _dash_plugins[function.__module__].append(function)
+        except Exception as e:
+            from meerschaum.utils.warnings import warn
+            warn(e)
+    return function
+
+
 def api_plugin(function: Callable[[Any], Any]) -> Callable[[Any], Any]:
     """
     Execute the function when initializing the Meerschaum API module.
@@ -164,15 +231,6 @@ def api_plugin(function: Callable[[Any], Any]) -> Callable[[Any], Any]:
     
     The FastAPI app will be passed as the only parameter.
     
-    Parameters
-    ----------
-    function: Callable[[Any, Any]]
-        The function to be called before starting the Meerschaum API.
-        
-    Returns
-    -------
-    Another function (decorator function).
-
     Examples
     --------
     >>> from meerschaum.plugins import api_plugin

meerschaum/utils/daemon/Daemon.py

@@ -465,8 +465,9 @@ class Daemon:
         Handle `SIGINT` within the Daemon context.
         This method is injected into the `DaemonContext`.
         """
-        #  from meerschaum.utils.daemon.FileDescriptorInterceptor import STOP_READING_FD_EVENT
-        #  STOP_READING_FD_EVENT.set()
+        from meerschaum.utils.process import signal_handler
+        signal_handler(signal_number, stack_frame)
+
         self.rotating_log.stop_log_fd_interception(unused_only=False)
         timer = self.__dict__.get('_log_refresh_timer', None)
         if timer is not None:
@@ -477,6 +478,7 @@ class Daemon:
             daemon_context.close()
 
         _close_pools()
+
         import threading
         for thread in threading.enumerate():
             if thread.name == 'MainThread':
@@ -495,6 +497,9 @@ class Daemon:
         Handle `SIGTERM` within the `Daemon` context.
         This method is injected into the `DaemonContext`.
         """
+        from meerschaum.utils.process import signal_handler
+        signal_handler(signal_number, stack_frame)
+
         timer = self.__dict__.get('_log_refresh_timer', None)
         if timer is not None:
             timer.cancel()

meerschaum/utils/misc.py

@@ -1103,6 +1103,12 @@ def is_docker_available() -> bool:
     return has_docker
 
 
+def is_android() -> bool:
+    """Return `True` if the current platform is Android."""
+    import sys
+    return hasattr(sys, 'getandroidapilevel')
+
+
 def is_bcp_available() -> bool:
     """Check if the MSSQL `bcp` utility is installed."""
     import subprocess