meerschaum 1.5.22__py3-none-any.whl → 1.5.24__py3-none-any.whl

meerschaum/actions/copy.py

@@ -117,7 +117,15 @@ def _copy_pipes(
                     noask=noask, yes=yes
                 )
         ):
-            _new_pipe.sync(p.get_data(debug=debug, **kw), debug=debug, **kw)
+            _new_pipe.sync(
+                p.get_data(
+                    debug = debug,
+                    as_iterator = True,
+                    **kw
+                ),
+                debug = debug,
+                **kw
+            )
 
     msg = (
         "No pipes were copied." if successes == 0

meerschaum/actions/stack.py

@@ -47,6 +47,15 @@ def stack(
     from meerschaum.utils.warnings import warn
     from meerschaum.utils.formatting import ANSI
     from meerschaum.utils.misc import is_docker_available
+    from meerschaum.config._read_config import search_and_substitute_config
+
+    stack_env_dict = {
+        var: val
+        for var, val in search_and_substitute_config(
+            meerschaum.config.stack.env_dict
+        ).items()
+        if isinstance(val, str)
+    }
 
     if action is None:
         action = []
@@ -139,7 +148,7 @@ def stack(
         cwd = STACK_COMPOSE_PATH.parent,
         stdout = stdout,
         stderr = stderr,
-        env = os.environ,
+        env = stack_env_dict,
     ) if (has_builtin_compose or has_binary_compose) else run_python_package(
         'compose',
         args = cmd_list,
@@ -147,6 +156,7 @@ def stack(
         venv = _compose_venv,
         capture_output = _capture_output,
         as_proc = True,
+        env = stack_env_dict,
     )
     try:
         rc = proc.wait() if proc is not None else 1

meerschaum/api/dash/callbacks/dashboard.py

@@ -129,17 +129,23 @@ def update_page_layout_div(pathname: str, session_store_data: Dict[str, Any]):
         session_id = session_store_data.get('session-id', None) 
     except AttributeError:
         session_id = None
+
     ### Bypass login if `--no-auth` is specified.
-    if session_id is None and no_auth:
+    if session_id not in active_sessions and no_auth:
         session_store_data['session-id'] = str(uuid.uuid4())
         active_sessions[session_store_data['session-id']] = {'username': 'no-auth'}
-        session_store_to_return = session_data
+        session_store_to_return = session_store_data
     else:
         session_store_to_return = dash.no_update
 
     _path = (pathname.rstrip('/') + '/').replace((dash_endpoint + '/'), '').rstrip('/')
-    path = _path if no_auth or _path not in _required_login else (
-        _path if session_id in active_sessions else 'login'
+    path = (
+        _path
+        if no_auth or _path not in _required_login else (
+            _path
+            if session_id in active_sessions
+            else 'login'
+        )
     )
     layout = _paths.get(path, pages.error.layout)
     return layout, session_store_to_return
@@ -447,21 +453,22 @@ def show_arguments_collapse(n_clicks : int, is_open : bool):
     Output('ws', 'send'),
     Input('test-button', 'n_clicks'),
     Input('ws', 'url'),
+    Input('session-store', 'data'),
     State('ws', 'state'),
     State('ws', 'message'),
     State('ws', 'error'),
     State('ws', 'protocols'),
-    State('session-store', 'data'),
-    #  prevent_initial_call = True,
 )
-def ws_send(n_clicks: int, url, *states):
+def ws_send(n_clicks: int, url, session_store_data: Dict[str, Any], *states):
     """
     Send an initial connection message over the websocket.
     """
     ctx = dash.callback_context
     if not url:
         raise PreventUpdate
-    session_id = ctx.states['session-store.data']['session-id']
+    session_id = session_store_data.get('session-id', None)
+    if session_id is None:
+        raise PreventUpdate
     return json.dumps({
         'connect-time': json_serialize_datetime(datetime.datetime.utcnow()),
         'session-id': session_id,

meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "1.5.22"
+__version__ = "1.5.24"

meerschaum/config/stack/__init__.py

@@ -47,7 +47,6 @@ env_dict['MEERSCHAUM_API_CONFIG'] = json.dumps(
         'meerschaum' : 'MRSM{!meerschaum}',
         'system' : 'MRSM{!system}',
     },
-    #  separators = (',', ':'),
     indent = 4,
 ).replace(
     '"MRSM{!system}"', 'MRSM{!system}'
@@ -94,17 +93,26 @@ networks = {
 }
 
 default_docker_compose_config = {
-    'version': '3.2',
+    'version': '3.9',
     'services': {
         'db': {
             'environment': {
                 'TIMESCALEDB_TELEMETRY': 'off',
-                'POSTGRES_USER': env_dict['POSTGRES_USER'],
-                'POSTGRES_DB': env_dict['POSTGRES_DB'],
-                'POSTGRES_PASSWORD': env_dict['POSTGRES_PASSWORD'],
+                'POSTGRES_USER': '$POSTGRES_USER',
+                'POSTGRES_DB': '$POSTGRES_DB',
+                'POSTGRES_PASSWORD': '$POSTGRES_PASSWORD',
                 'ALLOW_IP_RANGE': env_dict['ALLOW_IP_RANGE'],
             },
             'command': 'postgres -c max_connections=1000 -c shared_buffers=1024MB',
+            'healthcheck': {
+                'test': [
+                    'CMD-SHELL', 'pg_isready',
+                    '-U', '$POSTGRES_USER', '-d', '$POSTGRES_DB',
+                ],
+                'interval': '5s',
+                'timeout': '3s',
+                'retries': 3
+            },
             'restart': 'always',
             'image' : 'timescale/timescaledb:' + env_dict['TIMESCALEDB_VERSION'],
             'ports' : [
@@ -132,11 +140,13 @@ default_docker_compose_config = {
                 'MRSM_CONFIG': env_dict['MEERSCHAUM_API_CONFIG'],
                 'MRSM_PATCH': env_dict['MEERSCHAUM_API_PATCH'],
             },
-            'restart' : 'always',
+            'restart': 'always',
             'init': True,
-            'depends_on' : [
-                'db',
-            ],
+            'depends_on': {
+                'db': {
+                    'condition': 'service_healthy',
+                },
+            },
             'volumes' : [
                 'api_root:' + volumes['api_root'],
             ],
@@ -151,9 +161,11 @@ default_docker_compose_config = {
                 'backend',
             ],
             'restart': 'always',
-            'depends_on': [
-                'db',
-            ],
+            'depends_on': {
+                'db': {
+                    'condition': 'service_healthy',
+                },
+            },
             'volumes': [
                 'grafana_storage' + ':' + volumes['grafana_storage'],
                 ### NOTE: Mount with the 'z' option for SELinux.

{meerschaum-1.5.22.dist-info → meerschaum-1.5.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 1.5.22
+Version: 1.5.24
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares

{meerschaum-1.5.22.dist-info → meerschaum-1.5.24.dist-info}/RECORD

@@ -24,7 +24,7 @@ meerschaum/actions/__init__.py,sha256=6R5Lpfm1zbah-lq_EbNuPOXhmW4i1-M3jibXp9FQ07
 meerschaum/actions/api.py,sha256=loSyeob6DOd9lngKzzr3obnpzc-qvsXzq6mXziYSREg,10996
 meerschaum/actions/bootstrap.py,sha256=StA6CkWBt-FEl26MyAGC7Q8SPVSHrfB3Uf56HrmnZoM,14529
 meerschaum/actions/clear.py,sha256=IdHy1tafcoPUSLSxExnSzroIdQPOTPIs_wMVpiMvi-0,4857
-meerschaum/actions/copy.py,sha256=f_3b88glAgxU59mG1PDFtBMhNCBn2ZaFfi9W4sHU8Lw,6095
+meerschaum/actions/copy.py,sha256=dieg0qn7UviQY718nwGhDU2dVr0hNbAb-2J04pxcl5I,6259
 meerschaum/actions/delete.py,sha256=XIeQ1Blxg7c5Gr6RbFasgz0lsr1IZgOHnbjhMR3V4sE,15245
 meerschaum/actions/drop.py,sha256=KOnpy-4TJqir--WkqYRr0VQePa_gl6_qqjjT6FVfRP4,2701
 meerschaum/actions/edit.py,sha256=Ql-Gcol_ydTB7unsprlhRc94-JSjiXs564vuv1wRppk,9492
@@ -38,7 +38,7 @@ meerschaum/actions/setup.py,sha256=LSma1nPCAJCV9u5A3BqZLBsXipjKwfpw4gP9roKygjk,3
 meerschaum/actions/sh.py,sha256=fLfTJaacKu4sjLTRqEzzYlT2WbbdZBEczsKb6F-qAek,2026
 meerschaum/actions/show.py,sha256=mH08dx6Z2iu-odpuq7oJGuCabM4aZ8GxD9mYssIMcAA,23468
 meerschaum/actions/sql.py,sha256=DZDc5qgiqlPgRJpAeBUVK-W-2FeVO0CuOQTEUybOcU0,4224
-meerschaum/actions/stack.py,sha256=r2eftp6sde9JwPIAJHq4kMdRm6-hcn5WS2JCYlgm8BU,5501
+meerschaum/actions/stack.py,sha256=x3Xr633H82o75zajuQwZZ8QsRayyQGu4MqXGapruB2s,5807
 meerschaum/actions/start.py,sha256=bD5nuTTMDTnL3GAcW6pmR6iXFZNwAQ-02FLoM2qIkss,18247
 meerschaum/actions/stop.py,sha256=7PqrKzmAxZ9X4HSAkeIbzaAg6KUSWylixybICfR9zuI,3948
 meerschaum/actions/sync.py,sha256=l6JpW6lg2FHT3dUhIHre-I-hJ6rApEZGUZgcSR15L6A,15339
@@ -69,7 +69,7 @@ meerschaum/api/dash/assets/favicon.ico,sha256=nDEekVxwS60wEDno1nbw5GF3TJOcDV26SE
 meerschaum/api/dash/assets/logo_48x48.png,sha256=hTR5BHUHEN4yP2xiqAcDciuigoII9T3-80R-dzsxVmw,10218
 meerschaum/api/dash/assets/logo_500x500.png,sha256=9EUtf6wQcEZTXHKfQ2kjNXod6Rn_4DTB_BkTgxggq00,67702
 meerschaum/api/dash/callbacks/__init__.py,sha256=eVXQKdXMk-PKRBBfCFaj1Bk2lLlHYvpzEWVDsT8Tabg,283
-meerschaum/api/dash/callbacks/dashboard.py,sha256=2yLtyiS4hSl0Iw-_q7gcnDL11Y5Xh8qqRZ0fjNjtzGE,24874
+meerschaum/api/dash/callbacks/dashboard.py,sha256=UG9HzFTj-rM2SXgon-Wy7-kDbAExzKsp7jfAkH41flg,25003
 meerschaum/api/dash/callbacks/login.py,sha256=BNkJNllMuMxtF1AaNrCXxnzkaT_YVJrkCv6Qr2CJqEI,2529
 meerschaum/api/dash/callbacks/plugins.py,sha256=7CrwwbBI2N3DR4Yb1bKmrtJ3cAQ3dVv1l6E_AtZ6Wng,2777
 meerschaum/api/dash/callbacks/register.py,sha256=wr9KF8FkeUeqPDlcGaIsBWrKVRIGee1oF6aAnDmpNKg,3446
@@ -125,9 +125,9 @@ meerschaum/config/_preprocess.py,sha256=-AEA8m_--KivZwTQ1sWN6LTn5sio_fUr2XZ51BO6
 meerschaum/config/_read_config.py,sha256=4GzNM0iRysuE9cY2wU_HZlTCs0pvJ9SgF7BCuOCif9k,14567
 meerschaum/config/_shell.py,sha256=k6PH0BEr2imhgURLYlR5p6s5gXfYpWoyZSV29U-SsXk,3589
 meerschaum/config/_sync.py,sha256=vPdr6XBYM3k8xLyWbWSXpFh6pNIsbchIkJDw-gKZjgU,4968
-meerschaum/config/_version.py,sha256=ud6x7hl8u6S-pvD0jDvpTYxsmlcAbCjEcVfKsXQeIO0,72
+meerschaum/config/_version.py,sha256=enAodlavOdkagzu5r0Ke24tcJHL8VkBI5vAXKO0G1kg,72
 meerschaum/config/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meerschaum/config/stack/__init__.py,sha256=pEdUYrZQtPB7-05fX1NNrFGBmWC6yIM8lBae8FrCEto,8233
+meerschaum/config/stack/__init__.py,sha256=wJpxRRJnds0PT3dSr717GbtIHue3rnQ5C3R0H-xVpx0,8616
 meerschaum/config/stack/grafana/__init__.py,sha256=wzuoch_AK49lcn7lH2qTSJ_PPbSagF4lcweeipz_XiE,2010
 meerschaum/config/stack/mosquitto/__init__.py,sha256=-OwOjq8KiBoSH_pmgCAAF3Dp3CRD4KgAEdimZSadROs,186
 meerschaum/config/stack/mosquitto/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -214,11 +214,11 @@ meerschaum/utils/packages/_packages.py,sha256=NHRcHPMmq-SonGLdLtjqhB2uDGxUDBrGfW
 meerschaum/utils/packages/lazy_loader.py,sha256=VHnph3VozH29R4JnSSBfwtA5WKZYZQFT_GeQSShCnuc,2540
 meerschaum/utils/venv/_Venv.py,sha256=oKuSNYsFfsKQhrsV5TViPekRHvjUXyJ-hChMPqSxnlw,3479
 meerschaum/utils/venv/__init__.py,sha256=DzyBp2tvTp5gl1qp52iTHh6hCDT8VkpiV1_ghXpg6ak,22150
-meerschaum-1.5.22.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
-meerschaum-1.5.22.dist-info/METADATA,sha256=UP-I4Sk9oBgKt9l8HZRD7-UO5KP_cV_GpBIeGtnZ75w,24344
-meerschaum-1.5.22.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
-meerschaum-1.5.22.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-meerschaum-1.5.22.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
-meerschaum-1.5.22.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
-meerschaum-1.5.22.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-meerschaum-1.5.22.dist-info/RECORD,,
+meerschaum-1.5.24.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
+meerschaum-1.5.24.dist-info/METADATA,sha256=T7BipEo0CPuNkN35TmgTaVzD2mAGAiDOcHNKFQrxeA8,24344
+meerschaum-1.5.24.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
+meerschaum-1.5.24.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+meerschaum-1.5.24.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
+meerschaum-1.5.24.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
+meerschaum-1.5.24.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+meerschaum-1.5.24.dist-info/RECORD,,