adiumentum 0.3.0__tar.gz → 0.3.1__tar.gz

{adiumentum-0.3.0 → adiumentum-0.3.1}/PKG-INFO

@@ -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 → adiumentum-0.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "adiumentum"
-version = "0.3.0"
+version = "0.3.1"
 description = ""
 authors = [{name = "Isaac Riley", email = "yelircaasi@proton.me"}]
 readme = "README.md"
@@ -9,7 +9,6 @@ dependencies = [
     "pydantic         >= 2.11 ",
     "multipledispatch >= 1    ",
     "loguru           >= 0.7.3",
-    "datethyme        >= 0.4.0",
 ]
 
 [project.scripts]

{adiumentum-0.3.0 → adiumentum-0.3.1}/src/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]