continue upgrading

Author: giancarloromeo

packages/models-library/tests/test_service_settings_labels.py

@@ -126,7 +126,7 @@ def test_path_mappings_json_encoding():
         path_mappings = PathMappingsLabel.model_validate(example)
         print(path_mappings)
         assert (
-            PathMappingsLabel.parse_raw(path_mappings.model_dump_json())
+            PathMappingsLabel.model_validate_json(path_mappings.model_dump_json())
             == path_mappings
         )
 
@@ -262,7 +262,7 @@ def test_container_outgoing_permit_list_and_container_allow_internet_with_compos
         "simcore.service.container-http-entrypoint": container_name_1,
     }
 
-    instance = DynamicSidecarServiceLabels.parse_raw(json.dumps(dict_data))
+    instance = DynamicSidecarServiceLabels.model_validate_json(json.dumps(dict_data))
     assert (
         instance.containers_allowed_outgoing_permit_list[container_name_1][0]
         == expected_host_permit_list_policy
@@ -291,15 +291,15 @@ def test_container_outgoing_permit_list_and_container_allow_internet_without_com
             )
         },
     ):
-        assert DynamicSidecarServiceLabels.parse_raw(json.dumps(dict_data))
+        assert TypeAdapter(DynamicSidecarServiceLabels).validate_json(json.dumps(dict_data))
 
 
 def test_container_allow_internet_no_compose_spec_not_ok():
     dict_data = {
         "simcore.service.containers-allowed-outgoing-internet": json.dumps(["hoho"]),
     }
     with pytest.raises(ValidationError) as exec_info:
-        assert DynamicSidecarServiceLabels.parse_raw(json.dumps(dict_data))
+        assert DynamicSidecarServiceLabels.model_validate_json(json.dumps(dict_data))
 
     assert "Expected only 1 entry 'container' not '{'hoho'}" in f"{exec_info.value}"
 
@@ -312,7 +312,7 @@ def test_container_allow_internet_compose_spec_not_ok():
         "simcore.service.containers-allowed-outgoing-internet": json.dumps(["hoho"]),
     }
     with pytest.raises(ValidationError) as exec_info:
-        assert DynamicSidecarServiceLabels.parse_raw(json.dumps(dict_data))
+        assert DynamicSidecarServiceLabels.model_validate_json(json.dumps(dict_data))
 
     assert f"container='hoho' not found in {compose_spec=}" in f"{exec_info.value}"
 
@@ -331,7 +331,7 @@ def test_container_outgoing_permit_list_no_compose_spec_not_ok():
         ),
     }
     with pytest.raises(ValidationError) as exec_info:
-        assert DynamicSidecarServiceLabels.parse_raw(json.dumps(dict_data))
+        assert DynamicSidecarServiceLabels.model_validate_json(json.dumps(dict_data))
     assert (
         f"Expected only one entry '{DEFAULT_SINGLE_SERVICE_NAME}' not 'container_name'"
         in f"{exec_info.value}"
@@ -355,7 +355,7 @@ def test_container_outgoing_permit_list_compose_spec_not_ok():
         "simcore.service.compose-spec": json.dumps(compose_spec),
     }
     with pytest.raises(ValidationError) as exec_info:
-        assert DynamicSidecarServiceLabels.parse_raw(json.dumps(dict_data))
+        assert DynamicSidecarServiceLabels.model_validate_json(json.dumps(dict_data))
     assert (
         f"Trying to permit list container='container_name' which was not found in {compose_spec=}"
         in f"{exec_info.value}"
@@ -378,7 +378,7 @@ def test_not_allowed_in_both_permit_list_and_outgoing_internet():
     }
 
     with pytest.raises(ValidationError) as exec_info:
-        DynamicSidecarServiceLabels.parse_raw(json.dumps(dict_data))
+        DynamicSidecarServiceLabels.model_validate_json(json.dumps(dict_data))
 
     assert (
         f"Not allowed common_containers={{'{container_name}'}} detected"
@@ -610,4 +610,4 @@ def test_user_preferences_path_is_part_of_exiting_volume():
         ),
     }
     with pytest.raises(ValidationError, match="user_preferences_path=/tmp/outputs"):
-        assert DynamicSidecarServiceLabels.parse_raw(json.dumps(labels_data))
+        assert DynamicSidecarServiceLabels.model_validate_json(json.dumps(labels_data))

packages/models-library/tests/test_user_preferences.py

@@ -128,7 +128,7 @@ def test__user_service__user_preference(
     # NOTE: these will be stored as bytes,
     # check bytes serialization/deserialization
     pref1_as_bytes = pref1.model_dump_json().encode()
-    new_instance = UserServiceUserPreference.parse_raw(pref1_as_bytes)
+    new_instance = UserServiceUserPreference.model_validate_json(pref1_as_bytes)
     assert new_instance == pref1
 
 

packages/settings-library/src/settings_library/utils_cli.py

@@ -63,7 +63,7 @@ def print_as_envfile(
 
 def print_as_json(settings_obj, *, compact=False, **pydantic_export_options):
     typer.echo(
-        settings_obj.json(indent=None if compact else 2, **pydantic_export_options)
+        settings_obj.model_dump_json(indent=None if compact else 2, **pydantic_export_options)
     )
 
 

packages/settings-library/tests/test_utils_cli.py

@@ -85,7 +85,7 @@ def fake_granular_env_file_content() -> str:
 def export_as_dict() -> Callable:
     def _export(model_obj, **export_options):
         return json.loads(
-            model_obj.json(
+            model_obj.model_dump_json(
                 encoder=create_json_encoder_wo_secrets(model_obj.__class__),
                 **export_options,
             )
@@ -136,7 +136,7 @@ def test_settings_as_json(
 
     # reuse resulting json to build settings
     settings: dict = json.loads(result.stdout)
-    assert fake_settings_class.parse_obj(settings)
+    assert fake_settings_class.model_validate(settings)
 
 
 def test_settings_as_json_schema(

packages/simcore-sdk/src/simcore_sdk/node_ports_common/r_clone.py

@@ -167,7 +167,7 @@ async def _get_folder_size(
             cwd=f"{local_dir.resolve()}",
         )
 
-    rclone_folder_size_result = _RCloneSize.parse_raw(result)
+    rclone_folder_size_result = _RCloneSize.model_validate_json(result)
     _logger.debug(
         "RClone size call for %s: %s", f"{folder}", f"{rclone_folder_size_result}"
     )