mv requests_keys

pcrespov · pcrespov · commit fbd326a7679e · 2025-09-23T12:15:20.000+02:00
diff --git a/packages/service-library/src/servicelib/aiohttp/request_keys.py b/packages/service-library/src/servicelib/aiohttp/request_keys.py
@@ -1,6 +1,5 @@
-""" Storage keys in requests
+"""Storage keys in requests"""
 
-"""
 from typing import Final
 
 # RQT=request
diff --git a/services/web/server/src/simcore_service_webserver/activity/_handlers.py b/services/web/server/src/simcore_service_webserver/activity/_handlers.py
@@ -6,8 +6,8 @@
 from models_library.api_schemas_webserver.activity import ActivityStatusDict
 from pydantic import TypeAdapter
 from servicelib.aiohttp.client_session import get_client_session
+from servicelib.aiohttp.request_keys import RQT_USERID_KEY
 from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
-from servicelib.request_keys import RQT_USERID_KEY
 from yarl import URL
 
 from .._meta import API_VTAG
diff --git a/services/web/server/src/simcore_service_webserver/constants.py b/services/web/server/src/simcore_service_webserver/constants.py
@@ -9,7 +9,7 @@
     APP_FIRE_AND_FORGET_TASKS_KEY,
     APP_SETTINGS_KEY,
 )
-from servicelib.request_keys import RQT_USERID_KEY
+from servicelib.aiohttp.request_keys import RQT_USERID_KEY
 
 from ._meta import APP_NAME
 
diff --git a/services/web/server/src/simcore_service_webserver/director_v2/_controller/computations_rest.py b/services/web/server/src/simcore_service_webserver/director_v2/_controller/computations_rest.py
@@ -21,12 +21,12 @@
 from models_library.rest_pagination_utils import paginate_data
 from models_library.users import UserID
 from pydantic import Field
+from servicelib.aiohttp.request_keys import RQT_USERID_KEY
 from servicelib.aiohttp.requests_validation import (
     parse_request_path_parameters_as,
     parse_request_query_parameters_as,
 )
 from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
-from servicelib.request_keys import RQT_USERID_KEY
 from servicelib.rest_constants import RESPONSE_MODEL_POLICY
 from servicelib.tracing import with_profiled_span
 
diff --git a/services/web/server/src/simcore_service_webserver/director_v2/_controller/rest.py b/services/web/server/src/simcore_service_webserver/director_v2/_controller/rest.py
@@ -13,6 +13,7 @@
 )
 from models_library.projects import CommitID, ProjectID
 from servicelib.aiohttp import status
+from servicelib.aiohttp.request_keys import RQT_USERID_KEY
 from servicelib.aiohttp.requests_validation import (
     parse_request_body_as,
     parse_request_path_parameters_as,
@@ -21,7 +22,6 @@
     UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE,
     X_SIMCORE_USER_AGENT,
 )
-from servicelib.request_keys import RQT_USERID_KEY
 
 from ..._meta import API_VTAG as VTAG
 from ...login.decorators import login_required
diff --git a/services/web/server/src/simcore_service_webserver/exporter/_handlers.py b/services/web/server/src/simcore_service_webserver/exporter/_handlers.py
@@ -9,8 +9,8 @@
 from models_library.projects import ProjectID
 from models_library.projects_access import Owner
 from models_library.projects_state import ProjectStatus
+from servicelib.aiohttp.request_keys import RQT_USERID_KEY
 from servicelib.redis import with_project_locked
-from servicelib.request_keys import RQT_USERID_KEY
 
 from .._meta import API_VTAG
 from ..constants import RQ_PRODUCT_KEY
diff --git a/services/web/server/src/simcore_service_webserver/invitations/_rest.py b/services/web/server/src/simcore_service_webserver/invitations/_rest.py
@@ -9,8 +9,8 @@
 from models_library.rest_base import RequestParameters
 from models_library.users import UserID
 from pydantic import Field
+from servicelib.aiohttp.request_keys import RQT_USERID_KEY
 from servicelib.aiohttp.requests_validation import parse_request_body_as
-from servicelib.request_keys import RQT_USERID_KEY
 
 from .._meta import API_VTAG as VTAG
 from ..constants import RQ_PRODUCT_KEY
diff --git a/services/web/server/src/simcore_service_webserver/licenses/_common/models.py b/services/web/server/src/simcore_service_webserver/licenses/_common/models.py
@@ -14,7 +14,7 @@
 from models_library.users import UserID
 from models_library.wallets import WalletID
 from pydantic import BaseModel, ConfigDict, Field
