update linters

Author: NatalyaGrigoreva

.pre-commit-config.yaml

@@ -1,21 +1,37 @@
 repos:
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: 'bbc3dc1'
+    hooks:
+      - id: mypy
+        args:
+          - --check-untyped-defs
+          - --ignore-missing-imports
+          - --install-types
+          - --non-interactive
+          - --scripts-are-modules
+          - --warn-unused-ignores
+        stages:
+          - manual
+
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: "v3.2.0"
+    rev: "v4.1.0"
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: check-yaml
       - id: check-added-large-files
       - id: mixed-line-ending
       - id: requirements-txt-fixer
+      - id: pretty-format-json
+        exclude: "docs/"
 
   - repo: https://github.com/psf/black
-    rev: "23.3.0"
+    rev: "25.1.0"
     hooks:
       - id: black
 
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: "v0.1.8"
+    rev: "v0.9.4"
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix, --unsafe-fixes]

docs/conf.py

@@ -253,7 +253,7 @@
 
 # -- Options for LaTeX output ---------------------------------------------
 
-latex_elements = {
+latex_elements: dict = {
     # The paper size ('letterpaper' or 'a4paper').
     #
     # 'papersize': 'letterpaper',

examples/api_for_sqlalchemy/enums/enum.py …amples/api_for_sqlalchemy/enums/enums.pyexamples/api_for_sqlalchemy/enums/enum.py renamed to examples/api_for_sqlalchemy/enums/enums.py examples/api_for_sqlalchemy/enums/enum.py renamed to examples/api_for_sqlalchemy/enums/enums.py

@@ -1,4 +1,4 @@
-from fastapi_jsonapi.data_layers.fields.enum import Enum
+from fastapi_jsonapi.data_layers.fields.enums import Enum
 
 
 class UserStatusEnum(str, Enum):

examples/api_for_sqlalchemy/enums/user.py

@@ -2,7 +2,7 @@
 
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
-from examples.api_for_sqlalchemy.enums.enum import EnumColumn
+from examples.api_for_sqlalchemy.enums.enums import EnumColumn
 from examples.api_for_sqlalchemy.enums.user import UserStatusEnum
 
 from .base import Base
@@ -19,7 +19,10 @@ class User(Base):
     age: Mapped[Optional[int]]
     email: Mapped[Optional[str]]
     name: Mapped[Optional[str]] = mapped_column(unique=True)
-    status: Mapped[UserStatusEnum] = mapped_column(EnumColumn(UserStatusEnum), default=UserStatusEnum.active)
+    status: Mapped[UserStatusEnum] = mapped_column(
+        EnumColumn(UserStatusEnum),
+        default=UserStatusEnum.active,
+    )
 
     bio: Mapped[UserBio] = relationship(back_populates="user", cascade="delete")
     comments: Mapped[list[PostComment]] = relationship(back_populates="user", cascade="delete")

examples/api_for_sqlalchemy/models/user.py

@@ -67,20 +67,20 @@
     "ParentToChildAssociationAttributesSchema",
     "ParentToChildAssociationSchema",
     "PostAttributesBaseSchema",
+    "PostCommentAttributesBaseSchema",
+    "PostCommentSchema",
     "PostInSchema",
     "PostPatchSchema",
     "PostSchema",
-    "PostCommentAttributesBaseSchema",
-    "PostCommentSchema",
     "UserAttributesBaseSchema",
-    "UserInSchema",
-    "UserInSchemaAllowIdOnPost",
-    "UserPatchSchema",
-    "UserSchema",
     "UserBioAttributesBaseSchema",
     "UserBioBaseSchema",
     "UserBioInSchema",
     "UserBioPatchSchema",
+    "UserInSchema",
+    "UserInSchemaAllowIdOnPost",
+    "UserPatchSchema",
+    "UserSchema",
     "WorkplaceInSchema",
     "WorkplacePatchSchema",
     "WorkplaceSchema",

examples/api_for_sqlalchemy/schemas/__init__.py

@@ -13,10 +13,10 @@
 __version__ = Path(__file__).parent.joinpath("VERSION").read_text().strip()
 
 __all__ = [
-    "init",
     "BadRequest",
     "QueryStringManager",
     "RoutersJSONAPI",
+    "init",
 ]
 
 

fastapi_jsonapi/__init__.py

@@ -73,7 +73,7 @@ async def prepare_one_operation(self, operation: AtomicOperation):
         :param operation:
         :return:
         """
-        operation_type = operation.ref and operation.ref.type or operation.data and operation.data.type
+        operation_type = (operation.ref and operation.ref.type) or (operation.data and operation.data.type)
         assert operation_type
         if operation_type not in self.jsonapi_routers_cls.all_jsonapi_routers:
             msg = f"Unknown resource type {operation_type!r}. Register it via RoutersJSONAPI"

fastapi_jsonapi/atomic/atomic_handler.py

@@ -161,7 +161,7 @@ async def handle(self, dl: BaseDataLayer) -> TypeSchema:
         # `{'loc': ['data', 'attributes', 'name']`
         # and not `{'loc': ['attributes', 'name']`
         data_in = self.jsonapi.schema_in_patch(data=self.data.model_dump(exclude_unset=True))
-        obj_id = self.ref and self.ref.id or self.data and self.data.id
+        obj_id = (self.ref and self.ref.id) or (self.data and self.data.id)
         return await self.view.process_update_object(
             dl=dl,
             obj_id=obj_id,