fixed openapi generation

Author: CosmoV

fastapi_jsonapi/data_layers/sqla_orm.py

@@ -1,6 +1,6 @@
 """This module is a CRUD interface between resource managers and the sqlalchemy ORM"""
 import logging
-from typing import TYPE_CHECKING, Any, Iterable, List, Optional, Tuple, Type
+from typing import TYPE_CHECKING, Any, Dict, Iterable, List, Optional, Tuple, Type
 
 from sqlalchemy import delete, func, select
 from sqlalchemy.exc import DBAPIError, IntegrityError, NoResultFound
@@ -32,6 +32,7 @@
     get_related_schema,
 )
 from fastapi_jsonapi.schema_base import RelationshipInfo
+from fastapi_jsonapi.schema_builder import FieldConfig, TransferSaveWrapper
 from fastapi_jsonapi.splitter import SPLIT_REL
 from fastapi_jsonapi.utils.sqla import get_related_model_cls
 
@@ -184,6 +185,14 @@ async def apply_relationships(self, obj: TypeModel, data_create: BaseJSONAPIItem
             # todo: relation name may be different?
             setattr(obj, relation_name, related_data)
 
+    def _unwrap_field_config(self, extra: Dict):
+        field_config_wrapper: TransferSaveWrapper = extra.get("field_config")
+
+        if field_config_wrapper:
+            return field_config_wrapper.field_config
+
+        return FieldConfig()
+
     def _apply_client_generated_id(
         self,
         data_create: BaseJSONAPIItemInSchema,
@@ -199,8 +208,11 @@ def _apply_client_generated_id(
         extra = data_create.__fields__["id"].field_info.extra
         if extra.get("client_can_set_id"):
             id_value = data_create.id
-            if cast_type := extra.get("id_cast_func"):
-                id_value = cast_type(id_value)
+            field_config = self._unwrap_field_config(extra)
+
+            if field_config.cast_type:
+                id_value = field_config.cast_type(id_value)
+
             model_kwargs["id"] = id_value
 
         return model_kwargs

fastapi_jsonapi/schema_builder.py

@@ -46,6 +46,29 @@
 # todo: when 3.9 support is dropped, return back `slots=True to JSONAPIObjectSchemas dataclass`
 
 
+class FieldConfig:
+    cast_type: Callable
+
+    def __init__(self, cast_type: Optional[Callable] = None):
+        self.cast_type = cast_type
+
+
+class TransferSaveWrapper:
+    """
+    Types doesn't allowed to be passed as keywords to pydantic Field,
+    so this exists to help save them
+
+    In other case OpenAPI generation will fail
+    """
+
+    def __init__(self, field_config: FieldConfig):
+        self.get_config = lambda: field_config
+
+    @property
+    def field_config(self) -> FieldConfig:
+        return self.get_config()
+
+
 @dataclass(frozen=True)
 class JSONAPIObjectSchemas:
     attributes_schema: Type[BaseModel]
@@ -479,7 +502,9 @@ def _build_jsonapi_object(
             **field_info.extra,
         }
         if id_cast_func:
-            id_field_kw.update(id_cast_func=id_cast_func)
+            id_field_kw.update(
+                field_config=TransferSaveWrapper(field_config=FieldConfig(cast_type=id_cast_func)),
+            )
 
         object_jsonapi_schema_fields = {
             "attributes": (attributes_schema, ...),