meerschaum 2.2.5.dev3__py3-none-any.whl → 2.2.7__py3-none-any.whl

meerschaum/actions/show.py

@@ -48,9 +48,9 @@ def show(
 
 
 def _complete_show(
-        action: Optional[List[str]] = None,
-        **kw: Any
-    ) -> List[str]:
+    action: Optional[List[str]] = None,
+    **kw: Any
+) -> List[str]:
     """
     Override the default Meerschaum `complete_` function.
     """
@@ -91,7 +91,13 @@ def _show_actions(**kw: Any) -> SuccessTuple:
     from meerschaum.utils.misc import print_options
     from meerschaum._internal.shell.Shell import hidden_commands
     _actions = [ _a for _a in actions if _a not in hidden_commands ]
-    print_options(options=_actions, name='actions', actions=False, **kw)
+    print_options(
+        options=_actions,
+        name='actions',
+        actions=False,
+        sort_options=True,
+        **kw
+    )
     return True, "Success"
 
 
@@ -247,16 +253,16 @@ def _show_connectors(
 
 
 def _complete_show_connectors(
-        action: Optional[List[str]] = None, **kw: Any
-    ) -> List[str]:
+    action: Optional[List[str]] = None, **kw: Any
+) -> List[str]:
     from meerschaum.utils.misc import get_connector_labels
     _text = action[0] if action else ""
     return get_connector_labels(search_term=_text, ignore_exact_match=True)
 
 
 def _show_arguments(
-        **kw: Any
-    ) -> SuccessTuple:
+    **kw: Any
+) -> SuccessTuple:
     """
     Show the parsed keyword arguments.
     """
@@ -266,16 +272,16 @@ def _show_arguments(
 
 
 def _show_data(
-        action: Optional[List[str]] = None,
-        gui: bool = False,
-        begin: Optional[datetime.datetime] = None,
-        end: Optional[datetime.datetime] = None,
-        params: Optional[Dict[str, Any]] = None,
-        chunksize: Optional[int] = -1,
-        nopretty: bool = False,
-        debug: bool = False,
-        **kw: Any
-    ) -> SuccessTuple:
+    action: Optional[List[str]] = None,
+    gui: bool = False,
+    begin: Optional[datetime.datetime] = None,
+    end: Optional[datetime.datetime] = None,
+    params: Optional[Dict[str, Any]] = None,
+    chunksize: Optional[int] = -1,
+    nopretty: bool = False,
+    debug: bool = False,
+    **kw: Any
+) -> SuccessTuple:
     """
     Show pipes data as Pandas DataFrames.
     
@@ -374,11 +380,11 @@ def _show_data(
 
 
 def _show_columns(
-        action: Optional[List[str]] = None,
-        debug: bool = False,
-        nopretty: bool = False,
-        **kw: Any
-    ) -> SuccessTuple:
+    action: Optional[List[str]] = None,
+    debug: bool = False,
+    nopretty: bool = False,
+    **kw: Any
+) -> SuccessTuple:
     """
     Show the registered and table columns for pipes.
     """
@@ -392,11 +398,11 @@ def _show_columns(
 
 
 def _show_rowcounts(
-        action: Optional[List[str]] = None,
-        workers: Optional[int] = None,
-        debug: bool = False,
-        **kw: Any
-    ) -> SuccessTuple:
+    action: Optional[List[str]] = None,
+    workers: Optional[int] = None,
+    debug: bool = False,
+    **kw: Any
+) -> SuccessTuple:
     """
     Show the rowcounts for pipes.
     
@@ -433,12 +439,12 @@ def _show_rowcounts(
     return True, "Success"
 
 def _show_plugins(
-        action: Optional[List[str]] = None,
-        repository: Optional[str] = None,
-        nopretty: bool = False,
-        debug: bool = False,
-        **kw: Any
-    ) -> SuccessTuple:
+    action: Optional[List[str]] = None,
+    repository: Optional[str] = None,
+    nopretty: bool = False,
+    debug: bool = False,
+    **kw: Any
+) -> SuccessTuple:
     """
     Show the installed plugins.
     """
