datedict 0.1.6__tar.gz → 0.1.7__tar.gz

{datedict-0.1.6 → datedict-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datedict
-Version: 0.1.6
+Version: 0.1.7
 Summary: DateDict and YearDict: date-aware dictionary structures
 Project-URL: Homepage, https://gitlab.com/grisus/datedict
 Project-URL: Issues, https://gitlab.com/grisus/datedict/-/issues

{datedict-0.1.6 → datedict-0.1.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "datedict"
-version = "0.1.6"
+version = "0.1.7"
 description = "DateDict and YearDict: date-aware dictionary structures"
 readme = "README.md"
 requires-python = ">=3.10"

{datedict-0.1.6 → datedict-0.1.7}/src/datedict/DateDict.py

@@ -27,21 +27,24 @@ class DateDict:
         self.start_date, self.end_date = dates[0], dates[-1]
         self.data: dict[str, Decimal] = {k: to_decimal(v) for k, v in data.items()}
 
-    def fill(self, start_date, end_date, value: Decimable) -> "DateDict":
+    def fill(
+        self, start_date: str | date, end_date: str | date, value: Decimable
+    ) -> "DateDict":
         """
         Create a new graph with a specified range and value.
         The range is defined by start_date and end_date.
         """
+        start = (
+            start_date
+            if isinstance(start_date, date)
+            else date.fromisoformat(start_date)
+        )
+        end = end_date if isinstance(end_date, date) else date.fromisoformat(end_date)
         v = to_decimal(value)
         return DateDict(
             {
-                (date.fromisoformat(start_date) + timedelta(days=i)).strftime(
-                    "%Y-%m-%d"
-                ): v
-                for i in range(
-                    (date.fromisoformat(end_date) - date.fromisoformat(start_date)).days
-                    + 1
-                )
+                (start + timedelta(days=i)).strftime("%Y-%m-%d"): v
+                for i in range((end - start).days + 1)
             }
         )
 
@@ -118,25 +121,36 @@ class DateDict:
         )
 
     def sum(
-        self: "DateDict", start: str | None = None, end: str | None = None
+        self: "DateDict",
+        start_date: str | date | None = None,
+        end_date: str | date | None = None,
     ) -> Decimal:
         """
         Return the sum of values in the specified range.
         If a value is NaN, it is treated as zero.
         """
-        s = self.start_date if start is None else start
-        e = self.end_date if end is None else end
+        start = (
+            date.fromisoformat(self.start_date)
+            if start_date is None
+            else (
+                start_date
+                if isinstance(start_date, date)
+                else date.fromisoformat(start_date)
+            )
+        )
+        end = (
+            date.fromisoformat(self.end_date)
+            if end_date is None
+            else (
+                end_date if isinstance(end_date, date) else date.fromisoformat(end_date)
+            )
+        )
         return sum(
             [
                 (self.get(k, ZERO))
                 for k in map(
                     lambda x: x.strftime("%Y-%m-%d"),
-                    [
-                        date.fromisoformat(s) + timedelta(days=i)
-                        for i in range(
-                            (date.fromisoformat(e) - date.fromisoformat(s)).days + 1
-                        )
-                    ],
+                    [start + timedelta(days=i) for i in range((end - start).days + 1)],
                 )
             ],
             ZERO,