first part

Author: matusdrobuliak66

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

@@ -1,6 +1,6 @@
 from datetime import datetime
 from enum import auto
-from typing import Annotated, TypeAlias
+from typing import Annotated, Any, TypeAlias
 from uuid import UUID
 
 from models_library.groups import GroupID
@@ -23,6 +23,7 @@ class ConversationType(StrAutoEnum):
     PROJECT_ANNOTATION = (
         auto()  # Something like sticky note, can be located anywhere in the pipeline UI
     )
+    SUPPORT = auto()  # Support conversation
 
 
 class ConversationMessageType(StrAutoEnum):
@@ -44,6 +45,7 @@ class ConversationGetDB(BaseModel):
     project_uuid: ProjectID | None
     user_group_id: GroupID
     type: ConversationType
+    extra_context: dict[str, Any]
 
     # states
     created: datetime

packages/postgres-database/src/simcore_postgres_database/models/conversations.py

@@ -1,7 +1,7 @@
 import enum
 
 import sqlalchemy as sa
-from sqlalchemy.dialects.postgresql import UUID
+from sqlalchemy.dialects.postgresql import JSONB, UUID
 
 from ._common import RefActions, column_created_datetime, column_modified_datetime
 from .base import metadata
@@ -12,6 +12,7 @@
 class ConversationType(enum.Enum):
     PROJECT_STATIC = "PROJECT_STATIC"  # Static conversation for the project
     PROJECT_ANNOTATION = "PROJECT_ANNOTATION"  # Something like sticky note, can be located anywhere in the pipeline UI
+    SUPPORT = "SUPPORT"  # Support conversation
 
 
 conversations = sa.Table(
@@ -70,6 +71,13 @@ class ConversationType(enum.Enum):
         nullable=False,
         doc="Product name identifier. If None, then the item is not exposed",
     ),
+    sa.Column(
+        "extra_context",
+        JSONB,
+        nullable=False,
+        server_default=sa.text("'{}'::jsonb"),
+        doc="Free JSON to store extra context",
+    ),
     column_created_datetime(timezone=True),
     column_modified_datetime(timezone=True),
 )

packages/postgres-database/src/simcore_postgres_database/models/products.py

@@ -269,5 +269,18 @@ class ProductLoginSettingsDict(TypedDict, total=False):
         nullable=True,
         doc="Group associated to this product",
     ),
+    sa.Column(
+        "support_standard_group_id",
+        sa.BigInteger,
+        sa.ForeignKey(
+            groups.c.gid,
+            name="fk_products_support_standard_group_id",
+            ondelete=RefActions.SET_NULL,
+            onupdate=RefActions.CASCADE,
+        ),
+        unique=False,
+        nullable=True,
+        doc="Group associated to this product support",
+    ),
     sa.PrimaryKeyConstraint("name", name="products_pk"),
 )

services/web/server/src/simcore_service_webserver/conversations/_conversation_repository.py

@@ -1,5 +1,5 @@
 import logging
-from typing import cast
+from typing import Any, cast
 
 from aiohttp import web
 from models_library.conversations import (
@@ -42,6 +42,7 @@ async def create(
     user_group_id: GroupID,
     type_: ConversationType,
     product_name: ProductName,
+    extra_context: dict[str, Any],
 ) -> ConversationGetDB:
     async with transaction_context(get_asyncpg_engine(app), connection) as conn:
         result = await conn.execute(
@@ -54,6 +55,7 @@ async def create(
                 created=func.now(),
                 modified=func.now(),
                 product_name=product_name,
+                extra_context=extra_context,
             )
             .returning(*_SELECTION_ARGS)
         )
@@ -76,7 +78,110 @@ async def list_project_conversations(
     base_query = (
         select(*_SELECTION_ARGS)
         .select_from(conversations)
-        .where(conversations.c.project_uuid == f"{project_uuid}")
+        .where(
+            (conversations.c.project_uuid == f"{project_uuid}")
+            & (
+                conversations.c.type
+                in [
+                    ConversationType.PROJECT_STATIC,
+                    ConversationType.PROJECT_ANNOTATION,
+                ]
+            )
+        )
+    )
+
+    # Select total count from base_query
+    subquery = base_query.subquery()
+    count_query = select(func.count()).select_from(subquery)
+
+    # Ordering and pagination
+    if order_by.direction == OrderDirection.ASC:
+        list_query = base_query.order_by(
+            asc(getattr(conversations.c, order_by.field)),
+            conversations.c.conversation_id,
+        )
+    else:
+        list_query = base_query.order_by(
+            desc(getattr(conversations.c, order_by.field)),
+            conversations.c.conversation_id,
+        )
+    list_query = list_query.offset(offset).limit(limit)
+
+    async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
+        total_count = await conn.scalar(count_query)
+
+        result = await conn.stream(list_query)
+        items: list[ConversationGetDB] = [
+            ConversationGetDB.model_validate(row) async for row in result
+        ]
+
+        return cast(int, total_count), items
+
+
+async def list_support_conversations_for_user(
+    app: web.Application,
+    connection: AsyncConnection | None = None,
+    *,
+    user_group_id: GroupID,
+    # pagination
+    offset: NonNegativeInt,
+    limit: NonNegativeInt,
+    # ordering
+    order_by: OrderBy,
+) -> tuple[PageTotalCount, list[ConversationGetDB]]:
+
+    base_query = (
+        select(*_SELECTION_ARGS)
+        .select_from(conversations)
+        .where(
+            (conversations.c.user_group_id == user_group_id)
+            & (conversations.c.type == ConversationType.SUPPORT)
+        )
+    )
+
+    # Select total count from base_query
+    subquery = base_query.subquery()
+    count_query = select(func.count()).select_from(subquery)
+
+    # Ordering and pagination
+    if order_by.direction == OrderDirection.ASC:
+        list_query = base_query.order_by(
+            asc(getattr(conversations.c, order_by.field)),
+            conversations.c.conversation_id,
+        )
+    else:
+        list_query = base_query.order_by(
+            desc(getattr(conversations.c, order_by.field)),
+            conversations.c.conversation_id,
+        )
+    list_query = list_query.offset(offset).limit(limit)
+
+    async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
+        total_count = await conn.scalar(count_query)
+
+        result = await conn.stream(list_query)
+        items: list[ConversationGetDB] = [
+            ConversationGetDB.model_validate(row) async for row in result
+        ]
+
+        return cast(int, total_count), items
+
+
+async def list_all_support_conversations_for_support_user(
+    app: web.Application,
+    connection: AsyncConnection | None = None,
+    *,
+    # pagination
+    offset: NonNegativeInt,
+    limit: NonNegativeInt,
+    # ordering
+    order_by: OrderBy,
+) -> tuple[PageTotalCount, list[ConversationGetDB]]:
+
+    base_query = (
+        select(*_SELECTION_ARGS)
+        .select_from(conversations)
+        .where(conversations.c.type == ConversationType.SUPPORT)
     )
 
     # Select total count from base_query

services/web/server/src/simcore_service_webserver/conversations/_conversation_service.py

@@ -1,6 +1,7 @@
 # pylint: disable=unused-argument
 
 import logging
+from typing import Any
 
 from aiohttp import web
 from models_library.basic_types import IDStr
@@ -21,6 +22,8 @@
     notify_conversation_deleted,
     notify_conversation_updated,
 )
+from ..groups.api import list_user_groups_ids_with_read_access
+from ..products import products_service
 from ..projects._groups_repository import list_project_groups
 from ..users import users_service
 from ..users._users_service import get_users_in_group
@@ -48,6 +51,7 @@ async def create_conversation(
     # Creation attributes
     name: str,
     type_: ConversationType,
+    extra_context: dict[str, Any],
 ) -> ConversationGetDB:
     if project_uuid is None:
         raise NotImplementedError
@@ -61,6 +65,7 @@ async def create_conversation(
         user_group_id=_user_group_id,
         type_=type_,
         product_name=product_name,
+        extra_context=extra_context,
     )
 
     await notify_conversation_created(
@@ -133,7 +138,7 @@ async def delete_conversation(
     )
 
 
-async def list_conversations_for_project(
+async def list_project_conversations(
     app: web.Application,
     *,
     project_uuid: ProjectID,
@@ -148,3 +153,41 @@ async def list_conversations_for_project(
         limit=limit,
         order_by=OrderBy(field=IDStr("conversation_id"), direction=OrderDirection.DESC),
     )
+
+
+async def list_support_conversations_for_user(
+    app: web.Application,
+    *,
+    user_id: UserID,
+    product_name: ProductName,
+    # pagination
+    offset: int = 0,
+    limit: int = 20,
+) -> tuple[PageTotalCount, list[ConversationGetDB]]:
+
+    # Check if user is part of support group (in that case list all support conversations)
+    product = products_service.get_product(app, product_name=product_name)
+    _support_standard_group_id = product.support_standard_group_id
+    if _support_standard_group_id is not None:
+        _user_group_ids = await list_user_groups_ids_with_read_access(
+            app, user_id=user_id
+        )
+        if _support_standard_group_id in _user_group_ids:
+            # I am a support user
+            return await _conversation_repository.list_all_support_conversations_for_support_user(
+                app,
+                offset=offset,
+                limit=limit,
+                order_by=OrderBy(
+                    field=IDStr("conversation_id"), direction=OrderDirection.DESC
+                ),
+            )
+
+    _user_group_id = await users_service.get_user_primary_group_id(app, user_id=user_id)
+    return await _conversation_repository.list_support_conversations_for_user(
+        app,
+        user_group_id=_user_group_id,
+        offset=offset,
+        limit=limit,
+        order_by=OrderBy(field=IDStr("conversation_id"), direction=OrderDirection.DESC),
+    )

services/web/server/src/simcore_service_webserver/conversations/conversations_service.py

@@ -10,7 +10,7 @@
     create_conversation,
     delete_conversation,
     get_conversation,
-    list_conversations_for_project,
+    list_project_conversations,
     update_conversation,
 )
 
@@ -21,7 +21,7 @@
     "delete_message",
     "get_conversation",
     "get_message",
-    "list_conversations_for_project",
+    "list_project_conversations",
     "list_messages_for_conversation",
     "update_conversation",
     "update_message",

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

@@ -140,6 +140,9 @@ class Product(BaseModel):
     group_id: Annotated[
         int | None, Field(description="Groups associated to this product")
     ] = None
+    support_standard_group_id: Annotated[
+        int | None, Field(description="Support standard group ID")
+    ] = None
 
     is_payment_enabled: Annotated[
         bool,

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

@@ -74,6 +74,9 @@ async def create_project_conversation(request: web.Request):
     body_params = await parse_request_body_as(
         _ProjectConversationsCreateBodyParams, request
     )
+    _extra_context = (
+        body_params.extra_context if body_params.extra_context is not None else {}
+    )
 
     conversation = await _conversations_service.create_project_conversation(
         app=request.app,
@@ -82,6 +85,7 @@ async def create_project_conversation(request: web.Request):
         project_uuid=path_params.project_id,
         name=body_params.name,
         conversation_type=body_params.type,
+        extra_context=_extra_context,
     )
     data = ConversationRestGet.from_domain_model(conversation)
 

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

@@ -52,6 +52,7 @@ async def create_project_conversation(
         project_uuid=project_uuid,
         name=name,
         type_=conversation_type,
+        extra_context={},
     )
 
 
@@ -72,7 +73,7 @@ async def list_project_conversations(
         project_id=project_uuid,
         permission="read",
     )
-    return await conversations_service.list_conversations_for_project(
+    return await conversations_service.list_project_conversations(
         app,
         project_uuid=project_uuid,
         offset=offset,