meerschaum 2.7.1__py3-none-any.whl → 2.7.2__py3-none-any.whl

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/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/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/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/config/_version.py

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

{meerschaum-2.7.1.dist-info → meerschaum-2.7.2.dist-info}/METADATA

@@ -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.dist-info → meerschaum-2.7.2.dist-info}/RECORD

@@ -56,9 +56,9 @@ meerschaum/api/_chain.py,sha256=h8-WXUGXX6AqzdALfsBC5uv0FkAcLdHJXCGzqzuq89k,875
 meerschaum/api/_events.py,sha256=f-98AXHU10IL9zRGX1FrZFANxxiMz5ryeJnfFWaU8R8,2232
 meerschaum/api/_oauth2.py,sha256=dJTIVlPpX3sAVW-PcN6pXRNy2RR5QAalu2RHp3l14YU,1683
 meerschaum/api/_websockets.py,sha256=EMT9wB3yELu_WyCMqn9ZpgMDh23spUUchouRLCCLVuw,1509
-meerschaum/api/dash/__init__.py,sha256=jL08XtzNAzsrXJthDRqq-DlJjg6OpoyqeLeNjkp_bnA,2147
+meerschaum/api/dash/__init__.py,sha256=29vMm_m5gSDYG0lahh-8yVfhqg9kUFnUrYyw_9jC2Y0,2078
 meerschaum/api/dash/components.py,sha256=t2goHW7oioao5Ew6Dro9U4LZDnHF-YWb4flLPx46GP8,6293
-meerschaum/api/dash/connectors.py,sha256=nJxBOFldtCMJLYjUSVYZwX5BO-LNjTNHgoEaXe-0XMo,843
+meerschaum/api/dash/connectors.py,sha256=-Wd40ieYJI2nOASXi4V1C4bvLekjnN_tj6zp7HgZDl0,791
 meerschaum/api/dash/graphs.py,sha256=wJUDWzcLN8-C3xko6rj0F2v7Rt8YDkSXoVkkXJjYGIk,2046
 meerschaum/api/dash/jobs.py,sha256=mj9STE6AaQY4fwkjD1JcYRG0iW3VEcP04bO1SlKgiXw,7681
 meerschaum/api/dash/keys.py,sha256=hzEVeN60SAfVTVSO5lajGaykxRIKGhj9Ph00HRJnNoE,12598
@@ -77,7 +77,7 @@ meerschaum/api/dash/assets/logo_48x48.png,sha256=hTR5BHUHEN4yP2xiqAcDciuigoII9T3
 meerschaum/api/dash/assets/logo_500x500.png,sha256=9EUtf6wQcEZTXHKfQ2kjNXod6Rn_4DTB_BkTgxggq00,67702
 meerschaum/api/dash/callbacks/__init__.py,sha256=5nLDkziaWWWt5ivmuMNG3kVBMOfqB6KQNIAS8f16bmA,493
 meerschaum/api/dash/callbacks/custom.py,sha256=N9pVolAF8sIuJD3V6xBSgS7k8THJo_f8d1qAoh1Kg60,1161
-meerschaum/api/dash/callbacks/dashboard.py,sha256=-qTzDG7Gnc597A-I5KBaPu6myXhW9ow0fm5gxErtUMM,33171
+meerschaum/api/dash/callbacks/dashboard.py,sha256=UNbMG1w8sOTyOFLIRSJwnKZ5B1IuGZI8OHjiUTEgrfA,32777
 meerschaum/api/dash/callbacks/jobs.py,sha256=JYTrDcUEte_MIT3EegLDmQDsmU_Mxqw8L60dvF71ho4,8418
 meerschaum/api/dash/callbacks/login.py,sha256=mEvMgV-f85H6DvqNdTvJPoiwHqTnhWY2nf_zLB26ipE,2876
 meerschaum/api/dash/callbacks/pipes.py,sha256=byphQn-wJOe8ft-fGU9wac0n5xsMjVHJzNvYYb9NsKU,1693
