Merge branch 'master' into fix/handler-wrong-password

Author: odeimaiz

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

@@ -202,6 +202,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={
@@ -246,6 +252,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",
+                },
             }
         }
     )
@@ -256,6 +268,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
@@ -278,6 +291,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

@@ -178,6 +178,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(
@@ -200,7 +201,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/conversations.py

@@ -24,6 +24,10 @@ class ConversationType(StrAutoEnum):
         auto()  # Something like sticky note, can be located anywhere in the pipeline UI
     )
     SUPPORT = auto()  # Support conversation
+    SUPPORT_CALL = auto()  # Support call conversation
+
+    def is_support_type(self) -> bool:
+        return self in {ConversationType.SUPPORT, ConversationType.SUPPORT_CALL}
 
 
 class ConversationMessageType(StrAutoEnum):

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,
     )

packages/postgres-database/src/simcore_postgres_database/migration/versions/5756d9282a0a_add_support_call_conversationt_ype.py

@@ -0,0 +1,31 @@
+"""Add SUPPORT_CALL conversationt ype
+
+Revision ID: 5756d9282a0a
+Revises: ff13501db935
+Create Date: 2025-10-21 13:40:20.182151+00:00
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "5756d9282a0a"
+down_revision = "ff13501db935"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column("products", "base_url", existing_type=sa.VARCHAR(), nullable=False)
+
+    op.execute("ALTER TYPE conversationtype ADD VALUE 'SUPPORT_CALL'")
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column("products", "base_url", existing_type=sa.VARCHAR(), nullable=True)
+    # ### end Alembic commands ###

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

@@ -13,6 +13,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
+    SUPPORT_CALL = "SUPPORT_CALL"  # Support call conversation
 
 
 conversations = sa.Table(

services/agent/src/simcore_service_agent/main.py

@@ -5,11 +5,10 @@
 from fastapi import FastAPI
 from servicelib.fastapi.logging_lifespan import create_logging_shutdown_event
 from servicelib.tracing import TracingConfig
+from simcore_service_agent._meta import APP_NAME
 from simcore_service_agent.core.application import create_app
 from simcore_service_agent.core.settings import ApplicationSettings
 
-from ._meta import APP_NAME
-
 _logger = logging.getLogger(__name__)
 
 _NOISY_LOGGERS: Final[tuple[str, ...]] = (

services/api-server/src/simcore_service_api_server/main.py

@@ -7,11 +7,10 @@
 from fastapi import FastAPI
 from servicelib.fastapi.logging_lifespan import create_logging_shutdown_event
 from servicelib.tracing import TracingConfig
+from simcore_service_api_server._meta import APP_NAME
 from simcore_service_api_server.core.application import create_app
 from simcore_service_api_server.core.settings import ApplicationSettings
 
-from ._meta import APP_NAME
-
 _logger = logging.getLogger(__name__)
 
 _NOISY_LOGGERS: Final[tuple[str, ...]] = (

services/autoscaling/src/simcore_service_autoscaling/main.py

@@ -7,11 +7,10 @@
 from fastapi import FastAPI
 from servicelib import tracing
 from servicelib.fastapi.logging_lifespan import create_logging_shutdown_event
+from simcore_service_autoscaling._meta import APP_NAME
 from simcore_service_autoscaling.core.application import create_app
 from simcore_service_autoscaling.core.settings import ApplicationSettings
 
-from ._meta import APP_NAME
-
 _logger = logging.getLogger(__name__)
 
 _NOISY_LOGGERS: Final[tuple[str, ...]] = (