fixed also get project state

Author: sanderegg

api/specs/web-server/_projects_states.py

@@ -7,9 +7,11 @@
 from typing import Annotated
 
 from fastapi import APIRouter, Body, Depends
-from models_library.api_schemas_webserver.projects import ProjectGet
+from models_library.api_schemas_webserver.projects import (
+    ProjectGet,
+    ProjectStateOutputSchema,
+)
 from models_library.generics import Envelope
-from models_library.projects_state import ProjectState
 from pydantic import ValidationError
 from servicelib.aiohttp import status
 from simcore_service_webserver._meta import API_VTAG
@@ -80,7 +82,9 @@ def close_project(
 ): ...
 
 
-@router.get("/projects/{project_id}/state", response_model=Envelope[ProjectState])
+@router.get(
+    "/projects/{project_id}/state", response_model=Envelope[ProjectStateOutputSchema]
+)
 def get_project_state(
     _path_params: Annotated[ProjectPathParams, Depends()],
 ): ...

services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml

@@ -6304,7 +6304,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/Envelope_ProjectState_'
+                $ref: '#/components/schemas/Envelope_ProjectStateOutputSchema_'
   /v0/projects/{project_uuid}/tags/{tag_id}:add:
     post:
       tags:
@@ -10830,19 +10830,19 @@ components:
           title: Error
       type: object
       title: Envelope[ProjectShareAccepted]
-    Envelope_ProjectState_:
+    Envelope_ProjectStateOutputSchema_:
       properties:
         data:
           anyOf:
-          - $ref: '#/components/schemas/ProjectState'
+          - $ref: '#/components/schemas/ProjectStateOutputSchema'
           - type: 'null'
         error:
           anyOf:
           - {}
           - type: 'null'
           title: Error
       type: object
-      title: Envelope[ProjectState]
+      title: Envelope[ProjectStateOutputSchema]
     Envelope_ProjectsCommentsAPI_:
       properties:
         data:
@@ -15719,31 +15719,6 @@ components:
       - shareeEmail
       - confirmationLink
       title: ProjectShareAccepted
-    ProjectShareState:
-      properties:
-        status:
-          $ref: '#/components/schemas/ProjectStatus'
-          description: The status of the project
-        locked:
-          type: boolean
-          title: Locked
-          description: True if the project is locked
-        current_user_groupids:
-          items:
-            type: integer
-            exclusiveMinimum: true
-            minimum: 0
-          type: array
-          title: Current User Groupids
-          description: Current users in the project (if the project is locked, the
-            list contains only the lock owner)
-      additionalProperties: false
-      type: object
-      required:
-      - status
-      - locked
-      - current_user_groupids
-      title: ProjectShareState
     ProjectShareStateOutputSchema:
       properties:
         status:
@@ -15768,20 +15743,6 @@ components:
       - locked
       - currentUserGroupids
       title: ProjectShareStateOutputSchema
-    ProjectState:
-      properties:
-        share_state:
-          $ref: '#/components/schemas/ProjectShareState'
-          description: The project share state
-        state:
-          $ref: '#/components/schemas/ProjectRunningState'
-          description: The project running state
-      additionalProperties: false
-      type: object
-      required:
-      - share_state
-      - state
-      title: ProjectState
     ProjectStateOutputSchema:
       properties:
         shareState:

services/web/server/src/simcore_service_webserver/projects/_controller/projects_states_rest.py

@@ -4,7 +4,6 @@
 
 from aiohttp import web
 from models_library.api_schemas_webserver.projects import ProjectGet
-from models_library.projects_state import ProjectState
 from pydantic import BaseModel
 from servicelib.aiohttp import status
 from servicelib.aiohttp.requests_validation import (
@@ -16,6 +15,7 @@
     UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE,
     X_SIMCORE_USER_AGENT,
 )
+from servicelib.rest_constants import RESPONSE_MODEL_POLICY
 from simcore_postgres_database.models.users import UserRole
 from simcore_postgres_database.webserver_models import ProjectType
 
@@ -218,11 +218,16 @@ async def get_project_state(request: web.Request) -> web.Response:
     path_params = parse_request_path_parameters_as(ProjectPathParams, request)
 
     # check that project exists and queries state
-    validated_project = await _projects_service.get_project_for_user(
+    project = await _projects_service.get_project_for_user(
         request.app,
         project_uuid=f"{path_params.project_id}",
         user_id=req_ctx.user_id,
         include_state=True,
     )
-    project_state = ProjectState(**validated_project["state"])
-    return envelope_json_response(project_state.model_dump())
+    project_state = ProjectGet.from_domain_model(project).state
+    assert project_state  # nosec
+    return envelope_json_response(
+        project_state.model_dump(
+            **RESPONSE_MODEL_POLICY,
+        )
+    )