@@ -116,7 +116,7 @@ meerschaum/api/resources/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQe
 meerschaum/api/resources/templates/index.html,sha256=Ck-S0U5abJgB-wTOKIGg0ispGzKlXXqvFUoNAAByzLA,1019
 meerschaum/api/resources/templates/old_index.html,sha256=BDeOlcXhSsBH3-NaRtuX4Z1sDuhOoCMa_Dq-6g5RMpc,1711
 meerschaum/api/resources/templates/secret.html,sha256=0QWkm4ZoN81Aw1pd2-62rGCvx3nXPHfFUoegj3Iy8Ls,141
-meerschaum/api/resources/templates/termpage.html,sha256=4npmhCrZtPqxDE9hK7tzKjbLUZyUzu-X73vKg3_C6lc,4807
+meerschaum/api/resources/templates/termpage.html,sha256=A9YmJurFFliI0se9T4z0SBMIuoQqANyKSUJzZh8dcGo,4810
 meerschaum/api/routes/__init__.py,sha256=jbkeFNl51Tg8aT5gWe560ZLZLojFJsLMe5IENRjRkb0,606
 meerschaum/api/routes/_actions.py,sha256=VUasS1dpr4d3TXHcR1CXlRZPAqvGKKuHv_f9PsOkQ5c,1732
 meerschaum/api/routes/_connectors.py,sha256=NNbcn5xWhKqw2PqueSEaqRaZ95hFGDKazG5lE7gsssc,1849
@@ -143,7 +143,7 @@ meerschaum/config/_preprocess.py,sha256=-AEA8m_--KivZwTQ1sWN6LTn5sio_fUr2XZ51BO6
 meerschaum/config/_read_config.py,sha256=RLC3HHi_1ndj7ITVDKLD9_uULY3caGRwSz3ATYE-ixA,15014
 meerschaum/config/_shell.py,sha256=46_m49Txc5q1rGfCgO49ca48BODx45DQJi8D0zz1R18,4245
 meerschaum/config/_sync.py,sha256=jHcWRkxd82_BgX8Xo8agsWvf7BSbv3qHLWmYl6ehp_0,4242
-meerschaum/config/_version.py,sha256=KZzrNL20ForXO9e1OCdiNBZ0WcwZ4I9Z_8Rz0oMe8d8,71
+meerschaum/config/_version.py,sha256=1xtNmQSH6cdwmiJLMPpwjpoQUlVu9nsvSoAacNis2YE,71
 meerschaum/config/paths.py,sha256=JjibeGN3YAdSNceRwsd42aNmeUrIgM6ndzC8qZAmNI0,621
 meerschaum/config/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerschaum/config/stack/__init__.py,sha256=2UukC0Lmk-aVL1o1qXzumqmuIrw3vu9fD7iCuz4XD4I,10544
@@ -251,11 +251,11 @@ meerschaum/utils/packages/_packages.py,sha256=ykannoLv2Fm4iwZwiIlNAGZvt654cMJhjX
 meerschaum/utils/packages/lazy_loader.py,sha256=VHnph3VozH29R4JnSSBfwtA5WKZYZQFT_GeQSShCnuc,2540
 meerschaum/utils/venv/_Venv.py,sha256=QsnDGEE_YBqXIq53NTWi2TANA1FbkqJBl_xQi9jQP_U,3537
 meerschaum/utils/venv/__init__.py,sha256=eup-zUBdHBdNbu_G1qgA8iRzJvlAXyGhY7pG-SEvbHs,25347
-meerschaum-2.7.1.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
-meerschaum-2.7.1.dist-info/METADATA,sha256=rIEPTlucCyhBXjRB_ohMKVry1H7qOveF7ojFnrr1TcM,24224
-meerschaum-2.7.1.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
-meerschaum-2.7.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-meerschaum-2.7.1.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
-meerschaum-2.7.1.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
-meerschaum-2.7.1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-meerschaum-2.7.1.dist-info/RECORD,,
+meerschaum-2.7.2.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
+meerschaum-2.7.2.dist-info/METADATA,sha256=sMJL8F_pnYQOFhtyZ4LkrtOmwlzaHN-uXYiLHC1eEMM,24224
+meerschaum-2.7.2.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
+meerschaum-2.7.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+meerschaum-2.7.2.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
+meerschaum-2.7.2.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
+meerschaum-2.7.2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+meerschaum-2.7.2.dist-info/RECORD,,