Skip to content

πŸ™Œ OpenHands: AI-Driven Development

refactor: move Settings and Secrets models to app_server (#14170)

Tim O'Farrell8f0f3e49c8b1
diff --git a/enterprise/integrations/github/github_manager.py b/enterprise/integrations/github/github_manager.py
index e3bb748131..fc10025e3d 100644
--- a/enterprise/integrations/github/github_manager.py
+++ b/enterprise/integrations/github/github_manager.py
@@ -31,6 +31,7 @@ from server.auth.auth_error import ExpiredError
from server.auth.constants import GITHUB_APP_CLIENT_ID, GITHUB_APP_PRIVATE_KEY
from server.auth.token_manager import TokenManager
+from openhands.app_server.secrets.secrets_models import Secrets
from openhands.core.logger import openhands_logger as logger
from openhands.integrations.provider import ProviderToken, ProviderType
from openhands.integrations.service_types import AuthenticationError
@@ -39,7 +40,6 @@ from openhands.server.types import (
MissingSettingsError,
SessionExpiredError,
)
-from openhands.storage.data_models.secrets import Secrets
class GithubManager(Manager[GithubViewType]):
diff --git a/enterprise/integrations/gitlab/gitlab_manager.py b/enterprise/integrations/gitlab/gitlab_manager.py
index dd520aa221..e23d67aeb9 100644
--- a/enterprise/integrations/gitlab/gitlab_manager.py
+++ b/enterprise/integrations/gitlab/gitlab_manager.py
@@ -25,6 +25,7 @@ from jinja2 import Environment, FileSystemLoader
from pydantic import SecretStr
from server.auth.token_manager import TokenManager
+from openhands.app_server.secrets.secrets_models import Secrets
from openhands.core.logger import openhands_logger as logger
from openhands.integrations.gitlab.gitlab_service import GitLabServiceImpl
from openhands.integrations.provider import ProviderToken, ProviderType
@@ -33,7 +34,6 @@ from openhands.server.types import (
MissingSettingsError,
SessionExpiredError,
)
-from openhands.storage.data_models.secrets import Secrets
class GitlabManager(Manager[GitlabViewType]):
diff --git a/enterprise/server/auth/saas_user_auth.py b/enterprise/server/auth/saas_user_auth.py
index 72138c268a..f0078643c3 100644
--- a/enterprise/server/auth/saas_user_auth.py
+++ b/enterprise/server/auth/saas_user_auth.py
@@ -35,15 +35,15 @@ from storage.user_authorization_store import UserAuthorizationStore
from storage.user_store import UserStore
from tenacity import retry, retry_if_exception_type, stop_after_attempt, wait_fixed
+from openhands.app_server.secrets.secrets_models import Secrets
+from openhands.app_server.settings.settings_models import Settings
from openhands.app_server.settings.settings_store import SettingsStore
from openhands.integrations.provider import (
PROVIDER_TOKEN_TYPE,
ProviderToken,
ProviderType,
)
-from openhands.server.settings import Settings
from openhands.server.user_auth.user_auth import AuthType, UserAuth
-from openhands.storage.data_models.secrets import Secrets
token_manager = TokenManager()
diff --git a/enterprise/storage/lite_llm_manager.py b/enterprise/storage/lite_llm_manager.py
index 2f8e56e3ff..8b8f64306a 100644
--- a/enterprise/storage/lite_llm_manager.py
+++ b/enterprise/storage/lite_llm_manager.py
@@ -19,7 +19,7 @@ from server.constants import (
from server.logger import logger
from storage.user_settings import UserSettings
-from openhands.server.settings import Settings
+from openhands.app_server.settings.settings_models import Settings
from openhands.utils.http_session import httpx_verify_option
# Timeout in seconds for key verification requests to LiteLLM
diff --git a/enterprise/storage/org_member_store.py b/enterprise/storage/org_member_store.py
index de2b60172e..ba772bac8f 100644
--- a/enterprise/storage/org_member_store.py
+++ b/enterprise/storage/org_member_store.py
@@ -14,7 +14,7 @@ from storage.org_member import OrgMember
from storage.user import User
from storage.user_settings import UserSettings
-from openhands.storage.data_models.settings import Settings
+from openhands.app_server.settings.settings_models import Settings
from openhands.utils.jsonpatch_compat import deep_merge
diff --git a/enterprise/storage/org_service.py b/enterprise/storage/org_service.py
index 83ca025a8d..9152c97950 100644
--- a/enterprise/storage/org_service.py
+++ b/enterprise/storage/org_service.py
@@ -24,9 +24,9 @@ from storage.org_store import OrgStore
from storage.role_store import RoleStore
from storage.user_store import UserStore
+from openhands.app_server.settings.settings_models import Settings
from openhands.core.logger import openhands_logger as logger
from openhands.sdk.settings import AgentSettings, ConversationSettings
-from openhands.storage.data_models.settings import Settings
class OrgService:
diff --git a/enterprise/storage/org_store.py b/enterprise/storage/org_store.py
index b320633a9e..1813dabe3a 100644
--- a/enterprise/storage/org_store.py
+++ b/enterprise/storage/org_store.py
@@ -24,9 +24,9 @@ from storage.org_member import OrgMember
from storage.user import User
from storage.user_settings import UserSettings
+from openhands.app_server.settings.settings_models import Settings
from openhands.core.logger import openhands_logger as logger
from openhands.sdk.settings import AgentSettings, ConversationSettings
-from openhands.storage.data_models.settings import Settings
from openhands.utils.jsonpatch_compat import deep_merge
from openhands.utils.llm import is_openhands_model
diff --git a/enterprise/storage/saas_secrets_store.py b/enterprise/storage/saas_secrets_store.py
index 9df72241e1..2ff85a5fe9 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_maker
from storage.stored_custom_secrets import StoredCustomSecrets
from storage.user_store import UserStore
+from openhands.app_server.secrets.secrets_models import Secrets
from openhands.app_server.secrets.secrets_store import SecretsStore
from openhands.core.config.openhands_config import OpenHandsConfig
from openhands.core.logger import openhands_logger as logger
-from openhands.storage.data_models.secrets import Secrets
@dataclass
diff --git a/enterprise/storage/saas_settings_store.py b/enterprise/storage/saas_settings_store.py
index 44c40b2813..4f240a6d7f 100644
--- a/enterprise/storage/saas_settings_store.py
+++ b/enterprise/storage/saas_settings_store.py
@@ -21,9 +21,9 @@ from storage.user import User
from storage.user_settings import UserSettings
from storage.user_store import UserStore
+from openhands.app_server.settings.settings_models import Settings
from openhands.app_server.settings.settings_store import SettingsStore
from openhands.core.config.openhands_config import OpenHandsConfig
-from openhands.server.settings import Settings
from openhands.utils.jsonpatch_compat import deep_merge
from openhands.utils.llm import is_openhands_model
diff --git a/enterprise/storage/user_settings.py b/enterprise/storage/user_settings.py
index 29d6670858..b687e42466 100644
--- a/enterprise/storage/user_settings.py
+++ b/enterprise/storage/user_settings.py
@@ -85,8 +85,8 @@ class UserSettings(Base):
) # False = not migrated, True = migrated
def to_settings(self):
+ from openhands.app_server.settings.settings_models import Settings
from openhands.sdk.settings import AgentSettings, ConversationSettings
- from openhands.storage.data_models.settings import Settings
return Settings(
agent_settings=AgentSettings.model_validate(self.agent_settings or {}),
diff --git a/enterprise/storage/user_store.py b/enterprise/storage/user_store.py
index 8428253f3a..9bfe21088d 100644
--- a/enterprise/storage/user_store.py
+++ b/enterprise/storage/user_store.py
@@ -931,7 +931,7 @@ class UserStore:
from typing import TYPE_CHECKING
if TYPE_CHECKING:
- from openhands.storage.data_models.settings import Settings
+ from openhands.app_server.settings.settings_models import Settings
@staticmethod
async def create_default_settings(
@@ -945,7 +945,7 @@ class UserStore:
if not org_id:
return None
- from openhands.storage.data_models.settings import Settings
+ from openhands.app_server.settings.settings_models import Settings
default_settings = Settings(
language='en', enable_proactive_conversation_starters=True
diff --git a/enterprise/tests/unit/integrations/test_resolver_context.py b/enterprise/tests/unit/integrations/test_resolver_context.py
index 79f75259de..1a1bb11c63 100644
--- a/enterprise/tests/unit/integrations/test_resolver_context.py
+++ b/enterprise/tests/unit/integrations/test_resolver_context.py
@@ -10,6 +10,7 @@ import pytest
from pydantic import SecretStr
from enterprise.integrations.resolver_context import ResolverUserContext
+from openhands.app_server.secrets.secrets_models import Secrets
# Import the real classes we want to test
from openhands.integrations.provider import CustomSecret, ProviderToken
@@ -17,7 +18,6 @@ from openhands.integrations.service_types import ProviderType
# Import the SDK types we need for testing
from openhands.sdk.secret import SecretSource, StaticSecret
-from openhands.storage.data_models.secrets import Secrets
@pytest.fixture
diff --git a/enterprise/tests/unit/test_lite_llm_manager.py b/enterprise/tests/unit/test_lite_llm_manager.py
index 350249654a..253e35a6d7 100644
--- a/enterprise/tests/unit/test_lite_llm_manager.py
+++ b/enterprise/tests/unit/test_lite_llm_manager.py
@@ -20,7 +20,7 @@ from storage.lite_llm_manager import (
)
from storage.user_settings import UserSettings
-from openhands.server.settings import Settings
+from openhands.app_server.settings.settings_models import Settings
def _agent_value(settings: Settings, key: str):
diff --git a/enterprise/tests/unit/test_org_member_store.py b/enterprise/tests/unit/test_org_member_store.py
index ec0ea860e1..b8efeb06d2 100644
--- a/enterprise/tests/unit/test_org_member_store.py
+++ b/enterprise/tests/unit/test_org_member_store.py
@@ -12,7 +12,7 @@ from storage.role import Role
from storage.user import User
from storage.user_settings import UserSettings
-from openhands.storage.data_models.settings import Settings
+from openhands.app_server.settings.settings_models import Settings
def test_get_kwargs_from_user_settings_uses_agent_settings_as_source_of_truth():
diff --git a/enterprise/tests/unit/test_org_store.py b/enterprise/tests/unit/test_org_store.py
index 90bd193a31..ffbbbd0ff6 100644
--- a/enterprise/tests/unit/test_org_store.py
+++ b/enterprise/tests/unit/test_org_store.py
@@ -13,8 +13,8 @@ from storage.org_store import OrgStore
from storage.role import Role
from storage.user import User
+from openhands.app_server.settings.settings_models import Settings
from openhands.sdk.settings import AgentSettings, ConversationSettings
-from openhands.storage.data_models.settings import Settings
@pytest.fixture
diff --git a/enterprise/tests/unit/test_saas_secrets_store.py b/enterprise/tests/unit/test_saas_secrets_store.py
index 740507a973..e609d90b9c 100644
--- a/enterprise/tests/unit/test_saas_secrets_store.py
+++ b/enterprise/tests/unit/test_saas_secrets_store.py
@@ -8,9 +8,9 @@ from pydantic import SecretStr
from storage.saas_secrets_store import SaasSecretsStore
from storage.stored_custom_secrets import StoredCustomSecrets
+from openhands.app_server.secrets.secrets_models import Secrets
from openhands.core.config.openhands_config import OpenHandsConfig
from openhands.integrations.provider import CustomSecret
-from openhands.storage.data_models.secrets import Secrets
@pytest.fixture
diff --git a/enterprise/tests/unit/test_saas_settings_store.py b/enterprise/tests/unit/test_saas_settings_store.py
index 285e3f9b1f..d48ea4a376 100644
--- a/enterprise/tests/unit/test_saas_settings_store.py
+++ b/enterprise/tests/unit/test_saas_settings_store.py
@@ -4,9 +4,9 @@ from unittest.mock import AsyncMock, MagicMock, patch
import pytest
from pydantic import SecretStr
+from openhands.app_server.settings.settings_models import Settings
+from openhands.app_server.settings.settings_models import Settings as DataSettings
from openhands.core.config.openhands_config import OpenHandsConfig
-from openhands.server.settings import Settings
-from openhands.storage.data_models.settings import Settings as DataSettings
def _agent_value(settings: Settings, key: str):
diff --git a/enterprise/tests/unit/test_saas_user_auth.py b/enterprise/tests/unit/test_saas_user_auth.py
index 726702f310..55951f9219 100644
--- a/enterprise/tests/unit/test_saas_user_auth.py
+++ b/enterprise/tests/unit/test_saas_user_auth.py
@@ -22,8 +22,8 @@ from server.auth.saas_user_auth import (
from storage.api_key_store import ApiKeyValidationResult
from storage.user_authorization import UserAuthorizationType
+from openhands.app_server.secrets.secrets_models import Secrets
from openhands.integrations.provider import ProviderToken, ProviderType
-from openhands.storage.data_models.secrets import Secrets
@pytest.fixture
diff --git a/enterprise/tests/unit/test_user_store.py b/enterprise/tests/unit/test_user_store.py
index 54790a7b95..f34dafe91e 100644
--- a/enterprise/tests/unit/test_user_store.py
+++ b/enterprise/tests/unit/test_user_store.py
@@ -13,7 +13,7 @@ from storage.org import Org
from storage.user import User
from storage.user_store import UserStore
-from openhands.storage.data_models.settings import Settings
+from openhands.app_server.settings.settings_models import Settings
# --- Fixtures ---
diff --git a/openhands/app_server/app_conversation/app_conversation_models.py b/openhands/app_server/app_conversation/app_conversation_models.py
index f393e8c09f..e6767ab98a 100644
--- a/openhands/app_server/app_conversation/app_conversation_models.py
+++ b/openhands/app_server/app_conversation/app_conversation_models.py
@@ -11,13 +11,14 @@ from openhands.app_server.event_callback.event_callback_models import (
EventCallbackProcessor,
)
from openhands.app_server.sandbox.sandbox_models import SandboxStatus
+
+# Import from new location and re-export for backward compatibility
+from openhands.app_server.settings.settings_models import SandboxGroupingStrategy
from openhands.integrations.service_types import ProviderType, SuggestedTask
from openhands.sdk.conversation import ConversationExecutionStatus
from openhands.sdk.llm import MetricsSnapshot
from openhands.sdk.plugin import PluginSource
-from openhands.storage.data_models.settings import SandboxGroupingStrategy
-# Re-export SandboxGroupingStrategy for backward compatibility
__all__ = ['SandboxGroupingStrategy']
diff --git a/openhands/app_server/app_conversation/live_status_app_conversation_service.py b/openhands/app_server/app_conversation/live_status_app_conversation_service.py
index 81ff6befe6..0d53a42441 100644
--- a/openhands/app_server/app_conversation/live_status_app_conversation_service.py
+++ b/openhands/app_server/app_conversation/live_status_app_conversation_service.py
@@ -36,6 +36,7 @@ from openhands.app_server.app_conversation.app_conversation_models import (
AppConversationUpdateRequest,
ConversationTrigger,
PluginSpec,
+ SandboxGroupingStrategy,
)
from openhands.app_server.app_conversation.app_conversation_service import (
AppConversationService,
@@ -99,7 +100,6 @@ from openhands.sdk.secret import LookupSecret, StaticSecret
from openhands.sdk.utils.paging import page_iterator
from openhands.sdk.workspace.remote.async_remote_workspace import AsyncRemoteWorkspace
from openhands.server.types import AppMode
-from openhands.storage.data_models.settings import SandboxGroupingStrategy
from openhands.tools.preset.default import (
get_default_tools,
)
diff --git a/openhands/app_server/secrets/file_secrets_store.py b/openhands/app_server/secrets/file_secrets_store.py
index 1cc189ff01..d40d0cbc28 100644
--- a/openhands/app_server/secrets/file_secrets_store.py
+++ b/openhands/app_server/secrets/file_secrets_store.py
@@ -3,10 +3,10 @@ from __future__ import annotations
import json
from dataclasses import dataclass
+from openhands.app_server.secrets.secrets_models import Secrets
from openhands.app_server.secrets.secrets_store import SecretsStore
from openhands.core.config.openhands_config import OpenHandsConfig
from openhands.storage import get_file_store
-from openhands.storage.data_models.secrets import Secrets
from openhands.storage.files import FileStore
from openhands.utils.async_utils import call_sync_from_async
diff --git a/openhands/app_server/secrets/secrets_models.py b/openhands/app_server/secrets/secrets_models.py
index fd383dcb8f..44e42960b3 100644
--- a/openhands/app_server/secrets/secrets_models.py
+++ b/openhands/app_server/secrets/secrets_models.py
@@ -1,6 +1,175 @@
-"""Models for the secrets API."""
+"""Models for the secrets API.
-from pydantic import BaseModel, SecretStr
+This module contains:
+- Secrets: Model for storing provider tokens and custom secrets
+- CustomSecretWithoutValue: Custom secret model without value (for listing)
+- CustomSecretCreate: Custom secret model with value (for creating)
+- CustomSecretPage: Paginated response for custom secrets search
+"""
+
+from collections.abc import Mapping
+from types import MappingProxyType
+from typing import Any
+
+from pydantic import (
+ BaseModel,
+ ConfigDict,
+ Field,
+ SecretStr,
+ SerializationInfo,
+ field_serializer,
+ field_validator,
+ model_validator,
+)
+from pydantic.json import pydantic_encoder
+
+from openhands.integrations.provider import (
+ CUSTOM_SECRETS_TYPE,
+ PROVIDER_TOKEN_TYPE,
+ CustomSecret,
+ ProviderToken,
+)
+from openhands.integrations.service_types import ProviderType
+
+
+class Secrets(BaseModel):
+ """Model for storing provider tokens and custom secrets."""
+
+ provider_tokens: PROVIDER_TOKEN_TYPE = Field(
+ default_factory=lambda: MappingProxyType({})
+ )
+
+ custom_secrets: CUSTOM_SECRETS_TYPE = Field(
+ default_factory=lambda: MappingProxyType({})
+ )
+
+ model_config = ConfigDict(
+ frozen=True,
+ validate_assignment=True,
+ arbitrary_types_allowed=True,
+ )
+
+ @field_validator('provider_tokens', 'custom_secrets')
+ @classmethod
+ def immutable_validator(cls, value: Mapping) -> MappingProxyType:
+ return MappingProxyType(value)
+
+ @field_serializer('provider_tokens')
+ def provider_tokens_serializer(
+ self, provider_tokens: PROVIDER_TOKEN_TYPE, info: SerializationInfo
+ ) -> dict[str, dict[str, str | Any]]:
+ tokens = {}
+ expose_secrets = info.context and info.context.get('expose_secrets', False)
+
+ for token_type, provider_token in provider_tokens.items():
+ if not provider_token or not provider_token.token:
+ continue
+
+ token_type_str = (
+ token_type.value
+ if isinstance(token_type, ProviderType)
+ else str(token_type)
+ )
+
+ token = None
+ if provider_token.token:
+ token = (
+ provider_token.token.get_secret_value()
+ if expose_secrets
+ else pydantic_encoder(provider_token.token)
+ )
+
+ tokens[token_type_str] = {
+ 'token': token,
+ 'host': provider_token.host,
+ 'user_id': provider_token.user_id,
+ }
+
+ return tokens
+
+ @field_serializer('custom_secrets')
+ def custom_secrets_serializer(
+ self, custom_secrets: CUSTOM_SECRETS_TYPE, info: SerializationInfo
+ ):
+ secrets = {}
+ expose_secrets = info.context and info.context.get('expose_secrets', False)
+
+ if custom_secrets:
+ for secret_name, secret_value in custom_secrets.items():
+ secrets[secret_name] = {
+ 'secret': secret_value.secret.get_secret_value()
+ if expose_secrets
+ else pydantic_encoder(secret_value.secret),
+ 'description': secret_value.description,
+ }
+
+ return secrets
+
+ @model_validator(mode='before')
+ @classmethod
+ def convert_dict_to_mappingproxy(
+ cls, data: dict[str, dict[str, Any] | MappingProxyType] | PROVIDER_TOKEN_TYPE
+ ) -> dict[str, MappingProxyType | None]:
+ """Custom deserializer to convert dictionary into MappingProxyType"""
+ if not isinstance(data, dict):
+ raise ValueError('Secrets must be initialized with a dictionary')
+
+ new_data: dict[str, MappingProxyType | None] = {}
+
+ if 'provider_tokens' in data:
+ tokens = data['provider_tokens']
+ if isinstance(
+ tokens, dict
+ ): # Ensure conversion happens only for dict inputs
+ converted_tokens = {}
+ for key, value in tokens.items():
+ try:
+ provider_type = (
+ ProviderType(key) if isinstance(key, str) else key
+ )
+ converted_tokens[provider_type] = ProviderToken.from_value(
+ value
+ )
+ except ValueError:
+ # Skip invalid provider types or tokens
+ continue
+
+ # Convert to MappingProxyType
+ new_data['provider_tokens'] = MappingProxyType(converted_tokens)
+ elif isinstance(tokens, MappingProxyType):
+ new_data['provider_tokens'] = tokens
+
+ if 'custom_secrets' in data:
+ secrets = data['custom_secrets']
+ if isinstance(secrets, dict):
+ converted_secrets = {}
+ for key, value in secrets.items():
+ try:
+ converted_secrets[key] = CustomSecret.from_value(value)
+ except ValueError:
+ continue
+
+ new_data['custom_secrets'] = MappingProxyType(converted_secrets)
+ elif isinstance(secrets, MappingProxyType):
+ new_data['custom_secrets'] = secrets
+
+ return new_data
+
+ def get_env_vars(self) -> dict[str, str]:
+ secret_store = self.model_dump(context={'expose_secrets': True})
+ custom_secrets = secret_store.get('custom_secrets', {})
+ secrets = {}
+ for secret_name, value in custom_secrets.items():
+ secrets[secret_name] = value['secret']
+
+ return secrets
+
+ def get_custom_secrets_descriptions(self) -> dict[str, str]:
+ secrets = {}
+ for secret_name, secret in self.custom_secrets.items():
+ secrets[secret_name] = secret.description
+
+ return secrets
class CustomSecretWithoutValue(BaseModel):
diff --git a/openhands/app_server/secrets/secrets_router.py b/openhands/app_server/secrets/secrets_router.py
index 82abb79a9b..88475bce95 100644
--- a/openhands/app_server/secrets/secrets_router.py
+++ b/openhands/app_server/secrets/secrets_router.py
@@ -12,8 +12,10 @@ from openhands.app_server.secrets.secrets_models import (
CustomSecretCreate,
CustomSecretPage,
CustomSecretWithoutValue,
+ Secrets,
)
from openhands.app_server.secrets.secrets_store import SecretsStore
+from openhands.app_server.settings.settings_models import POSTProviderModel
from openhands.app_server.utils.dependencies import get_dependencies
from openhands.app_server.utils.models import EditResponse
from openhands.integrations.provider import (
@@ -22,15 +24,11 @@ from openhands.integrations.provider import (
ProviderType,
)
from openhands.integrations.utils import validate_provider_token
-from openhands.server.settings import (
- POSTProviderModel,
-)
from openhands.server.user_auth import (
get_provider_tokens,
get_secrets,
get_secrets_store,
)
-from openhands.storage.data_models.secrets import Secrets
# Create router with /api/v1/secrets prefix
router = APIRouter(
diff --git a/openhands/app_server/secrets/secrets_store.py b/openhands/app_server/secrets/secrets_store.py
index 068810a632..7af1f08727 100644
--- a/openhands/app_server/secrets/secrets_store.py
+++ b/openhands/app_server/secrets/secrets_store.py
@@ -2,8 +2,8 @@ from __future__ import annotations
from abc import ABC, abstractmethod
+from openhands.app_server.secrets.secrets_models import Secrets
from openhands.core.config.openhands_config import OpenHandsConfig
-from openhands.storage.data_models.secrets import Secrets
class SecretsStore(ABC):
diff --git a/openhands/app_server/settings/file_settings_store.py b/openhands/app_server/settings/file_settings_store.py
index f22f19013e..f086b772b9 100644
--- a/openhands/app_server/settings/file_settings_store.py
+++ b/openhands/app_server/settings/file_settings_store.py
@@ -3,10 +3,10 @@ from __future__ import annotations
import json
from dataclasses import dataclass
+from openhands.app_server.settings.settings_models import Settings
from openhands.app_server.settings.settings_store import SettingsStore
from openhands.core.config.openhands_config import OpenHandsConfig
from openhands.storage import get_file_store
-from openhands.storage.data_models.settings import Settings
from openhands.storage.files import FileStore
from openhands.utils.async_utils import call_sync_from_async
diff --git a/openhands/storage/data_models/settings.py b/openhands/app_server/settings/settings_models.py
similarity index 87%
rename from openhands/storage/data_models/settings.py
rename to openhands/app_server/settings/settings_models.py
index e8ea079a83..634a838cad 100644
--- a/openhands/storage/data_models/settings.py
+++ b/openhands/app_server/settings/settings_models.py
@@ -1,3 +1,13 @@
+"""Settings models for OpenHands App Server.
+
+This module contains:
+- Settings: Persisted settings for OpenHands sessions
+- SandboxGroupingStrategy: Strategy enum for grouping conversations
+- GETSettingsModel: Settings response model with additional token data
+- POSTProviderModel: Settings for POST requests
+- CustomSecretWithoutValueModel: Custom secret model without value (legacy)
+"""
+
from __future__ import annotations
from enum import Enum
@@ -15,9 +25,11 @@ from pydantic import (
)
from openhands.core.config.llm_config import LLMConfig
+from openhands.core.config.mcp_config import MCPConfig
from openhands.core.config.utils import load_openhands_config
+from openhands.integrations.provider import ProviderToken
+from openhands.integrations.service_types import ProviderType
from openhands.sdk.settings import AgentSettings, ConversationSettings
-from openhands.storage.data_models.secrets import Secrets
from openhands.utils.jsonpatch_compat import deep_merge
@@ -102,10 +114,8 @@ class Settings(BaseModel):
language: str | None = None
user_version: int | None = None
remote_runtime_resource_factor: int | None = None
- # Planned to be removed from settings
- secrets_store: Annotated[Secrets, Field(frozen=True)] = Field(
- default_factory=Secrets
- )
+ # Planned to be removed from settings - import Secrets lazily to avoid circular imports
+ secrets_store: Annotated[Any, Field(frozen=True)] = Field(default=None)
enable_sound_notifications: bool = False
enable_proactive_conversation_starters: bool = True
user_consents_to_analytics: bool | None = None
@@ -130,6 +140,14 @@ class Settings(BaseModel):
model_config = ConfigDict(populate_by_name=True)
+ def __init__(self, **data: Any):
+ # Import Secrets here to avoid circular imports
+ from openhands.app_server.secrets.secrets_models import Secrets
+
+ if 'secrets_store' not in data or data['secrets_store'] is None:
+ data['secrets_store'] = Secrets()
+ super().__init__(**data)
+
@property
def llm_api_key_is_set(self) -> bool:
raw = self.agent_settings.llm.api_key
@@ -240,6 +258,9 @@ class Settings(BaseModel):
@classmethod
def _normalize_inputs(cls, data: dict | object) -> dict | object:
"""Normalize agent_settings and secrets_store inputs."""
+ # Import Secrets here to avoid circular imports
+ from openhands.app_server.secrets.secrets_models import Secrets
+
if not isinstance(data, dict):
return data
@@ -279,12 +300,12 @@ class Settings(BaseModel):
secret_store = secret_store.model_copy(
update={'custom_secrets': converted_store.custom_secrets}
)
- data['secret_store'] = secret_store
+ data['secrets_store'] = secret_store
return data
@field_serializer('secrets_store')
- def secrets_store_serializer(self, secrets: Secrets, info: SerializationInfo):
+ def secrets_store_serializer(self, secrets: Any, info: SerializationInfo):
return {'provider_tokens': {}}
# ── Factory methods ─────────────────────────────────────────────
@@ -379,3 +400,32 @@ class Settings(BaseModel):
if normalized_base == normalized_proxy:
llm['base_url'] = None
return data
+
+
+# ── Legacy V0 Models (scheduled for removal April 1, 2026) ──────────
+
+
+class POSTProviderModel(BaseModel):
+ """Settings for POST requests"""
+
+ mcp_config: MCPConfig | None = None
+ provider_tokens: dict[ProviderType, ProviderToken] = {}
+
+
+class GETSettingsModel(Settings):
+ """Settings with additional token data for the frontend"""
+
+ provider_tokens_set: dict[ProviderType, str | None] | None = (
+ None # provider + base_domain key-value pair
+ )
+ llm_api_key_set: bool
+ search_api_key_set: bool = False
+
+ model_config = ConfigDict(use_enum_values=True)
+
+
+class CustomSecretWithoutValueModel(BaseModel):
+ """Custom secret model without value"""
+
+ name: str
+ description: str | None = None
diff --git a/openhands/app_server/settings/settings_router.py b/openhands/app_server/settings/settings_router.py
index c28564e33e..f92618246b 100644
--- a/openhands/app_server/settings/settings_router.py
+++ b/openhands/app_server/settings/settings_router.py
@@ -9,7 +9,12 @@ from typing import Any
from fastapi import APIRouter, Depends, status
from fastapi.responses import JSONResponse
+from openhands.app_server.secrets.secrets_models import Secrets
from openhands.app_server.secrets.secrets_store import SecretsStore
+from openhands.app_server.settings.settings_models import (
+ GETSettingsModel,
+ Settings,
+)
from openhands.app_server.settings.settings_store import SettingsStore
from openhands.app_server.utils.dependencies import get_dependencies
from openhands.core.logger import openhands_logger as logger
@@ -18,9 +23,6 @@ from openhands.integrations.provider import (
ProviderType,
)
from openhands.sdk.settings import AgentSettings, ConversationSettings
-from openhands.server.settings import (
- GETSettingsModel,
-)
from openhands.server.shared import config
from openhands.server.user_auth import (
get_provider_tokens,
@@ -28,8 +30,6 @@ from openhands.server.user_auth import (
get_user_settings,
get_user_settings_store,
)
-from openhands.storage.data_models.secrets import Secrets
-from openhands.storage.data_models.settings import Settings
from openhands.utils.llm import (
get_provider_api_base,
is_openhands_model,
diff --git a/openhands/app_server/settings/settings_store.py b/openhands/app_server/settings/settings_store.py
index 05b394d0a9..d240473b41 100644
--- a/openhands/app_server/settings/settings_store.py
+++ b/openhands/app_server/settings/settings_store.py
@@ -2,8 +2,8 @@ from __future__ import annotations
from abc import ABC, abstractmethod
+from openhands.app_server.settings.settings_models import Settings
from openhands.core.config.openhands_config import OpenHandsConfig
-from openhands.storage.data_models.settings import Settings
class SettingsStore(ABC):
diff --git a/openhands/app_server/user/user_models.py b/openhands/app_server/user/user_models.py
index d97479ceab..88fbfb8a89 100644
--- a/openhands/app_server/user/user_models.py
+++ b/openhands/app_server/user/user_models.py
@@ -1,5 +1,5 @@
+from openhands.app_server.settings.settings_models import Settings
from openhands.integrations.provider import PROVIDER_TOKEN_TYPE
-from openhands.storage.data_models.settings import Settings
class UserInfo(Settings):
diff --git a/openhands/core/setup.py b/openhands/core/setup.py
index c81336e559..fa633acab5 100644
--- a/openhands/core/setup.py
+++ b/openhands/core/setup.py
@@ -11,6 +11,7 @@ import uuid
from pydantic import SecretStr
+from openhands.app_server.secrets.secrets_models import Secrets
from openhands.core.config import (
OpenHandsConfig,
)
@@ -18,7 +19,6 @@ from openhands.integrations.provider import (
ProviderToken,
ProviderType,
)
-from openhands.storage.data_models.secrets import Secrets
def get_provider_tokens():
diff --git a/openhands/server/settings.py b/openhands/server/settings.py
deleted file mode 100644
index f5eb73aaca..0000000000
--- a/openhands/server/settings.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# IMPORTANT: LEGACY V0 CODE - Deprecated since version 1.0.0, scheduled for removal April 1, 2026
-# This file is part of the legacy (V0) implementation of OpenHands and will be removed soon as we complete the migration to V1.
-# OpenHands V1 uses the Software Agent SDK for the agentic core and runs a new application server. Please refer to:
-# - V1 agentic core (SDK): https://github.com/OpenHands/software-agent-sdk
-# - V1 application server (in this repo): openhands/app_server/
-# Unless you are working on deprecation, please avoid extending this legacy file and consult the V1 codepaths above.
-# Tag: Legacy-V0
-# This module belongs to the old V0 web server. The V1 application server lives under openhands/app_server/.
-from __future__ import annotations
-
-from pydantic import (
- BaseModel,
- ConfigDict,
-)
-
-from openhands.core.config.mcp_config import MCPConfig
-from openhands.integrations.provider import ProviderToken
-from openhands.integrations.service_types import ProviderType
-from openhands.storage.data_models.settings import Settings
-
-
-class POSTProviderModel(BaseModel):
- """Settings for POST requests"""
-
- mcp_config: MCPConfig | None = None
- provider_tokens: dict[ProviderType, ProviderToken] = {}
-
-
-class GETSettingsModel(Settings):
- """Settings with additional token data for the frontend"""
-
- provider_tokens_set: dict[ProviderType, str | None] | None = (
- None # provider + base_domain key-value pair
- )
- llm_api_key_set: bool
- search_api_key_set: bool = False
-
- model_config = ConfigDict(use_enum_values=True)
-
-
-class CustomSecretWithoutValueModel(BaseModel):
- """Custom secret model without value"""
-
- name: str
- description: str | None = None
diff --git a/openhands/server/user_auth/__init__.py b/openhands/server/user_auth/__init__.py
index 59dc67185a..2aac3e3b6d 100644
--- a/openhands/server/user_auth/__init__.py
+++ b/openhands/server/user_auth/__init__.py
@@ -2,12 +2,12 @@ from fastapi import Depends, Request
from fastapi.security import APIKeyHeader
from pydantic import SecretStr
+from openhands.app_server.secrets.secrets_models import Secrets
from openhands.app_server.secrets.secrets_store import SecretsStore
+from openhands.app_server.settings.settings_models import Settings
from openhands.app_server.settings.settings_store import SettingsStore
from openhands.integrations.provider import PROVIDER_TOKEN_TYPE
-from openhands.server.settings import Settings
from openhands.server.user_auth.user_auth import AuthType, get_user_auth
-from openhands.storage.data_models.secrets import Secrets
async 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.py
index 1fb0cb8a54..318c57e93e 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 dataclass
from fastapi import Request
from pydantic import SecretStr
+from openhands.app_server.secrets.secrets_models import Secrets
from openhands.app_server.secrets.secrets_store import SecretsStore
+from openhands.app_server.settings.settings_models import Settings
from openhands.app_server.settings.settings_store import SettingsStore
from openhands.integrations.provider import PROVIDER_TOKEN_TYPE
from openhands.server import shared
-from openhands.server.settings import Settings
from openhands.server.user_auth.user_auth import UserAuth
-from openhands.storage.data_models.secrets import Secrets
@dataclass
diff --git a/openhands/server/user_auth/user_auth.py b/openhands/server/user_auth/user_auth.py
index 922069d6e7..08d3219e63 100644
--- a/openhands/server/user_auth/user_auth.py
+++ b/openhands/server/user_auth/user_auth.py
@@ -14,13 +14,13 @@ from enum import Enum
from fastapi import Request
from pydantic import SecretStr
+from openhands.app_server.secrets.secrets_models import Secrets
from openhands.app_server.secrets.secrets_store import SecretsStore
+from openhands.app_server.settings.settings_models import Settings
from openhands.app_server.settings.settings_store import SettingsStore
from openhands.integrations.provider import PROVIDER_TOKEN_TYPE, ProviderHandler
from openhands.integrations.service_types import UserGitInfo
-from openhands.server.settings import Settings
from openhands.server.shared import server_config
-from openhands.storage.data_models.secrets import Secrets
from openhands.utils.import_utils import get_impl
diff --git a/openhands/storage/data_models/secrets.py b/openhands/storage/data_models/secrets.py
deleted file mode 100644
index 5f62dbf2bb..0000000000
--- a/openhands/storage/data_models/secrets.py
+++ /dev/null
@@ -1,160 +0,0 @@
-from collections.abc import Mapping
-from types import MappingProxyType
-from typing import Any
-
-from pydantic import (
- BaseModel,
- ConfigDict,
- Field,
- SerializationInfo,
- field_serializer,
- field_validator,
- model_validator,
-)
-from pydantic.json import pydantic_encoder
-
-from openhands.integrations.provider import (
- CUSTOM_SECRETS_TYPE,
- PROVIDER_TOKEN_TYPE,
- CustomSecret,
- ProviderToken,
-)
-from openhands.integrations.service_types import ProviderType
-
-
-class Secrets(BaseModel):
- provider_tokens: PROVIDER_TOKEN_TYPE = Field(
- default_factory=lambda: MappingProxyType({})
- )
-
- custom_secrets: CUSTOM_SECRETS_TYPE = Field(
- default_factory=lambda: MappingProxyType({})
- )
-
- model_config = ConfigDict(
- frozen=True,
- validate_assignment=True,
- arbitrary_types_allowed=True,
- )
-
- @field_validator('provider_tokens', 'custom_secrets')
- @classmethod
- def immutable_validator(cls, value: Mapping) -> MappingProxyType:
- return MappingProxyType(value)
-
- @field_serializer('provider_tokens')
- def provider_tokens_serializer(
- self, provider_tokens: PROVIDER_TOKEN_TYPE, info: SerializationInfo
- ) -> dict[str, dict[str, str | Any]]:
- tokens = {}
- expose_secrets = info.context and info.context.get('expose_secrets', False)
-
- for token_type, provider_token in provider_tokens.items():
- if not provider_token or not provider_token.token:
- continue
-
- token_type_str = (
- token_type.value
- if isinstance(token_type, ProviderType)
- else str(token_type)
- )
-
- token = None
- if provider_token.token:
- token = (
- provider_token.token.get_secret_value()
- if expose_secrets
- else pydantic_encoder(provider_token.token)
- )
-
- tokens[token_type_str] = {
- 'token': token,
- 'host': provider_token.host,
- 'user_id': provider_token.user_id,
- }
-
- return tokens
-
- @field_serializer('custom_secrets')
- def custom_secrets_serializer(
- self, custom_secrets: CUSTOM_SECRETS_TYPE, info: SerializationInfo
- ):
- secrets = {}
- expose_secrets = info.context and info.context.get('expose_secrets', False)
-
- if custom_secrets:
- for secret_name, secret_value in custom_secrets.items():
- secrets[secret_name] = {
- 'secret': secret_value.secret.get_secret_value()
- if expose_secrets
- else pydantic_encoder(secret_value.secret),
- 'description': secret_value.description,
- }
-
- return secrets
-
- @model_validator(mode='before')
- @classmethod
- def convert_dict_to_mappingproxy(
- cls, data: dict[str, dict[str, Any] | MappingProxyType] | PROVIDER_TOKEN_TYPE
- ) -> dict[str, MappingProxyType | None]:
- """Custom deserializer to convert dictionary into MappingProxyType"""
- if not isinstance(data, dict):
- raise ValueError('Secrets must be initialized with a dictionary')
-
- new_data: dict[str, MappingProxyType | None] = {}
-
- if 'provider_tokens' in data:
- tokens = data['provider_tokens']
- if isinstance(
- tokens, dict
- ): # Ensure conversion happens only for dict inputs
- converted_tokens = {}
- for key, value in tokens.items():
- try:
- provider_type = (
- ProviderType(key) if isinstance(key, str) else key
- )
- converted_tokens[provider_type] = ProviderToken.from_value(
- value
- )
- except ValueError:
- # Skip invalid provider types or tokens
- continue
-
- # Convert to MappingProxyType
- new_data['provider_tokens'] = MappingProxyType(converted_tokens)
- elif isinstance(tokens, MappingProxyType):
- new_data['provider_tokens'] = tokens
-
- if 'custom_secrets' in data:
- secrets = data['custom_secrets']
- if isinstance(secrets, dict):
- converted_secrets = {}
- for key, value in secrets.items():
- try:
- converted_secrets[key] = CustomSecret.from_value(value)
- except ValueError:
- continue
-
- new_data['custom_secrets'] = MappingProxyType(converted_secrets)
- elif isinstance(secrets, MappingProxyType):
- new_data['custom_secrets'] = secrets
-
- return new_data
-
- def get_env_vars(self) -> dict[str, str]:
- secret_store = self.model_dump(context={'expose_secrets': True})
- custom_secrets = secret_store.get('custom_secrets', {})
- secrets = {}
- for secret_name, value in custom_secrets.items():
- secrets[secret_name] = value['secret']
-
- return secrets
-
- def get_custom_secrets_descriptions(self) -> dict[str, str]:
- secrets = {}
- for secret_name, secret in self.custom_secrets.items():
- secrets[secret_name] = secret.description
-
- return secrets
diff --git a/openhands/utils/utils.py b/openhands/utils/utils.py
index 5ed33e0361..dcedd81d38 100644
--- a/openhands/utils/utils.py
+++ b/openhands/utils/utils.py
@@ -3,8 +3,8 @@ from copy import deepcopy
from pydantic import SecretStr
+from openhands.app_server.settings.settings_models import Settings
from openhands.core.config.openhands_config import OpenHandsConfig
-from openhands.storage.data_models.settings import Settings
from openhands.utils.environment import get_effective_llm_base_url
diff --git a/tests/unit/app_server/test_live_status_app_conversation_service.py b/tests/unit/app_server/test_live_status_app_conversation_service.py
index 759f208fe2..1716094e53 100644
--- a/tests/unit/app_server/test_live_status_app_conversation_service.py
+++ b/tests/unit/app_server/test_live_status_app_conversation_service.py
@@ -34,6 +34,10 @@ from openhands.app_server.sandbox.sandbox_models import (
SandboxStatus,
)
from openhands.app_server.sandbox.sandbox_spec_models import SandboxSpecInfo
+from openhands.app_server.settings.settings_models import (
+ SandboxGroupingStrategy,
+ Settings,
+)
from openhands.app_server.user.user_context import UserContext
from openhands.integrations.provider import ProviderToken, ProviderType
from openhands.integrations.service_types import SuggestedTask, TaskType
@@ -43,7 +47,6 @@ from openhands.sdk.secret import LookupSecret, StaticSecret
from openhands.sdk.settings import AgentSettings, ConversationSettings
from openhands.sdk.workspace.remote.async_remote_workspace import AsyncRemoteWorkspace
from openhands.server.types import AppMode
-from openhands.storage.data_models.settings import SandboxGroupingStrategy, Settings
def _build_test_user_agent_settings(user: SimpleNamespace) -> AgentSettings:
diff --git a/tests/unit/app_server/test_secrets_api.py b/tests/unit/app_server/test_secrets_api.py
index 78fc7f564f..fd8eb023cb 100644
--- a/tests/unit/app_server/test_secrets_api.py
+++ b/tests/unit/app_server/test_secrets_api.py
@@ -10,6 +10,7 @@ from fastapi.testclient import TestClient
from pydantic import SecretStr
from openhands.app_server.secrets.file_secrets_store import FileSecretsStore
+from openhands.app_server.secrets.secrets_models import Secrets
from openhands.app_server.secrets.secrets_router import (
router as secrets_router,
)
@@ -19,7 +20,6 @@ from openhands.integrations.provider import (
ProviderType,
)
from openhands.storage import get_file_store
-from openhands.storage.data_models.secrets import Secrets
@pytest.fixture
diff --git a/tests/unit/app_server/test_settings_api.py b/tests/unit/app_server/test_settings_api.py
index 42a822a77a..7522422c63 100644
--- a/tests/unit/app_server/test_settings_api.py
+++ b/tests/unit/app_server/test_settings_api.py
@@ -6,8 +6,10 @@ from fastapi import Request
from fastapi.testclient import TestClient
from pydantic import SecretStr
+from openhands.app_server.secrets.secrets_models import Secrets
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_models import Settings
from openhands.app_server.settings.settings_store import SettingsStore
from openhands.integrations.provider import ProviderToken, ProviderType
from openhands.integrations.service_types import UserGitInfo
@@ -19,8 +21,6 @@ from openhands.sdk.settings import (
)
from openhands.server.app import app
from openhands.server.user_auth.user_auth import UserAuth
-from openhands.storage.data_models.secrets import Secrets
-from openhands.storage.data_models.settings import Settings
from openhands.storage.memory import InMemoryFileStore
_EXPOSE = {'expose_secrets': True}
diff --git a/tests/unit/core/config/test_mcp_settings_merge.py b/tests/unit/core/config/test_mcp_settings_merge.py
index 79969a4a68..842c6e03e9 100644
--- a/tests/unit/core/config/test_mcp_settings_merge.py
+++ b/tests/unit/core/config/test_mcp_settings_merge.py
@@ -5,6 +5,7 @@ from unittest.mock import patch
import pytest
+from openhands.app_server.settings.settings_models import Settings
from openhands.core.config.mcp_config import (
MCPConfig,
RemoteMCPServer,
@@ -12,7 +13,6 @@ from openhands.core.config.mcp_config import (
)
from openhands.sdk.llm import LLM
from openhands.sdk.settings import AgentSettings
-from openhands.storage.data_models.settings import Settings
@pytest.fixture(autouse=True)
@@ -52,7 +52,7 @@ async def test_mcp_settings_merge_config_only():
frontend_settings = Settings(agent_settings=AgentSettings(llm=LLM(model='gpt-4')))
with patch(
- 'openhands.storage.data_models.settings.Settings.from_config',
+ 'openhands.app_server.settings.settings_models.Settings.from_config',
return_value=mock_config_settings,
):
merged_settings = frontend_settings.merge_with_config_settings()
@@ -83,7 +83,7 @@ async def test_mcp_settings_merge_frontend_only():
)
with patch(
- 'openhands.storage.data_models.settings.Settings.from_config',
+ 'openhands.app_server.settings.settings_models.Settings.from_config',
return_value=mock_config_settings,
):
merged_settings = frontend_settings.merge_with_config_settings()
@@ -122,7 +122,7 @@ async def test_mcp_settings_merge_both_present():
)
with patch(
- 'openhands.storage.data_models.settings.Settings.from_config',
+ 'openhands.app_server.settings.settings_models.Settings.from_config',
return_value=mock_config_settings,
):
merged_settings = frontend_settings.merge_with_config_settings()
@@ -154,7 +154,7 @@ async def test_mcp_settings_merge_no_config():
)
with patch(
- 'openhands.storage.data_models.settings.Settings.from_config',
+ 'openhands.app_server.settings.settings_models.Settings.from_config',
return_value=mock_config_settings,
):
merged_settings = frontend_settings.merge_with_config_settings()
@@ -175,7 +175,7 @@ async def test_mcp_settings_merge_neither_present():
frontend_settings = Settings(agent_settings=AgentSettings(llm=LLM(model='gpt-4')))
with patch(
- 'openhands.storage.data_models.settings.Settings.from_config',
+ 'openhands.app_server.settings.settings_models.Settings.from_config',
return_value=mock_config_settings,
):
merged_settings = frontend_settings.merge_with_config_settings()
diff --git a/tests/unit/integrations/bitbucket/test_bitbucket.py b/tests/unit/integrations/bitbucket/test_bitbucket.py
index 21cf7eac22..65c8b2d72e 100644
--- a/tests/unit/integrations/bitbucket/test_bitbucket.py
+++ b/tests/unit/integrations/bitbucket/test_bitbucket.py
@@ -6,12 +6,12 @@ import pytest
from pydantic import SecretStr
from openhands.app_server.secrets.secrets_router import check_provider_tokens
+from openhands.app_server.settings.settings_models import POSTProviderModel
from openhands.integrations.bitbucket.bitbucket_service import BitBucketService
from openhands.integrations.provider import ProviderToken, ProviderType
from openhands.integrations.service_types import OwnerType, Repository
from openhands.integrations.service_types import ProviderType as ServiceProviderType
from openhands.integrations.utils import validate_provider_token
-from openhands.server.settings import POSTProviderModel
from openhands.server.types import AppMode
diff --git a/tests/unit/integrations/test_provider_immutability.py b/tests/unit/integrations/test_provider_immutability.py
index f9d98012f5..0f82fc2c3e 100644
--- a/tests/unit/integrations/test_provider_immutability.py
+++ b/tests/unit/integrations/test_provider_immutability.py
@@ -4,13 +4,13 @@ from unittest.mock import AsyncMock, patch
import pytest
from pydantic import SecretStr, ValidationError
+from openhands.app_server.secrets.secrets_models import Secrets
+from openhands.app_server.settings.settings_models import Settings
from openhands.integrations.provider import (
ProviderHandler,
ProviderToken,
ProviderType,
)
-from openhands.storage.data_models.secrets import Secrets
-from openhands.storage.data_models.settings import Settings
def test_provider_token_immutability():
diff --git a/tests/unit/mcp/test_mcp_integration.py b/tests/unit/mcp/test_mcp_integration.py
index 62e84d045a..9ced3b55b0 100644
--- a/tests/unit/mcp/test_mcp_integration.py
+++ b/tests/unit/mcp/test_mcp_integration.py
@@ -5,11 +5,11 @@ from unittest.mock import AsyncMock, patch
import pytest
from openhands.app_server.settings.file_settings_store import FileSettingsStore
+from openhands.app_server.settings.settings_models import Settings
from openhands.core.config.mcp_config import MCPConfig, RemoteMCPServer
from openhands.sdk.llm import LLM
from openhands.sdk.settings import AgentSettings
from openhands.server.user_auth.default_user_auth import DefaultUserAuth
-from openhands.storage.data_models.settings import Settings
def _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.py
index 47940c86d4..a929d5b3be 100644
--- a/tests/unit/server/routes/test_skills_api.py
+++ b/tests/unit/server/routes/test_skills_api.py
@@ -7,6 +7,7 @@ from fastapi import Request
from fastapi.testclient import TestClient
from pydantic import SecretStr
+from openhands.app_server.secrets.secrets_models import Secrets
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 SettingsStore
@@ -14,7 +15,6 @@ from openhands.integrations.provider import ProviderToken, ProviderType
from openhands.integrations.service_types import UserGitInfo
from openhands.server.app import app
from openhands.server.user_auth.user_auth import UserAuth
-from openhands.storage.data_models.secrets import Secrets
from openhands.storage.memory import InMemoryFileStore
diff --git a/tests/unit/server/test_openapi_schema_generation.py b/tests/unit/server/test_openapi_schema_generation.py
index feb0dcd884..8526c6164e 100644
--- a/tests/unit/server/test_openapi_schema_generation.py
+++ b/tests/unit/server/test_openapi_schema_generation.py
@@ -6,6 +6,7 @@ from fastapi import Request
from fastapi.testclient import TestClient
from pydantic import SecretStr
+from openhands.app_server.secrets.secrets_models import Secrets
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 SettingsStore
@@ -13,7 +14,6 @@ from openhands.integrations.provider import ProviderToken, ProviderType
from openhands.integrations.service_types import UserGitInfo
from openhands.server.app import app
from openhands.server.user_auth.user_auth import UserAuth
-from openhands.storage.data_models.secrets import Secrets
from openhands.storage.memory import InMemoryFileStore
diff --git a/tests/unit/storage/data_models/test_secret_store.py b/tests/unit/storage/data_models/test_secret_store.py
index 9e67dc025a..e64a0657c1 100644
--- a/tests/unit/storage/data_models/test_secret_store.py
+++ b/tests/unit/storage/data_models/test_secret_store.py
@@ -5,12 +5,12 @@ from typing import Any
from pydantic import SecretStr
+from openhands.app_server.secrets.secrets_models import Secrets
from openhands.integrations.provider import (
CustomSecret,
ProviderToken,
ProviderType,
)
-from openhands.storage.data_models.secrets import Secrets
class TestSecrets:
diff --git a/tests/unit/storage/data_models/test_settings.py b/tests/unit/storage/data_models/test_settings.py
index 3d0318a4d6..a2665718d3 100644
--- a/tests/unit/storage/data_models/test_settings.py
+++ b/tests/unit/storage/data_models/test_settings.py
@@ -5,6 +5,7 @@ import pytest
from fastmcp.mcp_config import MCPConfig
from pydantic import SecretStr
+from openhands.app_server.settings.settings_models import Settings
from openhands.app_server.settings.settings_router import LITE_LLM_API_URL
from openhands.core.config.llm_config import LLMConfig
from openhands.core.config.openhands_config import OpenHandsConfig
@@ -17,7 +18,6 @@ from openhands.sdk.settings import (
ConversationSettings,
)
from openhands.sdk.settings.model import CondenserSettings, VerificationSettings
-from openhands.storage.data_models.settings import Settings
def test_settings_from_config():
@@ -39,7 +39,7 @@ def test_settings_from_config():
)
with patch(
- 'openhands.storage.data_models.settings.load_openhands_config',
+ 'openhands.app_server.settings.settings_models.load_openhands_config',
return_value=mock_app_config,
):
settings = Settings.from_config()
@@ -74,7 +74,7 @@ def test_settings_from_config_no_api_key():
)
with patch(
- 'openhands.storage.data_models.settings.load_openhands_config',
+ 'openhands.app_server.settings.settings_models.load_openhands_config',
return_value=mock_app_config,
):
settings = Settings.from_config()
@@ -338,9 +338,9 @@ def test_settings_no_pydantic_frozen_field_warning():
import importlib
- import openhands.storage.data_models.settings
+ import openhands.app_server.settings.settings_models
- importlib.reload(openhands.storage.data_models.settings)
+ importlib.reload(openhands.app_server.settings.settings_models)
frozen_warnings = [
warning for warning in w if 'frozen' in str(warning.message).lower()
diff --git a/tests/unit/storage/settings/test_file_settings_store.py b/tests/unit/storage/settings/test_file_settings_store.py
index 8d00ef46e7..552b38219a 100644
--- a/tests/unit/storage/settings/test_file_settings_store.py
+++ b/tests/unit/storage/settings/test_file_settings_store.py
@@ -5,10 +5,10 @@ import pytest
from pydantic import SecretStr
from openhands.app_server.settings.file_settings_store import FileSettingsStore
+from openhands.app_server.settings.settings_models import Settings
from openhands.core.config.openhands_config import OpenHandsConfig
from openhands.sdk.llm import LLM
from openhands.sdk.settings import AgentSettings, ConversationSettings
-from openhands.storage.data_models.settings import Settings
from openhands.storage.files import FileStore
@@ -31,7 +31,7 @@ def file_settings_store(mock_file_store):
@pytest.mark.asyncio
async def test_load_nonexistent_data(file_settings_store):
with patch(
- 'openhands.storage.data_models.settings.load_openhands_config',
+ 'openhands.app_server.settings.settings_models.load_openhands_config',
MagicMock(return_value=OpenHandsConfig()),
):
file_settings_store.file_store.read.side_effect = FileNotFoundError()