meerschaum 2.4.8__tar.gz → 2.4.10__tar.gz

{meerschaum-2.4.8/meerschaum.egg-info → meerschaum-2.4.10}/PKG-INFO

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

{meerschaum-2.4.8 → meerschaum-2.4.10}/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-2.4.8 → meerschaum-2.4.10}/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-2.4.8 → meerschaum-2.4.10}/meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "2.4.8"
+__version__ = "2.4.10"

{meerschaum-2.4.8 → meerschaum-2.4.10}/meerschaum/connectors/sql/_pipes.py

@@ -2075,7 +2075,7 @@ def get_pipe_rowcount(
     ----------
     pipe: mrsm.Pipe
         The pipe to query with.
-        
+
     begin: Union[datetime, int, None], default None
         The begin datetime value.
 
@@ -2124,14 +2124,14 @@ def get_pipe_rowcount(
                 warn(
                     f"No datetime could be determined for {pipe}."
                     + "\n    Ignoring begin and end...",
-                    stack = False,
+                    stack=False,
                 )
                 begin, end = None, None
             else:
                 warn(
                     f"A datetime wasn't specified for {pipe}.\n"
                     + f"    Using column \"{_dt}\" for datetime bounds...",
-                    stack = False,
+                    stack=False,
                 )
 
 

{meerschaum-2.4.8 → meerschaum-2.4.10}/meerschaum/core/Pipe/_data.py

@@ -515,15 +515,14 @@ def get_backtrack_data(
     )
 
 
-
 def get_rowcount(
-        self,
-        begin: Optional[datetime] = None,
-        end: Optional['datetime'] = None,
-        params: Optional[Dict[str, Any]] = None,
-        remote: bool = False,
-        debug: bool = False
-    ) -> int:
+    self,
+    begin: Union[datetime, int, None] = None,
+    end: Union[datetime, int, None] = None,
+    params: Optional[Dict[str, Any]] = None,
+    remote: bool = False,
+    debug: bool = False
+) -> int:
     """
     Get a Pipe's instance or remote rowcount.
 
@@ -556,11 +555,11 @@ def get_rowcount(
         with Venv(get_connector_plugin(connector)):
             rowcount = connector.get_pipe_rowcount(
                 self,
-                begin = begin,
-                end = end,
-                params = params,
-                remote = remote,
-                debug = debug,
+                begin=begin,
+                end=end,
+                params=params,
+                remote=remote,
+                debug=debug,
             )
             if rowcount is None:
                 return 0

{meerschaum-2.4.8 → meerschaum-2.4.10}/meerschaum/utils/dataframe.py

@@ -627,12 +627,12 @@ def get_numeric_cols(df: 'pd.DataFrame') -> List[str]:
 
 def get_uuid_cols(df: 'pd.DataFrame') -> List[str]:
     """
-    Get the columns which contain `decimal.Decimal` objects from a Pandas DataFrame.
+    Get the columns which contain `uuid.UUID` objects from a Pandas DataFrame.
 
     Parameters
     ----------
     df: pd.DataFrame
-        The DataFrame which may contain decimal objects.
+        The DataFrame which may contain UUID objects.
 
     Returns
     -------

{meerschaum-2.4.8 → meerschaum-2.4.10}/meerschaum/utils/formatting/_pipes.py

@@ -276,10 +276,10 @@ def pprint_pipe_columns(
 
 
 def pipe_repr(
-        pipe: mrsm.Pipe,
-        as_rich_text: bool = False,
-        ansi: Optional[bool] = None,
-    ) -> Union[str, 'rich.text.Text']:
+    pipe: mrsm.Pipe,
+    as_rich_text: bool = False,
+    ansi: Optional[bool] = None,
+) -> Union[str, 'rich.text.Text']:
     """
     Return a formatted string for representing a `meerschaum.Pipe`.
     """

{meerschaum-2.4.8 → meerschaum-2.4.10}/meerschaum/utils/misc.py

@@ -390,10 +390,10 @@ def flatten_pipes_dict(pipes_dict: PipesDict) -> List[Pipe]:
 
 
 def round_time(
-        dt: Optional[datetime] = None,
-        date_delta: Optional[timedelta] = None,
-        to: 'str' = 'down'
-    ) -> datetime:
+    dt: Optional[datetime] = None,
+    date_delta: Optional[timedelta] = None,
+    to: 'str' = 'down'
+) -> datetime:
     """
     Round a datetime object to a multiple of a timedelta.
     http://stackoverflow.com/questions/3463930/how-to-round-the-minute-of-a-datetime-object-python

{meerschaum-2.4.8 → meerschaum-2.4.10/meerschaum.egg-info}/PKG-INFO

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