aspyx 1.6.0__tar.gz → 1.7.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aspyx
-Version: 1.6.0
+Version: 1.7.0
 Summary: A DI and AOP library for Python
 Author-email: Andreas Ernst <andreas.ernst7@gmail.com>
 License: MIT License
@@ -117,9 +117,6 @@ from aspyx.di import injectable, on_init, on_destroy, module, Environment
 
 @injectable()
 class Foo:
-    def __init__(self):
-        pass
-
     def hello(self, msg: str):
         print(f"hello {msg}")
 
@@ -138,9 +135,7 @@ class Bar:
 
 @module()
 class SampleModule:
-    def __init__(self):
-        pass
-
+    pass
 
 # create environment
 
@@ -148,7 +143,7 @@ environment = Environment(SampleModule)
 
 # fetch an instance
 
-bar = env.read(Bar)
+bar = environment.get(Bar)
 
 bar.foo.hello("world")
 ```
@@ -206,10 +201,7 @@ class Foo:
     def __init__(self):
         pass
 ```
-⚠️ **Attention:** Please make sure, that the class defines a local constructor, as this is _required_ to determine injected instances. 
-All referenced types will be injected by the environment. 
-
-Only eligible types are allowed, of course!
+If the class defines a constructor, all parameters - which are expected to be registered as well - will be injected automatically.
 
 The decorator accepts the keyword arguments
 - `eager : boolean`  
@@ -235,9 +227,6 @@ Classes that implement the `Factory` base class and are annotated with `@factory
 ```python
 @factory()
 class TestFactory(Factory[Foo]):
-    def __init__(self):
-        pass
-
     def create(self) -> Foo:
         return Foo()
 ```
@@ -252,9 +241,6 @@ Any `injectable` can define methods decorated with `@create()`, that will create
 ```python
 @injectable()
 class Foo:
-    def __init__(self):
-        pass
-
     @create(scope="request")
     def create(self) -> Baz:
         return Baz()
@@ -290,8 +276,7 @@ constructor type argument called `module`.
 ```python
 @module()
 class SampleModule:
-    def __init__(self):
-        pass
+    pass
 ```
 
 A module is a regular injectable class decorated with `@module` that controls the discovery of injectable classes, by filtering classes according to their module location relative to this class. 
@@ -311,13 +296,11 @@ By adding the parameter `features: list[str]`, it is possible to filter injectab
 @injectable()
 @conditional(requires_feature("dev"))
 class DevOnly:
-     def __init__(self):
-        pass
+     pass
 
 @module()
 class SampleModule():
-    def __init__(self):
-        pass
+    pass
 
 environment = Environment(SampleModule, features=["dev"])
 ```
@@ -329,8 +312,7 @@ By adding an `imports: list[Type]` parameter, specifying other module types, it
 ```python
 @module()
 class SampleModule(imports=[OtherModule]):
-    def __init__(self):
-        pass
+    pass
 ```
 
 Another possibility is to add a parent environment as an `Environment` constructor parameter
@@ -392,11 +374,8 @@ Different decorators are implemented, that call methods with computed values
 ```python
 @injectable()
 class Foo:
-    def __init__(self):
-        pass
-
     @inject_environment()
-    def initEnvironment(self, env: Environment):
+    def set_environment(self, env: Environment):
         ...
 
     @inject()
@@ -586,9 +565,6 @@ A handy decorator `@synchronized` in combination with the respective advice is i
 ```python
 @injectable()
 class Foo:
-    def __init__(self):
-        pass
-
     @synchronized()
     def execute_synchronized(self):
         ...
@@ -601,9 +577,6 @@ It is possible to inject configuration values, by decorating methods with `@inje
 ```python
 @injectable()
 class Foo:
-    def __init__(self):
-        pass
-
     @inject_value("HOME")
     def inject_home(self, os: str):
         ...
@@ -615,13 +588,13 @@ Configuration values are managed centrally using a `ConfigurationManager`, which
 
 ```python
 class ConfigurationSource(ABC):
-    def __init__(self):
-        pass
-
-   ...
+    @inject()
+    def set_manager(self, manager: ConfigurationManager):
+        manager._register(self)
 
     @abstractmethod
     def load(self) -> dict:
