-
Notifications
You must be signed in to change notification settings - Fork 15
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[sub]fix(backend/image_transfert/encoder): update pydantic method #763
Conversation
Signed-off-by: Thibault Camalon <[email protected]>
FL-1242 [BUG] `dumps_kwargs` keyword arguments are no longer supported
ContextFLPC v3 has been deployed Test Compute Plan has been launched (Camelyon) The following error is raised in the
One side effect is:
Environment
SymptomsCompute Plan launched is stuck in SpecificationFix the Acceptance criteria
|
@@ -133,7 +133,7 @@ def create_zip_from_docker_images( | |||
dest = payload_descriptor.manifests_paths[manifest.docker_image_name] | |||
zip_file.writestr(dest, manifest.content) | |||
|
|||
zip_file.writestr("payload_descriptor.json", payload_descriptor.json(indent=4)) | |||
zip_file.writestr("payload_descriptor.json", payload_descriptor.model_dump_json(indent=4)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You need to change also PayloadDescriptor.parse_raw
into PayloadDescriptor.model_validate_json
in decoder.py
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice catch! You mean here and like this, right?
- return PayloadDescriptor.parse_raw(zip_file.read("payload_descriptor.json").decode())
+ return PayloadDescriptor.model_validate_json(zip_file.read("payload_descriptor.json").decode())
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yep ! (I did it for the PR refactor image transfer that's why ^^")
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also made the pydantic upgrade, but still 🙂
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done!
Signed-off-by: Thibault Camalon <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
perfect :)
* fix(backend/image_transfert/encoder): update pydantic method Signed-off-by: Thibault Camalon <[email protected]> * fix(backend/image_transfer/decoder): parse_raw -> model_validate_json Signed-off-by: Thibault Camalon <[email protected]> --------- Signed-off-by: Thibault Camalon <[email protected]>
* fix(backend/image_transfert/encoder): update pydantic method Signed-off-by: Thibault Camalon <[email protected]> * fix(backend/image_transfer/decoder): parse_raw -> model_validate_json Signed-off-by: Thibault Camalon <[email protected]> --------- Signed-off-by: Thibault Camalon <[email protected]>
* feat: decouple image builder from worker Signed-off-by: SdgJlbl <[email protected]> * fix: update skaffold config Signed-off-by: Guilhem Barthes <[email protected]> * feat: add `ServiceAccount` and modify role Signed-off-by: Guilhem Barthes <[email protected]> * fix: improve `wait_for_image_built` Signed-off-by: Guilhem Barthes <[email protected]> * feat: build image in new pod Signed-off-by: Guilhem Barthes <[email protected]> * chore: rename `deployment-builder.yaml` to `stateful-builder.yaml` Signed-off-by: Guilhem Barthes <[email protected]> * chore: rename `stateful-builder.yaml` to `statefulset-builder.yaml` Signed-off-by: Guilhem Barthes <[email protected]> * chore: centralize params Signed-off-by: Guilhem Barthes <[email protected]> * feat: create `BuildTask` Signed-off-by: Guilhem Barthes <[email protected]> * feat: move some values to `builder` module Signed-off-by: Guilhem Barthes <[email protected]> * feat: move more code to `builder` Signed-off-by: Guilhem Barthes <[email protected]> * fix: remove TaskProfiling as Celery task + save Entrypoint in DB Signed-off-by: SdgJlbl <[email protected]> * fix: extract entrypoint from registry Signed-off-by: SdgJlbl <[email protected]> * fix: make doc for helm chart Signed-off-by: SdgJlbl <[email protected]> * feat: build function at registration (#707) <!-- Please reference issue if any. --> <!-- Please include a summary of your changes. --> <!-- Please describe the tests that you ran to verify your changes. --> - [ ] [changelog](../CHANGELOG.md) was updated with notable changes - [ ] documentation was updated --------- Signed-off-by: SdgJlbl <[email protected]> Signed-off-by: Guilhem Barthes <[email protected]> Co-authored-by: SdgJlbl <[email protected]> * feat: share images between backends (#708) Signed-off-by: SdgJlbl <[email protected]> * chore: update helm worklfow Signed-off-by: ThibaultFy <[email protected]> * chore: add .DS_Store to gitignore Signed-off-by: ThibaultFy <[email protected]> * chore: rm DS_Store Signed-off-by: ThibaultFy <[email protected]> * chore: rm .DS_Store Signed-off-by: ThibaultFy <[email protected]> * [sub]fix: add missing migration poc (#728) ## Description Add a migration missing in the poc. This migration alters two things: - modify `ComputeTaskFailureReport.logs` - modify `FunctionImage.file` This migration has been generated automatically with `make migrations` ## How has this been tested? <!-- Please describe the tests that you ran to verify your changes. --> ## Checklist - [ ] [changelog](../CHANGELOG.md) was updated with notable changes - [ ] documentation was updated Signed-off-by: Guilhem Barthes <[email protected]> * [sub]feat: add function events (#714) - Substra/orchestrator#263 Add function events, used now we decoupled the building of the function with the execution of the compute task. For that it add a status field on the Function. It also includes another PR (merged here), to have functions build logs working again. In a future PR, we will change the compute task execution to avoid having to wait_for_function_built in compute_task() Fixes FL-1160 As this is going to be merged on a branch that is going to be merged to a POC branch, we use MNIST as a baseline of a working model. We will deal with failing tests on the POC before merging on main. - [x] [changelog](../CHANGELOG.md) was updated with notable changes - [ ] documentation was updated --------- Signed-off-by: SdgJlbl <[email protected]> Signed-off-by: Guilhem Barthes <[email protected]> Signed-off-by: Guilhem Barthés <[email protected]> Co-authored-by: SdgJlbl <[email protected]> * [sub]fix(app/orchestrator/resources): FunctionStatus.FUNCTION_STATUS_CREATED -> FunctionStatus.FUNCTION_STATUS_WAITING (#742) # Issue Backend FunctionStatus are not aligned with [orchestrator definitions](https://github.com/Substra/orchestrator/blob/poc-decoupled-builder/lib/asset/function.proto#L29-L36). In particular, `FunctionStatus.FUNCTION_STATUS_CREATED` leading to the following error: ```txt ValueError: 'FUNCTION_STATUS_WAITING' is not a valid FunctionStatus ``` ## Description FunctionStatus.FUNCTION_STATUS_CREATED -> FunctionStatus.FUNCTION_STATUS_WAITING ## How has this been tested? Running Camelyon benchmark on [poc-builder-flpc](https://substra.org-1.poc-builder-flpc.cg.owkin.tech/compute_plans/a420306f-5719-412b-ab9c-688b7bed9c70/tasks?page=1&ordering=-rank) environment. ## Checklist - [ ] [changelog](../CHANGELOG.md) was updated with notable changes - [ ] documentation was updated --------- Signed-off-by: Thibault Camalon <[email protected]> * fix: builder using builder SA (#754) * fix: builder using builder SA Signed-off-by: Guilhem Barthés <[email protected]> * docs: changelog Signed-off-by: Guilhem Barthés <[email protected]> --------- Signed-off-by: Guilhem Barthés <[email protected]> * fix: rebase changelog Signed-off-by: Guilhem Barthés <[email protected]> * fix: adapt to pydantic 2.x.x (#758) Signed-off-by: Guilhem Barthés <[email protected]> * [sub]fix(backend/image_transfert/encoder): update pydantic method (#763) * fix(backend/image_transfert/encoder): update pydantic method Signed-off-by: Thibault Camalon <[email protected]> * fix(backend/image_transfer/decoder): parse_raw -> model_validate_json Signed-off-by: Thibault Camalon <[email protected]> --------- Signed-off-by: Thibault Camalon <[email protected]> * [sub]chore: upgrade chart (#765) * chore(charts): bump chart version Signed-off-by: Thibault Camalon <[email protected]> * chore(charts/substra-backend/CHANGELOG): bring back unreleased section Signed-off-by: Thibault Camalon <[email protected]> --------- Signed-off-by: Thibault Camalon <[email protected]> * fix: post-rebase Signed-off-by: SdgJlbl <[email protected]> * chore: rationalize migrations Signed-off-by: SdgJlbl <[email protected]> * [sub]chore(builder): waitPostgresqlInitContainer (#764) * fix: builder using builder SA (#754) * fix: builder using builder SA Signed-off-by: Guilhem Barthés <[email protected]> * docs: changelog Signed-off-by: Guilhem Barthés <[email protected]> --------- Signed-off-by: Guilhem Barthés <[email protected]> * chore(charts/substra-backend/templates/statefulset-builder): add init-container waitPostgresqlInitContainer Signed-off-by: Thibault Camalon <[email protected]> --------- Signed-off-by: Guilhem Barthés <[email protected]> Signed-off-by: Thibault Camalon <[email protected]> Co-authored-by: Guilhem Barthés <[email protected]> --------- Signed-off-by: SdgJlbl <[email protected]> Signed-off-by: Guilhem Barthes <[email protected]> Signed-off-by: ThibaultFy <[email protected]> Signed-off-by: Guilhem Barthés <[email protected]> Signed-off-by: Thibault Camalon <[email protected]> Co-authored-by: SdgJlbl <[email protected]> Co-authored-by: ThibaultFy <[email protected]> Co-authored-by: Thibault Camalon <[email protected]>
Description
Closes FL-1242
How has this been tested?
Checklist