meerschaum 2.4.8__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/config/_version.py

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

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,
                 )
 
 
@@ -2187,6 +2187,8 @@ def get_pipe_rowcount(
         FROM ({src}) AS src
         """
     )
+    print(f"{begin=}")
+    print(f"{end=}")
     if begin is not None or end is not None:
         query += "WHERE"
     if begin is not None:

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/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/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/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.dist-info → meerschaum-2.4.9.dist-info}/METADATA

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

{meerschaum-2.4.8.dist-info → meerschaum-2.4.9.dist-info}/RECORD

@@ -4,7 +4,7 @@ meerschaum/_internal/__init__.py,sha256=ilC7utfKtin7GAvuN34fKyUQYfPyqH0Mm3MJF5iy
 meerschaum/_internal/entry.py,sha256=5vBZxQbtN0l9lia9HcvvLVWDCpSeThg-505dGhKiOBo,12234
 meerschaum/_internal/arguments/__init__.py,sha256=_nSKKVLXNsJeSv-buxEZsx8_c0BAbkhRyE4nT6Bv6q0,541
 meerschaum/_internal/arguments/_parse_arguments.py,sha256=602U0rQrKKGfJQYY_c13GcCD0avjOa44c5GoqIAD_iE,15805
-meerschaum/_internal/arguments/_parser.py,sha256=LfiVDTr1akj5D31qpJAAXKxMcnLQiD3jRpZtvvHWrAo,14917
+meerschaum/_internal/arguments/_parser.py,sha256=l2RYIn-1MEpjyUz2yczkeeuwg2liYaO2MNvEZ4Amk1o,16364
 meerschaum/_internal/docs/__init__.py,sha256=ZQYHWo6n0kfLLkyG36YXqTYvv2Pc7it5HZHMylT6cBA,126
 meerschaum/_internal/docs/index.py,sha256=IBVotNZ6f9KTSefXq5cCikcZ7mnjDy98JOeb-KPLkyg,24514
 meerschaum/_internal/gui/__init__.py,sha256=KF6Opae0aBOjIndMZ2txoPs7ozCXRlR-lcTsicLO7fc,1313
@@ -41,7 +41,7 @@ meerschaum/actions/reload.py,sha256=gMXeFBGVfyQ7uhKhYf6bLaDMD0fLPcA9BrLBSiuvWIc,
 meerschaum/actions/restart.py,sha256=6ffp3-X9eTEgunVSdD41HnOwqp71yjuSAmXJ5j39ONI,3038
 meerschaum/actions/setup.py,sha256=KkAGWcgwzl_L6A19fTmTX1KtBjW2FwD8QenLjPy0mQQ,3205
 meerschaum/actions/sh.py,sha256=fLfTJaacKu4sjLTRqEzzYlT2WbbdZBEczsKb6F-qAek,2026
-meerschaum/actions/show.py,sha256=uNXOfh1Z44i6YpmAcE_uM_6s9r3lNh8CnstpvS6tTjE,28179
+meerschaum/actions/show.py,sha256=T8Ol1o-762cI9rlUzd-8svvwgT4slYXYfOPQETh9Koo,28446
 meerschaum/actions/sql.py,sha256=8BSvlnccfEqLrscLq67Toa5D4FJ7I598IdxEe_yzmV8,4263
 meerschaum/actions/stack.py,sha256=ZwrCTGJ0x3jjZkRieWcvqasQHYCqNtB1HYvTX-r3Z3g,5996
 meerschaum/actions/start.py,sha256=7B6zLHh-DNWnJta1h_RV9ccGJ4EnbEDu3k-GdwAsU8M,19208
@@ -142,7 +142,7 @@ meerschaum/config/_preprocess.py,sha256=-AEA8m_--KivZwTQ1sWN6LTn5sio_fUr2XZ51BO6
 meerschaum/config/_read_config.py,sha256=oxnLjuhy6JBBld886FkBX07wUdkpzEzTItYMUa9qw1Q,14688
 meerschaum/config/_shell.py,sha256=46_m49Txc5q1rGfCgO49ca48BODx45DQJi8D0zz1R18,4245
 meerschaum/config/_sync.py,sha256=jHcWRkxd82_BgX8Xo8agsWvf7BSbv3qHLWmYl6ehp_0,4242
-meerschaum/config/_version.py,sha256=1oWpjLUymKmrkEXNSCmeb0HaJEmpVYs4n7VzxwE3Z6M,71
+meerschaum/config/_version.py,sha256=htHEYhloxhFm_vcPba-bk08zxppyNo-i76pJPh7DqqI,71
 meerschaum/config/paths.py,sha256=JjibeGN3YAdSNceRwsd42aNmeUrIgM6ndzC8qZAmNI0,621
 meerschaum/config/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerschaum/config/stack/__init__.py,sha256=gGVxXgNnGb9u25iF__IiNPlZt1BLUVmHmFJ0jvnJg3Q,10548
@@ -175,7 +175,7 @@ meerschaum/connectors/sql/_cli.py,sha256=1SgnWeMIAihoxp4FzbNrcq1npXf0dSOQnCntpU9
 meerschaum/connectors/sql/_create_engine.py,sha256=pZPjy-ne8DtVfu-wqMJopIGkgm8vul-y3E9d4tUyTgM,10215
 meerschaum/connectors/sql/_fetch.py,sha256=NYYWDoEd-aGIS337KwH-D9_3KVWVCZOHAspGLfdEuUE,13086
 meerschaum/connectors/sql/_instance.py,sha256=zXPZnEqvOAeOUPMeh6CcfkB1pOjjwJxdUOwXccRbuwk,6465
-meerschaum/connectors/sql/_pipes.py,sha256=m82E9GdBxdfcYCtFWECqmC3HjaZ7Y5ukhQ9LBlEymc4,100605
+meerschaum/connectors/sql/_pipes.py,sha256=0XQo4RF2DjpPp6-KvdSjkMpKknWd68QnnhgjfrREBvE,100637
 meerschaum/connectors/sql/_plugins.py,sha256=wbxcNxqTtjfDsxPvdVGTllasYf6NHHzODaQ72hEUSBQ,8135
 meerschaum/connectors/sql/_sql.py,sha256=zEh6fbOLJhfLOF-4x9OTQ5Fi3NMSVES3oixmnGYcNG8,36381
 meerschaum/connectors/sql/_uri.py,sha256=0BrhQtqQdzg9mR04gWBZINs_BbPFtSlTECXT_TCUwik,3460
@@ -195,7 +195,7 @@ meerschaum/core/Pipe/_attributes.py,sha256=yAHYvizRSkqqkIRcaGAYvUjE2qe5H4xNKBmxU
 meerschaum/core/Pipe/_bootstrap.py,sha256=evyi07kkzAVMj66HfZkbYdcWk_oHUDsl6f13EnSPMYs,7723
 meerschaum/core/Pipe/_clear.py,sha256=yFAYQnDmL3m6DzyAutgnBDXSOL9gjIrLvlQXd86YFV0,2193
 meerschaum/core/Pipe/_copy.py,sha256=PcOeNUb0B4-HehTAAnBpjyT4uLLTR6VQOarY0SFA9wk,2912
-meerschaum/core/Pipe/_data.py,sha256=WduKc7hrO8wAnFQr5nA5o-BpF6G6_v0E7gJSRCgKv2I,22709
+meerschaum/core/Pipe/_data.py,sha256=Z4-B03-RP-PZtA9MnYe3-7oQSiNWTLRBwZsblvuXml4,22684
 meerschaum/core/Pipe/_deduplicate.py,sha256=ZiuYZBb6d8tUkgHp6Nj8Xle20u4sjxqW45Rk2N-up54,10191
 meerschaum/core/Pipe/_delete.py,sha256=1geNp9BgrocXP1gt76dMbnlJWKYFMuSNqPFA4K4-hXE,2118
 meerschaum/core/Pipe/_drop.py,sha256=gIKdHWm0RsIgC2nu768MtFnPbCXyiJjNxaiT1obyuIo,1036
@@ -218,10 +218,10 @@ meerschaum/plugins/__init__.py,sha256=trMQ53qgP7ikJhhV_uXzqJw6X1NDz2rPOGXFk40bb1
 meerschaum/plugins/bootstrap.py,sha256=qg9MQ1YAU8ShwGqWDl38WjiXLIxDPl95pSIGDLN9rOw,11423
 meerschaum/utils/__init__.py,sha256=QrK1K9hIbPCRCM5k2nZGFqGnrqhA0Eh-iSmCU7FG6Cs,612
 meerschaum/utils/_get_pipes.py,sha256=tu4xKPoDn79Dz2kWM13cXTP4DSCkn-3G9M8KiLftopw,11073
-meerschaum/utils/dataframe.py,sha256=G5rD3998mYAVeTlIat7gTPZKvhlpHSMvLo9EHTXocgM,41946
+meerschaum/utils/dataframe.py,sha256=qV_6ecpxMIZOoiUb0pIk8u5ZPBn-h6O1yS_DtdLFX_U,41937
 meerschaum/utils/debug.py,sha256=GyIzJmunkoPnOcZNYVQdT4Sgd-aOb5MI2VbIgATOjIQ,3695
 meerschaum/utils/interactive.py,sha256=t-6jWozXSqL7lYGDHuwiOjTgr-UKhdcg61q_eR5mikI,3196
-meerschaum/utils/misc.py,sha256=ws-8v7gvD2uwmdIDDSRSUVL10XV7YZGUCEFBllC-xbY,46365
+meerschaum/utils/misc.py,sha256=OijhS1TMjlqkDvahbxhqfUdo0Myeor-kTKrvqqG8wN0,46349
 meerschaum/utils/networking.py,sha256=Sr_eYUGW8_UV9-k9LqRFf7xLtbUcsDucODyLCRsFRUc,1006
 meerschaum/utils/pool.py,sha256=vkE42af4fjrTEJTxf6Ek3xGucm1MtEkpsSEiaVzNKHs,2655
 meerschaum/utils/process.py,sha256=o7UtTQX87YGkg2dItPhlvN7gNQPkElXTYSzKf5Ro8Uc,7474
@@ -242,7 +242,7 @@ meerschaum/utils/dtypes/__init__.py,sha256=LawV4XrCLZRhyGquUen3i0HvK2IRHG-Ud4MYi
 meerschaum/utils/dtypes/sql.py,sha256=K0pginy3U5UvgtM9af-HRoiqdvFlwiAmKNQBPGChIUA,16267
 meerschaum/utils/formatting/__init__.py,sha256=GLx3fvTQi7EnC9fo31WggpMRpmR7yTWIuZmHdZgqvuM,15370
 meerschaum/utils/formatting/_jobs.py,sha256=izsqPJhTtUkXUUtWnbXtReYsUYwulXtci3pBj72Ne64,6637
-meerschaum/utils/formatting/_pipes.py,sha256=wy0iWJFsFl3X2VloaiA_gp9Yx9w6tD3FQZvAQAqef4A,19492
+meerschaum/utils/formatting/_pipes.py,sha256=qud_zaGKP3gh-Z5BMYadwEKWSwzUyR44Jg1RGCzAsXI,19476
 meerschaum/utils/formatting/_pprint.py,sha256=tgrT3FyGyu5CWJYysqK3kX1xdZYorlbOk9fcU_vt9Qg,3096
 meerschaum/utils/formatting/_shell.py,sha256=OMFh3cSZNr83z8m265irkS_JtEWHwjkEY2ybnMIOllY,3774
 meerschaum/utils/packages/__init__.py,sha256=m3HLTkKJxXco1g-h75q2l5skBwKXWaJtNmfQOsijchI,63965
@@ -250,11 +250,11 @@ meerschaum/utils/packages/_packages.py,sha256=8Ox9fiQTVmmKAmlxZBV-7Wtq_jhPnnf3AM
 meerschaum/utils/packages/lazy_loader.py,sha256=VHnph3VozH29R4JnSSBfwtA5WKZYZQFT_GeQSShCnuc,2540
 meerschaum/utils/venv/_Venv.py,sha256=sBnlmxHdAh2bx8btfVoD79-H9-cYsv5lP02IIXkyECs,3553
 meerschaum/utils/venv/__init__.py,sha256=G3KXL4ByWNqVxBRLs_RaJbO3h3tOKXkazkAYuoUW568,24420
-meerschaum-2.4.8.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
-meerschaum-2.4.8.dist-info/METADATA,sha256=9y7GjQHhEDP9mdJWBFuIfZwZ7vtHV0N4Wk0MqF6xuDg,24819
-meerschaum-2.4.8.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
-meerschaum-2.4.8.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-meerschaum-2.4.8.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
-meerschaum-2.4.8.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
-meerschaum-2.4.8.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-meerschaum-2.4.8.dist-info/RECORD,,
+meerschaum-2.4.9.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
+meerschaum-2.4.9.dist-info/METADATA,sha256=Gb8bbSaia30M8sGjWj52E0DDAdgyELhNUA4yNlw8Mw0,24819
+meerschaum-2.4.9.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
+meerschaum-2.4.9.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+meerschaum-2.4.9.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
+meerschaum-2.4.9.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
+meerschaum-2.4.9.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+meerschaum-2.4.9.dist-info/RECORD,,