Files
gh-christianlouis-docuelevate/app/utils/settings_sync.py
T
copilot-swe-agent[bot] 0c7ea6748d fix: social login providers now work from DB config without restart
- Extract all OAuth registration into _setup_social_providers() with a
  _register_oauth_client() helper that clears the authlib _clients cache
  so credentials can change without a restart
- Add refresh_social_providers() public function called after every
  settings reload (lifespan startup + settings_sync live reload)
- Fix connections page linked status to use _get_effective() (DB-aware)
  instead of the stale startup-time SOCIAL_PROVIDERS dict
- Fix oauth_configured template variable similarly
- Add tests: DB-driven linked status, stale-provider clearing,
  register_oauth_client cache-clear, refresh function coverage

Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
Agent-Logs-Url: https://github.com/christianlouis/DocuElevate/sessions/ef15910f-fd25-469a-814b-9e1fb40659c9
2026-03-22 18:42:18 +00:00

131 lines
5.6 KiB
Python

"""
Worker settings synchronisation helper.
When an admin saves a configuration change through the UI, any running Celery
workers still hold the *old* values in their in-process ``settings`` singleton.
This module provides two complementary mechanisms to propagate the change:
1. **Publish** (API side): :func:`notify_settings_updated` writes a monotonically
increasing timestamp to a Redis key. This is called immediately after every
successful ``save_setting_to_db`` / ``delete_setting_from_db`` operation.
2. **Subscribe** (worker side): :func:`register_settings_reload_signal` installs
a Celery ``task_prerun`` signal handler. Before each task begins the handler
reads the Redis version key; if it has changed since the last reload it calls
:func:`~app.utils.config_loader.reload_settings_from_db` so the worker picks
up the new values *before* executing the task body.
The Redis key used is ``docuelevate:settings_version``. Workers cache the last
seen version in a module-level variable to avoid redundant DB round-trips when
nothing has changed.
"""
import logging
import time
from typing import Any
import redis
from celery.signals import task_prerun
logger = logging.getLogger(__name__)
#: Redis key that stores the current settings "version" (epoch timestamp string).
SETTINGS_VERSION_KEY = "docuelevate:settings_version"
#: Module-level cache: the settings version seen by *this* process on its last reload.
_last_seen_version: str = ""
def notify_settings_updated() -> None:
"""
Publish a settings-updated signal by updating the Redis version key, and
immediately reload the in-process ``settings`` singleton so the API
process serves fresh values without a restart.
Call this after every successful settings write so that all worker
processes know they need to reload their in-memory configuration.
Errors are caught and logged rather than raised so that a Redis
connectivity issue does not prevent the primary save from succeeding.
"""
try:
from app.config import settings
r = redis.from_url(settings.redis_url, socket_connect_timeout=2)
version = str(time.time())
r.set(SETTINGS_VERSION_KEY, version)
logger.debug(f"Settings version bumped to {version}")
except Exception as exc:
logger.warning(f"Could not publish settings update to Redis: {exc}")
# Reload the in-process settings singleton immediately so the API node
# returns updated values (e.g. oauth_provider_name on the login page)
# without needing a restart. Workers use the task_prerun signal handler
# instead, so this only affects the API/web process.
try:
from app.config import settings
from app.utils.config_loader import reload_settings_from_db
reload_settings_from_db(settings)
logger.debug("In-process settings reloaded after settings update")
except Exception as exc:
logger.warning(f"Could not reload in-process settings: {exc}")
# Re-register OAuth / social-login providers so that any provider whose
# credentials were just saved (or updated) in the database is active
# immediately on the login page — no restart required.
try:
from app.auth import refresh_social_providers
refresh_social_providers()
except Exception as exc:
logger.warning(f"Could not refresh social login providers after settings update: {exc}")
# Re-check OCR language availability in the background whenever settings
# are updated. This ensures that if a user changes tesseract_language or
# easyocr_languages via the UI, the new language data is downloaded without
# requiring a container restart.
try:
from app.utils.ocr_language_manager import ensure_ocr_languages_async
ensure_ocr_languages_async()
except Exception as exc:
logger.warning(f"Could not schedule OCR language check: {exc}")
def register_settings_reload_signal() -> None:
"""
Install a Celery ``task_prerun`` signal handler for worker processes.
This should be called once during Celery worker initialisation (e.g. from
``celery_worker.py``). After registration, every task will check the
settings version key in Redis before it starts and reload configuration
from the database if a newer version is detected.
"""
@task_prerun.connect(weak=False)
def _reload_if_stale(sender: Any, **kwargs: Any) -> None:
"""Reload settings from DB if the Redis version key has changed."""
global _last_seen_version
try:
from app.config import settings
from app.utils.config_loader import reload_settings_from_db
r = redis.from_url(settings.redis_url, socket_connect_timeout=2)
current_version = (r.get(SETTINGS_VERSION_KEY) or b"").decode()
if current_version and current_version != _last_seen_version:
reload_settings_from_db(settings)
_last_seen_version = current_version
logger.info(f"Worker settings reloaded (version={current_version})")
# Ensure OCR language data is up to date after a settings reload.
try:
from app.utils.ocr_language_manager import ensure_ocr_languages_async
ensure_ocr_languages_async()
except Exception as lang_exc:
logger.warning(f"Could not schedule OCR language check on worker: {lang_exc}")
except Exception as exc:
logger.debug(f"Settings version check skipped: {exc}")
logger.info("Settings reload signal handler registered on task_prerun")