review @pcrespov

Author: matusdrobuliak66

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

@@ -5,6 +5,7 @@
 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,
@@ -18,9 +19,6 @@
 _logger = logging.getLogger(__name__)
 
 
-_JSON_CONTENT_TYPE = "application/json"
-
-
 class ChatResponse(BaseModel):
     answer: Annotated[str, Field(description="Answer from the chatbot")]
 
@@ -34,24 +32,22 @@ def _should_retry(response: httpx.Response | None) -> bool:
     )
 
 
-def _chatbot_retry():
-    """Retry configuration for chatbot API calls"""
-    return retry(
-        retry=(
-            retry_if_result(_should_retry)
-            | retry_if_exception_type(
-                (
-                    httpx.ConnectError,
-                    httpx.TimeoutException,
-                    httpx.NetworkError,
-                    httpx.ProtocolError,
-                )
+_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,
-    )
+        )
+    ),
+    stop=stop_after_attempt(3),
+    wait=wait_exponential(multiplier=1, min=1, max=10),
+    reraise=True,
+)
 
 
 class ChatbotRestClient:
@@ -63,7 +59,7 @@ 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()
+        @_CHATBOT_RETRY
         async def _request() -> httpx.Response:
             return await self._client.get(url)
 
@@ -82,7 +78,7 @@ 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()
+        @_CHATBOT_RETRY
         async def _request() -> httpx.Response:
             return await self._client.post(
                 url,
@@ -92,16 +88,15 @@ async def _request() -> httpx.Response:
                     "embedding_model": self._chatbot_settings.CHATBOT_EMBEDDING_MODEL,
                 },
                 headers={
-                    "Content-Type": _JSON_CONTENT_TYPE,
-                    "Accept": _JSON_CONTENT_TYPE,
+                    "Content-Type": MIMETYPE_APPLICATION_JSON,
+                    "Accept": MIMETYPE_APPLICATION_JSON,
                 },
             )
 
         try:
             response = await _request()
             response.raise_for_status()
-            response_data: dict[str, Any] = response.json()
-            return ChatResponse(**response_data)
+            return ChatResponse.model_validate(response.json())
         except Exception:
             _logger.error(  # noqa: TRY400
                 "Failed to ask question to chatbot at %s", url

services/web/server/tests/unit/with_dbs/04/test_chatbot_client.py

@@ -10,7 +10,6 @@
 import pytest
 import respx
 from aiohttp.test_utils import TestClient
-from pytest_mock import MockerFixture
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from simcore_service_webserver.chatbot._client import (
@@ -24,7 +23,6 @@
 def app_environment(
     monkeypatch: pytest.MonkeyPatch,
     app_environment: EnvVarsDict,
-    mocker: MockerFixture,
 ):
     return app_environment | setenvs_from_dict(
         monkeypatch,