meerschaum 3.0.2__py3-none-any.whl → 3.0.3__py3-none-any.whl

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/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/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/api/dash/pipes.py

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

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

meerschaum/config/_version.py

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

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,7 @@ 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}'
+    return f'.cache:pipes:{pipe.connector_keys.replace(':', '_')}:{pipe.metric_key}:{pipe.location_key}:{cache_key}'
 
 
 def _get_cache_connector(self) -> 'Union[None, ValkeyConnector]':
@@ -485,7 +485,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/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.dist-info → meerschaum-3.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meerschaum
-Version: 3.0.2
+Version: 3.0.3
 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.dist-info → meerschaum-3.0.3.dist-info}/RECORD

@@ -61,12 +61,12 @@ meerschaum/api/_oauth2.py,sha256=agWeuG5LzxLHZTjt3psdemhF_yoVJtdnfDdxSBVQMnY,704
 meerschaum/api/_tokens.py,sha256=t9K0TFzyJ4dOg04_QKOWCINO66rSJkH2Ct03lyXIjEs,3070
 meerschaum/api/_websockets.py,sha256=EMT9wB3yELu_WyCMqn9ZpgMDh23spUUchouRLCCLVuw,1509
 meerschaum/api/dash/__init__.py,sha256=-RpTps4ntFNlgSW0mW50ZHAgUd5tN1Ua3F5I3XsLY_0,1914
-meerschaum/api/dash/components.py,sha256=PMMLCcRHd0ADa8DjeH1xB2NXnIyl92HKW4LOCtmq55Y,10782
+meerschaum/api/dash/components.py,sha256=dkXCHJfTLZxgyKwzAQtuSEnjop5T2aZP2zEDd-LV_18,10798
 meerschaum/api/dash/connectors.py,sha256=-Wd40ieYJI2nOASXi4V1C4bvLekjnN_tj6zp7HgZDl0,791
 meerschaum/api/dash/graphs.py,sha256=wJUDWzcLN8-C3xko6rj0F2v7Rt8YDkSXoVkkXJjYGIk,2046
 meerschaum/api/dash/jobs.py,sha256=p0mC30jO7aYS0vUbfn540d66-s19_c-GgjyfNmVXgrs,7682
 meerschaum/api/dash/keys.py,sha256=pGIbKxp5RsIelzAU4WZMcYGDN835tF4mGhoktydc42M,8561
-meerschaum/api/dash/pipes.py,sha256=EWCsLg2A58FcgxDbsyqwgdod6uRVFNBZNxZ77P7phaE,37363
+meerschaum/api/dash/pipes.py,sha256=yeWIDbR5sVYdZYi0L_6efjRk0WOZzqvdaVyX0_knvCk,37385
 meerschaum/api/dash/plugins.py,sha256=KdfG04f6SsUpBg-nm7MUJegFGuElOj-GAkxDX98hi60,3768
 meerschaum/api/dash/sessions.py,sha256=jUM0a9CXNZC3j7SF3QkZim-8ZAbDom-V1iXklvMyBZE,5382
 meerschaum/api/dash/sync.py,sha256=9lt7IRdG-fe9gf_ZO_viPiGlerX7ic6r_VFocv3I51A,504
@@ -82,10 +82,10 @@ 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=flHWiTSjrdgVNLgFutSnaqYogVUgnqRFWy3K0-n0wFo,651
 meerschaum/api/dash/callbacks/custom.py,sha256=e9wU2gZ8hutYNe7T4mKjJPFwpR32-dcbEXWyOOJKCEk,1884
-meerschaum/api/dash/callbacks/dashboard.py,sha256=BSL5GKopDx45b-BaL4NdsOvY-e169TzGJzvG1HgsUCg,38735
+meerschaum/api/dash/callbacks/dashboard.py,sha256=Wrwx91D6srkkpL1ScGE0R-yKjdxhwgcxWEGwxRQjUKI,38876
 meerschaum/api/dash/callbacks/jobs.py,sha256=mwYYjxZxHte1g4uCtv6T8nGXR2-JPoWrAgZZdBlvDyQ,8817
 meerschaum/api/dash/callbacks/login.py,sha256=Eygp71kdWRO_fFrkuUN3hIT-nG9HKYOgebf8ACeuyPs,3175
-meerschaum/api/dash/callbacks/pipes.py,sha256=mK9d2A789fsMkT8BF6FIrxWpzPDzfa9VgAgeTZv05G8,7801
+meerschaum/api/dash/callbacks/pipes.py,sha256=t46Mu6-1Pq9FTlE57QzXmEVjt6deZUEdf13hxtDEKeE,7811
 meerschaum/api/dash/callbacks/plugins.py,sha256=GhhA8GZBCNcz65pBE8hn8BNBEiHjXfcTiqvBNeox4XQ,2759
 meerschaum/api/dash/callbacks/register.py,sha256=nrl_u0ujIrnjgOsCM_rSphY539shX0TRC2stZqJJIU0,3908
 meerschaum/api/dash/callbacks/tokens.py,sha256=zkmqDenGjCrzQjNA5HyTOjcKDk2wYG4qE3xhjRDlTaE,11723