+       pass
 ```
 
 The `load` method is able to return a tree-like structure by returning a `dict`.
@@ -670,11 +643,6 @@ Typically you create the required configuration sources in an environment class,
 ```python
 @module()
 class SampleModule:
-    # constructor
-
-    def __init__(self):
-        pass
-
     @create()
     def create_env_source(self) -> EnvConfigurationSource:
         return EnvConfigurationSource()
@@ -733,7 +701,7 @@ def transactional(scope):
 The class `ExceptionManager` is used to collect dynamic handlers for specific exceptions and is able to dispatch to the concrete functions
 given a specific exception.
 
-The handlers are declared by annoting a class with `@exception_handler` and decorating specific methods with `@handle`
+The handlers are declared by annoting a class with `@exception_handler` and decorating specific methods with `@catch`
 
 **Example**:
 
@@ -745,11 +713,6 @@ class DerivedException(Exception):
 
 @module()
 class SampleModule:
-    # constructor
-
-    def __init__(self):
-        pass
-
     @create()
     def create_exception_manager(self) -> ExceptionManager:
         return ExceptionManager()
@@ -758,19 +721,16 @@ class SampleModule:
 @injectable()
 @exception_handler()
 class TestExceptionHandler:
-    def __init__(self):
-        pass
-
-    @handle()
-    def handle_derived_exception(self, exception: DerivedException):
+    @catch()
+    def catch_derived_exception(self, exception: DerivedException):
         ExceptionManager.proceed()
 
-    @handle()
-    def handle_exception(self, exception: Exception):
+    @catch()
+    def catch_exception(self, exception: Exception):
         pass
 
-    @handle()
-    def handle_base_exception(self, exception: BaseException):
+    @catch()
+    def catch_base_exception(self, exception: BaseException):
         pass
 
 
@@ -798,9 +758,6 @@ Together with a simple around advice we can now add exception handling to any me
 ```python
 @injectable()
 class Service:
-    def __init__(self):
-        pass
-
     def throw(self):
         raise DerivedException()
 
@@ -843,3 +800,7 @@ class ExceptionAdvice:
 **1.4.1**
 
 - mkdocs
+
+**1.6.1**
+
+- default constructors not requires anymore

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

@@ -83,9 +83,6 @@ from aspyx.di import injectable, on_init, on_destroy, module, Environment
 
 @injectable()
 class Foo:
-    def __init__(self):
-        pass
-
     def hello(self, msg: str):
         print(f"hello {msg}")
 
@@ -104,9 +101,7 @@ class Bar:
 
 @module()
 class SampleModule:
-    def __init__(self):
-        pass
-
+    pass
 
 # create environment
 
@@ -114,7 +109,7 @@ environment = Environment(SampleModule)
 
 # fetch an instance
 
-bar = env.read(Bar)
+bar = environment.get(Bar)
 
 bar.foo.hello("world")
 ```
@@ -172,10 +167,7 @@ class Foo:
     def __init__(self):
         pass
 ```
-⚠️ **Attention:** Please make sure, that the class defines a local constructor, as this is _required_ to determine injected instances. 
-All referenced types will be injected by the environment. 
-
-Only eligible types are allowed, of course!
+If the class defines a constructor, all parameters - which are expected to be registered as well - will be injected automatically.
 
 The decorator accepts the keyword arguments
 - `eager : boolean`  
@@ -201,9 +193,6 @@ Classes that implement the `Factory` base class and are annotated with `@factory
 ```python
 @factory()
 class TestFactory(Factory[Foo]):
-    def __init__(self):
-        pass
-
     def create(self) -> Foo:
         return Foo()
 ```
@@ -218,9 +207,6 @@ Any `injectable` can define methods decorated with `@create()`, that will create
 ```python
 @injectable()
 class Foo:
-    def __init__(self):
-        pass
-
     @create(scope="request")
     def create(self) -> Baz:
         return Baz()
@@ -256,8 +242,7 @@ constructor type argument called `module`.
 ```python
 @module()
 class SampleModule:
