From 73c21f9d411344bea6ab8f52064fbd03da1323a6 Mon Sep 17 00:00:00 2001 From: Tommaso Comparin <3862206+tcompa@users.noreply.github.com> Date: Tue, 30 Apr 2024 17:05:04 +0200 Subject: [PATCH 1/8] Exclude dataset `history` from `applyworkflow` (close #1450) This concerns `input_dataset_dump` and `output_dataset_dump` attributes --- fractal_server/app/routes/api/v1/project.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fractal_server/app/routes/api/v1/project.py b/fractal_server/app/routes/api/v1/project.py index 4b84863781..d5c774206e 100644 --- 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=[ From 8771a276acdc04a6a6ffb8d903c3ae1f15e169b5 Mon Sep 17 00:00:00 2001 From: Tommaso Comparin <3862206+tcompa@users.noreply.github.com> Date: Tue, 30 Apr 2024 17:08:40 +0200 Subject: [PATCH 2/8] Update CHANGELOG [skip ci] --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49084c7ed0..44fc654b2e 100644 --- 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` and `images` 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` (\#1450). * Move settings logs to `check_settings` and use fractal-server `set_logger` (\#1452). * Benchmarks: * Handle some more errors in benchmark flow (\#1445). From 9ba446ad9927ee656f8d80fd3e1bb2b977cc498c Mon Sep 17 00:00:00 2001 From: Tommaso Comparin <3862206+tcompa@users.noreply.github.com> Date: Tue, 30 Apr 2024 17:09:05 +0200 Subject: [PATCH 3/8] Update CHANGELOG [skip ci] --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44fc654b2e..3957d30020 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ * Do not include dataset `history` and `images` 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` (\#1450). + * 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). From 2f4038b3b8b6130f039a57758643973041cff4cc Mon Sep 17 00:00:00 2001 From: Tommaso Comparin <3862206+tcompa@users.noreply.github.com> Date: Tue, 30 Apr 2024 17:09:27 +0200 Subject: [PATCH 4/8] Trigger CI --- dummy | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dummy diff --git a/dummy b/dummy new file mode 100644 index 0000000000..e69de29bb2 From 542b782d3a99b4237881a4dadf279a94eb0d3fc1 Mon Sep 17 00:00:00 2001 From: Tommaso Comparin <3862206+tcompa@users.noreply.github.com> Date: Tue, 30 Apr 2024 17:09:33 +0200 Subject: [PATCH 5/8] Revert "Trigger CI" This reverts commit 2f4038b3b8b6130f039a57758643973041cff4cc. --- dummy | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 dummy diff --git a/dummy b/dummy deleted file mode 100644 index e69de29bb2..0000000000 From f333866fbe37a8fa8c550b5c40a3893eff9d0c82 Mon Sep 17 00:00:00 2001 From: Tommaso Comparin <3862206+tcompa@users.noreply.github.com> Date: Tue, 30 Apr 2024 17:14:05 +0200 Subject: [PATCH 6/8] Update v1 `job_factory` --- tests/fixtures_server_v1.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/fixtures_server_v1.py b/tests/fixtures_server_v1.py index 71a6b7787c..355cea8c96 100644 --- 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 From c9c6a8590c92a534897db0adef4170d16b2a693a Mon Sep 17 00:00:00 2001 From: Tommaso Comparin <3862206+tcompa@users.noreply.github.com> Date: Tue, 30 Apr 2024 17:17:01 +0200 Subject: [PATCH 7/8] Add missing comma --- fractal_server/app/routes/api/v1/project.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fractal_server/app/routes/api/v1/project.py b/fractal_server/app/routes/api/v1/project.py index d5c774206e..e0130193f9 100644 --- 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", "history" "timestamp_created"} + exclude={"resource_list", "history", "timestamp_created"} ), timestamp_created=_encode_as_utc(input_dataset.timestamp_created), resource_list=[ From 7b3ee1ad99afc2793395002ae2f966ead0c1fb84 Mon Sep 17 00:00:00 2001 From: Tommaso Comparin <3862206+tcompa@users.noreply.github.com> Date: Tue, 30 Apr 2024 17:18:37 +0200 Subject: [PATCH 8/8] Update CHANGELOG [skip ci] --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3957d30020..f5a0e80079 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ * API: * Fix bug in status endpoint (\#1449). * Improve handling of out-of-scope scenario in status endpoint (\#1449). - * Do not include dataset `history` and `images` in `JobV2.dataset_dump` (\#1445). + * 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).