adiumentum 0.1.0__tar.gz → 0.1.1__tar.gz

{adiumentum-0.1.0 → adiumentum-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: adiumentum
-Version: 0.1.0
+Version: 0.1.1
 Summary: 
 Author: Isaac Riley
 Author-email: Isaac Riley <yelircaasi@proton.me>

{adiumentum-0.1.0 → adiumentum-0.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "adiumentum"
-version = "0.1.0"
+version = "0.1.1"
 description = ""
 authors = [{name = "Isaac Riley", email = "yelircaasi@proton.me"}]
 readme = "README.md"

{adiumentum-0.1.0 → adiumentum-0.1.1}/src/adiumentum/__init__.py

@@ -3,9 +3,9 @@ from .comparison import equal_within, nearly_equal
 from .exceptions import CustomValidationError
 from .file_modification_time import (
     first_newer,
-    get_time_created,
-    get_time_modified,
+    time_created,
     time_created_readable,
+    time_modified,
     time_modified_readable,
 )
 from .frozendict import FrozenDefaultDict
@@ -50,7 +50,7 @@ from .string import (
     indent_lines,
     parse_sequence,
 )
-from .timestamping import insert_timestamp
+from .timestamping import insert_timestamp, make_timestamp
 from .typing_utils import (
     areinstances,
     call_fallback_if_none,
@@ -80,8 +80,6 @@ __all__ = [
     "first_newer",
     "flexsplit",
     "fold_dictionaries",
-    "get_time_created",
-    "get_time_modified",
     "helper",
     "identity",
     "ihash",
@@ -92,6 +90,7 @@ __all__ = [
     "list_full",
     "lmap",
     "log_perf",
+    "make_timestamp",
     "mutates",
     "mutates_and_returns_instance",
     "mutates_instance",
@@ -105,7 +104,9 @@ __all__ = [
     "smap",
     "step_data",
     "step_transition",
+    "time_created",
     "time_created_readable",
+    "time_modified",
     "time_modified_readable",
     "tmap",
     "validator",

adiumentum-0.1.1/src/adiumentum/file_modification_time.py

@@ -0,0 +1,39 @@
+import os
+from datetime import datetime
+from pathlib import Path
+
+
+def time_created(path: Path | str) -> float:
+    return Path(path).stat().st_ctime
+
+
+def format_time(raw_time: float, places: int = 3) -> str:
+    dt = datetime.fromtimestamp(raw_time)
+    if places > 0:
+        idx: int | None = min(0, int(places) - 6) or None
+        return dt.strftime("%Y-%m-%d_%H:%M:%S.%f")[:idx]
+    return dt.strftime("%Y-%m-%d_%H:%M:%S")
+
+
+def time_created_readable(path: Path | str, places: int = 3) -> str:
+    # time_created: time.struct_time = time.strptime(time.ctime(time_created(path)))
+    return format_time(time_created(path), places=places)
+
+
+def time_modified(path: Path | str) -> float:
+    return Path(path).stat().st_mtime
+
+
+def time_modified_readable(path: Path | str, places: int = 3) -> str:
+    # time_modified: time.struct_time = time.strptime(time.ctime(time_modified(path)))
+    return format_time(time_modified(path), places=places)
+
+
+def first_newer(file1: str | Path, file2: str | Path | tuple[Path, ...] | tuple[str, ...]) -> bool:
+    m1 = os.path.getmtime(file1)
+
+    if isinstance(file2, tuple):
+        m2 = max(os.path.getmtime(f) for f in file2)
+    else:
+        m2 = os.path.getmtime(file2)
+    return m1 > m2

{adiumentum-0.1.0 → adiumentum-0.1.1}/src/adiumentum/frozendict.py

@@ -1,12 +1,12 @@
 from collections import defaultdict
 from collections.abc import Callable
-from typing import Generic, TypeVar, cast
+from typing import TypeVar, cast
 
 T = TypeVar("T")
 K = TypeVar("K")
 
 
-class FrozenDefaultDict(defaultdict[K, T], Generic[K, T]):
+class FrozenDefaultDict[K, T](defaultdict[K, T]):
     def __init__(self, default_factory: Callable[[], T], dictionary: dict[K, T]):
         super().__init__(default_factory, dictionary)
 

{adiumentum-0.1.0 → adiumentum-0.1.1}/src/adiumentum/functional.py

@@ -33,11 +33,11 @@ def dmap(callable_: Callable[[TPre], TPost], dictionary: dict[TPre, TPre]) -> di
     return {callable_(k): callable_(v) for k, v in dictionary.items()}
 
 
-def identity(x: T) -> T:
+def identity[T](x: T) -> T:
     return x
 
 
-def fold_dictionaries(dicts: Iterable[dict[K, T]]) -> dict[K, T]:
+def fold_dictionaries[K, T](dicts: Iterable[dict[K, T]]) -> dict[K, T]:
     def _or(dict1: dict[K, T], dict2: dict[K, T]) -> dict[K, T]:
         return dict1 | dict2
 

adiumentum-0.1.1/src/adiumentum/timestamping.py

@@ -0,0 +1,20 @@
+from datetime import datetime
+from pathlib import Path
+
+
+def make_timestamp(places: int = 3) -> str:
+    dt = datetime.now()
+    if places > 0:
+        idx: int | None = min(0, int(places) - 6) or None
+        return dt.strftime("%Y-%m-%d_%H:%M:%S.%f")[:idx]
+    return dt.strftime("%Y-%m-%d_%H:%M:%S")
+
+
+def insert_timestamp(p: Path | str) -> Path:
+    new_path = str(p)
+
+    if "." in new_path:
+        base, suffix = new_path.rsplit(".", 1)
+        return Path(f"{base}__{make_timestamp()}.{suffix}")
+
+    return Path(f"{new_path}__{make_timestamp()}")

adiumentum-0.1.0/src/adiumentum/file_modification_time.py

@@ -1,31 +0,0 @@
-import os
-import time
-from pathlib import Path
-
-
-def get_time_created(path: Path | str) -> float:
-    return os.path.getctime(path)
-
-
-def time_created_readable(path: Path | str) -> str:
-    time_created: time.struct_time = time.strptime(time.ctime(get_time_created(path)))
-    return time.strftime("%Y-%m-%d %H:%M:%S", time_created)
-
-
-def get_time_modified(path: Path | str) -> float:
-    return os.path.getmtime(path)
-
-
-def time_modified_readable(path: Path | str) -> str:
-    time_modified: time.struct_time = time.strptime(time.ctime(get_time_modified(path)))
-    return time.strftime("%Y-%m-%d %H:%M:%S", time_modified)
-
-
-def first_newer(file1: str | Path, file2: str | Path | tuple[Path, ...] | tuple[str, ...]) -> bool:
-    m1 = os.path.getmtime(file1)
-
-    if isinstance(file2, tuple):
-        m2 = max(os.path.getmtime(f) for f in file2)
-    else:
-        m2 = os.path.getmtime(file2)
-    return m1 > m2

adiumentum-0.1.0/src/adiumentum/timestamping.py

@@ -1,12 +0,0 @@
-from datetime import datetime
-from pathlib import Path
-
-
-def insert_timestamp(p: Path | str) -> Path:
-    new_path = str(p)
-
-    if "." in new_path:
-        base, suffix = new_path.rsplit(".", 1)
-        return Path(f"{base}__{datetime.now():%Y-%m-%d_%H:%M:%S}.{suffix}")
-
-    return Path(f"{new_path}__{datetime.now():%Y-%m-%d_%H:%M:%S}")