Merge pull request #1453 from fractal-analytics-platform/1450-backpor…

…t-fix-1445-do-not-include-dataset-history-in-dataset_dump Exclude dataset `history` from `applyworkflow` (close #1450)
fractal-analytics-platform · Apr 30, 2024 · 8c8f977 · 8c8f977
2 parents 3a396e4 + 7b3ee1a
commit 8c8f977
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,10 @@
 * API:
     * Fix bug in status endpoint (\#1449).
     * Improve handling of out-of-scope scenario in status endpoint (\#1449).
+    * Do not include dataset `history` in `JobV2.dataset_dump` (\#1445).
     * Forbid extra arguments in `DumpV2` schemas (\#1445).
+* API V1:
+    * Do not include dataset `history` in `ApplyWorkflow.{input,output}_dataset_dump` (\#1453).
 * Move settings logs to `check_settings` and use fractal-server `set_logger` (\#1452).
 * Benchmarks:
     * Handle some more errors in benchmark flow (\#1445).

diff --git a/fractal_server/app/routes/api/v1/project.py b/fractal_server/app/routes/api/v1/project.py
@@ -398,7 +398,7 @@ async def apply_workflow(
         user_email=user.email,
         input_dataset_dump=dict(
             **input_dataset.model_dump(
-                exclude={"resource_list", "timestamp_created"}
+                exclude={"resource_list", "history", "timestamp_created"}
             ),
             timestamp_created=_encode_as_utc(input_dataset.timestamp_created),
             resource_list=[
@@ -408,7 +408,7 @@ async def apply_workflow(
         ),
         output_dataset_dump=dict(
             **output_dataset.model_dump(
-                exclude={"resource_list", "timestamp_created"}
+                exclude={"resource_list", "history", "timestamp_created"}
             ),
             timestamp_created=_encode_as_utc(output_dataset.timestamp_created),
             resource_list=[

diff --git a/tests/fixtures_server_v1.py b/tests/fixtures_server_v1.py
@@ -168,7 +168,7 @@ async def __job_factory(
             workflow_id=workflow_id,
             input_dataset_dump=dict(
                 input_dataset.model_dump(
-                    exclude={"resource_list", "timestamp_created"}
+                    exclude={"resource_list", "timestamp_created", "history"}
                 ),
                 timestamp_created=_encode_as_utc(
                     input_dataset.timestamp_created
@@ -180,7 +180,7 @@ async def __job_factory(
             ),
             output_dataset_dump=dict(
                 output_dataset.model_dump(
-                    exclude={"resource_list", "timestamp_created"}
+                    exclude={"resource_list", "timestamp_created", "history"}
                 ),
                 timestamp_created=_encode_as_utc(
                     output_dataset.timestamp_created