aspyx 1.5.1__py3-none-any.whl → 1.5.2__py3-none-any.whl

aspyx/di/aop/aop.py

@@ -3,6 +3,7 @@ This module provides aspect-oriented programming (AOP) capabilities for Python a
 """
 from __future__ import annotations
 
+import functools
 from abc import ABC, abstractmethod
 import inspect
 import re
@@ -64,7 +65,7 @@ class AspectTarget(ABC):
     def __init__(self):
         self._clazz = None
         self._instance = None
-        self._async = False
+        self._async : Optional[bool] = None
         self._function = None
         self._type = None
 
@@ -118,6 +119,16 @@ class AspectTarget(ABC):
         self._async = True
         return self
 
+    def that_are_sync(self) -> AspectTarget:
+        """
+        matches methods that are sync
+
+        Returns:
+            AspectTarget: self
+        """
+        self._async = False
+        return self
+
     def of_type(self, type: Type) -> AspectTarget:
         """
         matches methods belonging to a class or classes that are subclasses of the specified type
@@ -217,10 +228,14 @@ class MethodAspectTarget(AspectTarget):
        An AspectTarget matching methods
        """
 
-    # properties
+    __slots__ = ["belonging_to"]
 
-    __slots__ = [ ]
+    # constructor
 
+    def __init__(self):
+        super().__init__()
+
+        self.belonging_to : list[ClassAspectTarget] = []
     # public
 
     def _matches_self(self, clazz : Type, func):
@@ -228,9 +243,21 @@ class MethodAspectTarget(AspectTarget):
 
         method_descriptor = descriptor.get_method(func.__name__)
 
+        # classes
+
+        if len(self.belonging_to) > 0:
+            match = False
+            for classes in self.belonging_to:
+                if classes._matches(clazz, func):
+                    match = True
+                    break
+
+            if not match:
+                return False
+
         # async
 
-        if self._async is not method_descriptor.is_async():
+        if self._async is not None and self._async is not method_descriptor.is_async():
             return False
 
         # type
@@ -261,7 +288,14 @@ class MethodAspectTarget(AspectTarget):
 
         return True
 
-def methods() -> AspectTarget:
+    # fluent
+
+    def declared_by(self, classes: ClassAspectTarget) -> MethodAspectTarget:
+        self.belonging_to.append(classes)
+
+        return self
+
+def methods() -> MethodAspectTarget:
     """
     Create a new AspectTarget instance to define method aspect targets.
 
@@ -270,7 +304,7 @@ def methods() -> AspectTarget:
     """
     return MethodAspectTarget()
 
-def classes() -> AspectTarget:
+def classes() -> ClassAspectTarget:
     """
     Create a new AspectTarget instance to define class aspect targets.
 
@@ -563,7 +597,7 @@ def advice(cls):
     Classes decorated with `@advice` are treated as advice classes.
     They can contain methods decorated with `@before`, `@after`, `@around`, or `@error` to define aspects.
     """
-    Providers.register(ClassInstanceProvider(cls, True))
+    #Providers.register(ClassInstanceProvider(cls, True))
 
     Decorators.add(cls, advice)
 
@@ -673,13 +707,15 @@ class AdviceProcessor(PostProcessor):
         for member, aspects in aspect_dict.items():
             Environment.logger.debug("add aspects for %s:%s", type(instance), member.__name__)
 
-            def wrap(jp):
+            def wrap(jp, member=member):
+                @functools.wraps(member)
                 def sync_wrapper(*args, **kwargs):
                     return Invocation(member, jp).call(*args, **kwargs)
 
                 return sync_wrapper
 
-            def wrap_async(jp):
+            def wrap_async(jp, member=member):
+                @functools.wraps(member)
                 async def async_wrapper(*args, **kwargs):
                     return await Invocation(member, jp).call_async(*args, **kwargs)
 

aspyx/di/di.py

@@ -552,7 +552,7 @@ class PostProcessor(LifecycleProcessor):
     """
     __slots__ = []
 
-
+    @abstractmethod
     def process(self, instance: object, environment: Environment):
         pass
 
