fix(app_enabled): centralize app_enabled check

to reduce requests to nextcloud server

Signed-off-by: Marcel Klehr <mklehr@gmx.net>

Author: marcelklehr

context_chat_backend/controller.py

@@ -2,6 +2,8 @@
 # SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
 # SPDX-License-Identifier: AGPL-3.0-or-later
 #
+import time
+
 from nc_py_api.ex_app.providers.task_processing import TaskProcessingProvider
 
 # isort: off
@@ -61,7 +63,20 @@
 		'revision': '607a30d783dfa663caf39e06633721c8d4cfcd7e',
 	}
 } if __download_models_from_hf else {}
+
+
 app_enabled = threading.Event()
+last_enabled_check: int|None = None
+def get_enabled_state() -> bool:
+	global last_enabled_check
+	if last_enabled_check is None or time.time() - last_enabled_check > 30:
+		nc = NextcloudApp()
+		if nc.enabled_state:
+			app_enabled.set()
+		else:
+			app_enabled.clear()
+		last_enabled_check = time.time()
+	return app_enabled.is_set()
 
 def enabled_handler(enabled: bool, nc: NextcloudApp | AsyncNextcloudApp) -> str:
 	try:
@@ -104,8 +119,7 @@ def enabled_handler(enabled: bool, nc: NextcloudApp | AsyncNextcloudApp) -> str:
 async def lifespan(app: FastAPI):
 	set_handlers(app, enabled_handler, models_to_fetch=models_to_fetch, trigger_handler=trigger_handler)
 	start_bg_threads(app_config)
-	nc = NextcloudApp()
-	logger.info(f'App enable state at startup: {nc.enabled_state}')
+	logger.info(f'App enable state at startup: {get_enabled_state()}')
 	yield
 	vectordb_loader.offload()
 	wait_for_bg_threads()

context_chat_backend/task_fetcher.py

@@ -10,7 +10,7 @@
 from contextlib import suppress
 from enum import Enum
 from threading import Event, Thread
-from time import sleep, time
+from time import sleep
 from typing import Any
 
 import niquests
@@ -23,6 +23,7 @@
 from .chain.ingest.injest import embed_sources
 from .chain.one_shot import process_context_query
 from .chain.types import ContextException, EnrichedSourceList, LLMOutput, ScopeList, SearchResult
+from .controller import get_enabled_state
 from .dyn_loader import LLMModelLoader, VectorDBLoader
 from .network_em import NetworkEmbeddings
 from .types import (
@@ -138,18 +139,12 @@ def _load_sources(source_items: Mapping[int, SourceItem | ReceivedFileItem]) ->
 	LOGGER.info(f'Using {file_parsing_cpu_count} parallel file parsing workers')
 
 	nc = NextcloudApp()
-	last_enabled_check = time()
-	enabled_state = nc.enabled_state
 	while True:
 		if THREAD_STOP_EVENT.is_set():
 			LOGGER.info('Files indexing thread is stopping due to stop event being set')
 			return
 
-		if time() - last_enabled_check > 30:  # check enabled state every 30 seconds
-			enabled_state = nc.enabled_state
-			last_enabled_check = time()
-
-		if not enabled_state:
+		if not get_enabled_state():
 			LOGGER.info('App is disabled, files indexing thread will sleep until next enabled state check')
 			sleep(POLLING_COOLDOWN)
 			continue
@@ -292,18 +287,12 @@ def updates_processing_thread(app_config: TConfig) -> None:
 		return
 
 	nc = NextcloudApp()
-	enabled_state = nc.enabled_state
-	last_enabled_check = time()
 	while True:
 		if THREAD_STOP_EVENT.is_set():
 			LOGGER.info('Updates processing thread is stopping due to stop event being set')
 			return
 
-		if time() - last_enabled_check > 30:  # check enabled state every 30 seconds
-			enabled_state = nc.enabled_state
-			last_enabled_check = time()
-
-		if not enabled_state:
+		if not get_enabled_state():
 			sleep(POLLING_COOLDOWN)
 			continue
 
@@ -487,8 +476,6 @@ def request_processing_thread(app_config: TConfig) -> None:
 		return
 
 	nc = NextcloudApp()
-	enabled_state = nc.enabled_state
-	last_enabled_check = time()
 	llm: LLM = llm_loader.load()
 
 	while True:
@@ -500,11 +487,7 @@ def request_processing_thread(app_config: TConfig) -> None:
 			sleep(POLLING_COOLDOWN)
 			continue
 
-		if time() - last_enabled_check > 30:  # check enabled state every 30 seconds
-			enabled_state = nc.enabled_state
-			last_enabled_check = time()
-
-		if not enabled_state:
+		if not get_enabled_state():
 			sleep(POLLING_COOLDOWN)
 			continue
 

context_chat_backend/utils.py

@@ -9,6 +9,7 @@
 import os
 import signal
 import sys
+import time
 import traceback
 from collections.abc import Callable
 from contextlib import suppress
@@ -18,7 +19,9 @@
 from typing import Any, TypeGuard, TypeVar
 
 from fastapi.responses import JSONResponse as FastAPIJSONResponse
+from nc_py_api import NextcloudApp
 
+from .controller import app_enabled
 from .types import AppRole, TConfig, TEmbeddingAuthApiKey, TEmbeddingAuthBasic, TEmbeddingConfig
 
 T = TypeVar('T')
@@ -313,4 +316,4 @@ def get_app_role() -> AppRole:
 	if role not in ['indexing', 'rp']:
 		_logger.warning(f'Invalid app role: {role}, defaulting to all roles')
 		return AppRole.NORMAL
-	return AppRole(role)
+	return AppRole(role)