From ebf3bf606a9e819d80a65db1f82e5ceaeb5a8ca7 Mon Sep 17 00:00:00 2001
From: tofarr <tofarr@gmail.com>
Date: Thu, 19 Dec 2024 12:44:35 -0700
Subject: [PATCH] Settings store type is defined in openhands_config rather
 than main config (#5701)

---
 openhands/core/config/app_config.py         |  3 ---
 openhands/server/config/openhands_config.py |  3 +++
 openhands/server/routes/settings.py         | 14 ++++++++++----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/openhands/core/config/app_config.py b/openhands/core/config/app_config.py
index e2e2033bde..c049e68174 100644
--- a/openhands/core/config/app_config.py
+++ b/openhands/core/config/app_config.py
@@ -66,9 +66,6 @@ class AppConfig:
     modal_api_token_secret: str = ''
     disable_color: bool = False
     jwt_secret: str = ''
-    settings_store_class: str = (
-        'openhands.storage.file_settings_store.FileSettingsStore'
-    )
     debug: bool = False
     file_uploads_max_file_size_mb: int = 0
     file_uploads_restrict_file_types: bool = False
diff --git a/openhands/server/config/openhands_config.py b/openhands/server/config/openhands_config.py
index 33d79906ff..f0675ebe22 100644
--- a/openhands/server/config/openhands_config.py
+++ b/openhands/server/config/openhands_config.py
@@ -15,6 +15,9 @@ class OpenhandsConfig(OpenhandsConfigInterface):
     attach_session_middleware_path = (
         'openhands.server.middleware.AttachSessionMiddleware'
     )
+    settings_store_class: str = (
+        'openhands.storage.file_settings_store.FileSettingsStore'
+    )
 
     def verify_config(self):
         if self.config_cls:
diff --git a/openhands/server/routes/settings.py b/openhands/server/routes/settings.py
index 51abc1af56..329e9549e7 100644
--- a/openhands/server/routes/settings.py
+++ b/openhands/server/routes/settings.py
@@ -5,13 +5,13 @@ from fastapi.responses import JSONResponse
 
 from openhands.core.logger import openhands_logger as logger
 from openhands.server.settings import Settings
-from openhands.server.shared import config
+from openhands.server.shared import config, openhands_config
 from openhands.storage.settings_store import SettingsStore
 from openhands.utils.import_utils import get_impl
 
 app = APIRouter(prefix='/api')
 
-SettingsStoreImpl = get_impl(SettingsStore, config.settings_store_class)  # type: ignore
+SettingsStoreImpl = get_impl(SettingsStore, openhands_config.settings_store_class)  # type: ignore
 
 
 @app.get('/settings')
@@ -21,6 +21,9 @@ async def load_settings(
     try:
         settings_store = await SettingsStoreImpl.get_instance(config, github_auth)
         settings = await settings_store.load()
+        if settings:
+            # For security reasons we don't ever send the api key to the client
+            settings.llm_api_key = None
         return settings
     except Exception as e:
         logger.warning(f'Invalid token: {e}')
@@ -37,8 +40,11 @@ async def store_settings(
 ) -> bool:
     try:
         settings_store = await SettingsStoreImpl.get_instance(config, github_auth)
-        settings = await settings_store.store(settings)
-        return True
+        existing_settings = await settings_store.load()
+        if existing_settings:
+            if settings.llm_api_key is None:
+                settings.llm_api_key = existing_settings.llm_api_key
+        return await settings_store.store(settings)
     except Exception as e:
         logger.warning(f'Invalid token: {e}')
         return JSONResponse(