@@ -110,7 +110,7 @@ meerschaum/api/resources/__init__.py,sha256=LshFiqh0sL55QtC_15fz6A6r-1_H9sQWtlif
 meerschaum/api/resources/static/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerschaum/api/resources/static/css/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerschaum/api/resources/static/css/bootstrap.min.css,sha256=W8ArKu4Q_NnxCNqO3doJB2hqrNOIHNLFroAxpyxnYL8,180286
-meerschaum/api/resources/static/css/dash.css,sha256=UVpQh1LaiYqwmPz9Q0Sqjnl8kiCRj6KLpxZiOx04KvY,2241
+meerschaum/api/resources/static/css/dash.css,sha256=CkPRqTF0R1kc2PDspTzF1hoeMnf9HzLOnMkb3LJHZUQ,2241
 meerschaum/api/resources/static/css/dbc_dark.css,sha256=2pka1ymFAjlWLv-mJaxGkPeL-gTEMD2g4Ba6LMuhHV4,6087
 meerschaum/api/resources/static/css/styles.css,sha256=dHcCtRUzs8kJhpG6d4gusROLSe9AFkUitybvgFmEDvI,81
 meerschaum/api/resources/static/css/xterm.css,sha256=gy8_LGA7Q61DUf8ElwFQzHqHMBQnbbEmpgZcbdgeSHI,5383
@@ -144,7 +144,7 @@ meerschaum/api/routes/_webterm.py,sha256=TviHMz0_pLnby7dZW76y3mt-40Cq3VGFItSVcBi
 meerschaum/api/tables/__init__.py,sha256=e2aNC0CdlWICTUMx1i9RauF8Pm426J0RZJbsJWv4SWo,482
 meerschaum/config/__init__.py,sha256=IZLzkI7jBycfmHSR6R_WG3eBe0Uv53c-CI_QqNf4lnw,12966
 meerschaum/config/_dash.py,sha256=BJHl4xMrQB-YHUEU7ldEW8q_nOPoIRSOqLrfGElc6Dw,187
-meerschaum/config/_default.py,sha256=V3aV0KeZrFg2rKfZtc-lHhqVWfKgLhxu9_EZFL6H0QU,8122
+meerschaum/config/_default.py,sha256=AHbSwc27XkL8rxvtMAHo1MXNWZlXvQiSXjN7ifl8anE,8141
 meerschaum/config/_edit.py,sha256=WCdt7BSspPytH-NiPS1kpCZxXDDG7VbOu0H1AnMtwlw,9177
 meerschaum/config/_formatting.py,sha256=SXUU0QFAlO_eIZjyodXQGSrjg-mVkL2qXuQwxqqdJps,6746
 meerschaum/config/_jobs.py,sha256=gS_4mMGdmVP7WB4V5Sz8kYP0HmhWcMY2jSWGR7jX6cw,1279
@@ -154,7 +154,7 @@ meerschaum/config/_preprocess.py,sha256=-AEA8m_--KivZwTQ1sWN6LTn5sio_fUr2XZ51BO6
 meerschaum/config/_read_config.py,sha256=Y4O-eozH94FsucqLWXb5hS57RLPMHsLUQe7a24doi0o,16231
 meerschaum/config/_shell.py,sha256=46_m49Txc5q1rGfCgO49ca48BODx45DQJi8D0zz1R18,4245
 meerschaum/config/_sync.py,sha256=nN5bLCHU8sFDdlPi7pQXuRVFcX457rZjOiALTvqRS_E,4332
-meerschaum/config/_version.py,sha256=yLMxZ0Wd2WlFk-MKJq82SsxiEbYoRPN98PxoXFoWg78,71
+meerschaum/config/_version.py,sha256=XrRWEz4obAp-68XTdUNX77n1AbwreUwJo5DKP37xW8M,71
 meerschaum/config/environment.py,sha256=hTyjPLrGp3R4sytg_Jqv4TnCVI1WdmbX2YoRBCWSNt8,8277
 meerschaum/config/paths.py,sha256=JjibeGN3YAdSNceRwsd42aNmeUrIgM6ndzC8qZAmNI0,621
 meerschaum/config/static.py,sha256=92fSGxoHFDOK9GEsN8NVbAEh9W7-eZ1BS6thyEqcjeI,359
