Merge branch 'master' into is8102/add-search-api-in-storage

Author: giancarloromeo

Makefile

@@ -707,7 +707,7 @@ local-registry: .env ## creates a local docker registry and configure simcore to
 							--publish 5000:5000 \
 							--volume $(LOCAL_REGISTRY_VOLUME):/var/lib/registry \
 							--name $(LOCAL_REGISTRY_HOSTNAME) \
-							registry:2)
+							registry:3)
 
 	# WARNING: environment file .env is now setup to use local registry on port 5000 without any security (take care!)...
 	@echo REGISTRY_AUTH=False >> .env

api/specs/web-server/_conversations.py

@@ -32,7 +32,6 @@
 )
 from simcore_service_webserver.conversations._controller._conversations_rest import (
     _ConversationsCreateBodyParams,
-    _GetConversationsQueryParams,
     _ListConversationsQueryParams,
 )
 
@@ -56,7 +55,6 @@
 )
 async def create_conversation(
     _body: _ConversationsCreateBodyParams,
-    _query: Annotated[_GetConversationsQueryParams, Depends()],
 ): ...
 
 
@@ -69,14 +67,13 @@ async def list_conversations(
 ): ...
 
 
-@router.put(
+@router.patch(
     "/conversations/{conversation_id}",
     response_model=Envelope[ConversationRestGet],
 )
 async def update_conversation(
     _params: Annotated[ConversationPathParams, Depends()],
     _body: ConversationPatch,
-    _query: Annotated[as_query(_GetConversationsQueryParams), Depends()],
 ): ...
 
 
@@ -86,7 +83,6 @@ async def update_conversation(
 )
 async def delete_conversation(
     _params: Annotated[ConversationPathParams, Depends()],
-    _query: Annotated[as_query(_GetConversationsQueryParams), Depends()],
 ): ...
 
 
@@ -96,7 +92,6 @@ async def delete_conversation(
 )
 async def get_conversation(
     _params: Annotated[ConversationPathParams, Depends()],
-    _query: Annotated[as_query(_GetConversationsQueryParams), Depends()],
 ): ...
 
 

packages/models-library/src/models_library/api_schemas_directorv2/dynamic_services_service.py

@@ -1,5 +1,6 @@
 from functools import cached_property
 from pathlib import Path
+from typing import Annotated
 
 from pydantic import BaseModel, ConfigDict, Field
 from pydantic.config import JsonDict
@@ -89,6 +90,11 @@ class RunningDynamicServiceDetails(ServiceDetails):
         alias="service_message",
     )
 
+    is_collaborative: Annotated[
+        bool,
+        Field(description="True if service allows collaboration (multi-tenant access)"),
+    ] = False
+
     @staticmethod
     def _update_json_schema_extra(schema: JsonDict) -> None:
         schema.update(

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

@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Annotated, Self
+from typing import Annotated, Any, Self
 
 from pydantic import Field
 
@@ -47,6 +47,7 @@ def from_domain_model(cls, domain: ConversationGetDB) -> Self:
 
 class ConversationPatch(InputSchema):
     name: str | None = None
+    extra_context: dict[str, Any] | None = None
 
 
 ### CONVERSATION MESSAGES ---------------------------------------------------------------

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

@@ -1,4 +1,5 @@
 from pydantic import BaseModel, ConfigDict, ValidationInfo, field_validator
+from pydantic.config import JsonDict
 from typing_extensions import (  # https://docs.pydantic.dev/latest/api/standard_library_types/#typeddict
     TypedDict,
 )
@@ -26,42 +27,46 @@ def ensure_default_included(cls, v, info: ValidationInfo):
             raise ValueError(msg)
         return v
 
-    model_config = ConfigDict(
-        json_schema_extra={
-            "examples": [
-                {
-                    "label": "Boot mode",
-                    "description": "Start it in web page mode",
-                    "default": "0",
-                    "items": {
-                        "0": {
-                            "label": "Non Voila",
-                            "description": "Tooltip for non Voila boot mode",
-                        },
-                        "1": {
-                            "label": "Voila",
-                            "description": "Tooltip for Voila boot mode",
+    @staticmethod
+    def _update_json_schema_extra(schema: JsonDict) -> None:
+        schema.update(
+            {
+                "examples": [
+                    {
+                        "label": "Boot mode",
+                        "description": "Start it in web page mode",
+                        "default": "0",
+                        "items": {
+                            "0": {
+                                "label": "Non Voila",
+                                "description": "Tooltip for non Voila boot mode",
+                            },
+                            "1": {
+                                "label": "Voila",
+                                "description": "Tooltip for Voila boot mode",
+                            },
                         },
                     },
-                },
-                {
-                    "label": "Application theme",
-                    "description": "Select a theme for the application",
-                    "default": "b",
-                    "items": {
-                        "a": {
-                            "label": "Clear",
-                            "description": "Using white background",
-                        },
-                        "b": {
-                            "label": "Dark",
-                            "description": "Using black and gray tones",
+                    {
+                        "label": "Application theme",
+                        "description": "Select a theme for the application",
+                        "default": "b",
+                        "items": {
+                            "a": {
+                                "label": "Clear",
+                                "description": "Using white background",
+                            },
+                            "b": {
+                                "label": "Dark",
+                                "description": "Using black and gray tones",
+                            },
                         },
                     },
-                },
-            ]
-        }
-    )
+                ]
+            }
+        )
+
+    model_config = ConfigDict(json_schema_extra=_update_json_schema_extra)
 
 
 BootOptions = dict[EnvVarKey, BootOption]

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

@@ -70,6 +70,7 @@ class ConversationMessageGetDB(BaseModel):
 
 class ConversationPatchDB(BaseModel):
     name: ConversationName | None = None
+    extra_context: dict[str, Any] | None = None
 
 
 class ConversationMessagePatchDB(BaseModel):