Merge branch 'master' into fix-listing-2

Author: matusdrobuliak66

api/specs/web-server/_auth.py

@@ -260,8 +260,8 @@ async def email_confirmation(code: str):
 
 @router.get(
     "/auth/captcha",
-    operation_id="request_captcha",
+    operation_id="create_captcha",
     status_code=status.HTTP_200_OK,
     responses={status.HTTP_200_OK: {"content": {"image/png": {}}}},
 )
-async def request_captcha(): ...
+async def create_captcha(): ...

api/specs/web-server/_users.py

@@ -7,20 +7,25 @@
 from enum import Enum
 from typing import Annotated
 
+from _common import as_query
 from fastapi import APIRouter, Depends, status
 from models_library.api_schemas_webserver.users import (
     MyPermissionGet,
     MyProfileGet,
     MyProfilePatch,
     MyTokenCreate,
     MyTokenGet,
-    UserForAdminGet,
+    UserAccountApprove,
+    UserAccountGet,
+    UserAccountReject,
+    UserAccountSearchQueryParams,
     UserGet,
-    UsersForAdminSearchQueryParams,
+    UsersAccountListQueryParams,
     UsersSearch,
 )
 from models_library.api_schemas_webserver.users_preferences import PatchRequestBody
 from models_library.generics import Envelope
+from models_library.rest_pagination import Page
 from models_library.user_preferences import PreferenceIdentifier
 from simcore_service_webserver._meta import API_VTAG
 from simcore_service_webserver.users._common.schemas import PreRegisteredUserGet
@@ -144,20 +149,46 @@ async def search_users(_body: UsersSearch): ...
 
 
 @router.get(
-    "/admin/users:search",
-    response_model=Envelope[list[UserForAdminGet]],
+    "/admin/user-accounts",
+    response_model=Page[UserAccountGet],
     tags=_extra_tags,
 )
-async def search_users_for_admin(
-    _query: Annotated[UsersForAdminSearchQueryParams, Depends()],
+async def list_users_accounts(
+    _query: Annotated[as_query(UsersAccountListQueryParams), Depends()],
+): ...
+
+
+@router.post(
+    "/admin/user-accounts:approve",
+    status_code=status.HTTP_204_NO_CONTENT,
+    tags=_extra_tags,
+)
+async def approve_user_account(_body: UserAccountApprove): ...
+
+
+@router.post(
+    "/admin/user-accounts:reject",
+    status_code=status.HTTP_204_NO_CONTENT,
+    tags=_extra_tags,
+)
+async def reject_user_account(_body: UserAccountReject): ...
+
+
+@router.get(
+    "/admin/user-accounts:search",
+    response_model=Envelope[list[UserAccountGet]],
+    tags=_extra_tags,
+)
+async def search_user_accounts(
+    _query: Annotated[UserAccountSearchQueryParams, Depends()],
 ):
     # NOTE: see `Search` in `Common Custom Methods` in https://cloud.google.com/apis/design/custom_methods
     ...
 
 
 @router.post(
-    "/admin/users:pre-register",
-    response_model=Envelope[UserForAdminGet],
+    "/admin/user-accounts:pre-register",
+    response_model=Envelope[UserAccountGet],
     tags=_extra_tags,
 )
-async def pre_register_user_for_admin(_body: PreRegisteredUserGet): ...
+async def pre_register_user_account(_body: PreRegisteredUserGet): ...

packages/models-library/src/models_library/api_schemas_webserver/users.py

@@ -1,13 +1,15 @@
 import re
-from datetime import date
+from datetime import date, datetime
 from enum import Enum
 from typing import Annotated, Any, Literal, Self
 
 import annotated_types
 from common_library.basic_types import DEFAULT_FACTORY
 from common_library.dict_tools import remap_keys
-from common_library.users_enums import UserStatus
+from common_library.users_enums import AccountRequestStatus, UserStatus
 from models_library.groups import AccessRightsDict
+from models_library.rest_filters import Filters
+from models_library.rest_pagination import PageQueryParameters
 from pydantic import (
     ConfigDict,
     EmailStr,
@@ -39,6 +41,7 @@
     OutputSchemaWithoutCamelCase,
 )
 from .groups import MyGroupsGet
+from .products import InvitationGenerate
 from .users_preferences import AggregatedPreferences
 
 #
@@ -238,7 +241,30 @@ def from_domain_model(cls, data):
         return cls.model_validate(data, from_attributes=True)
 
 
-class UsersForAdminSearchQueryParams(RequestParameters):
+class UsersForAdminListFilter(Filters):
+    # 1. account_request_status: PENDING, REJECTED, APPROVED
+    # 2. If APPROVED AND user uses the invitation link, then when user is registered,
+    #  it can be in any of these statuses:
+    #     CONFIRMATION_PENDING, ACTIVE, EXPIRED, BANNED, DELETED
+    #
+    review_status: Literal["PENDING", "REVIEWED"] | None = None
+
+    model_config = ConfigDict(extra="forbid")
+
+
+class UsersAccountListQueryParams(UsersForAdminListFilter, PageQueryParameters): ...
+
+
+class UserAccountApprove(InputSchema):
+    email: EmailStr
+    invitation: InvitationGenerate | None = None
+
+
+class UserAccountReject(InputSchema):
+    email: EmailStr
+
+
+class UserAccountSearchQueryParams(RequestParameters):
     email: Annotated[
         str,
         Field(
@@ -249,7 +275,7 @@ class UsersForAdminSearchQueryParams(RequestParameters):
     ]
 
 
-class UserForAdminGet(OutputSchema):
+class UserAccountGet(OutputSchema):
     # ONLY for admins
     first_name: str | None
     last_name: str | None
@@ -269,8 +295,12 @@ class UserForAdminGet(OutputSchema):
         ),
     ] = DEFAULT_FACTORY
 
