common model

Author: pcrespov

api/specs/web-server/_trash.py

@@ -8,15 +8,10 @@
 from typing import Annotated
 
 from fastapi import APIRouter, Depends, status
+from models_library.trash import RemoveQueryParams
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.folders._models import (
-    FoldersPathParams,
-    RemoveQueryParams,
-)
+from simcore_service_webserver.folders._models import FoldersPathParams
 from simcore_service_webserver.projects._trash_handlers import ProjectPathParams
-from simcore_service_webserver.projects._trash_handlers import (
-    RemoveQueryParams as RemoveQueryParams_duplicated,
-)
 from simcore_service_webserver.workspaces._models import WorkspacesPathParams
 
 router = APIRouter(
@@ -83,7 +78,7 @@ def untrash_project(
 )
 def trash_folder(
     _p: Annotated[FoldersPathParams, Depends()],
-    _q: Annotated[RemoveQueryParams_duplicated, Depends()],
+    _q: Annotated[RemoveQueryParams, Depends()],
 ):
     ...
 
@@ -116,7 +111,7 @@ def untrash_folder(
 )
 def trash_workspace(
     _p: Annotated[WorkspacesPathParams, Depends()],
-    _q: Annotated[RemoveQueryParams_duplicated, Depends()],
+    _q: Annotated[RemoveQueryParams, Depends()],
 ):
     ...
 

packages/models-library/src/models_library/trash.py

@@ -0,0 +1,7 @@
+from pydantic import BaseModel, Field
+
+
+class RemoveQueryParams(BaseModel):
+    force: bool = Field(
+        default=False, description="Force removal (even if resource is active)"
+    )

services/web/server/src/simcore_service_webserver/folders/_models.py

@@ -5,10 +5,11 @@
 from models_library.rest_filters import Filters, FiltersQueryParameters
 from models_library.rest_ordering import OrderBy, OrderDirection
 from models_library.rest_pagination import PageQueryParameters
+from models_library.trash import RemoveQueryParams
 from models_library.users import UserID
 from models_library.utils.common_validators import null_or_none_str_to_none_validator
 from models_library.workspaces import WorkspaceID
-from pydantic import BaseModel, Extra, Field, Json, validator
+from pydantic import Extra, Field, Json, validator
 from servicelib.aiohttp.requests_validation import RequestParams, StrictRequestParams
 from servicelib.request_keys import RQT_USERID_KEY
 
@@ -85,14 +86,15 @@ class Config:
     )(null_or_none_str_to_none_validator)
 
 
+
 class FolderListFullSearchWithJsonStrQueryParams(
     PageQueryParameters, FolderListSortParams, FiltersQueryParameters[FolderFilters]
 ):
     class Config:
         extra = Extra.forbid
 
 
-class RemoveQueryParams(BaseModel):
-    force: bool = Field(
-        default=False, description="Force removal (even if resource is active)"
-    )
+
+assert RemoveQueryParams  # nosec
+
+__all__: tuple[str, ...] = ("RemoveQueryParams",)

services/web/server/src/simcore_service_webserver/projects/_common_models.py

@@ -5,6 +5,7 @@
 """
 
 from models_library.projects import ProjectID
+from models_library.trash import RemoveQueryParams
 from models_library.users import UserID
 from pydantic import BaseModel, Extra, Field
 from servicelib.request_keys import RQT_USERID_KEY
@@ -25,7 +26,6 @@ class Config:
         extra = Extra.forbid
 
 
-class RemoveQueryParams(BaseModel):
-    force: bool = Field(
-        default=False, description="Force removal (even if resource is active)"
-    )
+assert RemoveQueryParams  # nosec
+
+__all__: tuple[str, ...] = ("RemoveQueryParams",)

services/web/server/src/simcore_service_webserver/workspaces/_models.py

@@ -4,6 +4,7 @@
 from models_library.rest_filters import Filters, FiltersQueryParameters
 from models_library.rest_ordering import OrderBy, OrderDirection
 from models_library.rest_pagination import PageQueryParameters
+from models_library.trash import RemoveQueryParams
 from models_library.users import GroupID, UserID
 from models_library.workspaces import WorkspaceID
 from pydantic import BaseModel, Extra, Field, Json, validator
@@ -75,3 +76,8 @@ class WorkspacesGroupsBodyParams(BaseModel):
 
     class Config:
         extra = Extra.forbid
+
+
+assert RemoveQueryParams  # nosec
+
+__all__: tuple[str, ...] = ("RemoveQueryParams",)

services/web/server/src/simcore_service_webserver/workspaces/_workspaces_handlers.py

@@ -27,6 +27,7 @@
 from . import _workspaces_api
 from ._exceptions_handlers import handle_plugin_requests_exceptions
 from ._models import (
+    WorkspacesFilters,
     WorkspacesListWithJsonStrQueryParams,
     WorkspacesPathParams,
     WorkspacesRequestContext,
@@ -68,10 +69,14 @@ async def list_workspaces(request: web.Request):
         parse_request_query_parameters_as(WorkspacesListWithJsonStrQueryParams, request)
     )
 
+    if not query_params.filters:
+        query_params.filters = WorkspacesFilters()
+
     workspaces: WorkspaceGetPage = await _workspaces_api.list_workspaces(
         app=request.app,
         user_id=req_ctx.user_id,
         product_name=req_ctx.product_name,
+        trashed=query_params.filters.trashed,
         offset=query_params.offset,
         limit=query_params.limit,
         order_by=parse_obj_as(OrderBy, query_params.order_by),