dynamicforms-fastapi-viewsets 0.6.0__tar.gz → 0.6.1__tar.gz

{dynamicforms_fastapi_viewsets-0.6.0 → dynamicforms_fastapi_viewsets-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: dynamicforms-fastapi-viewsets
-Version: 0.6.0
+Version: 0.6.1
 Summary: Django REST Framework-style viewsets for FastAPI, with optional Celery-backed async execution and a Vue/TypeScript client counterpart.
 Project-URL: Homepage, https://github.com/dynamicforms/fastapi-viewsets
 Project-URL: Repository, https://github.com/dynamicforms/fastapi-viewsets

dynamicforms_fastapi_viewsets-0.6.1/fastapi_viewsets/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.6.1"

{dynamicforms_fastapi_viewsets-0.6.0 → dynamicforms_fastapi_viewsets-0.6.1}/fastapi_viewsets/decorators/primary_key_model_helper.py

@@ -1,4 +1,6 @@
-from typing import Annotated, Any, get_args, get_origin, TypeVar
+import types
+
+from typing import Annotated, Any, get_args, get_origin, TypeVar, Union
 
 from pydantic import BaseModel, create_model
 
@@ -25,14 +27,27 @@ def typecast_to_original_model(value: Any, original_annotation: type[T]) -> T:
     annotation = original_annotation
     if get_origin(annotation) is Annotated:
         annotation = get_args(annotation)[0]
-    origin = get_origin(annotation) or annotation
+
+    origin = get_origin(annotation)
+    if origin is Union or origin is types.UnionType:
+        # Optional[Model] / Model | None: unwrap to the model member so isinstance() and
+        # model_validate()/model_construct() below run against the model class rather than
+        # the union object itself (which has neither).
+        annotation = next(
+            (arg for arg in get_args(annotation) if isinstance(arg, type) and issubclass(arg, BaseModel)),
+            annotation,
+        )
+        origin = get_origin(annotation) or annotation
+    else:
+        origin = origin or annotation
+
     if not isinstance(value, BaseModel) or isinstance(value, origin):
         return value
 
     # noinspection PyBroadException
     try:
-        return original_annotation.model_validate(value.model_dump())
+        return annotation.model_validate(value.model_dump())
     except Exception:
         # Fallback: create instance with model_construct if validation fails
         # (e.g. required field missing but it will be filled by autoinc)
-        return original_annotation.model_construct(**value.model_dump())
+        return annotation.model_construct(**value.model_dump())

dynamicforms_fastapi_viewsets-0.6.0/fastapi_viewsets/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.6.0"