adiumentum 0.3.0__tar.gz → 0.3.2__tar.gz

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

@@ -1,13 +1,12 @@
 Metadata-Version: 2.3
 Name: adiumentum
-Version: 0.3.0
+Version: 0.3.2
 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.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "adiumentum"
-version = "0.3.0"
+version = "0.3.2"
 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.2/src/adiumentum/paths_manager.py

@@ -0,0 +1,67 @@
+from abc import ABC, abstractmethod
+from pathlib import Path
+from typing import Self
+
+from pydantic import BaseModel
+
+
+# class PathsManager:
+#     @abstractmethod
+#     def setup(self) -> None: ...
+
+#     @classmethod
+#     @abstractmethod
+#     def auto(cls, root_dir: Path): ...
+
+#     @classmethod
+#     @abstractmethod
+#     def read(cls, config_file_path: Path) -> Self: ...
+
+#     @abstractmethod
+#     def write(self, config_file_path: Path) -> None: ...
+
+
+
+class PathsManager(BaseModel, ABC):
+    @abstractmethod
+    @classmethod
+    def create(cls, *args, **kwargs) -> Self:
+        """
+        Create directories first if they do not already exist.
+        """
+        ...
+
+    @abstractmethod
+    @classmethod
+    def auto(cls, root_dir: Path, **kwargs) -> Self:
+        """
+        Create directories and files in the default location if they do not alreay exist.
+        """
+        ...
+
+
+    @abstractmethod
+    @classmethod
+    def read(cls, config_file_path: Path) -> Self:
+        ...
+    
+    @abstractmethod
+    def write(self, config_file_path: Path) -> None:
+        ...
+
+    @staticmethod
+    def ensure_file_exists(p: Path, content_if_empty: str = "") -> Path:
+        if not p.exists():
+            p.touch()
+            if content_if_empty:
+                p.write_text(content_if_empty)
+        return p
+
+    @staticmethod
+    def ensure_directory_exists(p: Path) -> Path:
+        for parent in p.parents:
+            if not parent.exists():
+                parent.mkdir()
+        if not p.exists():
+            p.mkdir()
+        return p

{adiumentum-0.3.0 → adiumentum-0.3.2}/src/adiumentum/pydantic_extensions.py

@@ -97,13 +97,14 @@ class AbstractCustom(ABC):
         return set()
 
     @classmethod
-    @abstractmethod
-    def model_construct(cls, _fields_set: set[str] | None = None, **values: Any) -> Self: ...
+    def model_construct(cls, _fields_set: set[str] | None = None, **values: Any) -> Self:
+        raise NotImplementedError
 
-    @abstractmethod
     def model_copy(
         self, *, update: Mapping[str, Any] | None = None, deep: bool = False
-    ) -> Self: ...
+    ) -> Self:
+        return self.__class__.model_validate(self.model_dump())
+        
 
     def model_dump(
         self,
@@ -275,10 +276,10 @@ class AbstractCustom(ABC):
         return self.get_adapter().__annotations__
 
     @classmethod
-    def read(cls, read_path: Path) -> Self:
+    def read_json_file(cls, read_path: Path) -> Self:
         return cls.model_validate_json(read_path.read_text())
 
-    def write(self, write_path: Path) -> None:
+    def write_json_file(self, write_path: Path) -> None:
         write_json(cast(JSONDict, self.model_dump(mode="json")), write_path)
 
     @staticmethod

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

adiumentum-0.3.0/src/adiumentum/paths_manager.py

@@ -1,19 +0,0 @@
-from abc import abstractmethod
-from pathlib import Path
-from typing import Self
-
-
-class PathsManager:
-    @abstractmethod
-    def setup(self) -> None: ...
-
-    @classmethod
-    @abstractmethod
-    def auto(cls, root_dir: Path): ...
-
-    @classmethod
-    @abstractmethod
-    def read(cls, config_file_path: Path) -> Self: ...
-
-    @abstractmethod
-    def write(self, config_file_path: Path) -> None: ...