meerschaum 2.4.7__py3-none-any.whl → 2.4.9__py3-none-any.whl

meerschaum/_internal/arguments/_parser.py

@@ -10,6 +10,7 @@ from __future__ import annotations
 import sys
 import argparse
 import json
+import re
 from datetime import datetime, timedelta, timezone
 from meerschaum.utils.typing import Union, Dict, List, Any, Tuple, Callable
 from meerschaum.utils.misc import string_to_dict
@@ -39,7 +40,7 @@ class ArgumentParser(argparse.ArgumentParser):
 
 def parse_datetime(dt_str: str) -> Union[datetime, int, str]:
     """Parse a string into a datetime."""
-    from meerschaum.utils.misc import is_int
+    from meerschaum.utils.misc import is_int, round_time
     if is_int(dt_str):
         return int(dt_str)
 
@@ -47,11 +48,43 @@ def parse_datetime(dt_str: str) -> Union[datetime, int, str]:
         return 'None'
 
     from meerschaum.utils.packages import attempt_import
-    dateutil_parser = attempt_import('dateutil.parser')
+    dateutil_parser, dateutil_relativedelta = attempt_import(
+        'dateutil.parser', 'dateutil.relativedelta'
+    )
+    relativedelta = dateutil_relativedelta.relativedelta
+
+    ago_pattern = r'(\d+)\s+(days?|minutes?|seconds?|hours?|weeks?|months?|years?)\s+ago'
+    round_pattern = r'(\d+)\s+(days?|minutes?|seconds?|hours?|weeks?|years?)'
+    now = datetime.now(timezone.utc).replace(tzinfo=None)
+    ago_matches = re.findall(ago_pattern, dt_str.lower())
 
     try:
         if dt_str.lower() == 'now':
-            dt = datetime.now(timezone.utc).replace(tzinfo=None)
+            dt = now
+        elif ago_matches:
+            val_str, unit_str = ago_matches[0]
+            if not unit_str.endswith('s'):
+                unit_str += 's'
+            val = int(val_str) if is_int(val_str) else float(val_str)
+            ago_delta = relativedelta(**{unit_str: val})
+            round_part = dt_str.lower().split('ago ')[-1]
+            round_delta = None
+            if round_part:
+                round_matches = re.findall(round_pattern, round_part)
+                if round_matches:
+                    round_val_str, round_unit_str = round_matches[0]
+                    if not round_unit_str.endswith('s'):
+                        round_unit_str += 's'
+                    round_val = (
+                        int(round_val_str)
+                        if is_int(round_val_str)
+                        else float(round_val_str)
+                    )
+                    round_delta = timedelta(**{round_unit_str: round_val})
+
+            dt = now - ago_delta
+            if round_delta is not None:
+                dt = round_time(dt, round_delta)
         else:
             dt = dateutil_parser.parse(dt_str)
     except Exception as e:

meerschaum/actions/show.py

@@ -7,6 +7,8 @@ This module contains functions for printing elements.
 """
 
 from __future__ import annotations
+
+from datetime import datetime
 import meerschaum as mrsm
 from meerschaum.utils.typing import SuccessTuple, Union, Sequence, Any, Optional, List, Dict, Tuple
 
@@ -274,8 +276,8 @@ def _show_arguments(
 def _show_data(
     action: Optional[List[str]] = None,
     gui: bool = False,
-    begin: Optional[datetime.datetime] = None,
-    end: Optional[datetime.datetime] = None,
+    begin: Union[datetime, int, None] = None,
+    end: Union[datetime, int, None] = None,
     params: Optional[Dict[str, Any]] = None,
     chunksize: Optional[int] = -1,
     nopretty: bool = False,
@@ -401,12 +403,15 @@ def _show_columns(
 def _show_rowcounts(
     action: Optional[List[str]] = None,
     workers: Optional[int] = None,
+    begin: Union[datetime, int, None] = None,
+    end: Union[datetime, int, None] = None,
+    params: Optional[Dict[str, Any]] = None,
     debug: bool = False,
     **kw: Any
 ) -> SuccessTuple:
     """
     Show the rowcounts for pipes.
