meerschaum 2.7.1__tar.gz → 2.7.2__tar.gz

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

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

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

@@ -60,7 +60,6 @@ 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.1 → meerschaum-2.7.2}/meerschaum/api/dash/callbacks/dashboard.py

@@ -486,19 +486,18 @@ def update_flags(input_flags_dropdown_values, n_clicks, input_flags_texts):
     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'),
+    *keys_state  ### NOTE: Necessary for `ctx.states`.
 )
 def update_keys_options(
     connector_keys: Optional[List[str]],
     metric_keys: Optional[List[str]],
     location_keys: Optional[List[str]],
     instance_keys: Optional[str],
-    instance_store_data: Optional[Dict[str, Any]],
+    *keys
 ):
     """
     Update the keys dropdown menus' options.
@@ -507,8 +506,6 @@ 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:
@@ -517,11 +514,6 @@ def update_keys_options(
         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
 
@@ -626,7 +618,6 @@ 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(

{meerschaum-2.7.1 → meerschaum-2.7.2}/meerschaum/api/dash/connectors.py

@@ -7,15 +7,16 @@ Functions for interacting with Meerschaum connectors via the Web Interface.
 """
 
 from __future__ import annotations
-from meerschaum.utils.typing import WebState, Union, Optional
+
+import meerschaum as mrsm
+from meerschaum.utils.typing import WebState, Union
 from meerschaum.connectors.parse import parse_instance_keys
-from meerschaum.config import get_config
 from meerschaum.api import debug, get_api_connector
 
-def get_web_connector(state : WebState) -> Union[
-        meerschaum.connectors.api.APIConnector,
-        meerschaum.connectors.sql.SQLConnector,
-    ]:
+def get_web_connector(state: WebState) -> Union[
+    mrsm.connectors.api.APIConnector,
+    mrsm.connectors.sql.SQLConnector,
+]:
     """
     Parse the web instance keys into a connector.
     """
@@ -24,7 +25,4 @@ def get_web_connector(state : WebState) -> Union[
         if not state.get('instance-select.value', None)
         else state['instance-select.value']
     )
-
     return parse_instance_keys(instance_keys, debug=debug)
-
-

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

@@ -37,7 +37,7 @@ window.addEventListener(
             connector_keys_str += " " + quote_str + ck + quote_str;
         }
     }
-    if (connector_keys.length === 0){
+    if (connector_keys_str === " -c"){
         connector_keys_str = "";
     }
     let metric_keys_str = " -m";
@@ -47,7 +47,7 @@ window.addEventListener(
             metric_keys_str += " " + quote_str + mk + quote_str;
         }
     }
-    if (metric_keys.length === 0){
+    if (metric_keys_str === " -m"){
         metric_keys_str = "";
     }
     let location_keys_str = " -l";
@@ -57,7 +57,7 @@ window.addEventListener(
             location_keys_str += " " + quote_str + lk + quote_str;
         }
     }
-    if (location_keys.length === 0){
+    if (location_keys_str === " -l"){
         location_keys_str = "";
     }
 

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

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

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

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