@@ -689,7 +689,7 @@ class Providers:
             return True
 
         def is_injectable(type: Type) -> bool:
-            if type is object:
+            if type in [object, ABC]:
                 return False
 
             if inspect.isabstract(type):
@@ -998,13 +998,13 @@ class Environment:
             # inherit providers from parent
 
             for provider_type, inherited_provider in self.parent.providers.items():
+                provider = inherited_provider
                 if inherited_provider.get_scope() == "environment":
                     # replace with own environment instance provider
                     provider = EnvironmentInstanceProvider(self, cast(EnvironmentInstanceProvider, inherited_provider).provider)
                     provider.dependencies = [] # ??
-                    add_provider(provider_type, provider)
-                else:
-                    add_provider(provider_type, inherited_provider)
+
+                add_provider(provider_type, provider)
 
             # inherit processors as is unless they have an environment scope
 
@@ -1012,8 +1012,7 @@ class Environment:
                 if self.providers[type(processor)].get_scope() != "environment":
                     self.lifecycle_processors.append(processor)
                 else:
-                    # create and remember
-                    self.lifecycle_processors.append(self.get(type(processor)))
+                    self.get(type(processor)) # will automatically be appended
         else:
             self.providers[SingletonScope] = SingletonScopeInstanceProvider()
             self.providers[RequestScope]   = RequestScopeInstanceProvider()

aspyx/di/threading/synchronized.py

@@ -6,6 +6,7 @@ from __future__ import annotations
 import threading
 from weakref import WeakKeyDictionary
 
+from aspyx.di import injectable
 from aspyx.reflection import Decorators
 from aspyx.di.aop import advice, around, methods, Invocation
 
@@ -20,6 +21,7 @@ def synchronized():
     return decorator
 
 @advice
+@injectable()
 class SynchronizeAdvice:
     # constructor
 
@@ -38,7 +40,7 @@ class SynchronizeAdvice:
 
     # around
 
-    @around(methods().decorated_with(synchronized))
+    @around(methods().decorated_with(synchronized).that_are_sync())
     def synchronize_sync(self, invocation: Invocation):
         with self.get_lock(invocation.args[0]):
             return invocation.proceed()

aspyx/exception/exception_manager.py

@@ -107,6 +107,24 @@ class ExceptionManager:
 
     # internal
 
+    def collect_handlers(self, instance: Any):
+        type_descriptor = TypeDescriptor.for_type(type(instance))
+
+        # analyze methods
+
+        for method in type_descriptor.get_methods():
+            if method.has_decorator(handle):
+                if len(method.param_types) == 1:
+                    exception_type = method.param_types[0]
+
+                    self.handler.append(Handler(
+                        exception_type,
+                        instance,
+                        method.method,
+                    ))
+                else:
+                    print(f"handler {method.method} expected to have one parameter")
+
     @inject_environment()
     def set_environment(self, environment: Environment):
         self.environment = environment
@@ -114,23 +132,7 @@ class ExceptionManager:
     @on_running()
     def setup(self):
         for handler_class in self.exception_handler_classes:
-            type_descriptor = TypeDescriptor.for_type(handler_class)
-            instance = self.environment.get(handler_class)
-
-            # analyze methods
-
-            for method in type_descriptor.get_methods():
-                if method.has_decorator(handle):
-                    if len(method.param_types) == 1:
-                        exception_type = method.param_types[0]
-
-                        self.handler.append(Handler(
-                            exception_type,
-                            instance,
-                            method.method,
-                        ))
-                    else:
-                        print(f"handler {method.method} expected to have one parameter")
+            self.collect_handlers(self.environment.get(handler_class))
 
     def get_handlers(self, clazz: Type) -> Optional[Chain]:
         chain = self.cache.get(clazz, None)

aspyx/reflection/proxy.py

@@ -1,7 +1,9 @@
 """
 Dynamic proxies for method interception and delegation.
 """
+import functools
 import inspect
+from abc import ABC, abstractmethod
 from typing import Generic, TypeVar, Type, Callable
 
 T = TypeVar("T")
