upgrade deprecated

Author: giancarloromeo

services/web/server/src/simcore_service_webserver/dynamic_scheduler/settings.py

@@ -1,7 +1,7 @@
 from typing import Final
 
 from aiohttp import web
-from pydantic import Field, NonNegativeInt
+from pydantic import AliasChoices, Field, NonNegativeInt
 from settings_library.base import BaseCustomSettings
 from settings_library.utils_service import MixinServiceSettings
 
@@ -23,10 +23,10 @@ class DynamicSchedulerSettings(BaseCustomSettings, MixinServiceSettings):
             "- director-v* requests save_state and uses a 01:00:00 timeout"
             "The +10 seconds is used to make sure the director replies"
         ),
-        envs=[
+        validation_alias=AliasChoices(
             "DIRECTOR_V2_STOP_SERVICE_TIMEOUT",
             "DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT",
-        ],
+        ),
     )
 
 

services/web/server/src/simcore_service_webserver/users/_notifications_handlers.py

@@ -106,7 +106,7 @@ async def mark_notification_as_read(request: web.Request) -> web.Response:
     # NOTE: only the user's notifications can be patched
     key = get_notification_key(req_ctx.user_id)
     all_user_notifications: list[UserNotification] = [
-        UserNotification.parse_raw(x)
+        UserNotification.model_validate_json(x)
         for x in await handle_redis_returns_union_types(redis_client.lrange(key, 0, -1))
     ]
     for k, user_notification in enumerate(all_user_notifications):
@@ -130,7 +130,9 @@ async def list_user_permissions(request: web.Request) -> web.Response:
     )
     return envelope_json_response(
         [
-            PermissionGet.construct(_fields_set=p.__fields_set__, **p.model_dump())
+            PermissionGet.model_construct(
+                _fields_set=p.model_fields_set, **p.model_dump()
+            )
             for p in list_permissions
         ]
     )

services/web/server/src/simcore_service_webserver/users/_preferences_models.py

@@ -132,7 +132,7 @@ class BillingCenterUsageColumnOrderFrontendUserPreference(FrontendUserPreference
 ]
 
 _PREFERENCE_NAME_TO_IDENTIFIER_MAPPING: dict[PreferenceName, PreferenceIdentifier] = {
-    p.get_preference_name(): p.__fields__["preference_identifier"].default
+    p.get_preference_name(): p.model_fields["preference_identifier"].default
     for p in ALL_FRONTEND_PREFERENCES
 }
 _PREFERENCE_IDENTIFIER_TO_NAME_MAPPING: dict[PreferenceIdentifier, PreferenceName] = {

services/web/server/src/simcore_service_webserver/users/_schemas.py

@@ -12,7 +12,7 @@
 from models_library.api_schemas_webserver._base import InputSchema, OutputSchema
 from models_library.emails import LowerCaseEmailStr
 from models_library.products import ProductName
-from pydantic import ConfigDict, field_validator, model_validator, Field, field_validator
+from pydantic import ConfigDict, Field, field_validator, model_validator
 from simcore_postgres_database.models.users import UserStatus
 
 
@@ -74,10 +74,7 @@ class PreUserProfile(InputSchema):
         description="Keeps extra information provided in the request form. At most MAX_NUM_EXTRAS fields",
     )
 
-    model_config = ConfigDict(
-        str_strip_whitespace=True,
-        str_max_length=200
-    )
+    model_config = ConfigDict(str_strip_whitespace=True, str_max_length=200)
 
     @model_validator(mode="before")
     @classmethod
@@ -93,8 +90,8 @@ def _preprocess_aliases_and_extras(cls, values):
         # collect extras
         extra_fields = {}
         field_names_and_aliases = (
-            set(cls.__fields__.keys())
-            | {f.alias for f in cls.__fields__.values() if f.alias}
+            set(cls.model_fields.keys())
+            | {f.alias for f in cls.model_fields.values() if f.alias}
             | set(alias_by_priority)
         )
         for key, value in values.items():

services/web/server/tests/unit/isolated/test_login_settings.py

@@ -137,6 +137,6 @@ def test_smtp_settings(mock_env_devel_environment: dict[str, Any]):
 def test_product_login_settings_in_plugin_settings():
     # pylint: disable=no-member
     customizable_attributes = set(ProductLoginSettingsDict.__annotations__.keys())
-    settings_atrributes = set(LoginSettingsForProduct.__fields__.keys())
+    settings_atrributes = set(LoginSettingsForProduct.model_fields.keys())
 
     assert customizable_attributes.issubset(settings_atrributes)

services/web/server/tests/unit/with_dbs/03/test_users.py

@@ -149,7 +149,7 @@ async def test_update_profile(
         data, _ = await assert_status(resp, status.HTTP_200_OK)
 
         # This is a PUT! i.e. full replace of profile variable fields!
-        assert data["first_name"] == ProfileUpdate.__fields__["first_name"].default
+        assert data["first_name"] == ProfileUpdate.model_fields["first_name"].default
         assert data["last_name"] == "Foo"
         assert data["role"] == user_role.name
 
@@ -381,7 +381,7 @@ def test_preuserprofile_parse_model_without_extras(
     account_request_form: dict[str, Any]
 ):
     required = {
-        f.alias or f.name for f in PreUserProfile.__fields__.values() if f.required
+        f.alias or f.name for f in PreUserProfile.model_fields.values() if f.required
     }
     data = {k: account_request_form[k] for k in required}
     assert not PreUserProfile(**data).extras