Merge pull request #234 from python-ellar/removed_jinja_validator

Removed jinja validator

Author: eadwinCode

ellar/__init__.py

@@ -1,3 +1,3 @@
 """Ellar - Python ASGI web framework for building fast, efficient, and scalable RESTful APIs and server-side applications."""
 
-__version__ = "0.8.1"
+__version__ = "0.8.2"

ellar/common/templating/__init__.py

@@ -1,7 +1,7 @@
 from starlette.templating import _TemplateResponse as TemplateResponse
 
 from .environment import Environment
-from .loader import JinjaLoader, JinjaLoaderType
+from .loader import JinjaLoader
 from .model import ModuleTemplating
 from .renderer import (
     render_template,
@@ -13,7 +13,6 @@
     "TemplateFunctionData",
     "Environment",
     "JinjaLoader",
-    "JinjaLoaderType",
     "ModuleTemplating",
     "TemplateResponse",
     "render_template",

ellar/common/templating/loader.py

@@ -1,9 +1,9 @@
 import typing as t
 
 from ellar.pydantic import as_pydantic_validator
+from ellar.utils.importer import import_from_string
 from jinja2 import TemplateNotFound
 from jinja2.loaders import BaseLoader
-from uvicorn.importer import import_from_string
 
 if t.TYPE_CHECKING:  # pragma: no cover
     from ellar.app.main import App

ellar/core/conf/app_settings_models.py

@@ -10,13 +10,13 @@
 from ellar.common.interfaces import IAPIVersioning, IEllarMiddleware, IExceptionHandler
 from ellar.common.responses import JSONResponse, PlainTextResponse
 from ellar.common.serializer import Serializer, SerializerFilter
-from ellar.common.templating import JinjaLoaderType
 from ellar.common.types import ASGIApp, TReceive, TScope, TSend
 from ellar.core.conf.mixins import ConfigDefaultTypesMixin
 from ellar.di import ProviderConfig
 from ellar.di.injector.tree_manager import ModuleTreeManager
 from ellar.pydantic import ENCODERS_BY_TYPE as encoders_by_type
 from ellar.pydantic import AllowTypeOfSource, field_validator
+from jinja2 import BaseLoader
 from starlette.exceptions import HTTPException as StarletteHTTPException
 from starlette.middleware import Middleware
 from starlette.requests import HTTPConnection, Request
@@ -81,6 +81,12 @@
 )
 InterceptorType = Annotated[EllarInterceptor, _InterceptorValidator]
 
+_JinjaLoaderValidator = AllowTypeOfSource(
+    error_message=lambda source,
+    value: f"Expected {BaseLoader} object, received: {type(value)}",
+)
+JinjaLoaderType = Annotated[BaseLoader, _JinjaLoaderValidator]
+
 
 async def _not_found(
     scope: TScope, receive: TReceive, send: TSend

ellar/core/conf/mixins.py

@@ -3,9 +3,9 @@
 from ellar.common import EllarInterceptor, GuardCanActivate
 from ellar.common.constants import LOG_LEVELS as log_levels
 from ellar.common.interfaces import IAPIVersioning, IEllarMiddleware, IExceptionHandler
-from ellar.common.templating import JinjaLoaderType
 from ellar.di import ProviderConfig
 from ellar.di.injector.tree_manager import ModuleTreeManager
+from jinja2 import BaseLoader
 from starlette.requests import HTTPConnection, Request
 from starlette.responses import JSONResponse
 from starlette.types import ASGIApp
@@ -37,7 +37,7 @@ class ConfigDefaultTypesMixin:
     # https://jinja.palletsprojects.com/en/3.0.x/api/#high-level-api
     JINJA_TEMPLATES_OPTIONS: t.Dict[str, t.Any]
 
-    JINJA_LOADERS: t.List[t.Union[JinjaLoaderType, t.Any]]
+    JINJA_LOADERS: t.List[BaseLoader]
 
     TEMPLATES_CONTEXT_PROCESSORS: t.List[
         t.Callable[[t.Union[Request, HTTPConnection]], t.Dict[str, t.Any]]