adiumentum 0.3.0__py3-none-any.whl → 0.3.1__py3-none-any.whl

adiumentum/string_utils.py

@@ -1,20 +1,40 @@
 import json
 import re
 from collections.abc import Callable, Iterable
-from typing import Literal, TypeAlias, cast
-
-from datethyme import Date, Time
+from typing import Literal, Protocol, Self, TypeAlias, cast
 
 from .functional import lmap
 from .typing_utils import JSONDict, areinstances
 
+class DateProtocol(Protocol):
+    year: int
+    month: int
+    day: int
+
+    @classmethod
+    def parse(cls, date_string: str) -> Self: ...
+
+    def __str__(self) -> str: ...
+
+
+class TimeProtocol(Protocol):
+    hour: int
+    minute: int
+    second: float
+
+    @classmethod
+    def parse(cls, time_string: str) -> Self: ...
+
+    def __str__(self) -> str: ...
+
+
 MixedValidated: TypeAlias = (
     str
     | bool
     | int
     | float
-    | Time
-    | Date
+    | TimeProtocol
+    | DateProtocol
     | tuple[str, ...]
     | tuple[str, str]
     | tuple[float, float]
@@ -135,10 +155,10 @@ def cast_to_negative_score(s: str | bool) -> float:
     return score
 
 
-def cast_to_Date(s: str | bool) -> Date:
+def cast_to_date(s: str | bool, date_class: type[DateProtocol]) -> DateProtocol:
     if isinstance(s, bool):
         raise TypeError
-    return Date.model_validate(s)
+    return date_class.parse(s)
 
 
 def cast_to_stringtuple(s: str | bool) -> tuple[str, ...]:
@@ -160,10 +180,10 @@ def cast_as(
         "integer": cast_to_int,
         "float": cast_to_float,
         "minutes": cast_to_minutes,
-        "time": Time.model_validate,
+        # "time": Time.model_validate, TODO: add later via injection
         "positiveScore": cast_to_positive_score,
         "negativeScore": cast_to_negative_score,
-        "date": cast_to_Date,
+        # "date": cast_to_date, TODO: add later via injection
         "stringtuple": cast_to_stringtuple,
     }
     caster = dispatch[input_type]

{adiumentum-0.3.0.dist-info → adiumentum-0.3.1.dist-info}/METADATA

@@ -1,13 +1,12 @@
 Metadata-Version: 2.3
 Name: adiumentum
-Version: 0.3.0
+Version: 0.3.1
 Summary: 
 Author: Isaac Riley
 Author-email: Isaac Riley <yelircaasi@proton.me>
 Requires-Dist: pydantic>=2.11
 Requires-Dist: multipledispatch>=1
 Requires-Dist: loguru>=0.7.3
-Requires-Dist: datethyme>=0.4.0
 Requires-Python: >=3.11, <3.15
 Description-Content-Type: text/markdown
 

{adiumentum-0.3.0.dist-info → adiumentum-0.3.1.dist-info}/RECORD

@@ -17,10 +17,10 @@ adiumentum/paths_manager.py,sha256=7098bf8bd71cbe93eb60eb8c145a3f02d3e3470c2f236
 adiumentum/performance_logging.py,sha256=bd0c42337fb5c77921700e5487d366ea103e8cd25825138962bfb44c1b54773b,1471
 adiumentum/pydantic_extensions.md,sha256=6f5fe7fc9f10e0f6a87e2861dd16d066892099542dbaca3764944c6a27635706,24936
 adiumentum/pydantic_extensions.py,sha256=8e49c80f4be42b71986ec93195172af2d83986598de3f1bffe4c64505dc03729,12599
-adiumentum/string_utils.py,sha256=88b6389b2cb8ed9a3d65c5ea506ffe852cff480ac287ecdc399dec1e45095a58,4862
+adiumentum/string_utils.py,sha256=459576481a67d1f078ffcbb0606ba235d0694cb0911905174239312224953f66,5321
 adiumentum/timestamping.py,sha256=87729ac9dd7dac614fbb7bb1995e321bd860202a4c2f435e044f4af23dd545a0,556
 adiumentum/typing_utils.py,sha256=81e01e90a60fe397c5211493fb4446af5f59fbd4b364c98f377962f4bd67ff8b,3894
-adiumentum-0.3.0.dist-info/WHEEL,sha256=ab6157bc637547491fb4567cd7ddf26b04d63382916ca16c29a5c8e94c9c9ef7,79
-adiumentum-0.3.0.dist-info/entry_points.txt,sha256=8d158243687a1102f915d2091f19bdc1443ec58709954317c4edff9edb9e5be8,57
-adiumentum-0.3.0.dist-info/METADATA,sha256=9e6fb8f1c191d51f594457019bfc06043d6754b93ef6c7c1f82925d22eaeae2e,1136
-adiumentum-0.3.0.dist-info/RECORD,,
+adiumentum-0.3.1.dist-info/WHEEL,sha256=ab6157bc637547491fb4567cd7ddf26b04d63382916ca16c29a5c8e94c9c9ef7,79
+adiumentum-0.3.1.dist-info/entry_points.txt,sha256=8d158243687a1102f915d2091f19bdc1443ec58709954317c4edff9edb9e5be8,57
+adiumentum-0.3.1.dist-info/METADATA,sha256=ca600da9feaa1c5346895161b9cd661cf894e05b2e8b601b6e082165a32c6afc,1104
+adiumentum-0.3.1.dist-info/RECORD,,