continue fixing

Author: giancarloromeo

services/api-server/src/simcore_service_api_server/api/routes/studies.py

@@ -29,7 +29,7 @@
 
 def _create_study_from_project(project: ProjectGet) -> Study:
     assert isinstance(project, ProjectGet)  # nosec
-    return Study.construct(
+    return Study.model_construct(
         uid=project.uuid,
         title=project.name,
         description=project.description,

services/api-server/src/simcore_service_api_server/models/basic_types.py

@@ -1,6 +1,5 @@
 from typing import Annotated, TypeAlias
 
-from common_library.pydantic_basic_types import ConstrainedStr
 from fastapi.responses import StreamingResponse
 from models_library.basic_regex import SIMPLE_VERSION_RE
 from pydantic import StringConstraints

services/api-server/tests/unit/_with_db/test_core_settings__with_db.py

@@ -12,7 +12,7 @@
 
 def test_unit_with_db_app_environment(app_environment: EnvVarsDict):
     settings = ApplicationSettings.create_from_envs()
-    print("captured settings: \n", settings.json(indent=2))
+    print("captured settings: \n", settings.model_dump_json(indent=2))
 
     assert settings.SC_BOOT_MODE == BootModeEnum.PRODUCTION
     assert settings.log_level == logging.DEBUG

services/api-server/tests/unit/api_solvers/test_api_routers_solvers.py

@@ -39,7 +39,7 @@ async def test_list_solvers(
 
     for item in data:
         solver = Solver(**item)
-        print(solver.json(indent=1, exclude_unset=True))
+        print(solver.model_dump_json(indent=1, exclude_unset=True))
 
         # use link to get the same solver
         assert solver.url

services/api-server/tests/unit/test_core_settings.py

@@ -37,4 +37,4 @@ def app_environment(
 def test_unit_app_environment(app_environment: EnvVarsDict):
     assert app_environment
     settings = ApplicationSettings.create_from_envs()
-    print("captured settings: \n", settings.json(indent=2))
+    print("captured settings: \n", settings.model_dump_json(indent=2))

services/api-server/tests/unit/test_services_solver_job_models_converters.py

@@ -102,7 +102,7 @@ def test_job_to_node_inputs_conversion():
 
     NodeInputs = create_model("NodeInputs", __root__=(dict[str, InputTypes], ...))
     print(NodeInputs.model_validate(got_node_inputs).model_dump_json(indent=2))
-    print(got_job_inputs.json(indent=2))
+    print(got_job_inputs.model_dump_json(indent=2))
 
     assert got_job_inputs == job_inputs
     assert got_node_inputs == node_inputs

services/api-server/tests/unit/test_utils_http_calls_capture.py

@@ -32,7 +32,7 @@ async def test_capture_http_call(
             response, name="get_json", enhance_from_openapi_specs=False
         )
 
-        print(captured.json(indent=1))
+        print(captured.model_dump_json(indent=1))
 
         # MOCK
         with respx.mock(
@@ -141,5 +141,5 @@ def test_template_capture(project_tests_dir: Path, faker: Faker):
     # loads parametrized capture
     # replace in response and solve
     capture = HttpApiCallCaptureModel.model_validate_json(template.render(context))
-    print(capture.json(indent=1))
+    print(capture.model_dump_json(indent=1))
     assert capture.path == url_path