aspyx 1.5.0__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

@@ -316,7 +316,7 @@ class EnvironmentInstanceProvider(AbstractInstanceProvider):
 
         self.environment = environment
         self.provider = provider
-        self.dependencies : list[AbstractInstanceProvider] = []
+        self.dependencies : Optional[list[AbstractInstanceProvider]] = None # FOO
         self.scope_instance = Scopes.get(provider.get_scope(), environment)
 
     # public
@@ -340,27 +340,20 @@ class EnvironmentInstanceProvider(AbstractInstanceProvider):
     # implement
 
     def resolve(self, context: Providers.ResolveContext):
-        context.add(self)
-        context.push(self)
+        if self.dependencies is None:
+            self.dependencies = []
+            context.push(self)
+            try:
+                type_and_params = self.provider.get_dependencies()
+                #params = type_and_params[1]
+                for type in type_and_params[0]:
+                    provider = context.require_provider(type)
 
-        if not context.is_resolved(self):
-            context.provider_dependencies[self] = [] #?
+                    self.dependencies.append(provider)
 
-            type_and_params = self.provider.get_dependencies()
-            params = type_and_params[1]
-            for type in type_and_params[0]:
-                if params > 0:
-                    params -= 1
-                    self.dependencies.append(context.get_provider(type)) # try/catch TODO
-
-                provider = context.add_provider_dependency(self, type)
-                if provider is not None:
                     provider.resolve(context)
-
-        else:
-            context.add(*context.get_provider_dependencies(self))
-
-        context.pop()
+            finally:
+                context.pop()
 
     def get_module(self) -> str:
         return self.provider.get_module()
@@ -559,7 +552,7 @@ class PostProcessor(LifecycleProcessor):
     """
     __slots__ = []
 
-
+    @abstractmethod
     def process(self, instance: object, environment: Environment):
         pass
 
@@ -570,72 +563,39 @@ class PostProcessor(LifecycleProcessor):
 
 class Providers:
     """
-    The Providers class is a static class that manages the registration and resolution of InstanceProviders.
+    The Providers class is a static class used in the context of the registration and resolution of InstanceProviders.
     """
     # local class
 
     class ResolveContext:
         __slots__ = [
-            "dependencies",
             "providers",
-            "provider_dependencies",
             "path"
         ]
 
         # constructor
 
         def __init__(self, providers: Dict[Type, EnvironmentInstanceProvider]):
-            self.dependencies : list[EnvironmentInstanceProvider] = []
             self.providers = providers
             self.path = []
-            self.provider_dependencies : dict[EnvironmentInstanceProvider, list[EnvironmentInstanceProvider]] = {}
 
         # public
 
-        def is_resolved(self, provider: EnvironmentInstanceProvider) -> bool:
-            return self.provider_dependencies.get(provider, None) is not None
-
-        def get_provider_dependencies(self, provider: EnvironmentInstanceProvider) -> list[EnvironmentInstanceProvider]:
-            return self.provider_dependencies[provider]
-
-        def add_provider_dependency(self, provider: EnvironmentInstanceProvider, type: Type) -> Optional[EnvironmentInstanceProvider]:
-            provider_dependencies = self.provider_dependencies.get(provider, None)
-            if provider_dependencies is None:
-                provider_dependencies = []
-                self.provider_dependencies[provider] = provider_dependencies
-
-            provider = self.get_provider(type)
-
-            if any(issubclass(provider.get_type(), dependency.get_type()) for dependency in provider_dependencies):
-                return None
-
-            provider_dependencies.append(provider)
-
-            return provider
-
         def push(self, provider):
             self.path.append(provider)
 
         def pop(self):
             self.path.pop()
 
-        def next(self):
-            self.path.clear()
-            self.dependencies.clear()
-
-        def get_provider(self, type: Type) -> EnvironmentInstanceProvider:
+        def require_provider(self, type: Type) -> EnvironmentInstanceProvider:
             provider = self.providers.get(type, None)
             if provider is None:
                 raise DIRegistrationException(f"Provider for {type} is not defined")
 
-            return provider
-
-        def add(self, *providers: EnvironmentInstanceProvider):
-            for provider in providers:
-                if next((p for p in self.dependencies if p.get_type() is provider.get_type()), None) is not None:
-                    raise DIRegistrationException(self.cycle_report(provider))
+            if provider in self.path:
+                raise DIRegistrationException(self.cycle_report(provider))
 
-                self.dependencies.append(provider)
+            return provider
 
         def cycle_report(self, provider: AbstractInstanceProvider):
             cycle = ""
@@ -729,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):
@@ -788,7 +748,6 @@ class Providers:
         provider_context = Providers.ResolveContext(providers)
         for provider in mapped.values():
             provider.resolve(provider_context)
-            provider_context.next() # clear dependencies
 
         # done
 
@@ -1016,6 +975,11 @@ class Environment:
             parent (Optional[Environment]): Optional parent environment, whose objects are inherited.
         """
 
+        def add_provider(type: Type, provider: AbstractInstanceProvider):
+            Environment.logger.debug("\tadd provider %s for %s", provider, type)
+
+            self.providers[type] = provider
+
         Environment.logger.debug("create environment for class %s", env.__qualname__)
 
         # initialize
@@ -1034,11 +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
-                    self.providers[provider_type] = EnvironmentInstanceProvider(self, cast(EnvironmentInstanceProvider, inherited_provider).provider)
-                else:
-                    self.providers[provider_type] = inherited_provider
+                    provider = EnvironmentInstanceProvider(self, cast(EnvironmentInstanceProvider, inherited_provider).provider)
+                    provider.dependencies = [] # ??
+
+                add_provider(provider_type, provider)
 
             # inherit processors as is unless they have an environment scope
 
@@ -1046,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()
@@ -1059,11 +1024,6 @@ class Environment:
 
         loaded = set()
 
-        def add_provider(type: Type, provider: AbstractInstanceProvider):
-            Environment.logger.debug("\tadd provider %s for %s", provider, type)
-
-            self.providers[type] = provider
-
         def get_type_package(type: Type):
             module_name = type.__module__
             module = sys.modules.get(module_name)
@@ -1170,9 +1130,6 @@ class Environment:
         # construct eager objects for local providers
 
         for provider in set(self.providers.values()):
-            if isinstance(provider, EnvironmentInstanceProvider):
-                provider.print_tree()
-
             if provider.is_eager():
                 provider.create(self)
 

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__', [])