Refactor: rename user secrets table to custom secrets (#11525)

Co-authored-by: openhands <openhands@all-hands.dev>

tests/unit/server/data_models/test_conversation.py

@@ -82,7 +82,7 @@ def test_client():
 def create_new_test_conversation(
     test_request: InitSessionRequest, auth_type: AuthType | None = None
 ):
-    # Create a mock UserSecrets object with the required custom_secrets attribute
+    # Create a mock Secrets object with the required custom_secrets attribute
     mock_user_secrets = MagicMock()
     mock_user_secrets.custom_secrets = MappingProxyType({})
 

tests/unit/server/routes/test_secrets_api.py

@@ -18,7 +18,7 @@ from openhands.server.routes.secrets import (
     app as secrets_app,
 )
 from openhands.storage import get_file_store
-from openhands.storage.data_models.user_secrets import UserSecrets
+from openhands.storage.data_models.secrets import Secrets
 from openhands.storage.secrets.file_secrets_store import FileSecretsStore
 
 
@@ -62,7 +62,7 @@ async def test_load_custom_secrets_names(test_client, file_secrets_store):
     provider_tokens = {
         ProviderType.GITHUB: ProviderToken(token=SecretStr('github-token'))
     }
-    user_secrets = UserSecrets(
+    user_secrets = Secrets(
         custom_secrets=custom_secrets, provider_tokens=provider_tokens
     )
 
@@ -101,7 +101,7 @@ async def test_load_custom_secrets_names_empty(test_client, file_secrets_store):
     provider_tokens = {
         ProviderType.GITHUB: ProviderToken(token=SecretStr('github-token'))
     }
-    user_secrets = UserSecrets(provider_tokens=provider_tokens, custom_secrets={})
+    user_secrets = Secrets(provider_tokens=provider_tokens, custom_secrets={})
 
     # Store the initial settings
     await file_secrets_store.store(user_secrets)
@@ -123,7 +123,7 @@ async def test_add_custom_secret(test_client, file_secrets_store):
     provider_tokens = {
         ProviderType.GITHUB: ProviderToken(token=SecretStr('github-token'))
     }
-    user_secrets = UserSecrets(provider_tokens=provider_tokens)
+    user_secrets = Secrets(provider_tokens=provider_tokens)
 
     # Store the initial settings
     await file_secrets_store.store(user_secrets)
@@ -184,7 +184,7 @@ async def test_update_existing_custom_secret(test_client, file_secrets_store):
     provider_tokens = {
         ProviderType.GITHUB: ProviderToken(token=SecretStr('github-token'))
     }
-    user_secrets = UserSecrets(
+    user_secrets = Secrets(
         custom_secrets=custom_secrets, provider_tokens=provider_tokens
     )
 
@@ -223,7 +223,7 @@ async def test_add_multiple_custom_secrets(test_client, file_secrets_store):
     provider_tokens = {
         ProviderType.GITHUB: ProviderToken(token=SecretStr('github-token'))
     }
-    user_secrets = UserSecrets(
+    user_secrets = Secrets(
         custom_secrets=custom_secrets, provider_tokens=provider_tokens
     )
 
@@ -285,7 +285,7 @@ async def test_delete_custom_secret(test_client, file_secrets_store):
     provider_tokens = {
         ProviderType.GITHUB: ProviderToken(token=SecretStr('github-token'))
     }
-    user_secrets = UserSecrets(
+    user_secrets = Secrets(
         custom_secrets=custom_secrets, provider_tokens=provider_tokens
     )
 
@@ -323,7 +323,7 @@ async def test_delete_nonexistent_custom_secret(test_client, file_secrets_store)
     provider_tokens = {
         ProviderType.GITHUB: ProviderToken(token=SecretStr('github-token'))
     }
-    user_secrets = UserSecrets(
+    user_secrets = Secrets(
         custom_secrets=custom_secrets, provider_tokens=provider_tokens
     )
 
@@ -355,7 +355,7 @@ async def test_add_git_providers_with_host(test_client, file_secrets_store):
     provider_tokens = {
         ProviderType.GITHUB: ProviderToken(token=SecretStr('github-token'))
     }
-    user_secrets = UserSecrets(provider_tokens=provider_tokens)
+    user_secrets = Secrets(provider_tokens=provider_tokens)
     await file_secrets_store.store(user_secrets)
 
     # Mock check_provider_tokens to return empty string (no error)
@@ -394,7 +394,7 @@ async def test_add_git_providers_update_host_only(test_client, file_secrets_stor
             token=SecretStr('github-token'), host='github.com'
         )
     }
-    user_secrets = UserSecrets(provider_tokens=provider_tokens)
+    user_secrets = Secrets(provider_tokens=provider_tokens)
     await file_secrets_store.store(user_secrets)
 
     # Mock check_provider_tokens to return empty string (no error)
@@ -433,7 +433,7 @@ async def test_add_git_providers_invalid_token_with_host(
 ):
     """Test adding an invalid token with a host."""
     # Create initial user secrets
-    user_secrets = UserSecrets()
+    user_secrets = Secrets()
     await file_secrets_store.store(user_secrets)
 
     # Mock validate_provider_token to return None (invalid token)
@@ -456,7 +456,7 @@ async def test_add_git_providers_invalid_token_with_host(
 async def test_add_multiple_git_providers_with_hosts(test_client, file_secrets_store):
     """Test adding multiple git providers with different hosts."""
     # Create initial user secrets
-    user_secrets = UserSecrets()
+    user_secrets = Secrets()
     await file_secrets_store.store(user_secrets)
 
     # Mock check_provider_tokens to return empty string (no error)

tests/unit/server/routes/test_settings_api.py

@@ -9,7 +9,7 @@ from pydantic import SecretStr
 from openhands.integrations.provider import ProviderToken, ProviderType
 from openhands.server.app import app
 from openhands.server.user_auth.user_auth import UserAuth
-from openhands.storage.data_models.user_secrets import UserSecrets
+from openhands.storage.data_models.secrets import Secrets
 from openhands.storage.memory import InMemoryFileStore
 from openhands.storage.secrets.secrets_store import SecretsStore
 from openhands.storage.settings.file_settings_store import FileSettingsStore
@@ -43,7 +43,7 @@ class MockUserAuth(UserAuth):
     async def get_secrets_store(self) -> SecretsStore | None:
         return None
 
-    async def get_user_secrets(self) -> UserSecrets | None:
+    async def get_secrets(self) -> Secrets | None:
         return None
 
     @classmethod

tests/unit/server/routes/test_settings_store_functions.py

@@ -14,8 +14,8 @@ from openhands.server.routes.secrets import (
 from openhands.server.routes.settings import store_llm_settings
 from openhands.server.settings import POSTProviderModel
 from openhands.storage import get_file_store
+from openhands.storage.data_models.secrets import Secrets
 from openhands.storage.data_models.settings import Settings
-from openhands.storage.data_models.user_secrets import UserSecrets
 from openhands.storage.secrets.file_secrets_store import FileSecretsStore
 
 
@@ -220,9 +220,9 @@ async def test_store_provider_tokens_new_tokens(test_client, file_secrets_store)
     mock_store = MagicMock()
     mock_store.load = AsyncMock(return_value=None)  # No existing settings
 
-    UserSecrets()
+    Secrets()
 
-    user_secrets = await file_secrets_store.store(UserSecrets())
+    user_secrets = await file_secrets_store.store(Secrets())
 
     response = test_client.post('/api/add-git-providers', json=provider_tokens)
     assert response.status_code == 200
@@ -242,8 +242,8 @@ async def test_store_provider_tokens_update_existing(test_client, file_secrets_s
     github_token = ProviderToken(token=SecretStr('old-token'))
     provider_tokens = {ProviderType.GITHUB: github_token}
 
-    # Create a UserSecrets with the provider tokens
-    user_secrets = UserSecrets(provider_tokens=provider_tokens)
+    # Create a Secrets with the provider tokens
+    user_secrets = Secrets(provider_tokens=provider_tokens)
 
     await file_secrets_store.store(user_secrets)
 
@@ -268,7 +268,7 @@ async def test_store_provider_tokens_keep_existing(test_client, file_secrets_sto
     # Create existing secrets with a GitHub token
     github_token = ProviderToken(token=SecretStr('existing-token'))
     provider_tokens = {ProviderType.GITHUB: github_token}
-    user_secrets = UserSecrets(provider_tokens=provider_tokens)
+    user_secrets = Secrets(provider_tokens=provider_tokens)
 
     await file_secrets_store.store(user_secrets)
 

tests/unit/server/test_openapi_schema_generation.py

@@ -9,7 +9,7 @@ from pydantic import SecretStr
 from openhands.integrations.provider import ProviderToken, ProviderType
 from openhands.server.app import app
 from openhands.server.user_auth.user_auth import UserAuth
-from openhands.storage.data_models.user_secrets import UserSecrets
+from openhands.storage.data_models.secrets import Secrets
 from openhands.storage.memory import InMemoryFileStore
 from openhands.storage.secrets.secrets_store import SecretsStore
 from openhands.storage.settings.file_settings_store import FileSettingsStore
@@ -43,7 +43,7 @@ class MockUserAuth(UserAuth):
     async def get_secrets_store(self) -> SecretsStore | None:
         return None
 
-    async def get_user_secrets(self) -> UserSecrets | None:
+    async def get_secrets(self) -> Secrets | None:
         return None
 
     @classmethod