Fix a few issues with settings

All-Hands-AI · Dec 31, 2024 · 6995e23 · 6995e23
1 parent 4de0a27
commit 6995e23
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 19 deletions.
diff --git a/frontend/src/hooks/mutation/use-save-settings.ts b/frontend/src/hooks/mutation/use-save-settings.ts
@@ -1,6 +1,7 @@
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import {
   ApiSettings,
+  DEFAULT_SETTINGS,
   LATEST_SETTINGS_VERSION,
   Settings,
 } from "#/services/settings";
@@ -11,11 +12,11 @@ const saveSettingsMutationFn = async (settings: Partial<Settings>) => {
   const apiSettings: Partial<ApiSettings> = {
     llm_model: settings.LLM_MODEL,
     llm_base_url: settings.LLM_BASE_URL,
-    agent: settings.AGENT,
-    language: settings.LANGUAGE,
+    agent: settings.AGENT || DEFAULT_SETTINGS.AGENT,
+    language: settings.LANGUAGE || DEFAULT_SETTINGS.LANGUAGE,
     confirmation_mode: settings.CONFIRMATION_MODE,
     security_analyzer: settings.SECURITY_ANALYZER,
-    llm_api_key: settings.LLM_API_KEY,
+    llm_api_key: settings.LLM_API_KEY?.trim() || undefined,
   };
 
   await OpenHands.saveSettings(apiSettings);

diff --git a/frontend/src/hooks/query/use-settings.ts b/frontend/src/hooks/query/use-settings.ts
@@ -1,25 +1,36 @@
 import { useQuery } from "@tanstack/react-query";
 import React from "react";
 import posthog from "posthog-js";
+import { AxiosError } from "axios";
 import { DEFAULT_SETTINGS, getLocalStorageSettings } from "#/services/settings";
 import OpenHands from "#/api/open-hands";
 
 const getSettingsQueryFn = async () => {
-  const apiSettings = await OpenHands.getSettings();
+  try {
+    const apiSettings = await OpenHands.getSettings();
 
-  if (apiSettings !== null) {
-    return {
-      LLM_MODEL: apiSettings.llm_model,
-      LLM_BASE_URL: apiSettings.llm_base_url,
-      AGENT: apiSettings.agent,
-      LANGUAGE: apiSettings.language,
-      CONFIRMATION_MODE: apiSettings.confirmation_mode,
-      SECURITY_ANALYZER: apiSettings.security_analyzer,
-      LLM_API_KEY: apiSettings.llm_api_key,
-    };
-  }
+    if (apiSettings !== null) {
+      return {
+        LLM_MODEL: apiSettings.llm_model,
+        LLM_BASE_URL: apiSettings.llm_base_url,
+        AGENT: apiSettings.agent,
+        LANGUAGE: apiSettings.language,
+        CONFIRMATION_MODE: apiSettings.confirmation_mode,
+        SECURITY_ANALYZER: apiSettings.security_analyzer,
+        LLM_API_KEY: apiSettings.llm_api_key,
+      };
+    }
 
-  return getLocalStorageSettings();
+    return getLocalStorageSettings();
+  } catch (error) {
+    if (error instanceof AxiosError) {
+      if (error.response?.status === 404) {
+        return DEFAULT_SETTINGS;
+      }
+    }
+
+    throw error;
+  }
 };
 
 export const useSettings = () => {

diff --git a/openhands/server/routes/settings.py b/openhands/server/routes/settings.py
@@ -27,9 +27,14 @@ async def load_settings(
     try:
         settings_store = await SettingsStoreImpl.get_instance(config, github_token)
         settings = await settings_store.load()
-        if settings:
-            # For security reasons we don't ever send the api key to the client
-            settings.llm_api_key = 'SET' if settings.llm_api_key else None
+        if not settings:
+            return JSONResponse(
+                status_code=status.HTTP_404_NOT_FOUND,
+                content={'error': 'Settings not found'},
+            )
+
+        # For security reasons we don't ever send the api key to the client
+        settings.llm_api_key = 'SET' if settings.llm_api_key else None
         return settings
     except Exception as e:
         logger.warning(f'Invalid token: {e}')