@@ -44,10 +46,12 @@ class DynamicProxy(Generic[T]):
             self.args = args
             self.kwargs = kwargs
 
-    class InvocationHandler:
+    class InvocationHandler(ABC):
+        @abstractmethod
         def invoke(self, invocation: 'DynamicProxy.Invocation'):
             pass
 
+        @abstractmethod
         async def invoke_async(self, invocation: 'DynamicProxy.Invocation'):
             return self.invoke(invocation)
 
@@ -73,13 +77,16 @@ class DynamicProxy(Generic[T]):
     def __getattr__(self, name):
         method = getattr(self.type, name)
 
-        if  inspect.iscoroutinefunction(method):
+        if inspect.iscoroutinefunction(method):
+
+            @functools.wraps(method)
             async def async_wrapper(*args, **kwargs):
-                return  await self.invocation_handler.invoke_async(DynamicProxy.Invocation(self.type, method, *args, **kwargs))
+                return await self.invocation_handler.invoke_async(DynamicProxy.Invocation(self.type, method, *args, **kwargs))
 
             return async_wrapper
 
         else:
+            @functools.wraps(method)
             def sync_wrapper(*args, **kwargs):
                 return self.invocation_handler.invoke(DynamicProxy.Invocation(self.type, method, *args, **kwargs))
 

aspyx/reflection/reflection.py