-from servicelib.request_keys import RQT_USERID_KEY
+from servicelib.aiohttp.request_keys import RQT_USERID_KEY
 
 from ...constants import RQ_PRODUCT_KEY
 
@@ -28,23 +28,22 @@ class LicensedItemsPathParams(StrictRequestParameters):
     licensed_item_id: LicensedItemID
 
 
-_LicensedItemsListOrderQueryParams: type[
-    RequestParameters
-] = create_ordering_query_model_class(
-    ordering_fields={
-        "display_name",
-        "modified_at",
-    },
-    default=OrderBy(field=IDStr("display_name"), direction=OrderDirection.DESC),
-    ordering_fields_api_to_column_map={"modified_at": "modified"},
+_LicensedItemsListOrderQueryParams: type[RequestParameters] = (
+    create_ordering_query_model_class(
+        ordering_fields={
+            "display_name",
+            "modified_at",
+        },
+        default=OrderBy(field=IDStr("display_name"), direction=OrderDirection.DESC),
+        ordering_fields_api_to_column_map={"modified_at": "modified"},
+    )
 )
 
 
 class LicensedItemsListQueryParams(
     PageQueryParameters,
     _LicensedItemsListOrderQueryParams,  # type: ignore[misc, valid-type]
-):
-    ...
+): ...
 
 
 class LicensedItemsBodyParams(BaseModel):
@@ -60,21 +59,20 @@ class LicensedItemsPurchasesPathParams(StrictRequestParameters):
     licensed_item_purchase_id: LicensedItemPurchaseID
 
 
-_LicensedItemsPurchasesListOrderQueryParams: type[
-    RequestParameters
-] = create_ordering_query_model_class(
-    ordering_fields={
-        "purchased_at",
-        "modified_at",
-        "name",
-    },
-    default=OrderBy(field=IDStr("purchased_at"), direction=OrderDirection.DESC),
-    ordering_fields_api_to_column_map={"modified_at": "modified"},
+_LicensedItemsPurchasesListOrderQueryParams: type[RequestParameters] = (
+    create_ordering_query_model_class(
+        ordering_fields={
+            "purchased_at",
+            "modified_at",
+            "name",
+        },
+        default=OrderBy(field=IDStr("purchased_at"), direction=OrderDirection.DESC),
+        ordering_fields_api_to_column_map={"modified_at": "modified"},
+    )
 )
 
 
 class LicensedItemsPurchasesListQueryParams(
     PageQueryParameters,
     _LicensedItemsPurchasesListOrderQueryParams,  # type: ignore[misc, valid-type]
-):
-    ...
+): ...
diff --git a/services/web/server/src/simcore_service_webserver/login/_controller/rest/auth.py b/services/web/server/src/simcore_service_webserver/login/_controller/rest/auth.py
@@ -7,9 +7,9 @@
 from models_library.authentification import TwoFactorAuthentificationMethod
 from pydantic import TypeAdapter
 from servicelib.aiohttp import status
+from servicelib.aiohttp.request_keys import RQT_USERID_KEY
 from servicelib.aiohttp.requests_validation import parse_request_body_as
 from servicelib.logging_utils import log_context
-from servicelib.request_keys import RQT_USERID_KEY
 from simcore_postgres_database.models.users import UserRole
 
 from ...._meta import API_VTAG
diff --git a/services/web/server/src/simcore_service_webserver/login/_controller/rest/change.py b/services/web/server/src/simcore_service_webserver/login/_controller/rest/change.py
@@ -3,8 +3,8 @@
 from aiohttp import web
 from aiohttp.web import RouteTableDef
 from common_library.logging.logging_errors import create_troubleshooting_log_kwargs
+from servicelib.aiohttp.request_keys import RQT_USERID_KEY
 from servicelib.aiohttp.requests_validation import parse_request_body_as
-from servicelib.request_keys import RQT_USERID_KEY
 from simcore_postgres_database.utils_users import UsersRepo
 
 from ...._meta import API_VTAG
diff --git a/services/web/server/src/simcore_service_webserver/login_auth/decorators.py b/services/web/server/src/simcore_service_webserver/login_auth/decorators.py
@@ -4,8 +4,8 @@
 
 from aiohttp import web
 from models_library.users import UserID
+from servicelib.aiohttp.request_keys import RQT_USERID_KEY
 from servicelib.aiohttp.typing_extension import HandlerAnyReturn
-from servicelib.request_keys import RQT_USERID_KEY
 
 from ..products import products_web
 from ..security import security_web
