Switched to external notification module

This commit is contained in:
florian committed 2026-10-17 12:12:28 +02:00
1 parent c5370642c5
commit 162f73fe3f
3 files changed
+15 -79

No files matched your search

+5 -5
View File
@@ -6,14 +6,14 @@ atomicwriter==0.3.0
certifi==2026.7.22
charset-normalizer==3.5.2
click==8.5.0
fastapi==0.143.2
fastapi==0.143.3
h11==0.16.0
httpcore==1.0.9
httpx==0.28.1
idna==3.20
lib-db-module==0.2.0
lib-secret-manager==0.2.0
lib-uvicorn-config==0.2.0
lib-db-module==0.3.0
lib-secret-manager==0.3.1
lib-send-notifications==0.1.0
msgspec==0.22.0
mysql-connector-python==9.4.0
opentelemetry-api==1.45.1
@@ -23,7 +23,7 @@ pydantic_core==2.50.1
python-json-logger==4.2.0
requests==2.34.2
seadex==0.7.3
simple-logger-handler==0.1.0
simple-logger-handler==0.2.1
starlette==1.8.0
typing-inspection==0.4.4
typing_extensions==4.16.0
+10 -7
View File
@@ -14,9 +14,8 @@ from db_module import (
)
from metrics_server import REQUEST_COUNTER, metrics_api
from secret_manager import cleanup_secret_files
from send_notification import send_notification
from send_notifications import NotificationClient
from simple_logger_handler import LOG_LEVEL, setup_logger
from uvicorn_logger_config import LOGGING_CONFIG
logger = setup_logger(__name__)
@@ -24,7 +23,7 @@ logger = setup_logger(__name__)
@asynccontextmanager
async def lifespan(app: FastAPI):
logger.info("[App] Starting application...")
app.state.notifier = NotificationClient()
logger.info("[DB] Creating MySQL connection pool...")
create_connection_pool("royalRoadPool")
@@ -81,7 +80,7 @@ def check_for_update(seadex: SeaDexEntry, anilist_id: int) -> str | None:
@api.post("/update")
def check_seadex(db=Depends(get_db)):
def check_seadex(request:Request, db=Depends(get_db)):
results = {"checked": 0, "new": 0, "errors": 0}
with db.cursor() as cursor:
@@ -105,7 +104,11 @@ def check_seadex(db=Depends(get_db)):
logger.info(
f"[FastAPI] {anime_name} updated, Anilist ID: {anilist_id}"
)
send_notification(anime_name, f"https://seadex.moe/{anilist_id}/")
request.app.state.notifier.send(
title=anime_name,
body="SeaDex entry updated",
link=f"https://seadex.moe/{anilist_id}/",
)
with db.cursor() as cursor:
cursor.execute(
@@ -134,8 +137,8 @@ def check_seadex(db=Depends(get_db)):
async def start_servers():
logger.info("[Server] Starting main API (port 5000) and metrics server (port 9000)...")
config_main = uvicorn.Config(api, host="0.0.0.0", port=5000, log_level=LOG_LEVEL.lower(), log_config=LOGGING_CONFIG)
config_metrics = uvicorn.Config(metrics_api, host="0.0.0.0", port=9000, log_level=LOG_LEVEL.lower(), log_config=LOGGING_CONFIG)
config_main = uvicorn.Config(api, host="0.0.0.0", port=5000, log_level=LOG_LEVEL.lower(),log_config=None)
config_metrics = uvicorn.Config(metrics_api, host="0.0.0.0", port=9000, log_level=LOG_LEVEL.lower(),log_config=None)
server_main = uvicorn.Server(config_main)
server_metrics = uvicorn.Server(config_metrics)
-67
View File
@@ -1,67 +0,0 @@
import os
import time
import requests
from fastapi import HTTPException
from requests.exceptions import ConnectionError, HTTPError, RequestException, Timeout
from secret_manager import return_credentials
from simple_logger_handler import setup_logger
backend_api_url=os.getenv("BACKEND_API_URL","localhost:8101/internal/receive-notifications")
api_key= return_credentials("/etc/secrets/api_key")
logger = setup_logger(__name__)
def send_notification(anime_name: str,link: str,max_retries: int = 5,timeout: int = 5):
"""
Sends a notification to the internal backend service when a new Royalroad chapter is released.
Parameters:
anime_name: Name of the anime.
link: Direct link to the SeaDex page.
"""
headers = {
"X-API-Key-Internal": api_key,
"Content-Type": "application/json"
}
data = {
"user_id": 1,
"message": {
"title": "Updated SeaDex entry",
"body": anime_name,
"link": link,
"category":"utility",
"timestamp": int(time.time())
}
}
logger.debug(f"[Notify] Preparing to send notification: title='{anime_name}', link='{link}'")
with requests.Session() as session:
for attempt in range(1, max_retries + 1):
try:
logger.debug(f"[Notify] Sending request to backend (attempt {attempt}/{max_retries})")
response = session.post(backend_api_url, headers=headers, json=data, timeout=timeout)
response.raise_for_status()
logger.info(f"[Notify] Notification sent successfully for '{anime_name}')")
return response.text
except (Timeout, ConnectionError) as e:
logger.warning(f"[Notify] Attempt {attempt}/{max_retries} failed: {type(e).__name__}")
if attempt == max_retries:
logger.error(f"[Notify] All retry attempts failed for '{anime_name}'")
raise HTTPException(status_code=503, detail=f"Notification service unavailable: {type(e).__name__}") from e
sleep_time = 2 ** (attempt - 1)
logger.debug(f"[Notify] Retrying in {sleep_time} seconds...")
time.sleep(sleep_time)
except HTTPError as e:
logger.error(f"[Notify] HTTP {e.response.status_code}: {e.response.text}")
raise HTTPException(status_code=e.response.status_code, detail=e.response.text) from e
except RequestException as e:
logger.error(f"[Notify] Unexpected request failure: {e}")
raise HTTPException(status_code=500, detail=f"Request failed: {e!s}") from e