fastlifeweb 0.16.3__tar.gz → 0.16.4__tar.gz

{fastlifeweb-0.16.3 → fastlifeweb-0.16.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastlifeweb
-Version: 0.16.3
+Version: 0.16.4
 Summary: High-level web framework
 Home-page: https://github.com/mardiros/fastlife
 License: BSD-derived

{fastlifeweb-0.16.3 → fastlifeweb-0.16.4}/pyproject.toml

@@ -15,7 +15,7 @@ classifiers = [
   "Topic :: Software Development :: Libraries :: Python Modules",
   "Topic :: Internet :: WWW/HTTP",
 ]
-version = "0.16.3"
+version = "0.16.4"
 
 [tool.poetry.dependencies]
 python = "^3.11"
@@ -40,12 +40,10 @@ testing = ["beautifulsoup4"]
 [tool.poetry.group.dev.dependencies]
 beautifulsoup4 = "^4.12.2"
 behave = "^1.2.6"
-black = "^23.3.0"
-flake8 = "^6.1.0"
 heroicons = "^2.7.0"
 httpx = "^0.25.0"
 mypy = "^1.4.0"
-pytest = "^7"
+pytest = "^8.2.0"
 pytest-asyncio = "^0.21.0"
 pytest-cov = "^4.1.0"
 types-beautifulsoup4 = "^4.12.0.6"
@@ -83,6 +81,18 @@ module = [
 ]
 ignore_missing_imports = true
 
+[tool.ruff]
+line-length = 88
+target-version = "py311"
+
+[tool.ruff.lint]
+select = [
+ "B",  # bug bear security warning
+ "I",  # isort import order
+ "F",  # pyflakes
+ "UP", # alter when better syntax is available
+ "RUF" #  the ruff devleoper's own rules
+]
 
 [tool.isort]
 profile = "black"

{fastlifeweb-0.16.3 → fastlifeweb-0.16.4}/src/fastlife/adapters/jinjax/renderer.py

@@ -6,16 +6,11 @@ import ast
 import logging
 import re
 import textwrap
+from collections.abc import Iterator, Mapping, MutableMapping, Sequence
 from pathlib import Path
 from typing import (
     TYPE_CHECKING,
     Any,
-    Iterator,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Type,
     cast,
 )
 
@@ -108,7 +103,7 @@ def generate_docstring(
     kwonlyargs = func_def.args.kwonlyargs
     kw_defaults = func_def.args.kw_defaults
 
-    for arg, default in zip(kwonlyargs, kw_defaults):
+    for arg, default in zip(kwonlyargs, kw_defaults, strict=False):
         process_arg(arg, default)
 
     if add_content:
@@ -342,7 +337,7 @@ class JinjaxRenderer(AbstractTemplateRenderer):
         self,
         template: str,
         *,
-        globals: Optional[Mapping[str, Any]] = None,
+        globals: Mapping[str, Any] | None = None,
         **params: Any,
     ) -> str:
         # Jinja template does accept the file extention while rendering the template
@@ -360,13 +355,13 @@ class JinjaxRenderer(AbstractTemplateRenderer):
         )
 
     def pydantic_form(
-        self, model: FormModel[Any], *, token: Optional[str] = None
+        self, model: FormModel[Any], *, token: str | None = None
     ) -> Markup:
         return WidgetFactory(self, token).get_markup(model)
 
     def pydantic_form_field(
         self,
-        model: Type[Any],
+        model: type[Any],
         *,
         name: str | None,
         token: str | None,

{fastlifeweb-0.16.3 → fastlifeweb-0.16.4}/src/fastlife/adapters/jinjax/widgets/base.py

@@ -1,7 +1,9 @@
 """Widget base class."""
+
 import abc
 import secrets
-from typing import Any, Generic, Mapping, Type, TypeVar
+from collections.abc import Mapping
+from typing import Any, Generic, TypeVar
 
 from markupsafe import Markup
 
@@ -11,7 +13,7 @@ from fastlife.shared_utils.infer import is_union
 T = TypeVar("T")
 
 
-def get_title(typ: Type[Any]) -> str:
+def get_title(typ: type[Any]) -> str:
     return getattr(
         getattr(typ, "__meta__", None),
         "title",
@@ -81,7 +83,7 @@ class Widget(abc.ABC, Generic[T]):
         return Markup(renderer.render_template(self.get_template(), widget=self))
 
 
-def _get_fullname(typ: Type[Any]) -> str:
+def _get_fullname(typ: type[Any]) -> str:
     if is_union(typ):
         typs = [_get_fullname(t) for t in typ.__args__]  # type: ignore
         return "|".join(typs)  # type: ignore
@@ -102,7 +104,7 @@ class TypeWrapper:
 
     def __init__(
         self,
-        typ: Type[Any],
+        typ: type[Any],
         route_prefix: str,
         name: str,
         token: str,

{fastlifeweb-0.16.3 → fastlifeweb-0.16.4}/src/fastlife/adapters/jinjax/widgets/checklist.py

@@ -2,7 +2,7 @@
 Widget for field of type Set.
 """
 
-from typing import Sequence
+from collections.abc import Sequence
 
 from pydantic import BaseModel, Field
 

{fastlifeweb-0.16.3 → fastlifeweb-0.16.4}/src/fastlife/adapters/jinjax/widgets/dropdown.py

@@ -2,7 +2,7 @@
 Widget for field of type Enum or Literal.
 """
 
-from typing import Optional, Sequence, Tuple
+from collections.abc import Sequence
 
 from .base import Widget
 
@@ -26,14 +26,14 @@ class DropDownWidget(Widget[str]):
         self,
         name: str,
         *,
-        title: Optional[str],
-        hint: Optional[str] = None,
-        aria_label: Optional[str] = None,
-        value: Optional[str] = None,
+        title: str | None,
+        hint: str | None = None,
+        aria_label: str | None = None,
+        value: str | None = None,
         error: str | None = None,
-        options: Sequence[Tuple[str, str]] | Sequence[str],
+        options: Sequence[tuple[str, str]] | Sequence[str],
         removable: bool = False,
-        token: Optional[str] = None,
+        token: str | None = None,
     ) -> None:
         super().__init__(
             name,

{fastlifeweb-0.16.3 → fastlifeweb-0.16.4}/src/fastlife/adapters/jinjax/widgets/factory.py

@@ -3,12 +3,12 @@ Transform.
 """
 
 import secrets
-from collections.abc import MutableSequence, Sequence
+from collections.abc import Mapping, MutableSequence, Sequence
 from decimal import Decimal
 from enum import Enum
 from inspect import isclass
 from types import NoneType
-from typing import Any, Literal, Mapping, Type, cast, get_origin
+from typing import Any, Literal, cast, get_origin
 from uuid import UUID
 
 from markupsafe import Markup
@@ -59,7 +59,7 @@ class WidgetFactory:
 
     def get_widget(
         self,
-        base: Type[Any],
+        base: type[Any],
         form_data: Mapping[str, Any],
         form_errors: Mapping[str, Any],
         *,
@@ -78,7 +78,7 @@ class WidgetFactory:
 
     def build(
         self,
-        typ: Type[Any],
+        typ: type[Any],
         *,
         name: str = "",
         value: Any,
@@ -152,7 +152,7 @@ class WidgetFactory:
                 name, typ, field, value or "", form_errors, removable
             )
 
-        if issubclass(typ, (int, str, float, Decimal, UUID)):
+        if issubclass(typ, int | str | float | Decimal | UUID):
             return self.build_simpletype(
                 name, typ, field, value or "", form_errors, removable
             )
@@ -162,7 +162,7 @@ class WidgetFactory:
     def build_model(
         self,
         field_name: str,
-        typ: Type[BaseModel],
+        typ: type[BaseModel],
         field: FieldInfo | None,
         value: Mapping[str, Any],
         form_errors: Mapping[str, Any],
@@ -204,13 +204,13 @@ class WidgetFactory:
     def build_union(
         self,
         field_name: str,
-        field_type: Type[Any],
+        field_type: type[Any],
         field: FieldInfo | None,
         value: Any,
         form_errors: Mapping[str, Any],
         removable: bool,
     ) -> Widget[Any]:
-        types: list[Type[Any]] = []
+        types: list[type[Any]] = []
         # required = True
         for typ in field_type.__args__:  # type: ignore
             if typ is NoneType:
@@ -271,7 +271,7 @@ class WidgetFactory:
     def build_sequence(
         self,
         field_name: str,
-        field_type: Type[Any],
+        field_type: type[Any],
         field: FieldInfo | None,
         value: Sequence[Any] | None,
         form_errors: Mapping[str, Any],
@@ -309,7 +309,7 @@ class WidgetFactory:
     def build_set(
         self,
         field_name: str,
-        field_type: Type[Any],
+        field_type: type[Any],
         field: FieldInfo | None,
         value: Sequence[Any] | None,
         form_errors: Mapping[str, Any],
@@ -368,7 +368,7 @@ class WidgetFactory:
     def build_boolean(
         self,
         field_name: str,
-        field_type: Type[Any],
+        field_type: type[Any],
         field: FieldInfo | None,
         value: bool,
         form_errors: Mapping[str, Any],
@@ -392,7 +392,7 @@ class WidgetFactory:
     def build_emailtype(
         self,
         field_name: str,
-        field_type: Type[Any],
+        field_type: type[Any],
         field: FieldInfo | None,
         value: str | int | float,
         form_errors: Mapping[str, Any],
@@ -418,7 +418,7 @@ class WidgetFactory:
     def build_secretstr(
         self,
         field_name: str,
-        field_type: Type[Any],
+        field_type: type[Any],
         field: FieldInfo | None,
         value: SecretStr | str,
         form_errors: Mapping[str, Any],
@@ -444,7 +444,7 @@ class WidgetFactory:
     def build_literal(
         self,
         field_name: str,
-        field_type: Type[Any],  # a literal actually
+        field_type: type[Any],  # a literal actually
         field: FieldInfo | None,
         value: str | int | float,
         form_errors: Mapping[str, Any],
@@ -476,7 +476,7 @@ class WidgetFactory:
     def build_enum(
         self,
         field_name: str,
-        field_type: Type[Any],  # an enum subclass
+        field_type: type[Any],  # an enum subclass
         field: FieldInfo | None,
         value: str | int | float,
         form_errors: Mapping[str, Any],
@@ -502,7 +502,7 @@ class WidgetFactory:
     def build_simpletype(
         self,
         field_name: str,
-        field_type: Type[Any],
+        field_type: type[Any],
         field: FieldInfo | None,
         value: str | int | float,
         form_errors: Mapping[str, Any],

{fastlifeweb-0.16.3 → fastlifeweb-0.16.4}/src/fastlife/adapters/jinjax/widgets/model.py

@@ -1,4 +1,5 @@
-from typing import Any, Sequence
+from collections.abc import Sequence
+from typing import Any
 
 from markupsafe import Markup
 

{fastlifeweb-0.16.3 → fastlifeweb-0.16.4}/src/fastlife/adapters/jinjax/widgets/sequence.py

@@ -1,4 +1,5 @@
-from typing import Any, Sequence, Type
+from collections.abc import Sequence
+from typing import Any
 
 from markupsafe import Markup
 
@@ -17,7 +18,7 @@ class SequenceWidget(Widget[Sequence[Widget[Any]]]):
         aria_label: str | None = None,
         value: Sequence[Widget[Any]] | None,
         error: str | None = None,
-        item_type: Type[Any],
+        item_type: type[Any],
         token: str,
         removable: bool,
     ):

{fastlifeweb-0.16.3 → fastlifeweb-0.16.4}/src/fastlife/adapters/jinjax/widgets/text.py

@@ -1,5 +1,4 @@
 from collections.abc import Sequence
-from typing import Optional
 
 from .base import Widget
 
@@ -23,10 +22,10 @@ class TextWidget(Widget[str]):
         self,
         name: str,
         *,
-        title: Optional[str],
-        hint: Optional[str] = None,
-        aria_label: Optional[str] = None,
-        placeholder: Optional[str] = None,
+        title: str | None,
+        hint: str | None = None,
+        aria_label: str | None = None,
+        placeholder: str | None = None,
         error: str | None = None,
         value: str = "",
         input_type: str = "text",
@@ -87,12 +86,12 @@ class TextareaWidget(Widget[Sequence[str]]):
         self,
         name: str,
         *,
-        title: Optional[str],
-        hint: Optional[str] = None,
-        aria_label: Optional[str] = None,
-        placeholder: Optional[str] = None,
+        title: str | None,
+        hint: str | None = None,
+        aria_label: str | None = None,
+        placeholder: str | None = None,
         error: str | None = None,
-        value: Optional[Sequence[str]] = None,
+        value: Sequence[str] | None = None,
         removable: bool = False,
         token: str,
     ) -> None:

{fastlifeweb-0.16.3 → fastlifeweb-0.16.4}/src/fastlife/adapters/jinjax/widgets/union.py

@@ -1,7 +1,9 @@
 """
 Widget for field of type Union.
 """
-from typing import Any, Optional, Sequence, Type, Union
+
+from collections.abc import Sequence
+from typing import Any, Union
 
 from markupsafe import Markup
 from pydantic import BaseModel
@@ -31,12 +33,12 @@ class UnionWidget(Widget[Widget[Any]]):
         self,
         name: str,
         *,
-        title: Optional[str],
-        hint: Optional[str] = None,
-        aria_label: Optional[str] = None,
-        value: Optional[Widget[Any]],
+        title: str | None,
+        hint: str | None = None,
+        aria_label: str | None = None,
+        value: Widget[Any] | None,
         error: str | None = None,
-        children_types: Sequence[Type[BaseModel]],
+        children_types: Sequence[type[BaseModel]],
         removable: bool = False,
         token: str,
     ):
@@ -72,7 +74,7 @@ class UnionWidget(Widget[Widget[Any]]):
                 widget=self,
                 types=self.build_types(renderer.route_prefix),
                 parent_type=TypeWrapper(
-                    Union[tuple(self.children_types)],  # type: ignore
+                    Union[tuple(self.children_types)],  # type: ignore # noqa: UP007
                     renderer.route_prefix,
                     self.parent_name,
                     self.token,

{fastlifeweb-0.16.3 → fastlifeweb-0.16.4}/src/fastlife/config/configurator.py

@@ -15,16 +15,15 @@ import importlib
 import inspect
 import logging
 from collections import defaultdict
-from collections.abc import Mapping, Sequence
+from collections.abc import Callable, Mapping, Sequence
 from enum import Enum
 from pathlib import Path
 from types import ModuleType
-from typing import TYPE_CHECKING, Annotated, Any, Callable, Generic, Self, Tuple, Type
+from typing import TYPE_CHECKING, Annotated, Any, Generic, Self
 
 import venusian
-from fastapi import Depends, FastAPI
+from fastapi import Depends, FastAPI, Response
 from fastapi import Request as BaseRequest
-from fastapi import Response
 from fastapi.params import Depends as DependsType
 from fastapi.staticfiles import StaticFiles
 from fastapi.types import IncEx
@@ -127,9 +126,9 @@ class GenericConfigurator(Generic[TRegistry]):
         self.registry = registry_cls(settings)
         Route._registry = self.registry  # type: ignore
 
-        self.middlewares: list[Tuple[Type[AbstractMiddleware], Any]] = []
-        self.exception_handlers: list[Tuple[int | Type[Exception], Any]] = []
-        self.mounts: list[Tuple[str, Path, str]] = []
+        self.middlewares: list[tuple[type[AbstractMiddleware], Any]] = []
+        self.exception_handlers: list[tuple[int | type[Exception], Any]] = []
+        self.mounts: list[tuple[str, Path, str]] = []
         self.tags: dict[str, OpenApiTag] = {}
 
         self.api_title = "OpenAPI"
@@ -142,7 +141,7 @@ class GenericConfigurator(Generic[TRegistry]):
         self._route_prefix: str = ""
         self._routers: dict[str, Router] = defaultdict(Router)
         self._security_policies: dict[
-            str, "type[AbstractSecurityPolicy[Any, TRegistry]]"
+            str, type[AbstractSecurityPolicy[Any, TRegistry]]
         ] = {}
 
         self._registered_permissions: set[str] = set()
@@ -310,7 +309,7 @@ class GenericConfigurator(Generic[TRegistry]):
         return self
 
     def add_middleware(
-        self, middleware_class: Type[AbstractMiddleware], **options: Any
+        self, middleware_class: type[AbstractMiddleware], **options: Any
     ) -> Self:
         """
         Add a starlette middleware to the FastAPI app.
@@ -522,7 +521,7 @@ class GenericConfigurator(Generic[TRegistry]):
 
     def add_exception_handler(
         self,
-        status_code_or_exc: int | Type[Exception],
+        status_code_or_exc: int | type[Exception],
         handler: Any,
         *,
         template: str | None = None,

{fastlifeweb-0.16.3 → fastlifeweb-0.16.4}/src/fastlife/config/exceptions.py

@@ -1,4 +1,5 @@
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 import venusian
 

{fastlifeweb-0.16.3 → fastlifeweb-0.16.4}/src/fastlife/config/openapiextra.py

@@ -1,4 +1,5 @@
 """Types for OpenAPI documentation."""
+
 from pydantic import BaseModel, Field
 
 

{fastlifeweb-0.16.3 → fastlifeweb-0.16.4}/src/fastlife/config/resources.py

@@ -8,7 +8,8 @@ API Resources declaration using a decorator.
 
 """
 
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 import venusian
 from fastapi.types import IncEx
@@ -91,29 +92,21 @@ def resource(
                     endpoint=endpoint,
                     tags=[tag],
                     methods=[method.split("_").pop()],
-                    permission=getattr(endpoint, "permission"),
-                    status_code=getattr(endpoint, "status_code"),
-                    summary=getattr(endpoint, "summary"),
-                    description=getattr(endpoint, "description"),
-                    response_description=getattr(endpoint, "response_description"),
-                    deprecated=getattr(endpoint, "deprecated"),
-                    operation_id=getattr(endpoint, "operation_id"),
-                    response_model_include=getattr(endpoint, "response_model_include"),
-                    response_model_exclude=getattr(endpoint, "response_model_exclude"),
-                    response_model_by_alias=getattr(
-                        endpoint, "response_model_by_alias"
-                    ),
-                    response_model_exclude_unset=getattr(
-                        endpoint, "response_model_exclude_unset"
-                    ),
-                    response_model_exclude_defaults=getattr(
-                        endpoint, "response_model_exclude_defaults"
-                    ),
-                    response_model_exclude_none=getattr(
-                        endpoint, "response_model_exclude_none"
-                    ),
-                    include_in_schema=getattr(endpoint, "include_in_schema"),
-                    openapi_extra=getattr(endpoint, "openapi_extra"),
+                    permission=endpoint.permission,
+                    status_code=endpoint.status_code,
+                    summary=endpoint.summary,
+                    description=endpoint.description,
+                    response_description=endpoint.response_description,
+                    deprecated=endpoint.deprecated,
+                    operation_id=endpoint.operation_id,
+                    response_model_include=endpoint.response_model_include,
+                    response_model_exclude=endpoint.response_model_exclude,
+                    response_model_by_alias=endpoint.response_model_by_alias,
+                    response_model_exclude_unset=endpoint.response_model_exclude_unset,
+                    response_model_exclude_defaults=endpoint.response_model_exclude_defaults,
+                    response_model_exclude_none=endpoint.response_model_exclude_none,
+                    include_in_schema=endpoint.include_in_schema,
+                    openapi_extra=endpoint.openapi_extra,
                 )
 
             for method in dir(ob):
@@ -131,7 +124,13 @@ def resource(
                             config, method, collection_path, getattr(api, method)
                         )
                     case (
-                        "get" | "post" | "put" | "patch" | "delete" | "head" | "options"
+                        "get"
+                        | "post"
+                        | "put"
+                        | "patch"
+                        | "delete"
+                        | "head"
+                        | "options"
                     ):
                         bind_config(config, method, path, getattr(api, method))
                     case _:

{fastlifeweb-0.16.3 → fastlifeweb-0.16.4}/src/fastlife/config/views.py

@@ -17,7 +17,9 @@ async def hello_world(
     return template()
 ```
 """
-from typing import Any, Callable
+
+from collections.abc import Callable
+from typing import Any
 
 import venusian
 

{fastlifeweb-0.16.3 → fastlifeweb-0.16.4}/src/fastlife/middlewares/reverse_proxy/x_forwarded.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Optional, Sequence, Tuple
+from collections.abc import Sequence
 
 from starlette.types import ASGIApp, Receive, Scope, Send
 
@@ -8,14 +8,14 @@ from fastlife.middlewares.base import AbstractMiddleware
 log = logging.getLogger(__name__)
 
 
-def get_header(headers: Sequence[Tuple[bytes, bytes]], key: bytes) -> Optional[str]:
+def get_header(headers: Sequence[tuple[bytes, bytes]], key: bytes) -> str | None:
     for hdr in headers:
         if hdr[0].lower() == key:
             return hdr[1].decode("latin1")
     return None
 
 
-def get_header_int(headers: Sequence[Tuple[bytes, bytes]], key: bytes) -> Optional[int]:
+def get_header_int(headers: Sequence[tuple[bytes, bytes]], key: bytes) -> int | None:
     for hdr in headers:
         if hdr[0].lower() == key:
             ret = hdr[1].decode("latin1")
@@ -36,11 +36,19 @@ class XForwardedStar(AbstractMiddleware):
     async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
         if scope["type"] in ("http", "websocket"):
             headers = scope["headers"]
+            x_real_ip = get_header(headers, b"x-real-ip")
+            client = (
+                (
+                    x_real_ip,
+                    get_header_int(headers, b"x-real-port")
+                    or get_header_int(headers, b"x-forwarded-port")
+                    or 0,
+                )
+                if x_real_ip
+                else None
+            )
             new_vals = {
-                "client": (
-                    get_header(headers, b"x-real-ip"),
-                    get_header_int(headers, b"x-forwarded-port"),
-                ),
+                "client": client,
                 "host": get_header(headers, b"x-forwarded-host"),
                 "scheme": get_header(headers, b"x-forwarded-proto"),
             }

{fastlifeweb-0.16.3 → fastlifeweb-0.16.4}/src/fastlife/middlewares/session/middleware.py

@@ -1,7 +1,7 @@
 """Deal with http session."""
 
 from datetime import timedelta
-from typing import Literal, Type
+from typing import Literal
 
 from starlette.datastructures import MutableHeaders
 from starlette.requests import HTTPConnection
@@ -25,7 +25,7 @@ class SessionMiddleware(AbstractMiddleware):
         cookie_same_site: Literal["lax", "strict", "none"] = "lax",
         cookie_secure: bool = False,
         cookie_domain: str = "",
-        serializer: Type[AbsractSessionSerializer] = SignedSessionSerializer,
+        serializer: type[AbsractSessionSerializer] = SignedSessionSerializer,
     ) -> None:
         self.app = app
         self.max_age = int(duration.total_seconds())