π OpenHands: AI-Driven Development
refactor(frontend): move option APIs to a dedicated service handler (#10933)
Hiep Le95d7c10608a1
diff --git a/frontend/__tests__/components/chat/expandable-message.test.tsx b/frontend/__tests__/components/chat/expandable-message.test.tsxindex 7d75de905f..0b25ef1f92 100644--- a/frontend/__tests__/components/chat/expandable-message.test.tsx+++ b/frontend/__tests__/components/chat/expandable-message.test.tsx@@ -3,7 +3,7 @@ import { screen } from "@testing-library/react";import { renderWithProviders } from "test-utils";import { createRoutesStub } from "react-router";import { ExpandableMessage } from "#/components/features/chat/expandable-message";-import OpenHands from "#/api/open-hands";+import OptionService from "#/api/option-service/option-service.api";vi.mock("react-i18next", async () => {const actual = await vi.importActual("react-i18next");@@ -113,7 +113,7 @@ describe("ExpandableMessage", () => {});it("should render the out of credits message when the user is out of credits", async () => {- const getConfigSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfigSpy = vi.spyOn(OptionService, "getConfig");// @ts-expect-error - We only care about the APP_MODE and FEATURE_FLAGS fieldsgetConfigSpy.mockResolvedValue({APP_MODE: "saas",diff --git a/frontend/__tests__/components/features/home/repo-connector.test.tsx b/frontend/__tests__/components/features/home/repo-connector.test.tsxindex cf83d6337d..fd62bfd138 100644--- a/frontend/__tests__/components/features/home/repo-connector.test.tsx+++ b/frontend/__tests__/components/features/home/repo-connector.test.tsx@@ -7,6 +7,7 @@ import { Provider } from "react-redux";import { createRoutesStub, Outlet } from "react-router";import SettingsService from "#/settings-service/settings-service.api";import OpenHands from "#/api/open-hands";+import OptionService from "#/api/option-service/option-service.api";import { GitRepository } from "#/types/git";import { RepoConnector } from "#/components/features/home/repo-connector";import { MOCK_DEFAULT_USER_SETTINGS } from "#/mocks/handlers";@@ -177,7 +178,7 @@ describe("RepoConnector", () => {});it("should render the 'add github repos' link in dropdown if saas mode and github provider is set", async () => {- const getConfiSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfiSpy = vi.spyOn(OptionService, "getConfig");// @ts-expect-error - only return the APP_MODE and APP_SLUGgetConfiSpy.mockResolvedValue({APP_MODE: "saas",@@ -224,7 +225,7 @@ describe("RepoConnector", () => {});it("should not render the 'add github repos' link if github provider is not set", async () => {- const getConfiSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfiSpy = vi.spyOn(OptionService, "getConfig");// @ts-expect-error - only return the APP_MODE and APP_SLUGgetConfiSpy.mockResolvedValue({APP_MODE: "saas",@@ -269,7 +270,7 @@ describe("RepoConnector", () => {});it("should not render the 'add github repos' link in dropdown if oss mode", async () => {- const getConfiSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfiSpy = vi.spyOn(OptionService, "getConfig");// @ts-expect-error - only return the APP_MODEgetConfiSpy.mockResolvedValue({APP_MODE: "oss",diff --git a/frontend/__tests__/components/features/payment/payment-form.test.tsx b/frontend/__tests__/components/features/payment/payment-form.test.tsxindex 5bfe6e0330..b2c95372da 100644--- a/frontend/__tests__/components/features/payment/payment-form.test.tsx+++ b/frontend/__tests__/components/features/payment/payment-form.test.tsx@@ -3,12 +3,13 @@ import { render, screen, waitFor } from "@testing-library/react";import userEvent from "@testing-library/user-event";import { afterEach, beforeEach, describe, expect, it, test, vi } from "vitest";import OpenHands from "#/api/open-hands";+import OptionService from "#/api/option-service/option-service.api";import { PaymentForm } from "#/components/features/payment/payment-form";describe("PaymentForm", () => {const getBalanceSpy = vi.spyOn(OpenHands, "getBalance");const createCheckoutSessionSpy = vi.spyOn(OpenHands, "createCheckoutSession");- const getConfigSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfigSpy = vi.spyOn(OptionService, "getConfig");const renderPaymentForm = () =>render(<PaymentForm />, {diff --git a/frontend/__tests__/routes/_oh.test.tsx b/frontend/__tests__/routes/_oh.test.tsxindex efffc54d58..0a84390f0a 100644--- a/frontend/__tests__/routes/_oh.test.tsx+++ b/frontend/__tests__/routes/_oh.test.tsx@@ -8,6 +8,7 @@ import {import userEvent from "@testing-library/user-event";import MainApp from "#/routes/root-layout";import i18n from "#/i18n";+import OptionService from "#/api/option-service/option-service.api";import * as CaptureConsent from "#/utils/handle-capture-consent";import SettingsService from "#/settings-service/settings-service.api";import OpenHands from "#/api/open-hands";@@ -63,7 +64,7 @@ describe("frontend/routes/_oh", () => {// FIXME: This test fails when it shouldn't be, please investigateit.skip("should render and capture the user's consent if oss mode", async () => {const user = userEvent.setup();- const getConfigSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfigSpy = vi.spyOn(OptionService, "getConfig");const getSettingsSpy = vi.spyOn(SettingsService, "getSettings");const handleCaptureConsentSpy = vi.spyOn(CaptureConsent,@@ -107,7 +108,7 @@ describe("frontend/routes/_oh", () => {});it("should not render the user consent form if saas mode", async () => {- const getConfigSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfigSpy = vi.spyOn(OptionService, "getConfig");getConfigSpy.mockResolvedValue({APP_MODE: "saas",GITHUB_CLIENT_ID: "test-id",@@ -185,7 +186,7 @@ describe("frontend/routes/_oh", () => {});it("should render a you're in toast if it is a new user and in saas mode", async () => {- const getConfigSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfigSpy = vi.spyOn(OptionService, "getConfig");const getSettingsSpy = vi.spyOn(SettingsService, "getSettings");const displaySuccessToastSpy = vi.spyOn(ToastHandlers,diff --git a/frontend/__tests__/routes/git-settings.test.tsx b/frontend/__tests__/routes/git-settings.test.tsxindex c1d63ded4d..5e75c4f9fb 100644--- a/frontend/__tests__/routes/git-settings.test.tsx+++ b/frontend/__tests__/routes/git-settings.test.tsx@@ -8,9 +8,10 @@ import { I18nextProvider } from "react-i18next";import GitSettingsScreen from "#/routes/git-settings";import SettingsService from "#/settings-service/settings-service.api";import OpenHands from "#/api/open-hands";+import OptionService from "#/api/option-service/option-service.api";import AuthService from "#/api/auth-service/auth-service.api";import { MOCK_DEFAULT_USER_SETTINGS } from "#/mocks/handlers";-import { GetConfigResponse } from "#/api/open-hands.types";+import { GetConfigResponse } from "#/api/option-service/option.types";import * as ToastHandlers from "#/utils/custom-toast-handlers";import { SecretsService } from "#/api/secrets-service";@@ -110,7 +111,7 @@ describe("Content", () => {});it("should render the inputs if OSS mode", async () => {- const getConfigSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfigSpy = vi.spyOn(OptionService, "getConfig");getConfigSpy.mockResolvedValue(VALID_OSS_CONFIG);const { rerender } = renderGitSettingsScreen();@@ -153,7 +154,7 @@ describe("Content", () => {});it("should set '<hidden>' placeholder and indicator if the GitHub token is set", async () => {- const getConfigSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfigSpy = vi.spyOn(OptionService, "getConfig");const getSettingsSpy = vi.spyOn(SettingsService, "getSettings");getConfigSpy.mockResolvedValue(VALID_OSS_CONFIG);@@ -228,7 +229,7 @@ describe("Content", () => {});it("should render the 'Configure GitHub Repositories' button if SaaS mode and app slug exists", async () => {- const getConfigSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfigSpy = vi.spyOn(OptionService, "getConfig");getConfigSpy.mockResolvedValue(VALID_OSS_CONFIG);const { rerender } = renderGitSettingsScreen();@@ -272,7 +273,7 @@ describe("Form submission", () => {it("should save the GitHub token", async () => {const saveProvidersSpy = vi.spyOn(SecretsService, "addGitProvider");saveProvidersSpy.mockImplementation(() => Promise.resolve(true));- const getConfigSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfigSpy = vi.spyOn(OptionService, "getConfig");getConfigSpy.mockResolvedValue(VALID_OSS_CONFIG);renderGitSettingsScreen();@@ -293,7 +294,7 @@ describe("Form submission", () => {it("should save GitLab tokens", async () => {const saveProvidersSpy = vi.spyOn(SecretsService, "addGitProvider");saveProvidersSpy.mockImplementation(() => Promise.resolve(true));- const getConfigSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfigSpy = vi.spyOn(OptionService, "getConfig");getConfigSpy.mockResolvedValue(VALID_OSS_CONFIG);renderGitSettingsScreen();@@ -314,7 +315,7 @@ describe("Form submission", () => {it("should save the Bitbucket token", async () => {const saveProvidersSpy = vi.spyOn(SecretsService, "addGitProvider");saveProvidersSpy.mockImplementation(() => Promise.resolve(true));- const getConfigSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfigSpy = vi.spyOn(OptionService, "getConfig");getConfigSpy.mockResolvedValue(VALID_OSS_CONFIG);renderGitSettingsScreen();@@ -333,7 +334,7 @@ describe("Form submission", () => {});it("should disable the button if there is no input", async () => {- const getConfigSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfigSpy = vi.spyOn(OptionService, "getConfig");getConfigSpy.mockResolvedValue(VALID_OSS_CONFIG);renderGitSettingsScreen();@@ -359,7 +360,7 @@ describe("Form submission", () => {});it("should enable a disconnect tokens button if there is at least one token set", async () => {- const getConfigSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfigSpy = vi.spyOn(OptionService, "getConfig");const getSettingsSpy = vi.spyOn(SettingsService, "getSettings");getConfigSpy.mockResolvedValue(VALID_OSS_CONFIG);@@ -393,7 +394,7 @@ describe("Form submission", () => {});it("should call logout when pressing the disconnect tokens button", async () => {- const getConfigSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfigSpy = vi.spyOn(OptionService, "getConfig");const logoutSpy = vi.spyOn(AuthService, "logout");const getSettingsSpy = vi.spyOn(SettingsService, "getSettings");@@ -420,7 +421,7 @@ describe("Form submission", () => {// flaky testit.skip("should disable the button when submitting changes", async () => {const saveSettingsSpy = vi.spyOn(SecretsService, "addGitProvider");- const getConfigSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfigSpy = vi.spyOn(OptionService, "getConfig");getConfigSpy.mockResolvedValue(VALID_OSS_CONFIG);renderGitSettingsScreen();@@ -444,7 +445,7 @@ describe("Form submission", () => {it("should disable the button after submitting changes", async () => {const saveProvidersSpy = vi.spyOn(SecretsService, "addGitProvider");- const getConfigSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfigSpy = vi.spyOn(OptionService, "getConfig");getConfigSpy.mockResolvedValue(VALID_OSS_CONFIG);renderGitSettingsScreen();diff --git a/frontend/__tests__/routes/home-screen.test.tsx b/frontend/__tests__/routes/home-screen.test.tsxindex 5bfbb681ab..ad5b1fba52 100644--- a/frontend/__tests__/routes/home-screen.test.tsx+++ b/frontend/__tests__/routes/home-screen.test.tsx@@ -9,6 +9,7 @@ import HomeScreen from "#/routes/home";import { GitRepository } from "#/types/git";import SettingsService from "#/settings-service/settings-service.api";import OpenHands from "#/api/open-hands";+import OptionService from "#/api/option-service/option-service.api";import MainApp from "#/routes/root-layout";import { MOCK_DEFAULT_USER_SETTINGS } from "#/mocks/handlers";@@ -359,7 +360,7 @@ describe("Settings 404", () => {vi.resetAllMocks();});- const getConfigSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfigSpy = vi.spyOn(OptionService, "getConfig");const getSettingsSpy = vi.spyOn(SettingsService, "getSettings");it("should open the settings modal if GET /settings fails with a 404", async () => {@@ -418,7 +419,7 @@ describe("Settings 404", () => {});describe("Setup Payment modal", () => {- const getConfigSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfigSpy = vi.spyOn(OptionService, "getConfig");const getSettingsSpy = vi.spyOn(SettingsService, "getSettings");it("should only render if SaaS mode and is new user", async () => {diff --git a/frontend/__tests__/routes/llm-settings.test.tsx b/frontend/__tests__/routes/llm-settings.test.tsxindex 3ee2b7c313..9ca03b8a13 100644--- a/frontend/__tests__/routes/llm-settings.test.tsx+++ b/frontend/__tests__/routes/llm-settings.test.tsx@@ -5,6 +5,7 @@ import { QueryClientProvider, QueryClient } from "@tanstack/react-query";import LlmSettingsScreen from "#/routes/llm-settings";import SettingsService from "#/settings-service/settings-service.api";import OpenHands from "#/api/open-hands";+import OptionService from "#/api/option-service/option-service.api";import {MOCK_DEFAULT_USER_SETTINGS,resetTestHandlersMockSettings,@@ -697,7 +698,7 @@ describe("Status toasts", () => {describe("SaaS mode", () => {it("should not render the runtime settings input in oss mode", async () => {- const getConfigSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfigSpy = vi.spyOn(OptionService, "getConfig");// @ts-expect-error - only return modegetConfigSpy.mockResolvedValue({APP_MODE: "oss",@@ -715,7 +716,7 @@ describe("SaaS mode", () => {});it("should render the runtime settings input in saas mode", async () => {- const getConfigSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfigSpy = vi.spyOn(OptionService, "getConfig");// @ts-expect-error - only return modegetConfigSpy.mockResolvedValue({APP_MODE: "saas",@@ -733,7 +734,7 @@ describe("SaaS mode", () => {});it("should always render the runtime settings input as disabled", async () => {- const getConfigSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfigSpy = vi.spyOn(OptionService, "getConfig");// @ts-expect-error - only return modegetConfigSpy.mockResolvedValue({APP_MODE: "saas",diff --git a/frontend/__tests__/routes/secrets-settings.test.tsx b/frontend/__tests__/routes/secrets-settings.test.tsxindex aff96704b3..78e9c555ed 100644--- a/frontend/__tests__/routes/secrets-settings.test.tsx+++ b/frontend/__tests__/routes/secrets-settings.test.tsx@@ -8,6 +8,7 @@ import { SecretsService } from "#/api/secrets-service";import { GetSecretsResponse } from "#/api/secrets-service.types";import SettingsService from "#/settings-service/settings-service.api";import OpenHands from "#/api/open-hands";+import OptionService from "#/api/option-service/option-service.api";import { MOCK_DEFAULT_USER_SETTINGS } from "#/mocks/handlers";const MOCK_GET_SECRETS_RESPONSE: GetSecretsResponse["custom_secrets"] = [@@ -54,7 +55,7 @@ const renderSecretsSettings = () =>});beforeEach(() => {- const getConfigSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfigSpy = vi.spyOn(OptionService, "getConfig");// @ts-expect-error - only return the config we needgetConfigSpy.mockResolvedValue({APP_MODE: "oss",@@ -68,7 +69,7 @@ describe("Content", () => {});it("should NOT render a button to connect with git if they havent already in oss", async () => {- const getConfigSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfigSpy = vi.spyOn(OptionService, "getConfig");const getSettingsSpy = vi.spyOn(SettingsService, "getSettings");const getSecretsSpy = vi.spyOn(SecretsService, "getSecrets");// @ts-expect-error - only return the config we need@@ -88,8 +89,7 @@ describe("Content", () => {});it("should render add secret button in saas mode", async () => {- const getConfigSpy = vi.spyOn(OpenHands, "getConfig");- const getSettingsSpy = vi.spyOn(SettingsService, "getSettings");+ const getConfigSpy = vi.spyOn(OptionService, "getConfig");const getSecretsSpy = vi.spyOn(SecretsService, "getSecrets");// @ts-expect-error - only return the config we needgetConfigSpy.mockResolvedValue({diff --git a/frontend/__tests__/routes/settings.test.tsx b/frontend/__tests__/routes/settings.test.tsxindex 46a9566b91..c6ae026eb7 100644--- a/frontend/__tests__/routes/settings.test.tsx+++ b/frontend/__tests__/routes/settings.test.tsx@@ -4,6 +4,7 @@ import { describe, expect, it, vi } from "vitest";import { QueryClientProvider } from "@tanstack/react-query";import SettingsScreen, { clientLoader } from "#/routes/settings";import OpenHands from "#/api/open-hands";+import OptionService from "#/api/option-service/option-service.api";// Mock the i18next hookvi.mock("react-i18next", async () => {@@ -93,7 +94,7 @@ describe("Settings Screen", () => {it("should render the navbar", async () => {const sectionsToInclude = ["llm", "integrations", "application", "secrets"];const sectionsToExclude = ["api keys", "credits", "billing"];- const getConfigSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfigSpy = vi.spyOn(OptionService, "getConfig");// @ts-expect-error - only return app modegetConfigSpy.mockResolvedValue({APP_MODE: "oss",@@ -156,7 +157,7 @@ describe("Settings Screen", () => {});it("should not be able to access saas-only routes in oss mode", async () => {- const getConfigSpy = vi.spyOn(OpenHands, "getConfig");+ const getConfigSpy = vi.spyOn(OptionService, "getConfig");// @ts-expect-error - only return app modegetConfigSpy.mockResolvedValue({APP_MODE: "oss",diff --git a/frontend/src/api/auth-service/auth-service.api.ts b/frontend/src/api/auth-service/auth-service.api.tsindex f06782d0a9..8ea758b944 100644--- a/frontend/src/api/auth-service/auth-service.api.ts+++ b/frontend/src/api/auth-service/auth-service.api.ts@@ -1,6 +1,6 @@import { openHands } from "../open-hands-axios";import { AuthenticateResponse, GitHubAccessTokenResponse } from "./auth.types";-import { GetConfigResponse } from "../open-hands.types";+import { GetConfigResponse } from "../option-service/option.types";/*** Authentication service for handling all authentication-related API callsdiff --git a/frontend/src/api/open-hands.ts b/frontend/src/api/open-hands.tsindex 4512ba2144..f5edaed421 100644--- a/frontend/src/api/open-hands.ts+++ b/frontend/src/api/open-hands.ts@@ -2,7 +2,6 @@ import { AxiosHeaders } from "axios";import {Feedback,FeedbackResponse,- GetConfigResponse,GetVSCodeUrlResponse,Conversation,ResultSet,@@ -64,42 +63,6 @@ class OpenHands {return `/api/conversations/${conversationId}`;}- /**- * Retrieve the list of models available- * @returns List of models available- */- static async getModels(): Promise<string[]> {- const { data } = await openHands.get<string[]>("/api/options/models");- return data;- }-- /**- * Retrieve the list of agents available- * @returns List of agents available- */- static async getAgents(): Promise<string[]> {- const { data } = await openHands.get<string[]>("/api/options/agents");- return data;- }-- /**- * Retrieve the list of security analyzers available- * @returns List of security analyzers available- */- static async getSecurityAnalyzers(): Promise<string[]> {- const { data } = await openHands.get<string[]>(- "/api/options/security-analyzers",- );- return data;- }-- static async getConfig(): Promise<GetConfigResponse> {- const { data } = await openHands.get<GetConfigResponse>(- "/api/options/config",- );- return data;- }-static getConversationHeaders(): AxiosHeaders {const headers = new AxiosHeaders();const sessionApiKey = this.currentConversation?.session_api_key;diff --git a/frontend/src/api/open-hands.types.ts b/frontend/src/api/open-hands.types.tsindex c3fac3f8da..b7680029f8 100644--- a/frontend/src/api/open-hands.types.ts+++ b/frontend/src/api/open-hands.types.ts@@ -50,25 +50,6 @@ export interface GetTrajectoryResponse {error?: string;}-export interface GetConfigResponse {- APP_MODE: "saas" | "oss";- APP_SLUG?: string;- GITHUB_CLIENT_ID: string;- POSTHOG_CLIENT_KEY: string;- PROVIDERS_CONFIGURED?: Provider[];- AUTH_URL?: string;- FEATURE_FLAGS: {- ENABLE_BILLING: boolean;- HIDE_LLM_SETTINGS: boolean;- ENABLE_JIRA: boolean;- ENABLE_JIRA_DC: boolean;- ENABLE_LINEAR: boolean;- };- MAINTENANCE?: {- startTime: string;- };-}-export interface RepositorySelection {selected_repository: string | null;selected_branch: string | null;diff --git a/frontend/src/api/option-service/option-service.api.ts b/frontend/src/api/option-service/option-service.api.tsnew file mode 100644index 0000000000..0bf78182b8--- /dev/null+++ b/frontend/src/api/option-service/option-service.api.ts@@ -0,0 +1,49 @@+import { openHands } from "../open-hands-axios";+import { GetConfigResponse } from "./option.types";++/**+ * Service for handling API options endpoints+ */+class OptionService {+ /**+ * Retrieve the list of models available+ * @returns List of models available+ */+ static async getModels(): Promise<string[]> {+ const { data } = await openHands.get<string[]>("/api/options/models");+ return data;+ }++ /**+ * Retrieve the list of agents available+ * @returns List of agents available+ */+ static async getAgents(): Promise<string[]> {+ const { data } = await openHands.get<string[]>("/api/options/agents");+ return data;+ }++ /**+ * Retrieve the list of security analyzers available+ * @returns List of security analyzers available+ */+ static async getSecurityAnalyzers(): Promise<string[]> {+ const { data } = await openHands.get<string[]>(+ "/api/options/security-analyzers",+ );+ return data;+ }++ /**+ * Get the configuration from the server+ * @returns Configuration response+ */+ static async getConfig(): Promise<GetConfigResponse> {+ const { data } = await openHands.get<GetConfigResponse>(+ "/api/options/config",+ );+ return data;+ }+}++export default OptionService;diff --git a/frontend/src/api/option-service/option.types.ts b/frontend/src/api/option-service/option.types.tsnew file mode 100644index 0000000000..fa84227f0d--- /dev/null+++ b/frontend/src/api/option-service/option.types.ts@@ -0,0 +1,20 @@+import { Provider } from "#/types/settings";++export interface GetConfigResponse {+ APP_MODE: "saas" | "oss";+ APP_SLUG?: string;+ GITHUB_CLIENT_ID: string;+ POSTHOG_CLIENT_KEY: string;+ PROVIDERS_CONFIGURED?: Provider[];+ AUTH_URL?: string;+ FEATURE_FLAGS: {+ ENABLE_BILLING: boolean;+ HIDE_LLM_SETTINGS: boolean;+ ENABLE_JIRA: boolean;+ ENABLE_JIRA_DC: boolean;+ ENABLE_LINEAR: boolean;+ };+ MAINTENANCE?: {+ startTime: string;+ };+}diff --git a/frontend/src/components/features/waitlist/auth-modal.tsx b/frontend/src/components/features/waitlist/auth-modal.tsxindex 9fb72d35c2..362bbdff32 100644--- a/frontend/src/components/features/waitlist/auth-modal.tsx+++ b/frontend/src/components/features/waitlist/auth-modal.tsx@@ -9,7 +9,7 @@ import GitHubLogo from "#/assets/branding/github-logo.svg?react";import GitLabLogo from "#/assets/branding/gitlab-logo.svg?react";import BitbucketLogo from "#/assets/branding/bitbucket-logo.svg?react";import { useAuthUrl } from "#/hooks/use-auth-url";-import { GetConfigResponse } from "#/api/open-hands.types";+import { GetConfigResponse } from "#/api/option-service/option.types";import { Provider } from "#/types/settings";interface AuthModalProps {diff --git a/frontend/src/entry.client.tsx b/frontend/src/entry.client.tsxindex b673a0454b..e7d0aa56ad 100644--- a/frontend/src/entry.client.tsx+++ b/frontend/src/entry.client.tsx@@ -13,7 +13,7 @@ import posthog from "posthog-js";import "./i18n";import { QueryClientProvider } from "@tanstack/react-query";import store from "./store";-import OpenHands from "./api/open-hands";+import OptionService from "./api/option-service/option-service.api";import { displayErrorToast } from "./utils/custom-toast-handlers";import { queryClient } from "./query-client-config";@@ -25,7 +25,7 @@ function PosthogInit() {React.useEffect(() => {(async () => {try {- const config = await OpenHands.getConfig();+ const config = await OptionService.getConfig();setPosthogClientKey(config.POSTHOG_CLIENT_KEY);} catch (error) {displayErrorToast("Error fetching PostHog client key");diff --git a/frontend/src/hooks/query/use-ai-config-options.ts b/frontend/src/hooks/query/use-ai-config-options.tsindex f5b9a6f4ca..50ec828b74 100644--- a/frontend/src/hooks/query/use-ai-config-options.ts+++ b/frontend/src/hooks/query/use-ai-config-options.ts@@ -1,10 +1,10 @@import { useQuery } from "@tanstack/react-query";-import OpenHands from "#/api/open-hands";+import OptionService from "#/api/option-service/option-service.api";const fetchAiConfigOptions = async () => ({- models: await OpenHands.getModels(),- agents: await OpenHands.getAgents(),- securityAnalyzers: await OpenHands.getSecurityAnalyzers(),+ models: await OptionService.getModels(),+ agents: await OptionService.getAgents(),+ securityAnalyzers: await OptionService.getSecurityAnalyzers(),});export const useAIConfigOptions = () =>diff --git a/frontend/src/hooks/query/use-config.ts b/frontend/src/hooks/query/use-config.tsindex e1b93cfe4c..1f5a14250b 100644--- a/frontend/src/hooks/query/use-config.ts+++ b/frontend/src/hooks/query/use-config.ts@@ -1,5 +1,5 @@import { useQuery } from "@tanstack/react-query";-import OpenHands from "#/api/open-hands";+import OptionService from "#/api/option-service/option-service.api";import { useIsOnTosPage } from "#/hooks/use-is-on-tos-page";export const useConfig = () => {@@ -7,7 +7,7 @@ export const useConfig = () => {return useQuery({queryKey: ["config"],- queryFn: OpenHands.getConfig,+ queryFn: OptionService.getConfig,staleTime: 1000 * 60 * 5, // 5 minutesgcTime: 1000 * 60 * 15, // 15 minutes,enabled: !isOnTosPage,diff --git a/frontend/src/hooks/use-auth-url.ts b/frontend/src/hooks/use-auth-url.tsindex a5e357c9c4..c6a7d56a40 100644--- a/frontend/src/hooks/use-auth-url.ts+++ b/frontend/src/hooks/use-auth-url.ts@@ -1,5 +1,5 @@import { generateAuthUrl } from "#/utils/generate-auth-url";-import { GetConfigResponse } from "#/api/open-hands.types";+import { GetConfigResponse } from "#/api/option-service/option.types";interface UseAuthUrlConfig {appMode: GetConfigResponse["APP_MODE"] | null;diff --git a/frontend/src/hooks/use-github-auth-url.ts b/frontend/src/hooks/use-github-auth-url.tsindex de30371d8b..699b394fb8 100644--- a/frontend/src/hooks/use-github-auth-url.ts+++ b/frontend/src/hooks/use-github-auth-url.ts@@ -1,5 +1,5 @@import { useAuthUrl } from "./use-auth-url";-import { GetConfigResponse } from "#/api/open-hands.types";+import { GetConfigResponse } from "#/api/option-service/option.types";interface UseGitHubAuthUrlConfig {appMode: GetConfigResponse["APP_MODE"] | null;diff --git a/frontend/src/mocks/handlers.ts b/frontend/src/mocks/handlers.tsindex e22f53bd32..88ff9e71c3 100644--- a/frontend/src/mocks/handlers.ts+++ b/frontend/src/mocks/handlers.ts@@ -1,9 +1,6 @@import { delay, http, HttpResponse } from "msw";-import {- Conversation,- ResultSet,- GetConfigResponse,-} from "#/api/open-hands.types";+import { GetConfigResponse } from "#/api/option-service/option.types";+import { Conversation, ResultSet } from "#/api/open-hands.types";import { DEFAULT_SETTINGS } from "#/services/settings";import { STRIPE_BILLING_HANDLERS } from "./billing-handlers";import { Provider } from "#/types/settings";diff --git a/frontend/src/routes/microagent-management.tsx b/frontend/src/routes/microagent-management.tsxindex e213dec0c4..cd2e70e909 100644--- a/frontend/src/routes/microagent-management.tsx+++ b/frontend/src/routes/microagent-management.tsx@@ -1,6 +1,6 @@import { queryClient } from "#/query-client-config";-import { GetConfigResponse } from "#/api/open-hands.types";-import OpenHands from "#/api/open-hands";+import { GetConfigResponse } from "#/api/option-service/option.types";+import OptionService from "#/api/option-service/option-service.api";import { MicroagentManagementContent } from "#/components/features/microagent-management/microagent-management-content";import { ConversationSubscriptionsProvider } from "#/context/conversation-subscriptions-provider";import { EventHandler } from "#/wrapper/event-handler";@@ -8,7 +8,7 @@ import { EventHandler } from "#/wrapper/event-handler";export const clientLoader = async () => {let config = queryClient.getQueryData<GetConfigResponse>(["config"]);if (!config) {- config = await OpenHands.getConfig();+ config = await OptionService.getConfig();queryClient.setQueryData<GetConfigResponse>(["config"], config);}diff --git a/frontend/src/routes/settings.tsx b/frontend/src/routes/settings.tsxindex fab905b433..76b67154b2 100644--- a/frontend/src/routes/settings.tsx+++ b/frontend/src/routes/settings.tsx@@ -6,9 +6,9 @@ import { cn } from "#/utils/utils";import { useConfig } from "#/hooks/query/use-config";import { I18nKey } from "#/i18n/declaration";import { Route } from "./+types/settings";-import OpenHands from "#/api/open-hands";+import OptionService from "#/api/option-service/option-service.api";import { queryClient } from "#/query-client-config";-import { GetConfigResponse } from "#/api/open-hands.types";+import { GetConfigResponse } from "#/api/option-service/option.types";import { useSubscriptionAccess } from "#/hooks/query/use-subscription-access";const SAAS_ONLY_PATHS = [@@ -42,7 +42,7 @@ export const clientLoader = async ({ request }: Route.ClientLoaderArgs) => {let config = queryClient.getQueryData<GetConfigResponse>(["config"]);if (!config) {- config = await OpenHands.getConfig();+ config = await OptionService.getConfig();queryClient.setQueryData<GetConfigResponse>(["config"], config);}