@@ -42,11 +42,15 @@ class Decorators:
             decorator: the decorator
             *args: any arguments supplied to the decorator
         """
-        decorators = getattr(func_or_class, '__decorators__', None)
-        if decorators is None:
+        current = func_or_class.__dict__.get('__decorators__')
+        if current is None:
             setattr(func_or_class, '__decorators__', [DecoratorDescriptor(decorator, *args)])
         else:
-            decorators.append(DecoratorDescriptor(decorator, *args))
+            # Avoid mutating inherited list
+            if '__decorators__' not in func_or_class.__dict__:
+                current = list(current)
+                setattr(func_or_class, '__decorators__', current)
+            current.append(DecoratorDescriptor(decorator, *args))
 
     @classmethod
     def has_decorator(cls, func_or_class, callable: Callable) -> bool:
@@ -82,7 +86,7 @@ class Decorators:
         if inspect.ismethod(func_or_class):
             func_or_class = func_or_class.__func__  # unwrap bound method
 
-        #return getattr(func_or_class, '__decorators__', []) will return inherited as well
+        #return getattr(func_or_class, '__decorators__', []) #will return inherited as well
         return func_or_class.__dict__.get('__decorators__', [])
 
 

{aspyx-1.5.1.dist-info → aspyx-1.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aspyx
-Version: 1.5.1
+Version: 1.5.2
 Summary: A DI and AOP library for Python
 Author-email: Andreas Ernst <andreas.ernst7@gmail.com>
 License: MIT License

{aspyx-1.5.1.dist-info → aspyx-1.5.2.dist-info}/RECORD

@@ -1,24 +1,24 @@
 aspyx/__init__.py,sha256=MsSFjiLMLJZ7QhUPpVBWKiyDnCzryquRyr329NoCACI,2
 aspyx/di/__init__.py,sha256=AGVU2VBWQyBxSssvbk_GOKrYWIYtcmSoIlupz-Oqxi4,1138
-aspyx/di/di.py,sha256=O8FUZm68aimUbt7GnIc43XzRa47iFV8Qh696JGOwdEE,44703
+aspyx/di/di.py,sha256=V_BAV6DmFCoepPqAXhBz2GW6NwYaKokHb03HMz6A5Sw,44639
 aspyx/di/aop/__init__.py,sha256=rn6LSpzFtUOlgaBATyhLRWBzFmZ6XoVKA9B8SgQzYEI,746
-aspyx/di/aop/aop.py,sha256=Cn-fqFW6PznVDM38fPX7mqlSpjGKMsgpJRBSYBv59xY,18403
+aspyx/di/aop/aop.py,sha256=UqBpBI2nW6_8CLmY1j0F4cE2QVBQDgry9LWShVuxZKM,19367
 aspyx/di/configuration/__init__.py,sha256=flM9A79J2wfA5I8goQbxs4tTqYustR9tn_9s0YO2WJQ,484
 aspyx/di/configuration/configuration.py,sha256=cXW40bPXiUZ9hUtBoZkSATT3nLrDPWsSqxtgASIBQaM,4375
 aspyx/di/configuration/env_configuration_source.py,sha256=FXPvREzq2ZER6_GG5xdpx154TQQDxZVf7LW7cvaylAk,1446
 aspyx/di/configuration/yaml_configuration_source.py,sha256=NDl3SeoLMNVlzHgfP-Ysvhco1tRew_zFnBL5gGy2WRk,550
 aspyx/di/threading/__init__.py,sha256=qrWdaq7MewQ2UmZy4J0Dn6BhY-ahfiG3xsv-EHqoqSE,191
-aspyx/di/threading/synchronized.py,sha256=BQ9PjMQUJsF5r-qWaDgvqg3AvFm_R9QZdKB49EkoelQ,1263
+aspyx/di/threading/synchronized.py,sha256=6JOg5BXWrRIS5nRPH9iWR7T-kUglO4qWBQpLwhy99pI,1325
 aspyx/exception/__init__.py,sha256=OZwv-C3ZHD0Eg1rohCQMj575WLJ7lfYuk6PZD6sh1MA,211
-aspyx/exception/exception_manager.py,sha256=tv0nb0b2CFPiYWK6wwH9yI8hSc--9Xz9_xQVBwU42wc,5228
+aspyx/exception/exception_manager.py,sha256=_pK4yTS5FJYj2SW1ijdBVD_6qrPUM9elMgZki2pf-Tw,5237
 aspyx/reflection/__init__.py,sha256=r2sNJrfHDpuqaIYu4fTYsoo046gpgn4VTd7bsS3mQJY,282
-aspyx/reflection/proxy.py,sha256=9zqzmK2HGGx7LxdiBw8MfKRNT8H03h_0I6Y972eKFH8,2582
-aspyx/reflection/reflection.py,sha256=HYzbzExG7jzdHG_AggrRxy9yte6Cl192dPsJBRl785Y,8939
+aspyx/reflection/proxy.py,sha256=1-pgw-TNORFXbV0gowFZqGd-bcWv1ny69bJhq8TLsKs,2761
+aspyx/reflection/reflection.py,sha256=BcqXJcMO36Gzq71O4aBsMqPynmBhYLI8V6J7DOInPAM,9142
 aspyx/threading/__init__.py,sha256=3clmbCDP37GPan3dWtxTQvpg0Ti4aFzruAbUClkHGi0,147
 aspyx/threading/thread_local.py,sha256=86dNtbA4k2B-rNUUnZgn3_pU0DAojgLrRnh8RL6zf1E,1196
 aspyx/util/__init__.py,sha256=8H2yKkXu3nkRGeTerb8ialzKGfvzUx44XUWFUYcYuQM,125
 aspyx/util/stringbuilder.py,sha256=a-0T4YEXSJFUuQ3ztKN1ZPARkh8dIGMSkNEEJHRN7dc,856
-aspyx-1.5.1.dist-info/METADATA,sha256=U4sRH9owvFuCgQINKFlC84hL5BnQ-5kGavDNb-q8D88,26490
-aspyx-1.5.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aspyx-1.5.1.dist-info/licenses/LICENSE,sha256=n4jfx_MNj7cBtPhhI7MCoB_K35cj1icP9yJ4Rh4vlvY,1070
-aspyx-1.5.1.dist-info/RECORD,,
+aspyx-1.5.2.dist-info/METADATA,sha256=mRlR5o-1WlYVvThk483KJTv738uNq5y02VkquUUsYDk,26490
+aspyx-1.5.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aspyx-1.5.2.dist-info/licenses/LICENSE,sha256=n4jfx_MNj7cBtPhhI7MCoB_K35cj1icP9yJ4Rh4vlvY,1070
+aspyx-1.5.2.dist-info/RECORD,,