From a93cd66f5fc67434a2e3e823f2e14ae4be53faae Mon Sep 17 00:00:00 2001 From: Ludovico Bianchi Date: Sat, 29 Jun 2024 16:33:31 -0500 Subject: [PATCH 1/2] Replace deprecated Pydantic method parse_obj() --- backend/tests/app/routers/test_flowsheets.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/tests/app/routers/test_flowsheets.py b/backend/tests/app/routers/test_flowsheets.py index 4f2c2903..92921217 100644 --- a/backend/tests/app/routers/test_flowsheets.py +++ b/backend/tests/app/routers/test_flowsheets.py @@ -82,7 +82,7 @@ def test_get_all(client): data = body["flowsheet_list"] for item in data: # validates the result object, too - info = fm.FlowsheetInfo.parse_obj(item) + info = fm.FlowsheetInfo.model_validate(item) assert info.name != "" @@ -93,7 +93,7 @@ def test_get_config(client, flowsheet_id): assert response.status_code == 200, body # make sure it's a non-empty valid response assert body != {} - fs_exp = FlowsheetExport.parse_obj(body) + fs_exp = FlowsheetExport.model_validate(body) assert fs_exp.name != "" # this time build the model, make sure there is content From f4b17cd492c2ff212b8c280bf24ea71d032f00b8 Mon Sep 17 00:00:00 2001 From: Ludovico Bianchi Date: Sat, 29 Jun 2024 16:53:30 -0500 Subject: [PATCH 2/2] Remove import removed in watertap-org/watertap#1438 --- backend/app/internal/parameter_sweep.py | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/app/internal/parameter_sweep.py b/backend/app/internal/parameter_sweep.py index cc608108..ced6219e 100644 --- a/backend/app/internal/parameter_sweep.py +++ b/backend/app/internal/parameter_sweep.py @@ -2,7 +2,6 @@ from fastapi import HTTPException import numpy as np from watertap.tools.parameter_sweep import LinearSample, ParameterSweep, parameter_sweep -import watertap.examples.flowsheets.case_studies.wastewater_resource_recovery.amo_1575_magprex.magprex as magprex from importlib import import_module import idaes.logger as idaeslog from pyomo.environ import (