meerschaum 2.7.0rc1__py3-none-any.whl → 2.7.2__py3-none-any.whl

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,22 +475,22 @@ 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'),
+    Input('connector-keys-dropdown', 'value'),
+    Input('metric-keys-dropdown', 'value'),
+    Input('location-keys-dropdown', 'value'),
+    Input('instance-select', 'value'),
+    *keys_state  ### NOTE: Necessary for `ctx.states`.
 )
 def update_keys_options(
     connector_keys: Optional[List[str]],
@@ -506,8 +509,14 @@ def update_keys_options(
     ### 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
+
+    if not trigger and not update_instance_keys:
+        raise PreventUpdate
+
     instance_alerts = []
     try:
         parse_instance_keys(instance_keys)
@@ -617,14 +626,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 +647,7 @@ dash_app.clientside_callback(
     """,
     Output('mrsm-location', 'href'),
     Input('instance-select', 'value'),
+    State('mrsm-location', 'href'),
 )
 
 
@@ -698,7 +707,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 +716,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 +894,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 +903,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/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

@@ -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){
+    if (connector_keys_str === " -c"){
         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){
+    if (metric_keys_str === " -m"){
         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){
+    if (location_keys_str === " -l"){
         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/api/routes/_pipes.py

@@ -11,7 +11,6 @@ from __future__ import annotations
 
 import io
 import json
-import fastapi
 from decimal import Decimal
 import datetime
 
@@ -359,16 +358,16 @@ def sync_pipe(
     p = get_pipe(connector_keys, metric_key, location_key)
     if p.target in ('users', 'plugins', 'pipes'):
         raise fastapi.HTTPException(
-            status_code = 409,
-            detail = f"Cannot sync data to protected table '{p.target}'.",
+            status_code=409,
+            detail=f"Cannot sync data to protected table '{p.target}'.",
         )
 
     if not p.columns and columns is not None:
         p.columns = json.loads(columns)
     if not p.columns and not is_pipe_registered(p, pipes(refresh=True)):
         raise fastapi.HTTPException(
-            status_code = 409,
-            detail = "Pipe must be registered with the datetime column specified."
+            status_code=409,
+            detail="Pipe must be registered with index columns specified."
         )
 
     result = list(p.sync(
@@ -412,7 +411,7 @@ def get_pipe_data(
     if params is not None:
         try:
             _params = json.loads(params)
-        except Exception as e:
+        except Exception:
             _params = None
     if not isinstance(_params, dict):
         raise fastapi.HTTPException(
@@ -426,7 +425,7 @@ def get_pipe_data(
     if select_columns is not None:
         try:
             _select_columns = json.loads(select_columns)
-        except Exception as e:
+        except Exception:
             _select_columns = None
     if not isinstance(_select_columns, list):
         raise fastapi.HTTPException(
@@ -440,7 +439,7 @@ def get_pipe_data(
     if omit_columns is not None:
         try:
             _omit_columns = json.loads(omit_columns)
-        except Exception as e:
+        except Exception:
             _omit_columns = None
     if _omit_columns is None:
         raise fastapi.HTTPException(

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

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

meerschaum/connectors/api/_pipes.py

@@ -292,7 +292,7 @@ def sync_pipe(
 
         try:
             j = tuple(j)
-        except Exception as e:
+        except Exception:
             return False, response.text
 
         if debug:
@@ -314,12 +314,12 @@ def sync_pipe(
 
 def delete_pipe(
     self,
-    pipe: Optional[meerschaum.Pipe] = None,
+    pipe: Optional[mrsm.Pipe] = None,
     debug: bool = None,        
 ) -> SuccessTuple:
     """Delete a Pipe and drop its table."""
     if pipe is None:
-        error(f"Pipe cannot be None.")
+        error("Pipe cannot be None.")
     r_url = pipe_r_url(pipe)
     response = self.delete(
         r_url + '/delete',
@@ -340,7 +340,7 @@ def delete_pipe(
 
 def get_pipe_data(
     self,
-    pipe: meerschaum.Pipe,
+    pipe: mrsm.Pipe,
     select_columns: Optional[List[str]] = None,
     omit_columns: Optional[List[str]] = None,
     begin: Union[str, datetime, int, None] = None,
@@ -352,7 +352,6 @@ def get_pipe_data(
 ) -> Union[pandas.DataFrame, None]:
     """Fetch data from the API."""
     r_url = pipe_r_url(pipe)
-    chunks_list = []
     while True:
         try:
             response = self.get(
@@ -376,12 +375,19 @@ def get_pipe_data(
             return False, j['detail']
         break
 
-    from meerschaum.utils.packages import import_pandas
     from meerschaum.utils.dataframe import parse_df_datetimes, add_missing_cols_to_df
     from meerschaum.utils.dtypes import are_dtypes_equal
-    pd = import_pandas()
     try:
-        df = pd.read_json(StringIO(response.text))
+        df = parse_df_datetimes(
+            j,
+            ignore_cols=[
+                col
+                for col, dtype in pipe.dtypes.items()
+                if not are_dtypes_equal(str(dtype), 'datetime')
+            ],
+            strip_timezone=(pipe.tzinfo is None),
+            debug=debug,
+        )
     except Exception as e:
         warn(f"Failed to parse response for {pipe}:\n{e}")
         return None
@@ -389,16 +395,6 @@ def get_pipe_data(
     if len(df.columns) == 0:
         return add_missing_cols_to_df(df, pipe.dtypes)
 
-    df = parse_df_datetimes(
-        df,
-        ignore_cols = [
-            col
-            for col, dtype in pipe.dtypes.items()
-            if not are_dtypes_equal(str(dtype), 'datetime')
-        ],
-        strip_timezone=(pipe.tzinfo is None),
-        debug=debug,
-    )
     return df
 
 

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/connectors/sql/_instance.py

@@ -9,8 +9,7 @@ Define utilities for instance connectors.
 import time
 from datetime import datetime, timezone, timedelta
 import meerschaum as mrsm
-from meerschaum.utils.typing import Dict, SuccessTuple, Optional, Union, List
-from meerschaum.utils.warnings import warn
+from meerschaum.utils.typing import Dict, SuccessTuple, Union, List
 
 
 _in_memory_temp_tables: Dict[str, bool] = {}
@@ -28,9 +27,9 @@ def _log_temporary_tables_creation(
     from meerschaum.connectors.sql.tables import get_tables
     sqlalchemy = mrsm.attempt_import('sqlalchemy')
     temp_tables_table = get_tables(
-        mrsm_instance = self,
-        create = create,
-        debug = debug,
+        mrsm_instance=self,
+        create=create,
+        debug=debug,
     )['temp_tables']
     if isinstance(tables, str):
         tables = [tables]
@@ -72,7 +71,9 @@ def _drop_temporary_table(
             return True, "Success"
 
     drop_query = f"DROP TABLE {if_exists} " + sql_item_name(
-        table, self.flavor, schema=self.internal_schema
+        table,
+        self.flavor,
+        schema=self.internal_schema
     )
     drop_success = self.exec(drop_query, silent=True, debug=debug) is not None
     drop_msg = "Success" if drop_success else f"Failed to drop temporary table '{table}'."
@@ -83,7 +84,6 @@ def _drop_temporary_tables(self, debug: bool = False) -> SuccessTuple:
     """
     Drop all tables in the internal schema that are marked as ready to be dropped.
     """
-    from meerschaum.utils.sql import sql_item_name, table_exists
     from meerschaum.utils.misc import items_str
     from meerschaum.connectors.sql.tables import get_tables
     sqlalchemy = mrsm.attempt_import('sqlalchemy')
@@ -141,16 +141,15 @@ def _drop_temporary_tables(self, debug: bool = False) -> SuccessTuple:
 
 
 def _drop_old_temporary_tables(
-        self,
-        refresh: bool = True,
-        debug: bool = False,
-    ) -> SuccessTuple:
+    self,
+    refresh: bool = True,
+    debug: bool = False,
+) -> SuccessTuple:
     """
     Drop temporary tables older than the configured interval (24 hours by default).
     """
     from meerschaum.config import get_config
     from meerschaum.connectors.sql.tables import get_tables
-    from meerschaum.utils.misc import items_str
     sqlalchemy = mrsm.attempt_import('sqlalchemy')
     temp_tables_table = get_tables(mrsm_instance=self, create=False, debug=debug)['temp_tables']
     last_check = getattr(self, '_stale_temporary_tables_check_timestamp', 0)