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

meerschaum/api/dash/components.py

@@ -10,10 +10,10 @@ from __future__ import annotations
 
 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._internal.static import STATIC_CONFIG
 from meerschaum.utils.misc import remove_ansi
 from meerschaum._internal.shell.Shell import get_shell_intro
-from meerschaum.api import endpoints, CHECK_UPDATE, docs_enabled
+from meerschaum.api import endpoints, CHECK_UPDATE, docs_enabled, get_api_connector
 from meerschaum.connectors import instance_types, _load_builtin_custom_connectors
 from meerschaum.utils.misc import get_connector_labels
 from meerschaum.config import __doc__ as doc
@@ -104,7 +104,7 @@ instance_select = dbc.Select(
     id='instance-select',
     size='sm',
     options=[
-        {'label': i, 'value': i}
+        {'label': (i[:32] + '…') if len(i) > 32 else i, 'value': i}
         for i in get_connector_labels(*instance_types)
     ],
     class_name='dbc_dark custom-select custom-select-sm',
@@ -163,6 +163,7 @@ pages_navbar = html.Div(
     id='pages-navbar-div',
 )
 
+
 navbar = dbc.Navbar(
     dbc.Container(
         [
@@ -171,13 +172,11 @@ navbar = dbc.Navbar(
             dbc.Collapse(
                 dbc.Row(
                     [
-                        dbc.Col(instance_select),
-                        dbc.Col(
-                            sign_out_button,
-                            className="ms-auto",
-                        ),
+                        dbc.Col(instance_select, width="auto"),
+                        dbc.Col(sign_out_button, width="auto"),
                     ],
                     className="g-0 ms-auto flex-nowrap mt-3 mt-md-0",
+                    align="center",
                 ),
                 id='navbar-collapse',
                 is_open=False,
@@ -267,6 +266,26 @@ def build_pages_offcanvas_children():
 
     plugins_accordion_items = []
     for page_group, pages_dicts in _plugin_endpoints_to_pages.items():
+        if len(pages_dicts) == 1:
+            page_href, page_dict = list(pages_dicts.items())[0]
+            if page_dict['page_key'].lower() == page_group.lower():
+                pages_listgroup_items.append(
+                    dbc.ListGroupItem(
+                        dbc.Button(
+                            ' '.join([word.capitalize() for word in page_dict['page_key'].split(' ')]),
+                            style={
+                                'width': '100%',
+                                'text-align': 'left',
+                                'text-decoration': 'none',
+                                'padding-left': '0',
+                            },
+                            href=page_href,
+                            color='dark',
+                        )
+                    )
+                )
+                continue
+
         plugin_listgroup_items = [
             dbc.ListGroupItem(
                 dbc.Button(
@@ -294,13 +313,15 @@ def build_pages_offcanvas_children():
             class_name='pages-offcanvas-accordion',
         )
         plugins_accordion_items.append(plugin_accordion_item)
-    plugins_accordion = dbc.Accordion(
-        plugins_accordion_items,
-        start_collapsed=True,
-        flush=True,
-        always_open=True,
-    )
-    pages_listgroup_items.append(plugins_accordion)
+
+    if plugins_accordion_items:
+        plugins_accordion = dbc.Accordion(
+            plugins_accordion_items,
+            start_collapsed=True,
+            flush=True,
+            always_open=True,
+        )
+        pages_listgroup_items.append(plugins_accordion)
 
     pages_children = dbc.Card(
         dbc.ListGroup(

meerschaum/api/dash/jobs.py

@@ -98,7 +98,7 @@ def build_job_card(
             html.B(
                 html.A(
                     "🔗 " + job.name,
-                    href=f"/dash/job/{job.name}",
+                    href=f"/dash/jobs/{job.name}",
                     target="_blank",
                     style={
                         'color': 'white',

meerschaum/api/dash/keys.py

@@ -16,13 +16,10 @@ dbc = attempt_import('dash_bootstrap_components', lazy=False, check_update=CHECK
 html, dcc = import_html(check_update=CHECK_UPDATE), import_dcc(check_update=CHECK_UPDATE)
 
 placeholders = {
-    'ck' : 'Connectors',
-    'mk' : 'Metrics',
-    'lk' : 'Locations',
-    'params' : (
-        'Additional search parameters. ' +
-        'Simple dictionary format or JSON accepted.'
-    ),
+    'ck': 'Connectors',
+    'mk': 'Metrics',
+    'lk': 'Locations',
+    'tags': 'Tags',
 }
 widths = {
     'flags' : {'size' : 12},
@@ -212,11 +209,41 @@ dropdown_keys_row = dbc.Row(
         ),
     ] ### end of filters row children
 )
+tags_dropdown = html.Div(
+    dcc.Dropdown(
+        id='tags-dropdown',
+        options=[],
+        placeholder=placeholders['tags'],
+        multi=True,
+        searchable=True,
+    ),
+    className="dbc_dark",
+    id="tags-dropdown-div",
+)
+
 dropdown_tab_content = html.Div([
     dbc.Card(
         dbc.CardBody(
             [
                 dropdown_keys_row,
+                html.Br(),
+                dbc.Row(
+                    [
+                        dbc.Col(tags_dropdown, width=True),
+                        dbc.Col(
+                            dbc.Button(
+                                "Clear all",
+                                id='clear-all-keys-button',
+                                color='link',
+                                size='sm',
+                                style={'text-decoration': 'none'},
+                            ),
+                            width='auto',
+                        ),
+                    ],
+                    className='g-0',
+                    align='center',
+                ),
             ], ### end of card children
             className='card-text',
         )
@@ -232,94 +259,9 @@ dropdown_tab_content = html.Div([
     ),
 ])
 
-text_tab_content = dbc.Card(
-    dbc.CardBody(
-        [
-            dbc.Row(
-                [
-                    dbc.Col(html.Div(className='dbc_dark', children=[
-                        dbc.InputGroup(
-                            [
-                                    dbc.Button(
-                                        'Clear',
-                                        id='clear-connector-keys-input-button',
-                                        color='link',
-                                        size='sm',
-                                    ),
-                                dbc.Input(
-                                    id='connector-keys-input',
-                                    placeholder=placeholders['ck'],
-                                    type='text',
-                                    value='',
-                                    list='connector-keys-list',
-                                    className='dbc_dark'
-                                ),
-                            ],
-                            size=input_group_sizes['ck'],
-                        )]),
-                        width=4,
-                    ),
-                    dbc.Col(
-                        dbc.InputGroup(
-                            [
-                                    dbc.Button(
-                                        'Clear',
-                                        id='clear-metric-keys-input-button',
-                                        color='link',
-                                        size='sm',
-                                    ),
-                                dbc.Input(
-                                    id='metric-keys-input',
-                                    placeholder=placeholders['mk'],
-                                    type='text',
-                                    value='',
-                                    list='metric-keys-list',
-                                ),
-                            ],
-                            size=input_group_sizes['mk'],
-                        ),
-                        width=4,
-                    ),
-                    dbc.Col(
-                        dbc.InputGroup(
-                            [
-                                    dbc.Button(
-                                        'Clear',
-                                        id='clear-location-keys-input-button',
-                                        color='link',
-                                        size='sm',
-                                    ),
-                                dbc.Input(
-                                    id='location-keys-input',
-                                    placeholder=placeholders['lk'],
-                                    type='text',
-                                    value='',
-                                    list='location-keys-list',
-                                ),
-                            ],
-                            size=input_group_sizes['lk'],
-                        ),
-                        width=4,
-                    ),
-                ]
-            ),
-            html.Br(),
-            dbc.Row(
-                dbc.Col(
-                    dbc.InputGroup(
-                        [
-                            search_parameters_editor,
-                        ],
-                        size=input_group_sizes['params'],
-                    )
-                )
-            ),
-        ]
-    )
-)
-
 keys_lists_content = html.Div([
     html.Datalist(id='connector-keys-list'),
     html.Datalist(id='metric-keys-list'),
     html.Datalist(id='location-keys-list'),
+    html.Datalist(id='tags-list'),
 ], hidden=True)

meerschaum/api/dash/pages/__init__.py

@@ -9,7 +9,8 @@ import meerschaum.api.dash.pages.error
 import meerschaum.api.dash.pages.login
 import meerschaum.api.dash.pages.dashboard
 import meerschaum.api.dash.pages.plugins
+import meerschaum.api.dash.pages.tokens
 import meerschaum.api.dash.pages.register
 import meerschaum.api.dash.pages.pipes
-import meerschaum.api.dash.pages.job
+import meerschaum.api.dash.pages.jobs
 import meerschaum.api.dash.pages.settings

meerschaum/api/dash/pages/dashboard.py

@@ -6,7 +6,6 @@
 The main dashboard layout.
 """
 
-import uuid
 from meerschaum.config import __doc__ as doc, get_config
 from meerschaum.utils.misc import get_connector_labels
 from meerschaum.utils.packages import attempt_import, import_html, import_dcc, import_pandas
@@ -43,7 +42,6 @@ from meerschaum.api.dash.components import (
 )
 from meerschaum.api.dash.keys import (
     keys_lists_content,
-    text_tab_content,
     dropdown_tab_content,
 )
 
@@ -62,24 +60,7 @@ layout = html.Div(
                 children=[
                     dbc.Col(
                         children=[
-                            dbc.Tabs(
-                                id='pipes-filter-tabs',
-                                children=[
-                                    dbc.Tab(
-                                        dropdown_tab_content,
-                                        label='Filters',
-                                        id='pipes-filter-dropdown-tab',
-                                        tab_id='dropdown',
-                                    ),
-                                    dbc.Tab(
-                                        text_tab_content,
-                                        label='Text',
-                                        id='pipes-filter-input-tab',
-                                        tab_id='input',
-                                        tab_style={"display": "none"},
-                                    ),
-                                ]
-                            ),
+                            dropdown_tab_content,
                             html.Br(),
                             bottom_buttons_content,
                             test_button,

meerschaum/api/dash/pages/{job.py → jobs.py}

@@ -11,11 +11,14 @@ from meerschaum.utils.packages import import_html, import_dcc
 html, dcc = import_html(check_update=CHECK_UPDATE), import_dcc(check_update=CHECK_UPDATE)
 import dash_bootstrap_components as dbc
 
-from meerschaum.api.dash.components import download_logs, refresh_jobs_interval
+from meerschaum.api.dash.components import download_logs, refresh_jobs_interval, pages_navbar
 
-layout = dbc.Container([
-    dcc.Location('job-location'),
-    html.Div(id='job-output-div'),
-    download_logs,
-    refresh_jobs_interval,
-])
+layout = [
+    pages_navbar,
+    dbc.Container([
+        dcc.Location('job-location'),
+        html.Div(id='job-output-div'),
+        download_logs,
+        refresh_jobs_interval,
+    ]),
+]

meerschaum/api/dash/pages/login.py

@@ -49,11 +49,11 @@ registration_div = html.Div(
                         html.Code('mrsm register user newuser -i sql:main', className='codeblock'),
                     ),
                     dcc.Markdown("""
-                        To enable online registration, open the `system` configuration file and""" +
+                        To enable online registration, open the `api` configuration file and""" +
                     """ set the permissions to `true`:"""
                     ),
                     html.Pre(
-                        html.Code('mrsm edit config system', className='codeblock'),
+                        html.Code('mrsm edit config api', className='codeblock'),
                     ),
                     html.Br(),
                     dcc.Markdown('The settings file should look something like this:'),

meerschaum/api/dash/pages/pipes.py

@@ -7,16 +7,27 @@ Display pipes via a shareable URL.
 
 from meerschaum.api import CHECK_UPDATE
 from meerschaum.utils.packages import import_html, import_dcc
-from meerschaum.api.dash.components import download_dataframe, pages_navbar
+from meerschaum.api.dash.components import (
+    download_dataframe,
+)
 
 html, dcc = import_html(check_update=CHECK_UPDATE), import_dcc(check_update=CHECK_UPDATE)
 import dash_bootstrap_components as dbc
 
 layout = [
-    pages_navbar,
+    html.Div(id='pipes-navbar-div'),
+    dcc.Location('pipes-location'),
+    download_dataframe,
     dbc.Container([
-        dcc.Location('pipes-location'),
-        download_dataframe,
-        html.Div(id='pipe-output-div'),
+        dcc.Loading(
+            html.Div(id='pipe-output-div'),
+            id='pipes-loading',
+            type='circle',
+            delay_hide=1000,
+            delay_show=1000,
+            style={
+                'padding-top': '100px',
+            },
+        ),
     ])
 ]

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

@@ -14,7 +14,7 @@ from meerschaum.plugins import web_page
 @web_page('password-reset', login_required=True, page_group='Settings')
 def page_layout():
     """
-    Return the layout for this page.
+    Return the layout for the password reset page.
     """
     return dbc.Container([
         html.Br(),

meerschaum/api/dash/pages/tokens.py

@@ -0,0 +1,53 @@
+#! /usr/bin/env python3
+# vim:fenc=utf-8
+
+"""
+Define the tokens page layout.
+"""
+
+import dash_bootstrap_components as dbc
+import dash.html as html
+import dash.dcc as dcc
+from meerschaum._internal.static import STATIC_CONFIG
+from meerschaum.api.dash.components import pages_navbar
+
+
+layout = [
+    pages_navbar,
+    dbc.Container([
+        html.Br(), 
+        html.H3('Tokens'),
+        html.Div(id="tokens-alert-div"),
+        dbc.Modal(
+            id="tokens-register-input-modal",
+            size='lg',
+            is_open=False,
+        ),
+        dbc.Modal(
+            id="tokens-register-output-modal",
+            size='lg',
+            is_open=False,
+            backdrop='static',
+        ),
+        html.Div(id='tokens-register-output-modal-div'),
+        html.Div(
+            [
+                dbc.Button(
+                    "⟳",
+                    color='black',
+                    size='sm',
+                    id='tokens-refresh-button',
+                ),
+                dbc.Button(
+                    html.B('+'),
+                    color='black',
+                    size='sm',
+                    id='tokens-create-button',
+                ),
+            ],
+            id='tokens-controls-div',
+            style={'text-align': 'right'},
+        ),
+        html.Div(id='tokens-output-div'),
+    ]),
+]