@@ -475,10 +481,10 @@ def _show_plugins(
     return True, "Success"
 
 def _show_users(
-        mrsm_instance: Optional[str] = None,
-        debug: bool = False,
-        **kw: Any
-    ) -> SuccessTuple:
+    mrsm_instance: Optional[str] = None,
+    debug: bool = False,
+    **kw: Any
+) -> SuccessTuple:
     """
     Show the registered users in a Meerschaum instance (default is the current instance).
     """
@@ -498,10 +504,10 @@ def _show_users(
     return True, "Success"
 
 def _show_packages(
-        action: Optional[List[str]] = None,
-        nopretty: bool = False,
-        **kw: Any
-    ) -> SuccessTuple:
+    action: Optional[List[str]] = None,
+    nopretty: bool = False,
+    **kw: Any
+) -> SuccessTuple:
     """
     Show the packages in dependency groups, or as a list with `--nopretty`.
     """
@@ -530,9 +536,9 @@ def _show_packages(
     return True, "Success"
 
 def _complete_show_packages(
-        action: Optional[List[str]] = None,
-        **kw: Any
-    ) -> List[str]:
+    action: Optional[List[str]] = None,
+    **kw: Any
+) -> List[str]:
     from meerschaum.utils.packages import packages
     if not action:
         return sorted(list(packages.keys()))
@@ -545,10 +551,10 @@ def _complete_show_packages(
     return possibilities
 
 def _show_jobs(
-        action: Optional[List[str]] = None,
-        nopretty: bool = False,
-        **kw: Any
-    ) -> SuccessTuple:
+    action: Optional[List[str]] = None,
+    nopretty: bool = False,
+    **kw: Any
+) -> SuccessTuple:
     """
     Show the currently running and stopped jobs.
     """
@@ -572,10 +578,10 @@ def _show_jobs(
 
 
 def _show_logs(
-        action: Optional[List[str]] = None,
-        nopretty: bool = False,
-        **kw
-    ) -> SuccessTuple:
+    action: Optional[List[str]] = None,
+    nopretty: bool = False,
+    **kw
+) -> SuccessTuple:
     """
     Show the logs for jobs.
     
@@ -607,13 +613,15 @@ def _show_logs(
     now_follow_str = now.strftime(follow_timestamp_format)
 
     def build_buffer_spaces(daemons) -> Dict[str, str]:
-        max_len_id = max(len(d.daemon_id) for d in daemons) if daemons else 0
+        max_len_id = (
+            max(len(d.daemon_id) for d in daemons) + 1
+        ) if daemons else 0
         buffer_len = max(
             get_config('jobs', 'logs', 'min_buffer_len'),
-            max_len_id 
+            max_len_id
         )
         return {
-            d.daemon_id: ''.join([' ' for i in range(buffer_len - len(d.daemon_id))])
+            d.daemon_id: ''.join([' '] * (buffer_len - len(d.daemon_id)))
             for d in daemons
         }
 
@@ -763,9 +771,9 @@ def _show_logs(
 
 
 def _show_environment(
-        nopretty: bool = False,
-        **kw
-    ) -> SuccessTuple:
+    nopretty: bool = False,
+    **kw
+) -> SuccessTuple:
     """
     Show all of the current environment variables with begin with `'MRSM_'`.
     """
@@ -783,12 +791,12 @@ def _show_environment(
 
 
 def _show_tags(
-        action: Optional[List[str]] = None,
-        tags: Optional[List[str]] = None,
-        workers: Optional[int] = None,
-        nopretty: bool = False,
-        **kwargs
-    ) -> SuccessTuple:
+    action: Optional[List[str]] = None,
+    tags: Optional[List[str]] = None,
+    workers: Optional[int] = None,
+    nopretty: bool = False,
+    **kwargs
+) -> SuccessTuple:
     """
     Show the existing tags and their associated pipes.
     """
@@ -863,10 +871,10 @@ def _show_tags(
 
 
 def _show_schedules(
-        action: Optional[List[str]] = None,
-        nopretty: bool = False,
-        **kwargs: Any
-    ) -> SuccessTuple:
+    action: Optional[List[str]] = None,
+    nopretty: bool = False,
+    **kwargs: Any
+) -> SuccessTuple:
     """
     Print the upcoming timestamps according to the given schedule.
 
