Put back requests and synchronous Matrix logging

Author: Marc-Andrieu

app/core/utils/log.py

@@ -7,7 +7,6 @@
 from typing import Any
 
 import uvicorn
-from fastapi import BackgroundTasks
 
 from app.core.utils.config import Settings
 
@@ -122,7 +121,6 @@ def _get_config_dict(self, settings: Settings):
                     # Send error to a Matrix server. If credentials are not set in settings, the handler will be disabled
                     "formatter": "matrix",
                     "class": "app.utils.loggers_tools.matrix_handler.MatrixHandler",
-                    "background_tasks": BackgroundTasks,
                     "room_id": settings.MATRIX_LOG_ERROR_ROOM_ID,
                     "token": settings.MATRIX_TOKEN,
                     "server_base_url": settings.MATRIX_SERVER_BASE_URL,
@@ -135,7 +133,6 @@ def _get_config_dict(self, settings: Settings):
                     # Send error to a Matrix server. If credentials are not set in settings, the handler will be disabled
                     "formatter": "matrix",
                     "class": "app.utils.loggers_tools.matrix_handler.MatrixHandler",
-                    "background_tasks": BackgroundTasks,
                     "room_id": settings.MATRIX_LOG_AMAP_ROOM_ID,
                     "token": settings.MATRIX_TOKEN,
                     "server_base_url": settings.MATRIX_SERVER_BASE_URL,

app/utils/communication/matrix.py

@@ -1,6 +1,6 @@
 from typing import Any
 
-import httpx
+import requests
 
 from app.types.exceptions import MatrixRequestError, MatrixSendMessageError
 
@@ -24,7 +24,7 @@ def __init__(
 
         self.access_token = token
 
-    async def post(
+    def post(
         self,
         url: str,
         json: dict[str, Any],
@@ -43,18 +43,15 @@ async def post(
         if "Authorization" not in headers:
             headers["Authorization"] = "Bearer " + self.access_token
 
+        response = requests.post(url, json=json, headers=headers, timeout=10)
         try:
-            async with httpx.AsyncClient() as client:
-                response = await client.post(
-                    url, json=json, headers=headers, timeout=10
-                )
             response.raise_for_status()
-        except httpx.RequestError as err:
+        except requests.exceptions.HTTPError as err:
             raise MatrixRequestError() from err
 
         return response.json()
 
-    async def send_message(self, room_id: str, formatted_body: str) -> None:
+    def send_message(self, room_id: str, formatted_body: str) -> None:
         """
         Send a message to the room `room_id`.
         `formatted_body` can contain html formatted text
@@ -74,6 +71,6 @@ async def send_message(self, room_id: str, formatted_body: str) -> None:
         }
 
         try:
-            await self.post(url, json=data, headers=None)
+            self.post(url, json=data, headers=None)
         except MatrixRequestError as error:
             raise MatrixSendMessageError(room_id=room_id) from error

app/utils/loggers_tools/matrix_handler.py

@@ -1,7 +1,6 @@
 import logging
 from logging import StreamHandler
 
-from fastapi import BackgroundTasks
 from typing_extensions import override
 
 from app.utils.communication.matrix import Matrix
@@ -22,7 +21,6 @@ class MatrixHandler(StreamHandler):
 
     def __init__(
         self,
-        background_tasks: BackgroundTasks,
         room_id: str,
         token: str,
         server_base_url: str | None,
@@ -32,7 +30,6 @@ def __init__(
         super().__init__()
         self.setLevel(level)
 
-        self.background_tasks = background_tasks
         self.room_id = room_id
         self.enabled = enabled
         if self.enabled:
@@ -46,9 +43,7 @@ def emit(self, record):
         if self.enabled:
             msg = self.format(record)
             try:
-                self.background_tasks.add_task(
-                    self.matrix.send_message, room_id=self.room_id, formatted_body=msg
-                )
+                self.matrix.send_message(self.room_id, msg)
             # We should catch and log any error, as Python may discarded them in production
             except Exception as err:
                 # We use warning level so that the message is not sent to matrix again

requirements-common.txt

@@ -26,6 +26,7 @@ PyMuPDF==1.24.9                     # PDF processing, imported as `fitz`
 pypdf==4.3.1
 python-multipart==0.0.18             # a form data parser, as oauth flow requires form-data parameters
 redis==5.0.8
+requests==2.32.4
 sqlalchemy-utils == 0.41.2
 SQLAlchemy[asyncio]==2.0.32         # [asyncio] allows greenlet to be installed on Apple M1 devices.
 unidecode==1.3.8

requirements-dev.txt

@@ -14,3 +14,4 @@ types-Authlib==1.5.0.20250516
 types-fpdf2==2.8.3.20250516
 types-psutil==7.0.0.20250601
 types-redis==4.6.0.20241004
+types-requests==2.32.0.20250515