handlers and mvs models

Author: pcrespov

api/specs/web-server/_users.py

@@ -12,7 +12,6 @@
 from models_library.generics import Envelope
 from models_library.user_preferences import PreferenceIdentifier
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.users._handlers import PreUserProfile, _SearchQueryParams
 from simcore_service_webserver.users._notifications import (
     UserNotification,
     UserNotificationCreate,
@@ -21,7 +20,11 @@
 from simcore_service_webserver.users._notifications_handlers import (
     _NotificationPathParams,
 )
-from simcore_service_webserver.users._schemas import UserProfile
+from simcore_service_webserver.users._schemas import (
+    PreUserProfile,
+    UserProfile,
+    _SearchQueryParams,
+)
 from simcore_service_webserver.users._tokens_handlers import _TokenPathParams
 from simcore_service_webserver.users.schemas import (
     PermissionGet,

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

@@ -18,7 +18,6 @@
 from ..security.decorators import permission_required
 from ..utils_aiohttp import envelope_json_response
 from . import _users_service
-from ._handlers import UsersRequestContext
 from ._notifications import (
     MAX_NOTIFICATIONS_FOR_USER_TO_KEEP,
     MAX_NOTIFICATIONS_FOR_USER_TO_SHOW,
@@ -27,6 +26,7 @@
     UserNotificationPatch,
     get_notification_key,
 )
+from ._schemas import UsersRequestContext
 from .schemas import Permission, PermissionGet
 
 _logger = logging.getLogger(__name__)

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

@@ -11,9 +11,35 @@
 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, ValidationInfo, field_validator, model_validator
+from models_library.users import UserID
+from pydantic import (
+    BaseModel,
+    ConfigDict,
+    Field,
+    ValidationInfo,
+    field_validator,
+    model_validator,
+)
+from servicelib.aiohttp import status
+from servicelib.request_keys import RQT_USERID_KEY
 from simcore_postgres_database.models.users import UserStatus
 
+from .._constants import RQ_PRODUCT_KEY
+from ._schemas import PreUserProfile
+
+
+class UsersRequestContext(BaseModel):
+    user_id: UserID = Field(..., alias=RQT_USERID_KEY)  # type: ignore[literal-required]
+    product_name: str = Field(..., alias=RQ_PRODUCT_KEY)  # type: ignore[literal-required]
+
+
+class _SearchQueryParams(BaseModel):
+    email: str = Field(
+        min_length=3,
+        max_length=200,
+        description="complete or glob pattern for an email",
+    )
+
 
 class UserProfile(OutputSchema):
     first_name: str | None

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

@@ -15,7 +15,7 @@
 from ..security.decorators import permission_required
 from ..utils_aiohttp import envelope_json_response
 from . import _tokens
-from ._handlers import UsersRequestContext
+from ._schemas import UsersRequestContext
 from .exceptions import TokenNotFoundError
 from .schemas import TokenCreate
 

services/web/server/src/simcore_service_webserver/users/_handlers.py renamed to services/web/server/src/simcore_service_webserver/users/_users_handlers.py

@@ -12,17 +12,15 @@
 )
 from servicelib.aiohttp.typing_extension import Handler
 from servicelib.logging_errors import create_troubleshotting_log_kwargs
-from servicelib.request_keys import RQT_USERID_KEY
 from servicelib.rest_constants import RESPONSE_MODEL_POLICY
 
-from .._constants import RQ_PRODUCT_KEY
 from .._meta import API_VTAG
 from ..login.decorators import login_required
 from ..security.decorators import permission_required
 from ..utils_aiohttp import envelope_json_response
 from . import _users_service, api
 from ._constants import FMSG_MISSING_CONFIG_WITH_OEC
-from ._schemas import PreUserProfile
+from ._schemas import PreUserProfile, UsersRequestContext, _SearchQueryParams
 from .exceptions import (
     AlreadyPreRegisteredError,
     MissingGroupExtraPropertiesForProductError,
@@ -36,11 +34,6 @@
 routes = web.RouteTableDef()
 
 
-class UsersRequestContext(BaseModel):
-    user_id: UserID = Field(..., alias=RQT_USERID_KEY)  # type: ignore[literal-required]
-    product_name: str = Field(..., alias=RQ_PRODUCT_KEY)  # type: ignore[literal-required]
-
-
 def _handle_users_exceptions(handler: Handler):
     @functools.wraps(handler)
     async def wrapper(request: web.Request) -> web.StreamResponse:
@@ -97,14 +90,6 @@ async def update_my_profile(request: web.Request) -> web.Response:
     return web.json_response(status=status.HTTP_204_NO_CONTENT)
 
 
-class _SearchQueryParams(BaseModel):
-    email: str = Field(
-        min_length=3,
-        max_length=200,
-        description="complete or glob pattern for an email",
-    )
-
-
 _RESPONSE_MODEL_MINIMAL_POLICY = RESPONSE_MODEL_POLICY.copy()
 _RESPONSE_MODEL_MINIMAL_POLICY["exclude_none"] = True
 

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

@@ -10,10 +10,10 @@
 from servicelib.aiohttp.observer import setup_observer_registry
 
 from . import (
-    _handlers,
     _notifications_handlers,
     _preferences_handlers,
     _tokens_handlers,
+    _users_handlers,
 )
 from ._preferences_models import overwrite_user_preferences_defaults
 
@@ -32,7 +32,7 @@ def setup_users(app: web.Application):
     setup_observer_registry(app)
     overwrite_user_preferences_defaults(app)
 
-    app.router.add_routes(_handlers.routes)
+    app.router.add_routes(_users_handlers.routes)
     app.router.add_routes(_tokens_handlers.routes)
     app.router.add_routes(_notifications_handlers.routes)
     app.router.add_routes(_preferences_handlers.routes)