@@ -914,8 +922,8 @@ def _show_schedules(
         
 
 def _show_venvs(
-        **kwargs: Any    
-    ):
+    **kwargs: Any    
+):
     """
     Print the available virtual environments in the current MRSM_ROOT_DIR.
     """

meerschaum/actions/stop.py

@@ -21,9 +21,9 @@ def stop(action: Optional[List[str]] = None, **kw) -> SuccessTuple:
 
 
 def _complete_stop(
-        action: Optional[List[str]] = None,
-        **kw: Any
-    ) -> List[str]:
+    action: Optional[List[str]] = None,
+    **kw: Any
+) -> List[str]:
     """
     Override the default Meerschaum `complete_` function.
     """
@@ -49,14 +49,14 @@ def _complete_stop(
 
 
 def _stop_jobs(
-        action: Optional[List[str]] = None,
-        timeout_seconds: Optional[int] = None,
-        noask: bool = False,
-        force: bool = False,
-        yes: bool = False,
-        nopretty: bool = False,
-        **kw
-    ) -> SuccessTuple:
+    action: Optional[List[str]] = None,
+    timeout_seconds: Optional[int] = None,
+    noask: bool = False,
+    force: bool = False,
+    yes: bool = False,
+    nopretty: bool = False,
+    **kw
+) -> SuccessTuple:
     """
     Stop running jobs that were started with `-d` or `start job`.
     

meerschaum/actions/sync.py

@@ -14,9 +14,9 @@ import meerschaum as mrsm
 from meerschaum.utils.typing import SuccessTuple, Any, List, Optional, Tuple, Union
 
 def sync(
-        action: Optional[List[str]] = None,
-        **kw: Any
-    ) -> SuccessTuple:
+    action: Optional[List[str]] = None,
+    **kw: Any
+) -> SuccessTuple:
     """
     Fetch and sync data for pipes.
 

meerschaum/actions/upgrade.py

@@ -10,9 +10,9 @@ from __future__ import annotations
 from meerschaum.utils.typing import SuccessTuple, Any, List, Optional, Union
 
 def upgrade(
-        action: Optional[List[str]] = None,
-        **kw: Any
-    ) -> SuccessTuple:
+    action: Optional[List[str]] = None,
+    **kw: Any
+) -> SuccessTuple:
     """
     Upgrade Meerschaum, plugins, or packages.
     
@@ -34,13 +34,13 @@ def upgrade(
 
 
 def _upgrade_meerschaum(
-        action: Optional[List[str]] = None,
-        yes: bool = False,
-        force: bool = False,
-        noask: bool = False,
-        debug: bool = False,
-        **kw: Any
-    ) -> SuccessTuple:
+    action: Optional[List[str]] = None,
+    yes: bool = False,
+    force: bool = False,
+    noask: bool = False,
+    debug: bool = False,
+    **kw: Any
+) -> SuccessTuple:
     """
     Upgrade the current Meerschaum instance.
     Optionally specify dependency groups.
@@ -109,26 +109,21 @@ class NoVenv:
     pass
 
 def _upgrade_packages(
-        action: Optional[List[str]] = None,
-        venv: Union[str, None, NoVenv] = NoVenv,
-        yes: bool = False,
-        force: bool = False,
-        noask: bool = False,
-        debug: bool = False,
-        **kw: Any
-    ) -> SuccessTuple:
+    action: Optional[List[str]] = None,
+    venv: Union[str, None, NoVenv] = NoVenv,
+    yes: bool = False,
+    force: bool = False,
+    noask: bool = False,
+    debug: bool = False,
+    **kw: Any
+) -> SuccessTuple:
     """
     Upgrade and install dependencies.
     If provided, upgrade only a dependency group, otherwise default to `full`.
     
     Examples:
-        ```
         upgrade packages
-        ```
-    
-        ```
-        upgrade packages docs
-        ```
+        upgrade packages full
     """
     from meerschaum.utils.packages import packages, pip_install, get_prerelease_dependencies
     from meerschaum.utils.warnings import info, warn
