aspyx 1.5.2__tar.gz → 1.6.0__tar.gz

{aspyx-1.5.2 → aspyx-1.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aspyx
-Version: 1.5.2
+Version: 1.6.0
 Summary: A DI and AOP library for Python
 Author-email: Andreas Ernst <andreas.ernst7@gmail.com>
 License: MIT License
@@ -26,6 +26,8 @@ License: MIT License
         SOFTWARE.
 License-File: LICENSE
 Requires-Python: >=3.9
+Requires-Dist: cachetools~=5.5.2
+Requires-Dist: pydantic<3.0,>=2.0
 Requires-Dist: python-dotenv~=1.1.0
 Requires-Dist: pyyaml~=6.0.2
 Description-Content-Type: text/markdown
@@ -146,7 +148,7 @@ environment = Environment(SampleModule)
 
 # fetch an instance
 
-bar = env.get(Bar)
+bar = env.read(Bar)
 
 bar.foo.hello("world")
 ```
@@ -734,11 +736,13 @@ given a specific exception.
 The handlers are declared by annoting a class with `@exception_handler` and decorating specific methods with `@handle`
 
 **Example**:
+
 ```python
 class DerivedException(Exception):
     def __init__(self):
         pass
 
+
 @module()
 class SampleModule:
     # constructor
@@ -750,6 +754,7 @@ class SampleModule:
     def create_exception_manager(self) -> ExceptionManager:
         return ExceptionManager()
 
+
 @injectable()
 @exception_handler()
 class TestExceptionHandler:
@@ -778,9 +783,10 @@ class ExceptionAdvice:
     def handle_error(self, invocation: Invocation):
         self.exceptionManager.handle(invocation.exception)
 
-environment =  Environment(SampleEnvironment)
 
-environment.get(ExceptionManager).handle(DerivedException())
+environment = Environment(SampleEnvironment)
+
+environment.read(ExceptionManager).handle(DerivedException())
 ```
 
 The exception maanger will first call the most appropriate method. 

{aspyx-1.5.2 → aspyx-1.6.0}/README.md

@@ -114,7 +114,7 @@ environment = Environment(SampleModule)
 
 # fetch an instance
 
-bar = env.get(Bar)
+bar = env.read(Bar)
 
 bar.foo.hello("world")
 ```
@@ -702,11 +702,13 @@ given a specific exception.
 The handlers are declared by annoting a class with `@exception_handler` and decorating specific methods with `@handle`
 
 **Example**:
+
 ```python
 class DerivedException(Exception):
     def __init__(self):
         pass
 
+
 @module()
 class SampleModule:
     # constructor
@@ -718,6 +720,7 @@ class SampleModule:
     def create_exception_manager(self) -> ExceptionManager:
         return ExceptionManager()
 
+
 @injectable()
 @exception_handler()
 class TestExceptionHandler:
@@ -746,9 +749,10 @@ class ExceptionAdvice:
     def handle_error(self, invocation: Invocation):
         self.exceptionManager.handle(invocation.exception)
 
-environment =  Environment(SampleEnvironment)
 
-environment.get(ExceptionManager).handle(DerivedException())
+environment = Environment(SampleEnvironment)
+
+environment.read(ExceptionManager).handle(DerivedException())
 ```
 
 The exception maanger will first call the most appropriate method. 

{aspyx-1.5.2 → aspyx-1.6.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aspyx"
-version = "1.5.2"
+version = "1.6.0"
 description = "A DI and AOP library for Python"
 authors = [{ name = "Andreas Ernst", email = "andreas.ernst7@gmail.com" }]
 readme = "README.md"
@@ -8,7 +8,9 @@ license = { file = "LICENSE" }
 requires-python = ">=3.9"
 dependencies = [
     "python-dotenv~=1.1.0",
-    "pyyaml~=6.0.2"
+    "pyyaml~=6.0.2",
+    "cachetools~= 5.5.2",
+    "pydantic>=2.0,<3.0"
 ]
 
 [build-system]

{aspyx-1.5.2 → aspyx-1.6.0}/src/aspyx/di/aop/aop.py

@@ -14,7 +14,7 @@ from enum import auto, Enum
 from typing import Optional, Dict, Type, Callable
 
 from aspyx.reflection import Decorators, TypeDescriptor
-from aspyx.di import injectable, order, Providers, ClassInstanceProvider, Environment, PostProcessor
+from aspyx.di import injectable, order, Environment, PostProcessor
 
 class AOPException(Exception):
     """
@@ -197,25 +197,25 @@ class ClassAspectTarget(AspectTarget):
         #descriptor = TypeDescriptor.for_type(func)
         # type
 
-        if len(self.types) > 0:
+        if self.types:
             if next((type for type in self.types if issubclass(clazz, type)), None) is None:
                 return False
 
         # decorators
 
-        if len(self.decorators) > 0:
+        if self.decorators:
             if next((decorator for decorator in self.decorators if class_descriptor.has_decorator(decorator)), None) is None:
                 return False
 
         # names
 
-        if len(self.names) > 0:
+        if self.names:
             if next((name for name in self.names if name == clazz.__name__), None) is None:
                 return False
 
         # patterns
 
-        if len(self.patterns) > 0:
+        if self.patterns:
             if next((pattern for pattern in self.patterns if re.fullmatch(pattern, clazz.__name__) is not None), None) is None:
                 return False
 
@@ -245,7 +245,7 @@ class MethodAspectTarget(AspectTarget):
 
         # classes
 
-        if len(self.belonging_to) > 0:
+        if self.belonging_to:
             match = False
             for classes in self.belonging_to:
                 if classes._matches(clazz, func):
@@ -262,25 +262,25 @@ class MethodAspectTarget(AspectTarget):
 
         # type
 
-        if len(self.types) > 0:
+        if self.types:
             if next((type for type in self.types if issubclass(clazz, type)), None) is None:
                 return False
 
         # decorators
 
-        if len(self.decorators) > 0:
+        if self.decorators:
             if next((decorator for decorator in self.decorators if method_descriptor.has_decorator(decorator)), None) is None:
                 return False
 
         # names
 
-        if len(self.names) > 0:
+        if self.names:
             if next((name for name in self.names if name == func.__name__), None) is None:
                 return False
 
         # patterns
 
-        if len(self.patterns) > 0:
+        if self.patterns:
             if next((pattern for pattern in self.patterns if re.fullmatch(pattern, func.__name__) is not None), None) is None:
                 return False
 
@@ -474,7 +474,7 @@ class Invocation:
         """
         Proceed to the next aspect in the around chain up to the original method.
         """
-        if len(args) > 0 or len(kwargs) > 0:  # as soon as we have args, we replace the current ones
+        if args or kwargs:  # as soon as we have args, we replace the current ones
             self.args = args
             self.kwargs = kwargs
 
@@ -486,11 +486,11 @@ class Invocation:
         """
         Proceed to the next aspect in the around chain up to the original method.
         """
-        if len(args) > 0 or len(kwargs) > 0:  # as soon as we have args, we replace the current ones
+        if args or kwargs:  # as soon as we have args, we replace the current ones
             self.args = args
             self.kwargs = kwargs
 
-        # next one please...
+        # next one, please...
 
         return await self.current_aspect.next.call_async(self)
 
@@ -575,7 +575,7 @@ class Advices:
         afters = cls.collect(clazz, member, AspectType.AFTER, environment)
         errors = cls.collect(clazz, member, AspectType.ERROR, environment)
 
-        if len(befores) > 0 or len(arounds) > 0 or len(afters) > 0  or len(errors) > 0:
+        if befores or arounds or afters  or errors:
             return Aspects(
                 before=befores,
                 around=arounds,

{aspyx-1.5.2 → aspyx-1.6.0}/src/aspyx/exception/__init__.py

@@ -1,10 +1,11 @@
 """
 This module provides exception handling functions.
 """
-from .exception_manager import exception_handler, handle, ExceptionManager
+from .exception_manager import exception_handler, handle, catch, ExceptionManager
 
 __all__ = [
     "exception_handler",
     "handle",
+    "catch",
     "ExceptionManager"
 ]

{aspyx-1.5.2 → aspyx-1.6.0}/src/aspyx/exception/exception_manager.py

@@ -32,6 +32,16 @@ def handle():
 
     return decorator
 
+def catch():
+    """
+    Any method annotated with @catch will be registered as an exception handler method.
+    """
+    def decorator(func):
+        Decorators.add(func, handle)
+        return func
+
+    return decorator
+
 class Handler:
     # constructor
 
@@ -160,7 +170,7 @@ class ExceptionManager:
         for i in range(0, len(chain) - 1):
             chain[i].next = chain[i + 1]
 
-        if len(chain) > 0:
+        if chain:
             return chain[0]
         else:
             return None
@@ -174,7 +184,7 @@ class ExceptionManager:
             exception (BaseException): the exception
 
         Returns:
-            BaseException: the resulting exception
+            BaseException: the resulting - possible transformed - exception
         """
         chain = self.get_handlers(type(exception))
         if chain is not None:

{aspyx-1.5.2 → aspyx-1.6.0}/src/aspyx/threading/__init__.py

@@ -2,9 +2,11 @@
 A module with threading related utilities
 """
 from .thread_local import ThreadLocal
+from .context_local import ContextLocal
 
 imports = [ThreadLocal]
 
 __all__ = [
     "ThreadLocal",
+    "ContextLocal",
 ]

aspyx-1.6.0/src/aspyx/threading/context_local.py

@@ -0,0 +1,57 @@
+"""
+context utility
+"""
+import contextvars
+from contextlib import contextmanager
+from typing import Generic, Optional, TypeVar, Any
+
+T = TypeVar("T")
+
+class ContextLocal(Generic[T]):
+    """
+    A context local value holder
+    """
+    # constructor
+
+    def __init__(self, name: str, default: Optional[T] = None):
+        self.var = contextvars.ContextVar(name, default=default)
+
+    # public
+
+    def get(self) -> Optional[T]:
+        """
+        return the current value or invoke the optional factory to compute one
+
+        Returns:
+            Optional[T]: the value associated with the current thread
+        """
+        return self.var.get()
+
+    def set(self, value: Optional[T]) -> Any:
+        """
+        set a value in the current thread
+
+        Args:
+            value: the value
+
+        Returns:
+            a token that can be used as an argument to `reset`
+        """
+        return self.var.set(value)
+
+    def reset(self, token) -> None:
+        """
+        clear the value in the current thread
+
+        Args:
+            token: the token to clear
+        """
+        self.var.reset(token)
+
+    @contextmanager
+    def use(self, value):
+        token = self.set(value)
+        try:
+            yield
+        finally:
+            self.reset(token)

aspyx-1.6.0/src/aspyx/util/__init__.py

@@ -0,0 +1,16 @@
+"""
+This module provides utility functions.
+"""
+from .stringbuilder import StringBuilder
+from .logger import Logger
+from .serialization import TypeSerializer, TypeDeserializer, get_serializer, get_deserializer
+
+__all__ = [
+    "StringBuilder",
+    "Logger",
+
+    "TypeSerializer",
+    "TypeDeserializer",
+    "get_serializer",
+    "get_deserializer"
+]

aspyx-1.6.0/src/aspyx/util/logger.py

@@ -0,0 +1,19 @@
+"""
+Logging utility class
+"""
+import logging
+import sys
+from typing import Optional, Dict
+
+class Logger:
+    """just syntactic sugar"""
+
+    @classmethod
+    def configure(cls,
+                 default_level: int = logging.INFO,
+                 format: str = "[%(asctime)s] %(levelname)s in %(filename)s:%(lineno)d - %(message)s",
+                 levels: Optional[Dict[str, int]] = None, stream=sys.stdout):
+        logging.basicConfig(level=default_level, format=format)
+        if levels is not None:
+            for name, level in levels.items():
+                logging.getLogger(name).setLevel(level)

aspyx-1.6.0/src/aspyx/util/serialization.py

@@ -0,0 +1,137 @@
+"""
+deserialization functions
+"""
+from dataclasses import is_dataclass, fields
+from functools import lru_cache
+from typing import get_origin, get_args, Union
+
+from pydantic import BaseModel
+
+class TypeDeserializer:
+    # constructor
+
+    def __init__(self, typ):
+        self.typ = typ
+        self.deserializer = self._build_deserializer(typ)
+
+    def __call__(self, value):
+        return self.deserializer(value)
+
+    # internal
+
+    def _build_deserializer(self, typ):
+        origin = get_origin(typ)
+        args = get_args(typ)
+
+        if origin is Union:
+            deserializers = [TypeDeserializer(arg) for arg in args if arg is not type(None)]
+            def deser_union(value):
+                if value is None:
+                    return None
+                for d in deserializers:
+                    try:
+                        return d(value)
+                    except Exception:
+                        continue
+                return value
+            return deser_union
+
+        if isinstance(typ, type) and issubclass(typ, BaseModel):
+            return typ.model_validate
+
+        if is_dataclass(typ):
+            field_deserializers = {f.name: TypeDeserializer(f.type) for f in fields(typ)}
+            def deser_dataclass(value):
+                if is_dataclass(value):
+                    return value
+
+                return typ(**{
+                    k: field_deserializers[k](v) for k, v in value.items()
+                })
+            return deser_dataclass
+
+        if origin is list:
+            item_deser = TypeDeserializer(args[0]) if args else lambda x: x
+            return lambda v: [item_deser(item) for item in v]
+
+        if origin is dict:
+            key_deser = TypeDeserializer(args[0]) if args else lambda x: x
+            val_deser = TypeDeserializer(args[1]) if len(args) > 1 else lambda x: x
+            return lambda v: {key_deser(k): val_deser(val) for k, val in v.items()}
+
+        # Fallback
+        return lambda v: v
+
+class TypeSerializer:
+    def __init__(self, typ):
+        self.typ = typ
+        self.serializer = self._build_serializer(typ)
+
+    def __call__(self, value):
+        return self.serializer(value)
+
+    def _build_serializer(self, typ):
+        origin = get_origin(typ)
+        args = get_args(typ)
+
+        if origin is Union:
+            serializers = [TypeSerializer(arg) for arg in args if arg is not type(None)]
+            def ser_union(value):
+                if value is None:
+                    return None
+                for s in serializers:
+                    try:
+                        return s(value)
+                    except Exception:
+                        continue
+                return value
+            return ser_union
+
+        if isinstance(typ, type) and issubclass(typ, BaseModel):
+            return lambda v: v.model_dump() if v is not None else None
+
+        if is_dataclass(typ):
+            field_serializers = {f.name: TypeSerializer(f.type) for f in fields(typ)}
+            def ser_dataclass(obj):
+                if obj is None:
+                    return None
+                return {k: field_serializers[k](getattr(obj, k)) for k in field_serializers}
+            return ser_dataclass
+
+        if origin is list:
+            item_ser = TypeSerializer(args[0]) if args else lambda x: x
+            return lambda v: [item_ser(item) for item in v] if v is not None else None
+
+        if origin is dict:
+            key_ser = TypeSerializer(args[0]) if args else lambda x: x
+            val_ser = TypeSerializer(args[1]) if len(args) > 1 else lambda x: x
+            return lambda v: {key_ser(k): val_ser(val) for k, val in v.items()} if v is not None else None
+
+        # Fallback: primitive Typen oder unbekannt
+        return lambda v: v
+
+@lru_cache(maxsize=512)
+def get_deserializer(typ) -> TypeDeserializer:
+    """
+    return a function that is able to deserialize a value of the specified type
+
+    Args:
+        typ: the type
+
+    Returns:
+
+    """
+    return TypeDeserializer(typ)
+
+@lru_cache(maxsize=512)
+def get_serializer(typ) -> TypeSerializer:
+    """
+    return a function that is able to deserialize a value of the specified type
+
+    Args:
+        typ: the type
+
+    Returns:
+
+    """
+    return TypeSerializer(typ)

{aspyx-1.5.2 → aspyx-1.6.0}/tests/test_decorator.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 
 import unittest
 
-from aspyx.reflection import TypeDescriptor, Decorators
+from aspyx.reflection import Decorators
 
 def decorate_1(arg=""):
     def decorator(cls_or_func):

{aspyx-1.5.2 → aspyx-1.6.0}/tests/test_di.py

@@ -262,7 +262,6 @@ class TestDI(unittest.TestCase):
             no_feature_environment = prod_environment.get(RequiresBase)
             self.fail("should not return conditional class")
         except Exception as e:
-            print(e)
             pass
 
     def test_process_factory_instances(self):

aspyx-1.5.2/src/aspyx/util/__init__.py

@@ -1,8 +0,0 @@
-"""
-This module provides utility functions.
-"""
-from .stringbuilder import StringBuilder
-
-__all__ = [
-    "StringBuilder",
-]