@@ -213,7 +213,7 @@ meerschaum/core/__init__.py,sha256=Qx0s4KANuYCjTCHEaE70cfgCPxiYPPkr9DnmCTw33Z0,2
 meerschaum/core/Pipe/__init__.py,sha256=5ibU7Cnz3vLsKtfVINkmR4maNE_jOdX6bA4ZpyIm_Pc,19979
 meerschaum/core/Pipe/_attributes.py,sha256=ww6P90OYt-hFGRxznSfx-uy1ecor1YgwvbIBvtu-5fg,32457
 meerschaum/core/Pipe/_bootstrap.py,sha256=4RLDD25BvqyukHhejTIJFaECOvCgZk6tjtNQfS9qgA8,8150
-meerschaum/core/Pipe/_cache.py,sha256=sagCMxwLd33mZROpIRRhWS5zB7z0ecdYJWbnIZZxCks,15582
+meerschaum/core/Pipe/_cache.py,sha256=4nCSPG0J3UW-DPpdgFYfv11gtAjtlpxA4BbPOioBScU,15690
 meerschaum/core/Pipe/_clear.py,sha256=vCv4imPcMVdJXWwArOcnNlxEOk5HPOHSDZ9omrexzGc,1972
 meerschaum/core/Pipe/_copy.py,sha256=YDclAapf_spm9phpFr4-CALyYyw7nUsyKyiaLM1cnm4,2965
 meerschaum/core/Pipe/_data.py,sha256=HPNY5QTZstEd8Mq7pF9i_obl8ir9mTICtHyjY0ecRT4,27732
@@ -251,7 +251,7 @@ meerschaum/utils/debug.py,sha256=zBYxcLJ5Ymzz1J5BVv7DXAZ7CWd6vYN9uFFdWKmny9U,433
 meerschaum/utils/interactive.py,sha256=t-6jWozXSqL7lYGDHuwiOjTgr-UKhdcg61q_eR5mikI,3196
 meerschaum/utils/misc.py,sha256=792Ejz6FYrCoqTiyeWnC4n8t3-wcGXfJv5InSQIKGlM,50451
 meerschaum/utils/networking.py,sha256=Sr_eYUGW8_UV9-k9LqRFf7xLtbUcsDucODyLCRsFRUc,1006
-meerschaum/utils/pipes.py,sha256=ZJzUBd93a33aKOtQN6Jc1rDfdEaKPJB4-0hOcipG5RQ,6284
+meerschaum/utils/pipes.py,sha256=5HgHmZdt0UxcAF5VATF9BXJEqOOhn1CoBbDjB2XBltI,6340
 meerschaum/utils/pool.py,sha256=vkE42af4fjrTEJTxf6Ek3xGucm1MtEkpsSEiaVzNKHs,2655
 meerschaum/utils/process.py,sha256=Y7yk7b-OEADd28E40ffvIGLS3shi4-e604YWX5aFUDo,8214
 meerschaum/utils/prompt.py,sha256=NmbSRJyrapH7UKMV1Ry_LIjj2POVTpNCLS2QeIogge0,19740
@@ -279,11 +279,11 @@ meerschaum/utils/packages/_packages.py,sha256=KWVfxsm-6ZdffpskIjHPki6wSQvf0LK9MW
 meerschaum/utils/packages/lazy_loader.py,sha256=VHnph3VozH29R4JnSSBfwtA5WKZYZQFT_GeQSShCnuc,2540
 meerschaum/utils/venv/_Venv.py,sha256=dF-FqP7Boq-g-anj2Ps-UkTOL2qJtxY3bdz0HWF2zT8,3726
 meerschaum/utils/venv/__init__.py,sha256=_mabNYZwj5_XQCsdo8sED4HY-1q5s-3em6Bml7bc4BE,27301
-meerschaum-3.0.2.dist-info/licenses/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
-meerschaum-3.0.2.dist-info/licenses/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
-meerschaum-3.0.2.dist-info/METADATA,sha256=ZWCAgShvSeO_E6fEygHYgprOKBgnxVpo1c4AWwUDLbc,25325
-meerschaum-3.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-meerschaum-3.0.2.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
-meerschaum-3.0.2.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
-meerschaum-3.0.2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-meerschaum-3.0.2.dist-info/RECORD,,
+meerschaum-3.0.3.dist-info/licenses/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
+meerschaum-3.0.3.dist-info/licenses/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
+meerschaum-3.0.3.dist-info/METADATA,sha256=eMbvC9Rky4GLopLIiwdpe3DtcdyIlulBYkpODkZqHjA,25325
+meerschaum-3.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+meerschaum-3.0.3.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
+meerschaum-3.0.3.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
+meerschaum-3.0.3.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+meerschaum-3.0.3.dist-info/RECORD,,