moving to models

Author: pcrespov

services/web/server/src/simcore_service_webserver/login/_controller/rest/registration_schemas.py

@@ -1,7 +1,6 @@
 import logging
 from typing import Annotated, Literal
 
-from models_library.api_schemas_webserver.users import PhoneNumberStr
 from models_library.emails import LowerCaseEmailStr
 from pydantic import (
     BaseModel,
@@ -12,6 +11,7 @@
     field_validator,
 )
 
+from ....models import PhoneNumberStr
 from ....utils_aiohttp import NextPage
 from ..._models import InputSchema, check_confirm_password_match
 

services/web/server/src/simcore_service_webserver/models.py

@@ -1,13 +1,20 @@
-from typing import Annotated
+from typing import Annotated, TypeAlias
 
 from models_library.products import ProductName
 from models_library.rest_base import RequestParameters
 from models_library.users import UserID
 from pydantic import ConfigDict, Field
+from pydantic_extra_types.phone_numbers import PhoneNumberValidator
 from servicelib.request_keys import RQT_USERID_KEY
 
 from .constants import RQ_PRODUCT_KEY
 
+PhoneNumberStr: TypeAlias = Annotated[
+    # NOTE: validator require installing `phonenumbers``
+    str,
+    PhoneNumberValidator(number_format="E164"),
+]
+
 
 class AuthenticatedRequestContext(RequestParameters):
     """Fields expected in the request context for authenticated endpoints"""

services/web/server/src/simcore_service_webserver/users/_controller/rest/_rest_schemas.py

@@ -7,7 +7,7 @@
 import re
 import sys
 from contextlib import suppress
-from typing import Annotated, Any, Final, TypeAlias
+from typing import Annotated, Any, Final
 
 import pycountry
 from common_library.basic_types import DEFAULT_FACTORY
@@ -21,9 +21,8 @@
     field_validator,
     model_validator,
 )
-from pydantic_extra_types.phone_numbers import PhoneNumberValidator
 
-from ....models import AuthenticatedRequestContext
+from ....models import AuthenticatedRequestContext, PhoneNumberStr
 
 MAX_BYTES_SIZE_EXTRAS: Final[int] = 512
 
@@ -36,13 +35,6 @@ class UsersRequestContext(AuthenticatedRequestContext): ...
 #
 
 
-PhoneNumberStr: TypeAlias = Annotated[
-    # NOTE: validator require installing `phonenumbers``
-    str,
-    PhoneNumberValidator(number_format="E164"),
-]
-
-
 class MyPhoneRegister(InputSchema):
     phone: Annotated[
         PhoneNumberStr,

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

@@ -0,0 +1,48 @@
+# pylint: disable=protected-access
+# pylint: disable=redefined-outer-name
+# pylint: disable=too-many-arguments
+# pylint: disable=unused-argument
+# pylint: disable=unused-variable
+
+
+import pytest
+from pydantic import TypeAdapter, ValidationError
+from simcore_service_webserver.users._controller.rest._rest_schemas import (
+    MyPhoneRegister,
+    PhoneNumberStr,
+)
+
+
+@pytest.mark.parametrize(
+    "phone",
+    ["+41763456789", "+19104630364", "+1 301-304-4567"],
+)
+def test_valid_phone_numbers(phone: str):
+    # This test is used to tune options of PhoneNumberValidator
+    assert MyPhoneRegister.model_validate({"phone": phone}).phone == TypeAdapter(
+        PhoneNumberStr
+    ).validate_python(phone)
+
+
+@pytest.mark.parametrize(
+    "phone",
+    [
+        "+41763456789",
+        "+41 76 345 67 89",
+        "tel:+41-76-345-67-89",
+    ],
+    ids=["E.164", "INTERNATIONAL", "RFC3966"],
+)
+def test_autoformat_phone_number_to_e164(phone: str):
+    # This test is used to tune options of PhoneNumberValidator formatting to E164
+    assert TypeAdapter(PhoneNumberStr).validate_python(phone) == "+41763456789"
+
+
+@pytest.mark.parametrize(
+    "phone",
+    ["41763456789", "+09104630364", "+1 111-304-4567"],
+)
+def test_invalid_phone_numbers(phone: str):
+    # This test is used to tune options of PhoneNumberValidator
+    with pytest.raises(ValidationError):
+        MyPhoneRegister.model_validate({"phone": phone})

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

@@ -16,13 +16,8 @@
 )
 from models_library.generics import Envelope
 from models_library.utils.fastapi_encoders import jsonable_encoder
-from pydantic import TypeAdapter, ValidationError
 from servicelib.rest_constants import RESPONSE_MODEL_POLICY
 from simcore_postgres_database import utils_users
-from simcore_service_webserver.users._controller.rest._rest_schemas import (
-    MyPhoneRegister,
-    PhoneNumberStr,
-)
 from simcore_service_webserver.users._models import UserModelAdapter
 
 
@@ -155,38 +150,3 @@ def test_utils_user_generates_valid_myprofile_patch():
     MyProfileRestPatch.model_validate(
         {"userName": utils_users.generate_alternative_username(username)}
     )
-
-
-@pytest.mark.parametrize(
-    "phone",
-    ["+41763456789", "+19104630364", "+1 301-304-4567"],
-)
-def test_valid_phone_numbers(phone: str):
-    # This test is used to tune options of PhoneNumberValidator
-    assert MyPhoneRegister.model_validate({"phone": phone}).phone == TypeAdapter(
-        PhoneNumberStr
-    ).validate_python(phone)
-
-
-@pytest.mark.parametrize(
-    "phone",
-    [
-        "+41763456789",
-        "+41 76 345 67 89",
-        "tel:+41-76-345-67-89",
-    ],
-    ids=["E.164", "INTERNATIONAL", "RFC3966"],
-)
-def test_autoformat_phone_number_to_e164(phone: str):
-    # This test is used to tune options of PhoneNumberValidator formatting to E164
-    assert TypeAdapter(PhoneNumberStr).validate_python(phone) == "+41763456789"
-
-
-@pytest.mark.parametrize(
-    "phone",
-    ["41763456789", "+09104630364", "+1 111-304-4567"],
-)
-def test_invalid_phone_numbers(phone: str):
-    # This test is used to tune options of PhoneNumberValidator
-    with pytest.raises(ValidationError):
-        MyPhoneRegister.model_validate({"phone": phone})