project patch extended moved

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

@@ -146,11 +146,6 @@ class ProjectPatch(InputSchema):
     quality: dict[str, Any] = FieldNotRequired()
 
 
-class ProjectPatchExtended(ProjectPatch):
-    # Only used internally
-    trashed_at: datetime | None = None
-
-
 __all__: tuple[str, ...] = (
     "EmptyModel",
     "ProjectCopyOverride",

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

@@ -1,11 +1,11 @@
 import arrow
 from aiohttp import web
-from models_library.api_schemas_webserver.projects import ProjectPatchExtended
 from models_library.products import ProductName
 from models_library.projects import ProjectID
 from models_library.users import UserID
 
 from . import projects_api
+from .models import ProjectPatchExtended
 
 
 async def empty_trash(app: web.Application, product_name: ProductName, user_id: UserID):

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

@@ -1,13 +1,6 @@
-import functools
-
 from aiohttp import web
 from servicelib.aiohttp import status
 from servicelib.aiohttp.requests_validation import parse_request_path_parameters_as
-from servicelib.aiohttp.typing_extension import Handler
-from simcore_postgres_database.utils_tags import (
-    TagNotFoundError,
-    TagOperationNotAllowedError,
-)
 
 from .._meta import API_VTAG as VTAG
 from ..login.decorators import get_user_id, login_required
@@ -16,29 +9,12 @@
 from ..security.decorators import permission_required
 from . import _trash_api
 
-
-def _handle_trash_exceptions(handler: Handler):
-    @functools.wraps(handler)
-    async def wrapper(request: web.Request) -> web.StreamResponse:
-        try:
-            return await handler(request)
-
-        except TagNotFoundError as exc:
-            raise web.HTTPNotFound(reason=f"{exc}") from exc
-
-        except TagOperationNotAllowedError as exc:
-            raise web.HTTPForbidden(reason=f"{exc}") from exc
-
-    return wrapper
-
-
 routes = web.RouteTableDef()
 
 
 @routes.delete(f"/{VTAG}/trash", name="empty_trash")
 @login_required
 @permission_required("project.delete")
-@_handle_trash_exceptions
 async def empty_trash(request: web.Request):
     user_id = get_user_id(request)
     product_name = get_product_name(request)
@@ -58,7 +34,6 @@ async def empty_trash(request: web.Request):
 @routes.post(f"/{VTAG}/projects/{{project_id}}:trash", name="trash_project")
 @login_required
 @permission_required("project.delete")
-@_handle_trash_exceptions
 async def trash_project(request: web.Request):
     user_id = get_user_id(request)
     product_name = get_product_name(request)

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

@@ -3,6 +3,7 @@
 from typing import Any, TypeAlias
 
 from aiopg.sa.result import RowProxy
+from models_library.api_schemas_webserver.projects import ProjectPatch
 from models_library.basic_types import HttpUrlWithCustomMinLength
 from models_library.folders import FolderID
 from models_library.projects import ClassifierID, ProjectID
@@ -13,7 +14,7 @@
     none_to_empty_str_pre_validator,
 )
 from models_library.workspaces import WorkspaceID
-from pydantic import BaseModel, validator
+from pydantic import BaseModel, Extra, validator
 from simcore_postgres_database.models.projects import ProjectType, projects
 
 ProjectDict: TypeAlias = dict[str, Any]
@@ -97,6 +98,15 @@ class Config:
         orm_mode = True
 
 
+class ProjectPatchExtended(ProjectPatch):
+    # Only used internally
+    trashed_at: datetime | None = None
+
+    class Config:
+        allow_population_by_field_name = True
+        extra = Extra.forbid
+
+
 __all__: tuple[str, ...] = (
     "ProjectDict",
     "ProjectProxy",

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

@@ -30,10 +30,7 @@
     DynamicServiceStart,
     DynamicServiceStop,
 )
-from models_library.api_schemas_webserver.projects import (
-    ProjectPatch,
-    ProjectPatchExtended,
-)
+from models_library.api_schemas_webserver.projects import ProjectPatch
 from models_library.api_schemas_webserver.projects_nodes import NodePatch
 from models_library.basic_types import KeyIDStr
 from models_library.errors import ErrorDict
@@ -147,7 +144,7 @@
     ProjectTooManyProjectOpenedError,
 )
 from .lock import get_project_locked_state, is_project_locked, lock_project
-from .models import ProjectDict
+from .models import ProjectDict, ProjectPatchExtended
 from .settings import ProjectsSettings, get_plugin_settings
 from .utils import extract_dns_without_default_port