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

meerschaum/api/dash/pipes.py

@@ -18,7 +18,7 @@ from meerschaum.utils.packages import attempt_import, import_dcc, import_html, i
 from meerschaum.utils.sql import get_pd_type
 from meerschaum.utils.yaml import yaml
 from meerschaum.utils.warnings import warn
-from meerschaum.utils.dataframe import to_json
+from meerschaum.utils.dataframe import to_json, to_simple_lines
 from meerschaum.connectors.sql._fetch import get_pipe_query
 from meerschaum.api import CHECK_UPDATE
 from meerschaum.api.dash import debug, _get_pipes
@@ -58,28 +58,20 @@ def pipe_from_ctx(ctx, trigger_property: str = 'n_clicks') -> Union[mrsm.Pipe, N
 
 def keys_from_state(
     state: Dict[str, Any],
-    with_params: bool = False
+    with_tags: bool = False,
 ) -> Union[
     Tuple[List[str], List[str], List[str]],
-    Tuple[List[str], List[str], List[str], str],
+    Tuple[List[str], List[str], List[str], List[str]],
 ]:
     """
     Read the current state and return the selected keys lists.
     """
     _filters = {
-        'ck' : state.get(f"connector-keys-{state['pipes-filter-tabs.active_tab']}.value", None),
-        'mk' : state.get(f"metric-keys-{state['pipes-filter-tabs.active_tab']}.value", None),
-        'lk' : state.get(f"location-keys-{state['pipes-filter-tabs.active_tab']}.value", None),
+        'ck': state.get("connector-keys-dropdown.value", None),
+        'mk': state.get("metric-keys-dropdown.value", None),
+        'lk': state.get("location-keys-dropdown.value", None),
+        'tags': state.get("tags-dropdown.value", None),
     }
-    if state['pipes-filter-tabs.active_tab'] == 'input':
-        try:
-            #  params = string_to_dict(state['params-textarea.value'])
-            params = string_to_dict(state['search-parameters-editor.value'])
-        except Exception:
-            params = None
-    else:
-        params = None
-
     for k in _filters:
         _filters[k] = [] if _filters[k] is None else _filters[k]
         if not isinstance(_filters[k], list):
@@ -89,8 +81,8 @@ def keys_from_state(
                 print(e)
                 _filters[k] = []
     keys = [_filters['ck'], _filters['mk'], _filters['lk']]
-    if with_params:
-        keys.append(params)
+    if with_tags:
+        keys.append(_filters['tags'])
     return tuple(keys)
 
 
@@ -98,12 +90,12 @@ def pipes_from_state(
     state: Dict[str, Any],
     **kw
 ):
-    _ck, _mk, _lk, _params = keys_from_state(state, with_params=True)
+    _ck, _mk, _lk, _tags = keys_from_state(state, with_tags=True)
     try:
         _pipes = _get_pipes(
             _ck, _mk, _lk,
-            params = _params,
-            mrsm_instance = get_web_connector(state), 
+            tags=(_tags or []),
+            mrsm_instance=get_web_connector(state), 
             **kw
         )
     except Exception as e:
@@ -466,7 +458,7 @@ def accordion_items_from_pipe(
             overview_rows.append(
                 html.Tr([
                     html.Td("Indices" if len(indices_rows) != 1 else "Index"),
-                    html.Td(indices_table),
+                    html.Td(html.Div(indices_table, style={'overflowX': 'auto'})),
                 ])
             )
 
@@ -536,9 +528,9 @@ def accordion_items_from_pipe(
             ]
             columns_body = [html.Tbody(columns_rows)]
             columns_table = dbc.Table(columns_header + columns_body, bordered=False, hover=True)
+            items_bodies['columns'] = html.Div(columns_table, style={'overflowX': 'auto'})
         except Exception:
-            columns_table = html.P("Could not retrieve columns ― please try again.")
-        items_bodies['columns'] = columns_table
+            items_bodies['columns'] = html.P("Could not retrieve columns ― please try again.")
 
     if 'parameters' in active_items:
         parameters_editor = dash_ace.DashAceEditor(
@@ -579,21 +571,28 @@ def accordion_items_from_pipe(
             parameters_editor,
             html.Br(),
             dbc.Row([
-                dbc.Col(html.Span(
-                    (
-                        ([update_parameters_button] if authenticated else []) +
-                        [
-                            as_json_button,
-                            as_yaml_button,
-                        ]
-                    )
-                ), width=4),
-                dbc.Col([
-                    html.Div(
-                        id={'type': 'update-parameters-success-div', 'index': json.dumps(pipe.meta)}
-                    )
-                ],
-                width=True,
+                dbc.Col(
+                    html.Span(
+                        (
+                            ([update_parameters_button] if authenticated else []) +
+                            [
+                                as_json_button,
+                                as_yaml_button,
+                            ]
+                        )
+                    ),
+                    width=4,
+                ),
+                dbc.Col(
+                    [
+                        html.Div(
+                            id={
+                                'type': 'update-parameters-success-div',
+                                'index': json.dumps(pipe.meta),
+                            }
+                        )
+                    ],
+                    width=True,
                 )
             ]),
         ]
@@ -665,10 +664,10 @@ def accordion_items_from_pipe(
     if 'recent-data' in active_items:
         try:
             df = pipe.get_backtrack_data(backtrack_minutes=10, limit=10, debug=debug).astype(str)
-            table = dbc.Table.from_dataframe(df, bordered=False, hover=True) 
+            table = dbc.Table.from_dataframe(df, bordered=False, hover=True)
+            items_bodies['recent-data'] = html.Div(table, style={'overflowX': 'auto'})
         except Exception:
-            table = html.P("Could not retrieve recent data.")
-        items_bodies['recent-data'] = table
+            items_bodies['recent-data'] = html.P("Could not retrieve recent data.")
 
     if 'query-data' in active_items:
         query_editor = dash_ace.DashAceEditor(
@@ -722,7 +721,7 @@ def accordion_items_from_pipe(
             dbc.Row(
                 [
                     dbc.Col([query_data_button], lg=2, md=3, sm=4, xs=6, width=2),
-                    dbc.Col([begin_end_input_group], lg=3, md=3, sm=4, width=4),
+                    dbc.Col([begin_end_input_group], lg=6, md=6, sm=4, width=6),
                     dbc.Col(html.Div([limit_input, dbc.FormText("Row Limit")]), lg=2, md=3, sm=4, xs=6, width=2),
                 ],
                 justify="between",
@@ -733,23 +732,9 @@ def accordion_items_from_pipe(
         ])
 
     if 'sync-data' in active_items:
-        backtrack_df = pipe.get_backtrack_data(debug=debug, limit=1)
-        try:
-            json_text = to_json(
-                backtrack_df,
-                orient='records',
-                date_format='iso',
-                force_ascii=False,
-                indent=4,
-                date_unit='us',
-            ) if backtrack_df is not None else '[]'
-        except Exception as e:
-            warn(e)
-            json_text = '[]'
-
-        json_text = json.dumps(json.loads(json_text), indent=4, separators=(',', ': '))
+        backtrack_text = get_backtrack_text(pipe)
         sync_editor = dash_ace.DashAceEditor(
-            value = json_text,
+            value = backtrack_text,
             mode = 'norm',
             tabSize = 4,
             theme = 'twilight',
@@ -763,6 +748,22 @@ def accordion_items_from_pipe(
             wrapEnabled = True,
             style = {'min-height': '120px'},
         )
+
+        sync_as_json_button = dbc.Button(
+            "JSON",
+            id={'type': 'sync-as-json-button', 'index': json.dumps(pipe.meta)},
+            color='link',
+            size='sm',
+            style={'text-decoration': 'none', 'margin-left': '10px'},
+        )
+        sync_as_lines_button = dbc.Button(
+            "Lines",
+            id={'type': 'sync-as-lines-button', 'index': json.dumps(pipe.meta)},
+            color='link',
+            size='sm',
+            style={'text-decoration': 'none', 'margin-left': '10px'},
+        )
+
         update_sync_button = dbc.Button(
             "Sync",
             id = {'type': 'update-sync-button', 'index': json.dumps(pipe.meta)},
@@ -772,7 +773,15 @@ def accordion_items_from_pipe(
             sync_editor,
             html.Br(),
             dbc.Row([
-                dbc.Col([update_sync_button], width=1),
+                dbc.Col(html.Span(
+                    (
+                        ([update_sync_button] if authenticated else []) +
+                        [
+                            sync_as_json_button,
+                            sync_as_lines_button,
+                        ]
+                    )
+                ), width=4),
                 dbc.Col([sync_success_div], width=True),
             ]),
         ])
@@ -782,3 +791,29 @@ def accordion_items_from_pipe(
         for item_id, title in items_titles.items()
     ]
 
+
+def get_backtrack_text(
+    pipe: mrsm.Pipe,
+    lines: bool = False,
+    limit: int = 5,
+) -> str:
+    """
+    Return the backtrack documents as text for the sync editor.
+    """
+    backtrack_df = pipe.get_backtrack_data(debug=debug, limit=limit)
+    if lines:
+        return to_simple_lines(backtrack_df)
+    try:
+        json_text = to_json(
+            backtrack_df,
+            orient='records',
+            date_format='iso',
+            force_ascii=False,
+            indent=4,
+            date_unit='us',
+        ) if backtrack_df is not None else '[]'
+    except Exception as e:
+        warn(e)
+        json_text = '[]'
+
+    return json.dumps(json.loads(json_text), indent=4, separators=(',', ': '))

meerschaum/api/dash/sessions.py

@@ -86,6 +86,18 @@ def get_username_from_session(session_id: Optional[str]) -> Union[str, None]:
     return session_data.get('username', None)
 
 
+def get_user_from_session(session_id: Optional[str]) -> Union[User, None]:
+    """
+    Return a `User` from the current session.
+    """
+    username = get_username_from_session(session_id)
+    if username is None:
+        return None
+    
+    conn = get_api_connector()
+    return User(username, instance=conn)
+
+
 def is_session_active(session_id: Union[str, None]) -> bool:
     """
     Return whether a given `session_id` has been set.