Merge branch 'master' into dependabot/npm_and_yarn/npm_and_yarn-3c67cbb9cd

Author: odeimaiz

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

@@ -4,15 +4,7 @@
 import httpx
 from aiohttp import web
 from pydantic import BaseModel, Field
-from servicelib.aiohttp import status
 from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
-from tenacity import (
-    retry,
-    retry_if_exception_type,
-    retry_if_result,
-    stop_after_attempt,
-    wait_exponential,
-)
 
 from .settings import ChatbotSettings, get_plugin_settings
 
@@ -23,33 +15,6 @@ class ChatResponse(BaseModel):
     answer: Annotated[str, Field(description="Answer from the chatbot")]
 
 
-def _should_retry(response: httpx.Response | None) -> bool:
-    if response is None:
-        return True
-    return (
-        response.status_code >= status.HTTP_500_INTERNAL_SERVER_ERROR
-        or response.status_code == status.HTTP_429_TOO_MANY_REQUESTS
-    )
-
-
-_CHATBOT_RETRY = retry(
-    retry=(
-        retry_if_result(_should_retry)
-        | retry_if_exception_type(
-            (
-                httpx.ConnectError,
-                httpx.TimeoutException,
-                httpx.NetworkError,
-                httpx.ProtocolError,
-            )
-        )
-    ),
-    stop=stop_after_attempt(3),
-    wait=wait_exponential(multiplier=1, min=1, max=10),
-    reraise=True,
-)
-
-
 class ChatbotRestClient:
     def __init__(self, chatbot_settings: ChatbotSettings) -> None:
         self._client = httpx.AsyncClient()
@@ -59,7 +24,6 @@ async def get_settings(self) -> dict[str, Any]:
         """Fetches chatbot settings"""
         url = httpx.URL(self._chatbot_settings.base_url).join("/v1/chat/settings")
 
-        @_CHATBOT_RETRY
         async def _request() -> httpx.Response:
             return await self._client.get(url)
 
@@ -78,7 +42,6 @@ async def ask_question(self, question: str) -> ChatResponse:
         """Asks a question to the chatbot"""
         url = httpx.URL(self._chatbot_settings.base_url).join("/v1/chat")
 
-        @_CHATBOT_RETRY
         async def _request() -> httpx.Response:
             return await self._client.post(
                 url,
@@ -103,14 +66,6 @@ async def _request() -> httpx.Response:
             )
             raise
 
-    async def __aenter__(self):
-        """Async context manager entry"""
-        return self
-
-    async def __aexit__(self, exc_type, exc_val, exc_tb):
-        """Async context manager exit - cleanup client"""
-        await self._client.aclose()
-
 
 _APPKEY: Final = web.AppKey(ChatbotRestClient.__name__, ChatbotRestClient)
 

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

@@ -9,7 +9,7 @@
 from models_library.rabbitmq_messages import WebserverChatbotRabbitMessage
 from models_library.rest_ordering import OrderBy, OrderDirection
 from pydantic import TypeAdapter
-from servicelib.logging_utils import log_catch, log_context
+from servicelib.logging_utils import log_context
 from servicelib.rabbitmq import RabbitMQClient
 
 from ..conversations import conversations_service
@@ -32,6 +32,11 @@ async def _process_chatbot_trigger_message(app: web.Application, data: bytes) ->
     rabbit_message = TypeAdapter(WebserverChatbotRabbitMessage).validate_json(data)
     assert app  # nosec
 
+    _logger.info(
+        "Processing chatbot trigger message for conversation ID=%s",
+        rabbit_message.conversation.conversation_id,
+    )
+
     _product_name = rabbit_message.conversation.product_name
     _product = products_service.get_product(app, product_name=_product_name)
 
@@ -102,19 +107,7 @@ async def _subscribe_to_rabbitmq(app) -> str:
 
 
 async def _unsubscribe_from_rabbitmq(app) -> None:
-    with (
-        log_context(
-            _logger,
-            logging.INFO,
-            msg=f"Unsubscribing from {WebserverChatbotRabbitMessage.get_channel_name()} channel",
-        ),
-        log_catch(_logger, reraise=False),
-    ):
-        rabbit_client: RabbitMQClient = get_rabbitmq_client(app)
-        if app[_RABBITMQ_WEBSERVER_CHATBOT_CONSUMER_APPKEY]:
-            await rabbit_client.unsubscribe(
-                app[_RABBITMQ_WEBSERVER_CHATBOT_CONSUMER_APPKEY]
-            )
+    assert app  # nosec
 
 
 async def on_cleanup_ctx_rabbitmq_consumer(

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

@@ -101,7 +101,7 @@ async def list_(
         )
     list_query = list_query.offset(offset).limit(limit)
 
-    async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
+    async with transaction_context(get_asyncpg_engine(app), connection) as conn:
         total_count = await conn.scalar(count_query)
 
         result = await conn.stream(list_query)

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

@@ -264,9 +264,8 @@ async def create_support_message(
             "Support settings NOT available, so no need to create FogBugz case. Conversation ID: %s",
             conversation.conversation_id,
         )
-        return message
 
-    if is_first_message or conversation.fogbugz_case_id is None:
+    elif is_first_message or conversation.fogbugz_case_id is None:
         _logger.info(
             "Support settings available, this is first message, creating FogBugz case for Conversation ID: %s",
             conversation.conversation_id,