@@ -178,14 +173,15 @@ def _upgrade_packages(
         )
     return success, msg
 
+
 def _upgrade_plugins(
-        action: Optional[List[str]] = None,
-        yes: bool = False,
-        force: bool = False,
-        noask: bool = False,
-        debug: bool = False,
-        **kw: Any
-    ) -> SuccessTuple:
+    action: Optional[List[str]] = None,
+    yes: bool = False,
+    force: bool = False,
+    noask: bool = False,
+    debug: bool = False,
+    **kw: Any
+) -> SuccessTuple:
     """
     Upgrade all installed plugins to the latest versions.
     If no plugins are specified, attempt to upgrade all,
@@ -193,12 +189,8 @@ def _upgrade_plugins(
     
     Examples:
     
-    ```
     upgrade plugins
-    ```
-    ```
-    upgrade plugins testing
-    ```
+    upgrade plugins noaa
     """
     from meerschaum.actions import actions
     from meerschaum.plugins import get_plugins_names

meerschaum/api/dash/callbacks/login.py

@@ -17,6 +17,7 @@ from dash.dependencies import Input, Output, State
 from meerschaum.api.dash import dash_app, debug, pipes, _get_pipes, active_sessions
 from meerschaum.api.dash.connectors import get_web_connector
 from meerschaum.api.routes._login import login
+from meerschaum.api.dash.components import alert_from_success_tuple
 from fastapi_login.exceptions import InvalidCredentialsException
 from fastapi.exceptions import HTTPException
 dbc = attempt_import('dash_bootstrap_components', lazy=False, check_update=CHECK_UPDATE)
@@ -39,6 +40,7 @@ def show_registration_disabled_collapse(n_clicks, is_open):
     Output('session-store', 'data'),
     Output('username-input', 'className'),
     Output('location', 'pathname'),
+    Output('login-alert-div', 'children'),
     Input('username-input', 'n_submit'),
     Input('password-input', 'n_submit'),
     Input('login-button', 'n_clicks'),
@@ -48,14 +50,14 @@ def show_registration_disabled_collapse(n_clicks, is_open):
     State('location', 'pathname'),
 )
 def login_button_click(
-        username_submit,
-        password_submit,
-        n_clicks,
-        username,
-        password,
-        location_href,
-        location_pathname,
-    ):
+    username_submit,
+    password_submit,
+    n_clicks,
+    username,
+    password,
+    location_href,
+    location_pathname,
+):
     """
     When the user submits the login form, check the login.
     On successful login, set the session id.
@@ -63,12 +65,18 @@ def login_button_click(
     form_class = 'form-control'
     ctx = dash.callback_context
     if not username or not password or not ctx.triggered:
-        return {}, form_class, dash.no_update
+        raise PreventUpdate
+
     try:
-        token_dict = login({'username': username, 'password': password})
-        session_data = {'session-id': str(uuid.uuid4()), 'location.href': location_href}
+        _ = login({'username': username, 'password': password})
+        session_data = {
+            'session-id': str(uuid.uuid4()),
+            'location.href': location_href,
+        }
         active_sessions[session_data['session-id']] = {'username': username}
+        alerts = []
     except HTTPException:
         form_class += ' is-invalid'
-        session_data = None
-    return session_data, form_class, dash.no_update
+        session_data = dash.no_update
+        alerts = alert_from_success_tuple((False, "Invalid login."))
+    return session_data, form_class, dash.no_update, alerts

meerschaum/api/dash/pages/login.py

@@ -31,7 +31,7 @@ registration_div = html.Div(
         else [
             dcc.Markdown("""
                 #### **Web registration is disabled for security.**