-    def __init__(self):
-        pass
+    pass
 ```
 
 A module is a regular injectable class decorated with `@module` that controls the discovery of injectable classes, by filtering classes according to their module location relative to this class. 
@@ -277,13 +262,11 @@ By adding the parameter `features: list[str]`, it is possible to filter injectab
 @injectable()
 @conditional(requires_feature("dev"))
 class DevOnly:
-     def __init__(self):
-        pass
+     pass
 
 @module()
 class SampleModule():
-    def __init__(self):
-        pass
+    pass
 
 environment = Environment(SampleModule, features=["dev"])
 ```
@@ -295,8 +278,7 @@ By adding an `imports: list[Type]` parameter, specifying other module types, it
 ```python
 @module()
 class SampleModule(imports=[OtherModule]):
-    def __init__(self):
-        pass
+    pass
 ```
 
 Another possibility is to add a parent environment as an `Environment` constructor parameter
@@ -358,11 +340,8 @@ Different decorators are implemented, that call methods with computed values
 ```python
 @injectable()
 class Foo:
-    def __init__(self):
-        pass
-
     @inject_environment()
-    def initEnvironment(self, env: Environment):
+    def set_environment(self, env: Environment):
         ...
 
     @inject()
@@ -552,9 +531,6 @@ A handy decorator `@synchronized` in combination with the respective advice is i
 ```python
 @injectable()
 class Foo:
-    def __init__(self):
-        pass
-
     @synchronized()
     def execute_synchronized(self):
         ...
@@ -567,9 +543,6 @@ It is possible to inject configuration values, by decorating methods with `@inje
 ```python
 @injectable()
 class Foo:
-    def __init__(self):
-        pass
-
     @inject_value("HOME")
     def inject_home(self, os: str):
         ...
@@ -581,13 +554,13 @@ Configuration values are managed centrally using a `ConfigurationManager`, which
 
 ```python
 class ConfigurationSource(ABC):
-    def __init__(self):
-        pass
-
-   ...
+    @inject()
+    def set_manager(self, manager: ConfigurationManager):
+        manager._register(self)
 
     @abstractmethod
     def load(self) -> dict:
+       pass
 ```
 
 The `load` method is able to return a tree-like structure by returning a `dict`.
@@ -636,11 +609,6 @@ Typically you create the required configuration sources in an environment class,
 ```python
 @module()
 class SampleModule:
-    # constructor
-
-    def __init__(self):
-        pass
-
     @create()
     def create_env_source(self) -> EnvConfigurationSource:
         return EnvConfigurationSource()
@@ -699,7 +667,7 @@ def transactional(scope):
 The class `ExceptionManager` is used to collect dynamic handlers for specific exceptions and is able to dispatch to the concrete functions
 given a specific exception.
 
-The handlers are declared by annoting a class with `@exception_handler` and decorating specific methods with `@handle`
+The handlers are declared by annoting a class with `@exception_handler` and decorating specific methods with `@catch`
 
 **Example**:
 
@@ -711,11 +679,6 @@ class DerivedException(Exception):
 
 @module()
 class SampleModule:
-    # constructor
-
-    def __init__(self):
-        pass
-
     @create()
     def create_exception_manager(self) -> ExceptionManager:
         return ExceptionManager()
@@ -724,19 +687,16 @@ class SampleModule:
 @injectable()
 @exception_handler()
 class TestExceptionHandler:
-    def __init__(self):
-        pass
-
-    @handle()
-    def handle_derived_exception(self, exception: DerivedException):
+    @catch()
+    def catch_derived_exception(self, exception: DerivedException):
         ExceptionManager.proceed()
 
-    @handle()
-    def handle_exception(self, exception: Exception):
+    @catch()
+    def catch_exception(self, exception: Exception):
         pass
 
-    @handle()
-    def handle_base_exception(self, exception: BaseException):
+    @catch()
+    def catch_base_exception(self, exception: BaseException):
         pass
 
 
@@ -764,9 +724,6 @@ Together with a simple around advice we can now add exception handling to any me
 ```python
 @injectable()
 class Service:
-    def __init__(self):
-        pass
-
     def throw(self):
         raise DerivedException()
 
@@ -809,3 +766,7 @@ class ExceptionAdvice:
 **1.4.1**
 
 - mkdocs
+
+**1.6.1**
+
+- default constructors not requires anymore

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

@@ -1,6 +1,6 @@
 [project]
 name = "aspyx"
