π OpenHands: AI-Driven Development
refactor: move settings and secrets stores to app_server (#14165)
Tim O'Farrell9e3aed7f5328
diff --git a/enterprise/server/auth/saas_user_auth.py b/enterprise/server/auth/saas_user_auth.pyindex 42bdd9f640..72138c268a 100644--- a/enterprise/server/auth/saas_user_auth.py+++ b/enterprise/server/auth/saas_user_auth.py@@ -35,6 +35,7 @@ from storage.user_authorization_store import UserAuthorizationStorefrom storage.user_store import UserStorefrom tenacity import retry, retry_if_exception_type, stop_after_attempt, wait_fixed+from openhands.app_server.settings.settings_store import SettingsStorefrom openhands.integrations.provider import (PROVIDER_TOKEN_TYPE,ProviderToken,@@ -43,7 +44,6 @@ from openhands.integrations.provider import (from openhands.server.settings import Settingsfrom openhands.server.user_auth.user_auth import AuthType, UserAuthfrom openhands.storage.data_models.secrets import Secrets-from openhands.storage.settings.settings_store import SettingsStoretoken_manager = TokenManager()diff --git a/enterprise/storage/saas_secrets_store.py b/enterprise/storage/saas_secrets_store.pyindex 14d1fb524c..9df72241e1 100644--- a/enterprise/storage/saas_secrets_store.py+++ b/enterprise/storage/saas_secrets_store.py@@ -10,10 +10,10 @@ from storage.database import a_session_makerfrom storage.stored_custom_secrets import StoredCustomSecretsfrom storage.user_store import UserStore+from openhands.app_server.secrets.secrets_store import SecretsStorefrom openhands.core.config.openhands_config import OpenHandsConfigfrom openhands.core.logger import openhands_logger as loggerfrom openhands.storage.data_models.secrets import Secrets-from openhands.storage.secrets.secrets_store import SecretsStore@dataclassdiff --git a/enterprise/storage/saas_settings_store.py b/enterprise/storage/saas_settings_store.pyindex e73c3e62ba..44c40b2813 100644--- a/enterprise/storage/saas_settings_store.py+++ b/enterprise/storage/saas_settings_store.py@@ -21,9 +21,9 @@ from storage.user import Userfrom storage.user_settings import UserSettingsfrom storage.user_store import UserStore+from openhands.app_server.settings.settings_store import SettingsStorefrom openhands.core.config.openhands_config import OpenHandsConfigfrom openhands.server.settings import Settings-from openhands.storage.settings.settings_store import SettingsStorefrom openhands.utils.jsonpatch_compat import deep_mergefrom openhands.utils.llm import is_openhands_modeldiff --git a/openhands/storage/secrets/file_secrets_store.py b/openhands/app_server/secrets/file_secrets_store.pysimilarity index 96%rename from openhands/storage/secrets/file_secrets_store.pyrename to openhands/app_server/secrets/file_secrets_store.pyindex 9e9d744424..3c2093cecc 100644--- a/openhands/storage/secrets/file_secrets_store.py+++ b/openhands/app_server/secrets/file_secrets_store.py@@ -3,11 +3,11 @@ from __future__ import annotationsimport jsonfrom dataclasses import dataclass+from openhands.app_server.secrets.secrets_store import SecretsStorefrom openhands.core.config.openhands_config import OpenHandsConfigfrom openhands.storage import get_file_storefrom openhands.storage.data_models.secrets import Secretsfrom openhands.storage.files import FileStore-from openhands.storage.secrets.secrets_store import SecretsStorefrom openhands.utils.async_utils import call_sync_from_asyncdiff --git a/openhands/app_server/secrets/secrets_router.py b/openhands/app_server/secrets/secrets_router.pyindex 97269b7f49..82abb79a9b 100644--- a/openhands/app_server/secrets/secrets_router.py+++ b/openhands/app_server/secrets/secrets_router.py@@ -13,6 +13,7 @@ from openhands.app_server.secrets.secrets_models import (CustomSecretPage,CustomSecretWithoutValue,)+from openhands.app_server.secrets.secrets_store import SecretsStorefrom openhands.app_server.utils.dependencies import get_dependenciesfrom openhands.app_server.utils.models import EditResponsefrom openhands.integrations.provider import (@@ -30,7 +31,6 @@ from openhands.server.user_auth import (get_secrets_store,)from openhands.storage.data_models.secrets import Secrets-from openhands.storage.secrets.secrets_store import SecretsStore# Create router with /api/v1/secrets prefixrouter = APIRouter(diff --git a/openhands/storage/secrets/secrets_store.py b/openhands/app_server/secrets/secrets_store.pysimilarity index 100%rename from openhands/storage/secrets/secrets_store.pyrename to openhands/app_server/secrets/secrets_store.pydiff --git a/openhands/storage/settings/file_settings_store.py b/openhands/app_server/settings/file_settings_store.pysimilarity index 96%rename from openhands/storage/settings/file_settings_store.pyrename to openhands/app_server/settings/file_settings_store.pyindex 66820fb5cc..361c91becc 100644--- a/openhands/storage/settings/file_settings_store.py+++ b/openhands/app_server/settings/file_settings_store.py@@ -3,11 +3,11 @@ from __future__ import annotationsimport jsonfrom dataclasses import dataclass+from openhands.app_server.settings.settings_store import SettingsStorefrom openhands.core.config.openhands_config import OpenHandsConfigfrom openhands.storage import get_file_storefrom openhands.storage.data_models.settings import Settingsfrom openhands.storage.files import FileStore-from openhands.storage.settings.settings_store import SettingsStorefrom openhands.utils.async_utils import call_sync_from_asyncdiff --git a/openhands/app_server/settings/settings_router.py b/openhands/app_server/settings/settings_router.pyindex 90b556ea8f..4163cb5992 100644--- a/openhands/app_server/settings/settings_router.py+++ b/openhands/app_server/settings/settings_router.py@@ -9,6 +9,8 @@ from typing import Anyfrom fastapi import APIRouter, Depends, statusfrom fastapi.responses import JSONResponse+from openhands.app_server.secrets.secrets_store import SecretsStore+from openhands.app_server.settings.settings_store import SettingsStorefrom openhands.app_server.utils.dependencies import get_dependenciesfrom openhands.core.logger import openhands_logger as loggerfrom openhands.integrations.provider import (@@ -28,8 +30,6 @@ from openhands.server.user_auth import ()from openhands.storage.data_models.secrets import Secretsfrom openhands.storage.data_models.settings import Settings-from openhands.storage.secrets.secrets_store import SecretsStore-from openhands.storage.settings.settings_store import SettingsStorefrom openhands.utils.llm import (get_provider_api_base,is_openhands_model,diff --git a/openhands/storage/settings/settings_store.py b/openhands/app_server/settings/settings_store.pysimilarity index 100%rename from openhands/storage/settings/settings_store.pyrename to openhands/app_server/settings/settings_store.pydiff --git a/openhands/server/config/server_config.py b/openhands/server/config/server_config.pyindex 25caa8d5ee..2ca48453a3 100644--- a/openhands/server/config/server_config.py+++ b/openhands/server/config/server_config.py@@ -22,10 +22,10 @@ class ServerConfig(ServerConfigInterface):hide_llm_settings = os.environ.get('HIDE_LLM_SETTINGS', 'false') == 'true'# This config is used to hide the microagent management page from the users for now. We will remove this once we release the new microagent management page.settings_store_class: str = (- 'openhands.storage.settings.file_settings_store.FileSettingsStore'+ 'openhands.app_server.settings.file_settings_store.FileSettingsStore')secret_store_class: str = (- 'openhands.storage.secrets.file_secrets_store.FileSecretsStore'+ 'openhands.app_server.secrets.file_secrets_store.FileSecretsStore')user_auth_class: str = ('openhands.server.user_auth.default_user_auth.DefaultUserAuth'diff --git a/openhands/server/shared.py b/openhands/server/shared.pyindex 994c4685f4..a5e0e44eb8 100644--- a/openhands/server/shared.py+++ b/openhands/server/shared.py@@ -11,14 +11,14 @@ import osimport socketiofrom dotenv import load_dotenv+from openhands.app_server.secrets.secrets_store import SecretsStore+from openhands.app_server.settings.settings_store import SettingsStorefrom openhands.core.config import load_openhands_configfrom openhands.core.config.openhands_config import OpenHandsConfigfrom openhands.server.config.server_config import ServerConfig, load_server_configfrom openhands.server.types import ServerConfigInterfacefrom openhands.storage import get_file_storefrom openhands.storage.files import FileStore-from openhands.storage.secrets.secrets_store import SecretsStore-from openhands.storage.settings.settings_store import SettingsStorefrom openhands.utils.import_utils import get_implload_dotenv()diff --git a/openhands/server/user_auth/__init__.py b/openhands/server/user_auth/__init__.pyindex d6a4c58e3f..59dc67185a 100644--- a/openhands/server/user_auth/__init__.py+++ b/openhands/server/user_auth/__init__.py@@ -2,12 +2,12 @@ from fastapi import Depends, Requestfrom fastapi.security import APIKeyHeaderfrom pydantic import SecretStr+from openhands.app_server.secrets.secrets_store import SecretsStore+from openhands.app_server.settings.settings_store import SettingsStorefrom openhands.integrations.provider import PROVIDER_TOKEN_TYPEfrom openhands.server.settings import Settingsfrom openhands.server.user_auth.user_auth import AuthType, get_user_authfrom openhands.storage.data_models.secrets import Secrets-from openhands.storage.secrets.secrets_store import SecretsStore-from openhands.storage.settings.settings_store import SettingsStoreasync def get_provider_tokens(request: Request) -> PROVIDER_TOKEN_TYPE | None:diff --git a/openhands/server/user_auth/default_user_auth.py b/openhands/server/user_auth/default_user_auth.pyindex 70d8e177f4..1fb0cb8a54 100644--- a/openhands/server/user_auth/default_user_auth.py+++ b/openhands/server/user_auth/default_user_auth.py@@ -11,13 +11,13 @@ from dataclasses import dataclassfrom fastapi import Requestfrom pydantic import SecretStr+from openhands.app_server.secrets.secrets_store import SecretsStore+from openhands.app_server.settings.settings_store import SettingsStorefrom openhands.integrations.provider import PROVIDER_TOKEN_TYPEfrom openhands.server import sharedfrom openhands.server.settings import Settingsfrom openhands.server.user_auth.user_auth import UserAuthfrom openhands.storage.data_models.secrets import Secrets-from openhands.storage.secrets.secrets_store import SecretsStore-from openhands.storage.settings.settings_store import SettingsStore@dataclassdiff --git a/openhands/server/user_auth/user_auth.py b/openhands/server/user_auth/user_auth.pyindex 7ebc94593b..922069d6e7 100644--- a/openhands/server/user_auth/user_auth.py+++ b/openhands/server/user_auth/user_auth.py@@ -14,13 +14,13 @@ from enum import Enumfrom fastapi import Requestfrom pydantic import SecretStr+from openhands.app_server.secrets.secrets_store import SecretsStore+from openhands.app_server.settings.settings_store import SettingsStorefrom openhands.integrations.provider import PROVIDER_TOKEN_TYPE, ProviderHandlerfrom openhands.integrations.service_types import UserGitInfofrom openhands.server.settings import Settingsfrom openhands.server.shared import server_configfrom openhands.storage.data_models.secrets import Secrets-from openhands.storage.secrets.secrets_store import SecretsStore-from openhands.storage.settings.settings_store import SettingsStorefrom openhands.utils.import_utils import get_impldiff --git a/openhands/utils/import_utils.py b/openhands/utils/import_utils.pyindex 7dc25b918f..108db46fca 100644--- a/openhands/utils/import_utils.py+++ b/openhands/utils/import_utils.py@@ -52,7 +52,7 @@ def get_impl(cls: type[T], impl_name: str | None) -> type[T]:Args:cls: The base class that defines the interfaceimpl_name: Fully qualified name of the implementation class, or None to use the base class- e.g. 'openhands.storage.settings.file_settings_store.FileSettingsStore'+ e.g. 'openhands.app_server.settings.file_settings_store.FileSettingsStore'Returns:The implementation class, which is guaranteed to be a subclass of clsdiff --git a/tests/unit/app_server/test_secrets_api.py b/tests/unit/app_server/test_secrets_api.pyindex 401a4114ff..78fc7f564f 100644--- a/tests/unit/app_server/test_secrets_api.py+++ b/tests/unit/app_server/test_secrets_api.py@@ -9,6 +9,7 @@ from fastapi import FastAPIfrom fastapi.testclient import TestClientfrom pydantic import SecretStr+from openhands.app_server.secrets.file_secrets_store import FileSecretsStorefrom openhands.app_server.secrets.secrets_router import (router as secrets_router,)@@ -19,7 +20,6 @@ from openhands.integrations.provider import ()from openhands.storage import get_file_storefrom openhands.storage.data_models.secrets import Secrets-from openhands.storage.secrets.file_secrets_store import FileSecretsStore@pytest.fixture@@ -45,7 +45,7 @@ def file_secrets_store(temp_dir):file_store = get_file_store('local', temp_dir)store = FileSecretsStore(file_store)with patch(- 'openhands.storage.secrets.file_secrets_store.FileSecretsStore.get_instance',+ 'openhands.app_server.secrets.file_secrets_store.FileSecretsStore.get_instance',AsyncMock(return_value=store),):yield storediff --git a/tests/unit/app_server/test_settings_api.py b/tests/unit/app_server/test_settings_api.pyindex d4e7cf9b8c..42a822a77a 100644--- a/tests/unit/app_server/test_settings_api.py+++ b/tests/unit/app_server/test_settings_api.py@@ -6,6 +6,9 @@ from fastapi import Requestfrom fastapi.testclient import TestClientfrom pydantic import SecretStr+from openhands.app_server.secrets.secrets_store import SecretsStore+from openhands.app_server.settings.file_settings_store import FileSettingsStore+from openhands.app_server.settings.settings_store import SettingsStorefrom openhands.integrations.provider import ProviderToken, ProviderTypefrom openhands.integrations.service_types import UserGitInfofrom openhands.sdk.llm import LLM@@ -19,9 +22,6 @@ from openhands.server.user_auth.user_auth import UserAuthfrom openhands.storage.data_models.secrets import Secretsfrom openhands.storage.data_models.settings import Settingsfrom openhands.storage.memory import InMemoryFileStore-from openhands.storage.secrets.secrets_store import SecretsStore-from openhands.storage.settings.file_settings_store import FileSettingsStore-from openhands.storage.settings.settings_store import SettingsStore_EXPOSE = {'expose_secrets': True}@@ -103,7 +103,7 @@ def test_client():return_value=MockUserAuth(),),patch(- 'openhands.storage.settings.file_settings_store.FileSettingsStore.get_instance',+ 'openhands.app_server.settings.file_settings_store.FileSettingsStore.get_instance',AsyncMock(return_value=FileSettingsStore(InMemoryFileStore())),),):diff --git a/tests/unit/mcp/test_mcp_integration.py b/tests/unit/mcp/test_mcp_integration.pyindex 4c2fd439fa..62e84d045a 100644--- a/tests/unit/mcp/test_mcp_integration.py+++ b/tests/unit/mcp/test_mcp_integration.py@@ -4,12 +4,12 @@ from unittest.mock import AsyncMock, patchimport pytest+from openhands.app_server.settings.file_settings_store import FileSettingsStorefrom openhands.core.config.mcp_config import MCPConfig, RemoteMCPServerfrom openhands.sdk.llm import LLMfrom openhands.sdk.settings import AgentSettingsfrom openhands.server.user_auth.default_user_auth import DefaultUserAuthfrom openhands.storage.data_models.settings import Settings-from openhands.storage.settings.file_settings_store import FileSettingsStoredef _sdk_mcp_config(settings: Settings) -> MCPConfig | None:diff --git a/tests/unit/server/routes/test_skills_api.py b/tests/unit/server/routes/test_skills_api.pyindex b1daa1bee0..47940c86d4 100644--- a/tests/unit/server/routes/test_skills_api.py+++ b/tests/unit/server/routes/test_skills_api.py@@ -7,15 +7,15 @@ from fastapi import Requestfrom fastapi.testclient import TestClientfrom pydantic import SecretStr+from openhands.app_server.secrets.secrets_store import SecretsStore+from openhands.app_server.settings.file_settings_store import FileSettingsStore+from openhands.app_server.settings.settings_store import SettingsStorefrom openhands.integrations.provider import ProviderToken, ProviderTypefrom openhands.integrations.service_types import UserGitInfofrom openhands.server.app import appfrom openhands.server.user_auth.user_auth import UserAuthfrom openhands.storage.data_models.secrets import Secretsfrom openhands.storage.memory import InMemoryFileStore-from openhands.storage.secrets.secrets_store import SecretsStore-from openhands.storage.settings.file_settings_store import FileSettingsStore-from openhands.storage.settings.settings_store import SettingsStoreclass MockUserAuth(UserAuth):@@ -75,7 +75,7 @@ def test_client():return_value=MockUserAuth(),),patch(- 'openhands.storage.settings.file_settings_store.FileSettingsStore.get_instance',+ 'openhands.app_server.settings.file_settings_store.FileSettingsStore.get_instance',AsyncMock(return_value=FileSettingsStore(InMemoryFileStore())),),):diff --git a/tests/unit/server/test_openapi_schema_generation.py b/tests/unit/server/test_openapi_schema_generation.pyindex 8a3f8ad8f7..feb0dcd884 100644--- a/tests/unit/server/test_openapi_schema_generation.py+++ b/tests/unit/server/test_openapi_schema_generation.py@@ -6,15 +6,15 @@ from fastapi import Requestfrom fastapi.testclient import TestClientfrom pydantic import SecretStr+from openhands.app_server.secrets.secrets_store import SecretsStore+from openhands.app_server.settings.file_settings_store import FileSettingsStore+from openhands.app_server.settings.settings_store import SettingsStorefrom openhands.integrations.provider import ProviderToken, ProviderTypefrom openhands.integrations.service_types import UserGitInfofrom openhands.server.app import appfrom openhands.server.user_auth.user_auth import UserAuthfrom openhands.storage.data_models.secrets import Secretsfrom openhands.storage.memory import InMemoryFileStore-from openhands.storage.secrets.secrets_store import SecretsStore-from openhands.storage.settings.file_settings_store import FileSettingsStore-from openhands.storage.settings.settings_store import SettingsStoreclass MockUserAuth(UserAuth):@@ -71,7 +71,7 @@ def test_client():return_value=MockUserAuth(),),patch(- 'openhands.storage.settings.file_settings_store.FileSettingsStore.get_instance',+ 'openhands.app_server.settings.file_settings_store.FileSettingsStore.get_instance',AsyncMock(return_value=FileSettingsStore(InMemoryFileStore())),),):diff --git a/tests/unit/storage/settings/test_file_settings_store.py b/tests/unit/storage/settings/test_file_settings_store.pyindex 38500db701..12b093a09f 100644--- a/tests/unit/storage/settings/test_file_settings_store.py+++ b/tests/unit/storage/settings/test_file_settings_store.py@@ -4,12 +4,12 @@ from unittest.mock import MagicMock, patchimport pytestfrom pydantic import SecretStr+from openhands.app_server.settings.file_settings_store import FileSettingsStorefrom openhands.core.config.openhands_config import OpenHandsConfigfrom openhands.sdk.llm import LLMfrom openhands.sdk.settings import AgentSettings, ConversationSettingsfrom openhands.storage.data_models.settings import Settingsfrom openhands.storage.files import FileStore-from openhands.storage.settings.file_settings_store import FileSettingsStore@pytest.fixture@@ -106,7 +106,7 @@ async def test_get_instance():config = OpenHandsConfig(file_store='local', file_store_path='/test/path')with patch(- 'openhands.storage.settings.file_settings_store.get_file_store'+ 'openhands.app_server.settings.file_settings_store.get_file_store') as mock_get_store:mock_store = MagicMock(spec=FileStore)mock_get_store.return_value = mock_store