meerschaum 3.0.2__tar.gz → 3.0.4__tar.gz

{meerschaum-3.0.2/meerschaum.egg-info → meerschaum-3.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meerschaum
-Version: 3.0.2
+Version: 3.0.4
 Summary: Sync Time-Series Pipes with Meerschaum
 Author-email: Bennett Meares <bennett.meares@gmail.com>
 Maintainer-email: Bennett Meares <bennett.meares@gmail.com>

{meerschaum-3.0.2 → meerschaum-3.0.4}/meerschaum/api/dash/callbacks/dashboard.py

@@ -160,7 +160,8 @@ def update_page_layout_div(
     else:
         session_store_to_return = dash.no_update
 
-    base_path = '/'.join(pathname.split('/')[:2])
+    dashless_pathname = pathname[len('/dash'):] if pathname.startswith('/dash') else pathname
+    base_path = ('/dash/' + dashless_pathname.lstrip('/').split('/', maxsplit=1)[0]).rstrip('/')
     complete_path = (
         pathname.rstrip('/') + '/'
     ).rstrip('/')

{meerschaum-3.0.2 → meerschaum-3.0.4}/meerschaum/api/dash/callbacks/pipes.py

@@ -10,7 +10,6 @@ from typing import List, Optional, Dict, Any
 
 import dash
 from dash.dependencies import Input, Output, State
-from dash import no_update
 from dash.exceptions import PreventUpdate
 import dash_bootstrap_components as dbc
 
@@ -172,8 +171,9 @@ def render_pipe_page_from_url(
     Input('pipes-metric-keys-dropdown', 'value'),
     Input('pipes-location-keys-dropdown', 'value'),
     Input('pipes-tags-dropdown', 'value'),
-    Input('instance-select', 'value'),
+    Input('pipes-instance-select', 'value'),
     Input('pipes-clear-all-button', 'n_clicks'),
+    prevent_initial_call=True,
 )
 def update_location_on_pipes_filter_change(
     connector_keys: Optional[List[str]],

{meerschaum-3.0.2 → meerschaum-3.0.4}/meerschaum/api/dash/components.py

@@ -107,7 +107,7 @@ instance_select = dbc.Select(
         {'label': (i[:32] + '…') if len(i) > 32 else i, 'value': i}
         for i in get_connector_labels(*instance_types)
     ],
-    class_name='dbc_dark custom-select custom-select-sm',
+    class_name='dbc_dark custom-select custom-select-sm instance-select',
 )
 
 sign_out_button = dbc.Button(

{meerschaum-3.0.2 → meerschaum-3.0.4}/meerschaum/api/dash/pipes.py

@@ -575,7 +575,7 @@ def accordion_items_from_pipe(
 
     if 'parameters' in active_items:
         parameters_editor = dash_ace.DashAceEditor(
-            value=yaml.dump(pipe.parameters),
+            value=yaml.dump(pipe.get_parameters(apply_symlinks=False, refresh=True, debug=debug)),
             mode='norm',
             tabSize=4,
             theme='twilight',
@@ -1029,14 +1029,14 @@ def build_pipes_navbar(instance_keys: Optional[str] = None, with_instance_select
     Build the navbar from the selected instance keys.
     """
     instance_select = dbc.Select(
-        id='instance-select',
+        id='pipes-instance-select',
         size='sm',
         value=instance_keys or str(get_api_connector()),
         options=[
             {'label': (i[:32] + '…') if len(i) > 32 else i, 'value': i}
             for i in get_connector_labels(*instance_types)
         ],
-        class_name='dbc_dark custom-select custom-select-sm',
+        class_name='dbc_dark custom-select custom-select-sm instance-select',
     )
     instance_select_div_style = {} if with_instance_select else {'visibility': 'hidden'}
     instance_select_div = html.Div(instance_select, style=instance_select_div_style)

{meerschaum-3.0.2 → meerschaum-3.0.4}/meerschaum/api/resources/static/css/dash.css

@@ -65,7 +65,7 @@ a {
 #get-items-menu {
   width: 100%;
 }
-#instance-select {
+.instance-select {
   background-color : var(--bs-secondary) !important;
   color: white;
   margin-top: 5px;

{meerschaum-3.0.2 → meerschaum-3.0.4}/meerschaum/config/_default.py

@@ -151,6 +151,8 @@ default_system_config = {
             'debug',
             'bootstrap',
             'daemon',
+            'sql',
+            'register plugin',
         ],
     },
     'experimental': {

{meerschaum-3.0.2 → meerschaum-3.0.4}/meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "3.0.2"
+__version__ = "3.0.4"

{meerschaum-3.0.2 → meerschaum-3.0.4}/meerschaum/connectors/sql/_pipes.py

@@ -6,6 +6,7 @@
 Interact with Pipes metadata via SQLConnector.
 """
 from __future__ import annotations
+import traceback
 from datetime import datetime, date, timedelta
 
 import meerschaum as mrsm
@@ -3102,7 +3103,6 @@ def get_pipe_columns_types(
         for col in pipe_table.columns:
             table_columns[str(col.name)] = str(col.type)
     except Exception as e:
-        import traceback
         traceback.print_exc()
         warn(e)
         table_columns = {}

{meerschaum-3.0.2 → meerschaum-3.0.4}/meerschaum/core/Pipe/_cache.py

@@ -23,9 +23,9 @@ def _get_in_memory_key(cache_key: str) -> str:
     Return the in-memory version of a cache key.
     """
     return (
-        ('_' + cache_key)
-        if not cache_key.startswith('_')
-        else cache_key
+        f"_{cache_key}"
+        if not str(cache_key).startswith('_')
+        else str(cache_key)
     )
 
 
@@ -33,7 +33,10 @@ def _get_cache_conn_cache_key(pipe: mrsm.Pipe, cache_key: str) -> str:
     """
     Return the cache key to use in the cache connector.
     """
-    return f'.cache:pipes:{pipe.connector_keys}:{pipe.metric_key}:{pipe.location_key}:{cache_key}'
+    ck = pipe.connector_keys.replace(':', '_')
+    mk = pipe.metric_key
+    lk = str(pipe.location_key)
+    return f'.cache:pipes:{ck}:{mk}:{lk}:{cache_key}'
 
 
 def _get_cache_connector(self) -> 'Union[None, ValkeyConnector]':
@@ -485,7 +488,10 @@ def _get_cache_conn_keys(self, debug: bool = False) -> List[str]:
     keys_prefix = _get_cache_conn_cache_key(self, '')
 
     try:
-        return cache_connector.client.keys(keys_prefix + '*')
+        return [
+            key.decode('utf-8').split(':')[-1]
+            for key in cache_connector.client.keys(keys_prefix + '*')
+        ]
     except Exception as e:
         warn(f"Failed to get cache keys for {self} from '{cache_connector}':\n{e}")
         return []

{meerschaum-3.0.2 → meerschaum-3.0.4}/meerschaum/utils/dataframe.py

@@ -375,7 +375,9 @@ def filter_unseen_df(
         if json_col not in delta_df.columns:
             continue
         try:
-            delta_df[json_col] = delta_df[json_col].apply(json.loads)
+            delta_df[json_col] = delta_df[json_col].apply(
+                lambda x: (json.loads(x) if isinstance(x, str) else x)
+            )
         except Exception:
             warn(f"Unable to deserialize JSON column '{json_col}':\n{traceback.format_exc()}")
 

{meerschaum-3.0.2 → meerschaum-3.0.4}/meerschaum/utils/packages/__init__.py

@@ -1924,6 +1924,11 @@ def is_uv_enabled() -> bool:
     if is_android():
         return False
 
+    from meerschaum.utils.venv import inside_venv
+
+    if inside_venv():
+        return False
+
     try:
         import yaml
     except ImportError:

{meerschaum-3.0.2 → meerschaum-3.0.4}/meerschaum/utils/pipes.py

@@ -210,4 +210,7 @@ def is_pipe_registered(
     if debug:
         dprint(f'{ck}, {mk}, {lk}')
         dprint(f'{pipe}, {pipes}')
-    return ck in pipes and mk in pipes[ck] and lk in pipes[ck][mk]
+    try:
+        return ck in pipes and mk in pipes[ck] and lk in pipes[ck][mk]
+    except Exception:
+        return False

{meerschaum-3.0.2 → meerschaum-3.0.4}/meerschaum/utils/venv/__init__.py

@@ -755,7 +755,8 @@ def venv_target_path(
 
     venv_root_path = (
         (VIRTENV_RESOURCES_PATH / venv)
-        if venv is not None else pathlib.Path(sys.prefix)
+        if venv is not None
+        else pathlib.Path(sys.prefix)
     )
     target_path = venv_root_path
 
@@ -773,12 +774,14 @@ def venv_target_path(
     python_folder = 'python' + str(sys.version_info.major) + '.' + str(sys.version_info.minor)
     if target_path.exists():
         target_path = (
-            (target_path / python_folder) if python_folder in os.listdir(target_path)
+            (target_path / python_folder)
+            if python_folder in os.listdir(target_path)
             else target_path
         )
     else:
         target_path = (
-            (target_path / python_folder) if platform.system() != 'Windows'
+            (target_path / python_folder)
+            if platform.system() != 'Windows'
             else target_path
         )
 

{meerschaum-3.0.2 → meerschaum-3.0.4/meerschaum.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meerschaum
-Version: 3.0.2
+Version: 3.0.4
 Summary: Sync Time-Series Pipes with Meerschaum
 Author-email: Bennett Meares <bennett.meares@gmail.com>
 Maintainer-email: Bennett Meares <bennett.meares@gmail.com>