fix

Author: matusdrobuliak66

services/web/server/src/simcore_service_webserver/chatbot/_process_chatbot_trigger_service.py

@@ -11,8 +11,6 @@
 from pydantic import TypeAdapter
 from servicelib.logging_utils import log_catch, log_context
 from servicelib.rabbitmq import RabbitMQClient
-from simcore_service_webserver.products._models import ProductBaseUrl
-from simcore_service_webserver.products.errors import ProductNotFoundError
 
 from ..conversations import conversations_service
 from ..products import products_service
@@ -55,30 +53,16 @@ async def _process_chatbot_trigger_message(app: web.Application, data: bytes) ->
     for msg in messages[1]:
         _question_for_chatbot += f"{msg.content.strip()}\n"
 
-    # Prepare them and talk to the chatbot service
+    # Talk to the chatbot service
     chatbot_client = get_chatbot_rest_client(app)
     chat_response = await chatbot_client.ask_question(_question_for_chatbot)
 
-    # After I got respond, create a new support message in the conversation
-    try:
-        _product_base_url = products_service.get_product_base_url(
-            app, product_name=_product_name
-        )
-    except ProductNotFoundError:
-        _logger.warning(
-            "Product %s does not have base URL configured, cannot process chatbot message.",
-            _product_name,
-        )
-        _product_base_url = ProductBaseUrl(scheme="http", host="unknown")
-
     await conversations_service.create_support_message(
         app=app,
         product_name=rabbit_message.conversation.product_name,
         user_id=_product.support_chatbot_user_id,
         conversation_user_type=ConversationUserType.CHATBOT_USER,
         conversation=rabbit_message.conversation,
-        product_url_scheme=_product_base_url.scheme,
-        product_url_host=_product_base_url.host or "unknown",
         content=chat_response.answer,
         type_=ConversationMessageType.MESSAGE,
     )

services/web/server/src/simcore_service_webserver/conversations/_controller/_conversations_messages_rest.py

@@ -91,8 +91,6 @@ async def create_conversation_message(request: web.Request):
         user_id=req_ctx.user_id,
         conversation_user_type=conversation_user_type,
         conversation=_conversation,
-        product_url_scheme=request.url.scheme,
-        product_url_host=request.url.host or "unknown",
         content=body_params.content,
         type_=body_params.type,
     )

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

@@ -232,8 +232,6 @@ async def create_support_message(
     user_id: UserID,
     conversation_user_type: ConversationUserType,
     conversation: ConversationGetDB,
-    product_url_scheme: str,
-    product_url_host: str,
     # Creation attributes
     content: str,
     type_: ConversationMessageType,
@@ -250,7 +248,9 @@ async def create_support_message(
 
     product = products_service.get_product(app, product_name=product_name)
     fogbugz_settings_or_none = app[APP_SETTINGS_APPKEY].WEBSERVER_FOGBUGZ
-    _conversation_url = f"{product_url_scheme}://{product_url_host}/#/conversation/{conversation.conversation_id}"
+    _conversation_url = (
+        f"{product.base_url}#/conversation/{conversation.conversation_id}"
+    )
 
     if (
         product.support_standard_group_id is None
@@ -278,7 +278,7 @@ async def create_support_message(
                 user_id=user_id,
                 message_content=message.content,
                 conversation_url=_conversation_url,
-                host=product_url_host,
+                host=product.base_url.host or "unknown",
                 product_support_assigned_fogbugz_project_id=product.support_assigned_fogbugz_project_id,
                 fogbugz_url=str(fogbugz_settings_or_none.FOGBUGZ_URL),
             )

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

@@ -17,6 +17,7 @@
     BeforeValidator,
     ConfigDict,
     Field,
+    HttpUrl,
     PositiveInt,
     field_serializer,
     field_validator,
@@ -87,6 +88,11 @@ class Product(BaseModel):
         Field(description="Host regex"),
     ]
 
+    base_url: Annotated[
+        HttpUrl,
+        Field(description="Product Base URL"),
+    ]
+
     support_email: Annotated[
         LowerCaseEmailStr,
         Field(

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

@@ -8,8 +8,8 @@
 from servicelib.exceptions import InvalidConfig
 from simcore_postgres_database.utils_products_prices import ProductPriceInfo
 
-from ._application_keys import PRODUCTS_APPKEY, PRODUCTS_URL_MAPPING_APPKEY
-from ._models import CreditResult, Product, ProductBaseUrl, ProductStripeInfo
+from ._application_keys import PRODUCTS_APPKEY
+from ._models import CreditResult, Product, ProductStripeInfo
 from ._repository import ProductRepository
 from .errors import (
     BelowMinimumPaymentError,
@@ -43,18 +43,6 @@ def get_product(app: web.Application, product_name: ProductName) -> Product:
         raise ProductNotFoundError(product_name=product_name) from exc
 
 
-def get_product_base_url(
-    app: web.Application, product_name: ProductName
-) -> ProductBaseUrl:
-    try:
-        product_base_url: ProductBaseUrl = app[PRODUCTS_URL_MAPPING_APPKEY][
-            product_name
-        ]
-        return product_base_url
-    except KeyError as exc:
-        raise ProductNotFoundError(product_name=product_name) from exc
-
-
 def list_products(app: web.Application) -> list[Product]:
     products: list[Product] = list(app[PRODUCTS_APPKEY].values())
     return products

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

@@ -12,10 +12,6 @@
 from ..constants import RQ_PRODUCT_KEY
 from ..groups import api as groups_service
 from . import _service
-from ._application_keys import (
-    PRODUCTS_URL_MAPPING_APPKEY,
-)
-from ._models import ProductBaseUrl
 from ._web_events import PRODUCTS_TEMPLATES_DIR_APPKEY
 from .errors import (
     FileTemplateNotFoundError,
@@ -47,20 +43,20 @@ def get_current_product(request: web.Request) -> Product:
     return current_product
 
 
-def set_product_base_url(request: web.Request, product_name: ProductName) -> None:
-    if (
-        not request.app[PRODUCTS_URL_MAPPING_APPKEY].get(product_name)
-        and request.url.host
-    ):
-        request.app[PRODUCTS_URL_MAPPING_APPKEY][product_name] = ProductBaseUrl(
-            scheme=request.url.scheme, host=request.url.host
-        )
-        _logger.debug(
-            "Set product url for %s to %s://%s",
-            product_name,
-            request.url.scheme,
-            request.url.host,
-        )
+# def set_product_base_url(request: web.Request, product_name: ProductName) -> None:
+#     if (
+#         not request.app[PRODUCTS_URL_MAPPING_APPKEY].get(product_name)
+#         and request.url.host
+#     ):
+#         request.app[PRODUCTS_URL_MAPPING_APPKEY][product_name] = ProductBaseUrl(
+#             scheme=request.url.scheme, host=request.url.host
+#         )
+#         _logger.debug(
+#             "Set product url for %s to %s://%s",
+#             product_name,
+#             request.url.scheme,
+#             request.url.host,
+#         )
 
 
 async def is_user_in_product_support_group(

services/web/server/src/simcore_service_webserver/socketio/_handlers.py

@@ -149,8 +149,6 @@ async def connect(
             extra=get_log_record_extra(user_id=user_id),
         )
 
-        products_web.set_product_base_url(_request, product_name)
-
         await _set_user_in_group_rooms(app, user_id, socket_id)
         await _set_user_in_project_rooms(app, user_id, client_session_id, socket_id)