Merge branch 'master' into fix-redis-backend-cert-reqs

Author: giancarloromeo

api/specs/web-server/_users.py

@@ -39,26 +39,14 @@
     "/me",
     response_model=Envelope[MyProfileGet],
 )
-async def get_my_profile():
-    ...
+async def get_my_profile(): ...
 
 
 @router.patch(
     "/me",
     status_code=status.HTTP_204_NO_CONTENT,
 )
-async def update_my_profile(_body: MyProfilePatch):
-    ...
-
-
-@router.put(
-    "/me",
-    status_code=status.HTTP_204_NO_CONTENT,
-    deprecated=True,
-    description="Use PATCH instead",
-)
-async def replace_my_profile(_body: MyProfilePatch):
-    ...
+async def update_my_profile(_body: MyProfilePatch): ...
 
 
 @router.patch(
@@ -68,25 +56,22 @@ async def replace_my_profile(_body: MyProfilePatch):
 async def set_frontend_preference(
     preference_id: PreferenceIdentifier,
     _body: PatchRequestBody,
-):
-    ...
+): ...
 
 
 @router.get(
     "/me/tokens",
     response_model=Envelope[list[MyTokenGet]],
 )
-async def list_tokens():
-    ...
+async def list_tokens(): ...
 
 
 @router.post(
     "/me/tokens",
     response_model=Envelope[MyTokenGet],
     status_code=status.HTTP_201_CREATED,
 )
-async def create_token(_body: MyTokenCreate):
-    ...
+async def create_token(_body: MyTokenCreate): ...
 
 
 @router.get(
@@ -95,24 +80,21 @@ async def create_token(_body: MyTokenCreate):
 )
 async def get_token(
     _path: Annotated[_TokenPathParams, Depends()],
-):
-    ...
+): ...
 
 
 @router.delete(
     "/me/tokens/{service}",
     status_code=status.HTTP_204_NO_CONTENT,
 )
-async def delete_token(_path: Annotated[_TokenPathParams, Depends()]):
-    ...
+async def delete_token(_path: Annotated[_TokenPathParams, Depends()]): ...
 
 
 @router.get(
     "/me/notifications",
     response_model=Envelope[list[UserNotification]],
 )
-async def list_user_notifications():
-    ...
+async def list_user_notifications(): ...
 
 
 @router.post(
@@ -121,8 +103,7 @@ async def list_user_notifications():
 )
 async def create_user_notification(
     _body: UserNotificationCreate,
-):
-    ...
+): ...
 
 
 @router.patch(
@@ -132,16 +113,14 @@ async def create_user_notification(
 async def mark_notification_as_read(
     _path: Annotated[_NotificationPathParams, Depends()],
     _body: UserNotificationPatch,
-):
-    ...
+): ...
 
 
 @router.get(
     "/me/permissions",
     response_model=Envelope[list[MyPermissionGet]],
 )
-async def list_user_permissions():
-    ...
+async def list_user_permissions(): ...
 
 
 #
@@ -154,8 +133,7 @@ async def list_user_permissions():
     response_model=Envelope[list[UserGet]],
     description="Search among users who are publicly visible to the caller (i.e., me) based on their privacy settings.",
 )
-async def search_users(_body: UsersSearch):
-    ...
+async def search_users(_body: UsersSearch): ...
 
 
 #
@@ -171,7 +149,7 @@ async def search_users(_body: UsersSearch):
     tags=_extra_tags,
 )
 async def search_users_for_admin(
-    _query: Annotated[UsersForAdminSearchQueryParams, Depends()]
+    _query: Annotated[UsersForAdminSearchQueryParams, Depends()],
 ):
     # NOTE: see `Search` in `Common Custom Methods` in https://cloud.google.com/apis/design/custom_methods
     ...
@@ -182,5 +160,4 @@ async def search_users_for_admin(
     response_model=Envelope[UserForAdminGet],
     tags=_extra_tags,
 )
-async def pre_register_user_for_admin(_body: PreRegisteredUserGet):
-    ...
+async def pre_register_user_for_admin(_body: PreRegisteredUserGet): ...

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

@@ -16,6 +16,7 @@
     ValidationInfo,
     field_validator,
 )
+from pydantic.config import JsonDict
 
 from ..basic_types import IDStr
 from ..emails import LowerCaseEmailStr
@@ -46,11 +47,13 @@
 
 
 class MyProfilePrivacyGet(OutputSchema):
+    hide_username: bool
     hide_fullname: bool
     hide_email: bool
 
 
 class MyProfilePrivacyPatch(InputSchema):
