Merge branch 'main' into feat-extra-security-host

frontend/__tests__/components/modals/base-modal/base-modal.test.tsx

@@ -52,14 +52,10 @@ describe("BaseModal", () => {
     expect(screen.getByText("Save")).toBeInTheDocument();
     expect(screen.getByText("Cancel")).toBeInTheDocument();
 
-    await act(async () => {
-      await userEvent.click(screen.getByText("Save"));
-    });
+    await userEvent.click(screen.getByText("Save"));
     expect(onPrimaryClickMock).toHaveBeenCalledTimes(1);
 
-    await act(async () => {
-      await userEvent.click(screen.getByText("Cancel"));
-    });
+    await userEvent.click(screen.getByText("Cancel"));
     expect(onSecondaryClickMock).toHaveBeenCalledTimes(1);
   });
 
@@ -80,9 +76,7 @@ describe("BaseModal", () => {
       />,
     );
 
-    await act(async () => {
-      await userEvent.click(screen.getByText("Save"));
-    });
+    await userEvent.click(screen.getByText("Save"));
     expect(onOpenChangeMock).toHaveBeenCalledTimes(1);
   });
 

frontend/src/api/open-hands.ts

@@ -11,7 +11,7 @@ import {
   Conversation,
 } from "./open-hands.types";
 import { openHands } from "./open-hands-axios";
