batutils 2.0.0__tar.gz → 2.2.0__tar.gz

{batutils-2.0.0 → batutils-2.2.0}/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Thordur Matthiasson
+Copyright (c) 2024-2026 Thordur Matthiasson
 Copyright (c) 2013-2024 CCP Games
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

{batutils-2.0.0 → batutils-2.2.0}/PKG-INFO

@@ -1,11 +1,11 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: batutils
-Version: 2.0.0
+Version: 2.2.0
 Summary: Team Batcave's utilities for date and/or time objects and values and messing with types and so much more.
 Author-email: Thordur Matthiasson <doddi79@gmail.com>, John Aldis <johnaldis@ccpgames.com>
 License: MIT License
         
-        Copyright (c) 2024 Thordur Matthiasson
+        Copyright (c) 2024-2026 Thordur Matthiasson
         Copyright (c) 2013-2024 CCP Games
         
         Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -37,17 +37,18 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Utilities
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: license-file
 
 # Team Batcave Python Toolkit
 

batutils-2.2.0/batutils/__init__.py

@@ -0,0 +1,5 @@
+__version__ = '2.2.0'
+
+__author__ = 'Thordur Matthiasson <doddi79@gmail.com>'
+__license__ = 'MIT License'
+__copyright__ = 'Copyright 2024-2026 - Thordur Matthiasson, Copyright 2013-2024 - CCP Games ehf'

{batutils-2.0.0 → batutils-2.2.0}/batutils/dtu/casting/_any.py

