none-shall-parse 0.4.8__py3-none-any.whl → 0.6.0__py3-none-any.whl

none_shall_parse/dates.py

@@ -3,7 +3,7 @@ import logging
 import time
 from datetime import date, datetime
 from typing import Callable, Any, Tuple, Sequence, List
-from .types import DateTimeLike
+from .types import DateTimeLike, DateTimeOrDateLike
 
 import pendulum
 from pendulum import DateTime, Date
@@ -417,7 +417,7 @@ def month_span(mso: int) -> Callable[[DateTimeLike], Tuple[DateTime, DateTime]]:
     return find_dates
 
 
-def arb_span(dates: Sequence[str | DateTimeLike], naive: bool = False) -> Callable[
+def arb_span(dates: Sequence[str | DateTimeOrDateLike], naive: bool = False) -> Callable[
     [Any], Tuple[DateTime, DateTime]]:
     """
     Parses two given dates and returns a callable function that provides the date range
@@ -452,15 +452,20 @@ def arb_span(dates: Sequence[str | DateTimeLike], naive: bool = False) -> Callab
 
                 parsed_dates.append(parsed.start_of('day'))
             else:
-                # It's already a datetime
-                if date.tzinfo is None:
-                    # Input is naive, keep it naive using pendulum.naive()
-                    parsed = pendulum.naive(date.year, date.month, date.day,
-                                            date.hour, date.minute, date.second,
-                                            date.microsecond)
+                # It's already a datetime-like object
+                if isinstance(date, datetime):
+                    # datetime objects have tzinfo, hour, minute, etc.
+                    if date.tzinfo is None:
+                        # Input is naive, keep it naive using pendulum.naive()
+                        parsed = pendulum.naive(date.year, date.month, date.day,
+                                                date.hour, date.minute, date.second,
+                                                date.microsecond)
+                    else:
+                        # Input is timezone-aware, preserve it
+                        parsed = pendulum.instance(date)
                 else:
-                    # Input is timezone-aware, preserve it
-                    parsed = pendulum.instance(date)
+                    # date objects (no time component, no tzinfo) - treat as naive
+                    parsed = pendulum.naive(date.year, date.month, date.day)
 
                 parsed_dates.append(parsed.start_of('day'))
 
@@ -518,13 +523,21 @@ def unroll_span_func(
         DateUtilsError: If the date range cannot be processed due to invalid dates or formatting.
     """
     cover = pendulum.now() if cover is None else cover
-    naive = cover.tzinfo is None
+
     try:
         start, end = f(cover)
         start = pendulum.instance(start)
-        start = start.naive() if naive else start
         end = pendulum.instance(end)
-        end = end.naive() if naive else end
+
+        # Determine naiveness from the dates returned by f, not from cover
+        naive = start.tzinfo is None
+        if naive:
+            start = start.naive()
+            end = end.naive()
+
+        # Get actual current time for filtering future dates (always "now", not cover)
+        current_date_sentinel = pendulum.now().naive() if naive else pendulum.now()
+
     except Exception as e:
         raise DateUtilsError(f"Function f failed to compute date range: {str(e)}")
 
@@ -537,9 +550,11 @@ def unroll_span_func(
         ord_days = []
         iso_date_strings = []
         for dt in interval.range(unit="days"):
-            date_range.append(dt)
-            ord_days.append(dt.day_of_year)
-            iso_date_strings.append(dt.format('YYYY-MM-DD'))
+            # Filter: only include dates up to today (not future dates)
+            if dt <= current_date_sentinel and dt < end:
+                date_range.append(dt)
+                ord_days.append(dt.day_of_year)
+                iso_date_strings.append(dt.format('YYYY-MM-DD'))
 
         return date_range, ord_days, iso_date_strings, start, end
 

{none_shall_parse-0.4.8.dist-info → none_shall_parse-0.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: none-shall-parse
-Version: 0.4.8
+Version: 0.6.0
 Summary: Trinity Shared Python utilities.
 Author: Andries Niemandt, Jan Badenhorst
 Author-email: Andries Niemandt <andries.niemandt@trintel.co.za>, Jan Badenhorst <jan@trintel.co.za>

{none_shall_parse-0.4.8.dist-info → none_shall_parse-0.6.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
 none_shall_parse/__init__.py,sha256=ekNMvJaRzR-SOv2bQAOuH86ImPHXGpIj2NbeCO45GOc,3897
-none_shall_parse/dates.py,sha256=16vvvdkTyrxFe9DsV5e2keOQ_xlp1dnb2Oi6i-co6z8,27071
+none_shall_parse/dates.py,sha256=MeBc_Z4rNloTqUkUq9RLfuKg3gkj7SAdlzJM-gHUwL8,27824
 none_shall_parse/imeis.py,sha256=20pONoUhLKomZxAJegqSSjG72hZjYs60r8IcaRt-15M,6770
 none_shall_parse/lists.py,sha256=PKtYD8H1Z7MqbJQ5eFpsK_jgexLwiratMJiYeRMiOwc,1701
 none_shall_parse/parse.py,sha256=77bXZAtwFksRwuZ9Ax0lPxEjFpyjkQBqRa5mBc1WkF4,6843
 none_shall_parse/strings.py,sha256=F7491CJAHJjL7vdEGwoH_4S6PjaovYUS_yzVGJ-bYIE,8463
 none_shall_parse/types.py,sha256=WAgILMtW2_fm9MBpUuQvq68yXYBNd3rnSoQk70ibOd4,1320
-none_shall_parse-0.4.8.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-none_shall_parse-0.4.8.dist-info/METADATA,sha256=vBHgaT1rvFVt9nv85G4Af-R0wqDM7cAHGSWVE-DMKv8,1701
-none_shall_parse-0.4.8.dist-info/RECORD,,
+none_shall_parse-0.6.0.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+none_shall_parse-0.6.0.dist-info/METADATA,sha256=xe3e8WZa_AyId0ml5x-O05AaHloy1fkqgYRDLDSGyBQ,1701
+none_shall_parse-0.6.0.dist-info/RECORD,,