Feature/update ruff black linters

.pre-commit-config.yaml

@@ -10,12 +10,12 @@ repos:
       - id: requirements-txt-fixer
 
   - repo: https://github.com/psf/black
-    rev: "23.3.0"
+    rev: "24.4.2"
     hooks:
       - id: black
 
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: "v0.1.8"
+    rev: "v0.4.10"
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix, --unsafe-fixes]

examples/api_for_sqlalchemy/main.py

@@ -3,6 +3,7 @@
 
 In module placed db initialization functions, app factory.
 """
+
 import sys
 from pathlib import Path
 

examples/api_for_sqlalchemy/models/schemas/__init__.py

@@ -1,6 +1,5 @@
 """schemas package."""
 
-
 from .child import (
     ChildInSchema,
     ChildPatchSchema,

examples/api_for_sqlalchemy/models/schemas/post_comment.py

@@ -1,4 +1,5 @@
 """Post Comment schemas module."""
+
 from datetime import datetime
 from typing import TYPE_CHECKING
 

examples/api_for_sqlalchemy/models/schemas/user.py

@@ -1,4 +1,5 @@
 """User schemas module."""
+
 from __future__ import annotations
 
 from datetime import datetime

examples/api_for_sqlalchemy/models/user.py

@@ -1,4 +1,5 @@
 """User model."""
+
 from __future__ import annotations
 
 from sqlalchemy import Column, Integer, String

examples/api_for_sqlalchemy/models/user_bio.py

@@ -1,4 +1,5 @@
 """User Bio model."""
+
 from typing import Dict, List
 
 from sqlalchemy import JSON, Column, ForeignKey, Integer, String

examples/api_for_tortoise_orm/main.py

@@ -3,6 +3,7 @@
 
 In module placed db initialization functions, app factory.
 """
+
 import sys
 from pathlib import Path
 

examples/api_for_tortoise_orm/models/pydantic/__init__.py

@@ -1,6 +1,5 @@
 """W-mount schemas package."""
 
-
 from .user import (
     UserPatchSchema,
     UserSchema,

examples/api_for_tortoise_orm/models/tortoise/user.py

@@ -1,6 +1,5 @@
 """User model."""
 
-
 from tortoise import (
     fields,
     models,

fastapi_jsonapi/__init__.py

@@ -1,4 +1,5 @@
 """JSON API utils package."""
+
 from pathlib import Path
 
 from fastapi import FastAPI

fastapi_jsonapi/api.py

@@ -1,4 +1,5 @@
 """JSON API router class."""
+
 from enum import Enum, auto
 from inspect import Parameter, Signature, signature
 from typing import (

fastapi_jsonapi/data_layers/filtering/sqlalchemy.py

@@ -1,4 +1,5 @@
 """Helper to create sqlalchemy filters according to filter querystring parameter"""
+
 import inspect
 import logging
 from collections.abc import Sequence

fastapi_jsonapi/data_layers/filtering/tortoise_operation.py

@@ -1,6 +1,7 @@
 """
 Previously used: '__'
 """
+
 from typing import Protocol
 
 
@@ -292,8 +293,7 @@ def type_op_ilike(field_name: str, type_op: str) -> str:
 
 
 class ProcessTypeOperationFieldName(Protocol):
-    def __call__(self, field_name: str, type_op: str) -> str:
-        ...
+    def __call__(self, field_name: str, type_op: str) -> str: ...
 
 
 filters_dict: dict[str, ProcessTypeOperationFieldName] = {

fastapi_jsonapi/data_layers/sorting/sqlalchemy.py

@@ -1,4 +1,5 @@
 """Helper to create sqlalchemy sortings according to filter querystring parameter"""
+
 from typing import Any, List, Tuple, Type, Union
 
 from pydantic.fields import ModelField

fastapi_jsonapi/data_layers/sqla_orm.py

@@ -1,4 +1,5 @@
 """This module is a CRUD interface between resource managers and the sqlalchemy ORM"""
+
 import logging
 from typing import TYPE_CHECKING, Any, Iterable, List, Literal, Optional, Tuple, Type, Union
 

fastapi_jsonapi/querystring.py

@@ -1,4 +1,5 @@
 """Helper to deal with querystring parameters according to jsonapi specification."""
+
 from collections import defaultdict
 from functools import cached_property
 from typing import (

fastapi_jsonapi/schema.py

@@ -3,6 +3,7 @@
 
 Pydantic (for FastAPI).
 """
+
 from typing import (
     TYPE_CHECKING,
     Dict,

fastapi_jsonapi/schema_builder.py

@@ -1,4 +1,5 @@
 """JSON API schemas builder class."""
+
 from dataclasses import dataclass
 from functools import lru_cache
 from typing import (

fastapi_jsonapi/signature.py

@@ -1,4 +1,5 @@
 """Functions for extracting and updating signatures."""
+
 import inspect
 import logging
 from enum import Enum

pyproject.toml

@@ -97,8 +97,8 @@ asyncpg = "0.28.0"
 
 
 [tool.poetry.group.lint.dependencies]
-black = "^23.3.0"
-ruff = "^0.1.8"
+black = "^24.4.2"
+ruff = "^0.4.10"
 mypy = "^1.4.1"
 sqlalchemy-stubs = "^0.4"
 pre-commit = "^3.3.3"

tests/test_api/test_api_sqla_with_includes.py

@@ -1206,14 +1206,16 @@ def prepare_expected_includes(
                             },
                         },
                         "comments": {
-                            "data": [
-                                {
-                                    "id": str(user_2_comment_for_one_u1_post.id),
-                                    "type": "post_comment",
-                                },
-                            ]
-                            if p.id == user_2_comment_for_one_u1_post.post_id
-                            else [],
+                            "data": (
+                                [
+                                    {
+                                        "id": str(user_2_comment_for_one_u1_post.id),
+                                        "type": "post_comment",
+                                    },
+                                ]
+                                if p.id == user_2_comment_for_one_u1_post.post_id
+                                else []
+                            ),
                         },
                     },
                 }
@@ -1639,7 +1641,8 @@ async def test_create_with_relationship_to_the_same_table(self):
 
             response_json = res.json()
             assert response_json["data"]
-            assert (parent_object_id := response_json["data"].get("id"))
+            parent_object_id = response_json["data"].get("id")
+            assert parent_object_id
             assert response_json == {
                 "data": {
                     "attributes": {
@@ -1673,7 +1676,8 @@ async def test_create_with_relationship_to_the_same_table(self):
 
             response_json = res.json()
             assert response_json["data"]
-            assert (child_object_id := response_json["data"].get("id"))
+            child_object_id = response_json["data"].get("id")
+            assert child_object_id
             assert res.json() == {
                 "data": {
                     "attributes": {"name": "child"},
@@ -1728,7 +1732,8 @@ class ContainsTimestampAttrsSchema(BaseModel):
             assert res.status_code == status.HTTP_201_CREATED, res.text
             response_json = res.json()
 
-            assert (entity_id := response_json["data"]["id"])
+            entity_id = response_json["data"]["id"]
+            assert entity_id
             assert response_json == {
                 "meta": None,
                 "jsonapi": {"version": "1.0"},
@@ -2865,7 +2870,8 @@ async def test_filter_by_null(
 
         response_json = response.json()
 
-        assert len(data := response_json["data"]) == 1
+        data = response_json["data"]
+        assert len(data) == 1
         assert data[0]["id"] == str(target_user.id)
         assert data[0]["attributes"]["email"] == target_user.email