conversation

Author: matusdrobuliak66

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

@@ -12,7 +12,6 @@
 from ..groups import GroupID
 from ..products import ProductName
 from ..projects import ProjectID
-from ..users import UserID
 from ._base import InputSchema, OutputSchema
 
 
@@ -21,7 +20,7 @@ class ConversationRestGet(OutputSchema):
     product_name: ProductName
     name: str
     project_uuid: ProjectID | None
-    user_id: UserID
+    user_group_id: GroupID
     type: ConversationType
 
     # states
@@ -35,7 +34,7 @@ def from_domain_model(cls, domain: ConversationDB) -> Self:
             product_name=domain.product_name,
             name=domain.name,
             project_uuid=domain.project_uuid,
-            user_id=domain.user_id,
+            user_group_id=domain.user_group_id,
             type=domain.type,
             created=domain.created,
             modified=domain.modified,

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

@@ -5,7 +5,6 @@
 
 from models_library.groups import GroupID
 from models_library.projects import ProjectID
-from models_library.users import UserID
 from pydantic import BaseModel, ConfigDict
 from simcore_postgres_database.models.conversation_messages import (
     ConversationMessageType as PostgresConversationMessageType,
@@ -53,7 +52,7 @@ class ConversationDB(BaseModel):
     product_name: ProductName
     name: str
     project_uuid: ProjectID | None
-    user_id: UserID
+    user_group_id: GroupID
     type: ConversationType
 
     # states

packages/postgres-database/src/simcore_postgres_database/migration/versions/5921537e608d_add_conversations.py renamed to packages/postgres-database/src/simcore_postgres_database/migration/versions/03d6d6ab0d5f_add_conversations.py

@@ -1,8 +1,8 @@
 """add conversations
 
-Revision ID: 5921537e608d
+Revision ID: 03d6d6ab0d5f
 Revises: 742123f0933a
-Create Date: 2025-04-24 11:25:11.868406+00:00
+Create Date: 2025-04-28 10:57:35.554780+00:00
 
 """
 
@@ -11,7 +11,7 @@
 from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
-revision = "5921537e608d"
+revision = "03d6d6ab0d5f"
 down_revision = "742123f0933a"
 branch_labels = None
 depends_on = None
@@ -35,6 +35,7 @@ def upgrade():
             sa.Enum("PROJECT_STATIC", "PROJECT_ANNOTATION", name="conversationtype"),
             nullable=True,
         ),
+        sa.Column("product_name", sa.String(), nullable=False),
         sa.Column(
             "created",
             sa.DateTime(timezone=True),
@@ -47,6 +48,13 @@ def upgrade():
             server_default=sa.text("now()"),
             nullable=False,
         ),
+        sa.ForeignKeyConstraint(
+            ["product_name"],
+            ["products.name"],
+            name="fk_resource_tracker_license_packages_product_name",
+            onupdate="CASCADE",
+            ondelete="CASCADE",
+        ),
         sa.ForeignKeyConstraint(
             ["project_uuid"],
             ["projects.uuid"],
@@ -77,7 +85,7 @@ def upgrade():
             nullable=False,
         ),
         sa.Column("conversation_id", postgresql.UUID(as_uuid=True), nullable=False),
-        sa.Column("user_group_id", sa.BigInteger(), nullable=False),
+        sa.Column("user_group_id", sa.BigInteger(), nullable=True),
         sa.Column("content", sa.String(), nullable=False),
         sa.Column(
             "type",
@@ -105,8 +113,8 @@ def upgrade():
         ),
         sa.ForeignKeyConstraint(
             ["user_group_id"],
-            ["users.id"],
-            name="fk_conversation_messages_user_id",
+            ["groups.gid"],
+            name="fk_conversation_messages_user_primary_gid",
             ondelete="SET NULL",
         ),
         sa.PrimaryKeyConstraint("message_id"),

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

@@ -6,7 +6,7 @@
 from ._common import RefActions, column_created_datetime, column_modified_datetime
 from .base import metadata
 from .conversations import conversations
-from .users import users
+from .groups import groups
 
 
 class ConversationMessageType(enum.Enum):
@@ -41,12 +41,12 @@ class ConversationMessageType(enum.Enum):
         "user_group_id",
         sa.BigInteger,
         sa.ForeignKey(
-            users.c.id,
-            name="fk_conversation_messages_user_id",
+            groups.c.gid,
+            name="fk_conversation_messages_user_primary_gid",
             ondelete=RefActions.SET_NULL,
         ),
         doc="user primary group ID who created the message",
