meerschaum 2.7.0__tar.gz → 2.7.1__tar.gz

{meerschaum-2.7.0/meerschaum.egg-info → meerschaum-2.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.7.0
+Version: 2.7.1
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares

{meerschaum-2.7.0 → meerschaum-2.7.1}/meerschaum/api/dash/__init__.py

@@ -60,6 +60,7 @@ dash_app = enrich.DashProxy(
 dash_app.layout = html.Div([
     location,
     dcc.Store(id='session-store', storage_type='local', data={}),
+    dcc.Store(id='instance-store', storage_type='session', data={}),
     html.Div([], id='page-layout-div'),
 ])
 

{meerschaum-2.7.0 → meerschaum-2.7.1}/meerschaum/api/dash/callbacks/dashboard.py

@@ -11,6 +11,8 @@ from __future__ import annotations
 import textwrap
 import json
 import uuid
+from datetime import datetime, timezone
+
 from dash.dependencies import Input, Output, State, ALL, MATCH
 from dash.exceptions import PreventUpdate
 from meerschaum.utils.typing import List, Optional, Any, Tuple
@@ -191,6 +193,7 @@ def update_page_layout_div(
     Input('get-plugins-button', 'n_clicks'),
     Input('get-users-button', 'n_clicks'),
     Input('get-graphs-button', 'n_clicks'),
+    Input('instance-select', 'value'),
     State('mrsm-location', 'href'),
     State('session-store', 'data'),
     State('webterm-div', 'children'),
@@ -210,7 +213,7 @@ def update_content(*args):
     ### Open the webterm on the initial load.
     if not ctx.triggered:
         initial_load = True
-        trigger = 'open-shell-button'
+        trigger = 'instance-select'
 
     trigger = ctx.triggered[0]['prop_id'].split('.')[0] if not trigger else trigger
 
@@ -232,7 +235,7 @@ def update_content(*args):
         'get-plugins-button': get_plugins_cards,
         'get-users-button': get_users_cards,
         'get-graphs-button': get_graphs_cards,
-        'open-shell-button': lambda x: ([], []),
+        'instance-select': lambda x: ([], []),
     }
     ### Defaults to 3 if not in dict.
     trigger_num_cols = {
@@ -248,7 +251,7 @@ def update_content(*args):
     webterm_style = {
         'display': (
             'none'
-            if trigger not in ('open-shell-button', 'cancel-button', 'go-button')
+            if trigger not in ('instance-select', 'cancel-button', 'go-button')
             else 'block'
         )
     }
@@ -284,9 +287,9 @@ dash_app.clientside_callback(
         input_flags_texts,
         instance,
     ){
-        if (!n_clicks){ return url; }
+        if (!n_clicks){ return dash_clientside.no_update; }
         iframe = document.getElementById('webterm-iframe');
-        if (!iframe){ return url; }
+        if (!iframe){ return dash_clientside.no_update; }
 
         // Actions must be obtained from the DOM because of dynamic subactions.
         action = document.getElementById('action-dropdown').value;
@@ -308,7 +311,7 @@ dash_app.clientside_callback(
             },
             url
         );
-        return url;
+        return dash_clientside.no_update;
     }
     """,
     Output('mrsm-location', 'href'),
@@ -472,29 +475,30 @@ def update_flags(input_flags_dropdown_values, n_clicks, input_flags_texts):
 
 
 @dash_app.callback(
-    Output(component_id='connector-keys-dropdown', component_property='options'),
-    Output(component_id='connector-keys-list', component_property='children'),
-    Output(component_id='connector-keys-dropdown', component_property='value'),
-    Output(component_id='metric-keys-dropdown', component_property='options'),
-    Output(component_id='metric-keys-list', component_property='children'),
-    Output(component_id='metric-keys-dropdown', component_property='value'),
-    Output(component_id='location-keys-dropdown', component_property='options'),
-    Output(component_id='location-keys-list', component_property='children'),
-    Output(component_id='location-keys-dropdown', component_property='value'),
-    Output(component_id='instance-select', component_property='value'),
-    Output(component_id='instance-alert-div', component_property='children'),
-    Input(component_id='connector-keys-dropdown', component_property='value'),
-    Input(component_id='metric-keys-dropdown', component_property='value'),
-    Input(component_id='location-keys-dropdown', component_property='value'),
-    Input(component_id='instance-select', component_property='value'),
-    *keys_state
+    Output('connector-keys-dropdown', 'options'),
+    Output('connector-keys-list', 'children'),
+    Output('connector-keys-dropdown', 'value'),
+    Output('metric-keys-dropdown', 'options'),
+    Output('metric-keys-list', 'children'),
+    Output('metric-keys-dropdown', 'value'),
+    Output('location-keys-dropdown', 'options'),
+    Output('location-keys-list', 'children'),
+    Output('location-keys-dropdown', 'value'),
+    Output('instance-select', 'value'),
+    Output('instance-alert-div', 'children'),
+    Output('instance-store', 'data'),
+    Input('connector-keys-dropdown', 'value'),
+    Input('metric-keys-dropdown', 'value'),
+    Input('location-keys-dropdown', 'value'),
+    Input('instance-select', 'value'),
+    State('instance-store', 'data'),
 )
 def update_keys_options(
     connector_keys: Optional[List[str]],
     metric_keys: Optional[List[str]],
     location_keys: Optional[List[str]],
     instance_keys: Optional[str],
-    *keys
+    instance_store_data: Optional[Dict[str, Any]],
 ):
     """
     Update the keys dropdown menus' options.
@@ -503,11 +507,24 @@ def update_keys_options(
     trigger = ctx.triggered[0]['prop_id'].split('.')[0]
     instance_click = trigger == 'instance-select'
 
+    session_instance = instance_store_data.get('session_instance', None)
+
     ### Update the instance first.
     update_instance_keys = False
     if not instance_keys:
+        ### NOTE: Set to `session_instance` to restore the last used session.
+        ###       Choosing not to do this in order to keep the dashboard and webterm in sync.
         instance_keys = str(get_api_connector())
         update_instance_keys = True
+
+    instance_store_data_to_return = (
+        {**(instance_store_data or {}), **{'session_instance': instance_keys}}
+        if update_instance_keys or session_instance != instance_keys
+        else dash.no_update
+    )
+    if not trigger and not update_instance_keys:
+        raise PreventUpdate
+
     instance_alerts = []
     try:
         parse_instance_keys(instance_keys)
@@ -609,6 +626,7 @@ def update_keys_options(
         location_keys,
         (instance_keys if update_instance_keys else dash.no_update),
         instance_alerts,
+        instance_store_data_to_return,
     )
 
 dash_app.clientside_callback(
@@ -617,14 +635,13 @@ dash_app.clientside_callback(
         instance,
         url,
     ){
-        window.instance = instance;
-        if (!instance){ return url; }
-        iframe = document.getElementById('webterm-iframe');
-        if (!iframe){ return url; }
         if (!window.instance){
             window.instance = instance;
             return url;
         }
+        if (!instance){ return url; }
+        iframe = document.getElementById('webterm-iframe');
+        if (!iframe){ return url; }
         window.instance = instance;
 
         iframe.contentWindow.postMessage(
@@ -639,6 +656,7 @@ dash_app.clientside_callback(
     """,
     Output('mrsm-location', 'href'),
     Input('instance-select', 'value'),
+    State('mrsm-location', 'href'),
 )
 
 
@@ -698,7 +716,7 @@ dash_app.clientside_callback(
     """
     function(console_children, url){
         if (!console_children){
-            return console_children;
+            return dash_clientside.no_update;
         }
         var ansi_up = new AnsiUp;
         var html = ansi_up.ansi_to_html(console_children);
@@ -707,7 +725,7 @@ dash_app.clientside_callback(
             "<pre id=\\"console-pre\\">" + html + "</pre>"
         );
         console_div.scrollTop = console_div.scrollHeight;
-        return url;
+        return dash_clientside.no_update;;
     }
     """,
     Output('mrsm-location', 'href'),
@@ -885,8 +903,8 @@ dash_app.clientside_callback(
 
         iframe = document.getElementById('webterm-iframe');
         if (!iframe){ return dash_clientside.no_update; }
-        var location = pipe_meta.location;
-        if (!pipe_meta.location){
+        var location = pipe_meta.location_key;
+        if (!pipe_meta.location_key){
             location = "None";
         }
 
@@ -894,25 +912,25 @@ dash_app.clientside_callback(
         if (action == "python"){
             subaction = (
                 '"' + "pipe = mrsm.Pipe('"
-                + pipe_meta.connector
+                + pipe_meta.connector_keys
                 + "', '"
-                + pipe_meta.metric
+                + pipe_meta.metric_key
                 + "'"
             );
             if (location != "None"){
                 subaction += ", '" + location + "'";
             }
-            subaction += ", instance='" + pipe_meta.instance + "')" + '"';
+            subaction += ", instance='" + pipe_meta.instance_keys + "')" + '"';
         }
 
         iframe.contentWindow.postMessage(
             {
                 action: action,
                 subaction: subaction,
-                connector_keys: [pipe_meta.connector],
-                metric_keys: [pipe_meta.metric],
-                location_keys: [location],
-                instance: pipe_meta.instance,
+                connector_keys: [pipe_meta.connector_keys],
+                metric_keys: [pipe_meta.metric_key],
+                location_keys: [pipe_meta.location_key],
+                instance: pipe_meta.instance_keys,
             },
             url
         );

{meerschaum-2.7.0 → meerschaum-2.7.1}/meerschaum/api/resources/templates/termpage.html

@@ -17,9 +17,9 @@ window.addEventListener(
   (event) => {
     if (!event.isTrusted){ return; }
 
-    action_str = event.data.action;
-    subaction_str = event.data['subaction'] ? event.data['subaction'] : '';
-    subaction_text = event.data['subaction_text'] ? event.data['subaction_text'] : '';
+    let action_str = event.data.action;
+    let subaction_str = event.data['subaction'] ? event.data['subaction'] : '';
+    let subaction_text = event.data['subaction_text'] ? event.data['subaction_text'] : '';
     if (subaction_str.length > 0){
         action_str += ' ' + subaction_str;
     }
@@ -27,45 +27,53 @@ window.addEventListener(
         action_str += ' ' + subaction_text;
     }
 
-    connector_keys = event.data['connector_keys'] ? event.data['connector_keys'] : [];
-    metric_keys = event.data['metric_keys'] ? event.data['metric_keys'] : [];
-    location_keys = event.data['location_keys'] ? event.data['location_keys'] : [];
-    connector_keys_str = " -c";
-    for (ck of connector_keys){
-        quote_str = ck.includes(" ") ? "'" : "";
-        connector_keys_str += " " + quote_str + ck + quote_str;
+    let connector_keys = event.data['connector_keys'] ? event.data['connector_keys'] : [];
+    let metric_keys = event.data['metric_keys'] ? event.data['metric_keys'] : [];
+    let location_keys = event.data['location_keys'] ? event.data['location_keys'] : [];
+    let connector_keys_str = " -c";
+    for (let ck of connector_keys){
+        if (typeof ck === "string"){
+            let quote_str = ck.includes(" ") ? "'" : "";
+            connector_keys_str += " " + quote_str + ck + quote_str;
+        }
     }
     if (connector_keys.length === 0){
         connector_keys_str = "";
     }
-    metric_keys_str = " -m";
+    let metric_keys_str = " -m";
     for (mk of metric_keys){
-        quote_str = mk.includes(" ") ? "'" : "";
-        metric_keys_str += " " + quote_str + mk + quote_str;
+        if (typeof mk === "string"){
+            let quote_str = mk.includes(" ") ? "'" : "";
+            metric_keys_str += " " + quote_str + mk + quote_str;
+        }
     }
     if (metric_keys.length === 0){
         metric_keys_str = "";
     }
-    location_keys_str = " -l";
+    let location_keys_str = " -l";
     for (lk of location_keys){
-        quote_str = lk.includes(" ") ? "'" : "";
-        location_keys_str += " " + quote_str + lk + quote_str;
+        if (typeof lk === "string"){
+            quote_str = lk.includes(" ") ? "'" : "";
+            location_keys_str += " " + quote_str + lk + quote_str;
+        }
     }
     if (location_keys.length === 0){
         location_keys_str = "";
     }
 
-    instance = event.data['instance'] ? event.data['instance'] : '';
-    flags_str = "";
+    let instance = event.data['instance'] ? event.data['instance'] : '';
+    let flags_str = "";
     if (instance.length > 0){
         flags_str += " -i " + instance;
     }
-    flags = event.data['flags'] ? event.data['flags'] : [];
+    let flags = event.data['flags'] ? event.data['flags'] : [];
     for (fl of flags){
-        flags_str += " " + fl;
+        if (typeof fl === "string"){
+            flags_str += " " + fl;
+        }
     }
     // NOTE: Input flags are not quoted to allow for multiple arguments.
-    input_flags = event.data['input_flags'] ? event.data['input_flags'] : [];
+    let input_flags = event.data['input_flags'] ? event.data['input_flags'] : [];
     for (const [index, fl] of input_flags.entries()){
         if (!fl){ continue; }
         fl_val = event.data['input_flags_texts'][index];

{meerschaum-2.7.0 → meerschaum-2.7.1}/meerschaum/api/routes/_webterm.py

@@ -13,9 +13,10 @@ from meerschaum.utils.packages import attempt_import
 from meerschaum.api.dash.sessions import is_session_authenticated
 fastapi, fastapi_responses = attempt_import('fastapi', 'fastapi.responses')
 import starlette
-httpcore = attempt_import('httpcore')
-httpx = attempt_import('httpx')
-websockets = attempt_import('websockets')
+
+httpcore = attempt_import('httpcore', lazy=False)
+httpx = attempt_import('httpx', lazy=False)
+websockets = attempt_import('websockets', lazy=False)
 Request = fastapi.Request
 WebSocket = fastapi.WebSocket
 HTMLResponse = fastapi_responses.HTMLResponse

{meerschaum-2.7.0 → meerschaum-2.7.1}/meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "2.7.0"
+__version__ = "2.7.1"

{meerschaum-2.7.0 → meerschaum-2.7.1}/meerschaum/connectors/sql/_create_engine.py

@@ -190,7 +190,12 @@ def create_engine(
     import copy
     ### Install and patch required drivers.
     if self.flavor in install_flavor_drivers:
-        attempt_import(*install_flavor_drivers[self.flavor], debug=debug, lazy=False, warn=False)
+        _ = attempt_import(
+            *install_flavor_drivers[self.flavor],
+            debug=debug,
+            lazy=False,
+            warn=False,
+        )
         if self.flavor == 'mssql':
             pyodbc = attempt_import('pyodbc', debug=debug, lazy=False, warn=False)
             pyodbc.pooling = False

{meerschaum-2.7.0 → meerschaum-2.7.1/meerschaum.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.7.0
+Version: 2.7.1
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares