winipedia-utils 0.1.12__py3-none-any.whl → 0.1.14__py3-none-any.whl

winipedia_utils/oop/mixins/meta.py

@@ -15,13 +15,13 @@ from typing import Any, final
 
 from winipedia_utils.logging.logger import get_logger
 from winipedia_utils.modules.class_ import get_all_methods_from_cls
-from winipedia_utils.modules.function import is_func
+from winipedia_utils.modules.function import is_func, unwrap_method
 from winipedia_utils.text.string import value_to_truncated_string
 
 logger = get_logger(__name__)
 
 
-class LoggingMeta(type):
+class LoggingMeta(ABCMeta):
     """Metaclass that automatically adds logging to class methods.
 
     Wraps non-magic methods with a logging decorator that tracks method calls,
@@ -51,9 +51,20 @@ class LoggingMeta(type):
 
         for attr_name, attr_value in dct.items():
             if mcs.is_loggable_method(attr_value):
-                dct[attr_name] = mcs.wrap_with_logging(
-                    func=attr_value, class_name=name, call_times={}
-                )
+                if isinstance(attr_value, classmethod):
+                    wrapped_method = mcs.wrap_with_logging(
+                        func=attr_value.__func__, class_name=name, call_times={}
+                    )
+                    dct[attr_name] = classmethod(wrapped_method)
+                elif isinstance(attr_value, staticmethod):
+                    wrapped_method = mcs.wrap_with_logging(
+                        func=attr_value.__func__, class_name=name, call_times={}
+                    )
+                    dct[attr_name] = staticmethod(wrapped_method)
+                else:
+                    dct[attr_name] = mcs.wrap_with_logging(
+                        func=attr_value, class_name=name, call_times={}
+                    )
 
         return super().__new__(mcs, name, bases, dct)
 
@@ -96,7 +107,7 @@ class LoggingMeta(type):
         time_time = time.time  # Cache the time.time function for performance
 
         @wraps(func)
-        def wrapper(self: object, *args: object, **kwargs: object) -> object:
+        def wrapper(*args: object, **kwargs: object) -> object:
             # call_times as a dictionary to store the call times of the function
             # we only log if the time since the last call is greater than the threshold
             # this is to avoid spamming the logs
@@ -132,7 +143,7 @@ class LoggingMeta(type):
 
             # Execute the function and return the result
 
-            result = func(self, *args, **kwargs)
+            result = func(*args, **kwargs)
 
             if do_logging:
                 duration = time_time() - current_time
@@ -158,7 +169,7 @@ class LoggingMeta(type):
         return wrapper
 
 
-class ImplementationMeta(type):
+class ImplementationMeta(ABCMeta):
     """Metaclass that enforces implementation.
 
     Ensures that concrete subclasses properly implement all required attributes
@@ -171,7 +182,9 @@ class ImplementationMeta(type):
         cls: "ImplementationMeta",
         name: str,
         bases: tuple[type, ...],
-        dct: dict[str, Any],
+        namespace: dict[str, Any],
+        /,
+        **_kwargs: Any,
     ) -> None:
         """Initialize a class with implementation checking.
 
@@ -183,7 +196,7 @@ class ImplementationMeta(type):
             cls: The class being initialized
             name: The name of the class
             bases: The base classes
-            dct: The attribute dictionary
+            namespace: The attribute dictionary
 
         Raises:
             NotImplementedError: If the class doesn't define __abstract__
@@ -192,7 +205,7 @@ class ImplementationMeta(type):
             TypeError: If a method is neither final nor abstract
 
         """
-        super().__init__(name, bases, dct)
+        super().__init__(name, bases, namespace)
 
         # Check method decorators regardless of abstract status
 
@@ -212,7 +225,7 @@ class ImplementationMeta(type):
             True if the class is abstract, False otherwise
 
         """
-        return any(cls.is_abstract_method(method) for method in cls.__dict__.values())
+        return any(cls.__abstractmethods__)
 
     def check_method_decorators(cls) -> None:
         """Check that all methods are properly decorated with @final or @abstractmethod.
@@ -249,7 +262,10 @@ class ImplementationMeta(type):
             True if the method is marked with @final, False otherwise
 
         """
-        return getattr(method, "__final__", False)
+        unwrapped_method = unwrap_method(method)
+        return getattr(method, "__final__", False) or getattr(
+            unwrapped_method, "__final__", False
+        )
 
     @staticmethod
     def is_abstract_method(method: Callable[..., Any]) -> bool:
@@ -303,7 +319,7 @@ class ImplementationMeta(type):
         return list(attrs)
 
 
-class ABCImplementationLoggingMeta(ImplementationMeta, LoggingMeta, ABCMeta):
+class ABCImplementationLoggingMeta(ImplementationMeta, LoggingMeta):
     """Combined metaclass that merges implementation, logging, and ABC functionality.
 
     This metaclass combines the features of:

{winipedia_utils-0.1.12.dist-info → winipedia_utils-0.1.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: winipedia-utils
-Version: 0.1.12
+Version: 0.1.14
 Summary: A package with many utility functions
 License: MIT
 Author: Winipedia

{winipedia_utils-0.1.12.dist-info → winipedia_utils-0.1.14.dist-info}/RECORD

@@ -30,7 +30,7 @@ winipedia_utils/modules/module.py,sha256=mxaAsRl02CAq_bTW2HsmzRWoyC9jKNM8Q4xdgdQ
 winipedia_utils/modules/package.py,sha256=kCm4pXQdllafo-2dmWZTvaAqRruzh3iF4hseHlCmTlU,12605
 winipedia_utils/oop/__init__.py,sha256=wGjsVwLbTVEQWOfDJvN9nlvC-3NmAi8Doc2xIrm6e78,47
 winipedia_utils/oop/mixins/__init__.py,sha256=PDK-cJcdRUfDUCz36qQ5pmMW07G133WtN49OpmILGNI,54
-winipedia_utils/oop/mixins/meta.py,sha256=UpHags1j80OABxW4Q3QYt7A7lLIArvgUrGcWeYJaRyU,10576
+winipedia_utils/oop/mixins/meta.py,sha256=gV2YKo_rbJHY9xNCPHhjMmFWuTtiw3C-IGZlh52IZq8,11320
 winipedia_utils/oop/mixins/mixin.py,sha256=GuYdeueiOIHoRi9ds2ztxUcLnrcsBhHAsbrO43N9AGg,1170
 winipedia_utils/os/__init__.py,sha256=WSLt7tb6HqWRlCGGIEwRfVksF0sLJNeEW3iZeJhGWk0,47
 winipedia_utils/os/os.py,sha256=ITuiLLfjGBV2jH8tHQfwVzsICT-jY1zUxtwu3ASJBG4,1690
@@ -61,7 +61,7 @@ winipedia_utils/testing/tests/base/utils/utils.py,sha256=dUPDrgAxlfREQb33zz23Mfz
 winipedia_utils/testing/tests/conftest.py,sha256=8RounBlI8Jq1aLaLNpv84MW4ne8Qq0aavQextDOp5ng,920
 winipedia_utils/text/__init__.py,sha256=j2bwtK6kyeHI6SnoBjpRju0C1W2n2paXBDlNjNtaUxA,48
 winipedia_utils/text/string.py,sha256=1jbBftlgxffGgSlPnQh3aRPIr8XekEwpSenjFCW6JyM,3478
-winipedia_utils-0.1.12.dist-info/LICENSE,sha256=3PrKJ2CWNrnyyHaC_r0wPDSukVWgmjOxHr__eQVH7cw,1087
-winipedia_utils-0.1.12.dist-info/METADATA,sha256=u2sgf1gcfep7whVI1VvB9GMrkXyvX2rNl_FxzxIQ5Zs,12385
-winipedia_utils-0.1.12.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-winipedia_utils-0.1.12.dist-info/RECORD,,
+winipedia_utils-0.1.14.dist-info/LICENSE,sha256=3PrKJ2CWNrnyyHaC_r0wPDSukVWgmjOxHr__eQVH7cw,1087
+winipedia_utils-0.1.14.dist-info/METADATA,sha256=F5AnrujDCkrWAfddP9zJ3Gn8uK1JnvDLQwYdow6d0bA,12385
+winipedia_utils-0.1.14.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+winipedia_utils-0.1.14.dist-info/RECORD,,