-        nullable=False,
+        nullable=True,
     ),
     sa.Column(
         "content",

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

@@ -93,5 +93,7 @@ async def list_messages_for_conversation(
         conversation_id=conversation_id,
         offset=offset,
         limit=limit,
-        order_by=OrderBy(field=IDStr("message_id"), direction=OrderDirection.DESC),
+        order_by=OrderBy(
+            field=IDStr("created"), direction=OrderDirection.DESC
+        ),  # NOTE: Message should be ordered by creation date (latest first)
     )

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

@@ -8,10 +8,10 @@
     ConversationPatchDB,
     ConversationType,
 )
+from models_library.groups import GroupID
 from models_library.products import ProductName
 from models_library.projects import ProjectID
 from models_library.rest_ordering import OrderBy, OrderDirection
-from models_library.users import UserID
 from pydantic import NonNegativeInt
 from simcore_postgres_database.models.conversations import conversations
 from simcore_postgres_database.utils_repos import (
@@ -38,7 +38,7 @@ async def create(
     *,
     name: str,
     project_uuid: ProjectID | None,
-    user_id: UserID,
+    user_group_id: GroupID,
     type_: ConversationType,
     product_name: ProductName,
 ) -> ConversationDB:
@@ -47,8 +47,8 @@ async def create(
             conversations.insert()
             .values(
                 name=name,
-                project_uuid=project_uuid,
-                user_id=user_id,
+                project_uuid=f"{project_uuid}" if project_uuid else None,
+                user_group_id=user_group_id,
                 type=type_,
                 created=func.now(),
                 modified=func.now(),
@@ -75,7 +75,7 @@ async def list_project_conversations(
     base_query = (
         select(*_SELECTION_ARGS)
         .select_from(conversations)
-        .where(conversations.c.project_uuid == project_uuid)
+        .where(conversations.c.project_uuid == f"{project_uuid}")
     )
 
     # Select total count from base_query
@@ -115,7 +115,7 @@ async def get(
     select_query = (
         select(*_SELECTION_ARGS)
         .select_from(conversations)
-        .where(conversations.c.conversation_id == conversation_id)
+        .where(conversations.c.conversation_id == f"{conversation_id}")
     )
 
     async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
@@ -143,7 +143,7 @@ async def update(
         result = await conn.execute(
             conversations.update()
             .values(**_updates)
-            .where(conversations.c.conversation_id == conversation_id)
+            .where(conversations.c.conversation_id == f"{conversation_id}")
             .returning(*_SELECTION_ARGS)
         )
         row = result.one_or_none()
@@ -161,6 +161,6 @@ async def delete(
     async with transaction_context(get_asyncpg_engine(app), connection) as conn:
         await conn.execute(
             conversations.delete().where(
-                conversations.c.conversation_id == conversation_id
+                conversations.c.conversation_id == f"{conversation_id}"
             )
         )

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

@@ -15,6 +15,7 @@
 from models_library.rest_ordering import OrderBy, OrderDirection
 from models_library.users import UserID
 
+from ..users.api import get_user_primary_group_id
 from . import _conversation_repository
 
 _logger = logging.getLogger(__name__)
@@ -33,11 +34,13 @@ async def create_conversation(
     if project_uuid is None:
         raise NotImplementedError
 
+    _user_group_id = await get_user_primary_group_id(app, user_id=user_id)
+
     return await _conversation_repository.create(
         app,
         name=name,
         project_uuid=project_uuid,
-        user_id=user_id,
+        user_group_id=_user_group_id,
         type_=type_,
         product_name=product_name,
     )

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

@@ -14,6 +14,7 @@
 from ._controller import (
     access_rights_rest,
     comments_rest,
+    conversations_rest,
     folders_rest,
     metadata_rest,
     nodes_pricing_unit_rest,
@@ -62,6 +63,7 @@ def setup_projects(app: web.Application) -> bool:
     app.router.add_routes(projects_states_rest.routes)
     app.router.add_routes(projects_rest.routes)
     app.router.add_routes(comments_rest.routes)
+    app.router.add_routes(conversations_rest.routes)
     app.router.add_routes(access_rights_rest.routes)
     app.router.add_routes(metadata_rest.routes)
     app.router.add_routes(ports_rest.routes)