refactor

Author: sanderegg

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

@@ -35,7 +35,12 @@
     ProjectType,
 )
 from ..projects_access import AccessRights, GroupIDStr
-from ..projects_state import ProjectState, ProjectStatus
+from ..projects_state import (
+    ProjectShareCurrentUserGroupIDs,
+    ProjectShareLocked,
+    ProjectShareStatus,
+    ProjectStateRunningState,
+)
 from ..utils._original_fastapi_encoders import jsonable_encoder
 from ..utils.common_validators import (
     empty_str_to_none_pre_validator,
@@ -106,20 +111,14 @@ def to_domain_model(self) -> dict[str, Any]:
 
 
 class ProjectShareStateOutputSchema(OutputSchema):
-    status: Annotated[ProjectStatus, Field(description="The status of the project")]
-    locked: Annotated[bool, Field(description="True if the project is locked")]
-    current_user_groupids: Annotated[
-        list[GroupID],
-        Field(
-            description="Current users in the project (if the project is locked, the list contains only the lock owner)"
-        ),
-    ]
+    status: ProjectShareStatus
+    locked: ProjectShareLocked
+    current_user_groupids: ProjectShareCurrentUserGroupIDs
 
 
-class ProjectStateOutputSchema(ProjectState, OutputSchema):
-    share_state: Annotated[
-        ProjectShareStateOutputSchema, Field(description="The project lock state")
-    ]
+class ProjectStateOutputSchema(OutputSchema):
+    share_state: ProjectShareStateOutputSchema
+    state: ProjectStateRunningState
 
 
 class ProjectGet(OutputSchema):

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

@@ -3,7 +3,7 @@
 """
 
 from enum import Enum, unique
-from typing import Annotated, Self
+from typing import Annotated, Self, TypeAlias
 
 from pydantic import (
     BaseModel,
@@ -82,15 +82,24 @@ class ProjectStatus(str, Enum):
     MAINTAINING = "MAINTAINING"  # used for maintenance tasks, like removing EFS data
 
 
+ProjectShareStatus: TypeAlias = Annotated[
+    ProjectStatus, Field(description="The status of the project")
+]
+ProjectShareLocked: TypeAlias = Annotated[
+    bool, Field(description="True if the project is locked")
+]
+ProjectShareCurrentUserGroupIDs: TypeAlias = Annotated[
+    list[GroupID],
+    Field(
+        description="Current users in the project (if the project is locked, the list contains only the lock owner)"
+    ),
+]
+
+
 class ProjectShareState(BaseModel):
-    status: Annotated[ProjectStatus, Field(description="The status of the project")]
-    locked: Annotated[bool, Field(description="True if the project is locked")]
-    current_user_groupids: Annotated[
-        list[GroupID],
-        Field(
-            description="Current users in the project (if the project is locked, the list contains only the lock owner)"
-        ),
-    ]
+    status: ProjectShareStatus
+    locked: ProjectShareLocked
+    current_user_groupids: ProjectShareCurrentUserGroupIDs
 
     @staticmethod
     def _update_json_schema_extra(schema: JsonDict) -> None:
@@ -225,12 +234,16 @@ class ProjectRunningState(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
 
+ProjectStateShareState: TypeAlias = Annotated[
+    ProjectShareState, Field(description="The project share state")
+]
+ProjectStateRunningState: TypeAlias = Annotated[
+    ProjectRunningState, Field(description="The project running state")
+]
+
+
 class ProjectState(BaseModel):
-    share_state: Annotated[
-        ProjectShareState, Field(description="The project lock state")
-    ]
-    state: Annotated[
-        ProjectRunningState, Field(description="The project running state")
-    ]
+    share_state: ProjectStateShareState
+    state: ProjectStateRunningState
 
     model_config = ConfigDict(extra="forbid")

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

@@ -15772,7 +15772,7 @@ components:
       properties:
         share_state:
           $ref: '#/components/schemas/ProjectShareState'
-          description: The project lock state
+          description: The project share state
         state:
           $ref: '#/components/schemas/ProjectRunningState'
           description: The project running state
@@ -15786,7 +15786,6 @@ components:
       properties:
         shareState:
           $ref: '#/components/schemas/ProjectShareStateOutputSchema'
-          description: The project lock state
         state:
           $ref: '#/components/schemas/ProjectRunningState'
           description: The project running state

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

@@ -20,7 +20,7 @@
 from simcore_postgres_database.webserver_models import ProjectType
 
 from ..._meta import API_VTAG as VTAG
-from ...collaboration import settings as collaboration_settings
+from ...application_settings import get_application_settings
 from ...director_v2.exceptions import DirectorV2ServiceError
 from ...login.decorators import login_required
 from ...notifications import project_logs
@@ -94,16 +94,19 @@ async def open_project(request: web.Request) -> web.Response:
         )
 
         product: Product = products_web.get_current_product(request)
+        app_settings = get_application_settings(request.app)
 
         if not await _projects_service.try_open_project_for_user(
             req_ctx.user_id,
             project_uuid=path_params.project_id,
             client_session_id=client_session_id,
             app=request.app,
             max_number_of_opened_projects_per_user=product.max_open_studies_per_user,
-            max_number_of_user_sessions_per_project=collaboration_settings.get_plugin_settings(
-                request.app
-            ).RTC_MAX_NUMBER_OF_USERS,
+            max_number_of_user_sessions_per_project=(
+                1
+                if not app_settings.WEBSERVER_REALTIME_COLLABORATION
+                else app_settings.WEBSERVER_REALTIME_COLLABORATION.RTC_MAX_NUMBER_OF_USERS
+            ),
         ):
             raise HTTPLockedError(text="Project is locked, try later")