diff --git a/services/web/server/src/simcore_service_webserver/models.py b/services/web/server/src/simcore_service_webserver/models.py
@@ -5,7 +5,7 @@
 from models_library.users import UserID
 from pydantic import ConfigDict, Field, StringConstraints
 from pydantic_extra_types.phone_numbers import PhoneNumberValidator
-from servicelib.request_keys import RQT_USERID_KEY
+from servicelib.aiohttp.request_keys import RQT_USERID_KEY
 from servicelib.rest_constants import X_CLIENT_SESSION_ID_HEADER
 
 from .constants import RQ_PRODUCT_KEY
diff --git a/services/web/server/src/simcore_service_webserver/products/_controller/rest_schemas.py b/services/web/server/src/simcore_service_webserver/products/_controller/rest_schemas.py
@@ -7,7 +7,7 @@
 from models_library.rest_base import RequestParameters, StrictRequestParameters
 from models_library.users import UserID
 from pydantic import Field
-from servicelib.request_keys import RQT_USERID_KEY
+from servicelib.aiohttp.request_keys import RQT_USERID_KEY
 
 from ...constants import RQ_PRODUCT_KEY
 
diff --git a/services/web/server/src/simcore_service_webserver/projects/_controller/tags_rest.py b/services/web/server/src/simcore_service_webserver/projects/_controller/tags_rest.py
@@ -2,7 +2,7 @@
 
 from aiohttp import web
 from models_library.projects import ProjectID
-from servicelib.request_keys import RQT_USERID_KEY
+from servicelib.aiohttp.request_keys import RQT_USERID_KEY
 
 from ..._meta import API_VTAG
 from ...login.decorators import login_required
diff --git a/services/web/server/src/simcore_service_webserver/publications/_rest.py b/services/web/server/src/simcore_service_webserver/publications/_rest.py
@@ -3,11 +3,11 @@
 from aiohttp import MultipartReader, hdrs, web
 from common_library.json_serialization import json_dumps
 from servicelib.aiohttp import status
+from servicelib.aiohttp.request_keys import RQT_USERID_KEY
 from servicelib.mimetype_constants import (
     MIMETYPE_APPLICATION_JSON,
     MIMETYPE_APPLICATION_ZIP,
 )
-from servicelib.request_keys import RQT_USERID_KEY
 
 from .._meta import API_VTAG as VTAG
 from ..login._emails_service import AttachmentTuple, send_email_from_template, themed
diff --git a/services/web/server/src/simcore_service_webserver/socketio/_handlers.py b/services/web/server/src/simcore_service_webserver/socketio/_handlers.py
@@ -17,8 +17,8 @@
 from models_library.users import UserID
 from pydantic import TypeAdapter
 from servicelib.aiohttp.observer import emit
+from servicelib.aiohttp.request_keys import RQT_USERID_KEY
 from servicelib.logging_utils import log_context
-from servicelib.request_keys import RQT_USERID_KEY
 
 from ..groups.api import list_user_groups_ids_with_read_access
 from ..login.decorators import login_required
diff --git a/services/web/server/src/simcore_service_webserver/storage/_rest.py b/services/web/server/src/simcore_service_webserver/storage/_rest.py
@@ -33,6 +33,7 @@
 from pydantic import AnyUrl, BaseModel, ByteSize, TypeAdapter, field_validator
 from servicelib.aiohttp import status
 from servicelib.aiohttp.client_session import get_client_session
+from servicelib.aiohttp.request_keys import RQT_USERID_KEY
 from servicelib.aiohttp.requests_validation import (
     parse_request_body_as,
     parse_request_path_parameters_as,
@@ -47,7 +48,6 @@
     delete_paths as remote_delete_paths,
 )
 from servicelib.rabbitmq.rpc_interfaces.storage.simcore_s3 import start_export_data
-from servicelib.request_keys import RQT_USERID_KEY
 from servicelib.rest_responses import unwrap_envelope
 from yarl import URL
 
diff --git a/services/web/server/src/simcore_service_webserver/tags/schemas.py b/services/web/server/src/simcore_service_webserver/tags/schemas.py
@@ -7,7 +7,7 @@
 from models_library.rest_base import RequestParameters, StrictRequestParameters
 from models_library.users import UserID
 from pydantic import Field, PositiveInt, StringConstraints
-from servicelib.request_keys import RQT_USERID_KEY
+from servicelib.aiohttp.request_keys import RQT_USERID_KEY
 from simcore_postgres_database.utils_tags import TagAccessRightsDict, TagDict
 
 
