review @pcrespov

Author: matusdrobuliak66

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

@@ -4,9 +4,9 @@
 from pydantic import Field
 
 from ..conversations import (
-    ConversationDB,
+    ConversationGetDB,
     ConversationID,
-    ConversationMessageDB,
+    ConversationMessageGetDB,
     ConversationMessageID,
     ConversationMessageType,
     ConversationType,
@@ -30,7 +30,7 @@ class ConversationRestGet(OutputSchema):
     modified: datetime
 
     @classmethod
-    def from_domain_model(cls, domain: ConversationDB) -> Self:
+    def from_domain_model(cls, domain: ConversationGetDB) -> Self:
         return cls(
             conversation_id=domain.conversation_id,
             product_name=domain.product_name,
@@ -60,7 +60,7 @@ class ConversationMessageRestGet(OutputSchema):
     modified: datetime
 
     @classmethod
-    def from_domain_model(cls, domain: ConversationMessageDB) -> Self:
+    def from_domain_model(cls, domain: ConversationMessageGetDB) -> Self:
         return cls(
             message_id=domain.message_id,
             conversation_id=domain.conversation_id,

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

@@ -33,7 +33,7 @@ class ConversationMessageType(StrAutoEnum):
 #
 
 
-class ConversationDB(BaseModel):
+class ConversationGetDB(BaseModel):
     conversation_id: ConversationID
     product_name: ProductName
     name: str
@@ -48,7 +48,7 @@ class ConversationDB(BaseModel):
     model_config = ConfigDict(from_attributes=True)
 
 
-class ConversationMessageDB(BaseModel):
+class ConversationMessageGetDB(BaseModel):
     message_id: ConversationMessageID
     conversation_id: ConversationID
     user_group_id: GroupID

services/web/server/VERSION

@@ -1 +1 @@
-0.63.0
+0.64.0

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

@@ -4,13 +4,14 @@
 from aiohttp import web
 from models_library.conversations import (
     ConversationID,
-    ConversationMessageDB,
+    ConversationMessageGetDB,
     ConversationMessageID,
     ConversationMessagePatchDB,
     ConversationMessageType,
 )
 from models_library.groups import GroupID
 from models_library.rest_ordering import OrderBy, OrderDirection
+from models_library.rest_pagination import PageTotalCount
 from pydantic import NonNegativeInt
 from simcore_postgres_database.models.conversation_messages import conversation_messages
 from simcore_postgres_database.utils_repos import (
@@ -29,7 +30,7 @@
 
 
 _SELECTION_ARGS = get_columns_from_db_model(
-    conversation_messages, ConversationMessageDB
+    conversation_messages, ConversationMessageGetDB
 )
 
 
@@ -41,7 +42,7 @@ async def create(
     user_group_id: GroupID,
     content: str,
     type_: ConversationMessageType,
-) -> ConversationMessageDB:
+) -> ConversationMessageGetDB:
     async with transaction_context(get_asyncpg_engine(app), connection) as conn:
         result = await conn.execute(
             conversation_messages.insert()
@@ -56,7 +57,7 @@ async def create(
             .returning(*_SELECTION_ARGS)
         )
         row = result.one()
-        return ConversationMessageDB.model_validate(row)
+        return ConversationMessageGetDB.model_validate(row)
 
 
 async def list_(
@@ -69,7 +70,7 @@ async def list_(
     limit: NonNegativeInt,
     # ordering
     order_by: OrderBy,
-) -> tuple[int, list[ConversationMessageDB]]:
+) -> tuple[PageTotalCount, list[ConversationMessageGetDB]]:
 
     base_query = (
         select(*_SELECTION_ARGS)
@@ -98,8 +99,8 @@ async def list_(
         total_count = await conn.scalar(count_query)
 
         result = await conn.stream(list_query)
-        items: list[ConversationMessageDB] = [
-            ConversationMessageDB.model_validate(row) async for row in result
+        items: list[ConversationMessageGetDB] = [
+            ConversationMessageGetDB.model_validate(row) async for row in result
         ]
 
         return cast(int, total_count), items
@@ -111,7 +112,7 @@ async def get(
     *,
     conversation_id: ConversationID,
     message_id: ConversationMessageID,
-) -> ConversationMessageDB:
+) -> ConversationMessageGetDB:
     select_query = (
         select(*_SELECTION_ARGS)
         .select_from(conversation_messages)
@@ -128,7 +129,7 @@ async def get(
             raise ConversationMessageErrorNotFoundError(
                 conversation_id=conversation_id, message_id=message_id
             )
-        return ConversationMessageDB.model_validate(row)
+        return ConversationMessageGetDB.model_validate(row)
 
 
 async def update(
@@ -138,7 +139,7 @@ async def update(
     conversation_id: ConversationID,
     message_id: ConversationMessageID,
     updates: ConversationMessagePatchDB,
-) -> ConversationMessageDB:
+) -> ConversationMessageGetDB:
     # NOTE: at least 'touch' if updated_values is empty
     _updates = {
         **updates.model_dump(exclude_unset=True),
@@ -160,7 +161,7 @@ async def update(
             raise ConversationMessageErrorNotFoundError(
                 conversation_id=conversation_id, message_id=message_id
             )
-        return ConversationMessageDB.model_validate(row)
+        return ConversationMessageGetDB.model_validate(row)
 
 
 async def delete(

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

@@ -6,12 +6,13 @@
 from models_library.basic_types import IDStr
 from models_library.conversations import (
     ConversationID,
-    ConversationMessageDB,
+    ConversationMessageGetDB,
     ConversationMessageID,
     ConversationMessagePatchDB,
     ConversationMessageType,
 )
 from models_library.rest_ordering import OrderBy, OrderDirection
+from models_library.rest_pagination import PageTotalCount
 from models_library.users import UserID
 
 from ..users.api import get_user_primary_group_id
@@ -28,7 +29,7 @@ async def create_message(
     # Creation attributes
     content: str,
     type_: ConversationMessageType,
-) -> ConversationMessageDB:
+) -> ConversationMessageGetDB:
     _user_group_id = await get_user_primary_group_id(app, user_id=user_id)
 
     return await _conversation_message_repository.create(
@@ -45,7 +46,7 @@ async def get_message(
     *,
     conversation_id: ConversationID,
     message_id: ConversationMessageID,
-) -> ConversationMessageDB:
+) -> ConversationMessageGetDB:
     return await _conversation_message_repository.get(
         app, conversation_id=conversation_id, message_id=message_id
     )
@@ -58,7 +59,7 @@ async def update_message(
     message_id: ConversationMessageID,
     # Update attributes
     updates: ConversationMessagePatchDB,
-) -> ConversationMessageDB:
+) -> ConversationMessageGetDB:
     return await _conversation_message_repository.update(
         app,
         conversation_id=conversation_id,
@@ -87,7 +88,7 @@ async def list_messages_for_conversation(
     # pagination
     offset: int = 0,
     limit: int = 20,
-) -> tuple[int, list[ConversationMessageDB]]:
+) -> tuple[PageTotalCount, list[ConversationMessageGetDB]]:
     return await _conversation_message_repository.list_(
         app,
         conversation_id=conversation_id,

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

@@ -3,7 +3,7 @@
 
 from aiohttp import web
 from models_library.conversations import (
-    ConversationDB,
+    ConversationGetDB,
     ConversationID,
     ConversationPatchDB,
     ConversationType,
@@ -12,6 +12,7 @@
 from models_library.products import ProductName
 from models_library.projects import ProjectID
 from models_library.rest_ordering import OrderBy, OrderDirection
+from models_library.rest_pagination import PageTotalCount
 from pydantic import NonNegativeInt
 from simcore_postgres_database.models.conversations import conversations
 from simcore_postgres_database.utils_repos import (
@@ -29,7 +30,7 @@
 _logger = logging.getLogger(__name__)
 
 
-_SELECTION_ARGS = get_columns_from_db_model(conversations, ConversationDB)
+_SELECTION_ARGS = get_columns_from_db_model(conversations, ConversationGetDB)
 
 
 async def create(
@@ -41,7 +42,7 @@ async def create(
     user_group_id: GroupID,
     type_: ConversationType,
     product_name: ProductName,
-) -> ConversationDB:
+) -> ConversationGetDB:
     async with transaction_context(get_asyncpg_engine(app), connection) as conn:
         result = await conn.execute(
             conversations.insert()
@@ -57,7 +58,7 @@ async def create(
             .returning(*_SELECTION_ARGS)
         )
         row = result.one()
-        return ConversationDB.model_validate(row)
+        return ConversationGetDB.model_validate(row)
 
 
 async def list_project_conversations(
@@ -70,7 +71,7 @@ async def list_project_conversations(
     limit: NonNegativeInt,
     # ordering
     order_by: OrderBy,
-) -> tuple[int, list[ConversationDB]]:
+) -> tuple[PageTotalCount, list[ConversationGetDB]]:
 
     base_query = (
         select(*_SELECTION_ARGS)
@@ -99,8 +100,8 @@ async def list_project_conversations(
         total_count = await conn.scalar(count_query)
 
         result = await conn.stream(list_query)
-        items: list[ConversationDB] = [
-            ConversationDB.model_validate(row) async for row in result
+        items: list[ConversationGetDB] = [
+            ConversationGetDB.model_validate(row) async for row in result
         ]
 
         return cast(int, total_count), items
@@ -111,7 +112,7 @@ async def get(
     connection: AsyncConnection | None = None,
     *,
     conversation_id: ConversationID,
-) -> ConversationDB:
+) -> ConversationGetDB:
     select_query = (
         select(*_SELECTION_ARGS)
         .select_from(conversations)
@@ -123,7 +124,7 @@ async def get(
         row = result.one_or_none()
         if row is None:
             raise ConversationErrorNotFoundError(conversation_id=conversation_id)
-        return ConversationDB.model_validate(row)
+        return ConversationGetDB.model_validate(row)
 
 
 async def update(
@@ -132,7 +133,7 @@ async def update(
     *,
     conversation_id: ConversationID,
     updates: ConversationPatchDB,
-) -> ConversationDB:
+) -> ConversationGetDB:
     # NOTE: at least 'touch' if updated_values is empty
     _updates = {
         **updates.model_dump(exclude_unset=True),
@@ -149,7 +150,7 @@ async def update(
         row = result.one_or_none()
         if row is None:
             raise ConversationErrorNotFoundError(conversation_id=conversation_id)
-        return ConversationDB.model_validate(row)
+        return ConversationGetDB.model_validate(row)
 
 
 async def delete(

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

@@ -5,14 +5,15 @@
 from aiohttp import web
 from models_library.basic_types import IDStr
 from models_library.conversations import (
-    ConversationDB,
+    ConversationGetDB,
     ConversationID,
     ConversationPatchDB,
     ConversationType,
 )
 from models_library.products import ProductName
 from models_library.projects import ProjectID
 from models_library.rest_ordering import OrderBy, OrderDirection
+from models_library.rest_pagination import PageTotalCount
 from models_library.users import UserID
 
 from ..users.api import get_user_primary_group_id
@@ -30,7 +31,7 @@ async def create_conversation(
     # Creation attributes
     name: str,
     type_: ConversationType,
-) -> ConversationDB:
+) -> ConversationGetDB:
     if project_uuid is None:
         raise NotImplementedError
 
@@ -50,7 +51,7 @@ async def get_conversation(
     app: web.Application,
     *,
     conversation_id: ConversationID,
-) -> ConversationDB:
+) -> ConversationGetDB:
     return await _conversation_repository.get(
         app,
         conversation_id=conversation_id,
@@ -63,7 +64,7 @@ async def update_conversation(
     conversation_id: ConversationID,
     # Update attributes
     updates: ConversationPatchDB,
-) -> ConversationDB:
+) -> ConversationGetDB:
     return await _conversation_repository.update(
         app,
         conversation_id=conversation_id,
@@ -89,7 +90,7 @@ async def list_conversations_for_project(
     # pagination
     offset: int = 0,
     limit: int = 20,
-) -> tuple[int, list[ConversationDB]]:
+) -> tuple[PageTotalCount, list[ConversationGetDB]]:
     return await _conversation_repository.list_project_conversations(
         app,
         project_uuid=project_uuid,