@@ -90,7 +90,7 @@ def any_to_datetime(temporal_object: T_TEMPORAL_VALUE,
                 # This range means that the number, if treated as an instant,
                 # represents a datetime within 1000 years to/from now so it's the
                 # second most likely bet!
-                return timestamp_to_datetime(temporal_object)
+                return instant_to_datetime(temporal_object)
 
             # This number is so large that it's most likely a filetime!
             return filetime_to_datetime(temporal_object)

{batutils-2.0.0 → batutils-2.2.0}/batutils/dtu/casting/_instant.py

@@ -16,7 +16,12 @@ def instant_to_datetime(milliseconds_since_epoch: T_NUMBER, minmax_on_fail: bool
                            negative)
     :return: A Python Datetime
     """
-    return timestamp_to_datetime(milliseconds_since_epoch / 1000., minmax_on_fail)
+    try:
+        return Datetime(1970, 1, 1) + TimeDelta(milliseconds=milliseconds_since_epoch)
+    except OverflowError:
+        if minmax_on_fail:
+            return Datetime.max if milliseconds_since_epoch > 0 else Datetime.min
+        raise
 
 
 def datetime_to_instant(dt: T_DATE_VALUE) -> int:

{batutils-2.0.0 → batutils-2.2.0}/batutils/dtu/casting/_timestamp.py

@@ -17,18 +17,11 @@ def timestamp_to_datetime(seconds_since_epoch: T_NUMBER, minmax_on_fail: bool =
     :return: A Python Datetime
     """
     try:
-        return Datetime.fromtimestamp(seconds_since_epoch)
-    except OSError:
-        try:
-            return Datetime(1970, 1, 1, 0, 0, 0, 0) + TimeDelta(seconds=seconds_since_epoch)
-        except OverflowError:
-            if minmax_on_fail:
-                if seconds_since_epoch > 0:
-                    return Datetime.max
-                else:
-                    return Datetime.min
-            else:
-                raise
+        return Datetime(1970, 1, 1) + TimeDelta(seconds=seconds_since_epoch)
+    except OverflowError:
+        if minmax_on_fail:
+            return Datetime.max if seconds_since_epoch > 0 else Datetime.min
+        raise
 
 
 def datetime_to_timestamp(dt: T_DATE_VALUE) -> float:

{batutils-2.0.0 → batutils-2.2.0}/batutils/tpu/casting/_evals.py

@@ -4,6 +4,8 @@ __all__ = [
     'bool_eval',
     'enum_eval',
 
+    'enum_value_lookup_map',
+
     'decode_bytes',
 ]
 
@@ -223,9 +225,24 @@ def enum_eval(value: Any,
             return default
 
     if isinstance(value, str):
-        hit = {o.name.lower(): o for o in enum_class}.get(value.strip().lower(), None)
+        # First we check the member name (normalized)
+        hit = {n.lower(): m for n, m in enum_class.__members__.items()}.get(value.strip().lower(), None)
         if hit is not None:
             return hit
+
+    try:
+        value_lookup = enum_value_lookup_map(enum_class, allow_collision=False)
+    except KeyError:
+        if raise_on_fail:
+            raise
+        return default
+
+    # This covers just about everything, except where a numeric value was given as a string
+    hit = value_lookup.get(value, None)
+    if hit is not None:
+        return hit
+
+    if isinstance(value, str):
         try:
             value = int(value, base=0)
         except ValueError:
@@ -233,15 +250,53 @@ def enum_eval(value: Any,
                 raise ValueError(f'{value!r} is not a valid {enum_class.__name__}')
             return default
 
-    if isinstance(value, int):
-        try:
-            return enum_class(value)
-        except ValueError:
-            if raise_on_fail:
-                raise
-            return default
+        # Retry after casting
+        hit = value_lookup.get(value, None)
+        if hit is not None:
+            return hit
 
     if raise_on_fail:
         raise ValueError(f'{value!r} is not a valid {enum_class.__name__}')
 
     return default
+
+
+def enum_value_lookup_map(enum_class: Type[_T_ENUM_CLASS], allow_collision: bool = False) -> Dict[Any, _T_ENUM_CLASS]:
+    """Returns a dict of all the values of an enum class as keys and their respective members as values for reverse
+    value lookups.
+
+    This also breaks down the individual values in the value tuple of a multi-value enum and includes each of those as
+    a lookup key as well. By default, this will raise a `KeyError` if any individual value is repeated with a different
+    member as its target but this can be suppressed by setting `allow_collision=True`
+
+    Example:
+    ```python
+    import enum
+
+    class MyGoodEnum(enum.Enum):
+        FOO = ('one', 'one'),  # This is fine
+        BAR = ('something', 'else'),
+
+    class MyBadEnum(enum.Enum):
+        FOO = ('one', 'something'),
+        BAR = ('one', 'else'),  # This will result in a collision with FOO's 'one' and raise a KeyError by default
+    ```
+    """
+    d = {}
+
+    def _collision_free_add(value: Any, enum_member: _T_ENUM_CLASS):
+        if allow_collision:
+            d[value] = enum_member
+        else:
+            if value in d:
+                if d[value] != enum_member:
+                    raise KeyError(f'value lookup map for {enum_class.__name__} resulted in a collision between {d[value]} and {enum_member} for the value {value!r}')
+            else:
+                d[value] = enum_member
+
+    for _, member in enum_class.__members__.items():
+        _collision_free_add(member.value, member)
+        if isinstance(member.value, tuple):
+            for v in member.value:
+                _collision_free_add(v, member)
+    return d

{batutils-2.0.0 → batutils-2.2.0}/batutils.egg-info/PKG-INFO

@@ -1,11 +1,11 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: batutils
-Version: 2.0.0
+Version: 2.2.0
 Summary: Team Batcave's utilities for date and/or time objects and values and messing with types and so much more.
 Author-email: Thordur Matthiasson <doddi79@gmail.com>, John Aldis <johnaldis@ccpgames.com>
 License: MIT License
         
-        Copyright (c) 2024 Thordur Matthiasson
+        Copyright (c) 2024-2026 Thordur Matthiasson
         Copyright (c) 2013-2024 CCP Games
         
         Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -37,17 +37,18 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Utilities
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: license-file
 
 # Team Batcave Python Toolkit
 

{batutils-2.0.0 → batutils-2.2.0}/pyproject.toml

@@ -22,11 +22,11 @@ classifiers = [
 
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
 
     "Topic :: Software Development",
     "Topic :: Software Development :: Libraries",

batutils-2.0.0/batutils/__init__.py

@@ -1,5 +0,0 @@
-__version__ = '2.0.0'
-
-__author__ = 'Thordur Matthiasson <doddi79@gmail.com>'
-__license__ = 'MIT License'
-__copyright__ = 'Copyright 2024 - Thordur Matthiasson, Copyright 2013-2024 - CCP Games ehf'