diff --git a/services/web/server/src/simcore_service_webserver/wallets/_handlers.py b/services/web/server/src/simcore_service_webserver/wallets/_handlers.py
@@ -12,12 +12,12 @@
 from models_library.users import UserID
 from models_library.wallets import WalletID
 from pydantic import Field
+from servicelib.aiohttp.request_keys import RQT_USERID_KEY
 from servicelib.aiohttp.requests_validation import (
     parse_request_body_as,
     parse_request_path_parameters_as,
 )
 from servicelib.aiohttp.typing_extension import Handler
-from servicelib.request_keys import RQT_USERID_KEY
 
 from .._meta import API_VTAG as VTAG
 from ..application_settings_utils import requires_dev_feature_enabled
diff --git a/services/web/server/src/simcore_service_webserver/workspaces/_common/models.py b/services/web/server/src/simcore_service_webserver/workspaces/_common/models.py
@@ -16,7 +16,7 @@
 from models_library.utils.common_validators import empty_str_to_none_pre_validator
 from models_library.workspaces import WorkspaceID
 from pydantic import BaseModel, BeforeValidator, ConfigDict, Field
-from servicelib.request_keys import RQT_USERID_KEY
+from servicelib.aiohttp.request_keys import RQT_USERID_KEY
 
 from ...constants import RQ_PRODUCT_KEY
 
@@ -32,15 +32,15 @@ class WorkspacesPathParams(StrictRequestParameters):
     workspace_id: WorkspaceID
 
 
-_WorkspacesListOrderQueryParams: type[
-    RequestParameters
-] = create_ordering_query_model_class(
-    ordering_fields={
-        "modified_at",
-        "name",
-    },
-    default=OrderBy(field=IDStr("modified_at"), direction=OrderDirection.DESC),
-    ordering_fields_api_to_column_map={"modified_at": "modified"},
+_WorkspacesListOrderQueryParams: type[RequestParameters] = (
+    create_ordering_query_model_class(
+        ordering_fields={
+            "modified_at",
+            "name",
+        },
+        default=OrderBy(field=IDStr("modified_at"), direction=OrderDirection.DESC),
+        ordering_fields_api_to_column_map={"modified_at": "modified"},
+    )
 )
 
 
@@ -49,22 +49,21 @@ class WorkspacesFilters(Filters):
         default=False,
         description="Set to true to list trashed, false to list non-trashed (default), None to list all",
     )
-    text: Annotated[
-        str | None, BeforeValidator(empty_str_to_none_pre_validator)
-    ] = Field(
-        default=None,
-        description="Multi column full text search",
-        max_length=100,
-        examples=["My Workspace"],
+    text: Annotated[str | None, BeforeValidator(empty_str_to_none_pre_validator)] = (
+        Field(
+            default=None,
+            description="Multi column full text search",
+            max_length=100,
+            examples=["My Workspace"],
+        )
     )
 
 
 class WorkspacesListQueryParams(
     PageQueryParameters,
     FiltersQueryParameters[WorkspacesFilters],
     _WorkspacesListOrderQueryParams,  # type: ignore[misc, valid-type]
-):
-    ...
+): ...
 
 
 class WorkspacesGroupsPathParams(BaseModel):
@@ -80,5 +79,4 @@ class WorkspacesGroupsBodyParams(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
 
-class WorkspaceTrashQueryParams(RemoveQueryParams):
-    ...
+class WorkspaceTrashQueryParams(RemoveQueryParams): ...

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`APP_FIRE_AND_FORGET_TASKS_KEY,`
`10`	`10`	`APP_SETTINGS_KEY,`
`11`	`11`	`)`
`12`		`-from servicelib.request_keys import RQT_USERID_KEY`
	`12`	`+from servicelib.aiohttp.request_keys import RQT_USERID_KEY`
`13`	`13`
`14`	`14`	`from ._meta import APP_NAME`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`)`
`14`	`14`	`from models_library.projects import CommitID, ProjectID`
`15`	`15`	`from servicelib.aiohttp import status`
	`16`	`+from servicelib.aiohttp.request_keys import RQT_USERID_KEY`
`16`	`17`	`from servicelib.aiohttp.requests_validation import (`
`17`	`18`	`parse_request_body_as,`
`18`	`19`	`parse_request_path_parameters_as,`
`@@ -21,7 +22,6 @@`
`21`	`22`	`UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE,`
`22`	`23`	`X_SIMCORE_USER_AGENT,`
`23`	`24`	`)`
`24`		`-from servicelib.request_keys import RQT_USERID_KEY`
`25`	`25`
`26`	`26`	`from ..._meta import API_VTAG as VTAG`
`27`	`27`	`from ...login.decorators import login_required`