common

Author: pcrespov

api/specs/web-server/_users.py

@@ -25,8 +25,8 @@
 from simcore_service_webserver.users._notifications_handlers import (
     _NotificationPathParams,
 )
-from simcore_service_webserver.users._schemas import PreRegisteredUserGet
 from simcore_service_webserver.users._tokens_handlers import _TokenPathParams
+from simcore_service_webserver.users.common._schemas import PreRegisteredUserGet
 from simcore_service_webserver.users.schemas import (
     PermissionGet,
     ThirdPartyToken,

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

@@ -26,7 +26,7 @@
     UserNotificationPatch,
     get_notification_key,
 )
-from ._schemas import UsersRequestContext
+from .common._schemas import UsersRequestContext
 from .schemas import Permission, PermissionGet
 
 _logger = logging.getLogger(__name__)

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 ._schemas import UsersRequestContext
+from .common._schemas import UsersRequestContext
 from .exceptions import TokenNotFoundError
 from .schemas import TokenCreate
 

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

@@ -21,8 +21,8 @@
 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 PreRegisteredUserGet, UsersRequestContext
+from .common._constants import FMSG_MISSING_CONFIG_WITH_OEC
+from .common._schemas import PreRegisteredUserGet, UsersRequestContext
 from .exceptions import (
     AlreadyPreRegisteredError,
     MissingGroupExtraPropertiesForProductError,

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

@@ -2,7 +2,7 @@
 
 import pycountry
 from aiohttp import web
-from models_library.api_schemas_webserver.users import PreRegisteredUserGet, UserGet
+from models_library.api_schemas_webserver.users import UserGet
 from models_library.emails import LowerCaseEmailStr
 from models_library.payments import UserInvoiceAddress
 from models_library.products import ProductName
@@ -12,7 +12,8 @@
 
 from ..db.plugin import get_asyncpg_engine
 from . import _users_repository
-from ._models import UserCredentialsTuple
+from .common._models import UserCredentialsTuple
+from .common._schemas import PreRegisteredUserGet
 from .exceptions import AlreadyPreRegisteredError
 from .schemas import Permission
 
@@ -58,17 +59,17 @@ async def set_user_as_deleted(app: web.Application, *, user_id: UserID) -> None:
     )
 
 
-def _glob_to_sql_like(glob_pattern: str) -> str:
-    # Escape SQL LIKE special characters in the glob pattern
-    sql_like_pattern = glob_pattern.replace("%", r"\%").replace("_", r"\_")
-    # Convert glob wildcards to SQL LIKE wildcards
-    return sql_like_pattern.replace("*", "%").replace("?", "_")
-
-
 async def search_users(
     app: web.Application, email_glob: str, *, include_products: bool = False
 ) -> list[UserGet]:
     # NOTE: this search is deploy-wide i.e. independent of the product!
+
+    def _glob_to_sql_like(glob_pattern: str) -> str:
+        # Escape SQL LIKE special characters in the glob pattern
+        sql_like_pattern = glob_pattern.replace("%", r"\%").replace("_", r"\_")
+        # Convert glob wildcards to SQL LIKE wildcards
+        return sql_like_pattern.replace("*", "%").replace("?", "_")
+
     rows = await _users_repository.search_users_and_get_profile(
         get_asyncpg_engine(app), email_like=_glob_to_sql_like(email_glob)
     )

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

@@ -37,13 +37,13 @@
 from ..login.storage import AsyncpgStorage, get_plugin_storage
 from ..security.api import clean_auth_policy_cache
 from . import _users_repository
-from ._models import ToUserUpdateDB
 from ._preferences_api import get_frontend_user_preferences_aggregation
 from ._users_service import (
     get_user_credentials,
     get_user_invoice_address,
     set_user_as_deleted,
 )
+from .common._models import ToUserUpdateDB
 from .exceptions import (
     MissingGroupExtraPropertiesForProductError,
     UserNameDuplicateError,

services/web/server/src/simcore_service_webserver/users/common/__init__.py

@@ -17,7 +17,7 @@
 from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
 from servicelib.request_keys import RQT_USERID_KEY
 
-from .._constants import RQ_PRODUCT_KEY
+from ..._constants import RQ_PRODUCT_KEY
 
 
 class UsersRequestContext(BaseModel):