fixes

Author: matusdrobuliak66

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

@@ -201,6 +201,12 @@ class MyGroupsGet(OutputSchema):
             description="Group ID of the app support team or None if no support is defined for this product"
         ),
     ] = None
+    chatbot: Annotated[
+        GroupGetBase | None,
+        Field(
+            description="Group ID of the support chatbot user or None if no chatbot is defined for this product"
+        ),
+    ] = None
 
     model_config = ConfigDict(
         json_schema_extra={
@@ -245,6 +251,12 @@ class MyGroupsGet(OutputSchema):
                     "description": "The support team of the application",
                     "thumbnail": "https://placekitten.com/15/15",
                 },
+                "chatbot": {
+                    "gid": "6",
+                    "label": "Chatbot User",
+                    "description": "The chatbot user of the application",
+                    "thumbnail": "https://placekitten.com/15/15",
+                },
             }
         }
     )
@@ -255,6 +267,7 @@ def from_domain_model(
         groups_by_type: GroupsByTypeTuple,
         my_product_group: tuple[Group, AccessRightsDict] | None,
         product_support_group: Group | None,
+        product_chatbot_primary_group: Group | None,
     ) -> Self:
         assert groups_by_type.primary  # nosec
         assert groups_by_type.everyone  # nosec
@@ -277,6 +290,13 @@ def from_domain_model(
                 if product_support_group
                 else None
             ),
+            chatbot=(
+                GroupGetBase.model_validate(
+                    GroupGetBase.dump_basic_group_data(product_chatbot_primary_group)
+                )
+                if product_chatbot_primary_group
+                else None
+            ),
         )
 
 

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

@@ -172,6 +172,7 @@ def from_domain_model(
         my_product_group: tuple[Group, AccessRightsDict] | None,
         my_preferences: AggregatedPreferences,
         my_support_group: Group | None,
+        my_chatbot_user_group: Group | None,
         profile_contact: MyProfileAddressGet | None = None,
     ) -> Self:
         profile_data = remap_keys(
@@ -194,7 +195,10 @@ def from_domain_model(
         return cls(
             **profile_data,
             groups=MyGroupsGet.from_domain_model(
-                my_groups_by_type, my_product_group, my_support_group
+                my_groups_by_type,
+                my_product_group,
+                my_support_group,
+                my_chatbot_user_group,
             ),
             preferences=my_preferences,
             contact=profile_contact,

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

@@ -77,6 +77,13 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
             "type": "standard",
             "thumbnail": None,
         }
+        chatbot: JsonDict = {
+            "gid": 5,
+            "name": "Chatbot",
+            "description": "chatbot group",
+            "type": "primary",
+            "thumbnail": None,
+        }
 
         schema.update(
             {
@@ -86,6 +93,7 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
                     organization,
                     product,
                     support,
+                    chatbot,
                 ]
             }
         )

packages/models-library/tests/test_users.py

@@ -8,10 +8,11 @@
 from pydantic import TypeAdapter
 
 
+@pytest.mark.parametrize("with_chatbot_user_group", [True, False])
 @pytest.mark.parametrize("with_support_group", [True, False])
 @pytest.mark.parametrize("with_standard_groups", [True, False])
 def test_adapter_from_model_to_schema(
-    with_support_group: bool, with_standard_groups: bool
+    with_support_group: bool, with_standard_groups: bool, with_chatbot_user_group: bool
 ):
     my_profile = MyProfile.model_validate(MyProfile.model_json_schema()["example"])
 
@@ -31,6 +32,7 @@ def test_adapter_from_model_to_schema(
     )
 
     my_support_group = groups[4]
+    my_chatbot_user_group = groups[5]
 
     my_preferences = {"foo": Preference(default_value=3, value=1)}
 
@@ -40,4 +42,5 @@ def test_adapter_from_model_to_schema(
         my_product_group,
         my_preferences,
         my_support_group if with_support_group else None,
+        my_chatbot_user_group if with_chatbot_user_group else None,
     )

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

@@ -266,7 +266,7 @@ async def create_support_message(
         return message
 
     if is_first_message or conversation.fogbugz_case_id is None:
-        _logger.debug(
+        _logger.info(
             "Support settings available, this is first message, creating FogBugz case for Conversation ID: %s",
             conversation.conversation_id,
         )
@@ -298,7 +298,7 @@ async def create_support_message(
             )
     else:
         assert not is_first_message  # nosec
-        _logger.debug(
+        _logger.info(
             "Support settings available, but this is NOT the first message, so we need to reopen a FogBugz case. Conversation ID: %s",
             conversation.conversation_id,
         )
@@ -329,7 +329,7 @@ async def create_support_message(
 
     if (
         product.support_chatbot_user_id
-        and conversation_user_type == ConversationUserType.CHATBOT_USER
+        and conversation_user_type == ConversationUserType.REGULAR_USER
     ):
         # If enabled, ask Chatbot to analyze the message history and respond
         await _trigger_chatbot_processing(

services/web/server/src/simcore_service_webserver/groups/_groups_rest.py

@@ -51,6 +51,7 @@ async def list_groups(request: web.Request):
         groups_by_type,
         my_product_group,
         product_support_group,
+        product_chatbot_primary_group,
     ) = await _groups_service.get_user_profile_groups(
         request.app, user_id=req_ctx.user_id, product=product
     )
@@ -59,7 +60,10 @@ async def list_groups(request: web.Request):
     assert groups_by_type.everyone  # nosec
 
     my_groups = MyGroupsGet.from_domain_model(
-        groups_by_type, my_product_group, product_support_group
+        groups_by_type,
+        my_product_group,
+        product_support_group,
+        product_chatbot_primary_group,
     )
 
     return envelope_json_response(my_groups)

services/web/server/src/simcore_service_webserver/groups/_groups_service.py

@@ -84,6 +84,7 @@ async def get_user_profile_groups(
     GroupsByTypeTuple,
     tuple[Group, AccessRightsDict] | None,
     Group | None,
+    Group | None,
 ]:
     """
     Get all groups needed for user profile including standard groups,
@@ -110,7 +111,19 @@ async def get_user_profile_groups(
             app, product.support_standard_group_id
         )
 
-    return groups_by_type, my_product_group, product_support_group
+    product_chatbot_primary_group = None
+    if product.support_chatbot_user_id:
+        _group_id = users_service.get_user_primary_group_id(
+            app, user_id=product.support_chatbot_user_id
+        )
+        product_chatbot_primary_group = await get_group_by_gid(app, _group_id)
+
+    return (
+        groups_by_type,
+        my_product_group,
+        product_support_group,
+        product_chatbot_primary_group,
+    )
 
 
 #

services/web/server/src/simcore_service_webserver/users/_controller/rest/users_rest.py

@@ -56,6 +56,7 @@ async def get_my_profile(request: web.Request) -> web.Response:
         groups_by_type,
         my_product_group,
         product_support_group,
+        product_chatbot_primary_group,
     ) = await groups_service.get_user_profile_groups(
         request.app, user_id=req_ctx.user_id, product=product
     )
@@ -85,6 +86,7 @@ async def get_my_profile(request: web.Request) -> web.Response:
         my_product_group,
         preferences,
         product_support_group,
+        product_chatbot_primary_group,
         my_address,
     )