-    # authorization
+    # pre-registration
+    pre_registration_id: int | None
     invited_by: str | None = None
+    account_request_status: AccountRequestStatus | None
+    account_request_reviewed_by: UserID | None = None
+    account_request_reviewed_at: datetime | None = None
 
     # user status
     registered: bool

packages/service-library/src/servicelib/aiohttp/rest_responses.py

@@ -8,10 +8,10 @@
 from common_library.error_codes import ErrorCodeStr
 from common_library.json_serialization import json_dumps
 from models_library.rest_error import ErrorGet, ErrorItemType
-from servicelib.rest_constants import RESPONSE_MODEL_POLICY
 
 from ..aiohttp.status import HTTP_200_OK
 from ..mimetype_constants import MIMETYPE_APPLICATION_JSON
+from ..rest_constants import RESPONSE_MODEL_POLICY
 from ..rest_responses import is_enveloped
 from ..status_codes_utils import get_code_description
 
@@ -54,7 +54,7 @@ def create_http_error(
     http_error_cls: type[HTTPError] = web.HTTPInternalServerError,
     *,
     skip_internal_error_details: bool = False,
-    error_code: ErrorCodeStr | None = None
+    error_code: ErrorCodeStr | None = None,
 ) -> HTTPError:
     """
     - Response body conforms OAS schema model
@@ -92,7 +92,8 @@ def create_http_error(
     )
 
     return http_error_cls(
-        reason=reason,
+        # Multiline not allowed in HTTP reason
+        reason=reason.replace("\n", " ") if reason else None,
         text=json_dumps(
             payload,
         ),

scripts/maintenance/pre_registration.py

@@ -123,7 +123,7 @@ async def _pre_register_user(
     extras: dict[str, Any] = {},
 ) -> dict[str, Any]:
     """Pre-register a user in the system"""
-    path = "/v0/admin/users:pre-register"
+    path = "/v0/admin/user-accounts:pre-register"
 
     user_data = PreRegisterUserRequest(
         firstName=first_name,

services/agent/docker/boot.sh

@@ -32,7 +32,11 @@ fi
 
 if [ "${SC_BOOT_MODE}" = "debug" ]; then
   # NOTE: production does NOT pre-installs debugpy
-  uv pip install debugpy
+  if command -v uv >/dev/null 2>&1; then
+    uv pip install debugpy
+  else
+    pip install debugpy
+  fi
 fi
 
 #
@@ -48,7 +52,7 @@ if [ "${SC_BOOT_MODE}" = "debug" ]; then
 
   exec sh -c "
     cd services/agent/src/simcore_service_agent && \
-    python -m debugpy --listen 0.0.0.0:${AGENT_SERVER_REMOTE_DEBUG_PORT} -m uvicorn main:the_app \
+    python -Xfrozen_modules=off -m debugpy --listen 0.0.0.0:${AGENT_SERVER_REMOTE_DEBUG_PORT} -m uvicorn main:the_app \
       --host 0.0.0.0 \
       --port 8000 \
       --reload \

services/api-server/docker/boot.sh

@@ -27,7 +27,11 @@ fi
 
 if [ "${SC_BOOT_MODE}" = "debug" ]; then
   # NOTE: production does NOT pre-installs debugpy
-  uv pip install debugpy
+  if command -v uv >/dev/null 2>&1; then
+    uv pip install debugpy
+  else
+    pip install debugpy
+  fi
 fi
 
 # RUNNING application ----------------------------------------
@@ -40,7 +44,7 @@ if [ "${SC_BOOT_MODE}" = "debug" ]; then
 
   exec sh -c "
     cd services/api-server/src/simcore_service_api_server && \
-    python -m debugpy --listen 0.0.0.0:${API_SERVER_REMOTE_DEBUG_PORT} -m uvicorn main:the_app \
+    python -Xfrozen_modules=off -m debugpy --listen 0.0.0.0:${API_SERVER_REMOTE_DEBUG_PORT} -m uvicorn main:the_app \
       --host 0.0.0.0 \
       --reload \
       $reload_dir_packages

services/autoscaling/docker/boot.sh

@@ -31,7 +31,11 @@ fi
 
 if [ "${SC_BOOT_MODE}" = "debug" ]; then
   # NOTE: production does NOT pre-installs debugpy
-  uv pip install debugpy
+  if command -v uv >/dev/null 2>&1; then
+    uv pip install debugpy
+  else
+    pip install debugpy
+  fi
 fi
 
 #
@@ -47,7 +51,7 @@ if [ "${SC_BOOT_MODE}" = "debug" ]; then
 
   exec sh -c "
     cd services/autoscaling/src/simcore_service_autoscaling && \
-    python -m debugpy --listen 0.0.0.0:${AUTOSCALING_REMOTE_DEBUGGING_PORT} -m uvicorn main:the_app \
+    python -Xfrozen_modules=off -m debugpy --listen 0.0.0.0:${AUTOSCALING_REMOTE_DEBUGGING_PORT} -m uvicorn main:the_app \
       --host 0.0.0.0 \
       --reload \
       $reload_dir_packages

services/catalog/docker/boot.sh

@@ -27,7 +27,11 @@ fi
 
 if [ "${SC_BOOT_MODE}" = "debug" ]; then
   # NOTE: production does NOT pre-installs debugpy
-  uv pip install debugpy
+  if command -v uv >/dev/null 2>&1; then
+    uv pip install debugpy
+  else
+    pip install debugpy
+  fi
 fi
 
 # RUNNING application ----------------------------------------
@@ -40,7 +44,7 @@ if [ "${SC_BOOT_MODE}" = "debug" ]; then
 
   exec sh -c "
     cd services/catalog/src/simcore_service_catalog && \
-    python -m debugpy --listen 0.0.0.0:${CATALOG_REMOTE_DEBUGGING_PORT} -m uvicorn main:the_app \
+    python -Xfrozen_modules=off -m debugpy --listen 0.0.0.0:${CATALOG_REMOTE_DEBUGGING_PORT} -m uvicorn main:the_app \
       --host 0.0.0.0 \
       --reload \
       $reload_dir_packages

services/clusters-keeper/docker/boot.sh

@@ -32,7 +32,11 @@ fi
 
 if [ "${SC_BOOT_MODE}" = "debug" ]; then
   # NOTE: production does NOT pre-installs debugpy
-  uv pip install debugpy
+  if command -v uv >/dev/null 2>&1; then
+    uv pip install debugpy
+  else
+    pip install debugpy
+  fi
 fi
 
 #
@@ -48,7 +52,7 @@ if [ "${SC_BOOT_MODE}" = "debug" ]; then
 
   exec sh -c "
     cd services/clusters-keeper/src/simcore_service_clusters_keeper && \
-    python -m debugpy --listen 0.0.0.0:${CLUSTERS_KEEPER_REMOTE_DEBUGGING_PORT} -m uvicorn main:the_app \
+    python -Xfrozen_modules=off -m debugpy --listen 0.0.0.0:${CLUSTERS_KEEPER_REMOTE_DEBUGGING_PORT} -m uvicorn main:the_app \
       --host 0.0.0.0 \
       --reload \
       $reload_dir_packages