-                You can still register users on this instance with a SQL connector.
+                You can register users via the CLI with `mrsm register user`.
             """),
             dbc.Button(
                 'More information.',
@@ -80,6 +80,7 @@ layout = dbc.Container([
     html.Br(),
     dbc.Container([
         dcc.Location(id='location-login', refresh=True),
+        html.Div(id="login-alert-div"),
         html.Div([
             dbc.Container(
                 html.Img(
@@ -129,4 +130,3 @@ layout = dbc.Container([
         ]),
     ], className='jumbotron')
 ])
-

meerschaum/api/routes/_login.py

@@ -32,16 +32,16 @@ def load_user(
 
 
 @app.post(endpoints['login'], tags=['Users'])
-async def login(
+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)
+        (data['username'], data['password'])
+        if isinstance(data, dict)
+        else (data.username, data.password)
     ) if not no_auth else ('no-auth', 'no-auth')
 
     user = User(username, password)
@@ -62,7 +62,7 @@ async def login(
     return {
         'access_token': access_token,
         'token_type': 'bearer',
-        'expires' : expires_dt,
+        'expires': expires_dt,
     }
 
 

meerschaum/api/routes/_pipes.py

@@ -44,14 +44,14 @@ pd = attempt_import('pandas')
 
 @app.post(pipes_endpoint + '/{connector_keys}/{metric_key}/{location_key}/register', tags=['Pipes'])
 def register_pipe(
-        connector_keys: str,
-        metric_key: str,
-        location_key: str,
-        parameters: dict,
-        curr_user = (
-            fastapi.Depends(manager) if not no_auth else None
-        ),
-    ):
+    connector_keys: str,
+    metric_key: str,
+    location_key: str,
+    parameters: dict,
+    curr_user = (
+        fastapi.Depends(manager) if not no_auth else None
+    ),
+):
     """
     Register a new pipe.
     """
@@ -376,18 +376,18 @@ def sync_pipe(
 
 @app.get(pipes_endpoint + '/{connector_keys}/{metric_key}/{location_key}/data', tags=['Pipes'])
 def get_pipe_data(
-        connector_keys: str,
-        metric_key: str,
-        location_key: str,
-        select_columns: Optional[str] = None,
-        omit_columns: Optional[str] = None,
-        begin: Union[str, int, None] = None,
-        end: Union[str, int, None] = None,
-        params: Optional[str] = None,
-        curr_user = (
-            fastapi.Depends(manager) if not no_auth else None
-        ),
-    ) -> str:
+    connector_keys: str,
+    metric_key: str,
+    location_key: str,
+    select_columns: Optional[str] = None,
+    omit_columns: Optional[str] = None,
+    begin: Union[str, int, None] = None,
+    end: Union[str, int, None] = None,
+    params: Optional[str] = None,
+    curr_user = (
+        fastapi.Depends(manager) if not no_auth else None
+    ),
+) -> str:
     """
     Get a pipe's data, applying any filtering.
 

meerschaum/config/__init__.py

@@ -26,7 +26,14 @@ from meerschaum.config._paths import (
 from meerschaum.config._patch import (
     apply_patch_to_config,
 )
-__all__ = ('get_plugin_config', 'write_plugin_config', 'get_config', 'write_config', 'set_config',)
+__all__ = (
+    'get_plugin_config',
+    'write_plugin_config',
+    'get_config',
+    'write_config',
+    'set_config',
+    'paths',
+)
 __pdoc__ = {'static': False, 'resources': False, 'stack': False, }
 _locks = {'config': RLock()}
 

meerschaum/config/_formatting.py

@@ -36,6 +36,7 @@ default_formatting_config = {
         'paused'           : '🟡',
         'stopped'          : '🔴',
         'tag'              : '🔖',
+        'announcement'     : '📢',
     },
     'pipes'                : {
         'unicode'          : {