orionis 0.379.0__tar.gz → 0.381.0__tar.gz

{orionis-0.379.0/orionis.egg-info → orionis-0.381.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: orionis
-Version: 0.379.0
+Version: 0.381.0
 Summary: Orionis Framework – Elegant, Fast, and Powerful.
 Home-page: https://github.com/orionis-framework/framework
 Author: Raul Mauricio Uñate Castro

{orionis-0.379.0 → orionis-0.381.0}/orionis/container/resolver/resolver.py

@@ -8,6 +8,7 @@ from orionis.container.exceptions import OrionisContainerException
 from orionis.services.introspection.callables.reflection import ReflectionCallable
 from orionis.services.introspection.concretes.reflection import ReflectionConcrete
 from orionis.services.introspection.dependencies.entities.known_dependencies import KnownDependency
+from orionis.services.introspection.dependencies.entities.method_dependencies import MethodDependency
 
 class Resolver(IResolver):
     """
@@ -65,6 +66,146 @@ class Resolver(IResolver):
         elif binding.lifetime == Lifetime.SCOPED:
             return self.__resolveScoped(binding, *args, **kwargs)
 
+    def resolveType(
+        self,
+        type_: Callable[..., Any],
+        *args,
+        **kwargs
+    ) -> Any:
+        """
+        Forces resolution of a type whether it's registered in the container or not.
+
+        Parameters
+        ----------
+        type_ : Callable[..., Any]
+            The type or callable to resolve.
+        *args : tuple
+            Positional arguments to pass to the constructor/callable.
+        **kwargs : dict
+            Keyword arguments to pass to the constructor/callable.
+
+        Returns
+        -------
+        Any
+            The resolved instance.
+
+        Raises
+        ------
+        OrionisContainerException
+            If the type cannot be resolved.
+        """
+
+        # Try to resolve the type with the provided arguments
+        # If the type is already bound in the container, resolve it directly
+        # or if args or kwargs are provided, instantiate it directly
+        # If the type is a concrete class, instantiate it with resolved dependencies
+        try:
+
+            # Check if the type is already bound in the container
+            if self.container.bound(type_):
+                binding = self.container.getBinding(type_)
+                return self.resolve(binding, *args, **kwargs)
+
+            # If args or kwargs are provided, use them directly
+            if args or kwargs:
+
+                # For classes
+                if isinstance(type_, type):
+                    return type_(*args, **kwargs)
+
+                # For callables
+                elif callable(type_):
+                    return type_(*args, **kwargs)
+
+            # Otherwise use reflection to resolve dependencies
+            # If the type is a concrete class, instantiate it with resolved dependencies
+            elif ReflectionConcrete.isConcreteClass(type_):
+                return type_(**self.__resolveDependencies(type_, is_class=True))
+
+            # Try to call directly if it's a callable
+            elif callable(type_) and not isinstance(type_, type):
+                return type_(**self.__resolveDependencies(type_, is_class=False))
+
+            # If the type is neither a concrete class nor a callable, raise an exception
+            raise OrionisContainerException(
+                f"Cannot force resolve: {getattr(type_, '__name__', str(type_))} is neither a concrete class nor a callable."
+            )
+
+        except Exception as e:
+
+            # Get the type name safely to avoid AttributeError
+            type_name = getattr(type_, '__name__', str(type_))
+            module_name = getattr(type_, '__module__', "unknown module")
+
+            # Provide more detailed error message
+            error_msg = f"Error while force-resolving '{type_name}' from '{module_name}':\n{str(e)}"
+
+            # If it's already an OrionisContainerException, just re-raise it with the context
+            if isinstance(e, OrionisContainerException):
+                raise e from None
+
+            # Raise a new OrionisContainerException with the original exception as context
+            else:
+                raise OrionisContainerException(error_msg) from e
+
+    def resolveSignature(
+        self,
+        signature: MethodDependency
+    ) -> dict:
+        """
+        Resolves dependencies defined in a method signature.
+
+        Parameters
+        ----------
+        signature : MethodDependency
+            The method dependency information to resolve.
+
+        Returns
+        -------
+        dict
+            A dictionary of resolved parameter values.
+
+        Raises
+        ------
+        OrionisContainerException
+            If any dependencies cannot be resolved.
+        """
+        # If no dependencies to resolve, return empty dict
+        if not signature.resolved and not signature.unresolved:
+            return {}
+
+        # If there are unresolved dependencies, raise an error
+        if signature.unresolved:
+            raise OrionisContainerException(
+                f"Cannot resolve method dependencies because the following parameters are unresolved: {', '.join(signature.unresolved)}."
+            )
+
+        # Create a dict of resolved dependencies
+        params = {}
+        for param_name, dep in signature.resolved.items():
+            if isinstance(dep, KnownDependency):
+                # Try to resolve the dependency using the container
+                if self.container.bound(dep.type):
+                    params[param_name] = self.resolve(
+                        self.container.getBinding(dep.type)
+                    )
+                elif self.container.bound(dep.full_class_path):
+                    params[param_name] = self.resolve(
+                        self.container.getBinding(dep.full_class_path)
+                    )
+                # Try to resolve directly if it's a concrete type
+                elif ReflectionConcrete.isConcreteClass(dep.type):
+                    params[param_name] = self.resolveType(dep.type)
+                else:
+                    raise OrionisContainerException(
+                        f"Cannot resolve dependency '{param_name}' of type '{dep.type.__name__}'."
+                    )
+            else:
+                # Use default value
+                params[param_name] = dep
+
+        return params
+
     def __resolveTransient(self, binding: Binding, *args, **kwargs) -> Any:
         """
         Resolves a service with transient lifetime.

{orionis-0.379.0 → orionis-0.381.0}/orionis/metadata/framework.py

@@ -5,7 +5,7 @@
 NAME = "orionis"
 
 # Current version of the framework
-VERSION = "0.379.0"
+VERSION = "0.381.0"
 
 # Full name of the author or maintainer of the project
 AUTHOR = "Raul Mauricio Uñate Castro"

{orionis-0.379.0 → orionis-0.381.0}/orionis/test/core/unit_test.py

@@ -10,8 +10,11 @@ from contextlib import redirect_stdout, redirect_stderr
 from datetime import datetime
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple
+from orionis.container.resolver.resolver import Resolver
 from orionis.foundation.contracts.application import IApplication
+from orionis.services.introspection.concretes.reflection import ReflectionConcrete
 from orionis.services.introspection.instances.reflection import ReflectionInstance
+from orionis.services.introspection.dependencies.entities.known_dependencies import KnownDependency
 from orionis.services.system.workers import Workers
 from orionis.test.entities.result import TestResult
 from orionis.test.enums import (
@@ -664,79 +667,133 @@ class UnitTest(IUnitTest):
         # Return the result along with captured output and error streams
         return result, output_buffer, error_buffer
 
-    def __runTestsSequentially(
-        self,
-        output_buffer: io.StringIO,
-        error_buffer: io.StringIO
-    ) -> unittest.TestResult:
+    def __resolveFlattenedTestSuite(
+        self
+    ) -> unittest.TestSuite:
         """
-        Executes the test suite sequentially, capturing the output and error streams.
+        Resolves dependencies for all test cases in the suite and creates a flattened test suite with injected dependencies.
+
+        Processes each test case, identifies dependencies in test method signatures, and resolves
+        them using the application's dependency resolver. Creates wrapper methods that automatically
+        inject the resolved dependencies when tests are executed.
 
         Parameters
         ----------
-        output_buffer : io.StringIO
-            A buffer to capture the standard output during test execution.
-        error_buffer : io.StringIO
-            A buffer to capture the standard error during test execution.
+        None
 
         Returns
         -------
-        unittest.TestResult
-            The result of the test suite execution, containing information about
-            passed, failed, and skipped tests.
-        """
+        unittest.TestSuite
+            A new test suite with all tests having their dependencies resolved and injected.
+
+        Raises
+        ------
+        OrionisTestValueError
+            If any test method has dependencies that cannot be resolved.
 
-        # Flatten the suite to avoid duplicate tests
-        flattened_suite = unittest.TestSuite(self.__flattenTestSuite(self.suite))
+        Notes
+        -----
+        - Test methods with decorators are left as-is
+        - Test methods without dependencies are added directly
+        - Test methods with unresolved dependencies trigger an error
+        """
 
         # Create a new test suite with tests that have their dependencies resolved
         flattened_suite = unittest.TestSuite()
-        app = self.app
-        
+
         # Iterate through all test cases
         for test_case in self.__flattenTestSuite(self.suite):
+
             # Get the test method name
-            method_name = getattr(test_case, '_testMethodName', None)
-            
-            # Skip if we can't identify the test method
+            method_name = ReflectionInstance(test_case).getAttribute("_testMethodName")
+
+            # Is not method_name, use the original test case
             if not method_name:
                 flattened_suite.addTest(test_case)
                 continue
-            
+
+            # Get the actual method object
+            test_method = getattr(test_case.__class__, method_name, None)
+
+            # Check for all decorators on the test method
+            decorators = []
+
+            # Get decorators from the test method
+            if hasattr(test_method, '__wrapped__'):
+                original = test_method
+                while hasattr(original, '__wrapped__'):
+                    # Try to get decorator name
+                    if hasattr(original, '__qualname__'):
+                        decorators.append(original.__qualname__)
+                    elif hasattr(original, '__name__'):
+                        decorators.append(original.__name__)
+                    original = original.__wrapped__
+
+            # If use decorators, use original test method
+            if decorators:
+                flattened_suite.addTest(test_case)
+                continue
+
             # Extract dependencies for the test method
-            rsv = ReflectionInstance(test_case).getMethodDependencies(method_name)
-            
+            signature = ReflectionInstance(test_case).getMethodDependencies(method_name)
+
             # If no dependencies to resolve, just add the original test
-            if not rsv.resolved and not rsv.unresolved:
+            if (not signature.resolved and not signature.unresolved) or \
+               (not signature.resolved and len(signature.unresolved) > 0):
                 flattened_suite.addTest(test_case)
                 continue
-            
+
+            # If there are unresolved dependencies, raise an error
+            if (len(signature.unresolved) > 0):
+                raise OrionisTestValueError(
+                    f"Test method '{method_name}' in class '{test_case.__class__.__name__}' has unresolved dependencies: {signature.unresolved}. "
+                    "Please ensure all dependencies are correctly defined and available."
+                )
+
             # Create a specialized test case with resolved dependencies
-            test_class = test_case.__class__
+            test_class = ReflectionInstance(test_case).getClass()
             original_method = getattr(test_class, method_name)
-            
+
             # Create a dict of resolved dependencies
-            args_ = {}
-            for k, v in rsv.resolved.items():
-                from orionis.services.introspection.dependencies.entities.known_dependencies import KnownDependency
-                if isinstance(v, KnownDependency):
-                    args_[k] = app.make(v.type)
-            
+            params = Resolver(self.app).resolveSignature(signature)
+
             # Create a wrapper method that injects dependencies
-            def create_test_wrapper(original_test, resolved_args, unresolved_args):
+            def create_test_wrapper(original_test, resolved_args:dict):
                 def wrapper(self_instance):
-                    args_list = list(resolved_args.values())
-                    args_list.extend(unresolved_args)
-                    return original_test(self_instance, *args_list)
+                    return original_test(self_instance, **resolved_args)
                 return wrapper
-            
+
             # Create a new test case with the wrapped method
-            setattr(test_class, f"_wrapped_{method_name}", create_test_wrapper(original_method, args_, rsv.unresolved))
+            setattr(test_class, f"_wrapped_{method_name}", create_test_wrapper(original_method, params))
             setattr(test_case, '_testMethodName', f"_wrapped_{method_name}")
-            
+
             # Add the modified test case to the suite
             flattened_suite.addTest(test_case)
-        # sys.exit(0)
+
+        # Return the flattened suite with resolved dependencies
+        return flattened_suite
+
+    def __runTestsSequentially(
+        self,
+        output_buffer: io.StringIO,
+        error_buffer: io.StringIO
+    ) -> unittest.TestResult:
+        """
+        Executes the test suite sequentially, capturing the output and error streams.
+
+        Parameters
+        ----------
+        output_buffer : io.StringIO
+            A buffer to capture the standard output during test execution.
+        error_buffer : io.StringIO
+            A buffer to capture the standard error during test execution.
+
+        Returns
+        -------
+        unittest.TestResult
+            The result of the test suite execution, containing information about
+            passed, failed, and skipped tests.
+        """
 
         # Create a custom result class to capture detailed test results
         with redirect_stdout(output_buffer), redirect_stderr(error_buffer):
@@ -746,7 +803,7 @@ class UnitTest(IUnitTest):
                 failfast=self.fail_fast,
                 resultclass=self.__customResultClass()
             )
-            result = runner.run(flattened_suite)
+            result = runner.run(self.__resolveFlattenedTestSuite())
 
         # Return the result object containing test outcomes
         return result
@@ -780,7 +837,7 @@ class UnitTest(IUnitTest):
         """
 
         # Flatten the test suite to get individual test cases
-        test_cases = list(self.__flattenTestSuite(self.suite))
+        test_cases = list(self.__resolveFlattenedTestSuite())
 
         # Create a custom result instance to collect all results
         result_class = self.__customResultClass()

{orionis-0.379.0 → orionis-0.381.0/orionis.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: orionis
-Version: 0.379.0
+Version: 0.381.0
 Summary: Orionis Framework – Elegant, Fast, and Powerful.
 Home-page: https://github.com/orionis-framework/framework
 Author: Raul Mauricio Uñate Castro

{orionis-0.379.0 → orionis-0.381.0}/tests/example/test_example.py

@@ -6,7 +6,7 @@ class TestExample(SyncTestCase):
     Unit tests for basic example functionality.
     """
 
-    def testUnitExample(self) -> None:
+    def testUnitExample(self, console:IConsole) -> None:
         """
         Test that basic equality assertions work as expected.