Mirrors/ProxMenux
1
0
Fork 0
mirror of https://github.com/MacRimi/ProxMenux.git synced 2026-11-06 21:02:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(notifications): take the AI time limit from its configuration

Browse Source
This commit is contained in:
MacRimi
2026-11-06 18:43:16 +01:00
parent 8086e582e5
commit 854caf8315
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppImage/scripts/notification_manager.py
+7 -6
View File
@@ -826,7 +826,7 @@ _ai_rewrite_pool = concurrent.futures.ThreadPoolExecutor(
) )
def _format_with_ai_bounded(format_fn, *args, timeout=AI_REWRITE_TIMEOUT_SECONDS, **kwargs): def _format_with_ai_bounded(format_fn, *args, timeout=None, **kwargs):
"""Run an AI rewrite with a hard wall-clock timeout. """Run an AI rewrite with a hard wall-clock timeout.
Returns the rewriter's result on success, or `None` on timeout / exception. Returns the rewriter's result on success, or `None` on timeout / exception.
@@ -834,6 +834,10 @@ def _format_with_ai_bounded(format_fn, *args, timeout=AI_REWRITE_TIMEOUT_SECONDS
is not cancelled — Python can't cancel an in-flight HTTP call cleanly — is not cancelled — Python can't cancel an in-flight HTTP call cleanly —
but its result is discarded and the dispatch thread proceeds. but its result is discarded and the dispatch thread proceeds.
""" """
if timeout is None:
# Both rewriters take the AI configuration as their fourth argument.
ai_config = args[3] if len(args) > 3 and isinstance(args[3], dict) else {}
timeout = _ai_rewrite_timeout(ai_config)
future = _ai_rewrite_pool.submit(format_fn, *args, **kwargs) future = _ai_rewrite_pool.submit(format_fn, *args, **kwargs)
try: try:
return future.result(timeout=timeout) return future.result(timeout=timeout)
@@ -847,8 +851,8 @@ def _format_with_ai_bounded(format_fn, *args, timeout=AI_REWRITE_TIMEOUT_SECONDS
# ─── Notification Manager ───────────────────────────────────────── # ─── Notification Manager ─────────────────────────────────────────
def _format_backup_with_ai_bounded(*args, timeout=AI_REWRITE_TIMEOUT_SECONDS, **kwargs): def _format_backup_with_ai_bounded(*args, **kwargs):
result = _format_with_ai_bounded(format_backup_diagnostics_with_ai, *args, timeout=timeout, **kwargs) result = _format_with_ai_bounded(format_backup_diagnostics_with_ai, *args, **kwargs)
if result is not None: if result is not None:
return result return result
return format_backup_diagnostics_with_ai(*args, **kwargs, fallback_only=True) return format_backup_diagnostics_with_ai(*args, **kwargs, fallback_only=True)
@@ -1500,7 +1504,6 @@ class NotificationManager:
ai_result = _format_backup_with_ai_bounded( ai_result = _format_backup_with_ai_bounded(
ch_title, ch_body, severity, channel_ai_config, ch_title, ch_body, severity, channel_ai_config,
event_type=event_type, data=data, event_type=event_type, data=data,
timeout=_ai_rewrite_timeout(channel_ai_config),
detail_level=detail_level, use_emojis=use_rich_format, detail_level=detail_level, use_emojis=use_rich_format,
) )
else: else:
@@ -1521,7 +1524,6 @@ class NotificationManager:
ai_result = _format_with_ai_bounded( ai_result = _format_with_ai_bounded(
format_with_ai_full, format_with_ai_full,
ch_title, ch_body, severity, channel_ai_config, ch_title, ch_body, severity, channel_ai_config,
timeout=_ai_rewrite_timeout(channel_ai_config),
detail_level=detail_level, detail_level=detail_level,
journal_context=enriched_context, journal_context=enriched_context,
use_emojis=use_rich_format, use_emojis=use_rich_format,
@@ -2604,7 +2606,6 @@ class NotificationManager:
ai_result = _format_backup_with_ai_bounded( ai_result = _format_backup_with_ai_bounded(
title, message, severity, channel_ai_config, title, message, severity, channel_ai_config,
event_type=event_type, data=data, event_type=event_type, data=data,
timeout=_ai_rewrite_timeout(channel_ai_config),
detail_level=detail_level, use_emojis=use_rich_format, detail_level=detail_level, use_emojis=use_rich_format,
) )
ch_title = title ch_title = title