dynamicforms-fastapi-viewsets 0.6.2__tar.gz → 0.6.4__tar.gz

{dynamicforms_fastapi_viewsets-0.6.2 → dynamicforms_fastapi_viewsets-0.6.4}/.gitignore

@@ -9,7 +9,6 @@ dist
 /demo/backend/demo.sqlite3
 
 /docs/.vitepress/cache
-/package-lock.json
 
 __pycache__/
 *.py[cod]

{dynamicforms_fastapi_viewsets-0.6.2 → dynamicforms_fastapi_viewsets-0.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: dynamicforms-fastapi-viewsets
-Version: 0.6.2
+Version: 0.6.4
 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.4/fastapi_viewsets/__init__.py

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

{dynamicforms_fastapi_viewsets-0.6.2 → dynamicforms_fastapi_viewsets-0.6.4}/fastapi_viewsets/decorators/celery_viewset/client.py

@@ -126,6 +126,11 @@ def _patch_method(cls: type, original_endpoint, task_name: str, celery_app, queu
                     "_result_queue_key": queue_key,
                     **extra_kwargs,
                 },
+                # send_task() defaults ignore_result to False regardless of what the task was
+                # registered with (celery_viewset_server sets ignore_result=True) - Celery's
+                # per-request value overrides the task's own, so it must be repeated here or the
+                # worker still tries to JSON-encode the raw return value into its result backend.
+                ignore_result=True,
             )
             return await future
         except Exception:

{dynamicforms_fastapi_viewsets-0.6.2 → dynamicforms_fastapi_viewsets-0.6.4}/fastapi_viewsets/decorators/celery_viewset/server.py

@@ -59,6 +59,26 @@ def _to_jsonable(value):
     return value
 
 
+def _reconstruct_value(hint, value):
+    """Rebuild a dict (or list/tuple of dicts) back into BaseModel instance(s) per `hint`.
+
+    `_reconstruct_kwargs` only unwraps `Optional[...]` at the top level, so a hint arriving here
+    may still be `list[Model]` or `Optional[list[Model]]` - handled by recursing into the origin's
+    type args rather than requiring `hint` itself to be a bare BaseModel subclass.
+    """
+    hint = _unwrap_optional(hint)
+    if hint is not None and isinstance(value, dict) and inspect.isclass(hint) and issubclass(hint, BaseModel):
+        try:
+            return hint.model_validate(value)
+        except Exception:
+            return hint.model_construct(**value)
+    if get_origin(hint) in (list, tuple) and isinstance(value, (list, tuple)):
+        args = get_args(hint)
+        if args:
+            return [_reconstruct_value(args[0], item) for item in value]
+    return value
+
+
 def _reconstruct_kwargs(original_endpoint, kwargs: dict, cls: type = None) -> dict:
     """Reconstruct dict values back into Pydantic BaseModel instances based on endpoint type hints.
 
@@ -85,14 +105,8 @@ def _reconstruct_kwargs(original_endpoint, kwargs: dict, cls: type = None) -> di
     for key, value in remaining.items():
         hint = hints.get(key)
         if hint is not None:
-            hint = _unwrap_optional(resolve_typevars(type_map, hint))
-        if hint is not None and isinstance(value, dict) and inspect.isclass(hint) and issubclass(hint, BaseModel):
-            try:
-                result[key] = hint.model_validate(value)
-            except Exception:
-                result[key] = hint.model_construct(**value)
-        else:
-            result[key] = value
+            hint = resolve_typevars(type_map, hint)
+        result[key] = _reconstruct_value(hint, value)
     return result
 
 
@@ -144,6 +158,14 @@ def celery_viewset_server(
                                 }
                             ),
                         )
+                        # celery_viewset_client never reads this task's own retval (only the queue
+                        # entry just pushed above), so returning `result` a second time here would
+                        # hand Celery a raw endpoint return value - e.g. a Pydantic model - to
+                        # encode on its own (result backend, task-succeeded event, ...), which
+                        # isn't JSON-safe. ignore_result=True (set on both task registration and
+                        # send_task) tells Celery to skip that, but a JSON-trivial retval here means
+                        # nothing breaks even where that setting doesn't reach.
+                        return True
                     return result
                 except Exception as e:
                     if isinstance(e, HTTPException):

dynamicforms_fastapi_viewsets-0.6.2/fastapi_viewsets/__init__.py

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