dataiter 1.1__tar.gz → 1.2__tar.gz

{dataiter-1.1 → dataiter-1.2}/.gitignore

@@ -1,5 +1,6 @@
 *.lprof
 *.prof
+.claude
 .env
 .envrc
 .pytest_cache

{dataiter-1.1 → dataiter-1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dataiter
-Version: 1.1
+Version: 1.2
 Summary: Simple, light-weight data frames for Python
 Project-URL: Homepage, https://github.com/otsaloma/dataiter
 Author-email: Osmo Salomaa <otsaloma@iki.fi>

{dataiter-1.1 → dataiter-1.2}/dataiter/__init__.py

@@ -25,7 +25,7 @@ import numpy as np
 
 from dataiter import util
 
-__version__ = "1.1"
+__version__ = "1.2"
 
 DEFAULT_PEEK_ELEMENTS = 10
 DEFAULT_PEEK_ITEMS = 3

{dataiter-1.1 → dataiter-1.2}/dataiter/aggregate.py

@@ -25,7 +25,6 @@ import functools
 import numpy as np
 import statistics
 
-from collections import Counter
 from dataiter import deco
 from dataiter import Vector
 
@@ -403,36 +402,30 @@ def mode(x, *, drop_na=True):
         aggregate.group_aware = True
         return aggregate
     x = handle_na(x, drop_na)
-    return mode1(x) if len(x) >= 1 else x.na_value
+    return statistics.mode(x) if len(x) >= 1 else x.na_value
 
 @deco.listify
 def mode_apply(x, group, drop_na):
     for xg in yield_groups(x, group, drop_na):
-        yield mode1(xg) if len(xg) >= 1 else None
+        yield statistics.mode(xg) if len(xg) >= 1 else None
 
 @njit(cache=dataiter.USE_NUMBA_CACHE)
 def mode_apply_numba(x, group, drop_na):
     out = []
     for xg in yield_groups_numba(x, group, drop_na):
         if len(xg) > 0:
-            ng = np.full(len(xg), 0)
+            best_found = xg[0]
+            best_count = 1
             for i in range(len(xg)):
-                for j in range(len(xg)):
-                    if xg[j] == xg[i]:
-                        ng[i] += 1
-            out.append(xg[np.argmax(ng)])
+                count = np.sum(xg == xg[i])
+                if count > best_count:
+                    best_found = xg[i]
+                    best_count = count
+            out.append(best_found)
         else:
             out.append(None)
     return out
 
-def mode1(x):
-    try:
-        return statistics.mode(x)
-    except statistics.StatisticsError:
-        # Python < 3.8 with several elements tied for mode.
-        # Return the first encountered of the tied elements.
-        return Counter(x).most_common(1)[0][0]
-
 @composite
 def nth(x, index, *, drop_na=False):
     """

{dataiter-1.1 → dataiter-1.2}/dataiter/data_frame.py

@@ -396,7 +396,12 @@ class DataFrame(dict):
         >>> data = di.read_csv("data/listings.csv")
         >>> data.count("hood")
         """
-        return self.copy().group_by(*colnames).aggregate(n=dataiter.count())
+        stat = self.copy().group_by(*colnames).aggregate(_n_=dataiter.count())
+        if (name := "n") in stat:
+            while name in stat: name += "_"
+            stat = stat.rename(**{name: "n"})
+        stat.n = stat.pop("_n_")
+        return stat
 
     def deepcopy(self):
         """
@@ -1258,9 +1263,9 @@ class DataFrame(dict):
                     batch_rows[i] += " "
                     batch_rows[i] += column[i]
                 del columns[colname]
-            rows_to_print.append("" if rows_to_print else ".")
+            rows_to_print.append("" if rows_to_print else "")
             rows_to_print += batch_rows
-        rows_to_print.append(".")
+        rows_to_print.append("")
         if max_rows < self.nrow:
             rows_to_print.append(f"... {self.nrow} rows total")
         return "\n".join(rows_to_print)

{dataiter-1.1 → dataiter-1.2}/dataiter/dt.py

@@ -74,6 +74,19 @@ def hour(x):
     """
     return _pull_int(x, lambda y: y.hour)
 
+def isoformat(x):
+    """
+    Return datetime `x` as a string in ISO 8601 format.
+
+    For dates, return `YYYY-MM-DD`, for datetimes `YYYY-MM-DDTHH:MM:SS.ffffff`.
+
+    >>> x = dt.new([dt.today()])
+    >>> dt.isoformat(x)
+    >>> y = dt.new([dt.now()])
+    >>> dt.isoformat(y)
+    """
+    return _pull_str(x, lambda x: x.isoformat())
+
 def isoweek(x):
     """
     Extract ISO 8601 week from datetime `x`.

{dataiter-1.1 → dataiter-1.2}/dataiter/test/test_aggregate.py

@@ -171,6 +171,8 @@ class TestAggregate:
                 assert stat.a.equal(expected)
             except AssertionError:
                 print("")
+                print("Function:", function.__name__)
+                print("Numba:", use_numba)
                 print(data)
                 print("Expected:")
                 print(expected)

{dataiter-1.1 → dataiter-1.2}/dataiter/test/test_data_frame.py

@@ -229,6 +229,15 @@ class TestDataFrame:
         assert stat.hood.equal(data.hood.unique().sort())
         assert stat.n.sum() == data.nrow
 
+    def test_count_n_exists(self):
+        data = test.data_frame("listings.csv")
+        stat1 = data.count("zipcode")
+        stat2 = data.count("zipcode").count("n")
+        assert stat1.colnames == ["zipcode", "n"]
+        assert stat2.colnames == ["n_", "n"]
+        assert stat2.nrow == len(stat1.n.unique())
+        assert sum(stat2.n) == stat1.nrow
+
     def test_deepcopy(self):
         orig = test.data_frame("vehicles.csv")
         data = orig.copy()

{dataiter-1.1 → dataiter-1.2}/dataiter/test/test_dt.py

@@ -62,6 +62,22 @@ class TestDT:
         a = dt.new(["2022-10-15T12:34:56", NaT])
         assert dt.hour(a).tolist() == [12, None]
 
+    def test_isoformat_date(self):
+        a = np.array(["2022-10-15", NaT], np.datetime64)
+        assert dt.isoformat(a).tolist() == ["2022-10-15", None]
+
+    def test_isoformat_date_scalar(self):
+        x = np.datetime64("2022-10-15")
+        assert dt.isoformat(x) == "2022-10-15"
+
+    def test_isoformat_datetime(self):
+        a = np.array(["2022-10-15T12:34:56.789", NaT], np.datetime64)
+        assert dt.isoformat(a).tolist() == ["2022-10-15T12:34:56.789000", None]
+
+    def test_isoformat_datetime_scalar(self):
+        x = np.datetime64("2022-10-15T12:34:56.789")
+        assert dt.isoformat(x) == "2022-10-15T12:34:56.789000"
+
     def test_isoweek(self):
         a = dt.new(["2022-10-15", NaT])
         assert dt.isoweek(a).tolist() == [41, None]