-import { ApiSettings, Settings } from "#/services/settings";
+import { ApiSettings } from "#/services/settings";
 
 class OpenHands {
   /**
@@ -238,13 +238,11 @@ class OpenHands {
   }
 
   static async createConversation(
-    settings: Settings,
     githubToken?: string,
     selectedRepository?: string,
   ): Promise<Conversation> {
     const body = {
       github_token: githubToken,
-      args: settings,
       selected_repository: selectedRepository,
     };
 

frontend/src/components/shared/buttons/icon-button.tsx

@@ -1,9 +1,9 @@
 import { Button } from "@nextui-org/react";
-import React, { MouseEventHandler, ReactElement } from "react";
+import React, { ReactElement } from "react";
 
 export interface IconButtonProps {
   icon: ReactElement;
-  onClick: MouseEventHandler<HTMLButtonElement>;
+  onClick: () => void;
   ariaLabel: string;
   testId?: string;
 }
@@ -18,7 +18,7 @@ export function IconButton({
     <Button
       type="button"
       variant="flat"
-      onClick={onClick}
+      onPress={onClick}
       className="cursor-pointer text-[12px] bg-transparent aspect-square px-0 min-w-[20px] h-[20px]"
       aria-label={ariaLabel}
       data-testid={testId}

frontend/src/components/shared/modals/base-modal/footer-content.tsx

@@ -23,7 +23,7 @@ export function FooterContent({ actions, closeModal }: FooterContentProps) {
             key={label}
             type="button"
             isDisabled={isDisabled}
-            onClick={() => {
+            onPress={() => {
               action();
               if (closeAfterAction) closeModal();
             }}

frontend/src/components/shared/modals/security/invariant/invariant.tsx

@@ -127,7 +127,7 @@ function SecurityInvariant() {
       <>
         <div className="flex justify-between items-center border-b border-neutral-600 mb-4 p-4">
           <h2 className="text-2xl">{t(I18nKey.INVARIANT$LOG_LABEL)}</h2>
-          <Button onClick={() => exportTraces()} className="bg-neutral-700">
+          <Button onPress={() => exportTraces()} className="bg-neutral-700">
             {t(I18nKey.INVARIANT$EXPORT_TRACE_LABEL)}
           </Button>
         </div>
@@ -162,7 +162,7 @@ function SecurityInvariant() {
           <h2 className="text-2xl">{t(I18nKey.INVARIANT$POLICY_LABEL)}</h2>
           <Button
             className="bg-neutral-700"
-            onClick={() => updatePolicy({ policy })}
+            onPress={() => updatePolicy({ policy })}
           >
             {t(I18nKey.INVARIANT$UPDATE_POLICY_LABEL)}
           </Button>
@@ -184,7 +184,7 @@ function SecurityInvariant() {
           <h2 className="text-2xl">{t(I18nKey.INVARIANT$SETTINGS_LABEL)}</h2>
           <Button
             className="bg-neutral-700"
-            onClick={() => updateRiskSeverity({ riskSeverity: selectedRisk })}
+            onPress={() => updateRiskSeverity({ riskSeverity: selectedRisk })}
           >
             {t(I18nKey.INVARIANT$UPDATE_SETTINGS_LABEL)}
           </Button>

frontend/src/hooks/mutation/use-create-conversation.ts

@@ -6,13 +6,11 @@ import OpenHands from "#/api/open-hands";
 import { setInitialQuery } from "#/state/initial-query-slice";
 import { RootState } from "#/store";
 import { useAuth } from "#/context/auth-context";
-import { useSettings } from "../query/use-settings";
 
 export const useCreateConversation = () => {
   const navigate = useNavigate();
   const dispatch = useDispatch();
   const { gitHubToken } = useAuth();
-  const { data: settings } = useSettings();
   const queryClient = useQueryClient();
 
   const { selectedRepository, files } = useSelector(
@@ -27,7 +25,6 @@ export const useCreateConversation = () => {
 
       if (variables.q) dispatch(setInitialQuery(variables.q));
       return OpenHands.createConversation(
-        settings,
         gitHubToken || undefined,
         selectedRepository || undefined,
       );

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);

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 = () => {

frontend/src/hooks/use-maybe-migrate-settings.ts

@@ -1,7 +1,6 @@
 // Sometimes we ship major changes, like a new default agent.
 
 import React from "react";
-import { useAuth } from "#/context/auth-context";
 import { useSettingsUpToDate } from "#/context/settings-up-to-date-context";
 import {
   DEFAULT_SETTINGS,
@@ -12,7 +11,6 @@ import { useSaveSettings } from "./mutation/use-save-settings";
 
 // In this case, we may want to override a previous choice made by the user.
 export const useMaybeMigrateSettings = () => {
-  const { logout } = useAuth();
   const { mutateAsync: saveSettings } = useSaveSettings();
   const { isUpToDate } = useSettingsUpToDate();
 
@@ -35,7 +33,7 @@ export const useMaybeMigrateSettings = () => {
     }
 
     if (currentVersion < 4) {
-      logout();
+      // We used to log out here, but it's breaking things
     }
 
     // Only save settings if user already previously saved settings

openhands/runtime/impl/docker/docker_runtime.py

@@ -370,7 +370,6 @@ def _find_available_port(self, max_attempts=5):
     @property
     def vscode_url(self) -> str | None:
         token = super().get_vscode_token()
-        print('got token', token)
         if not token:
             return None
         vscode_url = f'http://localhost:{self._host_port + 1}/?tkn={token}&folder={self.config.workspace_mount_path_in_sandbox}'

openhands/server/routes/new_conversation.py

@@ -6,10 +6,10 @@
 from pydantic import BaseModel
 
 from openhands.core.logger import openhands_logger as logger
+from openhands.server.data_models.conversation_metadata import ConversationMetadata
 from openhands.server.routes.settings import ConversationStoreImpl, SettingsStoreImpl
 from openhands.server.session.conversation_init_data import ConversationInitData
 from openhands.server.shared import config, session_manager
-from openhands.server.data_models.conversation_metadata import ConversationMetadata
 from openhands.utils.async_utils import call_sync_from_async
 
 app = APIRouter(prefix='/api')
@@ -38,9 +38,6 @@ async def new_conversation(request: Request, data: InitSessionRequest):
     session_init_args: dict = {}
     if settings:
         session_init_args = {**settings.__dict__, **session_init_args}
-    if data.args:
-        for key, value in data.args.items():
-            session_init_args[key.lower()] = value
 
     session_init_args['github_token'] = github_token
     session_init_args['selected_repository'] = data.selected_repository

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}')
@@ -50,14 +55,13 @@ async def store_settings(
     try:
         settings_store = await SettingsStoreImpl.get_instance(config, github_token)
         existing_settings = await settings_store.load()
+
         if existing_settings:
-            # Only update settings that are not None with the new values
-            for key, value in settings.__dict__.items():
-                if value is None:
-                    setattr(settings, key, getattr(existing_settings, key))
+            # LLM key isn't on the frontend, so we need to keep it if unset
             if settings.llm_api_key is None:
                 settings.llm_api_key = existing_settings.llm_api_key
         await settings_store.store(settings)
+
         return JSONResponse(
             status_code=status.HTTP_200_OK,
             content={'message': 'Settings stored'},

openhands/server/session/session.py

@@ -85,11 +85,9 @@ async def initialize_agent(
         # override default LLM config
 
         default_llm_config = self.config.get_llm_config()
-        default_llm_config.model = settings.llm_model or default_llm_config.model
-        default_llm_config.api_key = settings.llm_api_key or default_llm_config.api_key
-        default_llm_config.base_url = (
-            settings.llm_base_url or default_llm_config.base_url
-        )
+        default_llm_config.model = settings.llm_model or ''
+        default_llm_config.api_key = settings.llm_api_key
+        default_llm_config.base_url = settings.llm_base_url
 
         # TODO: override other LLM config & agent config groups (#2075)