meerschaum 2.2.4__py3-none-any.whl → 2.2.5.dev0__py3-none-any.whl

meerschaum/_internal/entry.py

@@ -47,9 +47,6 @@ def entry(sysargs: Optional[List[str]] = None) -> SuccessTuple:
                 )
             )
 
-    #  if args.get('schedule', None):
-        #  from meerschaum.utils.schedule import schedule_function
-        #  return schedule_function(entry_with_args, **args)
     return entry_with_args(**args)
 
 
@@ -122,11 +119,12 @@ def entry_with_args(
 def _do_action_wrapper(action_function, plugin_name, **kw):
     from meerschaum.plugins import Plugin
     from meerschaum.utils.venv import Venv, active_venvs, deactivate_venv
+    from meerschaum.utils.misc import filter_keywords
     plugin = Plugin(plugin_name) if plugin_name else None
     with Venv(plugin, debug=kw.get('debug', False)):
         action_name = ' '.join(action_function.__name__.split('_') + kw.get('action', []))
         try:
-            result = action_function(**kw)
+            result = action_function(**filter_keywords(action_function, **kw))
         except Exception as e:
             if kw.get('debug', False):
                 import traceback

meerschaum/actions/__init__.py

@@ -40,7 +40,11 @@ def get_subactions(
     for name, f in inspect.getmembers(action_module):
         if not inspect.isfunction(f):
             continue
-        if action_function.__name__ + '_' in name and not name.lstrip('_').startswith('complete'):
+
+        ### Detect subactions which may contain an underscore prefix.
+        if (
+            name.lstrip('_').startswith(action_function.__name__.lstrip('_') + '_')
+        ):
             _name = name.replace(action_function.__name__, '')
             _name = _name.lstrip('_')
             subactions[_name] = f

meerschaum/actions/backup.py

@@ -0,0 +1,43 @@
+#! /usr/bin/env python3
+# -*- coding: utf-8 -*-
+# vim:fenc=utf-8
+
+"""
+Backup the stack database.
+"""
+
+from __future__ import annotations
+from meerschaum.utils.typing import SuccessTuple, Any, List, Optional, Union
+
+def backup(
+        action: Optional[List[str]] = None,
+        **kwargs: Any
+    ) -> SuccessTuple:
+    """
+    Backup the stack database.
+    """
+    from meerschaum.actions import choose_subaction
+    options = {
+        'database'        : _backup_database,
+    }
+    return choose_subaction(action, options, **kwargs)
+
+
+def _backup_database(
+        action: Optional[List[str]] = None,
+    ) -> SuccessTuple:
+    """
+    Backup the stack's database to a sql file.
+    """
+    from meerschaum.actions import get_action
+    from meerschaum.config.paths import BACKUP_RESOURCES_PATH
+    do_stack = get_action('stack')
+    cmd_list = ['exec', 'db', 'pg']
+    stack_success, stack_msg = do_stack(['exec'])
+    return True, "Success"
+
+### NOTE: This must be the final statement of the module.
+###       Any subactions added below these lines will not
+###       be added to the `help` docstring.
+from meerschaum.utils.misc import choices_docstring as _choices_docstring
+backup.__doc__ += _choices_docstring('backup')

meerschaum/actions/bootstrap.py

@@ -25,6 +25,7 @@ def bootstrap(
     options = {
         'pipes'      : _bootstrap_pipes,
         'connectors' : _bootstrap_connectors,
+        'plugins'    : _bootstrap_plugins,
     }
     return choose_subaction(action, options, **kw)
 
@@ -382,6 +383,251 @@ def _bootstrap_connectors(
     return True, "Success"
 
 
+def _bootstrap_plugins(
+        action: Optional[List[str]] = None,
+        debug: bool = False,
+        **kwargs: Any
+    ) -> SuccessTuple:
+    """
+    Launch an interactive wizard to guide the user to creating a new plugin.
+    """
+    import pathlib
+    import meerschaum as mrsm
+    from meerschaum.utils.warnings import info, warn
+    from meerschaum.utils.prompt import prompt, choose, yes_no
+    from meerschaum.utils.formatting._shell import clear_screen
+    from meerschaum.utils.misc import edit_file
+    from meerschaum.config.paths import PLUGINS_DIR_PATHS
+    from meerschaum._internal.entry import entry
+
+    if not action:
+        action = [prompt("Enter the name of your new plugin:")]
+
+    if len(PLUGINS_DIR_PATHS) > 1:
+        plugins_dir_path = pathlib.Path(
+            choose(
+                "In which directory do you want to write your plugin?",
+                [path.as_posix() for path in PLUGINS_DIR_PATHS],
+                numeric = True,
+                multiple = False,
+                default = PLUGINS_DIR_PATHS[0].as_posix(),
+            )
+        )
+    else:
+        plugins_dir_path = PLUGINS_DIR_PATHS[0]
+        
+    clear_screen(debug=debug)
+    info(
+        "Answer the questions below to pick out features.\n"
+        + "    See the Writing Plugins guide for documentation:\n"
+        + "    https://meerschaum.io/reference/plugins/writing-plugins/ for documentation.\n"
+    )
+
+    imports_lines = {
+        'default': (
+            "import meerschaum as mrsm\n"
+        ),
+        'action': (
+            "from meerschaum.actions import make_action\n"
+        ),
+        'api': (
+            "from meerschaum.plugins import api_plugin\n"
+        ),
+        'web': (
+            "from meerschaum.plugins import web_page, dash_plugin\n"
+        ),
+        'api+web': (
+            "from meerschaum.plugins import api_plugin, web_page, dash_plugin\n"
+        ),
+    }
+
+    ### TODO: Add feature for custom connectors.
+    feature_lines = {
+        'header': (
+            "# {plugin_name}.py\n\n"
+        ),
+        'default': (
+            "__version__ = '0.0.1'\n"
+            "\n# Add any depedencies to `required` (similar to `requirements.txt`).\n"
+            "required = []\n\n"
+        ),
+        'setup': (
+            "def setup(**kwargs) -> mrsm.SuccessTuple:\n"
+            "    \"\"\"Executed during installation and `mrsm setup plugin {plugin_name}`.\"\"\"\n"
+            "    return True, \"Success\"\n\n\n"
+        ),
+        'register': (
+            "def register(pipe: mrsm.Pipe):\n"
+            "    \"\"\"Return the default parameters for a new pipe.\"\"\"\n"
+            "    return {\n"
+            "        'columns': {\n"
+            "            'datetime': None,\n"
+            "        }\n"
+            "    }\n\n\n"
+        ),
+        'fetch': (
+            "def fetch(pipe: mrsm.Pipe, **kwargs):\n"
+            "    \"\"\"Return or yield dataframe-like objects.\"\"\"\n"
+            "    docs = []\n"
+            "    # populate docs with dictionaries (rows).\n"
+            "    return docs\n\n\n"
+        ),
+        'action': (
+            "@make_action\n"
+            "def {action_name}(**kwargs) -> mrsm.SuccessTuple:\n"
+            "    \"\"\"Run `mrsm {action_spaces}` to trigger.\"\"\"\n"
+            "    return True, \"Success\"\n\n\n"
+        ),
+        'api': (
+            "@api_plugin\n"
+            "def init_app(fastapi_app):\n"
+            "    \"\"\"Add new endpoints to the FastAPI app.\"\"\"\n\n"
+            "    import fastapi\n"
+            "    from meerschaum.api import manager\n\n"
+            "    @fastapi_app.get('/my/endpoint')\n"
+            "    def get_my_endpoint(curr_user=fastapi.Depends(manager)):\n"
+            "        return {'message': 'Hello, World!'}\n\n\n"
+        ),
+        'web': (
+            "@dash_plugin\n"
+            "def init_dash(dash_app):\n"
+            "    \"\"\"Initialize the Plotly Dash application.\"\"\"\n"
+            "    import dash.html as html\n"
+            "    import dash.dcc as dcc\n"
+            "    from dash import Input, Output, State, no_update\n"
+            "    import dash_bootstrap_components as dbc\n\n"
+            "    # Create a new page at the path `/dash/{plugin_name}`.\n"
+            "    @web_page('{plugin_name}', login_required=False)\n"
+            "    def page_layout():\n"
+            "        \"\"\"Return the layout objects for this page.\"\"\"\n"
+            "        return dbc.Container([\n"
+            "            dcc.Location(id='{plugin_name}-location'),\n"
+            "            html.Div(id='output-div'),\n"
+            "        ])\n\n"
+            "    @dash_app.callback(\n"
+            "        Output('output-div', 'children'),\n"
+            "        Input('{plugin_name}-location', 'pathname'),\n"
+            "    )\n"
+            "    def render_page_on_url_change(pathname: str):\n"
+            "        \"\"\"Reload page contents when the URL path changes.\"\"\"\n"
+            "        return html.H1(\"Hello from plugin '{plugin_name}'!\")\n\n\n"
+        ),
+    }
+
+    for plugin_name in action:
+        plugin_path = plugins_dir_path / (plugin_name + '.py')
+        plugin = mrsm.Plugin(plugin_name)
+        if plugin.is_installed():
+            warn(f"Plugin '{plugin_name}' is already installed!", stack=False)
+            uninstall_plugin = yes_no(
+                f"Do you want to first uninstall '{plugin}'?",
+                default = 'n',
+                **kwargs
+            )
+            if not uninstall_plugin:
+                return False, f"Plugin '{plugin_name}' already exists."
+
+            uninstall_success, uninstall_msg = entry(['uninstall', 'plugin', plugin_name, '-f'])
+            if not uninstall_success:
+                return uninstall_success, uninstall_msg
+            clear_screen(debug=debug)
+
+        features = choose(
+            "Which of the following features would you like to add to your plugin?",
+            [
+                (
+                    'fetch',
+                    'Fetch data\n     (e.g. extracting from a remote API)\n'
+                ),
+                (
+                    'action',
+                    'New actions\n     (e.g. `mrsm sing song`)\n'
+                ),
+                (
+                    'api',
+                    'New API endpoints\n     (e.g. `POST /my/new/endpoint`)\n',
+                ),
+                (
+                    'web',
+                    'New web console page\n     (e.g. `/dash/my-web-app`)\n',
+                ),
+            ],
+            default = 'fetch',
+            multiple = True,
+            as_indices = True,
+            **kwargs
+        )
+
+        action_name = ''
+        if 'action' in features:
+            while True:
+                try:
+                    action_name = prompt(
+                        "What is name of your action?\n    "
+                        + "(separate subactions with spaces, e.g. `sing song`):"
+                    ).replace(' ', '_')
+                except KeyboardInterrupt as e:
+                    return False, "Aborted plugin creation."
+
+                if action_name:
+                    break
+                warn("Please enter an action.", stack=False)
+
+        action_spaces = action_name.replace('_', ' ')
+
+        plugin_labels = {
+            'plugin_name': plugin_name,
+            'action_name': action_name,
+            'action_spaces': action_spaces,
+        }
+
+        body_text = ""
+        body_text += feature_lines['header'].format(**plugin_labels)
+        body_text += imports_lines['default'].format(**plugin_labels)
+        if 'action' in features:
+            body_text += imports_lines['action']
+        if 'api' in features and 'web' in features:
+            body_text += imports_lines['api+web']
+        elif 'api' in features:
+            body_text += imports_lines['api']
+        elif 'web' in features:
+            body_text += imports_lines['web']
+
+        body_text += "\n"
+        body_text += feature_lines['default'].format(**plugin_labels)
+        body_text += feature_lines['setup'].format(**plugin_labels)
+
+        if 'fetch' in features:
+            body_text += feature_lines['register']
+            body_text += feature_lines['fetch']
+
+        if 'action' in features:
+            body_text += feature_lines['action'].format(**plugin_labels)
+
+        if 'api' in features:
+            body_text += feature_lines['api']
+
+        if 'web' in features:
+            body_text += feature_lines['web'].format(**plugin_labels)
+
+        try:
+            with open(plugin_path, 'w+', encoding='utf-8') as f:
+                f.write(body_text.rstrip())
+        except Exception as e:
+            error_msg = f"Failed to write file '{plugin_path}':\n{e}"
+            return False, error_msg
+
+        mrsm.pprint((True, f"Successfully created file '{plugin_path}'."))
+        try:
+            _ = prompt(f"Press [Enter] to edit plugin '{plugin_name}', [CTRL+C] to skip.")
+        except (KeyboardInterrupt, Exception):
+            continue
+
+        edit_file(plugin_path, debug=debug)
+
+    return True, "Success"
+
+
 ### NOTE: This must be the final statement of the module.
 ###       Any subactions added below these lines will not
 ###       be added to the `help` docstring.

meerschaum/actions/delete.py

@@ -29,6 +29,7 @@ def delete(
         'users'      : _delete_users,
         'connectors' : _delete_connectors,
         'jobs'       : _delete_jobs,
+        'venvs'      : _delete_venvs,
     }
     return choose_subaction(action, options, **kw)
 
@@ -486,6 +487,67 @@ def _delete_jobs(
     )
 
 
+def _delete_venvs(
+        action: Optional[List[str]] = None,
+        yes: bool = False,
+        force: bool = False,
+        **kwargs: Any
+    ) -> SuccessTuple:
+    """
+    Remove virtual environments.
+    Specify which venvs to remove, or remove everything at once.
+    """
+    import os
+    import shutil
+    import pathlib
+    from meerschaum.config.paths import VIRTENV_RESOURCES_PATH
+    from meerschaum.utils.venv import venv_exists
+    from meerschaum.utils.prompt import yes_no
+    from meerschaum.utils.misc import print_options
+    from meerschaum.utils.warnings import warn
+
+    venvs_to_skip = ['mrsm']
+    venvs = [
+        _venv
+        for _venv in action or os.listdir(VIRTENV_RESOURCES_PATH)
+        if venv_exists(_venv)
+        and _venv not in venvs_to_skip
+    ]
+
+    if not venvs:
+        msg = "No venvs to delete."
+        if action:
+            return False, msg
+        return True, msg
+
+    print_options(
+        venvs,
+        header = 'Venvs to Delete:',
+        **kwargs
+    )
+    confirm_delete = yes_no(
+        (
+            "Remove the above venv" + ('s' if len(venvs) != 1 else '') + "?\n    "
+            + "Run `mrsm upgrade packages` and `mrsm install required` to reinstall dependencies.\n"
+        ),
+        yes = yes,
+        default = 'n',
+        force = force,
+    )
+    if not confirm_delete:
+        return True, "Nothing was deleted."
+
+    for venv in venvs:
+        venv_path = pathlib.Path(VIRTENV_RESOURCES_PATH / venv)
+        try:
+            shutil.rmtree(venv_path)
+        except Exception as e:
+            error_msg = f"Failed to remove '{venv_path}':\n{e}"
+            return False, error_msg
+
+    msg = f"Removed {len(venvs)} venv" + ('s' if len(venvs) != 1 else '') + '.'
+    return True, msg
+
 
 ### NOTE: This must be the final statement of the module.
 ###       Any subactions added below these lines will not

meerschaum/actions/python.py

@@ -11,6 +11,9 @@ from meerschaum.utils.typing import SuccessTuple, Any, List, Optional
 def python(
         action: Optional[List[str]] = None,
         sub_args: Optional[List[str]] = None,
+        nopretty: bool = False,
+        noask: bool = False,
+        venv: Optional[str] = None,
         debug: bool = False,
         **kw: Any
     ) -> SuccessTuple:
@@ -24,6 +27,21 @@ def python(
     Examples:
         mrsm python
         mrsm python [-m pip -V]
+
+    Flags:
+        `--nopretty`
+        Open a plain Pyhthon REPL rather than ptpython.
+
+        `--noask`
+        Run the supplied Python code and do not open a REPL.
+
+        `--venv`
+        Run the Python interpreter from a virtual environment.
+        Will not have Meercshaum imported.
+
+        `--sub-args` (or flags surrounded by `[]`)
+        Rather than run Python code, execute the interpreter with the given sub-flags
+        (e.g. `mrsm python [-V]`)
     """
     import sys, subprocess, os
     from meerschaum.utils.debug import dprint
@@ -33,11 +51,16 @@ def python(
     from meerschaum.config import __version__ as _version
     from meerschaum.config.paths import VIRTENV_RESOURCES_PATH, PYTHON_RESOURCES_PATH
     from meerschaum.utils.packages import run_python_package, attempt_import
+    from meerschaum.utils.process import run_process
 
     if action is None:
         action = []
 
-    joined_actions = ["import meerschaum as mrsm"]
+    joined_actions = (
+        ["import meerschaum as mrsm"]
+        if venv is None and not sub_args
+        else []
+    )
     line = ""
     for i, a in enumerate(action):
         if a == '':
@@ -68,6 +91,11 @@ def python(
         '"""); '
         + 'pts.print_formatted_text(ansi); '
     )
+    if nopretty or venv is not None or sub_args:
+        print_command = ""
+
+    if sub_args:
+        nopretty = True
 
     command = print_command
     for a in joined_actions:
@@ -89,7 +117,21 @@ def python(
             'ptpython',
             sub_args or ['--dark-bg', '-i', init_script_path.as_posix()],
             foreground = True,
-            venv = None,
+            venv = venv,
+        ) if not nopretty else run_process(
+            (
+                [venv_executable(venv)] + (
+                    sub_args or
+                    (
+                        (
+                            ['-i']
+                            if not noask
+                            else []
+                        ) + [init_script_path.as_posix()]
+                    )
+                )
+            ),
+            foreground = True,
         )
     except KeyboardInterrupt:
         return_code = 1

meerschaum/actions/show.py

@@ -42,6 +42,7 @@ def show(
         'logs'       : _show_logs,
         'tags'       : _show_tags,
         'schedules'  : _show_schedules,
+        'venvs'      : _show_venvs,
     }
     return choose_subaction(action, show_options, **kw)
 
@@ -903,6 +904,31 @@ def _show_schedules(
     return True, "Success"
         
 
+def _show_venvs(
+        **kwargs: Any    
+    ):
+    """
+    Print the available virtual environments in the current MRSM_ROOT_DIR.
+    """
+    import os
+    import pathlib
+    from meerschaum.config.paths import VIRTENV_RESOURCES_PATH
+    from meerschaum.utils.venv import venv_exists
+    from meerschaum.utils.misc import print_options
+
+    venvs = [
+        _venv
+        for _venv in os.listdir(VIRTENV_RESOURCES_PATH)
+        if venv_exists(_venv)
+    ]
+    print_options(
+        venvs,
+        name = 'Venvs:',
+        **kwargs
+    )
+
+    return True, "Success"
+
 
 ### NOTE: This must be the final statement of the module.
 ###       Any subactions added below these lines will not

meerschaum/api/_oauth2.py

@@ -13,6 +13,23 @@ fastapi = attempt_import('fastapi', lazy=False, check_update=CHECK_UPDATE)
 fastapi_responses = attempt_import('fastapi.responses', lazy=False, check_update=CHECK_UPDATE)
 fastapi_login = attempt_import('fastapi_login', check_update=CHECK_UPDATE)
 
+class CustomOAuth2PasswordRequestForm:
+    def __init__(
+        self,
+        grant_type: str = fastapi.Form(None, regex="password|client_credentials"),
+        username: str = fastapi.Form(...),
+        password: str = fastapi.Form(...),
+        scope: str = fastapi.Form(""),
+        client_id: str = fastapi.Form(None),
+        client_secret: str = fastapi.Form(None),
+    ):
+        self.grant_type = grant_type
+        self.username = username
+        self.password = password
+        self.scope = scope
+        self.client_id = client_id
+        self.client_secret = client_secret
+
 LoginManager = fastapi_login.LoginManager
 def generate_secret_key() -> str:
     """

meerschaum/api/routes/_login.py

@@ -8,13 +8,17 @@ Manage access and refresh tokens.
 
 from datetime import datetime, timedelta, timezone
 import fastapi
+from fastapi import Request, status
 from fastapi_login.exceptions import InvalidCredentialsException
-from fastapi.security import OAuth2PasswordRequestForm
+from fastapi.exceptions import RequestValidationError
 from starlette.responses import Response, JSONResponse
 from meerschaum.api import endpoints, get_api_connector, app, debug, manager, no_auth
 from meerschaum.core import User
 from meerschaum.config.static import STATIC_CONFIG
-from meerschaum.utils.typing import Dict, Any
+from meerschaum.utils.typing import Dict, Any, Optional
+from meerschaum.core.User._User import verify_password
+from meerschaum.utils.warnings import warn
+from meerschaum.api._oauth2 import CustomOAuth2PasswordRequestForm
 
 
 @manager.user_loader()
@@ -28,18 +32,18 @@ def load_user(
 
 
 @app.post(endpoints['login'], tags=['Users'])
-def login(
-        data: OAuth2PasswordRequestForm = fastapi.Depends()
+async def login(
+        data: CustomOAuth2PasswordRequestForm = fastapi.Depends()
+        #  data: dict[str, str],
+        #  request: Request
     ) -> Dict[str, Any]:
     """
     Login and set the session token.
     """
     username, password = (
-        (data['username'], data['password']) if isinstance(data, dict)
-        else (data.username, data.password)
+        (data.username, data.password)
     ) if not no_auth else ('no-auth', 'no-auth')
 
-    from meerschaum.core.User._User import verify_password
     user = User(username, password)
     correct_password = no_auth or verify_password(
         password,
@@ -60,3 +64,15 @@ def login(
         'token_type': 'bearer',
         'expires' : expires_dt,
     }
+
+
+@app.exception_handler(RequestValidationError)
+async def validation_exception_handler(request: Request, exc: RequestValidationError):
+    """
+    Log validation errors as warnings.
+    """
+    warn(f"Validation error: {exc.errors()}", stack=False)
+    return JSONResponse(
+        status_code = status.HTTP_422_UNPROCESSABLE_ENTITY,
+        content = {"detail": exc.errors()},
+    )

meerschaum/config/_edit.py

@@ -171,7 +171,7 @@ def general_write_yaml_config(
         path = pathlib.Path(fp)
         path.parent.mkdir(parents=True, exist_ok=True)
         path.touch(exist_ok=True)
-        with open(path, 'w+') as f:
+        with open(path, 'w+', encoding='utf-8') as f:
             if header is not None:
                 if debug:
                     dprint(f"Header detected, writing to {path}...")

meerschaum/config/_paths.py

@@ -138,6 +138,9 @@ paths = {
     'SQLITE_RESOURCES_PATH'          : ('{ROOT_DIR_PATH}', 'sqlite'),
     'SQLITE_DB_PATH'                 : ('{SQLITE_RESOURCES_PATH}', 'mrsm_local.db'),
 
+    'BACKUP_RESOURCES_PATH'          : ('{ROOT_DIR_PATH}', 'backup'),
+    'BACKUP_DATABASE_PATH'           : ('{BACKUP_RESOURCES_PATH}', 'backup.sql'),
+
     'DUCKDB_RESOURCES_PATH'          : ('{ROOT_DIR_PATH}', 'duckdb'),
     'DUCKDB_PATH'                    : ('{DUCKDB_RESOURCES_PATH}', 'duck.db'),
 

meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "2.2.4"
+__version__ = "2.2.5.dev0"

meerschaum/config/stack/__init__.py

@@ -56,6 +56,7 @@ env_dict['MEERSCHAUM_API_CONFIG'] = json.dumps(
 
 volumes = {
     'api_root': '/meerschaum',
+    'api_user_local': '/home/meerschaum/.local',
     'meerschaum_db_data': '/var/lib/postgresql/data',
     'grafana_storage': '/var/lib/grafana',
 }
@@ -122,7 +123,7 @@ default_docker_compose_config = {
             ],
             'hostname' : f'{db_hostname}',
             'volumes' : [
-                'meerschaum_db_data' + ':' + volumes['meerschaum_db_data'],
+                'meerschaum_db_data:' + volumes['meerschaum_db_data'],
             ],
             'shm_size': '1024m',
             'networks' : [
@@ -159,6 +160,7 @@ default_docker_compose_config = {
             },
             'volumes' : [
                 'api_root:' + volumes['api_root'],
+                'api_user_local:' + volumes['api_user_local'],
             ],
         },
         'grafana': {

meerschaum/utils/daemon/Daemon.py

@@ -185,7 +185,7 @@ class Daemon:
                     result = self.target(*self.target_args, **self.target_kw)
                     self.properties['result'] = result
                 except Exception as e:
-                    warn(e, stacklevel=3)
+                    warn(f"Exception in daemon target function: {e}", stacklevel=3)
                     result = e
                 finally:
                     self._log_refresh_timer.cancel()
@@ -203,9 +203,20 @@ class Daemon:
             daemon_error = traceback.format_exc()
             with open(DAEMON_ERROR_LOG_PATH, 'a+', encoding='utf-8') as f:
                 f.write(daemon_error)
+            warn(f"Encountered an error while running the daemon '{self}':\n{daemon_error}")
+        finally:
+            self._cleanup_on_exit()
 
-        if daemon_error:
-            warn(f"Encountered an error while starting the daemon '{self}':\n{daemon_error}")
+    def _cleanup_on_exit(self):
+        """Perform cleanup operations when the daemon exits."""
+        try:
+            self._log_refresh_timer.cancel()
+            self.rotating_log.close()
+            if self.pid is None and self.pid_path.exists():
+                self.pid_path.unlink()
+            self._capture_process_timestamp('ended')
+        except Exception as e:
+            warn(f"Error during daemon cleanup: {e}")
 
 
     def _capture_process_timestamp(

meerschaum/utils/daemon/FileDescriptorInterceptor.py

@@ -65,24 +65,31 @@ class FileDescriptorInterceptor:
             except BlockingIOError:
                 continue
             except OSError as e:
-                continue
+                from meerschaum.utils.warnings import warn
+                warn(f"OSError in FileDescriptorInterceptor: {e}")
+                break
 
-            first_char_is_newline = data[0] == b'\n'
-            last_char_is_newline = data[-1] == b'\n'
+            try:
+                first_char_is_newline = data[0] == b'\n'
+                last_char_is_newline = data[-1] == b'\n'
 
-            injected_str = self.injection_hook()
-            injected_bytes = injected_str.encode('utf-8')
+                injected_str = self.injection_hook()
+                injected_bytes = injected_str.encode('utf-8')
 
-            if is_first_read:
-                data = b'\n' + data
-                is_first_read = False
+                if is_first_read:
+                    data = b'\n' + data
+                    is_first_read = False
 
-            modified_data = (
-                (data[:-1].replace(b'\n', b'\n' + injected_bytes) + b'\n')
-                if last_char_is_newline
-                else data.replace(b'\n', b'\n' + injected_bytes)
-            )
-            os.write(self.new_file_descriptor, modified_data)
+                modified_data = (
+                    (data[:-1].replace(b'\n', b'\n' + injected_bytes) + b'\n')
+                    if last_char_is_newline
+                    else data.replace(b'\n', b'\n' + injected_bytes)
+                )
+                os.write(self.new_file_descriptor, modified_data)
+            except Exception as e:
+                from meerschaum.utils.warnings import warn
+                warn(f"Error in FileDescriptorInterceptor data processing: {e}")
+                break
 
 
     def stop_interception(self):

meerschaum/utils/daemon/RotatingFile.py

@@ -355,26 +355,29 @@ class RotatingFile(io.IOBase):
         As such, if data is larger than max_file_size, then the corresponding subfile
         may exceed this limit.
         """
-        self.file_path.parent.mkdir(exist_ok=True, parents=True)
-        if isinstance(data, bytes):
-            data = data.decode('utf-8')
-
-        prefix_str = self.get_timestamp_prefix_str() if self.write_timestamps else ""
-        suffix_str = "\n" if self.write_timestamps else ""
-        self.refresh_files(
-            potential_new_len = len(prefix_str + data + suffix_str),
-            start_interception = self.write_timestamps,
-        )
         try:
-            if prefix_str:
-                self._current_file_obj.write(prefix_str)
-            self._current_file_obj.write(data)
-            if suffix_str:
-                self._current_file_obj.write(suffix_str)
+            self.file_path.parent.mkdir(exist_ok=True, parents=True)
+            if isinstance(data, bytes):
+                data = data.decode('utf-8')
+
+            prefix_str = self.get_timestamp_prefix_str() if self.write_timestamps else ""
+            suffix_str = "\n" if self.write_timestamps else ""
+            self.refresh_files(
+                potential_new_len = len(prefix_str + data + suffix_str),
+                start_interception = self.write_timestamps,
+            )
+            try:
+                if prefix_str:
+                    self._current_file_obj.write(prefix_str)
+                self._current_file_obj.write(data)
+                if suffix_str:
+                    self._current_file_obj.write(suffix_str)
+            except Exception as e:
+                warn(f"Failed to write to subfile:\n{traceback.format_exc()}")
+            self.flush()
+            self.delete(unused_only=True)
         except Exception as e:
-            warn(f"Failed to write to subfile:\n{traceback.format_exc()}")
-        self.flush()
-        self.delete(unused_only=True)
+            warn(f"Unexpected error in RotatingFile.write: {e}")
 
 
     def delete(self, unused_only: bool = False) -> None:

meerschaum/utils/packages/_packages.py

@@ -42,6 +42,7 @@ packages: Dict[str, Dict[str, str]] = {
         'requests'                   : 'requests>=2.23.0',
         'binaryornot'                : 'binaryornot>=0.4.4',
         'pyvim'                      : 'pyvim>=3.0.2',
+        'ptpython'                   : 'ptpython>=3.0.27',
         'aiofiles'                   : 'aiofiles>=0.6.0',
         'packaging'                  : 'packaging>=21.3.0',
         'prompt_toolkit'             : 'prompt-toolkit>=3.0.39',
@@ -74,7 +75,6 @@ packages: Dict[str, Dict[str, str]] = {
         'litecli'                    : 'litecli>=1.5.0',
         'mssqlcli'                   : 'mssql-cli>=1.0.0',
         'gadwall'                    : 'gadwall>=0.2.0',
-        'ptpython'                   : 'ptpython>=3.0.27',
     },
     'stack': {
         'compose'                    : 'docker-compose>=1.29.2',

meerschaum/utils/prompt.py

@@ -61,6 +61,7 @@ def prompt(
     from meerschaum.utils.formatting import colored, ANSI, CHARSET, highlight_pipes, fill_ansi
     from meerschaum.config import get_config
     from meerschaum.config.static import _static_config
+    from meerschaum.utils.misc import filter_keywords
     noask = check_noask(noask)
     if not noask:
         prompt_toolkit = attempt_import('prompt_toolkit')
@@ -101,7 +102,7 @@ def prompt(
         prompt_toolkit.prompt(
             prompt_toolkit.formatted_text.ANSI(question),
             wrap_lines = wrap_lines,
-            **kw
+            **filter_keywords(prompt_toolkit.prompt, **kw)
         ) if not noask else ''
     )
     if noask:
@@ -192,10 +193,11 @@ def yes_no(
 
 def choose(
         question: str,
-        choices: List[str],
-        default: Optional[str] = None,
+        choices: List[Union[str, Tuple[str, str]]],
+        default: Union[str, List[str], None] = None,
         numeric: bool = True,
         multiple: bool = False,
+        as_indices: bool = False,
         delimiter: str = ',',
         icon: bool = True,
         warn: bool = True,
@@ -210,10 +212,12 @@ def choose(
     question: str
         The question to be printed.
 
-    choices: List[str]
+    choices: List[Union[str, Tuple[str, str]]
         A list of options.
+        If an option is a tuple of two strings, the first string is treated as the index
+        and not displayed. In this case, set `as_indices` to `True` to return the index.
 
-    default: Optional[str], default None
+    default: Union[str, List[str], None], default None
         If the user declines to enter a choice, return this value.
 
     numeric: bool, default True
@@ -223,6 +227,11 @@ def choose(
     multiple: bool, default False
         If `True`, allow the user to choose multiple answers separated by `delimiter`.
 
+    as_indices: bool, default False
+        If `True`, return the indices for the choices.
+        If a choice is a tuple of two strings, the first is assumed to be the index.
+        Otherwise the index in the list is returned.
+
     delimiter: str, default ','
         If `multiple`, separate answers by this string. Raise a warning if this string is contained
         in any of the choices.
@@ -254,8 +263,14 @@ def choose(
     if isinstance(default, list):
         multiple = True
 
+    choices_indices = {}
+    for i, c in enumerate(choices):
+        if isinstance(c, tuple):
+            i, c = c
+        choices_indices[i] = c
+
     def _enforce_default(d):
-        if d is not None and d not in choices and warn:
+        if d is not None and d not in choices and d not in choices_indices and warn:
             _warn(
                 f"Default choice '{default}' is not contained in the choices {choices}. "
                 + "Setting numeric = False.",
@@ -271,16 +286,18 @@ def choose(
             break
 
     _default = default
-    _choices = choices
+    _choices = list(choices_indices.values())
     if multiple:
-        question += f"\n    Enter your choices, separated by '{delimiter}'."
+        question += f"\n    Enter your choices, separated by '{delimiter}'.\n"
 
     altered_choices = {}
     altered_indices = {}
     altered_default_indices = {}
     delim_replacement = '_' if delimiter != '_' else '-'
     can_strip_start_spaces, can_strip_end_spaces = True, True
-    for c in choices:
+    for i, c in choices_indices.items():
+        if isinstance(c, tuple):
+            key, c = c
         if can_strip_start_spaces and c.startswith(' '):
             can_strip_start_spaces = False
         if can_strip_end_spaces and c.endswith(' '):
@@ -301,8 +318,8 @@ def choose(
             default[i] = new_d
 
         ### Check if the choices have the delimiter.
-        for i, c in enumerate(choices):
-            if delimiter in c and warn:
+        for i, c in choices_indices.items():
+            if delimiter in c and not numeric and warn:
                 _warn(
                     f"The delimiter '{delimiter}' is contained within choice '{c}'.\n"
                     + f"Replacing the string '{delimiter}' with '{delim_replacement}' in "
@@ -313,7 +330,7 @@ def choose(
                 altered_choices[new_c] = c
                 altered_indices[i] = new_c
         for i, new_c in altered_indices.items():
-            choices[i] = new_c
+            choices_indices[i] = new_c
         default = delimiter.join(default) if isinstance(default, list) else default
 
     if numeric:
@@ -321,23 +338,36 @@ def choose(
         _default = ''
         if default is not None:
             for d in (default.split(delimiter) if multiple else [default]):
+                if d not in choices and d in choices_indices:
+                    d_index = d
+                    d_value = choices_indices[d]
+                    for _i, _option in enumerate(choices):
+                        if (
+                            isinstance(_option, tuple) and (
+                                _option[1] == d_value
+                                or
+                                _option[0] == d_index
+                            )
+                        ) or d_index == _i:
+                            d = _option
+
                 _d = str(choices.index(d) + 1)
                 _default += _d + delimiter
         _default = _default[:-1 * len(delimiter)]
         question += '\n'
         choices_digits = len(str(len(choices)))
-        for i, c in enumerate(choices):
+        for i, c in enumerate(choices_indices.values()):
             question += f"  {i + 1}. " + (" " * (choices_digits - len(str(i + 1)))) + f"{c}\n"
         default_tuple = (_default, default) if default is not None else None
     else:
         default_tuple = default
         question += '\n'
-        for c in choices:
+        for c in choices_indices.values():
             question += f"  - {c}\n"
 
     if 'completer' not in kw:
         WordCompleter = attempt_import('prompt_toolkit.completion').WordCompleter
-        kw['completer'] = WordCompleter(choices, sentence=True)
+        kw['completer'] = WordCompleter(choices_indices.values(), sentence=True)
 
     valid = False
     while not valid:
@@ -383,7 +413,10 @@ def choose(
         if not numeric:
             return answer
         try:
-            return choices[int(answer) - 1]
+            _answer = choices[int(answer) - 1]
+            if as_indices and isinstance(choice, tuple):
+                return _answer[0]
+            return _answer
         except Exception as e:
             _warn(f"Could not cast answer '{answer}' to an integer.", stacklevel=3)
 
@@ -393,7 +426,10 @@ def choose(
     for a in answers:
         try:
             _answer = choices[int(a) - 1]
-            _answers.append(altered_choices.get(_answer, _answer))
+            _answer_to_return = altered_choices.get(_answer, _answer)
+            if isinstance(_answer_to_return, tuple) and as_indices:
+                _answer_to_return = _answer_to_return[0]
+            _answers.append(_answer_to_return)
         except Exception as e:
             _warn(f"Could not cast answer '{a}' to an integer.", stacklevel=3)
     return _answers

meerschaum/utils/yaml.py

@@ -18,6 +18,7 @@ _lib = None
 _import_name = 'yaml'
 
 _yaml = None
+_dumper = None
 _locks = {
     '_lib': Lock(),
     '_yaml': Lock(),
@@ -46,7 +47,7 @@ class yaml:
     """
     Wrapper around `PyYAML` and `ruamel.yaml` so that we may switch between implementations.
     """
-    global _yaml, _lib
+    global _yaml, _lib, _dumper
     if _import_name is None:
         error(f"No YAML library declared.")
     with _locks['_lib']:
@@ -85,6 +86,7 @@ class yaml:
             and packaging_version.parse(_yaml.__version__) >= packaging_version.parse('6.0')
         ):
             _args += [_yaml.Loader]
+        
         return _yaml.load(*_args, **filter_keywords(_yaml.load, **kw))
 
 
@@ -98,7 +100,36 @@ class yaml:
         if stream is None and _import_name == 'ruamel.yaml':
             stream = _lib.compat.StringIO()
             get_string = True
+
+        if _import_name == 'yaml' and 'Dumper' not in kw:
+            kw['Dumper'] = get_dumper_class()
+
         result = _yaml.dump(data, stream, **filter_keywords(_yaml.dump, **kw))
         if get_string:
             return stream.getvalue()
         return result
+
+
+def get_dumper_class():
+    """
+    Return the dumper class to use when writing.
+    Only supports `yaml`.
+    """
+    global _dumper
+    if _dumper is not None:
+        return _dumper
+
+    if _import_name != 'yaml':
+        return None
+
+    class CustomDumper(_yaml.Dumper):
+        """
+        Add an extra line break when writing.
+        """
+        def write_line_break(self, data=None):
+            if len(self.indents) == 1:
+                super(CustomDumper, self).write_line_break(data)
+            super(CustomDumper, self).write_line_break(data)
+
+    _dumper = CustomDumper
+    return _dumper

{meerschaum-2.2.4.dist-info → meerschaum-2.2.5.dev0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.2.4
+Version: 2.2.5.dev0
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares
@@ -68,6 +68,7 @@ Requires-Dist: python-dateutil >=2.7.5 ; extra == 'api'
 Requires-Dist: requests >=2.23.0 ; extra == 'api'
 Requires-Dist: binaryornot >=0.4.4 ; extra == 'api'
 Requires-Dist: pyvim >=3.0.2 ; extra == 'api'
+Requires-Dist: ptpython >=3.0.27 ; extra == 'api'
 Requires-Dist: aiofiles >=0.6.0 ; extra == 'api'
 Requires-Dist: packaging >=21.3.0 ; extra == 'api'
 Requires-Dist: prompt-toolkit >=3.0.39 ; extra == 'api'
@@ -105,7 +106,6 @@ Requires-Dist: mycli >=1.23.2 ; extra == 'cli'
 Requires-Dist: litecli >=1.5.0 ; extra == 'cli'
 Requires-Dist: mssql-cli >=1.0.0 ; extra == 'cli'
 Requires-Dist: gadwall >=0.2.0 ; extra == 'cli'
-Requires-Dist: ptpython >=3.0.27 ; extra == 'cli'
 Provides-Extra: core
 Requires-Dist: wheel >=0.34.2 ; extra == 'core'
 Requires-Dist: setuptools >=63.3.0 ; extra == 'core'
@@ -118,6 +118,7 @@ Requires-Dist: python-dateutil >=2.7.5 ; extra == 'core'
 Requires-Dist: requests >=2.23.0 ; extra == 'core'
 Requires-Dist: binaryornot >=0.4.4 ; extra == 'core'
 Requires-Dist: pyvim >=3.0.2 ; extra == 'core'
+Requires-Dist: ptpython >=3.0.27 ; extra == 'core'
 Requires-Dist: aiofiles >=0.6.0 ; extra == 'core'
 Requires-Dist: packaging >=21.3.0 ; extra == 'core'
 Requires-Dist: prompt-toolkit >=3.0.39 ; extra == 'core'
@@ -204,6 +205,7 @@ Requires-Dist: python-dateutil >=2.7.5 ; extra == 'full'
 Requires-Dist: requests >=2.23.0 ; extra == 'full'
 Requires-Dist: binaryornot >=0.4.4 ; extra == 'full'
 Requires-Dist: pyvim >=3.0.2 ; extra == 'full'
+Requires-Dist: ptpython >=3.0.27 ; extra == 'full'
 Requires-Dist: aiofiles >=0.6.0 ; extra == 'full'
 Requires-Dist: packaging >=21.3.0 ; extra == 'full'
 Requires-Dist: prompt-toolkit >=3.0.39 ; extra == 'full'
@@ -288,6 +290,7 @@ Requires-Dist: python-dateutil >=2.7.5 ; extra == 'sql'
 Requires-Dist: requests >=2.23.0 ; extra == 'sql'
 Requires-Dist: binaryornot >=0.4.4 ; extra == 'sql'
 Requires-Dist: pyvim >=3.0.2 ; extra == 'sql'
+Requires-Dist: ptpython >=3.0.27 ; extra == 'sql'
 Requires-Dist: aiofiles >=0.6.0 ; extra == 'sql'
 Requires-Dist: packaging >=21.3.0 ; extra == 'sql'
 Requires-Dist: prompt-toolkit >=3.0.39 ; extra == 'sql'

{meerschaum-2.2.4.dist-info → meerschaum-2.2.5.dev0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 meerschaum/__init__.py,sha256=mw_PhxT7155SW8d_S51T4-WTibL5g205CwMa3qX8qyA,1487
 meerschaum/__main__.py,sha256=Q43yra6APe5CdhDp9ngaorUjs8ZoabeYnMa6C5kQchA,2763
 meerschaum/_internal/__init__.py,sha256=ilC7utfKtin7GAvuN34fKyUQYfPyqH0Mm3MJF5iyEf4,169
-meerschaum/_internal/entry.py,sha256=_pfnlnXhqzP4XQ5syZ04sDG9LxS5UhNdziBlETDMUhc,5756
+meerschaum/_internal/entry.py,sha256=TNqt79kfNgXH-7Pi75Jus4Osi9y776ZVptFuvrs4wWY,5680
 meerschaum/_internal/arguments/__init__.py,sha256=HFciFQgo2ZOT19Mo6CpLhPYlpLYh2sNn1C9Lo7NMADc,519
 meerschaum/_internal/arguments/_parse_arguments.py,sha256=dNVDBvXYNgEw-TrlZJ9A6VPlG696EpQcQm6FOAhseqw,10249
 meerschaum/_internal/arguments/_parser.py,sha256=OtcrZK-_qV9a5qpdcP9NLKOGRevjmCU9fBLbB88px3c,13719
@@ -20,25 +20,26 @@ meerschaum/_internal/shell/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeu
 meerschaum/_internal/term/TermPageHandler.py,sha256=Rt5S47Pr_3HLJc8xIXpZUczYE_Dw2qT8qwf1jZFtUHQ,520
 meerschaum/_internal/term/__init__.py,sha256=LqTySBfHYnOtHGYCWfovcxV4FnZdON2BPYp0UbgI1QI,1640
 meerschaum/_internal/term/tools.py,sha256=dXVAimKD-Yv2fg2WOTr0YGBY7XDKjQqw-RizcS65YVI,727
-meerschaum/actions/__init__.py,sha256=7CNoKEqkqqafqMcChspJX9cR9OdgEWk9ggj0000Jl98,11360
+meerschaum/actions/__init__.py,sha256=ZUdQk6FvuMqyEvLCP-RiDDlIK4NwkqLRgFZSKq04qq4,11440
 meerschaum/actions/api.py,sha256=mWhv4bn3Ap17_Gqf2Cx9bAsHKG-Zhy072pBbNzHLEJc,12756
-meerschaum/actions/bootstrap.py,sha256=JnIyJ4odw6cA4e0Cw7J8THkLavMcj68nRyGsQDAT8nc,13396
+meerschaum/actions/backup.py,sha256=MhdNEo7ptOdFpR-L0o9Z590hBmKeqHsSx64GPKhx9e8,1230
+meerschaum/actions/bootstrap.py,sha256=dWUmvagqRwBI22PLsTX9PN3dY6ibvBxOXhTdxImRqAE,22530
 meerschaum/actions/clear.py,sha256=OoFZE0bK5m8s3GLNZcixuVT0DMj1izXVxGCATcmUGbI,4851
 meerschaum/actions/copy.py,sha256=8g3ANXfVdvuyaoXcZjgTg3BxHTOhHGrzVDOOsTBrpSU,6213
 meerschaum/actions/deduplicate.py,sha256=puYyxeFYEUy1Sd2IOcZB2e6MrNxAZl2bTLmNzFDkCiw,1167
-meerschaum/actions/delete.py,sha256=Nf1c47i_qZcWVpVe_se3qG5LhhYpXzvDPCqFBy_ER8U,15528
+meerschaum/actions/delete.py,sha256=RDkIQEnnN8t52dMAJpxoQ7LN-pzH7UAfGF8yT5oNiIw,17325
 meerschaum/actions/drop.py,sha256=Hd5h4rrWd7qL2rTqglsTonUsEoH7qQlsfqNFSHGeqr0,2453
 meerschaum/actions/edit.py,sha256=dHfqVtc1v6UUT_GEhWQkgoUf1nMbX_LLOETLGR5cCXQ,9487
 meerschaum/actions/install.py,sha256=akzzgsvy5yqUFuUqzSMG4eBKARY2iSnL3n_BiaNcM58,7431
 meerschaum/actions/login.py,sha256=fNgsgkrFCn9wBQJY50SQhz2PwsN_TvEYYHnXK3JG4ig,4206
 meerschaum/actions/os.py,sha256=dtoppoBhLzW3rLNF0SFovEfNxA4WJWt_9WrOGlS5KbA,2251
 meerschaum/actions/pause.py,sha256=kDK0UMm90TuohFEG5Gugl3PEbuqGua-ghidqvgYShoc,3909
-meerschaum/actions/python.py,sha256=Ogqm9NFFq3E710mRWAAU7F8JiEHrxYcGKj5H3ZDsP-s,3295
+meerschaum/actions/python.py,sha256=hOtA_opi6ulF71XP5p0V5zXsLD7CCdSFWhiBanFevtw,4539
 meerschaum/actions/register.py,sha256=l_21LWZCzKwJVex_xAXECC5WVW1VEuIX9HSp7CuyCwA,11326
 meerschaum/actions/reload.py,sha256=gMXeFBGVfyQ7uhKhYf6bLaDMD0fLPcA9BrLBSiuvWIc,508
 meerschaum/actions/setup.py,sha256=KkAGWcgwzl_L6A19fTmTX1KtBjW2FwD8QenLjPy0mQQ,3205
 meerschaum/actions/sh.py,sha256=fLfTJaacKu4sjLTRqEzzYlT2WbbdZBEczsKb6F-qAek,2026
-meerschaum/actions/show.py,sha256=p92UahbFeKOThGooO8Ul5Z6s6_Ll54FCxXsMAFnhuT0,29024
+meerschaum/actions/show.py,sha256=S6J8bM2Jc9mzi31Dp_qqZLVqsRswPemWYzQc4wSzSr4,29631
 meerschaum/actions/sql.py,sha256=wYofwk1vGO96U2ncigGEfMtYMZeprz2FR1PRRZhkAPI,4311
 meerschaum/actions/stack.py,sha256=WMRMebyYwZGNlbnj6Ja09qvCSDNteFJOTa8_joHlnVo,5886
 meerschaum/actions/start.py,sha256=9Ej3Hk7qXfbrBaQq17KirTII_4Pa-BWSdrkutMnLA3k,18352
@@ -51,7 +52,7 @@ meerschaum/actions/verify.py,sha256=tY5slGpHiWiE0v9TDnjbmxSKn86zBnu9WBpixUgKNQU,
 meerschaum/api/__init__.py,sha256=oOYwNnkXM2s-h52EYnN2NGPfrlaQh6D4-zmHa7uPLG0,7450
 meerschaum/api/_chain.py,sha256=h8-WXUGXX6AqzdALfsBC5uv0FkAcLdHJXCGzqzuq89k,875
 meerschaum/api/_events.py,sha256=NrjiabEr7rmHMfxnX07DOGzr9sPiEbRkFqPjuA_8Zx8,1603
-meerschaum/api/_oauth2.py,sha256=He8JnFDhfCq25Wlz1Jh3TcGz83VOttrJk6RgzJKbFLw,1056
+meerschaum/api/_oauth2.py,sha256=o4ub9gMLvJ5ewxuCbk78kA8c6MOHV4FDxURupH1lT7U,1645
 meerschaum/api/_websockets.py,sha256=OmrSDGx3xGlfP5XXeLEyYW6-Y3iRUcB-xSqL3RWsjqQ,1609
 meerschaum/api/dash/__init__.py,sha256=yr4zR7uFPlLFc_lDpwa2rCM1h9ZWGiu5-2XhHcM-5f8,2252
 meerschaum/api/dash/actions.py,sha256=eUClPPdNVNSCtyq8Ecr1saasxj5VBgd1gcXejvQxXEc,9418
@@ -115,7 +116,7 @@ meerschaum/api/routes/__init__.py,sha256=vEXVwhvhVlGf0SFBjjCpQiYM4mMoxH3oywBgVOa
 meerschaum/api/routes/_actions.py,sha256=nPLJlhnl0kDjsjFiBmUub63fe1N1_4cVimmlxtInsK0,2240
 meerschaum/api/routes/_connectors.py,sha256=NNbcn5xWhKqw2PqueSEaqRaZ95hFGDKazG5lE7gsssc,1849
 meerschaum/api/routes/_index.py,sha256=QI6CBo6pI2Zi0a6fJHDjZfiLa9f4okb0BGe3A_JD0kM,578
-meerschaum/api/routes/_login.py,sha256=zoBdrNlR66ZZ5xoA_64EkV3XaAMypu7BD3LP5dLlbFY,1933
+meerschaum/api/routes/_login.py,sha256=EozEq592WA81x5VI8WU4-4S2w4C-w2oL45UZFbETzzw,2466
 meerschaum/api/routes/_misc.py,sha256=05--9ZVFeaCgZrHER2kA3SYdK4TyfkEXOCjLvPbum-w,2469
 meerschaum/api/routes/_pipes.py,sha256=d1JCu334xqjzvK1r2NzBxFqYScLKDATUjGWZkrjLTKU,21677
 meerschaum/api/routes/_plugins.py,sha256=vR6-uTJraY1YEJMuRvds1-xFLB2mexxnp2dJwN_0rVo,6216
@@ -126,20 +127,20 @@ meerschaum/api/tables/__init__.py,sha256=e2aNC0CdlWICTUMx1i9RauF8Pm426J0RZJbsJWv
 meerschaum/config/__init__.py,sha256=01hZ4Z8jGs4LbcIwNTeVzSvHD-Y0nAgiewRgngVUYb4,11517
 meerschaum/config/_dash.py,sha256=BJHl4xMrQB-YHUEU7ldEW8q_nOPoIRSOqLrfGElc6Dw,187
 meerschaum/config/_default.py,sha256=J6AWxxXM4mntCdkM6bKIpyQznZ5NuMICmTaurF11J9Q,5275
-meerschaum/config/_edit.py,sha256=CE8gumBiOtnZZdTATCLAZgUnhL04yJdReaNCrv1yuJc,8218
+meerschaum/config/_edit.py,sha256=_kabgFbJdI5kcLs-JIsoaTo0JdyxnPnBdrlTyTAgPm8,8236
 meerschaum/config/_environment.py,sha256=Vv4DLDfc2vKLbCLsMvkQDj77K4kEvHKEBmUBo-wCrgo,4419
 meerschaum/config/_formatting.py,sha256=RT_oU0OSfUkzeqbY5jvEJwuove_t9sP4MyUb1Px250U,6635
 meerschaum/config/_jobs.py,sha256=2bEikO48qVSguFS3lrbWz6uiKt_0b3oSRWhwyz8RRDM,1279
 meerschaum/config/_patch.py,sha256=21N30q1ANmWMDQ-2RUjpMx7KafWfPQ3lKx9rrMqg1s4,1526
-meerschaum/config/_paths.py,sha256=CWhB17T00NeyyKW5T0fjmetd5AqOGYIN5ySbFg3dAMI,8265
+meerschaum/config/_paths.py,sha256=jov62LjyHQGlDssQ2b_kd4QENWr8UOoKKByuULfkjyo,8418
 meerschaum/config/_preprocess.py,sha256=-AEA8m_--KivZwTQ1sWN6LTn5sio_fUr2XZ51BO6wLs,1220
 meerschaum/config/_read_config.py,sha256=WFZKIXZMDe_ca0ES7ivgM_mnwShvFxLdoeisT_X5-h0,14720
 meerschaum/config/_shell.py,sha256=s74cmJl8NrhM_Y1cB_P41_JDUYXV0g4WXnKFZWMtnrY,3551
 meerschaum/config/_sync.py,sha256=oK2ZujO2T1he08BXCFyiniBUevNGWSQKXLcS_jRv_7Y,4155
-meerschaum/config/_version.py,sha256=tzwD6PP0EAlINX0JJN0MPxAdg_vH8JKm0JxuSFEgJ_A,71
+meerschaum/config/_version.py,sha256=aJrQ0SowIZBgPrXHghgYBS2TpjhP0IDnQyvcMX4qZiU,76
 meerschaum/config/paths.py,sha256=Z7vaOunaEJbVFXiSSz4IthhNOQDI-dhtpi5TpSyrcXg,206
 meerschaum/config/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meerschaum/config/stack/__init__.py,sha256=c_WdTSejVdj8lqSE_pK5MhIBkHoftiZWDuEuB9dmk2I,9007
+meerschaum/config/stack/__init__.py,sha256=Yt7GNzC_hz7iUDZ4gVho_lugJO2DnXgnMtsMG_ReoRg,9114
 meerschaum/config/stack/grafana/__init__.py,sha256=LNXQw2FvHKrD68RDhqDmi2wJjAHaKw9IWx8rNuyWEPo,2010
 meerschaum/config/stack/mosquitto/__init__.py,sha256=-OwOjq8KiBoSH_pmgCAAF3Dp3CRD4KgAEdimZSadROs,186
 meerschaum/config/stack/mosquitto/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -206,16 +207,16 @@ meerschaum/utils/misc.py,sha256=2_FyirImT793NH-wQriJ1VPOW7DcXm98Id0XMn8nh9I,4344
 meerschaum/utils/networking.py,sha256=Sr_eYUGW8_UV9-k9LqRFf7xLtbUcsDucODyLCRsFRUc,1006
 meerschaum/utils/pool.py,sha256=vkE42af4fjrTEJTxf6Ek3xGucm1MtEkpsSEiaVzNKHs,2655
 meerschaum/utils/process.py,sha256=UyiNszYXdnjF6WN8Tt0NchWjkCV10MbOXEFn_TAhXeg,7510
-meerschaum/utils/prompt.py,sha256=0mBFbgi_l9rCou9UnC_6qKTHkqyl1Z_jSRzfmc0xRXM,16490
+meerschaum/utils/prompt.py,sha256=gdQYIspF1Jp9sAVAqqhI7amo8wNWYQH6ZsVz5bhGKjA,18305
 meerschaum/utils/schedule.py,sha256=btAeSDaoFH62-7wTO0U7NK9P9QHV46PtY3DJ8DN_mCY,10860
 meerschaum/utils/sql.py,sha256=4sCNEpgUd6uFz6ySs4nnUMVaOT0YAvPM1ZlQYJTSF-0,46656
 meerschaum/utils/threading.py,sha256=3N8JXPAnwqJiSjuQcbbJg3Rv9-CCUMJpeQRfKFR7MaA,2489
 meerschaum/utils/typing.py,sha256=L05wOXfWdn_nJ0KnZVr-2zdMYcqjdyOW_7InT3xe6-s,2807
 meerschaum/utils/warnings.py,sha256=0b5O2DBbhEAGnu6RAB1hlHSVmwL_hcR3EiMkExXmBJ0,6535
-meerschaum/utils/yaml.py,sha256=vbCrFjdapKsZ9wRRaI9Ih8dVUwZ-KHpSzfGhRcpDBgQ,3162
-meerschaum/utils/daemon/Daemon.py,sha256=rd9L9BgB0vwnPuhAbgLI-KkiEhFIPJqTQZ4PJ66lTf4,34686
-meerschaum/utils/daemon/FileDescriptorInterceptor.py,sha256=1cn5nQYLImL-BHXlLoxN_TadgN7XmGRLl1b7xecYMPc,4544
-meerschaum/utils/daemon/RotatingFile.py,sha256=LuaHPs-c4GaMc3VkMjvL6WJ5r7wmMUOm9ZLyk4OHAlg,23658
+meerschaum/utils/yaml.py,sha256=ptfS5XncNPaYXuvYX11yOpnEwPxDdaelHgDzIrvp9yc,3908
+meerschaum/utils/daemon/Daemon.py,sha256=TTbBj3M0RoGRaTvvq6IPr9EJb2KiPV_HLucqbPQVzs8,35184
+meerschaum/utils/daemon/FileDescriptorInterceptor.py,sha256=G5eJDapiTH1IX1x-2r62pLDS1MkRfpJaaZ-3FOAJgo0,4933
+meerschaum/utils/daemon/RotatingFile.py,sha256=KTkCBtTwz7MvznSsUa6Mnyzk1lM3LlClEkVezjf-SQY,23843
 meerschaum/utils/daemon/__init__.py,sha256=I_ki51yml4vsh9OoH7BWTaz9SnATD8qM0i0fN3aUMn0,8375
 meerschaum/utils/daemon/_names.py,sha256=Prf7xA2GWDbKR_9Xq9_5RTTIf9GNWY3Yt0s4tEU3JgM,4330
 meerschaum/utils/dtypes/__init__.py,sha256=JR9PViJTzhukZhq0QoPIs73HOnXZZr8OmfhAAD4OAUA,6261
@@ -226,15 +227,15 @@ meerschaum/utils/formatting/_pipes.py,sha256=wy0iWJFsFl3X2VloaiA_gp9Yx9w6tD3FQZv
 meerschaum/utils/formatting/_pprint.py,sha256=tgrT3FyGyu5CWJYysqK3kX1xdZYorlbOk9fcU_vt9Qg,3096
 meerschaum/utils/formatting/_shell.py,sha256=ox75O7VHDAiwzSvdMSJZhXLadvAqYJVeihU6WeZ2Ogc,3677
 meerschaum/utils/packages/__init__.py,sha256=6zRX0g8Kh-wHjvkbiMf_kLKM2BlR5FJUCA3JStX9YeU,62628
-meerschaum/utils/packages/_packages.py,sha256=yU8bD4fYs4cv1gOtEp3QrnejyvPi0K2W9TYaP_cd59w,7977
+meerschaum/utils/packages/_packages.py,sha256=gWrco46rqKjtAI714aJp0XfzYQFAdNi08Kq5dq1VEkg,7977
 meerschaum/utils/packages/lazy_loader.py,sha256=VHnph3VozH29R4JnSSBfwtA5WKZYZQFT_GeQSShCnuc,2540
 meerschaum/utils/venv/_Venv.py,sha256=sBnlmxHdAh2bx8btfVoD79-H9-cYsv5lP02IIXkyECs,3553
 meerschaum/utils/venv/__init__.py,sha256=4vFAu85lQ5GYEVhc6e_KhFmrks4t_Ma6ysmtraccYbs,24187
-meerschaum-2.2.4.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
-meerschaum-2.2.4.dist-info/METADATA,sha256=qA6ciSqJ8o1Cfsl2Al74zn3a7NS1wzsteaim54kRDIQ,24035
-meerschaum-2.2.4.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
-meerschaum-2.2.4.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-meerschaum-2.2.4.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
-meerschaum-2.2.4.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
-meerschaum-2.2.4.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-meerschaum-2.2.4.dist-info/RECORD,,
+meerschaum-2.2.5.dev0.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
+meerschaum-2.2.5.dev0.dist-info/METADATA,sha256=uD2d6sBxf_fMlrdGCsOpfRLPHT_hvD-u1rEq8CpgxKw,24192
+meerschaum-2.2.5.dev0.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
+meerschaum-2.2.5.dev0.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+meerschaum-2.2.5.dev0.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
+meerschaum-2.2.5.dev0.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
+meerschaum-2.2.5.dev0.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+meerschaum-2.2.5.dev0.dist-info/RECORD,,

{meerschaum-2.2.4.dist-info → meerschaum-2.2.5.dev0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.1.0)
+Generator: setuptools (70.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any