Merge branch 'master' into create-case-in-fogbugz-via-email

Author: matusdrobuliak66

api/specs/web-server/_conversations.py

@@ -69,7 +69,7 @@ async def list_conversations(
 ): ...
 
 
-@router.put(
+@router.patch(
     "/conversations/{conversation_id}",
     response_model=Envelope[ConversationRestGet],
 )

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/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):

packages/service-library/src/servicelib/fastapi/client_session.py

@@ -2,20 +2,25 @@
 
 import httpx
 from fastapi import FastAPI
+from servicelib.fastapi.tracing import setup_httpx_client_tracing
+from settings_library.tracing import TracingSettings
 
 
 def setup_client_session(
     app: FastAPI,
     *,
     default_timeout: datetime.timedelta = datetime.timedelta(seconds=20),
-    max_keepalive_connections: int = 20
+    max_keepalive_connections: int = 20,
+    tracing_settings: TracingSettings | None,
 ) -> None:
     async def on_startup() -> None:
         session = httpx.AsyncClient(
             transport=httpx.AsyncHTTPTransport(http2=True),
             limits=httpx.Limits(max_keepalive_connections=max_keepalive_connections),
             timeout=default_timeout.total_seconds(),
         )
+        if tracing_settings:
+            setup_httpx_client_tracing(session)
         app.state.aiohttp_client_session = session
 
     async def on_shutdown() -> None:

services/director/src/simcore_service_director/core/application.py

@@ -50,6 +50,7 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
         app,
         max_keepalive_connections=settings.DIRECTOR_REGISTRY_CLIENT_MAX_KEEPALIVE_CONNECTIONS,
         default_timeout=settings.DIRECTOR_REGISTRY_CLIENT_TIMEOUT,
+        tracing_settings=settings.DIRECTOR_TRACING,
     )
     setup_registry(app)
 

services/storage/src/simcore_service_storage/core/application.py

@@ -69,7 +69,7 @@ def create_app(settings: ApplicationSettings) -> FastAPI:  # noqa: C901
 
     setup_db(app)
     setup_s3(app)
-    setup_client_session(app)
+    setup_client_session(app, tracing_settings=settings.STORAGE_TRACING)
 
     if settings.STORAGE_CELERY and not settings.STORAGE_WORKER_MODE:
         setup_rabbitmq(app)

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

@@ -571,7 +571,7 @@ paths:
               schema:
                 $ref: '#/components/schemas/Page_ConversationRestGet_'
   /v0/conversations/{conversation_id}:
-    put:
+    patch:
       tags:
       - conversations
       summary: Update Conversation
@@ -10310,6 +10310,12 @@ components:
           - type: string
           - type: 'null'
           title: Name
+        extraContext:
+          anyOf:
+          - additionalProperties: true
+            type: object
+          - type: 'null'
+          title: Extracontext
       type: object
       title: ConversationPatch
     ConversationRestGet:

services/web/server/src/simcore_service_webserver/conversations/_controller/_conversations_rest.py

@@ -163,7 +163,7 @@ async def get_conversation(request: web.Request):
     return envelope_json_response(data)
 
 
-@routes.put(
+@routes.patch(
     f"/{VTAG}/conversations/{{conversation_id}}",
     name="update_conversation",
 )
@@ -190,7 +190,7 @@ async def update_conversation(request: web.Request):
         app=request.app,
         project_id=None,  # Support conversations don't use project_id
         conversation_id=path_params.conversation_id,
-        updates=ConversationPatchDB(name=body_params.name),
+        updates=ConversationPatchDB(**body_params.model_dump(exclude_unset=True)),
     )
 
     data = ConversationRestGet.from_domain_model(conversation)

services/web/server/src/simcore_service_webserver/products/_models.py

@@ -288,6 +288,7 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
                             "LOGIN_2FA_REQUIRED": False,
                         },
                         "group_id": 12345,
+                        "support_standard_group_id": 67890,
                         "is_payment_enabled": False,
                     },
                 ]

services/web/server/src/simcore_service_webserver/products/_repository.py

@@ -53,6 +53,7 @@
     products.c.registration_email_template,
     products.c.max_open_studies_per_user,
     products.c.group_id,
+    products.c.support_standard_group_id,
 ]
 
 assert {column.name for column in _PRODUCTS_COLUMNS}.issubset(  # nosec