-version = "1.6.0"
+version = "1.7.0"
 description = "A DI and AOP library for Python"
 authors = [{ name = "Andreas Ernst", email = "andreas.ernst7@gmail.com" }]
 readme = "README.md"

{aspyx-1.6.0 → aspyx-1.7.0}/src/aspyx/di/configuration/configuration.py

@@ -106,9 +106,6 @@ class ConfigurationSource(ABC):
 
     __slots__ = []
 
-    def __init__(self):
-        pass
-
     @inject()
     def set_manager(self, manager: ConfigurationManager):
         manager._register(self)

{aspyx-1.6.0 → aspyx-1.7.0}/src/aspyx/di/configuration/env_configuration_source.py

@@ -14,11 +14,6 @@ class EnvConfigurationSource(ConfigurationSource):
 
     __slots__ = []
 
-    # constructor
-
-    def __init__(self):
-        super().__init__()
-
     # implement
 
     def load(self) -> dict:

{aspyx-1.6.0 → aspyx-1.7.0}/src/aspyx/di/configuration/yaml_configuration_source.py

@@ -15,8 +15,6 @@ class YamlConfigurationSource(ConfigurationSource):
     # constructor
 
     def __init__(self, file: str):
-        super().__init__()
-
         self.file = file
 
     # implement

{aspyx-1.6.0 → aspyx-1.7.0}/src/aspyx/di/di.py

@@ -8,6 +8,7 @@ import logging
 import importlib
 import pkgutil
 import sys
+import time
 
 from abc import abstractmethod, ABC
 from enum import Enum
@@ -405,12 +406,10 @@ class ClassInstanceProvider(InstanceProvider):
         # check constructor
 
         init = TypeDescriptor.for_type(self.type).get_method("__init__")
-        if init is None:
-            raise DIRegistrationException(f"{self.type.__name__} does not implement __init__")
-
-        self.params = len(init.param_types)
-        for param in init.param_types:
-            types.append(param)
+        if init is not None:
+            self.params = len(init.param_types)
+            for param in init.param_types:
+                types.append(param)
 
         # check @inject
 
@@ -976,7 +975,7 @@ class Environment:
         """
 
         def add_provider(type: Type, provider: AbstractInstanceProvider):
-            Environment.logger.debug("\tadd provider %s for %s", provider, type)
+            Environment.logger.info("\tadd provider %s for %s", provider, type)
 
             self.providers[type] = provider
 
@@ -989,6 +988,8 @@ class Environment:
         if self.parent is None and env is not Boot:
             self.parent = Boot.get_environment() # inherit environment including its manged instances!
 
+        start = time.perf_counter()
+
         self.features = features
         self.providers: Dict[Type, AbstractInstanceProvider] = {}
         self.instances = []
@@ -1138,6 +1139,13 @@ class Environment:
         for instance in self.instances:
             self.execute_processors(Lifecycle.ON_RUNNING, instance)
 
+        # done
+
+        end = time.perf_counter()
+
+        Environment.logger.info("created environment for class %s in %s ms, created %s instances", env.__qualname__, 1000 * (end - start),  len(self.instances))
+
+
     def is_registered_type(self, type: Type) -> bool:
         provider = self.providers.get(type, None)
         return provider is not None and not isinstance(provider, AmbiguousProvider)

{aspyx-1.6.0 → aspyx-1.7.0}/src/aspyx/reflection/reflection.py

@@ -94,7 +94,12 @@ class TypeDescriptor:
     """
     This class provides a way to introspect Python classes, their methods, decorators, and type hints.
     """
-    # inner class
+    # inner classes
+
+    class ParameterDescriptor:
+        def __init__(self, name: str, type: Type):
+            self.name = name
+            self.type = type
 
     class MethodDescriptor:
         """
@@ -107,12 +112,14 @@ class TypeDescriptor:
             self.method = method
             self.decorators: list[DecoratorDescriptor] = Decorators.get(method)
             self.param_types : list[Type] = []
+            self.params: list[TypeDescriptor.ParameterDescriptor] = []
 
             type_hints = get_type_hints(method)
             sig = signature(method)
 
             for name, _ in sig.parameters.items():
                 if name != 'self':
