meerschaum 2.5.0__tar.gz → 2.5.1__tar.gz

{meerschaum-2.5.0/meerschaum.egg-info → meerschaum-2.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.5.0
+Version: 2.5.1
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares
@@ -180,7 +180,8 @@ Requires-Dist: websockets>=11.0.3; extra == "api"
 Requires-Dist: fastapi>=0.111.0; extra == "api"
 Requires-Dist: fastapi-login>=1.7.2; extra == "api"
 Requires-Dist: python-multipart>=0.0.9; extra == "api"
-Requires-Dist: httpx>=0.24.1; extra == "api"
+Requires-Dist: httpx>=0.27.2; extra == "api"
+Requires-Dist: httpcore>=1.0.6; extra == "api"
 Requires-Dist: valkey>=6.0.0; extra == "api"
 Requires-Dist: numpy>=1.18.5; extra == "api"
 Requires-Dist: pandas[parquet]>=2.0.1; extra == "api"
@@ -313,7 +314,8 @@ Requires-Dist: websockets>=11.0.3; extra == "full"
 Requires-Dist: fastapi>=0.111.0; extra == "full"
 Requires-Dist: fastapi-login>=1.7.2; extra == "full"
 Requires-Dist: python-multipart>=0.0.9; extra == "full"
-Requires-Dist: httpx>=0.24.1; extra == "full"
+Requires-Dist: httpx>=0.27.2; extra == "full"
+Requires-Dist: httpcore>=1.0.6; extra == "full"
 Requires-Dist: valkey>=6.0.0; extra == "full"
 
 <img src="https://meerschaum.io/assets/banner_1920x320.png" alt="Meerschaum banner" style="width: 100%"/>

{meerschaum-2.5.0 → meerschaum-2.5.1}/meerschaum/_internal/entry.py

@@ -13,6 +13,7 @@ import os
 import sys
 import pathlib
 
+import meerschaum as mrsm
 from meerschaum.utils.typing import SuccessTuple, List, Optional, Dict, Callable, Any
 from meerschaum.config.static import STATIC_CONFIG as _STATIC_CONFIG
 
@@ -229,7 +230,7 @@ def entry_with_args(
         _ = get_shell(**kw).cmdloop()
         return True, "Success"
 
-    skip_schedule = False
+    _skip_schedule = False
 
     executor_keys = kw.get('executor_keys', None)
     if executor_keys is None:
@@ -246,7 +247,7 @@ def entry_with_args(
             api_label = executor_keys.split(':')[-1]
             kw['action'].insert(0, 'api')
             kw['action'].insert(1, api_label)
-            skip_schedule = True
+            _skip_schedule = True
 
     ### If the `--daemon` flag is present, prepend 'start job'.
     if kw.get('daemon', False) and kw['action'][0] != 'stack':
@@ -271,7 +272,7 @@ def entry_with_args(
         and kw['action'][0] == 'start'
         and kw['action'][1] in ('job', 'jobs')
     ):
-        skip_schedule = True
+        _skip_schedule = True
 
     kw['action'] = remove_leading_action(kw['action'], _actions=_actions)
 
@@ -279,10 +280,11 @@ def entry_with_args(
         _do_action_wrapper,
         action_function,
         plugin_name,
+        _skip_schedule=_skip_schedule,
         **kw
     )
 
-    if kw.get('schedule', None) and not skip_schedule:
+    if kw.get('schedule', None) and not _skip_schedule:
         from meerschaum.utils.schedule import schedule_function
         from meerschaum.utils.misc import interval_str
         import time
@@ -304,7 +306,12 @@ def entry_with_args(
     return result
 
 
-def _do_action_wrapper(action_function, plugin_name, **kw):
+def _do_action_wrapper(
+    action_function,
+    plugin_name,
+    _skip_schedule: bool = False,
+    **kw
+):
     from meerschaum.plugins import Plugin
     from meerschaum.utils.venv import Venv
     from meerschaum.utils.misc import filter_keywords
@@ -328,6 +335,10 @@ def _do_action_wrapper(action_function, plugin_name, **kw):
             )
         except KeyboardInterrupt:
             result = False, f"Cancelled action `{action_name.lstrip()}`."
+
+    if kw.get('schedule', None) and not _skip_schedule:
+        mrsm.pprint(result)
+
     return result
 
 _shells = []

{meerschaum-2.5.0 → meerschaum-2.5.1}/meerschaum/api/dash/pipes.py

@@ -346,6 +346,8 @@ def accordion_items_from_pipe(
     for item in skip_items:
         _ = items_titles.pop(item, None)
 
+    pipe_meta_str = json.dumps(pipe.meta, sort_keys=True)
+
     ### Only generate items if they're in the `active_items` list.
     items_bodies = {}
     if 'overview' in active_items:
@@ -358,22 +360,103 @@ def accordion_items_from_pipe(
             html.Tr([html.Td("Instance"), html.Td(html.Pre(f"{pipe.instance_keys}"))]),
             html.Tr([html.Td("Target Table"), html.Td(html.Pre(f"{pipe.target}"))]),
         ]
-        columns = pipe.columns.copy()
-        if columns:
-            datetime_index = columns.pop('datetime', None)
-            columns_items = []
-            if datetime_index:
-                columns_items.append(html.Li(f"{datetime_index} (datetime)"))
-            columns_items.extend([
-                html.Li(f"{col}")
-                for col_key, col in columns.items()
-            ])
+
+        indices_header = [
+            html.Thead(
+                html.Tr(
+                    [
+                        html.Th(
+                            html.Span(
+                                "Key",
+                                id={'type': 'key-table-header', 'id': pipe_meta_str},
+                                style={"textDecoration": "underline", "cursor": "pointer"},
+                            ),
+                        ),
+                        html.Th(
+                            html.Span(
+                                "Column",
+                                id={'type': 'column-table-header', 'id': pipe_meta_str},
+                                style={"textDecoration": "underline", "cursor": "pointer"},
+                            ),
+                        ),
+                        html.Th(
+                            html.Span(
+                                "Index",
+                                id={'type': 'index-table-header', 'id': pipe_meta_str},
+                                style={"textDecoration": "underline", "cursor": "pointer"},
+                            ),
+                        ),
+                        html.Th(
+                            html.Span(
+                                "Is Composite",
+                                id={'type': 'is-composite-table-header', 'id': pipe_meta_str},
+                                style={"textDecoration": "underline", "cursor": "pointer"},
+                            ),
+                        ),
+                        dbc.Tooltip(
+                            "Unique reference name for the index "
+                            "(e.g. `datetime` for the range axis)",
+                            target={'type': 'key-table-header', 'id': pipe_meta_str},
+                        ),
+                        dbc.Tooltip(
+                            "The actual column (field name) in the target dataset.",
+                            target={'type': 'column-table-header', 'id': pipe_meta_str},
+                        ),
+                        dbc.Tooltip(
+                            "The name of the index created on the given columns.",
+                            target={'type': 'index-table-header', 'id': pipe_meta_str},
+                        ),
+                        dbc.Tooltip(
+                            "Whether the column is used in the composite primary key "
+                            "to determine updates.",
+                            target={'type': 'is-composite-table-header', 'id': pipe_meta_str},
+                        ),
+                    ]
+                )
+            )
+        ]
+
+        indices = pipe.indices
+        columns = pipe.columns
+        index_column_names = pipe.get_indices()
+        indices_rows = []
+        for ix_key, ix_name in index_column_names.items():
+            col = columns.get(ix_key, None)
+            ix_cols = indices.get(ix_key, None)
+            if not col and not ix_cols:
+                continue
+            if not isinstance(ix_cols, (list, tuple)):
+                ix_cols = [ix_cols]
+            if col:
+                col_item = html.Pre(col)
+            elif len(ix_cols) == 1:
+                col_item = html.Pre(ix_cols[0])
+            else:
+                col_item = html.Pre(html.Ul([html.Li(_c) for _c in ix_cols]))
+            is_composite_item = "✅" if col else ""
+            ix_key_item = html.Pre(ix_key) if ix_key != 'datetime' else html.Pre(f"🕓 {ix_key}")
+            indices_rows.append(
+                html.Tr([
+                    html.Td(ix_key_item),
+                    html.Td(col_item),
+                    html.Td(html.Pre(ix_name)),
+                    html.Td(is_composite_item),
+                ])
+            )
+        indices_table = dbc.Table(
+            indices_header + [html.Tbody(indices_rows)],
+            bordered=True,
+            hover=False,
+            striped=True,
+        )
+        if indices_rows:
             overview_rows.append(
                 html.Tr([
-                    html.Td("Indices" if len(columns_items) != 1 else "Index"),
-                    html.Td(html.Pre(html.Ul(columns_items))),
+                    html.Td("Indices" if len(indices_rows) != 1 else "Index"),
+                    html.Td(indices_table),
                 ])
             )
+
         tags = pipe.tags
         if tags:
             tags_items = html.Ul([
@@ -420,7 +503,6 @@ def accordion_items_from_pipe(
         if newest_time is not None:
             stats_rows.append(html.Tr([html.Td("Newest time"), html.Td(str(newest_time))]))
 
-
         items_bodies['stats'] = dbc.Table(stats_header + [html.Tbody(stats_rows)], hover=True)
 
     if 'columns' in active_items:

{meerschaum-2.5.0 → meerschaum-2.5.1}/meerschaum/api/routes/_webterm.py

@@ -13,6 +13,7 @@ from meerschaum.utils.packages import attempt_import
 from meerschaum.api.dash.sessions import is_session_authenticated
 fastapi, fastapi_responses = attempt_import('fastapi', 'fastapi.responses')
 import starlette
+httpcore = attempt_import('httpcore')
 httpx = attempt_import('httpx')
 websockets = attempt_import('websockets')
 Request = fastapi.Request

{meerschaum-2.5.0 → meerschaum-2.5.1}/meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "2.5.0"
+__version__ = "2.5.1"

{meerschaum-2.5.0 → meerschaum-2.5.1}/meerschaum/utils/dataframe.py

@@ -1194,9 +1194,9 @@ def query_df(
     dtypes = {col: str(typ) for col, typ in df.dtypes.items()}
 
     if inplace:
-        df.infer_objects(copy=False).fillna(NA, inplace=True)
+        df.fillna(NA, inplace=True)
     else:
-        df = df.infer_objects(copy=False).fillna(NA)
+        df = df.infer_objects().fillna(NA)
 
     if isinstance(begin, str):
         begin = dateutil_parser.parse(begin)

{meerschaum-2.5.0 → meerschaum-2.5.1}/meerschaum/utils/packages/_packages.py

@@ -163,7 +163,8 @@ packages['api'] = {
     'fastapi'                        : 'fastapi>=0.111.0',
     'fastapi_login'                  : 'fastapi-login>=1.7.2',
     'multipart'                      : 'python-multipart>=0.0.9',
-    'httpx'                          : 'httpx>=0.24.1',
+    'httpx'                          : 'httpx>=0.27.2',
+    'httpcore'                       : 'httpcore>=1.0.6',
     'valkey'                         : 'valkey>=6.0.0',
 }
 packages['api'].update(packages['sql'])

{meerschaum-2.5.0 → meerschaum-2.5.1}/meerschaum/utils/schedule.py

@@ -111,16 +111,18 @@ def schedule_function(
     except RuntimeError:
         loop = asyncio.new_event_loop()
 
-
     async def run_scheduler():
         async with _scheduler:
             job = await _scheduler.add_schedule(
                 function,
                 trigger,
-                args=args,
-                kwargs=kw,
-                max_running_jobs=1,
-                conflict_policy=apscheduler.ConflictPolicy.replace,
+                **filter_keywords(
+                    _scheduler.add_schedule,
+                    args=args,
+                    kwargs=kw,
+                    max_running_jobs=1,
+                    conflict_policy=apscheduler.ConflictPolicy.replace,
+                )
             )
             try:
                 await _scheduler.run_until_stopped()

{meerschaum-2.5.0 → meerschaum-2.5.1/meerschaum.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.5.0
+Version: 2.5.1
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares
@@ -180,7 +180,8 @@ Requires-Dist: websockets>=11.0.3; extra == "api"
 Requires-Dist: fastapi>=0.111.0; extra == "api"
 Requires-Dist: fastapi-login>=1.7.2; extra == "api"
 Requires-Dist: python-multipart>=0.0.9; extra == "api"
-Requires-Dist: httpx>=0.24.1; extra == "api"
+Requires-Dist: httpx>=0.27.2; extra == "api"
+Requires-Dist: httpcore>=1.0.6; extra == "api"
 Requires-Dist: valkey>=6.0.0; extra == "api"
 Requires-Dist: numpy>=1.18.5; extra == "api"
 Requires-Dist: pandas[parquet]>=2.0.1; extra == "api"
@@ -313,7 +314,8 @@ Requires-Dist: websockets>=11.0.3; extra == "full"
 Requires-Dist: fastapi>=0.111.0; extra == "full"
 Requires-Dist: fastapi-login>=1.7.2; extra == "full"
 Requires-Dist: python-multipart>=0.0.9; extra == "full"
-Requires-Dist: httpx>=0.24.1; extra == "full"
+Requires-Dist: httpx>=0.27.2; extra == "full"
+Requires-Dist: httpcore>=1.0.6; extra == "full"
 Requires-Dist: valkey>=6.0.0; extra == "full"
 
 <img src="https://meerschaum.io/assets/banner_1920x320.png" alt="Meerschaum banner" style="width: 100%"/>

{meerschaum-2.5.0 → meerschaum-2.5.1}/meerschaum.egg-info/requires.txt

@@ -7,7 +7,8 @@ websockets>=11.0.3
 fastapi>=0.111.0
 fastapi-login>=1.7.2
 python-multipart>=0.0.9
-httpx>=0.24.1
+httpx>=0.27.2
+httpcore>=1.0.6
 valkey>=6.0.0
 numpy>=1.18.5
 pandas[parquet]>=2.0.1
@@ -237,7 +238,8 @@ websockets>=11.0.3
 fastapi>=0.111.0
 fastapi-login>=1.7.2
 python-multipart>=0.0.9
-httpx>=0.24.1
+httpx>=0.27.2
+httpcore>=1.0.6
 valkey>=6.0.0
 
 [gui]