+    hide_username: bool | None = None
     hide_fullname: bool | None = None
     hide_email: bool | None = None
 
@@ -79,23 +82,33 @@ class MyProfileGet(OutputSchemaWithoutCamelCase):
     privacy: MyProfilePrivacyGet
     preferences: AggregatedPreferences
 
+    @staticmethod
+    def _update_json_schema_extra(schema: JsonDict) -> None:
+        schema.update(
+            {
+                "examples": [
+                    {
+                        "id": 42,
+                        "login": "[email protected]",
+                        "userName": "bla42",
+                        "role": "admin",  # pre
+                        "expirationDate": "2022-09-14",  # optional
+                        "preferences": {},
+                        "privacy": {
+                            "hide_username": 0,
+                            "hide_fullname": 0,
+                            "hide_email": 1,
+                        },
+                    },
+                ]
+            }
+        )
+
     model_config = ConfigDict(
         # NOTE: old models have an hybrid between snake and camel cases!
         # Should be unified at some point
         populate_by_name=True,
-        json_schema_extra={
-            "examples": [
-                {
-                    "id": 42,
-                    "login": "[email protected]",
-                    "userName": "bla42",
-                    "role": "admin",  # pre
-                    "expirationDate": "2022-09-14",  # optional
-                    "preferences": {},
-                    "privacy": {"hide_fullname": 0, "hide_email": 1},
-                },
-            ]
-        },
+        json_schema_extra=_update_json_schema_extra,
     )
 
     @field_validator("role", mode="before")

packages/postgres-database/src/simcore_postgres_database/utils_users.py

@@ -27,10 +27,10 @@ class UserNotFoundInRepoError(BaseUserRepoError):
 
 
 # NOTE: see MyProfilePatch.user_name
-_MIN_USERNAME_LEN: Final[int] = 4
+MIN_USERNAME_LEN: Final[int] = 4
 
 
-def _generate_random_chars(length: int = _MIN_USERNAME_LEN) -> str:
+def _generate_random_chars(length: int = MIN_USERNAME_LEN) -> str:
     """returns `length` random digit character"""
     return "".join(secrets.choice(string.digits) for _ in range(length))
 
@@ -42,8 +42,8 @@ def _generate_username_from_email(email: str) -> str:
     username = re.sub(r"[^a-zA-Z0-9]", "", username).lower()
 
     # Ensure the username is at least 4 characters long
-    if len(username) < _MIN_USERNAME_LEN:
-        username += _generate_random_chars(length=_MIN_USERNAME_LEN - len(username))
+    if len(username) < MIN_USERNAME_LEN:
+        username += _generate_random_chars(length=MIN_USERNAME_LEN - len(username))
 
     return username
 

packages/service-library/src/servicelib/progress_bar.py

@@ -22,14 +22,12 @@
 
 @runtime_checkable
 class AsyncReportCB(Protocol):
-    async def __call__(self, report: ProgressReport) -> None:
-        ...
+    async def __call__(self, report: ProgressReport) -> None: ...
 
 
 @runtime_checkable
 class ReportCB(Protocol):
-    def __call__(self, report: ProgressReport) -> None:
-        ...
+    def __call__(self, report: ProgressReport) -> None: ...
 
 
 def _normalize_weights(steps: int, weights: list[float]) -> list[float]:
@@ -88,7 +86,7 @@ async def main_fct():
     progress_unit: ProgressUnit | None = None
     progress_report_cb: AsyncReportCB | ReportCB | None = None
     _current_steps: float = _INITIAL_VALUE
-    _currnet_attempt: int = 0
+    _current_attempt: int = 0
     _children: list["ProgressBarData"] = field(default_factory=list)
     _parent: Optional["ProgressBarData"] = None
     _continuous_value_lock: asyncio.Lock = field(init=False)
@@ -148,7 +146,7 @@ async def _report_external(self, value: float) -> None:
                         # NOTE: here we convert back to actual value since this is possibly weighted
                         actual_value=value * self.num_steps,
                         total=self.num_steps,
-                        attempt=self._currnet_attempt,
+                        attempt=self._current_attempt,
                         unit=self.progress_unit,
                         message=self.compute_report_message_stuct(),
                     ),
@@ -200,7 +198,7 @@ async def update(self, steps: float = 1) -> None:
         await self._report_external(new_progress_value)
 
     def reset(self) -> None:
-        self._currnet_attempt += 1
+        self._current_attempt += 1
         self._current_steps = _INITIAL_VALUE
         self._last_report_value = _INITIAL_VALUE