-    
+
     To see remote rowcounts (execute `COUNT(*)` on the source server),
     execute `show rowcounts remote`.
     """
@@ -421,7 +426,13 @@ def _show_rowcounts(
     pipes = get_pipes(as_list=True, debug=debug, **kw)
     pool = get_pool(workers=workers)
     def _get_rc(_pipe):
-        return _pipe.get_rowcount(remote=remote, debug=debug)
+        return _pipe.get_rowcount(
+            begin=begin,
+            end=end,
+            params=params,
+            remote=remote,
+            debug=debug
+        )
 
     rowcounts = pool.map(_get_rc, pipes) if pool is not None else [_get_rc(p) for p in pipes]
 

meerschaum/actions/sql.py

@@ -59,7 +59,7 @@ def sql(
         - `sql local exec "INSERT INTO table (id) VALUES (1)"
             Execute the above query on `sql:local`.
     """
-    from meerschaum.utils.dataframe impor to_json
+    from meerschaum.utils.dataframe import to_json
 
     if action is None:
         action = []

meerschaum/api/routes/_pipes.py

@@ -408,8 +408,8 @@ def get_pipe_data(
             _params = None
     if not isinstance(_params, dict):
         raise fastapi.HTTPException(
-            status_code = 409,
-            detail = "Params must be a valid JSON-encoded dictionary.",
+            status_code=409,
+            detail="Params must be a valid JSON-encoded dictionary.",
         )
 
     _select_columns = []
@@ -422,8 +422,8 @@ def get_pipe_data(
             _select_columns = None
     if not isinstance(_select_columns, list):
         raise fastapi.HTTPException(
-            status_code = 409,
-            detail = "Selected columns must be a JSON-encoded list."
+            status_code=409,
+            detail="Selected columns must be a JSON-encoded list."
         )
 
     _omit_columns = []
@@ -436,35 +436,35 @@ def get_pipe_data(
             _omit_columns = None
     if _omit_columns is None:
         raise fastapi.HTTPException(
-            status_code = 409,
-            detail = "Omitted columns must be a JSON-encoded list.",
+            status_code=409,
+            detail="Omitted columns must be a JSON-encoded list.",
         )
 
     pipe = get_pipe(connector_keys, metric_key, location_key)
     if not is_pipe_registered(pipe, pipes(refresh=True)):
         raise fastapi.HTTPException(
-            status_code = 409,
-            detail = "Pipe must be registered with the datetime column specified."
+            status_code=409,
+            detail="Pipe must be registered with the datetime column specified."
         )
 
     if pipe.target in ('users', 'plugins', 'pipes'):
         raise fastapi.HTTPException(
-            status_code = 409,
-            detail = f"Cannot retrieve data from protected table '{pipe.target}'.",
+            status_code=409,
+            detail=f"Cannot retrieve data from protected table '{pipe.target}'.",
         )
 
     df = pipe.get_data(
-        select_columns = _select_columns,
-        omit_columns = _omit_columns,
-        begin = begin,
-        end = end,
-        params = _params,
-        debug = debug,
+        select_columns=_select_columns,
+        omit_columns=_omit_columns,
+        begin=begin,
+        end=end,
+        params=_params,
+        debug=debug,
     )
     if df is None:
         raise fastapi.HTTPException(
-            status_code = 400,
-            detail = f"Could not fetch data with the given parameters.",
+            status_code=400,
+            detail="Could not fetch data with the given parameters.",
         )
 
     ### NaN cannot be JSON-serialized.
@@ -482,16 +482,16 @@ def get_pipe_data(
 
 @app.get(pipes_endpoint + '/{connector_keys}/{metric_key}/{location_key}/csv', tags=['Pipes'])
 def get_pipe_csv(
-        connector_keys: str,
-        metric_key: str,
-        location_key: str,
-        begin: Union[str, int, None] = None,
-        end: Union[str, int, None] = None,
-        params: Optional[str] = None,
-        curr_user = (
-            fastapi.Depends(manager) if not no_auth else None
-        ),
-    ) -> str:
+    connector_keys: str,
+    metric_key: str,
+    location_key: str,
+    begin: Union[str, int, None] = None,
+    end: Union[str, int, None] = None,
+    params: Optional[str] = None,
+    curr_user = (
+        fastapi.Depends(manager) if not no_auth else None
+    ),
+) -> str:
     """
     Get a Pipe's data as a CSV file. Optionally set query boundaries.
     """
@@ -518,8 +518,8 @@ def get_pipe_csv(
 
     if not isinstance(_params, dict):
         raise fastapi.HTTPException(
-            status_code = 409,
-            detail = "Params must be a valid JSON-encoded dictionary.",
+            status_code=409,
+            detail="Params must be a valid JSON-encoded dictionary.",
         )
 
     p = get_pipe(connector_keys, metric_key, location_key)
@@ -529,7 +529,7 @@ def get_pipe_csv(
             detail = "Pipe must be registered with the datetime column specified."
         )
 
-    dt_col = pipe.columns.get('datetime', None)
+    dt_col = p.columns.get('datetime', None)
     if dt_col:
         if begin is None:
             begin = p.get_sync_time(round_down=False, newest=False)
@@ -552,13 +552,13 @@ def get_pipe_csv(
 
 @app.get(pipes_endpoint + '/{connector_keys}/{metric_key}/{location_key}/id', tags=['Pipes'])
 def get_pipe_id(
-        connector_keys: str,
-        metric_key: str,
-        location_key: str,
-        curr_user = (
-            fastapi.Depends(manager) if not no_auth else None
-        ),
-    ) -> int:
+    connector_keys: str,
+    metric_key: str,
+    location_key: str,
+    curr_user = (
+        fastapi.Depends(manager) if not no_auth else None
+    ),
+) -> int:
     """
     Get a Pipe's ID.
     """

meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "2.4.7"
+__version__ = "2.4.9"

meerschaum/connectors/api/_pipes.py

@@ -346,14 +346,14 @@ def get_pipe_data(
         try:
             response = self.get(
                 r_url + "/data",
-                params = {
+                params={
                     'select_columns': json.dumps(select_columns),
                     'omit_columns': json.dumps(omit_columns),
                     'begin': begin,
                     'end': end,
-                    'params': json.dumps(params)
+                    'params': json.dumps(params, default=str)
                 },
-                debug = debug
+                debug=debug
             )
             if not response.ok:
                 return None

meerschaum/connectors/sql/_SQLConnector.py

@@ -272,7 +272,7 @@ class SQLConnector(Connector):
         """
         Return whether this connector may be multithreaded.
         """
-        if self.flavor == 'duckdb':
+        if self.flavor in ('duckdb', 'oracle'):
             return False
         if self.flavor == 'sqlite':
             return ':memory:' not in self.URI

meerschaum/connectors/sql/_instance.py

@@ -15,12 +15,12 @@ from meerschaum.utils.warnings import warn
 
 _in_memory_temp_tables: Dict[str, bool] = {}
 def _log_temporary_tables_creation(
-        self,
-        tables: Union[str, List[str]],
-        ready_to_drop: bool = False,
-        create: bool = True,
-        debug: bool = False,
-    ) -> SuccessTuple:
+    self,
+    tables: Union[str, List[str]],
+    ready_to_drop: bool = False,
+    create: bool = True,
+    debug: bool = False,
+) -> SuccessTuple:
     """
     Log a temporary table's creation for later deletion.
     """
@@ -58,15 +58,15 @@ def _log_temporary_tables_creation(
 
 
 def _drop_temporary_table(
-        self,
-        table: str,
-        debug: bool = False,
-    ) -> SuccessTuple:
+    self,
+    table: str,
+    debug: bool = False,
+) -> SuccessTuple:
     """
     Drop a temporary table and clear it from the internal table.
     """
-    from meerschaum.utils.sql import sql_item_name, table_exists, SKIP_IF_EXISTS_FLAVORS
-    if_exists = "IF EXISTS" if self.flavor not in SKIP_IF_EXISTS_FLAVORS else ""
+    from meerschaum.utils.sql import sql_item_name, table_exists, DROP_IF_EXISTS_FLAVORS
+    if_exists = "IF EXISTS" if self.flavor in DROP_IF_EXISTS_FLAVORS else ""
     if not if_exists:
         if not table_exists(table, self, self.internal_schema, debug=debug):
             return True, "Success"