meerschaum 3.0.3__py3-none-any.whl → 3.0.4__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- meerschaum/api/dash/pipes.py +1 -1
- meerschaum/config/_default.py +1 -0
- meerschaum/config/_version.py +1 -1
- meerschaum/connectors/sql/_pipes.py +1 -1
- meerschaum/core/Pipe/_cache.py +4 -1
- meerschaum/utils/dataframe.py +3 -1
- meerschaum/utils/packages/__init__.py +5 -0
- meerschaum/utils/venv/__init__.py +6 -3
- {meerschaum-3.0.3.dist-info → meerschaum-3.0.4.dist-info}/METADATA +1 -1
- {meerschaum-3.0.3.dist-info → meerschaum-3.0.4.dist-info}/RECORD +16 -16
- {meerschaum-3.0.3.dist-info → meerschaum-3.0.4.dist-info}/WHEEL +0 -0
- {meerschaum-3.0.3.dist-info → meerschaum-3.0.4.dist-info}/entry_points.txt +0 -0
- {meerschaum-3.0.3.dist-info → meerschaum-3.0.4.dist-info}/licenses/LICENSE +0 -0
- {meerschaum-3.0.3.dist-info → meerschaum-3.0.4.dist-info}/licenses/NOTICE +0 -0
- {meerschaum-3.0.3.dist-info → meerschaum-3.0.4.dist-info}/top_level.txt +0 -0
- {meerschaum-3.0.3.dist-info → meerschaum-3.0.4.dist-info}/zip-safe +0 -0
meerschaum/api/dash/pipes.py
CHANGED
@@ -575,7 +575,7 @@ def accordion_items_from_pipe(
|
|
575
575
|
|
576
576
|
if 'parameters' in active_items:
|
577
577
|
parameters_editor = dash_ace.DashAceEditor(
|
578
|
-
value=yaml.dump(pipe.
|
578
|
+
value=yaml.dump(pipe.get_parameters(apply_symlinks=False, refresh=True, debug=debug)),
|
579
579
|
mode='norm',
|
580
580
|
tabSize=4,
|
581
581
|
theme='twilight',
|
meerschaum/config/_default.py
CHANGED
meerschaum/config/_version.py
CHANGED
@@ -6,6 +6,7 @@
|
|
6
6
|
Interact with Pipes metadata via SQLConnector.
|
7
7
|
"""
|
8
8
|
from __future__ import annotations
|
9
|
+
import traceback
|
9
10
|
from datetime import datetime, date, timedelta
|
10
11
|
|
11
12
|
import meerschaum as mrsm
|
@@ -3102,7 +3103,6 @@ def get_pipe_columns_types(
|
|
3102
3103
|
for col in pipe_table.columns:
|
3103
3104
|
table_columns[str(col.name)] = str(col.type)
|
3104
3105
|
except Exception as e:
|
3105
|
-
import traceback
|
3106
3106
|
traceback.print_exc()
|
3107
3107
|
warn(e)
|
3108
3108
|
table_columns = {}
|
meerschaum/core/Pipe/_cache.py
CHANGED
@@ -33,7 +33,10 @@ def _get_cache_conn_cache_key(pipe: mrsm.Pipe, cache_key: str) -> str:
|
|
33
33
|
"""
|
34
34
|
Return the cache key to use in the cache connector.
|
35
35
|
"""
|
36
|
-
|
36
|
+
ck = pipe.connector_keys.replace(':', '_')
|
37
|
+
mk = pipe.metric_key
|
38
|
+
lk = str(pipe.location_key)
|
39
|
+
return f'.cache:pipes:{ck}:{mk}:{lk}:{cache_key}'
|
37
40
|
|
38
41
|
|
39
42
|
def _get_cache_connector(self) -> 'Union[None, ValkeyConnector]':
|
meerschaum/utils/dataframe.py
CHANGED
@@ -375,7 +375,9 @@ def filter_unseen_df(
|
|
375
375
|
if json_col not in delta_df.columns:
|
376
376
|
continue
|
377
377
|
try:
|
378
|
-
delta_df[json_col] = delta_df[json_col].apply(
|
378
|
+
delta_df[json_col] = delta_df[json_col].apply(
|
379
|
+
lambda x: (json.loads(x) if isinstance(x, str) else x)
|
380
|
+
)
|
379
381
|
except Exception:
|
380
382
|
warn(f"Unable to deserialize JSON column '{json_col}':\n{traceback.format_exc()}")
|
381
383
|
|
@@ -755,7 +755,8 @@ def venv_target_path(
|
|
755
755
|
|
756
756
|
venv_root_path = (
|
757
757
|
(VIRTENV_RESOURCES_PATH / venv)
|
758
|
-
if venv is not None
|
758
|
+
if venv is not None
|
759
|
+
else pathlib.Path(sys.prefix)
|
759
760
|
)
|
760
761
|
target_path = venv_root_path
|
761
762
|
|
@@ -773,12 +774,14 @@ def venv_target_path(
|
|
773
774
|
python_folder = 'python' + str(sys.version_info.major) + '.' + str(sys.version_info.minor)
|
774
775
|
if target_path.exists():
|
775
776
|
target_path = (
|
776
|
-
(target_path / python_folder)
|
777
|
+
(target_path / python_folder)
|
778
|
+
if python_folder in os.listdir(target_path)
|
777
779
|
else target_path
|
778
780
|
)
|
779
781
|
else:
|
780
782
|
target_path = (
|
781
|
-
(target_path / python_folder)
|
783
|
+
(target_path / python_folder)
|
784
|
+
if platform.system() != 'Windows'
|
782
785
|
else target_path
|
783
786
|
)
|
784
787
|
|
@@ -66,7 +66,7 @@ meerschaum/api/dash/connectors.py,sha256=-Wd40ieYJI2nOASXi4V1C4bvLekjnN_tj6zp7Hg
|
|
66
66
|
meerschaum/api/dash/graphs.py,sha256=wJUDWzcLN8-C3xko6rj0F2v7Rt8YDkSXoVkkXJjYGIk,2046
|
67
67
|
meerschaum/api/dash/jobs.py,sha256=p0mC30jO7aYS0vUbfn540d66-s19_c-GgjyfNmVXgrs,7682
|
68
68
|
meerschaum/api/dash/keys.py,sha256=pGIbKxp5RsIelzAU4WZMcYGDN835tF4mGhoktydc42M,8561
|
69
|
-
meerschaum/api/dash/pipes.py,sha256=
|
69
|
+
meerschaum/api/dash/pipes.py,sha256=mFssfAkA8tW1PB2WHpXE22r-XlGN67GY37QPrmVbFUQ,37438
|
70
70
|
meerschaum/api/dash/plugins.py,sha256=KdfG04f6SsUpBg-nm7MUJegFGuElOj-GAkxDX98hi60,3768
|
71
71
|
meerschaum/api/dash/sessions.py,sha256=jUM0a9CXNZC3j7SF3QkZim-8ZAbDom-V1iXklvMyBZE,5382
|
72
72
|
meerschaum/api/dash/sync.py,sha256=9lt7IRdG-fe9gf_ZO_viPiGlerX7ic6r_VFocv3I51A,504
|
@@ -144,7 +144,7 @@ meerschaum/api/routes/_webterm.py,sha256=TviHMz0_pLnby7dZW76y3mt-40Cq3VGFItSVcBi
|
|
144
144
|
meerschaum/api/tables/__init__.py,sha256=e2aNC0CdlWICTUMx1i9RauF8Pm426J0RZJbsJWv4SWo,482
|
145
145
|
meerschaum/config/__init__.py,sha256=IZLzkI7jBycfmHSR6R_WG3eBe0Uv53c-CI_QqNf4lnw,12966
|
146
146
|
meerschaum/config/_dash.py,sha256=BJHl4xMrQB-YHUEU7ldEW8q_nOPoIRSOqLrfGElc6Dw,187
|
147
|
-
meerschaum/config/_default.py,sha256=
|
147
|
+
meerschaum/config/_default.py,sha256=kon77hqv6Iw0i_FovooR62iZOD589EqAMSeG5Z-gOkI,8172
|
148
148
|
meerschaum/config/_edit.py,sha256=WCdt7BSspPytH-NiPS1kpCZxXDDG7VbOu0H1AnMtwlw,9177
|
149
149
|
meerschaum/config/_formatting.py,sha256=SXUU0QFAlO_eIZjyodXQGSrjg-mVkL2qXuQwxqqdJps,6746
|
150
150
|
meerschaum/config/_jobs.py,sha256=gS_4mMGdmVP7WB4V5Sz8kYP0HmhWcMY2jSWGR7jX6cw,1279
|
@@ -154,7 +154,7 @@ meerschaum/config/_preprocess.py,sha256=-AEA8m_--KivZwTQ1sWN6LTn5sio_fUr2XZ51BO6
|
|
154
154
|
meerschaum/config/_read_config.py,sha256=Y4O-eozH94FsucqLWXb5hS57RLPMHsLUQe7a24doi0o,16231
|
155
155
|
meerschaum/config/_shell.py,sha256=46_m49Txc5q1rGfCgO49ca48BODx45DQJi8D0zz1R18,4245
|
156
156
|
meerschaum/config/_sync.py,sha256=nN5bLCHU8sFDdlPi7pQXuRVFcX457rZjOiALTvqRS_E,4332
|
157
|
-
meerschaum/config/_version.py,sha256=
|
157
|
+
meerschaum/config/_version.py,sha256=XePMeRwPxnziKgqCJG_d7nZQVMdmL3oHJQnL0Z3047s,71
|
158
158
|
meerschaum/config/environment.py,sha256=hTyjPLrGp3R4sytg_Jqv4TnCVI1WdmbX2YoRBCWSNt8,8277
|
159
159
|
meerschaum/config/paths.py,sha256=JjibeGN3YAdSNceRwsd42aNmeUrIgM6ndzC8qZAmNI0,621
|
160
160
|
meerschaum/config/static.py,sha256=92fSGxoHFDOK9GEsN8NVbAEh9W7-eZ1BS6thyEqcjeI,359
|
@@ -195,7 +195,7 @@ meerschaum/connectors/sql/_cli.py,sha256=D4c_S-xTmhLRxl2dMhNSF0bMb1fDrMwWP2SVRBm
|
|
195
195
|
meerschaum/connectors/sql/_create_engine.py,sha256=M_uP6HlMIJvwKn_K-GXPBO9oVlGA2ULrWTR3fuEDfPY,7678
|
196
196
|
meerschaum/connectors/sql/_fetch.py,sha256=eJIqVAc4qI0xrbkZedO85sfB1-Hd3_Jkk12D6-OuzRU,12208
|
197
197
|
meerschaum/connectors/sql/_instance.py,sha256=xCc8M0xWMzF5Tu_1uWIFivAoHey5N1ccFhN_Z7u04zk,6304
|
198
|
-
meerschaum/connectors/sql/_pipes.py,sha256=
|
198
|
+
meerschaum/connectors/sql/_pipes.py,sha256=hts5BUQTD8p9oLireNWw0Dio-ilQ1Aimw6uMrZaOHxo,130234
|
199
199
|
meerschaum/connectors/sql/_plugins.py,sha256=SubR5HUJaetoUCv83YNEMwhv4wTTBCMcxSOEUgyMML4,8747
|
200
200
|
meerschaum/connectors/sql/_sql.py,sha256=7x54ED3WYNASBBb50JKX37-d-LLQsp2fqR59S7qK6HQ,44490
|
201
201
|
meerschaum/connectors/sql/_uri.py,sha256=BFzu5pjlbL3kxLH13vHWlpKGYTPfg8wuA2j58O9NsCM,3440
|
@@ -213,7 +213,7 @@ meerschaum/core/__init__.py,sha256=Qx0s4KANuYCjTCHEaE70cfgCPxiYPPkr9DnmCTw33Z0,2
|
|
213
213
|
meerschaum/core/Pipe/__init__.py,sha256=5ibU7Cnz3vLsKtfVINkmR4maNE_jOdX6bA4ZpyIm_Pc,19979
|
214
214
|
meerschaum/core/Pipe/_attributes.py,sha256=ww6P90OYt-hFGRxznSfx-uy1ecor1YgwvbIBvtu-5fg,32457
|
215
215
|
meerschaum/core/Pipe/_bootstrap.py,sha256=4RLDD25BvqyukHhejTIJFaECOvCgZk6tjtNQfS9qgA8,8150
|
216
|
-
meerschaum/core/Pipe/_cache.py,sha256=
|
216
|
+
meerschaum/core/Pipe/_cache.py,sha256=p8ckGqqVmm1g9OKDR6OhzpgBCuP7gbYHopmIS9qQR3A,15731
|
217
217
|
meerschaum/core/Pipe/_clear.py,sha256=vCv4imPcMVdJXWwArOcnNlxEOk5HPOHSDZ9omrexzGc,1972
|
218
218
|
meerschaum/core/Pipe/_copy.py,sha256=YDclAapf_spm9phpFr4-CALyYyw7nUsyKyiaLM1cnm4,2965
|
219
219
|
meerschaum/core/Pipe/_data.py,sha256=HPNY5QTZstEd8Mq7pF9i_obl8ir9mTICtHyjY0ecRT4,27732
|
@@ -246,7 +246,7 @@ meerschaum/plugins/__init__.py,sha256=3ButbAcVQVdOlgai7kEvid7TYMNdDW-zqRbEL0Ka2C
|
|
246
246
|
meerschaum/plugins/bootstrap.py,sha256=sSvdh2g78AYwTTNMTdHw62Nj2v95pmbd77HFznuErUE,27728
|
247
247
|
meerschaum/utils/__init__.py,sha256=QrK1K9hIbPCRCM5k2nZGFqGnrqhA0Eh-iSmCU7FG6Cs,612
|
248
248
|
meerschaum/utils/_get_pipes.py,sha256=TbV77VjQ9qqCLOy06-hlnfQI_hS6PTcXkbO7aQ2csdM,13275
|
249
|
-
meerschaum/utils/dataframe.py,sha256=
|
249
|
+
meerschaum/utils/dataframe.py,sha256=bxcf04SRlt0tI7vNQXYvoTLHM35e5QMVm4IJYT82mMo,67686
|
250
250
|
meerschaum/utils/debug.py,sha256=zBYxcLJ5Ymzz1J5BVv7DXAZ7CWd6vYN9uFFdWKmny9U,4334
|
251
251
|
meerschaum/utils/interactive.py,sha256=t-6jWozXSqL7lYGDHuwiOjTgr-UKhdcg61q_eR5mikI,3196
|
252
252
|
meerschaum/utils/misc.py,sha256=792Ejz6FYrCoqTiyeWnC4n8t3-wcGXfJv5InSQIKGlM,50451
|
@@ -274,16 +274,16 @@ meerschaum/utils/formatting/_jobs.py,sha256=c2Kp51vRJkDs2OeYLiePjSJCYhWj5az4b8uG
|
|
274
274
|
meerschaum/utils/formatting/_pipes.py,sha256=CbCgUQadFR7i9gKogTPQ7vCgFguy9BW_hIT_aIwPhCw,19565
|
275
275
|
meerschaum/utils/formatting/_pprint.py,sha256=DCwopIQUu2xsCETsmbfSYVupG6Uz95gyZ63pa_nDMPo,3097
|
276
276
|
meerschaum/utils/formatting/_shell.py,sha256=e1SPZIUGRF6TkiKn4tULPGCE6ZbaxFdOTqosJA5rWX4,4378
|
277
|
-
meerschaum/utils/packages/__init__.py,sha256=
|
277
|
+
meerschaum/utils/packages/__init__.py,sha256=bgMYbbFanPLgqGchwxYiUoB-45XvjoMFdJdeqXX_MSo,63886
|
278
278
|
meerschaum/utils/packages/_packages.py,sha256=KWVfxsm-6ZdffpskIjHPki6wSQvf0LK9MWZgllS3dMo,9432
|
279
279
|
meerschaum/utils/packages/lazy_loader.py,sha256=VHnph3VozH29R4JnSSBfwtA5WKZYZQFT_GeQSShCnuc,2540
|
280
280
|
meerschaum/utils/venv/_Venv.py,sha256=dF-FqP7Boq-g-anj2Ps-UkTOL2qJtxY3bdz0HWF2zT8,3726
|
281
|
-
meerschaum/utils/venv/__init__.py,sha256=
|
282
|
-
meerschaum-3.0.
|
283
|
-
meerschaum-3.0.
|
284
|
-
meerschaum-3.0.
|
285
|
-
meerschaum-3.0.
|
286
|
-
meerschaum-3.0.
|
287
|
-
meerschaum-3.0.
|
288
|
-
meerschaum-3.0.
|
289
|
-
meerschaum-3.0.
|
281
|
+
meerschaum/utils/venv/__init__.py,sha256=tMxoGCrUZ_1OEzeZAM8KQyfYMBR0L0V7huBJ2dZNx7k,27333
|
282
|
+
meerschaum-3.0.4.dist-info/licenses/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
|
283
|
+
meerschaum-3.0.4.dist-info/licenses/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
|
284
|
+
meerschaum-3.0.4.dist-info/METADATA,sha256=85H_Xm43ujqNqu3nNxBZWyrAxjME5uV-vJOfYPnDtUI,25325
|
285
|
+
meerschaum-3.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
286
|
+
meerschaum-3.0.4.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
|
287
|
+
meerschaum-3.0.4.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
|
288
|
+
meerschaum-3.0.4.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
|
289
|
+
meerschaum-3.0.4.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|