meerschaum 2.9.4__py3-none-any.whl → 3.0.0__py3-none-any.whl

meerschaum/api/dash/callbacks/login.py

@@ -16,11 +16,14 @@ from meerschaum.utils.typing import Optional
 dash = attempt_import('dash', lazy=False, check_update=CHECK_UPDATE)
 from dash.exceptions import PreventUpdate
 from dash.dependencies import Input, Output, State
+
 from meerschaum.api.dash import dash_app, debug, pipes, _get_pipes
 from meerschaum.api.dash.sessions import set_session
 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 meerschaum.api._oauth2 import CustomOAuth2PasswordRequestForm
+from meerschaum._internal.static import STATIC_CONFIG
 from fastapi_login.exceptions import InvalidCredentialsException
 from fastapi.exceptions import HTTPException
 dbc = attempt_import('dash_bootstrap_components', lazy=False, check_update=CHECK_UPDATE)
@@ -73,7 +76,13 @@ def login_button_click(
         raise PreventUpdate
 
     try:
-        _ = login({'username': username, 'password': password})
+        form = CustomOAuth2PasswordRequestForm(
+            grant_type='password',
+            username=username,
+            password=password,
+            scope=' '.join(STATIC_CONFIG['tokens']['scopes'])
+        )
+        _ = login(form)
         session_id = str(uuid.uuid4())
         session_data = {
             'session-id': session_id,

meerschaum/api/dash/callbacks/pipes.py

@@ -5,22 +5,35 @@
 Define callbacks for the `/dash/pipes/` page.
 """
 
-from urllib.parse import parse_qs
+from urllib.parse import parse_qs, quote_plus
+from typing import List, Optional, Dict, Any
 
+import dash
 from dash.dependencies import Input, Output, State
 from dash import no_update
+from dash.exceptions import PreventUpdate
+import dash_bootstrap_components as dbc
 
 import meerschaum as mrsm
 from meerschaum.api.dash import dash_app
-from meerschaum.api.dash.pipes import build_pipe_card
-from meerschaum.api import CHECK_UPDATE
+from meerschaum.api.dash.components import (
+    alert_from_success_tuple,
+    build_cards_grid,
+)
+from meerschaum.api.dash.pipes import (
+    build_pipe_card,
+    build_pipes_dropdown_keys_row,
+    build_pipes_tags_dropdown,
+    build_pipes_navbar,
+)
+from meerschaum.api import CHECK_UPDATE, get_api_connector
 from meerschaum.utils.packages import import_html, import_dcc
 from meerschaum.api.dash.sessions import is_session_authenticated
-from meerschaum.utils.typing import Optional, Dict, Any
 html, dcc = import_html(check_update=CHECK_UPDATE), import_dcc(check_update=CHECK_UPDATE)
 
 
 @dash_app.callback(
+    Output('pipes-navbar-div', 'children'),
     Output('pipe-output-div', 'children'),
     Input('pipes-location', 'pathname'),
     State('pipes-location', 'search'),
@@ -32,24 +45,191 @@ def render_pipe_page_from_url(
     session_data: Optional[Dict[str, Any]],
 ):
     if not str(pathname).startswith('/dash/pipes'):
-        return no_update
+        raise PreventUpdate
 
     session_id = (session_data or {}).get('session-id', None)
     authenticated = is_session_authenticated(str(session_id))
+    query_params = parse_qs(pipe_search.lstrip('?')) if pipe_search else {}
+    instance = query_params.get('instance', [None])[0] or str(get_api_connector())
+    tags = query_params.get('tags', [None])[0] or []
+    if isinstance(tags, str):
+        tags = tags.split(',')
+
+    connector_keys = query_params.get('connector_keys', [None])[0] or []
+    if isinstance(connector_keys, str):
+        connector_keys = connector_keys.split(',')
+
+    metric_keys = query_params.get('metric_keys', [None])[0] or []
+    if isinstance(metric_keys, str):
+        metric_keys = metric_keys.split(',')
+
+    location_keys = query_params.get('location_keys', [None])[0] or []
+    if isinstance(location_keys, str):
+        location_keys = location_keys.split(',')
 
     keys = pathname.replace('/dash/pipes', '').lstrip('/').rstrip('/').split('/')
-    if len(keys) not in (2, 3):
-        return no_update
+    instance_connector = mrsm.get_connector(instance)
+    viewing_single_pipe = len(keys) in (2, 3)
+    if instance_connector is None:
+        return (
+            build_pipes_navbar(instance, with_instance_select=(not viewing_single_pipe)),
+            [
+                html.Br(),
+                alert_from_success_tuple((False, f"Invalid instance keys '{instance}'.")),
+                html.Br(),
+            ]
+        )
+
+    if not viewing_single_pipe:
+        try:
+            pipes = mrsm.get_pipes(
+                as_list=True,
+                connector_keys=connector_keys,
+                metric_keys=metric_keys,
+                location_keys=location_keys,
+                tags=tags,
+                instance=instance_connector,
+            )
+        except Exception as e:
+            return (
+                build_pipes_navbar(instance, with_instance_select=False),
+                [
+                    html.Br(),
+                    alert_from_success_tuple(
+                        (False, f"Failed to get pipes for instance '{instance}':\n{e}")
+                    ),
+                    html.Br(),
+                    dbc.Row(
+                        [
+                            dbc.Button(
+                                "Reload",
+                                id='pipes-reload-button',
+                                size='lg',
+                                href=(
+                                    "/dash/pipes"
+                                    if pathname.startswith('/dash/pipes/')
+                                    else "/dash/pipes/" 
+                                )
+                            ),
+                        ],
+                        justify='center',
+                        align='center',
+                        className='h-50',
+                    ),
+                ]
+            )
+
+        cards = [
+            build_pipe_card(pipe, authenticated=authenticated, include_manage=False)
+            for pipe in pipes
+        ]
+        return (
+            build_pipes_navbar(instance, with_instance_select=True),
+            [
+                html.Div([
+                    html.Br(),
+                    build_pipes_dropdown_keys_row(
+                        connector_keys,
+                        metric_keys,
+                        location_keys,
+                        tags,
+                        pipes,
+                        instance_connector,
+                    ),
+                    html.Br(),
+                    build_pipes_tags_dropdown(
+                        connector_keys,
+                        metric_keys,
+                        location_keys,
+                        tags,
+                        instance,
+                    ),
+                ]),
+                html.Br(),
+                build_cards_grid(cards, 1),
+                html.Br(),
+            ]
+        )
 
     ck = keys[0]
     mk = keys[1]
     lk = keys[2] if len(keys) == 3 else None
-    query_params = parse_qs(pipe_search.lstrip('?')) if pipe_search else {}
-    instance = query_params.get('instance', [None])[0]
 
     pipe = mrsm.Pipe(ck, mk, lk, instance=instance)
-    return [
-        html.Br(),
-        build_pipe_card(pipe, authenticated=authenticated, include_manage=False),
-        html.Br(),
-    ]
+    return (
+        build_pipes_navbar(instance, with_instance_select=False),
+        [
+            html.Br(),
+            build_pipe_card(pipe, authenticated=authenticated, include_manage=False),
+            html.Br(),
+        ]
+    )
+
+
+@dash_app.callback(
+    Output('pipes-location', 'search'),
+    Input('pipes-connector-keys-dropdown', 'value'),
+    Input('pipes-metric-keys-dropdown', 'value'),
+    Input('pipes-location-keys-dropdown', 'value'),
+    Input('pipes-tags-dropdown', 'value'),
+    Input('instance-select', 'value'),
+    Input('pipes-clear-all-button', 'n_clicks'),
+)
+def update_location_on_pipes_filter_change(
+    connector_keys: Optional[List[str]],
+    metric_keys: Optional[List[str]],
+    location_keys: Optional[List[str]],
+    tags: Optional[List[str]],
+    instance_keys: str,
+    clear_all_button_n_clicks: Optional[int],
+):
+    """
+    Update the URL parameters when clicking the dropdowns.
+    """
+    ctx = dash.callback_context.triggered
+    if len(ctx) != 1:
+        raise PreventUpdate
+
+    if not any(
+        (connector_keys or [])
+        + (metric_keys or [])
+        + (location_keys or [])
+        + (tags or [])
+        + ([instance_keys] if instance_keys else [])
+    ):
+        return ''
+
+    if ctx[0].get('prop_id', None) == 'pipes-clear-all-button.n_clicks':
+        connector_keys = []
+        metric_keys = []
+        location_keys = []
+        tags = []
+
+    include_instance_keys = instance_keys and instance_keys != str(get_api_connector())
+    search_str = ""
+    
+    if connector_keys:
+        search_str += "connector_keys=" + ','.join((quote_plus(ck) for ck in connector_keys))
+        if metric_keys or location_keys or tags or include_instance_keys:
+            search_str += '&'
+
+    if metric_keys:
+        search_str += "metric_keys=" + ','.join((quote_plus(mk) for mk in metric_keys))
+        if location_keys or tags or include_instance_keys:
+            search_str += '&'
+
+    if location_keys:
+        search_str += "location_keys=" + ','.join((quote_plus(str(lk)) for lk in location_keys))
+        if tags or include_instance_keys:
+            search_str += '&'
+
+    if tags:
+        search_str += "tags=" + ','.join((quote_plus(tag) for tag in tags))
+        if include_instance_keys:
+            search_str += '&'
+
+    if instance_keys:
+        if include_instance_keys:
+            search_str += "instance=" + quote_plus(instance_keys)
+
+    return ('?' + search_str) if search_str else ''

meerschaum/api/dash/callbacks/plugins.py

@@ -66,4 +66,3 @@ def edit_plugin_description(
         success, _msg = get_api_connector().register_plugin(plugin, debug=debug, force=True)
         msg = _msg if not success else "Successfully updated description."
     return [alert_from_success_tuple((success, msg))]
-

meerschaum/api/dash/callbacks/register.py

@@ -13,8 +13,9 @@ from meerschaum.api.dash.sessions import set_session
 from dash.dependencies import Input, Output, State, ALL, MATCH
 from dash.exceptions import PreventUpdate
 from meerschaum.core import User
-from meerschaum.config.static import STATIC_CONFIG
+from meerschaum._internal.static import STATIC_CONFIG
 from meerschaum.utils.packages import attempt_import
+from meerschaum.api._oauth2 import CustomOAuth2PasswordRequestForm
 dash = attempt_import('dash', check_update=CHECK_UPDATE)
 from fastapi.exceptions import HTTPException
 
@@ -97,10 +98,16 @@ def register_button_click(
         form_class += ' is-invalid'
         return {}, form_class, dash.no_update
     try:
-        _ = login({'username': username, 'password': password})
+        form = CustomOAuth2PasswordRequestForm(
+            grant_type='password',
+            username=username,
+            password=password,
+            scope=' '.join(STATIC_CONFIG['tokens']['scopes'])
+        )
+        _ = login(form)
         session_data = {'session-id': str(uuid.uuid4())}
         set_session(session_data['session-id'], {'username': username})
-    except HTTPException as e:
+    except HTTPException:
         form_class += ' is-invalid'
         session_data = None
     return session_data, form_class, (dash.no_update if not session_data else endpoints['dash'])

meerschaum/api/dash/callbacks/settings/password_reset.py

@@ -11,7 +11,7 @@ from dash.dependencies import Input, Output, State
 import dash_bootstrap_components as dbc
 
 from meerschaum.core.User import User
-from meerschaum.config.static import STATIC_CONFIG
+from meerschaum._internal.static import STATIC_CONFIG
 from meerschaum.api import get_api_connector, debug
 from meerschaum.api.dash import dash_app
 from meerschaum.api.dash.components import alert_from_success_tuple
@@ -39,7 +39,7 @@ def password_reset_button_click(n_clicks, new_password_value, session_store_data
         )
 
     instance_connector = get_api_connector()
-    user = User(username, new_password_value)
+    user = User(username, new_password_value, instance=instance_connector)
     success, msg = instance_connector.edit_user(user, debug=debug)
     return alert_from_success_tuple((success, msg))