Fix git secrets (#8258)

Co-authored-by: rohitvinodmalhotra@gmail.com <rohitvinodmalhotra@gmail.com>

openhands/server/config/server_config.py

@@ -16,7 +16,7 @@ class ServerConfig(ServerConfigInterface):
         'openhands.storage.settings.file_settings_store.FileSettingsStore'
     )
     secret_store_class: str = (
-        'openhands.storage.settings.file_secrets_store.FileSecretsStore'
+        'openhands.storage.secrets.file_secrets_store.FileSecretsStore'
     )
     conversation_store_class: str = (
         'openhands.storage.conversation.file_conversation_store.FileConversationStore'

openhands/server/routes/secrets.py

@@ -14,7 +14,7 @@ from openhands.server.user_auth import (
 )
 from openhands.storage.data_models.settings import Settings
 from openhands.storage.data_models.user_secrets import UserSecrets
-from openhands.storage.settings.secret_store import SecretsStore
+from openhands.storage.secrets.secrets_store import SecretsStore
 from openhands.storage.settings.settings_store import SettingsStore
 
 app = APIRouter(prefix='/api')
@@ -78,34 +78,31 @@ async def store_provider_tokens(
 
     try:
         user_secrets = await secrets_store.load()
+        if not user_secrets:
+            user_secrets = UserSecrets()
 
-        if user_secrets:
-            if provider_info.provider_tokens:
-                existing_providers = [
-                    provider for provider in user_secrets.provider_tokens
-                ]
+        if provider_info.provider_tokens:
+            existing_providers = [provider for provider in user_secrets.provider_tokens]
 
-                # Merge incoming settings store with the existing one
-                for provider, token_value in list(
-                    provider_info.provider_tokens.items()
-                ):
-                    if provider in existing_providers and not token_value.token:
-                        existing_token = user_secrets.provider_tokens.get(provider)
-                        if existing_token and existing_token.token:
-                            provider_info.provider_tokens[provider] = existing_token
+            # Merge incoming settings store with the existing one
+            for provider, token_value in list(provider_info.provider_tokens.items()):
+                if provider in existing_providers and not token_value.token:
+                    existing_token = user_secrets.provider_tokens.get(provider)
+                    if existing_token and existing_token.token:
+                        provider_info.provider_tokens[provider] = existing_token
 
-            else:  # nothing passed in means keep current settings
-                provider_info.provider_tokens = dict(user_secrets.provider_tokens)
+        else:  # nothing passed in means keep current settings
+            provider_info.provider_tokens = dict(user_secrets.provider_tokens)
 
-            updated_secrets = user_secrets.model_copy(
-                update={'provider_tokens': provider_info.provider_tokens}
-            )
-            await secrets_store.store(updated_secrets)
+        updated_secrets = user_secrets.model_copy(
+            update={'provider_tokens': provider_info.provider_tokens}
+        )
+        await secrets_store.store(updated_secrets)
 
-            return JSONResponse(
-                status_code=status.HTTP_200_OK,
-                content={'message': 'Git providers stored'},
-            )
+        return JSONResponse(
+            status_code=status.HTTP_200_OK,
+            content={'message': 'Git providers stored'},
+        )
     except Exception as e:
         logger.warning(f'Something went wrong storing git providers: {e}')
         return JSONResponse(

openhands/server/routes/settings.py

@@ -17,7 +17,7 @@ from openhands.server.user_auth import (
     get_user_settings_store,
 )
 from openhands.storage.data_models.settings import Settings
-from openhands.storage.settings.secret_store import SecretsStore
+from openhands.storage.secrets.secrets_store import SecretsStore
 from openhands.storage.settings.settings_store import SettingsStore
 
 app = APIRouter(prefix='/api')

openhands/server/shared.py

@@ -11,7 +11,7 @@ from openhands.server.conversation_manager.conversation_manager import (
 from openhands.server.monitoring import MonitoringListener
 from openhands.storage import get_file_store
 from openhands.storage.conversation.conversation_store import ConversationStore
-from openhands.storage.settings.secret_store import SecretsStore
+from openhands.storage.secrets.secrets_store import SecretsStore
 from openhands.storage.settings.settings_store import SettingsStore
 from openhands.utils.import_utils import get_impl
 

openhands/server/user_auth/__init__.py

@@ -6,7 +6,7 @@ from openhands.integrations.service_types import ProviderType
 from openhands.server.settings import Settings
 from openhands.server.user_auth.user_auth import AuthType, get_user_auth
 from openhands.storage.data_models.user_secrets import UserSecrets
-from openhands.storage.settings.secret_store import SecretsStore
+from openhands.storage.secrets.secrets_store import SecretsStore
 from openhands.storage.settings.settings_store import SettingsStore
 
 

openhands/server/user_auth/default_user_auth.py

@@ -8,7 +8,7 @@ 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.user_secrets import UserSecrets
-from openhands.storage.settings.secret_store import SecretsStore
+from openhands.storage.secrets.secrets_store import SecretsStore
 from openhands.storage.settings.settings_store import SettingsStore
 
 

openhands/server/user_auth/user_auth.py

@@ -10,7 +10,7 @@ from openhands.integrations.provider import PROVIDER_TOKEN_TYPE
 from openhands.server.settings import Settings
 from openhands.server.shared import server_config
 from openhands.storage.data_models.user_secrets import UserSecrets
-from openhands.storage.settings.secret_store import SecretsStore
+from openhands.storage.secrets.secrets_store import SecretsStore
 from openhands.storage.settings.settings_store import SettingsStore
 from openhands.utils.import_utils import get_impl
 

openhands/storage/secrets/file_secrets_store.py

@@ -7,7 +7,7 @@ from openhands.core.config.app_config import AppConfig
 from openhands.storage import get_file_store
 from openhands.storage.data_models.user_secrets import UserSecrets
 from openhands.storage.files import FileStore
-from openhands.storage.settings.secret_store import SecretsStore
+from openhands.storage.secrets.secrets_store import SecretsStore
 from openhands.utils.async_utils import call_sync_from_async
 
 

tests/unit/test_secrets_api.py

@@ -12,7 +12,7 @@ from openhands.integrations.provider import ProviderToken, ProviderType
 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.settings.file_secrets_store import FileSecretsStore
+from openhands.storage.secrets.file_secrets_store import FileSecretsStore
 
 
 @pytest.fixture
@@ -33,7 +33,7 @@ def file_secrets_store(temp_dir):
     file_store = get_file_store('local', temp_dir)
     store = FileSecretsStore(file_store)
     with patch(
-        'openhands.storage.settings.file_secrets_store.FileSecretsStore.get_instance',
+        'openhands.storage.secrets.file_secrets_store.FileSecretsStore.get_instance',
         AsyncMock(return_value=store),
     ):
         yield store

tests/unit/test_settings_api.py

@@ -10,8 +10,8 @@ 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.memory import InMemoryFileStore
+from openhands.storage.secrets.secrets_store import SecretsStore
 from openhands.storage.settings.file_settings_store import FileSettingsStore
-from openhands.storage.settings.secret_store import SecretsStore
 from openhands.storage.settings.settings_store import SettingsStore
 
 

tests/unit/test_settings_store_functions.py

@@ -15,7 +15,7 @@ from openhands.server.settings import POSTProviderModel
 from openhands.storage import get_file_store
 from openhands.storage.data_models.settings import Settings
 from openhands.storage.data_models.user_secrets import UserSecrets
-from openhands.storage.settings.file_secrets_store import FileSecretsStore
+from openhands.storage.secrets.file_secrets_store import FileSecretsStore
 
 
 # Mock functions to simulate the actual functions in settings.py
@@ -47,7 +47,7 @@ def file_secrets_store(temp_dir):
     file_store = get_file_store('local', temp_dir)
     store = FileSecretsStore(file_store)
     with patch(
-        'openhands.storage.settings.file_secrets_store.FileSecretsStore.get_instance',
+        'openhands.storage.secrets.file_secrets_store.FileSecretsStore.get_instance',
         AsyncMock(return_value=store),
     ):
         yield store