+                    self.params.append(TypeDescriptor.ParameterDescriptor(name, type_hints.get(name)))
                     self.param_types.append(type_hints.get(name, object))
 
             self.return_type = type_hints.get('return', None)

{aspyx-1.6.0 → aspyx-1.7.0}/src/aspyx/util/__init__.py

@@ -4,11 +4,14 @@ This module provides utility functions.
 from .stringbuilder import StringBuilder
 from .logger import Logger
 from .serialization import TypeSerializer, TypeDeserializer, get_serializer, get_deserializer
+from .copy_on_write_cache import CopyOnWriteCache
 
 __all__ = [
     "StringBuilder",
     "Logger",
 
+    "CopyOnWriteCache",
+
     "TypeSerializer",
     "TypeDeserializer",
     "get_serializer",

aspyx-1.7.0/src/aspyx/util/copy_on_write_cache.py

@@ -0,0 +1,37 @@
+from typing import TypeVar, Generic, Optional, Callable
+
+K = TypeVar("K")
+V = TypeVar("V")
+
+class CopyOnWriteCache(Generic[K, V]):
+    # constructor
+
+    def __init__(self, factory: Optional[Callable[[K], V]] = None) -> None:
+        self._cache: dict[K, V] = {}
+        self._factory = factory
+
+    # public
+
+    def get(self, key: K, factory: Optional[Callable[[K], V]] = None) -> Optional[V]:
+        value = self._cache.get(key, None)
+        if value is None:
+            if factory is not None:
+                value = factory(key)
+                self.put(key, value)
+
+            elif self._factory is not None:
+                value = self._factory(key)
+                self.put(key, value)
+
+        return value
+
+    def put(self, key: K, value: V) -> None:
+        new_cache = self._cache.copy()
+        new_cache[key] = value
+        self._cache = new_cache
+
+    def contains(self, key: K) -> bool:
+        return key in self._cache
+
+    def clear(self) -> None:
+        self._cache = {}

{aspyx-1.6.0 → aspyx-1.7.0}/tests/di_import.py

@@ -5,10 +5,8 @@ from aspyx.di import module, injectable
 
 @module()
 class ImportedModule:
-    def __init__(self):
-        pass
+    pass
 
 @injectable()
 class ImportedClass:
-    def __init__(self):
-        pass
+    pass

{aspyx-1.6.0 → aspyx-1.7.0}/tests/sub_import.py

@@ -5,10 +5,8 @@ from aspyx.di import module, injectable
 
 @module()
 class SubImportModule:
-    def __init__(self):
-        pass
+    pass
 
 @injectable()
 class Sub:
-    def __init__(self):
-        pass
+    pass

{aspyx-1.6.0 → aspyx-1.7.0}/tests/test_aop.py

@@ -34,16 +34,12 @@ def transactional():
 
 @module()
 class SampleModule:
-    def __init__(self):
-        pass
+    pass
 
 
 @injectable()
 @transactional()
 class Bar:
-    def __init__(self):
-        pass
-
     async def say_async(self, message: str):
         await asyncio.sleep(0.01)
 

{aspyx-1.6.0 → aspyx-1.7.0}/tests/test_configuration.py

@@ -14,11 +14,6 @@ from aspyx.di import injectable, Environment, module, create
 
 @module()
 class SampleModule:
-    # constructor
-
-    def __init__(self):
-        pass
-
     @create()
     def create_env_source(self) -> EnvConfigurationSource:
         return EnvConfigurationSource()
@@ -30,10 +25,6 @@ class SampleModule:
 
 @injectable()
 class SampleConfigurationSource1(ConfigurationSource):
-    # constructor
-
-    def __init__(self):
-        super().__init__()
 
     def load(self) -> dict:
         return {
@@ -43,11 +34,6 @@ class SampleConfigurationSource1(ConfigurationSource):
 
 @injectable()
 class SampleConfigurationSource2(ConfigurationSource):
-    # constructor
-
-    def __init__(self):
-        super().__init__()
-
     def load(self) -> dict:
         return {
             "b": {

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

@@ -69,8 +69,9 @@ class Baz:
 
 @injectable()
 class Bazong:
-    def __init__(self):
-        pass
+    pass
+    #def __init__(self):
+    #    pass
 
 class ConditionalBase:
     pass