fixed issues with resolving route function parameters and request parameters

Author: eadwinCode

ninja_extra/conf/decorator.py

@@ -5,6 +5,7 @@
 from pydantic.json_schema import JsonSchemaValue
 from pydantic_core.core_schema import CoreSchema, with_info_plain_validator_function
 
+from ninja_extra.lazy import LazyStrImport
 from ninja_extra.shortcuts import fail_silently
 
 
@@ -29,6 +30,8 @@ def validate(value: t.Any, *args: t.Any) -> t.Any:
                 try_import_value = fail_silently(import_string, value)
                 if try_import_value is not None:
                     value = try_import_value
+                else:
+                    value = LazyStrImport(value)
 
             if (self.validator and not self.validator(source, value)) or (
                 not self.validator and not isinstance(value, source)

ninja_extra/conf/package_settings.py

@@ -18,6 +18,7 @@
     error_message=lambda source,
     value: f"Expected type of {source.__name__}, received: {type(value)}",
 )
+
 PaginationClassHandlerType = Annotated[PaginationBase, _GenericModelValidator]
 ThrottlingClassHandlerType = Annotated[BaseThrottle, _GenericModelValidator]
 SearchingClassHandlerType = Annotated[SearchingBase, _GenericModelValidator]
@@ -34,7 +35,7 @@
 
 class UserDefinedSettingsMapper:
     def __init__(self, data: dict) -> None:
-        self.__dict__ = data
+        self.__dict__ = dict(NinjaEXTRA_SETTINGS_DEFAULTS, **data)
 
 
 NinjaEXTRA_SETTINGS_DEFAULTS = {

ninja_extra/context.py

@@ -52,6 +52,7 @@ def __init__(
         self.response = response
         self.args: t.List[t.Any] = args or []
         self.kwargs: DictStrAny = kwargs or {}
+        self.kwargs.update({"view_func_kwargs": {}})
         self.permission_classes: PermissionType = permission_classes or []
         self._api = api
         self._view_signature = view_signature
@@ -102,7 +103,7 @@ def compute_route_parameters(
         if self._view_signature.response_arg:
             values[self._view_signature.response_arg] = self.response
 
-        self.kwargs.update(values)
+        self.kwargs.update({"view_func_kwargs": values}, **values)
         self._has_computed_route_parameters = True
 
 

ninja_extra/controllers/base.py

@@ -400,9 +400,9 @@ def __call__(self, cls: ControllerClassType) -> ControllerClassType:
         else:
             cls._api_controller = self
 
-        assert isinstance(
-            cls.throttling_classes, (list, tuple)
-        ), f"Controller[{cls.__name__}].throttling_class must be a list or tuple"
+        assert isinstance(cls.throttling_classes, (list, tuple)), (
+            f"Controller[{cls.__name__}].throttling_class must be a list or tuple"
+        )
 
         throttling_objects: Union[BaseThrottle, List[BaseThrottle], NOT_SET_TYPE] = (
             NOT_SET
@@ -424,9 +424,9 @@ def __call__(self, cls: ControllerClassType) -> ControllerClassType:
 
         if issubclass(cls, ModelControllerBase):
             if cls.model_config:
-                assert (
-                    cls.service_type is not None
-                ), "service_type is required for ModelControllerBase"
+                assert cls.service_type is not None, (
+                    "service_type is required for ModelControllerBase"
+                )
                 # if model_config is not provided, treat controller class as normal
                 builder = ModelControllerBuilder(cls, self)
                 builder.register_model_routes()

ninja_extra/controllers/model/endpoints.py

@@ -707,9 +707,9 @@ async def patch_item(
             )
             instance = await _check_if_coroutine(instance)
 
-            assert (
-                instance
-            ), "`service.patch_async()` or `custom_handler` must return a value"
+            assert instance, (
+                "`service.patch_async()` or `custom_handler` must return a value"
+            )
             return instance
 
         patch_item.__name__ = cls._change_name("patch_item")
@@ -748,9 +748,9 @@ async def update_item(
             )
             instance = await _check_if_coroutine(instance)
 
-            assert (
-                instance
-            ), "`service.update_async` or `custom_handler` must return a value"
+            assert instance, (
+                "`service.update_async` or `custom_handler` must return a value"
+            )
             return instance
 
         update_item.__name__ = cls._change_name("update_item")
@@ -775,9 +775,9 @@ async def create_item(
             )
             instance = await _check_if_coroutine(instance)
 
-            assert (
-                instance
-            ), "`service.create_async` or  `custom_handler` must return a value"
+            assert instance, (
+                "`service.create_async` or  `custom_handler` must return a value"
+            )
             return instance
 
         create_item.__name__ = cls._change_name("create_item")

ninja_extra/controllers/response.py

@@ -8,7 +8,7 @@
 
 from ninja import Schema
 
-from .. import status
+from ninja_extra import status
 
 
 class ControllerResponse:

ninja_extra/operation.py

@@ -211,7 +211,7 @@ def run(self, request: HttpRequest, **kw: Any) -> HttpResponseBase:
                 if not ctx.has_computed_route_parameters:
                     ctx.compute_route_parameters()
 
-                result = self.view_func(request, **ctx.kwargs)
+                result = self.view_func(request, **ctx.kwargs["view_func_kwargs"])
                 assert ctx.response is not None
                 _processed_results = self._result_to_response(
                     request, result, ctx.response
@@ -345,7 +345,7 @@ async def run(self, request: HttpRequest, **kw: Any) -> HttpResponseBase:  # typ
                 if not ctx.has_computed_route_parameters:
                     ctx.compute_route_parameters()
 
-                result = await self.view_func(request, **ctx.kwargs)
+                result = await self.view_func(request, **ctx.kwargs["view_func_kwargs"])
                 assert ctx.response is not None
                 _processed_results = await self._result_to_response(
                     request, result, ctx.response