@pcrespov move model

Author: bisgaard-itis

services/web/server/src/simcore_service_webserver/models.py

@@ -5,9 +5,11 @@
 from models_library.users import UserID
 from pydantic import ConfigDict, Field, StringConstraints
 from pydantic_extra_types.phone_numbers import PhoneNumberValidator
+from servicelib.celery.models import OwnerMetadata
 from servicelib.request_keys import RQT_USERID_KEY
 from servicelib.rest_constants import X_CLIENT_SESSION_ID_HEADER
 
+from ._meta import APP_NAME
 from .constants import RQ_PRODUCT_KEY
 
 PhoneNumberStr: TypeAlias = Annotated[
@@ -55,3 +57,11 @@ class ClientSessionHeaderParams(RequestParameters):
     model_config = ConfigDict(
         validate_by_name=True,
     )
+
+
+class WebServerOwnerMetadata(OwnerMetadata):
+    user_id: UserID
+    product_name: ProductName
+    owner: Annotated[
+        str, StringConstraints(pattern=rf"^{APP_NAME}$"), Field(frozen=True)
+    ] = APP_NAME

services/web/server/src/simcore_service_webserver/storage/_rest.py

@@ -53,11 +53,10 @@
 
 from .._meta import API_VTAG
 from ..login.decorators import login_required
-from ..models import AuthenticatedRequestContext
+from ..models import AuthenticatedRequestContext, WebServerOwnerMetadata
 from ..rabbitmq import get_rabbitmq_rpc_client
 from ..security.decorators import permission_required
 from ..tasks._exception_handlers import handle_export_data_exceptions
-from ..utils import WebServerOwnerMetadata
 from .schemas import StorageFileIDStr
 from .settings import StorageSettings, get_plugin_settings
 

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

@@ -30,10 +30,10 @@
 )
 from yarl import URL
 
+from ..models import WebServerOwnerMetadata
 from ..projects.models import ProjectDict
 from ..projects.utils import NodesMap
 from ..rabbitmq import get_rabbitmq_rpc_client
-from ..utils import WebServerOwnerMetadata
 from .settings import StorageSettings, get_plugin_settings
 
 _logger = logging.getLogger(__name__)

services/web/server/src/simcore_service_webserver/tasks/_rest.py

@@ -29,12 +29,11 @@
 from servicelib.aiohttp.rest_responses import create_data_response
 from servicelib.long_running_tasks import lrt_api
 from servicelib.rabbitmq.rpc_interfaces.async_jobs import async_jobs
-from simcore_service_webserver.utils import WebServerOwnerMetadata
 
 from .._meta import API_VTAG
 from ..login.decorators import login_required
 from ..long_running_tasks.plugin import webserver_request_context_decorator
-from ..models import AuthenticatedRequestContext
+from ..models import AuthenticatedRequestContext, WebServerOwnerMetadata
 from ..rabbitmq import get_rabbitmq_rpc_client
 from ..security.decorators import permission_required
 from ._exception_handlers import handle_export_data_exceptions