Merge remote-tracking branch 'upstream/master' into pr-osparc-long-running-tasks-refactor-6

Author: Andrei Neagu

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

@@ -1,7 +1,7 @@
 import datetime
 from typing import Annotated, TypeAlias
 
-from pydantic import Field
+from pydantic import Field, HttpUrl
 
 from ..functions import (
     Function,
@@ -116,6 +116,10 @@
 
 class RegisteredSolverFunctionGet(RegisteredSolverFunction, OutputSchema):
     uid: Annotated[FunctionID, Field(alias="uuid")]
+    created_at: Annotated[datetime.datetime, Field(alias="creationDate")]
+    modified_at: Annotated[datetime.datetime, Field(alias="lastChangeDate")]
+    access_rights: FunctionAccessRights | None = None
+    thumbnail: HttpUrl | None = None
 
 
 class RegisteredProjectFunctionGet(RegisteredProjectFunction, OutputSchema):
@@ -124,7 +128,7 @@ class RegisteredProjectFunctionGet(RegisteredProjectFunction, OutputSchema):
     created_at: Annotated[datetime.datetime, Field(alias="creationDate")]
     modified_at: Annotated[datetime.datetime, Field(alias="lastChangeDate")]
     access_rights: FunctionAccessRights | None = None
-    thumbnail: str | None = None
+    thumbnail: HttpUrl | None = None
 
 
 class SolverFunctionToRegister(SolverFunction, InputSchema): ...

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

@@ -16078,6 +16078,9 @@ components:
         thumbnail:
           anyOf:
           - type: string
+            maxLength: 2083
+            minLength: 1
+            format: uri
           - type: 'null'
           title: Thumbnail
       type: object
@@ -16131,14 +16134,14 @@ components:
           type: string
           format: uuid
           title: Uuid
-        createdAt:
+        creationDate:
           type: string
           format: date-time
-          title: Createdat
-        modifiedAt:
+          title: Creationdate
+        lastChangeDate:
           type: string
           format: date-time
-          title: Modifiedat
+          title: Lastchangedate
         solverKey:
           type: string
           pattern: ^simcore/services/((comp|dynamic|frontend))/([a-z0-9][a-z0-9_.-]*/)*([a-z0-9-_]+[a-z0-9])$
@@ -16147,14 +16150,26 @@ components:
           type: string
           pattern: ^(0|[1-9]\d*)(\.(0|[1-9]\d*)){2}(-(0|[1-9]\d*|\d*[-a-zA-Z][-\da-zA-Z]*)(\.(0|[1-9]\d*|\d*[-a-zA-Z][-\da-zA-Z]*))*)?(\+[-\da-zA-Z]+(\.[-\da-zA-Z-]+)*)?$
           title: Solverversion
+        accessRights:
+          anyOf:
+          - $ref: '#/components/schemas/FunctionAccessRights'
+          - type: 'null'
+        thumbnail:
+          anyOf:
+          - type: string
+            maxLength: 2083
+            minLength: 1
+            format: uri
+          - type: 'null'
+          title: Thumbnail
       type: object
       required:
       - inputSchema
       - outputSchema
       - defaultInputs
       - uuid
-      - createdAt
-      - modifiedAt
+      - creationDate
+      - lastChangeDate
       - solverKey
       - solverVersion
       title: RegisteredSolverFunctionGet