Merge branch 'master' into 2025/upgrade/postgres

Author: mrnicegyu11

.env-devel

@@ -348,10 +348,10 @@ SIMCORE_VCS_RELEASE_TAG=latest
 STUDIES_ACCESS_ANONYMOUS_ALLOWED=0
 STUDIES_DEFAULT_SERVICE_THUMBNAIL=https://via.placeholder.com/170x120.png
 TRACING_OPENTELEMETRY_COLLECTOR_BATCH_SIZE=2
-TRACING_OPENTELEMETRY_COLLECTOR_PORT=4318
 TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT=http://opentelemetry-collector
-TRACING_OPENTELEMETRY_COLLECTOR_SAMPLING_PERCENTAGE=100
 TRACING_OPENTELEMETRY_COLLECTOR_EXPORTER_ENDPOINT=http://jaeger:4318
+TRACING_OPENTELEMETRY_COLLECTOR_PORT=4318
+TRACING_OPENTELEMETRY_COLLECTOR_SAMPLING_PERCENTAGE=100
 TRAEFIK_SIMCORE_ZONE=internal_simcore_stack
 TWILIO_ACCOUNT_SID=DUMMY
 TWILIO_AUTH_TOKEN=DUMMY
@@ -365,8 +365,8 @@ WEBSERVER_DEV_FEATURES_ENABLED=0
 WEBSERVER_DIAGNOSTICS={}
 WEBSERVER_EMAIL={}
 WEBSERVER_EXPORTER={}
-WEBSERVER_FRONTEND={}
 WEBSERVER_FOLDERS=1
+WEBSERVER_FRONTEND={}
 WEBSERVER_GARBAGE_COLLECTOR=null
 WEBSERVER_GROUPS=1
 WEBSERVER_GUNICORN_CMD_ARGS=--timeout=180

api/specs/web-server/_projects_crud.py

@@ -30,7 +30,7 @@
 from models_library.rest_pagination import Page
 from pydantic import BaseModel
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.projects._common_models import ProjectPathParams
+from simcore_service_webserver.projects._common.models import ProjectPathParams
 from simcore_service_webserver.projects._crud_handlers import ProjectCreateParams
 from simcore_service_webserver.projects._crud_handlers_models import (
     ProjectActiveQueryParams,

api/specs/web-server/_projects_groups.py

@@ -9,7 +9,7 @@
 from fastapi import APIRouter, Depends, status
 from models_library.generics import Envelope
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.projects._common_models import ProjectPathParams
+from simcore_service_webserver.projects._common.models import ProjectPathParams
 from simcore_service_webserver.projects._groups_api import ProjectGroupGet
 from simcore_service_webserver.projects._groups_handlers import (
     _ProjectsGroupsBodyParams,

api/specs/web-server/_projects_wallet.py

@@ -16,7 +16,7 @@
 from models_library.projects import ProjectID
 from models_library.wallets import WalletID
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.projects._common_models import ProjectPathParams
+from simcore_service_webserver.projects._common.models import ProjectPathParams
 
 router = APIRouter(
     prefix=f"/{API_VTAG}",

services/web/server/setup.cfg

@@ -12,13 +12,13 @@ commit_args = --no-verify
 [tool:pytest]
 addopts = --strict-markers
 asyncio_mode = auto
-markers = 
+markers =
 	slow: marks tests as slow (deselect with '-m "not slow"')
 	acceptance_test: "marks tests as 'acceptance tests' i.e. does the system do what the user expects? Typically those are workflows."
 	testit: "marks test to run during development"
 	heavy_load: "mark tests that require large amount of data"
 
 [mypy]
-plugins = 
+plugins =
 	pydantic.mypy
 	sqlalchemy.ext.mypy.plugin

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

@@ -175,8 +175,13 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
         json_schema_extra={"auto_default_from_env": True},
         description="director-v2 service client's plugin",
     )
+
+    WEBSERVER_DYNAMIC_SCHEDULER: DynamicSchedulerSettings | None = Field(
+        json_schema_extra={"auto_default_from_env": True},
+    )
+
     WEBSERVER_EMAIL: SMTPSettings | None = Field(
-        json_schema_extra={"auto_default_from_env": True}, description="email plugin"
+        json_schema_extra={"auto_default_from_env": True}
     )
     WEBSERVER_EXPORTER: ExporterSettings | None = Field(
         json_schema_extra={"auto_default_from_env": True}, description="exporter plugin"
@@ -204,9 +209,8 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
         description="payments plugin settings",
     )
 
-    WEBSERVER_DYNAMIC_SCHEDULER: DynamicSchedulerSettings | None = Field(
-        description="dynamic-scheduler plugin settings",
-        json_schema_extra={"auto_default_from_env": True},
+    WEBSERVER_PROJECTS: ProjectsSettings | None = Field(
+        json_schema_extra={"auto_default_from_env": True}
     )
 
     WEBSERVER_REDIS: RedisSettings | None = Field(
@@ -254,15 +258,19 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
         description="tracing plugin", json_schema_extra={"auto_default_from_env": True}
     )
 
-    WEBSERVER_PROJECTS: ProjectsSettings | None = Field(
-        description="projects plugin", json_schema_extra={"auto_default_from_env": True}
-    )
-    WEBSERVER_RABBITMQ: RabbitSettings | None = Field(
-        description="rabbitmq plugin", json_schema_extra={"auto_default_from_env": True}
-    )
-    WEBSERVER_USERS: UsersSettings | None = Field(
-        description="users plugin", json_schema_extra={"auto_default_from_env": True}
-    )
+    WEBSERVER_RABBITMQ: Annotated[
+        RabbitSettings | None,
+        Field(
+            json_schema_extra={"auto_default_from_env": True},
+        ),
+    ]
+
+    WEBSERVER_USERS: Annotated[
+        UsersSettings | None,
+        Field(
+            json_schema_extra={"auto_default_from_env": True},
+        ),
+    ]
 
     # These plugins only require (for the moment) an entry to toggle between enabled/disabled
     WEBSERVER_ANNOUNCEMENTS: bool = False

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

@@ -31,7 +31,7 @@
 from ..security.decorators import permission_required
 from ..utils_aiohttp import envelope_json_response
 from . import _comments_api, projects_api
-from ._common_models import RequestContext
+from ._common.models import RequestContext
 from .exceptions import ProjectInvalidRightsError, ProjectNotFoundError
 
 _logger = logging.getLogger(__name__)

services/web/server/src/simcore_service_webserver/projects/_common/__init__.py

@@ -7,7 +7,7 @@
 from models_library.projects import ProjectID
 from pydantic import BaseModel, ConfigDict, Field
 
-from ..models import RequestContext
+from ...models import RequestContext
 
 assert RequestContext.__name__  # nosec
 

services/web/server/src/simcore_service_webserver/projects/_common_models.py renamed to services/web/server/src/simcore_service_webserver/projects/_common/models.py

@@ -48,7 +48,7 @@
 from ..users.api import get_user_fullname
 from ..workspaces.errors import WorkspaceAccessForbiddenError, WorkspaceNotFoundError
 from . import _crud_api_create, _crud_api_read, projects_api
-from ._common_models import ProjectPathParams, RequestContext
+from ._common.models import ProjectPathParams, RequestContext
 from ._crud_handlers_models import (
     ProjectActiveQueryParams,
     ProjectCreateHeaders,