meerschaum 2.2.0rc4__py3-none-any.whl → 2.2.2__py3-none-any.whl

meerschaum/api/dash/callbacks/dashboard.py

@@ -94,6 +94,8 @@ omit_actions = {
     'repo',
     'instance',
 }
+
+### Map endpoints to page layouts.
 _paths = {
     'login'   : pages.login.layout,
     ''        : pages.dashboard.layout,
@@ -101,7 +103,8 @@ _paths = {
     'register': pages.register.layout,
 }
 _required_login = {''}
- 
+
+
 @dash_app.callback(
     Output('page-layout-div', 'children'),
     Output('session-store', 'data'),
@@ -147,16 +150,31 @@ def update_page_layout_div(
     else:
         session_store_to_return = dash.no_update
 
-    _path = (
+    base_path = (
         pathname.rstrip('/') + '/'
     ).replace(
         (dash_endpoint + '/'),
         ''
     ).rstrip('/').split('/')[0]
+
+    complete_path = (
+        pathname.rstrip('/') + '/'
+    ).replace(
+        dash_endpoint + '/',
+        ''
+    ).rstrip('/')
+
+    if complete_path in _paths:
+        path_str = complete_path
+    elif base_path in _paths:
+        path_str = base_path
+    else:
+        path_str = ''
+
     path = (
-        _path
-        if no_auth or _path not in _required_login else (
-            _path
+        path_str
+        if no_auth or path_str not in _required_login else (
+            path_str
             if session_id in active_sessions
             else 'login'
         )
@@ -868,10 +886,25 @@ dash_app.clientside_callback(
             location = "None";
         }
 
+        var subaction = "pipes";
+        if (action == "python"){
+            subaction = (
+                '"' + "pipe = mrsm.Pipe('"
+                + pipe_meta.connector
+                + "', '"
+                + pipe_meta.metric
+                + "'"
+            );
+            if (location != "None"){
+                subaction += ", '" + location + "'";
+            }
+            subaction += ", instance='" + pipe_meta.instance + "')" + '"';
+        }
+
         iframe.contentWindow.postMessage(
             {
                 action: action,
-                subaction: "pipes",
+                subaction: subaction,
                 connector_keys: [pipe_meta.connector],
                 metric_keys: [pipe_meta.metric],
                 location_keys: [location],

meerschaum/api/dash/callbacks/login.py

@@ -45,6 +45,7 @@ def show_registration_disabled_collapse(n_clicks, is_open):
     State('username-input', 'value'),
     State('password-input', 'value'),
     State('location', 'href'),
+    State('location', 'pathname'),
 )
 def login_button_click(
         username_submit,
@@ -53,6 +54,7 @@ def login_button_click(
         username,
         password,
         location_href,
+        location_pathname,
     ):
     """
     When the user submits the login form, check the login.
@@ -69,4 +71,4 @@ def login_button_click(
     except HTTPException:
         form_class += ' is-invalid'
         session_data = None
-    return session_data, form_class, (dash.no_update if not session_data else endpoints['dash'])
+    return session_data, form_class, dash.no_update

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.0rc4"
+__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

@@ -23,7 +23,14 @@ from meerschaum.connectors.sql.SQLConnector import SQLConnector
 from meerschaum.connectors.api.APIConnector import APIConnector
 from meerschaum.connectors.sql._create_engine import flavor_configs as sql_flavor_configs
 
-__all__ = ("Connector", "SQLConnector", "APIConnector", "get_connector", "is_connected")
+__all__ = (
+    "Connector",
+    "SQLConnector",
+    "APIConnector",
+    "get_connector",
+    "is_connected",
+    "poll",
+)
 
 ### store connectors partitioned by
 ### type, label for reuse
@@ -321,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/connectors/sql/_cli.py

@@ -42,9 +42,13 @@ def cli(
     env = copy.deepcopy(dict(os.environ))
     env[f'MRSM_SQL_{self.label.upper()}'] = json.dumps(self.meta)
     cli_code = (
+        "import sys\n"
         "import meerschaum as mrsm\n"
         f"conn = mrsm.get_connector('sql:{self.label}')\n"
-        f"conn._cli_exit()"
+        "success, msg = conn._cli_exit()\n"
+        "mrsm.pprint((success, msg))\n"
+        "if not success:\n"
+        "    raise Exception(msg)"
     )
     try:
         _ = venv_exec(cli_code, venv=None, debug=debug, capture_output=False)
@@ -91,6 +95,8 @@ def _cli_exit(
     cli_arg_str = self.DATABASE_URL
     if self.flavor in ('sqlite', 'duckdb'):
         cli_arg_str = str(self.database)
+    if cli_arg_str.startswith('postgresql+psycopg://'):
+        cli_arg_str = cli_arg_str.replace('postgresql+psycopg://', 'postgresql://')
 
     ### Define the script to execute to launch the CLI.
     ### The `mssqlcli` script is manually written to avoid telemetry

meerschaum/connectors/sql/_pipes.py

@@ -385,6 +385,9 @@ def get_create_index_queries(
     -------
     A dictionary of column names mapping to lists of queries.
     """
+    ### NOTE: Due to recent breaking changes in DuckDB, indices don't behave properly.
+    if self.flavor == 'duckdb':
+        return {}
     from meerschaum.utils.sql import (
         sql_item_name,
         get_distinct_col_count,
@@ -554,6 +557,9 @@ def get_drop_index_queries(
     -------
     A dictionary of column names mapping to lists of queries.
     """
+    ### NOTE: Due to breaking changes within DuckDB, indices must be skipped.
+    if self.flavor == 'duckdb':
+        return {}
     if not pipe.exists(debug=debug):
         return {}
     from meerschaum.utils.sql import sql_item_name, table_exists, hypertable_queries

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):