meerschaum 2.6.4__tar.gz → 2.6.5__tar.gz

{meerschaum-2.6.4/meerschaum.egg-info → meerschaum-2.6.5}/PKG-INFO

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

{meerschaum-2.6.4 → meerschaum-2.6.5}/meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "2.6.4"
+__version__ = "2.6.5"

{meerschaum-2.6.4 → meerschaum-2.6.5}/meerschaum/core/Pipe/_data.py

@@ -737,6 +737,8 @@ def parse_date_bounds(self, *dt_vals: Union[datetime, int, None]) -> Union[
 
         dt_col = self.columns.get('datetime', None)
         dt_typ = str(self.dtypes.get(dt_col, 'datetime64[ns, UTC]'))
+        if dt_typ == 'datetime':
+            dt_typ = 'datetime64[ns, UTC]'
         return coerce_timezone(dt_val, strip_utc=('utc' not in dt_typ.lower()))
 
     bounds = tuple(_parse_date_bound(dt_val) for dt_val in dt_vals)

{meerschaum-2.6.4 → meerschaum-2.6.5/meerschaum.egg-info}/PKG-INFO

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

{meerschaum-2.6.4 → meerschaum-2.6.5}/tests/test_pipes_dtypes.py

@@ -136,10 +136,10 @@ def test_force_json_dtype(flavor: str):
     conn = conns[flavor]
     pipe = Pipe('foo', 'bar', session_id, instance=conn, dtypes={'a': 'json'})
     _ = pipe.delete(debug=debug)
-    pipe = Pipe('foo', 'bar', session_id, instance=conn, dtypes={'a': 'json'})
+    pipe = Pipe('foo', 'bar', session_id, instance=conn, dtypes={'a': 'json'}, columns=['id'])
     success, msg = pipe.sync([
-        {'a': json.dumps(['b', 'c'])},
-        {'a': json.dumps({'b': 1})},
+        {'id': 1, 'a': json.dumps(['b', 'c'])},
+        {'id': 2, 'a': json.dumps({'b': 1})},
     ])
     assert success, msg
     pprint(pipe.get_columns_types())
@@ -171,10 +171,10 @@ def test_infer_numeric_dtype(flavor: str):
     conn = conns[flavor]
     pipe = Pipe('infer', 'numeric', instance=conn)
     _ = pipe.delete(debug=debug)
-    pipe = Pipe('infer', 'numeric', instance=conn)
+    pipe = Pipe('infer', 'numeric', instance=conn, columns=['id'])
     success, msg = pipe.sync([
-        {'a': Decimal('1')},
-        {'a': Decimal(numeric_str)},
+        {'id': 1, 'a': Decimal('1')},
+        {'id': 2, 'a': Decimal(numeric_str)},
     ])
     assert success, msg
     pprint(pipe.get_columns_types())
@@ -195,11 +195,11 @@ def test_infer_uuid_dtype(flavor: str):
     conn = conns[flavor]
     pipe = Pipe('infer', 'uuid', instance=conn)
     _ = pipe.delete(debug=debug)
-    pipe = Pipe('infer', 'uuid', instance=conn)
+    pipe = Pipe('infer', 'uuid', instance=conn, columns=['id'])
     uuid_str = "e6f3a4ea-f1af-4e93-8da9-716b57672206"
     success, msg = pipe.sync(
         [
-            {'a': UUID(uuid_str)},
+            {'id': 1, 'a': UUID(uuid_str)},
         ],
         debug=debug,
     )
@@ -222,10 +222,10 @@ def test_infer_numeric_from_mixed_types(flavor: str):
     conn = conns[flavor]
     pipe = Pipe('foo', 'bar', session_id, instance=conn)
     _ = pipe.delete(debug=debug)
-    pipe = Pipe('foo', 'bar', session_id, instance=conn)
-    success, msg = pipe.sync([{'a': 1}])
+    pipe = Pipe('foo', 'bar', session_id, instance=conn, columns=['id'])
+    success, msg = pipe.sync([{'id': 1, 'a': 1}])
     assert success, msg
-    success, msg = pipe.sync([{'a': 2.1}])
+    success, msg = pipe.sync([{'id': 2, 'a': 2.1}])
     assert success, msg
     pprint(pipe.get_columns_types())
     df = pipe.get_data(debug=debug)
@@ -247,10 +247,10 @@ def test_force_numeric_dtype(flavor: str):
     conn = conns[flavor]
     pipe = Pipe('foo', 'bar', session_id, instance=conn, dtypes={'a': 'numeric'})
     _ = pipe.delete(debug=debug)
-    pipe = Pipe('foo', 'bar', session_id, instance=conn, dtypes={'a': 'numeric'})
+    pipe = Pipe('foo', 'bar', session_id, instance=conn, dtypes={'a': 'numeric'}, columns=['id'])
     success, msg = pipe.sync([
-        {'a': '1'},
-        {'a': '2.1'},
+        {'id': 1, 'a': '1'},
+        {'id': 2, 'a': '2.1'},
     ])
     assert success, msg
     pprint(pipe.get_columns_types())
@@ -747,3 +747,53 @@ def test_mixed_timezone_aware_and_naive(flavor: str):
     df = pipe.get_data(begin='2024-01-01 05:00:00+00:00', debug=debug)
     assert len(df) == 1
     assert df['val'][0] == 4
+
+
+@pytest.mark.parametrize("flavor", get_flavors())
+def test_parse_date_bounds(flavor: str):
+    """
+    Test that datetime bounds are parsed correctly.
+    """
+    conn = conns[flavor]
+    pipe = mrsm.Pipe('test', 'parse_date_bounds', 'tz', instance=conn)
+    pipe.delete()
+    pipe = mrsm.Pipe('test', 'parse_date_bounds', 'tz', instance=conn, columns={'datetime': 'ts'})
+    success, msg = pipe.sync([{'ts': '2024-01-01'}], debug=debug)
+    assert success, msg
+
+    naive_begin = datetime(2024, 1, 1)
+    naive_end = datetime(2024, 1, 2)
+    aware_begin = datetime(2024, 1, 1, tzinfo=timezone.utc)
+    aware_end = datetime(2024, 2, 1, tzinfo=timezone.utc)
+
+    begin, end = pipe.parse_date_bounds(naive_begin, naive_end)
+    assert begin.tzinfo is not None
+    assert end.tzinfo is not None
+    begin, end = pipe.parse_date_bounds(aware_begin, aware_end)
+    assert begin.tzinfo is not None
+    assert end.tzinfo is not None
+    begin, end = pipe.parse_date_bounds(naive_begin, aware_end)
+    assert begin.tzinfo is not None
+    assert end.tzinfo is not None
+
+    pipe = mrsm.Pipe('test', 'parse_date_bounds', 'naive', instance=conn)
+    pipe.delete()
+    pipe = mrsm.Pipe(
+        'test', 'parse_date_bounds', 'naive',
+        instance=conn,
+        columns={'datetime': 'ts'},
+        dtypes={'ts': 'datetime64[ns]'},
+    )
+
+    success, msg = pipe.sync([{'ts': '2024-01-01'}], debug=debug)
+    assert success, msg
+
+    begin, end = pipe.parse_date_bounds(naive_begin, naive_end)
+    assert begin.tzinfo is None
+    assert end.tzinfo is None
+    begin, end = pipe.parse_date_bounds(aware_begin, aware_end)
+    assert begin.tzinfo is None
+    assert end.tzinfo is None
+    begin, end = pipe.parse_date_bounds(naive_begin, aware_end)
+    assert begin.tzinfo is None
+    assert end.tzinfo is None