({
+ key: agent,
+ label: agent, // TODO: Add i18n support for agent names
+ })) || []
+ }
+ defaultSelectedKey={settings.agent}
+ isClearable={false}
+ onInputChange={handleAgentIsDirty}
+ wrapperClassName="w-full max-w-[680px]"
+ />
+ )}
)}
@@ -600,11 +662,11 @@ function LlmSettingsScreen() {
step={1}
label={t(I18nKey.SETTINGS$CONDENSER_MAX_SIZE)}
defaultValue={(
- settings.CONDENSER_MAX_SIZE ??
- DEFAULT_SETTINGS.CONDENSER_MAX_SIZE
+ settings.condenser_max_size ??
+ DEFAULT_SETTINGS.condenser_max_size
)?.toString()}
onChange={(value) => handleCondenserMaxSizeIsDirty(value)}
- isDisabled={!settings.ENABLE_DEFAULT_CONDENSER}
+ isDisabled={!settings.enable_default_condenser}
/>
{t(I18nKey.SETTINGS$CONDENSER_MAX_SIZE_TOOLTIP)}
@@ -614,7 +676,7 @@ function LlmSettingsScreen() {
{t(I18nKey.SETTINGS$ENABLE_MEMORY_CONDENSATION)}
@@ -626,7 +688,7 @@ function LlmSettingsScreen() {
testId="enable-confirmation-mode-switch"
name="enable-confirmation-mode-switch"
onToggle={handleConfirmationModeIsDirty}
- defaultIsToggled={settings.CONFIRMATION_MODE}
+ defaultIsToggled={settings.confirmation_mode}
isBeta
>
{t(I18nKey.SETTINGS$CONFIRMATION_MODE)}
diff --git a/frontend/src/routes/mcp-settings.tsx b/frontend/src/routes/mcp-settings.tsx
index 0a4224182bd0..e308b45228cc 100644
--- a/frontend/src/routes/mcp-settings.tsx
+++ b/frontend/src/routes/mcp-settings.tsx
@@ -41,7 +41,7 @@ function MCPSettingsScreen() {
useState(false);
const [serverToDelete, setServerToDelete] = useState(null);
- const mcpConfig: MCPConfig = settings?.MCP_CONFIG || {
+ const mcpConfig: MCPConfig = settings?.mcp_config || {
sse_servers: [],
stdio_servers: [],
shttp_servers: [],
diff --git a/frontend/src/routes/planner-tab.tsx b/frontend/src/routes/planner-tab.tsx
index a3002c665119..f17a0acbc52a 100644
--- a/frontend/src/routes/planner-tab.tsx
+++ b/frontend/src/routes/planner-tab.tsx
@@ -1,49 +1,31 @@
+import React from "react";
import { useTranslation } from "react-i18next";
-import Markdown from "react-markdown";
-import remarkGfm from "remark-gfm";
-import remarkBreaks from "remark-breaks";
import { I18nKey } from "#/i18n/declaration";
import LessonPlanIcon from "#/icons/lesson-plan.svg?react";
-import { useConversationStore } from "#/state/conversation-store";
-import { code } from "#/components/features/markdown/code";
-import { ul, ol } from "#/components/features/markdown/list";
-import { paragraph } from "#/components/features/markdown/paragraph";
-import { anchor } from "#/components/features/markdown/anchor";
-import {
- h1,
- h2,
- h3,
- h4,
- h5,
- h6,
-} from "#/components/features/markdown/headings";
+import { useConversationStore } from "#/stores/conversation-store";
+import { useScrollToBottom } from "#/hooks/use-scroll-to-bottom";
+import { MarkdownRenderer } from "#/components/features/markdown/markdown-renderer";
+import { useHandlePlanClick } from "#/hooks/use-handle-plan-click";
function PlannerTab() {
const { t } = useTranslation();
+ const { scrollRef: scrollContainerRef, onChatBodyScroll } = useScrollToBottom(
+ React.useRef(null),
+ );
- const { planContent, setConversationMode } = useConversationStore();
+ const { planContent } = useConversationStore();
+ const { handlePlanClick } = useHandlePlanClick();
- if (planContent) {
+ if (planContent !== null && planContent !== undefined) {
return (
-
-
+ onChatBodyScroll(e.currentTarget)}
+ className="flex flex-col w-full h-full p-4 overflow-auto"
+ >
+
{planContent}
-
+
);
}
@@ -56,7 +38,7 @@ function PlannerTab() {
setConversationMode("plan")}
+ onClick={handlePlanClick}
className="flex w-[164px] h-[40px] p-2 justify-center items-center shrink-0 rounded-lg bg-white overflow-hidden text-black text-ellipsis font-sans text-[16px] not-italic font-normal leading-[20px] hover:cursor-pointer hover:opacity-80"
>
{t(I18nKey.COMMON$CREATE_A_PLAN)}
diff --git a/frontend/src/routes/root-layout.tsx b/frontend/src/routes/root-layout.tsx
index 264ae541c88d..876c4d8c11a1 100644
--- a/frontend/src/routes/root-layout.tsx
+++ b/frontend/src/routes/root-layout.tsx
@@ -106,16 +106,16 @@ export default function MainApp() {
React.useEffect(() => {
// Don't change language when on TOS page
- if (!isOnTosPage && settings?.LANGUAGE) {
- i18n.changeLanguage(settings.LANGUAGE);
+ if (!isOnTosPage && settings?.language) {
+ i18n.changeLanguage(settings.language);
}
- }, [settings?.LANGUAGE, isOnTosPage]);
+ }, [settings?.language, isOnTosPage]);
React.useEffect(() => {
// Don't show consent form when on TOS page
if (!isOnTosPage) {
const consentFormModalIsOpen =
- settings?.USER_CONSENTS_TO_ANALYTICS === null;
+ settings?.user_consents_to_analytics === null;
setConsentFormIsOpen(consentFormModalIsOpen);
}
@@ -134,10 +134,10 @@ export default function MainApp() {
}, [isOnTosPage]);
React.useEffect(() => {
- if (settings?.IS_NEW_USER && config.data?.APP_MODE === "saas") {
+ if (settings?.is_new_user && config.data?.APP_MODE === "saas") {
displaySuccessToast(t(I18nKey.BILLING$YOURE_IN));
}
- }, [settings?.IS_NEW_USER, config.data?.APP_MODE]);
+ }, [settings?.is_new_user, config.data?.APP_MODE]);
React.useEffect(() => {
// Don't do any redirects when on TOS page
@@ -249,7 +249,7 @@ export default function MainApp() {
{config.data?.FEATURE_FLAGS.ENABLE_BILLING &&
config.data?.APP_MODE === "saas" &&
- settings?.IS_NEW_USER && resetUrl()} className="text-sm">
+ resetUrl()}
+ className="text-sm"
+ aria-label={t(I18nKey.BUTTON$HOME)}
+ >
diff --git a/frontend/src/routes/settings.tsx b/frontend/src/routes/settings.tsx
index 19370245b330..4f35595d1319 100644
--- a/frontend/src/routes/settings.tsx
+++ b/frontend/src/routes/settings.tsx
@@ -1,14 +1,13 @@
import { useMemo } from "react";
import { Outlet, redirect, useLocation } from "react-router";
import { useTranslation } from "react-i18next";
-import { useConfig } from "#/hooks/query/use-config";
import { Route } from "./+types/settings";
import OptionService from "#/api/option-service/option-service.api";
import { queryClient } from "#/query-client-config";
import { GetConfigResponse } from "#/api/option-service/option.types";
-import { SAAS_NAV_ITEMS, OSS_NAV_ITEMS } from "#/constants/settings-nav";
-import { Typography } from "#/ui/typography";
import { SettingsLayout } from "#/components/features/settings/settings-layout";
+import { Typography } from "#/ui/typography";
+import { useSettingsNavItems } from "#/hooks/use-settings-nav-items";
const SAAS_ONLY_PATHS = [
"/settings/user",
@@ -33,32 +32,26 @@ export const clientLoader = async ({ request }: Route.ClientLoaderArgs) => {
// if in OSS mode, do not allow access to saas-only paths
return redirect("/settings");
}
+ // If LLM settings are hidden and user tries to access the LLM settings page
+ if (config?.FEATURE_FLAGS?.HIDE_LLM_SETTINGS && pathname === "/settings") {
+ // Redirect to the first available settings page
+ return isSaas ? redirect("/settings/user") : redirect("/settings/mcp");
+ }
return null;
};
function SettingsScreen() {
const { t } = useTranslation();
- const { data: config } = useConfig();
const location = useLocation();
-
- const isSaas = config?.APP_MODE === "saas";
-
- // Navigation items configuration
- const navItems = useMemo(() => {
- const items = [];
- if (isSaas) {
- items.push(...SAAS_NAV_ITEMS);
- } else {
- items.push(...OSS_NAV_ITEMS);
- }
- return items;
- }, [isSaas]);
-
+ const navItems = useSettingsNavItems();
// Current section title for the main content area
const currentSectionTitle = useMemo(() => {
const currentItem = navItems.find((item) => item.to === location.pathname);
- return currentItem ? currentItem.text : "SETTINGS$NAV_LLM";
+ // Default to the first available navigation item if current page is not found
+ return currentItem
+ ? currentItem.text
+ : (navItems[0]?.text ?? "SETTINGS$TITLE");
}, [navItems, location.pathname]);
return (
diff --git a/frontend/src/routes/user-settings.tsx b/frontend/src/routes/user-settings.tsx
index 93366574b051..cddc38466ebf 100644
--- a/frontend/src/routes/user-settings.tsx
+++ b/frontend/src/routes/user-settings.tsx
@@ -122,12 +122,12 @@ function UserSettingsScreen() {
const prevVerificationStatusRef = useRef(undefined);
useEffect(() => {
- if (settings?.EMAIL) {
- setEmail(settings.EMAIL);
- setOriginalEmail(settings.EMAIL);
- setIsEmailValid(EMAIL_REGEX.test(settings.EMAIL));
+ if (settings?.email) {
+ setEmail(settings.email);
+ setOriginalEmail(settings.email);
+ setIsEmailValid(EMAIL_REGEX.test(settings.email));
}
- }, [settings?.EMAIL]);
+ }, [settings?.email]);
useEffect(() => {
if (pollingIntervalRef.current) {
@@ -137,7 +137,7 @@ function UserSettingsScreen() {
if (
prevVerificationStatusRef.current === false &&
- settings?.EMAIL_VERIFIED === true
+ settings?.email_verified === true
) {
// Display toast notification instead of setting state
displaySuccessToast(t("SETTINGS$EMAIL_VERIFIED_SUCCESSFULLY"));
@@ -146,9 +146,9 @@ function UserSettingsScreen() {
}, 2000);
}
- prevVerificationStatusRef.current = settings?.EMAIL_VERIFIED;
+ prevVerificationStatusRef.current = settings?.email_verified;
- if (settings?.EMAIL_VERIFIED === false) {
+ if (settings?.email_verified === false) {
pollingIntervalRef.current = window.setInterval(() => {
refetch();
}, 5000);
@@ -160,7 +160,7 @@ function UserSettingsScreen() {
pollingIntervalRef.current = null;
}
};
- }, [settings?.EMAIL_VERIFIED, refetch, queryClient, t]);
+ }, [settings?.email_verified, refetch, queryClient, t]);
const handleEmailChange = (e: React.ChangeEvent) => {
const newEmail = e.target.value;
@@ -215,10 +215,10 @@ function UserSettingsScreen() {
isSaving={isSaving}
isResendingVerification={isResendingVerification}
isEmailChanged={isEmailChanged}
- emailVerified={settings?.EMAIL_VERIFIED}
+ emailVerified={settings?.email_verified}
isEmailValid={isEmailValid}
>
- {settings?.EMAIL_VERIFIED === false &&
diff --git a/frontend/src/routes/vscode-tab.tsx b/frontend/src/routes/vscode-tab.tsx
index 0d64180c1d2f..e1bb2e8fe4cb 100644
--- a/frontend/src/routes/vscode-tab.tsx
+++ b/frontend/src/routes/vscode-tab.tsx
@@ -51,7 +51,7 @@ function VSCodeTab() {
);
}
- if (error || (data && data.error) || !data?.url || iframeError) {
+ if (error || data?.error || !data?.url || iframeError) {
return (
{iframeError ||
diff --git a/frontend/src/services/actions.ts b/frontend/src/services/actions.ts
index 86b89106ff09..6f03c526e124 100644
--- a/frontend/src/services/actions.ts
+++ b/frontend/src/services/actions.ts
@@ -1,6 +1,6 @@
import { trackError } from "#/utils/error-handler";
import useMetricsStore from "#/stores/metrics-store";
-import { useStatusStore } from "#/state/status-store";
+import { useStatusStore } from "#/stores/status-store";
import ActionType from "#/types/action-type";
import {
ActionMessage,
@@ -8,7 +8,7 @@ import {
StatusMessage,
} from "#/types/message";
import { handleObservationMessage } from "./observations";
-import { useCommandStore } from "#/state/command-store";
+import { useCommandStore } from "#/stores/command-store";
import { queryClient } from "#/query-client-config";
import {
ActionSecurityRisk,
diff --git a/frontend/src/services/observations.ts b/frontend/src/services/observations.ts
index 40cc1daa8a27..8f1d8d3b4119 100644
--- a/frontend/src/services/observations.ts
+++ b/frontend/src/services/observations.ts
@@ -1,5 +1,5 @@
import { ObservationMessage } from "#/types/message";
-import { useCommandStore } from "#/state/command-store";
+import { useCommandStore } from "#/stores/command-store";
import ObservationType from "#/types/observation-type";
import { useBrowserStore } from "#/stores/browser-store";
import { useAgentStore } from "#/stores/agent-store";
diff --git a/frontend/src/services/settings.ts b/frontend/src/services/settings.ts
index f7cad15b43a9..e4a04b1e87f2 100644
--- a/frontend/src/services/settings.ts
+++ b/frontend/src/services/settings.ts
@@ -3,34 +3,36 @@ import { Settings } from "#/types/settings";
export const LATEST_SETTINGS_VERSION = 5;
export const DEFAULT_SETTINGS: Settings = {
- LLM_MODEL: "openhands/claude-sonnet-4-20250514",
- LLM_BASE_URL: "",
- AGENT: "CodeActAgent",
- LANGUAGE: "en",
- LLM_API_KEY_SET: false,
- SEARCH_API_KEY_SET: false,
- CONFIRMATION_MODE: false,
- SECURITY_ANALYZER: "llm",
- REMOTE_RUNTIME_RESOURCE_FACTOR: 1,
- PROVIDER_TOKENS_SET: {},
- ENABLE_DEFAULT_CONDENSER: true,
- CONDENSER_MAX_SIZE: 120,
- ENABLE_SOUND_NOTIFICATIONS: false,
- USER_CONSENTS_TO_ANALYTICS: false,
- ENABLE_PROACTIVE_CONVERSATION_STARTERS: false,
- ENABLE_SOLVABILITY_ANALYSIS: false,
- SEARCH_API_KEY: "",
- IS_NEW_USER: true,
- MAX_BUDGET_PER_TASK: null,
- EMAIL: "",
- EMAIL_VERIFIED: true, // Default to true to avoid restricting access unnecessarily
- MCP_CONFIG: {
+ llm_model: "openhands/claude-opus-4-5-20251101",
+ llm_base_url: "",
+ agent: "CodeActAgent",
+ language: "en",
+ llm_api_key: null,
+ llm_api_key_set: false,
+ search_api_key_set: false,
+ confirmation_mode: false,
+ security_analyzer: "llm",
+ remote_runtime_resource_factor: 1,
+ provider_tokens_set: {},
+ enable_default_condenser: true,
+ condenser_max_size: 120,
+ enable_sound_notifications: false,
+ user_consents_to_analytics: false,
+ enable_proactive_conversation_starters: false,
+ enable_solvability_analysis: false,
+ search_api_key: "",
+ is_new_user: true,
+ max_budget_per_task: null,
+ email: "",
+ email_verified: true, // Default to true to avoid restricting access unnecessarily
+ mcp_config: {
sse_servers: [],
stdio_servers: [],
shttp_servers: [],
},
- GIT_USER_NAME: "openhands",
- GIT_USER_EMAIL: "openhands@all-hands.dev",
+ git_user_name: "openhands",
+ git_user_email: "openhands@all-hands.dev",
+ v1_enabled: false,
};
/**
diff --git a/frontend/src/settings-service/settings.types.ts b/frontend/src/settings-service/settings.types.ts
deleted file mode 100644
index bdd1610f4923..000000000000
--- a/frontend/src/settings-service/settings.types.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { Provider } from "#/types/settings";
-
-export type ApiSettings = {
- llm_model: string;
- llm_base_url: string;
- agent: string;
- language: string;
- llm_api_key: string | null;
- llm_api_key_set: boolean;
- search_api_key_set: boolean;
- confirmation_mode: boolean;
- security_analyzer: string | null;
- remote_runtime_resource_factor: number | null;
- enable_default_condenser: boolean;
- // Max size for condenser in backend settings
- condenser_max_size: number | null;
- enable_sound_notifications: boolean;
- enable_proactive_conversation_starters: boolean;
- enable_solvability_analysis: boolean;
- user_consents_to_analytics: boolean | null;
- search_api_key?: string;
- provider_tokens_set: Partial
>;
- max_budget_per_task: number | null;
- mcp_config?: {
- sse_servers: (string | { url: string; api_key?: string })[];
- stdio_servers: {
- name: string;
- command: string;
- args?: string[];
- env?: Record;
- }[];
- shttp_servers: (string | { url: string; api_key?: string })[];
- };
- email?: string;
- email_verified?: boolean;
- git_user_name?: string;
- git_user_email?: string;
-};
-
-export type PostApiSettings = ApiSettings & {
- user_consents_to_analytics: boolean | null;
- search_api_key?: string;
- mcp_config?: {
- sse_servers: (string | { url: string; api_key?: string })[];
- stdio_servers: {
- name: string;
- command: string;
- args?: string[];
- env?: Record;
- }[];
- shttp_servers: (string | { url: string; api_key?: string })[];
- };
-};
diff --git a/frontend/src/state/command-store.ts b/frontend/src/stores/command-store.ts
similarity index 100%
rename from frontend/src/state/command-store.ts
rename to frontend/src/stores/command-store.ts
diff --git a/frontend/src/state/conversation-store.ts b/frontend/src/stores/conversation-store.ts
similarity index 68%
rename from frontend/src/state/conversation-store.ts
rename to frontend/src/stores/conversation-store.ts
index 77186ce69c9a..a8edd16f6a44 100644
--- a/frontend/src/state/conversation-store.ts
+++ b/frontend/src/stores/conversation-store.ts
@@ -56,14 +56,53 @@ interface ConversationActions {
setHasRightPanelToggled: (hasRightPanelToggled: boolean) => void;
setConversationMode: (conversationMode: ConversationMode) => void;
setSubConversationTaskId: (taskId: string | null) => void;
+ setPlanContent: (planContent: string | null) => void;
}
type ConversationStore = ConversationState & ConversationActions;
-// Helper function to get initial right panel state from localStorage
+const getConversationIdFromLocation = (): string | null => {
+ if (typeof window === "undefined") {
+ return null;
+ }
+
+ const match = window.location.pathname.match(/\/conversations\/([^/]+)/);
+ return match ? match[1] : null;
+};
+
+const parseStoredBoolean = (value: string | null): boolean | null => {
+ if (value === null) {
+ return null;
+ }
+
+ try {
+ return JSON.parse(value);
+ } catch {
+ return null;
+ }
+};
+
const getInitialRightPanelState = (): boolean => {
- const stored = localStorage.getItem("conversation-right-panel-shown");
- return stored !== null ? JSON.parse(stored) : true;
+ if (typeof window === "undefined") {
+ return true;
+ }
+
+ const conversationId = getConversationIdFromLocation();
+ const keysToCheck = conversationId
+ ? [`conversation-right-panel-shown-${conversationId}`]
+ : [];
+
+ // Fallback to legacy global key for users who haven't switched tabs yet
+ keysToCheck.push("conversation-right-panel-shown");
+
+ for (const key of keysToCheck) {
+ const parsed = parseStoredBoolean(localStorage.getItem(key));
+ if (parsed !== null) {
+ return parsed;
+ }
+ }
+
+ return true;
};
export const useConversationStore = create()(
@@ -81,91 +120,7 @@ export const useConversationStore = create()(
submittedMessage: null,
shouldHideSuggestions: false,
hasRightPanelToggled: true,
- planContent: `
-# Improve Developer Onboarding and Examples
-
-## Overview
-
-Based on the analysis of Browser-Use's current documentation and examples, this plan addresses gaps in developer onboarding by creating a progressive learning path, troubleshooting resources, and practical examples that address real-world scenarios (like the LM Studio/local LLM integration issues encountered).
-
-## Current State Analysis
-
-**Strengths:**
-
-- Good quickstart documentation in \`docs/quickstart.mdx\`
-- Extensive examples across multiple categories (60+ example files)
-- Well-structured docs with multiple LLM provider examples
-- Active community support via Discord
-
-**Gaps Identified:**
-
-- No progressive tutorial series that builds complexity gradually
-- Limited troubleshooting documentation for common issues
-- Sparse comments in example files explaining what's happening
-- Local LLM setup (Ollama/LM Studio) not prominently featured
-- No "first 10 minutes" success path
-- Missing visual/conceptual architecture guides for beginners
-- Error messages don't always point to solutions
-
-## Proposed Improvements
-
-### 1. Create Interactive Tutorial Series (\`examples/tutorials/\`)
-
-**New folder structure:**
-
-\`\`\`
-examples/tutorials/
-├── README.md # Tutorial overview and prerequisites
-├── 00_hello_world.py # Absolute minimal example
-├── 01_your_first_search.py # Basic search with detailed comments
-├── 02_understanding_actions.py # How actions work
-├── 03_data_extraction_basics.py # Extract data step-by-step
-├── 04_error_handling.py # Common errors and solutions
-├── 05_custom_tools_intro.py # First custom tool
-├── 06_local_llm_setup.py # Ollama/LM Studio complete guide
-└── 07_debugging_tips.py # Debugging strategies
-\`\`\`
-
-**Key Features:**
-
-- Each file 50–80 lines max
-- Extensive inline comments explaining every concept
-- Clear learning objectives at the top of each file
-- "What you'll learn" and "Prerequisites" sections
-- Common pitfalls highlighted
-- Expected output shown in comments
-
-### 2. Troubleshooting Guide (\`docs/troubleshooting.mdx\`)
-
-**Sections:**
-
-- Installation issues (Chromium, dependencies, virtual environments)
-- LLM provider connection errors (API keys, timeouts, rate limits)
-- Local LLM setup (Ollama vs LM Studio, model compatibility)
-- Browser automation issues (element not found, timeout errors)
-- Common error messages with solutions
-- Performance optimization tips
-- When to ask for help (Discord/GitHub)
-
-**Format:**
-
-**Error: "LLM call timed out after 60 seconds"**
-
-**What it means:**
-The model took too long to respond
-
-**Common causes:**
-
-1. Model is too slow for the task
-2. LM Studio/Ollama not responding properly
-3. Complex page overwhelming the model
-
-**Solutions:**
-
-- Use flash_mode for faster execution
-- Try a faster model (Gemini Flash, GPT-4 Turbo Mini)
-- Simplify the task
-- Check model server logs`,
+ planContent: null,
conversationMode: "code",
subConversationTaskId: null,
@@ -304,6 +259,7 @@ The model took too long to respond
shouldHideSuggestions: false,
conversationMode: "code",
subConversationTaskId: null,
+ planContent: null,
},
false,
"resetConversationState",
@@ -317,6 +273,9 @@ The model took too long to respond
setSubConversationTaskId: (subConversationTaskId) =>
set({ subConversationTaskId }, false, "setSubConversationTaskId"),
+
+ setPlanContent: (planContent) =>
+ set({ planContent }, false, "setPlanContent"),
}),
{
name: "conversation-store",
diff --git a/frontend/src/stores/home-store.ts b/frontend/src/stores/home-store.ts
index 3ec2ed2c26a4..6289f65f0160 100644
--- a/frontend/src/stores/home-store.ts
+++ b/frontend/src/stores/home-store.ts
@@ -1,21 +1,26 @@
import { create } from "zustand";
import { persist, createJSONStorage } from "zustand/middleware";
import { GitRepository } from "#/types/git";
+import { Provider } from "#/types/settings";
interface HomeState {
recentRepositories: GitRepository[];
+ lastSelectedProvider: Provider | null;
}
interface HomeActions {
addRecentRepository: (repository: GitRepository) => void;
clearRecentRepositories: () => void;
getRecentRepositories: () => GitRepository[];
+ setLastSelectedProvider: (provider: Provider | null) => void;
+ getLastSelectedProvider: () => Provider | null;
}
type HomeStore = HomeState & HomeActions;
const initialState: HomeState = {
recentRepositories: [],
+ lastSelectedProvider: null,
};
export const useHomeStore = create()(
@@ -44,6 +49,13 @@ export const useHomeStore = create()(
})),
getRecentRepositories: () => get().recentRepositories,
+
+ setLastSelectedProvider: (provider: Provider | null) =>
+ set(() => ({
+ lastSelectedProvider: provider,
+ })),
+
+ getLastSelectedProvider: () => get().lastSelectedProvider,
}),
{
name: "home-store", // unique name for localStorage
diff --git a/frontend/src/state/microagent-management-store.ts b/frontend/src/stores/microagent-management-store.ts
similarity index 100%
rename from frontend/src/state/microagent-management-store.ts
rename to frontend/src/stores/microagent-management-store.ts
diff --git a/frontend/src/state/status-store.ts b/frontend/src/stores/status-store.ts
similarity index 100%
rename from frontend/src/state/status-store.ts
rename to frontend/src/stores/status-store.ts
diff --git a/frontend/src/stores/use-event-store.ts b/frontend/src/stores/use-event-store.ts
index 307f4ced0d7b..2d8ecf0a3b6c 100644
--- a/frontend/src/stores/use-event-store.ts
+++ b/frontend/src/stores/use-event-store.ts
@@ -5,7 +5,9 @@ import { OpenHandsParsedEvent } from "#/types/core";
import { isV1Event } from "#/types/v1/type-guards";
// While we transition to v1 events, our store can handle both v0 and v1 events
-type OHEvent = OpenHandsEvent | OpenHandsParsedEvent;
+type OHEvent = (OpenHandsEvent | OpenHandsParsedEvent) & {
+ isFromPlanningAgent?: boolean;
+};
interface EventState {
events: OHEvent[];
diff --git a/frontend/src/tailwind.css b/frontend/src/tailwind.css
index 8228f6b15440..16732885646a 100644
--- a/frontend/src/tailwind.css
+++ b/frontend/src/tailwind.css
@@ -318,8 +318,8 @@
background: transparent !important;
}
-/* Ensure all xterm elements have transparent backgrounds */
-.xterm * {
+/* Ensure all xterm DOM elements have transparent backgrounds. Exclude canvas elements */
+.xterm {
background: transparent !important;
}
diff --git a/frontend/src/types/core/actions.ts b/frontend/src/types/core/actions.ts
index 89852f16e31e..bb80971e3285 100644
--- a/frontend/src/types/core/actions.ts
+++ b/frontend/src/types/core/actions.ts
@@ -31,8 +31,7 @@ export interface CommandAction extends OpenHandsActionEvent<"run"> {
};
}
-export interface AssistantMessageAction
- extends OpenHandsActionEvent<"message"> {
+export interface AssistantMessageAction extends OpenHandsActionEvent<"message"> {
source: "agent";
args: {
thought: string;
@@ -87,8 +86,7 @@ export interface BrowseAction extends OpenHandsActionEvent<"browse"> {
};
}
-export interface BrowseInteractiveAction
- extends OpenHandsActionEvent<"browse_interactive"> {
+export interface BrowseInteractiveAction extends OpenHandsActionEvent<"browse_interactive"> {
source: "agent";
timeout: number;
args: {
@@ -162,8 +160,7 @@ export interface MCPAction extends OpenHandsActionEvent<"call_tool_mcp"> {
};
}
-export interface TaskTrackingAction
- extends OpenHandsActionEvent<"task_tracking"> {
+export interface TaskTrackingAction extends OpenHandsActionEvent<"task_tracking"> {
source: "agent";
args: {
command: string;
diff --git a/frontend/src/types/core/base.ts b/frontend/src/types/core/base.ts
index 4014d2bbb5fa..e305bf7d4d6d 100644
--- a/frontend/src/types/core/base.ts
+++ b/frontend/src/types/core/base.ts
@@ -30,14 +30,16 @@ interface OpenHandsBaseEvent {
timestamp: string; // ISO 8601
}
-export interface OpenHandsActionEvent
- extends OpenHandsBaseEvent {
+export interface OpenHandsActionEvent<
+ T extends OpenHandsEventType,
+> extends OpenHandsBaseEvent {
action: T;
args: Record;
}
-export interface OpenHandsObservationEvent
- extends OpenHandsBaseEvent {
+export interface OpenHandsObservationEvent<
+ T extends OpenHandsEventType,
+> extends OpenHandsBaseEvent {
cause: number;
observation: T;
content: string;
diff --git a/frontend/src/types/core/observations.ts b/frontend/src/types/core/observations.ts
index 01a73ec81beb..2741926fdaf7 100644
--- a/frontend/src/types/core/observations.ts
+++ b/frontend/src/types/core/observations.ts
@@ -1,8 +1,7 @@
import { AgentState } from "../agent-state";
import { OpenHandsObservationEvent } from "./base";
-export interface AgentStateChangeObservation
- extends OpenHandsObservationEvent<"agent_state_changed"> {
+export interface AgentStateChangeObservation extends OpenHandsObservationEvent<"agent_state_changed"> {
source: "agent";
extras: {
agent_state: AgentState;
@@ -19,8 +18,7 @@ export interface CommandObservation extends OpenHandsObservationEvent<"run"> {
};
}
-export interface IPythonObservation
- extends OpenHandsObservationEvent<"run_ipython"> {
+export interface IPythonObservation extends OpenHandsObservationEvent<"run_ipython"> {
source: "agent";
extras: {
code: string;
@@ -28,8 +26,7 @@ export interface IPythonObservation
};
}
-export interface DelegateObservation
- extends OpenHandsObservationEvent<"delegate"> {
+export interface DelegateObservation extends OpenHandsObservationEvent<"delegate"> {
source: "agent";
extras: {
outputs: Record;
@@ -53,8 +50,7 @@ export interface BrowseObservation extends OpenHandsObservationEvent<"browse"> {
};
}
-export interface BrowseInteractiveObservation
- extends OpenHandsObservationEvent<"browse_interactive"> {
+export interface BrowseInteractiveObservation extends OpenHandsObservationEvent<"browse_interactive"> {
source: "agent";
extras: {
url: string;
@@ -103,8 +99,7 @@ export interface ErrorObservation extends OpenHandsObservationEvent<"error"> {
};
}
-export interface AgentThinkObservation
- extends OpenHandsObservationEvent<"think"> {
+export interface AgentThinkObservation extends OpenHandsObservationEvent<"think"> {
source: "agent";
extras: {
thought: string;
@@ -141,14 +136,12 @@ export interface MCPObservation extends OpenHandsObservationEvent<"mcp"> {
};
}
-export interface UserRejectedObservation
- extends OpenHandsObservationEvent<"user_rejected"> {
+export interface UserRejectedObservation extends OpenHandsObservationEvent<"user_rejected"> {
source: "agent";
extras: Record;
}
-export interface TaskTrackingObservation
- extends OpenHandsObservationEvent<"task_tracking"> {
+export interface TaskTrackingObservation extends OpenHandsObservationEvent<"task_tracking"> {
source: "agent";
extras: {
command: string;
diff --git a/frontend/src/types/settings.ts b/frontend/src/types/settings.ts
index f76fcaa19a95..e5db0296bd1b 100644
--- a/frontend/src/types/settings.ts
+++ b/frontend/src/types/settings.ts
@@ -38,36 +38,31 @@ export type MCPConfig = {
};
export type Settings = {
- LLM_MODEL: string;
- LLM_BASE_URL: string;
- AGENT: string;
- LANGUAGE: string;
- LLM_API_KEY_SET: boolean;
- SEARCH_API_KEY_SET: boolean;
- CONFIRMATION_MODE: boolean;
- SECURITY_ANALYZER: string | null;
- REMOTE_RUNTIME_RESOURCE_FACTOR: number | null;
- PROVIDER_TOKENS_SET: Partial>;
- ENABLE_DEFAULT_CONDENSER: boolean;
+ llm_model: string;
+ llm_base_url: string;
+ agent: string;
+ language: string;
+ llm_api_key: string | null;
+ llm_api_key_set: boolean;
+ search_api_key_set: boolean;
+ confirmation_mode: boolean;
+ security_analyzer: string | null;
+ remote_runtime_resource_factor: number | null;
+ provider_tokens_set: Partial>;
+ enable_default_condenser: boolean;
// Maximum number of events before the condenser runs
- CONDENSER_MAX_SIZE: number | null;
- ENABLE_SOUND_NOTIFICATIONS: boolean;
- ENABLE_PROACTIVE_CONVERSATION_STARTERS: boolean;
- ENABLE_SOLVABILITY_ANALYSIS: boolean;
- USER_CONSENTS_TO_ANALYTICS: boolean | null;
- SEARCH_API_KEY?: string;
- IS_NEW_USER?: boolean;
- MCP_CONFIG?: MCPConfig;
- MAX_BUDGET_PER_TASK: number | null;
- EMAIL?: string;
- EMAIL_VERIFIED?: boolean;
- GIT_USER_NAME?: string;
- GIT_USER_EMAIL?: string;
-};
-
-export type PostSettings = Settings & {
+ condenser_max_size: number | null;
+ enable_sound_notifications: boolean;
+ enable_proactive_conversation_starters: boolean;
+ enable_solvability_analysis: boolean;
user_consents_to_analytics: boolean | null;
- llm_api_key?: string | null;
search_api_key?: string;
+ is_new_user?: boolean;
mcp_config?: MCPConfig;
+ max_budget_per_task: number | null;
+ email?: string;
+ email_verified?: boolean;
+ git_user_name?: string;
+ git_user_email?: string;
+ v1_enabled?: boolean;
};
diff --git a/frontend/src/types/v1/core/base/action.ts b/frontend/src/types/v1/core/base/action.ts
index ce08d5a1b99a..8d3ec41bff48 100644
--- a/frontend/src/types/v1/core/base/action.ts
+++ b/frontend/src/types/v1/core/base/action.ts
@@ -41,6 +41,25 @@ export interface ExecuteBashAction extends ActionBase<"ExecuteBashAction"> {
reset: boolean;
}
+export interface TerminalAction extends ActionBase<"TerminalAction"> {
+ /**
+ * The terminal command to execute.
+ */
+ command: string;
+ /**
+ * If True, the command is an input to the running process. If False, the command is executed directly.
+ */
+ is_input: boolean;
+ /**
+ * Optional max time limit (seconds) for the command.
+ */
+ timeout: number | null;
+ /**
+ * If True, reset the terminal session before running the command.
+ */
+ reset: boolean;
+}
+
export interface FileEditorAction extends ActionBase<"FileEditorAction"> {
/**
* The commands to run. Allowed options are: `view`, `create`, `str_replace`, `insert`, `undo_edit`.
@@ -72,8 +91,7 @@ export interface FileEditorAction extends ActionBase<"FileEditorAction"> {
view_range: [number, number] | null;
}
-export interface StrReplaceEditorAction
- extends ActionBase<"StrReplaceEditorAction"> {
+export interface StrReplaceEditorAction extends ActionBase<"StrReplaceEditorAction"> {
/**
* The commands to run. Allowed options are: `view`, `create`, `str_replace`, `insert`, `undo_edit`.
*/
@@ -115,8 +133,7 @@ export interface TaskTrackerAction extends ActionBase<"TaskTrackerAction"> {
task_list: TaskItem[];
}
-export interface BrowserNavigateAction
- extends ActionBase<"BrowserNavigateAction"> {
+export interface BrowserNavigateAction extends ActionBase<"BrowserNavigateAction"> {
/**
* The URL to navigate to
*/
@@ -149,16 +166,14 @@ export interface BrowserTypeAction extends ActionBase<"BrowserTypeAction"> {
text: string;
}
-export interface BrowserGetStateAction
- extends ActionBase<"BrowserGetStateAction"> {
+export interface BrowserGetStateAction extends ActionBase<"BrowserGetStateAction"> {
/**
* Whether to include a screenshot of the current page. Default: False
*/
include_screenshot: boolean;
}
-export interface BrowserGetContentAction
- extends ActionBase<"BrowserGetContentAction"> {
+export interface BrowserGetContentAction extends ActionBase<"BrowserGetContentAction"> {
/**
* Whether to include links in the content (default: False)
*/
@@ -180,21 +195,18 @@ export interface BrowserGoBackAction extends ActionBase<"BrowserGoBackAction"> {
// No additional properties - this action has no parameters
}
-export interface BrowserListTabsAction
- extends ActionBase<"BrowserListTabsAction"> {
+export interface BrowserListTabsAction extends ActionBase<"BrowserListTabsAction"> {
// No additional properties - this action has no parameters
}
-export interface BrowserSwitchTabAction
- extends ActionBase<"BrowserSwitchTabAction"> {
+export interface BrowserSwitchTabAction extends ActionBase<"BrowserSwitchTabAction"> {
/**
* 4 Character Tab ID of the tab to switch to (from browser_list_tabs)
*/
tab_id: string;
}
-export interface BrowserCloseTabAction
- extends ActionBase<"BrowserCloseTabAction"> {
+export interface BrowserCloseTabAction extends ActionBase<"BrowserCloseTabAction"> {
/**
* 4 Character Tab ID of the tab to close (from browser_list_tabs)
*/
@@ -206,6 +218,7 @@ export type Action =
| FinishAction
| ThinkAction
| ExecuteBashAction
+ | TerminalAction
| FileEditorAction
| StrReplaceEditorAction
| TaskTrackerAction
diff --git a/frontend/src/types/v1/core/base/base.ts b/frontend/src/types/v1/core/base/base.ts
index 5925e8599d43..7704f1105de5 100644
--- a/frontend/src/types/v1/core/base/base.ts
+++ b/frontend/src/types/v1/core/base/base.ts
@@ -3,9 +3,11 @@ type EventType =
| "Finish"
| "Think"
| "ExecuteBash"
+ | "Terminal"
| "FileEditor"
| "StrReplaceEditor"
- | "TaskTracker";
+ | "TaskTracker"
+ | "PlanningFileEditor";
type ActionOnlyType =
| "BrowserNavigate"
@@ -24,7 +26,8 @@ type ObservationOnlyType = "Browser";
type ActionEventType = `${ActionOnlyType}Action` | `${EventType}Action`;
type ObservationEventType =
| `${ObservationOnlyType}Observation`
- | `${EventType}Observation`;
+ | `${EventType}Observation`
+ | "TerminalObservation";
export interface ActionBase {
kind: T;
diff --git a/frontend/src/types/v1/core/base/observation.ts b/frontend/src/types/v1/core/base/observation.ts
index e406e30593fb..a1c8a1a48d25 100644
--- a/frontend/src/types/v1/core/base/observation.ts
+++ b/frontend/src/types/v1/core/base/observation.ts
@@ -6,8 +6,7 @@ import {
ImageContent,
} from "./common";
-export interface MCPToolObservation
- extends ObservationBase<"MCPToolObservation"> {
+export interface MCPToolObservation extends ObservationBase<"MCPToolObservation"> {
/**
* Content returned from the MCP tool converted to LLM Ready TextContent or ImageContent
*/
@@ -22,23 +21,25 @@ export interface MCPToolObservation
tool_name: string;
}
-export interface FinishObservation
- extends ObservationBase<"FinishObservation"> {
+export interface FinishObservation extends ObservationBase<"FinishObservation"> {
/**
- * Final message sent to the user
+ * Content returned from the finish action as a list of TextContent/ImageContent objects.
*/
- message: string;
+ content: Array;
+ /**
+ * Whether the finish action resulted in an error
+ */
+ is_error: boolean;
}
export interface ThinkObservation extends ObservationBase<"ThinkObservation"> {
/**
* Confirmation message. DEFAULT: "Your thought has been logged."
*/
- content: string;
+ content: Array;
}
-export interface BrowserObservation
- extends ObservationBase<"BrowserObservation"> {
+export interface BrowserObservation extends ObservationBase<"BrowserObservation"> {
/**
* The output message from the browser operation
*/
@@ -53,8 +54,7 @@ export interface BrowserObservation
screenshot_data: string | null;
}
-export interface ExecuteBashObservation
- extends ObservationBase<"ExecuteBashObservation"> {
+export interface ExecuteBashObservation extends ObservationBase<"ExecuteBashObservation"> {
/**
* Content returned from the tool as a list of TextContent/ImageContent objects.
*/
@@ -81,8 +81,34 @@ export interface ExecuteBashObservation
metadata: CmdOutputMetadata;
}
-export interface FileEditorObservation
- extends ObservationBase<"FileEditorObservation"> {
+export interface TerminalObservation extends ObservationBase<"TerminalObservation"> {
+ /**
+ * Content returned from the terminal as a list of TextContent/ImageContent objects.
+ */
+ content: Array;
+ /**
+ * The bash command that was executed.
+ */
+ command: string | null;
+ /**
+ * The exit code of the command if it has finished.
+ */
+ exit_code: number | null;
+ /**
+ * Whether the command execution produced an error.
+ */
+ is_error: boolean;
+ /**
+ * Whether the command execution timed out.
+ */
+ timeout: boolean;
+ /**
+ * Additional metadata captured from the shell after command execution.
+ */
+ metadata: CmdOutputMetadata;
+}
+
+export interface FileEditorObservation extends ObservationBase<"FileEditorObservation"> {
/**
* The commands to run. Allowed options are: `view`, `create`, `str_replace`, `insert`, `undo_edit`.
*/
@@ -114,8 +140,7 @@ export interface FileEditorObservation
}
// Keep StrReplaceEditorObservation as a separate interface for backward compatibility
-export interface StrReplaceEditorObservation
- extends ObservationBase<"StrReplaceEditorObservation"> {
+export interface StrReplaceEditorObservation extends ObservationBase<"StrReplaceEditorObservation"> {
/**
* The commands to run. Allowed options are: `view`, `create`, `str_replace`, `insert`, `undo_edit`.
*/
@@ -146,8 +171,7 @@ export interface StrReplaceEditorObservation
error: string | null;
}
-export interface TaskTrackerObservation
- extends ObservationBase<"TaskTrackerObservation"> {
+export interface TaskTrackerObservation extends ObservationBase<"TaskTrackerObservation"> {
/**
* The formatted task list or status message.
*/
@@ -162,12 +186,45 @@ export interface TaskTrackerObservation
task_list: TaskItem[];
}
+export interface PlanningFileEditorObservation extends ObservationBase<"PlanningFileEditorObservation"> {
+ /**
+ * Content returned from the tool as a list of TextContent/ImageContent objects.
+ */
+ content: Array;
+ /**
+ * Whether the call resulted in an error.
+ */
+ is_error: boolean;
+ /**
+ * The commands to run. Allowed options are: `view`, `create`, `str_replace`, `insert`, `undo_edit`.
+ */
+ command: "view" | "create" | "str_replace" | "insert" | "undo_edit";
+ /**
+ * The file path that was edited.
+ */
+ path: string | null;
+ /**
+ * Indicates if the file previously existed. If not, it was created.
+ */
+ prev_exist: boolean;
+ /**
+ * The content of the file before the edit.
+ */
+ old_content: string | null;
+ /**
+ * The content of the file after the edit.
+ */
+ new_content: string | null;
+}
+
export type Observation =
| MCPToolObservation
| FinishObservation
| ThinkObservation
| BrowserObservation
| ExecuteBashObservation
+ | TerminalObservation
| FileEditorObservation
| StrReplaceEditorObservation
- | TaskTrackerObservation;
+ | TaskTrackerObservation
+ | PlanningFileEditorObservation;
diff --git a/frontend/src/types/v1/core/events/conversation-state-event.ts b/frontend/src/types/v1/core/events/conversation-state-event.ts
index 81b3640dfa1a..93679d667170 100644
--- a/frontend/src/types/v1/core/events/conversation-state-event.ts
+++ b/frontend/src/types/v1/core/events/conversation-state-event.ts
@@ -1,11 +1,63 @@
import { BaseEvent } from "../base/event";
import { V1ExecutionStatus } from "../base/common";
+/**
+ * Token usage metrics for LLM calls
+ */
+export interface TokenUsage {
+ model: string;
+ prompt_tokens: number;
+ completion_tokens: number;
+ cache_read_tokens: number;
+ cache_write_tokens: number;
+ reasoning_tokens: number;
+ context_window: number;
+ per_turn_token: number;
+ response_id: string;
+}
+
+/**
+ * LLM metrics for a specific component (agent or condenser)
+ */
+export interface LLMMetrics {
+ model_name: string;
+ accumulated_cost: number;
+ max_budget_per_task: number | null;
+ accumulated_token_usage: TokenUsage;
+ costs: Array<{
+ model: string;
+ cost: number;
+ timestamp: number;
+ }>;
+ response_latencies: Array<{
+ model: string;
+ latency: number;
+ response_id: string;
+ }>;
+ token_usages: TokenUsage[];
+}
+
+/**
+ * Usage metrics mapping for different components
+ */
+export interface UsageToMetrics {
+ agent: LLMMetrics;
+ condenser: LLMMetrics;
+}
+
+/**
+ * Stats containing usage metrics
+ */
+export interface ConversationStats {
+ usage_to_metrics: UsageToMetrics;
+}
+
/**
* Conversation state value types
*/
export interface ConversationState {
execution_status: V1ExecutionStatus;
+ stats?: ConversationStats;
// Add other conversation state fields here as needed
}
@@ -19,32 +71,37 @@ interface ConversationStateUpdateEventBase extends BaseEvent {
* Unique key for this state update event.
* Can be "full_state" for full state snapshots or field names for partial updates.
*/
- key: "full_state" | "execution_status"; // Extend with other keys as needed
+ key: "full_state" | "execution_status" | "stats"; // Extend with other keys as needed
/**
* Conversation state updates
*/
- value: ConversationState | V1ExecutionStatus;
+ value: ConversationState | V1ExecutionStatus | ConversationStats;
}
// Narrowed interfaces for full state update event
-export interface ConversationStateUpdateEventFullState
- extends ConversationStateUpdateEventBase {
+export interface ConversationStateUpdateEventFullState extends ConversationStateUpdateEventBase {
key: "full_state";
value: ConversationState;
}
// Narrowed interface for agent status update event
-export interface ConversationStateUpdateEventAgentStatus
- extends ConversationStateUpdateEventBase {
+export interface ConversationStateUpdateEventAgentStatus extends ConversationStateUpdateEventBase {
key: "execution_status";
value: V1ExecutionStatus;
}
+// Narrowed interface for stats update event
+export interface ConversationStateUpdateEventStats extends ConversationStateUpdateEventBase {
+ key: "stats";
+ value: ConversationStats;
+}
+
// Conversation state update event - contains conversation state updates
export type ConversationStateUpdateEvent =
| ConversationStateUpdateEventFullState
- | ConversationStateUpdateEventAgentStatus;
+ | ConversationStateUpdateEventAgentStatus
+ | ConversationStateUpdateEventStats;
// Conversation error event - contains error information
export interface ConversationErrorEvent extends BaseEvent {
diff --git a/frontend/src/types/v1/core/events/observation-event.ts b/frontend/src/types/v1/core/events/observation-event.ts
index 62750d72898c..bf4e22a70983 100644
--- a/frontend/src/types/v1/core/events/observation-event.ts
+++ b/frontend/src/types/v1/core/events/observation-event.ts
@@ -21,8 +21,9 @@ export interface ObservationBaseEvent extends BaseEvent {
}
// Main observation event interface
-export interface ObservationEvent
- extends ObservationBaseEvent {
+export interface ObservationEvent<
+ T extends Observation = Observation,
+> extends ObservationBaseEvent {
/**
* The observation (tool call) sent to LLM
*/
diff --git a/frontend/src/types/v1/type-guards.ts b/frontend/src/types/v1/type-guards.ts
index b479e4697b5a..dec181620923 100644
--- a/frontend/src/types/v1/type-guards.ts
+++ b/frontend/src/types/v1/type-guards.ts
@@ -3,7 +3,12 @@ import {
ObservationEvent,
BaseEvent,
ExecuteBashAction,
+ TerminalAction,
ExecuteBashObservation,
+ PlanningFileEditorObservation,
+ TerminalObservation,
+ BrowserObservation,
+ BrowserNavigateAction,
} from "./core";
import { AgentErrorEvent } from "./core/events/observation-event";
import { MessageEvent } from "./core/events/message-event";
@@ -12,6 +17,7 @@ import {
ConversationStateUpdateEvent,
ConversationStateUpdateEventAgentStatus,
ConversationStateUpdateEventFullState,
+ ConversationStateUpdateEventStats,
ConversationErrorEvent,
} from "./core/events/conversation-state-event";
import { SystemPromptEvent } from "./core/events/system-event";
@@ -48,7 +54,10 @@ export const isObservationEvent = (
): event is ObservationEvent =>
event.source === "environment" &&
"action_id" in event &&
- "observation" in event;
+ "observation" in event &&
+ event.observation !== null &&
+ typeof event.observation === "object" &&
+ "kind" in event.observation;
/**
* Type guard function to check if an event is an agent error event
@@ -88,6 +97,9 @@ export const isUserMessageEvent = (
export const isActionEvent = (event: OpenHandsEvent): event is ActionEvent =>
event.source === "agent" &&
"action" in event &&
+ event.action !== null &&
+ typeof event.action === "object" &&
+ "kind" in event.action &&
"tool_name" in event &&
"tool_call_id" in event &&
typeof event.tool_name === "string" &&
@@ -98,17 +110,45 @@ export const isActionEvent = (event: OpenHandsEvent): event is ActionEvent =>
*/
export const isExecuteBashActionEvent = (
event: OpenHandsEvent,
-): event is ActionEvent =>
- isActionEvent(event) && event.action.kind === "ExecuteBashAction";
+): event is ActionEvent =>
+ isActionEvent(event) &&
+ (event.action.kind === "ExecuteBashAction" ||
+ event.action.kind === "TerminalAction");
/**
- * Type guard function to check if an observation event is an ExecuteBashObservation
+ * Type guard function to check if an observation event contains terminal output
*/
export const isExecuteBashObservationEvent = (
event: OpenHandsEvent,
-): event is ObservationEvent =>
+): event is ObservationEvent =>
isObservationEvent(event) &&
- event.observation.kind === "ExecuteBashObservation";
+ (event.observation.kind === "ExecuteBashObservation" ||
+ event.observation.kind === "TerminalObservation");
+
+/**
+ * Type guard function to check if an observation event is a PlanningFileEditorObservation
+ */
+export const isPlanningFileEditorObservationEvent = (
+ event: OpenHandsEvent,
+): event is ObservationEvent =>
+ isObservationEvent(event) &&
+ event.observation.kind === "PlanningFileEditorObservation";
+
+/**
+ * Type guard function to check if an observation event is a BrowserObservation
+ */
+export const isBrowserObservationEvent = (
+ event: OpenHandsEvent,
+): event is ObservationEvent =>
+ isObservationEvent(event) && event.observation.kind === "BrowserObservation";
+
+/**
+ * Type guard function to check if an action event is a BrowserNavigateAction
+ */
+export const isBrowserNavigateActionEvent = (
+ event: OpenHandsEvent,
+): event is ActionEvent =>
+ isActionEvent(event) && event.action.kind === "BrowserNavigateAction";
/**
* Type guard function to check if an event is a system prompt event
@@ -139,6 +179,10 @@ export const isAgentStatusConversationStateUpdateEvent = (
): event is ConversationStateUpdateEventAgentStatus =>
event.key === "execution_status";
+export const isStatsConversationStateUpdateEvent = (
+ event: ConversationStateUpdateEvent,
+): event is ConversationStateUpdateEventStats => event.key === "stats";
+
/**
* Type guard function to check if an event is a conversation error event
*/
diff --git a/frontend/src/utils/extract-model-and-provider.ts b/frontend/src/utils/extract-model-and-provider.ts
index 93ef12d8bf16..ab0836079f5b 100644
--- a/frontend/src/utils/extract-model-and-provider.ts
+++ b/frontend/src/utils/extract-model-and-provider.ts
@@ -16,7 +16,7 @@ import {
* splitIsActuallyVersion(split) // returns true
*/
const splitIsActuallyVersion = (split: string[]) =>
- split[1] && split[1][0] && isNumber(split[1][0]);
+ split[1]?.[0] && isNumber(split[1][0]);
/**
* Given a model string, extract the provider and model name. Currently the supported separators are "/" and "."
diff --git a/frontend/src/utils/feature-flags.ts b/frontend/src/utils/feature-flags.ts
index acbe83d7d7e5..0f38a4d7eace 100644
--- a/frontend/src/utils/feature-flags.ts
+++ b/frontend/src/utils/feature-flags.ts
@@ -17,6 +17,4 @@ export const HIDE_LLM_SETTINGS = () => loadFeatureFlag("HIDE_LLM_SETTINGS");
export const VSCODE_IN_NEW_TAB = () => loadFeatureFlag("VSCODE_IN_NEW_TAB");
export const ENABLE_TRAJECTORY_REPLAY = () =>
loadFeatureFlag("TRAJECTORY_REPLAY");
-export const USE_V1_CONVERSATION_API = () =>
- loadFeatureFlag("USE_V1_CONVERSATION_API");
export const USE_PLANNING_AGENT = () => loadFeatureFlag("USE_PLANNING_AGENT");
diff --git a/frontend/src/utils/format-time-delta.ts b/frontend/src/utils/format-time-delta.ts
index 8f2425a234fe..6785d9c845cc 100644
--- a/frontend/src/utils/format-time-delta.ts
+++ b/frontend/src/utils/format-time-delta.ts
@@ -1,16 +1,45 @@
+/**
+ * Parses a date string as UTC if it doesn't have a timezone indicator.
+ * This fixes the issue where ISO strings without timezone info are interpreted as local time.
+ * @param dateString ISO 8601 date string
+ * @returns Date object parsed as UTC
+ *
+ * @example
+ * parseDateAsUTC("2025-12-01T11:53:37.273886"); // Parsed as UTC
+ * parseDateAsUTC("2025-12-01T11:53:37.273886Z"); // Already has timezone, parsed correctly
+ * parseDateAsUTC("2025-12-01T11:53:37+00:00"); // Already has timezone, parsed correctly
+ */
+const parseDateAsUTC = (dateString: string): Date => {
+ // Check if the string already has a timezone indicator
+ // Look for 'Z' (UTC), '+' (positive offset), or '-' after the time part (negative offset)
+ const hasTimezone =
+ dateString.includes("Z") || dateString.match(/[+-]\d{2}:\d{2}$/) !== null;
+
+ if (hasTimezone) {
+ // Already has timezone info, parse normally
+ return new Date(dateString);
+ }
+
+ // No timezone indicator - append 'Z' to force UTC parsing
+ return new Date(`${dateString}Z`);
+};
+
/**
* Formats a date into a compact string representing the time delta between the given date and the current date.
- * @param date The date to format
+ * @param date The date to format (Date object or ISO 8601 string)
* @returns A compact string representing the time delta between the given date and the current date
*
* @example
* // now is 2024-01-01T00:00:00Z
* formatTimeDelta(new Date("2023-12-31T23:59:59Z")); // "1s"
- * formatTimeDelta(new Date("2022-01-01T00:00:00Z")); // "2y"
+ * formatTimeDelta("2023-12-31T23:59:59Z"); // "1s"
+ * formatTimeDelta("2025-12-01T11:53:37.273886"); // Parsed as UTC automatically
*/
-export const formatTimeDelta = (date: Date) => {
+export const formatTimeDelta = (date: Date | string) => {
+ // Parse string dates as UTC if needed, or use Date object directly
+ const dateObj = typeof date === "string" ? parseDateAsUTC(date) : date;
const now = new Date();
- const delta = now.getTime() - date.getTime();
+ const delta = now.getTime() - dateObj.getTime();
const seconds = Math.floor(delta / 1000);
const minutes = Math.floor(seconds / 60);
diff --git a/frontend/src/utils/has-advanced-settings-set.ts b/frontend/src/utils/has-advanced-settings-set.ts
index 8cf3f10a393d..b87342523917 100644
--- a/frontend/src/utils/has-advanced-settings-set.ts
+++ b/frontend/src/utils/has-advanced-settings-set.ts
@@ -3,4 +3,4 @@ import { Settings } from "#/types/settings";
export const hasAdvancedSettingsSet = (settings: Partial): boolean =>
Object.keys(settings).length > 0 &&
- (!!settings.LLM_BASE_URL || settings.AGENT !== DEFAULT_SETTINGS.AGENT);
+ (!!settings.llm_base_url || settings.agent !== DEFAULT_SETTINGS.agent);
diff --git a/frontend/src/utils/parse-terminal-output.ts b/frontend/src/utils/parse-terminal-output.ts
index a6ccc73cfc58..1cd54eb8581a 100644
--- a/frontend/src/utils/parse-terminal-output.ts
+++ b/frontend/src/utils/parse-terminal-output.ts
@@ -1,3 +1,5 @@
+const START = "[Python Interpreter: ";
+
/**
* Parses the raw output from the terminal into the command and symbol
* @param raw The raw output to be displayed in the terminal
@@ -13,9 +15,14 @@
* console.log(parsed.symbol); // openhands@659478cb008c:/workspace $
*/
export const parseTerminalOutput = (raw: string) => {
- const envRegex = /(.*)\[Python Interpreter: (.*)\]/s;
- const match = raw.match(envRegex);
-
- if (!match) return raw;
- return match[1]?.trim() || "";
+ const start = raw.indexOf(START);
+ if (start < 0) {
+ return raw;
+ }
+ const offset = start + START.length;
+ const end = raw.indexOf("]", offset);
+ if (end <= offset) {
+ return raw;
+ }
+ return raw.substring(0, start).trim();
};
diff --git a/frontend/src/utils/reo.ts b/frontend/src/utils/reo.ts
index 9f76c98d314f..b2b8773ec804 100644
--- a/frontend/src/utils/reo.ts
+++ b/frontend/src/utils/reo.ts
@@ -4,6 +4,8 @@
* Using CDN approach for better TypeScript compatibility
*/
+import EventLogger from "./event-logger";
+
export interface ReoIdentity {
username: string;
type: "github" | "email";
@@ -41,7 +43,7 @@ class ReoService {
this.initialized = true;
}
} catch (error) {
- console.error("Failed to initialize Reo.dev tracking:", error);
+ EventLogger.error(`Failed to initialize Reo.dev tracking: ${error}`);
}
}
@@ -78,7 +80,7 @@ class ReoService {
*/
identify(identity: ReoIdentity): void {
if (!this.initialized) {
- console.warn("Reo.dev not initialized. Call init() first.");
+ EventLogger.warning("Reo.dev not initialized. Call init() first.");
return;
}
@@ -87,7 +89,7 @@ class ReoService {
window.Reo.identify(identity);
}
} catch (error) {
- console.error("Failed to identify user in Reo.dev:", error);
+ EventLogger.error(`Failed to identify user in Reo.dev: ${error}`);
}
}
diff --git a/frontend/src/utils/settings-utils.ts b/frontend/src/utils/settings-utils.ts
index ca56b251707e..4259226d7718 100644
--- a/frontend/src/utils/settings-utils.ts
+++ b/frontend/src/utils/settings-utils.ts
@@ -67,9 +67,7 @@ export const parseMaxBudgetPerTask = (value: string): number | null => {
: null;
};
-export const extractSettings = (
- formData: FormData,
-): Partial & { llm_api_key?: string | null } => {
+export const extractSettings = (formData: FormData): Partial => {
const { LLM_MODEL, LLM_API_KEY, AGENT, LANGUAGE } =
extractBasicFormData(formData);
@@ -82,14 +80,14 @@ export const extractSettings = (
} = extractAdvancedFormData(formData);
return {
- LLM_MODEL: CUSTOM_LLM_MODEL || LLM_MODEL,
- LLM_API_KEY_SET: !!LLM_API_KEY,
- AGENT,
- LANGUAGE,
- LLM_BASE_URL,
- CONFIRMATION_MODE,
- SECURITY_ANALYZER,
- ENABLE_DEFAULT_CONDENSER,
+ llm_model: CUSTOM_LLM_MODEL || LLM_MODEL,
+ llm_api_key_set: !!LLM_API_KEY,
+ agent: AGENT,
+ language: LANGUAGE,
+ llm_base_url: LLM_BASE_URL,
+ confirmation_mode: CONFIRMATION_MODE,
+ security_analyzer: SECURITY_ANALYZER,
+ enable_default_condenser: ENABLE_DEFAULT_CONDENSER,
llm_api_key: LLM_API_KEY,
};
};
diff --git a/frontend/src/utils/utils.ts b/frontend/src/utils/utils.ts
index 620fb2c444ba..69ff7aae5f01 100644
--- a/frontend/src/utils/utils.ts
+++ b/frontend/src/utils/utils.ts
@@ -606,10 +606,15 @@ export const shouldIncludeRepository = (
* @returns The query string for searching OpenHands repositories
*/
export const getOpenHandsQuery = (provider: Provider | null): string => {
- if (provider === "gitlab") {
- return "openhands-config";
- }
- return ".openhands";
+ const providerRepositorySuffix: Record = {
+ gitlab: "openhands-config",
+ azure_devops: "openhands-config",
+ default: ".openhands",
+ } as const;
+
+ return provider && provider in providerRepositorySuffix
+ ? providerRepositorySuffix[provider]
+ : providerRepositorySuffix.default;
};
/**
@@ -621,12 +626,7 @@ export const getOpenHandsQuery = (provider: Provider | null): string => {
export const hasOpenHandsSuffix = (
repo: GitRepository,
provider: Provider | null,
-): boolean => {
- if (provider === "gitlab") {
- return repo.full_name.endsWith("/openhands-config");
- }
- return repo.full_name.endsWith("/.openhands");
-};
+): boolean => repo.full_name.endsWith(`/${getOpenHandsQuery(provider)}`);
/**
* Build headers for V1 API requests that require session authentication
diff --git a/frontend/src/utils/verified-models.ts b/frontend/src/utils/verified-models.ts
index 12453c6c8642..dcf5f7251766 100644
--- a/frontend/src/utils/verified-models.ts
+++ b/frontend/src/utils/verified-models.ts
@@ -19,6 +19,7 @@ export const VERIFIED_MODELS = [
"claude-haiku-4-5-20251001",
"claude-opus-4-20250514",
"claude-opus-4-1-20250805",
+ "claude-opus-4-5-20251101",
"gemini-2.5-pro",
"o4-mini",
"deepseek-chat",
@@ -59,6 +60,7 @@ export const VERIFIED_ANTHROPIC_MODELS = [
"claude-haiku-4-5-20251001",
"claude-opus-4-20250514",
"claude-opus-4-1-20250805",
+ "claude-opus-4-5-20251101",
];
// LiteLLM does not return the compatible Mistral models with the provider, so we list them here to set them ourselves
@@ -79,6 +81,7 @@ export const VERIFIED_OPENHANDS_MODELS = [
"gpt-5-mini-2025-08-07",
"claude-opus-4-20250514",
"claude-opus-4-1-20250805",
+ "claude-opus-4-5-20251101",
"gemini-2.5-pro",
"o3",
"o4-mini",
@@ -90,4 +93,4 @@ export const VERIFIED_OPENHANDS_MODELS = [
];
// Default model for OpenHands provider
-export const DEFAULT_OPENHANDS_MODEL = "openhands/claude-sonnet-4-20250514";
+export const DEFAULT_OPENHANDS_MODEL = "openhands/claude-opus-4-5-20251101";
diff --git a/frontend/src/utils/websocket-url.ts b/frontend/src/utils/websocket-url.ts
index fa6b907d0e11..a0aebf4151cb 100644
--- a/frontend/src/utils/websocket-url.ts
+++ b/frontend/src/utils/websocket-url.ts
@@ -9,6 +9,17 @@ export function extractBaseHost(
if (conversationUrl && !conversationUrl.startsWith("/")) {
try {
const url = new URL(conversationUrl);
+ // If the backend returns a localhost URL but the UI is accessed via
+ // another hostname (e.g., from a remote machine), swap the hostname
+ // while preserving the backend-provided port so the socket remains
+ // reachable.
+ if (
+ ["localhost", "127.0.0.1"].includes(url.hostname) &&
+ window.location.hostname !== url.hostname
+ ) {
+ return `${window.location.hostname}${url.port ? `:${url.port}` : ""}`;
+ }
+
return url.host; // e.g., "localhost:3000"
} catch {
return window.location.host;
diff --git a/frontend/tests/avatar-menu.spec.ts b/frontend/tests/avatar-menu.spec.ts
new file mode 100644
index 000000000000..a7ef4efe4044
--- /dev/null
+++ b/frontend/tests/avatar-menu.spec.ts
@@ -0,0 +1,48 @@
+import test, { expect } from "@playwright/test";
+
+/**
+ * Test for issue #11933: Avatar context menu closes when moving cursor diagonally
+ *
+ * This test verifies that the user can move their cursor diagonally from the
+ * avatar to the context menu without the menu closing unexpectedly.
+ */
+test("avatar context menu stays open when moving cursor diagonally to menu", async ({
+ page,
+ browserName,
+}) => {
+ // Skip on WebKit - Playwright's mouse.move() doesn't reliably trigger CSS hover states
+ test.skip(browserName === "webkit", "Playwright hover simulation unreliable");
+
+ await page.goto("/");
+
+ // Get the user avatar button
+ const userAvatar = page.getByTestId("user-avatar");
+ await expect(userAvatar).toBeVisible();
+
+ // Get avatar bounding box first
+ const avatarBox = await userAvatar.boundingBox();
+ if (!avatarBox) {
+ throw new Error("Could not get bounding box for avatar");
+ }
+
+ // Use mouse.move to hover (not .hover() which may trigger click)
+ const avatarCenterX = avatarBox.x + avatarBox.width / 2;
+ const avatarCenterY = avatarBox.y + avatarBox.height / 2;
+ await page.mouse.move(avatarCenterX, avatarCenterY);
+
+ // The context menu should appear via CSS group-hover
+ const contextMenu = page.getByTestId("account-settings-context-menu");
+ await expect(contextMenu).toBeVisible();
+
+ // Move UP from the LEFT side of the avatar - simulating diagonal movement
+ // toward the menu (which is to the right). This exits the hover zone.
+ const leftX = avatarBox.x + 2;
+ const aboveY = avatarBox.y - 50;
+ await page.mouse.move(leftX, aboveY);
+
+ // The menu uses opacity-0/opacity-100 for visibility via CSS.
+ // Use toHaveCSS which auto-retries, avoiding flaky waitForTimeout.
+ // The menu should remain visible (opacity 1) to allow diagonal access to it.
+ const menuWrapper = contextMenu.locator("..");
+ await expect(menuWrapper).toHaveCSS("opacity", "1");
+});
diff --git a/frontend/tests/conversation-panel.test.ts b/frontend/tests/conversation-panel.test.ts
deleted file mode 100644
index 6e3f58cd458f..000000000000
--- a/frontend/tests/conversation-panel.test.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-import test, { expect, Page } from "@playwright/test";
-
-const toggleConversationPanel = async (page: Page) => {
- const panel = page.getByTestId("conversation-panel");
- await page.waitForTimeout(1000); // Wait for state to stabilize
- const panelIsVisible = await panel.isVisible();
-
- if (!panelIsVisible) {
- const conversationPanelButton = page.getByTestId(
- "toggle-conversation-panel",
- );
- await conversationPanelButton.click();
- }
-
- return page.getByTestId("conversation-panel");
-};
-
-const selectConversationCard = async (page: Page, index: number) => {
- const panel = await toggleConversationPanel(page);
-
- // select a conversation
- const conversationItem = panel.getByTestId("conversation-card").nth(index);
- await conversationItem.click();
-
- // panel should close
- await expect(panel).not.toBeVisible();
-
- await page.waitForURL(`/conversations/${index + 1}`);
- expect(page.url()).toBe(`http://localhost:3001/conversations/${index + 1}`);
-};
-
-test.beforeEach(async ({ page }) => {
- await page.goto("/");
-});
-
-test("should only display the create new conversation button when in a conversation", async ({
- page,
-}) => {
- const panel = page.getByTestId("conversation-panel");
-
- const newProjectButton = panel.getByTestId("new-conversation-button");
- await expect(newProjectButton).not.toBeVisible();
-
- await page.goto("/conversations/1");
- await expect(newProjectButton).toBeVisible();
-});
-
-test("redirect to /conversation with the session id as a path param when clicking on a conversation card", async ({
- page,
-}) => {
- const panel = page.getByTestId("conversation-panel");
-
- // select a conversation
- const conversationItem = panel.getByTestId("conversation-card").first();
- await conversationItem.click();
-
- // panel should close
- expect(panel).not.toBeVisible();
-
- await page.waitForURL("/conversations/1");
- expect(page.url()).toBe("http://localhost:3001/conversations/1");
-});
-
-test("redirect to the home screen if the current session was deleted", async ({
- page,
-}) => {
- await page.goto("/conversations/1");
- await page.waitForURL("/conversations/1");
-
- const panel = page.getByTestId("conversation-panel");
- const firstCard = panel.getByTestId("conversation-card").first();
-
- const ellipsisButton = firstCard.getByTestId("ellipsis-button");
- await ellipsisButton.click();
-
- const deleteButton = firstCard.getByTestId("delete-button");
- await deleteButton.click();
-
- // confirm modal
- const confirmButton = page.getByText("Confirm");
- await confirmButton.click();
-
- await page.waitForURL("/");
-});
-
-test("load relevant files in the file explorer", async ({ page }) => {
- await selectConversationCard(page, 0);
-
- // check if the file explorer has the correct files
- const fileExplorer = page.getByTestId("file-explorer");
-
- await expect(fileExplorer.getByText("file1.txt")).toBeVisible();
- await expect(fileExplorer.getByText("file2.txt")).toBeVisible();
- await expect(fileExplorer.getByText("file3.txt")).toBeVisible();
-
- await selectConversationCard(page, 2);
-
- // check if the file explorer has the correct files
- expect(fileExplorer.getByText("reboot_skynet.exe")).toBeVisible();
- expect(fileExplorer.getByText("target_list.txt")).toBeVisible();
- expect(fileExplorer.getByText("terminator_blueprint.txt")).toBeVisible();
-});
-
-test("should redirect to home screen if conversation deos not exist", async ({
- page,
-}) => {
- await page.goto("/conversations/9999");
- await page.waitForURL("/");
-});
-
-test("display the conversation details during a conversation", async ({
- page,
-}) => {
- const conversationPanelButton = page.getByTestId("toggle-conversation-panel");
- await expect(conversationPanelButton).toBeVisible();
- await conversationPanelButton.click();
-
- const panel = page.getByTestId("conversation-panel");
-
- // select a conversation
- const conversationItem = panel.getByTestId("conversation-card").first();
- await conversationItem.click();
-
- // panel should close
- await expect(panel).not.toBeVisible();
-
- await page.waitForURL("/conversations/1");
- expect(page.url()).toBe("http://localhost:3001/conversations/1");
-
- const conversationDetails = page.getByTestId("conversation-card");
-
- await expect(conversationDetails).toBeVisible();
- await expect(conversationDetails).toHaveText("Conversation 1");
-});
diff --git a/frontend/tests/helpers/confirm-settings.ts b/frontend/tests/helpers/confirm-settings.ts
deleted file mode 100644
index ca82edd35a15..000000000000
--- a/frontend/tests/helpers/confirm-settings.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Page } from "@playwright/test";
-
-export const confirmSettings = async (page: Page) => {
- const confirmPreferenceButton = page.getByRole("button", {
- name: /confirm preferences/i,
- });
- await confirmPreferenceButton.click();
-
- const configSaveButton = page
- .getByRole("button", {
- name: /save/i,
- })
- .first();
- await configSaveButton.click();
-
- const confirmChanges = page.getByRole("button", {
- name: /yes, close settings/i,
- });
- await confirmChanges.click();
-};
diff --git a/frontend/tests/placeholder.spec.ts b/frontend/tests/placeholder.spec.ts
new file mode 100644
index 000000000000..48e76b587ecb
--- /dev/null
+++ b/frontend/tests/placeholder.spec.ts
@@ -0,0 +1,4 @@
+import { test } from "@playwright/test";
+
+// Placeholder test to ensure CI passes until real E2E tests are added
+test("placeholder", () => {});
diff --git a/frontend/tests/redirect.spec.ts b/frontend/tests/redirect.spec.ts
deleted file mode 100644
index 8425345ba624..000000000000
--- a/frontend/tests/redirect.spec.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { expect, test } from "@playwright/test";
-import path from "path";
-import { fileURLToPath } from "url";
-
-const filename = fileURLToPath(import.meta.url);
-const dirname = path.dirname(filename);
-
-test.beforeEach(async ({ page }) => {
- await page.goto("/");
-});
-
-test("should redirect to /conversations after uploading a project zip", async ({
- page,
-}) => {
- const fileInput = page.getByLabel("Upload a .zip");
- const filePath = path.join(dirname, "fixtures/project.zip");
- await fileInput.setInputFiles(filePath);
-
- await page.waitForURL(/\/conversations\/\d+/);
-});
-
-test("should redirect to /conversations after selecting a repo", async ({
- page,
-}) => {
- // enter a github token to view the repositories
- const connectToGitHubButton = page.getByRole("button", {
- name: /connect to github/i,
- });
- await connectToGitHubButton.click();
- const tokenInput = page.getByLabel(/github token\*/i);
- await tokenInput.fill("fake-token");
-
- const submitButton = page.getByTestId("connect-to-github");
- await submitButton.click();
-
- // select a repository
- const repoDropdown = page.getByLabel(/github repository/i);
- await repoDropdown.click();
-
- const repoItem = page.getByTestId("github-repo-item").first();
- await repoItem.click();
-
- await page.waitForURL(/\/conversations\/\d+/);
-});
-
-// FIXME: This fails because the MSW WS mocks change state too quickly,
-// missing the OPENING status where the initial query is rendered.
-test.skip("should redirect the user to /conversation with their initial query after selecting a project", async ({
- page,
-}) => {
- // enter query
- const testQuery = "this is my test query";
- const textbox = page.getByPlaceholder(/what do you want to build/i);
- expect(textbox).not.toBeNull();
- await textbox.fill(testQuery);
-
- const fileInput = page.getByLabel("Upload a .zip");
- const filePath = path.join(dirname, "fixtures/project.zip");
- await fileInput.setInputFiles(filePath);
-
- await page.waitForURL("/conversation");
-
- // get user message
- const userMessage = page.getByTestId("user-message");
- expect(await userMessage.textContent()).toBe(testQuery);
-});
diff --git a/frontend/tests/repo-selection-form.test.tsx b/frontend/tests/repo-selection-form.test.tsx
deleted file mode 100644
index 24666d49fc23..000000000000
--- a/frontend/tests/repo-selection-form.test.tsx
+++ /dev/null
@@ -1,130 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from "vitest";
-import { render, screen, fireEvent } from "@testing-library/react";
-import { RepositorySelectionForm } from "../src/components/features/home/repo-selection-form";
-import { useUserRepositories } from "../src/hooks/query/use-user-repositories";
-import { useRepositoryBranches } from "../src/hooks/query/use-repository-branches";
-import { useCreateConversation } from "../src/hooks/mutation/use-create-conversation";
-import { useIsCreatingConversation } from "../src/hooks/use-is-creating-conversation";
-
-// Mock the hooks
-vi.mock("../src/hooks/query/use-user-repositories");
-vi.mock("../src/hooks/query/use-repository-branches");
-vi.mock("../src/hooks/mutation/use-create-conversation");
-vi.mock("../src/hooks/use-is-creating-conversation");
-vi.mock("react-i18next", () => ({
- useTranslation: () => ({
- t: (key: string) => key,
- }),
-}));
-
-describe("RepositorySelectionForm", () => {
- const mockOnRepoSelection = vi.fn();
-
- beforeEach(() => {
- vi.resetAllMocks();
-
- // Mock the hooks with default values
- (useUserRepositories as any).mockReturnValue({
- data: [
- { id: "1", full_name: "test/repo1" },
- { id: "2", full_name: "test/repo2" }
- ],
- isLoading: false,
- isError: false,
- });
-
- (useRepositoryBranches as any).mockReturnValue({
- data: [
- { name: "main" },
- { name: "develop" }
- ],
- isLoading: false,
- isError: false,
- });
-
- (useCreateConversation as any).mockReturnValue({
- mutate: vi.fn(() => (useIsCreatingConversation as any).mockReturnValue(true)),
- isPending: false,
- isSuccess: false,
- });
-
- (useIsCreatingConversation as any).mockReturnValue(false);
- });
-
- it("should clear selected branch when input is empty", async () => {
- render('
- if is_multiline:
- ret += '\n'
if isinstance(param_value, list) or isinstance(param_value, dict):
ret += json.dumps(param_value)
else:
ret += f'{param_value}'
- if is_multiline:
- ret += '\n'
ret += '\n'
ret += ''
return ret
diff --git a/openhands/llm/llm.py b/openhands/llm/llm.py
index b94ed3bc2be6..150fa54925c1 100644
--- a/openhands/llm/llm.py
+++ b/openhands/llm/llm.py
@@ -188,12 +188,14 @@ def __init__(
if 'claude-opus-4-1' in self.config.model.lower():
kwargs['thinking'] = {'type': 'disabled'}
- # Anthropic constraint: Opus 4.1 and Sonnet 4 models cannot accept both temperature and top_p
+ # Anthropic constraint: Opus 4.1, Opus 4.5, and Sonnet 4 models cannot accept both temperature and top_p
# Prefer temperature (drop top_p) if both are specified.
_model_lower = self.config.model.lower()
- # Apply to Opus 4.1 and Sonnet 4 models to avoid API errors
+ # Apply to Opus 4.1, Opus 4.5, and Sonnet 4 models to avoid API errors
if (
- ('claude-opus-4-1' in _model_lower) or ('claude-sonnet-4' in _model_lower)
+ ('claude-opus-4-1' in _model_lower)
+ or ('claude-opus-4-5' in _model_lower)
+ or ('claude-sonnet-4' in _model_lower)
) and ('temperature' in kwargs and 'top_p' in kwargs):
kwargs.pop('top_p', None)
diff --git a/openhands/llm/model_features.py b/openhands/llm/model_features.py
index a9857ffaca85..f592f0bb9892 100644
--- a/openhands/llm/model_features.py
+++ b/openhands/llm/model_features.py
@@ -132,6 +132,8 @@ class ModelFeatures:
'grok-code-fast-1',
# DeepSeek R1 family
'deepseek-r1-0528*',
+ # Azure GPT-5 family
+ 'azure/gpt-5*',
]
diff --git a/openhands/memory/conversation_memory.py b/openhands/memory/conversation_memory.py
index 5ff6ec7e584f..5ae1a2cd715c 100644
--- a/openhands/memory/conversation_memory.py
+++ b/openhands/memory/conversation_memory.py
@@ -76,6 +76,7 @@ def process_events(
self,
condensed_history: list[Event],
initial_user_action: MessageAction,
+ forgotten_event_ids: set[int] | None = None,
max_message_chars: int | None = None,
vision_is_active: bool = False,
) -> list[Message]:
@@ -85,16 +86,23 @@ def process_events(
Args:
condensed_history: The condensed history of events to convert
+ initial_user_action: The initial user message action, if available. Used to ensure the conversation starts correctly.
+ forgotten_event_ids: Set of event IDs that have been forgotten/condensed. If the initial user action's ID
+ is in this set, it will not be re-inserted to prevent re-execution of old instructions.
max_message_chars: The maximum number of characters in the content of an event included
in the prompt to the LLM. Larger observations are truncated.
vision_is_active: Whether vision is active in the LLM. If True, image URLs will be included.
- initial_user_action: The initial user message action, if available. Used to ensure the conversation starts correctly.
"""
events = condensed_history
+ # Default to empty set if not provided
+ if forgotten_event_ids is None:
+ forgotten_event_ids = set()
# Ensure the event list starts with SystemMessageAction, then MessageAction(source='user')
self._ensure_system_message(events)
- self._ensure_initial_user_message(events, initial_user_action)
+ self._ensure_initial_user_message(
+ events, initial_user_action, forgotten_event_ids
+ )
# log visual browsing status
logger.debug(f'Visual browsing: {self.agent_config.enable_som_visual_browsing}')
@@ -827,9 +835,23 @@ def _ensure_system_message(self, events: list[Event]) -> None:
)
def _ensure_initial_user_message(
- self, events: list[Event], initial_user_action: MessageAction
+ self,
+ events: list[Event],
+ initial_user_action: MessageAction,
+ forgotten_event_ids: set[int],
) -> None:
- """Checks if the second event is a user MessageAction and inserts the provided one if needed."""
+ """Checks if the second event is a user MessageAction and inserts the provided one if needed.
+
+ IMPORTANT: If the initial user action has been condensed (its ID is in forgotten_event_ids),
+ we do NOT re-insert it. This prevents old instructions from being re-executed after
+ conversation condensation. The condensation summary already contains the context of
+ what was requested and completed.
+
+ Args:
+ events: The list of events to modify in-place
+ initial_user_action: The initial user message action from the full history
+ forgotten_event_ids: Set of event IDs that have been forgotten/condensed
+ """
if (
not events
): # Should have system message from previous step, but safety check
@@ -837,6 +859,17 @@ def _ensure_initial_user_message(
# Or raise? Let's log for now, _ensure_system_message should handle this.
return
+ # Check if the initial user action has been condensed/forgotten.
+ # If so, we should NOT re-insert it to prevent re-execution of old instructions.
+ # The condensation summary already contains the context of what was requested.
+ initial_user_action_id = initial_user_action.id
+ if initial_user_action_id in forgotten_event_ids:
+ logger.info(
+ f'Initial user action (id={initial_user_action_id}) has been condensed. '
+ 'Not re-inserting to prevent re-execution of old instructions.'
+ )
+ return
+
# We expect events[0] to be SystemMessageAction after _ensure_system_message
if len(events) == 1:
# Only system message exists
diff --git a/openhands/memory/view.py b/openhands/memory/view.py
index 87a20b6340e5..81dd8bab5d63 100644
--- a/openhands/memory/view.py
+++ b/openhands/memory/view.py
@@ -18,6 +18,8 @@ class View(BaseModel):
events: list[Event]
unhandled_condensation_request: bool = False
+ # Set of event IDs that have been forgotten/condensed
+ forgotten_event_ids: set[int] = set()
def __len__(self) -> int:
return len(self.events)
@@ -90,4 +92,5 @@ def from_events(events: list[Event]) -> View:
return View(
events=kept_events,
unhandled_condensation_request=unhandled_condensation_request,
+ forgotten_event_ids=forgotten_event_ids,
)
diff --git a/openhands/runtime/base.py b/openhands/runtime/base.py
index 5eb5429f71ca..c7a332166b7d 100644
--- a/openhands/runtime/base.py
+++ b/openhands/runtime/base.py
@@ -76,6 +76,8 @@
call_sync_from_async,
)
+DISABLE_VSCODE_PLUGIN = os.getenv('DISABLE_VSCODE_PLUGIN', 'false').lower() == 'true'
+
def _default_env_vars(sandbox_config: SandboxConfig) -> dict[str, str]:
ret = {}
@@ -153,9 +155,11 @@ def __init__(
self.plugins = (
copy.deepcopy(plugins) if plugins is not None and len(plugins) > 0 else []
)
+
# add VSCode plugin if not in headless mode
- if not headless_mode:
+ if not headless_mode and not DISABLE_VSCODE_PLUGIN:
self.plugins.append(VSCodeRequirement())
+ logger.info(f'Loaded plugins for runtime {self.sid}: {self.plugins}')
self.status_callback = status_callback
self.attach_to_existing = attach_to_existing
diff --git a/openhands/runtime/browser/browser_env.py b/openhands/runtime/browser/browser_env.py
index 55e3ce18902a..c8d09d9c2bdd 100644
--- a/openhands/runtime/browser/browser_env.py
+++ b/openhands/runtime/browser/browser_env.py
@@ -1,8 +1,10 @@
import atexit
import json
import multiprocessing
+import os
import time
import uuid
+from pathlib import Path
import browsergym.core # noqa F401 (we register the openended task as a gym environment)
import gymnasium as gym
@@ -67,6 +69,16 @@ def init_browser(self) -> None:
raise BrowserInitException('Failed to start browser environment.')
def browser_process(self) -> None:
+ def _is_local_runtime() -> bool:
+ runtime_flag = os.getenv('RUNTIME', '').lower()
+ return runtime_flag == 'local'
+
+ # Default Playwright cache for local runs only; do not override in docker
+ if _is_local_runtime() and 'PLAYWRIGHT_BROWSERS_PATH' not in os.environ:
+ os.environ['PLAYWRIGHT_BROWSERS_PATH'] = str(
+ Path.home() / '.cache' / 'playwright'
+ )
+
if self.eval_mode:
assert self.browsergym_eval_env is not None
logger.info('Initializing browser env for web browsing evaluation.')
@@ -87,6 +99,11 @@ def browser_process(self) -> None:
)
env = gym.make(self.browsergym_eval_env, tags_to_mark='all', timeout=100000)
else:
+ downloads_path = os.getenv('BROWSERGYM_DOWNLOAD_DIR')
+ if not downloads_path and _is_local_runtime():
+ downloads_path = str(Path.home() / '.cache' / 'browsergym-downloads')
+ if not downloads_path:
+ downloads_path = '/workspace/.downloads/'
env = gym.make(
'browsergym/openended',
task_kwargs={'start_url': 'about:blank', 'goal': 'PLACEHOLDER_GOAL'},
@@ -96,7 +113,7 @@ def browser_process(self) -> None:
tags_to_mark='all',
timeout=100000,
pw_context_kwargs={'accept_downloads': True},
- pw_chromium_kwargs={'downloads_path': '/workspace/.downloads/'},
+ pw_chromium_kwargs={'downloads_path': downloads_path},
)
obs, info = env.reset()
diff --git a/openhands/runtime/builder/docker.py b/openhands/runtime/builder/docker.py
index 39a7982cd518..5f0fb2027b26 100644
--- a/openhands/runtime/builder/docker.py
+++ b/openhands/runtime/builder/docker.py
@@ -19,8 +19,11 @@ def __init__(self, docker_client: docker.DockerClient):
version_info = self.docker_client.version()
server_version = version_info.get('Version', '').replace('-', '.')
+ components = version_info.get('Components')
self.is_podman = (
- version_info.get('Components')[0].get('Name').startswith('Podman')
+ components is not None
+ and len(components) > 0
+ and components[0].get('Name', '').startswith('Podman')
)
if (
tuple(map(int, server_version.split('.')[:2])) < (18, 9)
@@ -79,8 +82,11 @@ def build(
self.docker_client = docker.from_env()
version_info = self.docker_client.version()
server_version = version_info.get('Version', '').split('+')[0].replace('-', '.')
+ components = version_info.get('Components')
self.is_podman = (
- version_info.get('Components')[0].get('Name').startswith('Podman')
+ components is not None
+ and len(components) > 0
+ and components[0].get('Name', '').startswith('Podman')
)
if tuple(map(int, server_version.split('.'))) < (18, 9) and not self.is_podman:
raise AgentRuntimeBuildError(
diff --git a/openhands/runtime/impl/docker/containers.py b/openhands/runtime/impl/docker/containers.py
index 25764b027488..32a5ba1353e2 100644
--- a/openhands/runtime/impl/docker/containers.py
+++ b/openhands/runtime/impl/docker/containers.py
@@ -7,7 +7,7 @@ def stop_all_containers(prefix: str) -> None:
containers = docker_client.containers.list(all=True)
for container in containers:
try:
- if container.name.startswith(prefix):
+ if container.name and container.name.startswith(prefix):
container.stop()
except docker.errors.APIError:
pass
diff --git a/openhands/runtime/impl/kubernetes/README.md b/openhands/runtime/impl/kubernetes/README.md
index d16247389da0..36b7452d1ea8 100644
--- a/openhands/runtime/impl/kubernetes/README.md
+++ b/openhands/runtime/impl/kubernetes/README.md
@@ -40,7 +40,7 @@ Two configuration options are required to use the Kubernetes runtime:
2. **Runtime Container Image**: Specify the container image to use for the runtime environment
```toml
[sandbox]
- runtime_container_image = "docker.openhands.dev/openhands/runtime:0.62-nikolaik"
+ runtime_container_image = "docker.openhands.dev/openhands/runtime:1.0-nikolaik"
```
#### Additional Kubernetes Options
diff --git a/openhands/runtime/impl/local/local_runtime.py b/openhands/runtime/impl/local/local_runtime.py
index ed8d26996ae4..cf81b222ebd5 100644
--- a/openhands/runtime/impl/local/local_runtime.py
+++ b/openhands/runtime/impl/local/local_runtime.py
@@ -45,6 +45,8 @@
from openhands.utils.http_session import httpx_verify_option
from openhands.utils.tenacity_stop import stop_if_should_exit
+DISABLE_VSCODE_PLUGIN = os.getenv('DISABLE_VSCODE_PLUGIN', 'false').lower() == 'true'
+
@dataclass
class ActionExecutionServerInfo:
@@ -247,7 +249,22 @@ async def connect(self) -> None:
)
else:
# Set up workspace directory
+ # For local runtime, prefer a stable host path over /workspace defaults.
+ if (
+ self.config.workspace_base is None
+ and self.config.runtime
+ and self.config.runtime.lower() == 'local'
+ ):
+ env_base = os.getenv('LOCAL_WORKSPACE_BASE')
+ if env_base:
+ self.config.workspace_base = os.path.abspath(env_base)
+ else:
+ self.config.workspace_base = os.path.abspath(
+ os.path.join(os.getcwd(), 'workspace', 'local')
+ )
+
if self.config.workspace_base is not None:
+ os.makedirs(self.config.workspace_base, exist_ok=True)
logger.warning(
f'Workspace base path is set to {self.config.workspace_base}. '
'It will be used as the path for the agent to run in. '
@@ -406,7 +423,7 @@ def setup(cls, config: OpenHandsConfig, headless_mode: bool = False):
plugins = _get_plugins(config)
# Copy the logic from Runtime where we add a VSCodePlugin on init if missing
- if not headless_mode:
+ if not headless_mode and not DISABLE_VSCODE_PLUGIN:
plugins.append(VSCodeRequirement())
for _ in range(initial_num_warm_servers):
diff --git a/openhands/server/app.py b/openhands/server/app.py
index d5135f23999d..5cee75b163a4 100644
--- a/openhands/server/app.py
+++ b/openhands/server/app.py
@@ -36,7 +36,7 @@
from openhands.server.types import AppMode
from openhands.version import get_version
-mcp_app = mcp_server.http_app(path='/mcp')
+mcp_app = mcp_server.http_app(path='/mcp', stateless_http=True)
def combine_lifespans(*lifespans):
diff --git a/openhands/server/routes/git.py b/openhands/server/routes/git.py
index 1401bb0dcd34..a6807a2e2a4a 100644
--- a/openhands/server/routes/git.py
+++ b/openhands/server/routes/git.py
@@ -26,13 +26,11 @@
)
from openhands.server.dependencies import get_dependencies
from openhands.server.shared import server_config
-from openhands.server.types import AppMode
from openhands.server.user_auth import (
get_access_token,
get_provider_tokens,
get_user_id,
)
-from openhands.utils.posthog_tracker import alias_user_identities
app = APIRouter(prefix='/api/user', dependencies=get_dependencies())
@@ -119,14 +117,6 @@ async def get_user(
try:
user: User = await client.get_user()
-
- # Alias git provider login with Keycloak user ID in PostHog (SaaS mode only)
- if user_id and user.login and server_config.app_mode == AppMode.SAAS:
- alias_user_identities(
- keycloak_user_id=user_id,
- git_login=user.login,
- )
-
return user
except UnknownException as e:
diff --git a/openhands/server/routes/mcp.py b/openhands/server/routes/mcp.py
index 929c66af5b9e..2d541d637c90 100644
--- a/openhands/server/routes/mcp.py
+++ b/openhands/server/routes/mcp.py
@@ -25,9 +25,7 @@
)
from openhands.storage.data_models.conversation_metadata import ConversationMetadata
-mcp_server = FastMCP(
- 'mcp', stateless_http=True, mask_error_details=True, dependencies=None
-)
+mcp_server = FastMCP('mcp', mask_error_details=True)
HOST = f'https://{os.getenv("WEB_HOST", "app.all-hands.dev").strip()}'
CONVERSATION_URL = HOST + '/conversations/{}'
diff --git a/openhands/server/services/conversation_service.py b/openhands/server/services/conversation_service.py
index 927e55ce5831..ac2e06b8cdd1 100644
--- a/openhands/server/services/conversation_service.py
+++ b/openhands/server/services/conversation_service.py
@@ -7,7 +7,7 @@
from openhands.events.action.message import MessageAction
from openhands.experiments.experiment_manager import ExperimentManagerImpl
from openhands.integrations.provider import (
- CUSTOM_SECRETS_TYPE_WITH_JSON_SCHEMA,
+ CUSTOM_SECRETS_TYPE,
PROVIDER_TOKEN_TYPE,
ProviderToken,
)
@@ -73,7 +73,7 @@ async def initialize_conversation(
async def start_conversation(
user_id: str | None,
git_provider_tokens: PROVIDER_TOKEN_TYPE | None,
- custom_secrets: CUSTOM_SECRETS_TYPE_WITH_JSON_SCHEMA | None,
+ custom_secrets: CUSTOM_SECRETS_TYPE | None,
initial_user_msg: str | None,
image_urls: list[str] | None,
replay_json: str | None,
@@ -164,7 +164,7 @@ async def start_conversation(
async def create_new_conversation(
user_id: str | None,
git_provider_tokens: PROVIDER_TOKEN_TYPE | None,
- custom_secrets: CUSTOM_SECRETS_TYPE_WITH_JSON_SCHEMA | None,
+ custom_secrets: CUSTOM_SECRETS_TYPE | None,
selected_repository: str | None,
selected_branch: str | None,
initial_user_msg: str | None,
diff --git a/openhands/server/session/conversation_init_data.py b/openhands/server/session/conversation_init_data.py
index cdf76db97702..c1bf660c2840 100644
--- a/openhands/server/session/conversation_init_data.py
+++ b/openhands/server/session/conversation_init_data.py
@@ -1,4 +1,7 @@
-from pydantic import ConfigDict, Field
+from collections.abc import Mapping
+from types import MappingProxyType
+
+from pydantic import ConfigDict, Field, field_validator
from openhands.integrations.provider import CUSTOM_SECRETS_TYPE, PROVIDER_TOKEN_TYPE
from openhands.integrations.service_types import ProviderType
@@ -19,3 +22,17 @@ class ConversationInitData(Settings):
model_config = ConfigDict(
arbitrary_types_allowed=True,
)
+
+ @field_validator('git_provider_tokens', 'custom_secrets')
+ @classmethod
+ def immutable_validator(cls, value: Mapping | None) -> MappingProxyType | None:
+ """Ensure git_provider_tokens and custom_secrets are always MappingProxyType.
+
+ This validator converts any Mapping (including dict) to MappingProxyType,
+ ensuring type safety and immutability. If the value is None, it returns None.
+ """
+ if value is None:
+ return None
+ if isinstance(value, MappingProxyType):
+ return value
+ return MappingProxyType(value)
diff --git a/openhands/server/user_auth/default_user_auth.py b/openhands/server/user_auth/default_user_auth.py
index 2e0a7b5af992..8bc79af1561e 100644
--- a/openhands/server/user_auth/default_user_auth.py
+++ b/openhands/server/user_auth/default_user_auth.py
@@ -88,6 +88,9 @@ async def get_provider_tokens(self) -> PROVIDER_TOKEN_TYPE | None:
return None
return user_secrets.provider_tokens
+ async def get_mcp_api_key(self) -> str | None:
+ return None
+
@classmethod
async def get_instance(cls, request: Request) -> UserAuth:
user_auth = DefaultUserAuth()
diff --git a/openhands/server/user_auth/user_auth.py b/openhands/server/user_auth/user_auth.py
index e370d3247438..c61c9ceb8bfb 100644
--- a/openhands/server/user_auth/user_auth.py
+++ b/openhands/server/user_auth/user_auth.py
@@ -75,6 +75,10 @@ async def get_secrets(self) -> Secrets | None:
def get_auth_type(self) -> AuthType | None:
return None
+ @abstractmethod
+ async def get_mcp_api_key(self) -> str | None:
+ """Get an mcp api key for the user"""
+
@classmethod
@abstractmethod
async def get_instance(cls, request: Request) -> UserAuth:
diff --git a/openhands/storage/data_models/secrets.py b/openhands/storage/data_models/secrets.py
index ce5302e754af..69b60e9730d0 100644
--- a/openhands/storage/data_models/secrets.py
+++ b/openhands/storage/data_models/secrets.py
@@ -1,3 +1,4 @@
+from collections.abc import Mapping
from types import MappingProxyType
from typing import Any
@@ -7,6 +8,7 @@
Field,
SerializationInfo,
field_serializer,
+ field_validator,
model_validator,
)
from pydantic.json import pydantic_encoder
@@ -14,9 +16,7 @@
from openhands.events.stream import EventStream
from openhands.integrations.provider import (
CUSTOM_SECRETS_TYPE,
- CUSTOM_SECRETS_TYPE_WITH_JSON_SCHEMA,
PROVIDER_TOKEN_TYPE,
- PROVIDER_TOKEN_TYPE_WITH_JSON_SCHEMA,
CustomSecret,
ProviderToken,
)
@@ -24,11 +24,11 @@
class Secrets(BaseModel):
- provider_tokens: PROVIDER_TOKEN_TYPE_WITH_JSON_SCHEMA = Field(
+ provider_tokens: PROVIDER_TOKEN_TYPE = Field(
default_factory=lambda: MappingProxyType({})
)
- custom_secrets: CUSTOM_SECRETS_TYPE_WITH_JSON_SCHEMA = Field(
+ custom_secrets: CUSTOM_SECRETS_TYPE = Field(
default_factory=lambda: MappingProxyType({})
)
@@ -38,6 +38,11 @@ class Secrets(BaseModel):
arbitrary_types_allowed=True,
)
+ @field_validator('provider_tokens', 'custom_secrets')
+ @classmethod
+ def immutable_validator(cls, value: Mapping) -> MappingProxyType:
+ return MappingProxyType(value)
+
@field_serializer('provider_tokens')
def provider_tokens_serializer(
self, provider_tokens: PROVIDER_TOKEN_TYPE, info: SerializationInfo
diff --git a/openhands/storage/data_models/settings.py b/openhands/storage/data_models/settings.py
index 72785c1822ab..0dc9b99e6238 100644
--- a/openhands/storage/data_models/settings.py
+++ b/openhands/storage/data_models/settings.py
@@ -1,5 +1,7 @@
from __future__ import annotations
+import os
+
from pydantic import (
BaseModel,
ConfigDict,
@@ -48,6 +50,7 @@ class Settings(BaseModel):
email_verified: bool | None = None
git_user_name: str | None = None
git_user_email: str | None = None
+ v1_enabled: bool | None = Field(default=bool(os.getenv('V1_ENABLED') == '1'))
model_config = ConfigDict(
validate_assignment=True,
diff --git a/openhands/storage/settings/file_settings_store.py b/openhands/storage/settings/file_settings_store.py
index 3acedeb16fe3..5b43bf6b80fd 100644
--- a/openhands/storage/settings/file_settings_store.py
+++ b/openhands/storage/settings/file_settings_store.py
@@ -21,6 +21,11 @@ async def load(self) -> Settings | None:
json_str = await call_sync_from_async(self.file_store.read, self.path)
kwargs = json.loads(json_str)
settings = Settings(**kwargs)
+
+ # Turn on V1 in OpenHands
+ # We can simplify / remove this as part of V0 removal
+ settings.v1_enabled = True
+
return settings
except FileNotFoundError:
return None
diff --git a/openhands/utils/llm.py b/openhands/utils/llm.py
index 9eeb7c539304..876a89000159 100644
--- a/openhands/utils/llm.py
+++ b/openhands/utils/llm.py
@@ -60,6 +60,7 @@ def get_supported_llm_models(config: OpenHandsConfig) -> list[str]:
'openhands/gpt-5-2025-08-07',
'openhands/gpt-5-mini-2025-08-07',
'openhands/claude-opus-4-20250514',
+ 'openhands/claude-opus-4-5-20251101',
'openhands/gemini-2.5-pro',
'openhands/o3',
'openhands/o4-mini',
@@ -90,4 +91,4 @@ def get_supported_llm_models(config: OpenHandsConfig) -> list[str]:
]
model_list = clarifai_models + model_list
- return list(sorted(set(model_list)))
+ return sorted(set(model_list))
diff --git a/openhands/utils/posthog_tracker.py b/openhands/utils/posthog_tracker.py
deleted file mode 100644
index c0859eddc717..000000000000
--- a/openhands/utils/posthog_tracker.py
+++ /dev/null
@@ -1,270 +0,0 @@
-"""PostHog tracking utilities for OpenHands events."""
-
-import os
-
-from openhands.core.logger import openhands_logger as logger
-
-# Lazy import posthog to avoid import errors in environments where it's not installed
-posthog = None
-
-
-def _init_posthog():
- """Initialize PostHog client lazily."""
- global posthog
- if posthog is None:
- try:
- import posthog as ph
-
- posthog = ph
- posthog.api_key = os.environ.get(
- 'POSTHOG_CLIENT_KEY', 'phc_3ESMmY9SgqEAGBB6sMGK5ayYHkeUuknH2vP6FmWH9RA'
- )
- posthog.host = os.environ.get('POSTHOG_HOST', 'https://us.i.posthog.com')
- except ImportError:
- logger.warning(
- 'PostHog not installed. Analytics tracking will be disabled.'
- )
- posthog = None
-
-
-def track_agent_task_completed(
- conversation_id: str,
- user_id: str | None = None,
- app_mode: str | None = None,
-) -> None:
- """Track when an agent completes a task.
-
- Args:
- conversation_id: The ID of the conversation/session
- user_id: The ID of the user (optional, may be None for unauthenticated users)
- app_mode: The application mode (saas/oss), optional
- """
- _init_posthog()
-
- if posthog is None:
- return
-
- # Use conversation_id as distinct_id if user_id is not available
- # This ensures we can track completions even for anonymous users
- distinct_id = user_id if user_id else f'conversation_{conversation_id}'
-
- try:
- posthog.capture(
- distinct_id=distinct_id,
- event='agent_task_completed',
- properties={
- 'conversation_id': conversation_id,
- 'user_id': user_id,
- 'app_mode': app_mode or 'unknown',
- },
- )
- logger.debug(
- 'posthog_track',
- extra={
- 'event': 'agent_task_completed',
- 'conversation_id': conversation_id,
- 'user_id': user_id,
- },
- )
- except Exception as e:
- logger.warning(
- f'Failed to track agent_task_completed to PostHog: {e}',
- extra={
- 'conversation_id': conversation_id,
- 'error': str(e),
- },
- )
-
-
-def track_user_signup_completed(
- user_id: str,
- signup_timestamp: str,
-) -> None:
- """Track when a user completes signup by accepting TOS.
-
- Args:
- user_id: The ID of the user (Keycloak user ID)
- signup_timestamp: ISO format timestamp of when TOS was accepted
- """
- _init_posthog()
-
- if posthog is None:
- return
-
- try:
- posthog.capture(
- distinct_id=user_id,
- event='user_signup_completed',
- properties={
- 'user_id': user_id,
- 'signup_timestamp': signup_timestamp,
- },
- )
- logger.debug(
- 'posthog_track',
- extra={
- 'event': 'user_signup_completed',
- 'user_id': user_id,
- },
- )
- except Exception as e:
- logger.warning(
- f'Failed to track user_signup_completed to PostHog: {e}',
- extra={
- 'user_id': user_id,
- 'error': str(e),
- },
- )
-
-
-def track_credit_limit_reached(
- conversation_id: str,
- user_id: str | None = None,
- current_budget: float = 0.0,
- max_budget: float = 0.0,
-) -> None:
- """Track when a user reaches their credit limit during a conversation.
-
- Args:
- conversation_id: The ID of the conversation/session
- user_id: The ID of the user (optional, may be None for unauthenticated users)
- current_budget: The current budget spent
- max_budget: The maximum budget allowed
- """
- _init_posthog()
-
- if posthog is None:
- return
-
- distinct_id = user_id if user_id else f'conversation_{conversation_id}'
-
- try:
- posthog.capture(
- distinct_id=distinct_id,
- event='credit_limit_reached',
- properties={
- 'conversation_id': conversation_id,
- 'user_id': user_id,
- 'current_budget': current_budget,
- 'max_budget': max_budget,
- },
- )
- logger.debug(
- 'posthog_track',
- extra={
- 'event': 'credit_limit_reached',
- 'conversation_id': conversation_id,
- 'user_id': user_id,
- 'current_budget': current_budget,
- 'max_budget': max_budget,
- },
- )
- except Exception as e:
- logger.warning(
- f'Failed to track credit_limit_reached to PostHog: {e}',
- extra={
- 'conversation_id': conversation_id,
- 'error': str(e),
- },
- )
-
-
-def track_credits_purchased(
- user_id: str,
- amount_usd: float,
- credits_added: float,
- stripe_session_id: str,
-) -> None:
- """Track when a user successfully purchases credits.
-
- Args:
- user_id: The ID of the user (Keycloak user ID)
- amount_usd: The amount paid in USD (cents converted to dollars)
- credits_added: The number of credits added to the user's account
- stripe_session_id: The Stripe checkout session ID
- """
- _init_posthog()
-
- if posthog is None:
- return
-
- try:
- posthog.capture(
- distinct_id=user_id,
- event='credits_purchased',
- properties={
- 'user_id': user_id,
- 'amount_usd': amount_usd,
- 'credits_added': credits_added,
- 'stripe_session_id': stripe_session_id,
- },
- )
- logger.debug(
- 'posthog_track',
- extra={
- 'event': 'credits_purchased',
- 'user_id': user_id,
- 'amount_usd': amount_usd,
- 'credits_added': credits_added,
- },
- )
- except Exception as e:
- logger.warning(
- f'Failed to track credits_purchased to PostHog: {e}',
- extra={
- 'user_id': user_id,
- 'error': str(e),
- },
- )
-
-
-def alias_user_identities(
- keycloak_user_id: str,
- git_login: str,
-) -> None:
- """Alias a user's Keycloak ID with their git provider login for unified tracking.
-
- This allows PostHog to link events tracked from the frontend (using git provider login)
- with events tracked from the backend (using Keycloak user ID).
-
- PostHog Python alias syntax: alias(previous_id, distinct_id)
- - previous_id: The old/previous distinct ID that will be merged
- - distinct_id: The new/canonical distinct ID to merge into
-
- For our use case:
- - Git provider login is the previous_id (first used in frontend, before backend auth)
- - Keycloak user ID is the distinct_id (canonical backend ID)
- - Result: All events with git login will be merged into Keycloak user ID
-
- Args:
- keycloak_user_id: The Keycloak user ID (canonical distinct_id)
- git_login: The git provider username (GitHub/GitLab/Bitbucket) to merge
-
- Reference:
- https://github.com/PostHog/posthog-python/blob/master/posthog/client.py
- """
- _init_posthog()
-
- if posthog is None:
- return
-
- try:
- # Merge git provider login into Keycloak user ID
- # posthog.alias(previous_id, distinct_id) - official Python SDK signature
- posthog.alias(git_login, keycloak_user_id)
- logger.debug(
- 'posthog_alias',
- extra={
- 'previous_id': git_login,
- 'distinct_id': keycloak_user_id,
- },
- )
- except Exception as e:
- logger.warning(
- f'Failed to alias user identities in PostHog: {e}',
- extra={
- 'keycloak_user_id': keycloak_user_id,
- 'git_login': git_login,
- 'error': str(e),
- },
- )
diff --git a/poetry.lock b/poetry.lock
index 0cc47afea7d7..23789d328587 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -254,14 +254,14 @@ files = [
[[package]]
name = "anthropic"
-version = "0.72.0"
+version = "0.75.0"
description = "The official Python library for the anthropic API"
optional = false
-python-versions = ">=3.8"
+python-versions = ">=3.9"
groups = ["main"]
files = [
- {file = "anthropic-0.72.0-py3-none-any.whl", hash = "sha256:0e9f5a7582f038cab8efbb4c959e49ef654a56bfc7ba2da51b5a7b8a84de2e4d"},
- {file = "anthropic-0.72.0.tar.gz", hash = "sha256:8971fe76dcffc644f74ac3883069beb1527641115ae0d6eb8fa21c1ce4082f7a"},
+ {file = "anthropic-0.75.0-py3-none-any.whl", hash = "sha256:ea8317271b6c15d80225a9f3c670152746e88805a7a61e14d4a374577164965b"},
+ {file = "anthropic-0.75.0.tar.gz", hash = "sha256:e8607422f4ab616db2ea5baacc215dd5f028da99ce2f022e33c7c535b29f3dfb"},
]
[package.dependencies]
@@ -1205,34 +1205,37 @@ botocore = ["botocore"]
[[package]]
name = "browser-use"
-version = "0.8.0"
+version = "0.10.1"
description = "Make websites accessible for AI agents"
optional = false
python-versions = "<4.0,>=3.11"
groups = ["main"]
files = [
- {file = "browser_use-0.8.0-py3-none-any.whl", hash = "sha256:b7c299e38ec1c1aec42a236cc6ad2268a366226940d6ff9d88ed461afd5a1cc3"},
- {file = "browser_use-0.8.0.tar.gz", hash = "sha256:2136eb3251424f712a08ee379c9337237c2f93b29b566807db599cf94e6abb5e"},
+ {file = "browser_use-0.10.1-py3-none-any.whl", hash = "sha256:96e603bfc71098175342cdcb0592519e6f244412e740f0254e4389fdd82a977f"},
+ {file = "browser_use-0.10.1.tar.gz", hash = "sha256:5f211ecfdf1f9fd186160f10df70dedd661821231e30f1bce40939787abab223"},
]
[package.dependencies]
aiohttp = "3.12.15"
-anthropic = ">=0.68.1,<1.0.0"
+anthropic = ">=0.72.1,<1.0.0"
anyio = ">=4.9.0"
authlib = ">=1.6.0"
bubus = ">=1.5.6"
-cdp-use = ">=1.4.0"
+cdp-use = ">=1.4.4"
+click = ">=8.1.8"
+cloudpickle = ">=3.1.1"
google-api-core = ">=2.25.0"
google-api-python-client = ">=2.174.0"
google-auth = ">=2.40.3"
google-auth-oauthlib = ">=1.2.2"
-google-genai = ">=1.29.0,<2.0.0"
+google-genai = ">=1.50.0,<2.0.0"
groq = ">=0.30.0"
-html2text = ">=2025.4.15"
httpx = ">=0.28.1"
+inquirerpy = ">=0.3.4"
+markdownify = ">=1.2.0"
mcp = ">=1.10.1"
ollama = ">=0.5.1"
-openai = ">=1.99.2,<2.0.0"
+openai = ">=2.7.2,<3.0.0"
pillow = ">=11.2.1"
portalocker = ">=2.7.0,<3.0.0"
posthog = ">=3.7.0"
@@ -1241,19 +1244,24 @@ pydantic = ">=2.11.5"
pyobjc = {version = ">=11.0", markers = "platform_system == \"darwin\""}
pyotp = ">=2.9.0"
pypdf = ">=5.7.0"
+python-docx = ">=1.2.0"
python-dotenv = ">=1.0.1"
reportlab = ">=4.0.0"
requests = ">=2.32.3"
+rich = ">=14.0.0"
screeninfo = {version = ">=0.8.1", markers = "platform_system != \"darwin\""}
typing-extensions = ">=4.12.2"
uuid7 = ">=0.1.0"
[package.extras]
-all = ["agentmail (==0.0.59)", "boto3 (>=1.38.45)", "botocore (>=1.37.23)", "click (>=8.1.8)", "imgcat (>=0.6.0)", "langchain-openai (>=0.3.26)", "rich (>=14.0.0)", "textual (>=3.2.0)"]
+all = ["agentmail (==0.0.59)", "boto3 (>=1.38.45)", "botocore (>=1.37.23)", "imgcat (>=0.6.0)", "langchain-openai (>=0.3.26)", "oci (>=2.126.4)", "textual (>=3.2.0)"]
aws = ["boto3 (>=1.38.45)"]
-cli = ["click (>=8.1.8)", "rich (>=14.0.0)", "textual (>=3.2.0)"]
-eval = ["anyio (>=4.9.0)", "browserbase (==1.4.0)", "datamodel-code-generator (>=0.26.0)", "hyperbrowser (==0.47.0)", "lmnr[all] (==0.7.17)", "psutil (>=7.0.0)"]
+cli = ["textual (>=3.2.0)"]
+cli-oci = ["oci (>=2.126.4)", "textual (>=3.2.0)"]
+code = ["matplotlib (>=3.9.0)", "numpy (>=2.3.2)", "pandas (>=2.2.0)", "tabulate (>=0.9.0)"]
+eval = ["anyio (>=4.9.0)", "datamodel-code-generator (>=0.26.0)", "lmnr[all] (==0.7.17)", "psutil (>=7.0.0)"]
examples = ["agentmail (==0.0.59)", "botocore (>=1.37.23)", "imgcat (>=0.6.0)", "langchain-openai (>=0.3.26)"]
+oci = ["oci (>=2.126.4)"]
video = ["imageio[ffmpeg] (>=2.37.0)", "numpy (>=2.3.2)"]
[[package]]
@@ -1494,14 +1502,14 @@ files = [
[[package]]
name = "cdp-use"
-version = "1.4.3"
+version = "1.4.4"
description = "Type safe generator/client library for CDP"
optional = false
python-versions = ">=3.11"
groups = ["main"]
files = [
- {file = "cdp_use-1.4.3-py3-none-any.whl", hash = "sha256:c48664604470c2579aa1e677c3e3e7e24c4f300c54804c093d935abb50479ecd"},
- {file = "cdp_use-1.4.3.tar.gz", hash = "sha256:9029c04bdc49fbd3939d2bf1988ad8d88e260729c7d5e35c2f6c87591f5a10e9"},
+ {file = "cdp_use-1.4.4-py3-none-any.whl", hash = "sha256:e37e80e067db2653d6fdf953d4ff9e5d80d75daa27b7c6d48c0261cccbef73e1"},
+ {file = "cdp_use-1.4.4.tar.gz", hash = "sha256:330a848b517006eb9ad1dc468aa6434d913cf0c6918610760c36c3fdfdba0fab"},
]
[package.dependencies]
@@ -3802,28 +3810,28 @@ testing = ["pytest"]
[[package]]
name = "google-genai"
-version = "1.45.0"
+version = "1.53.0"
description = "GenAI Python SDK"
optional = false
-python-versions = ">=3.9"
+python-versions = ">=3.10"
groups = ["main"]
files = [
- {file = "google_genai-1.45.0-py3-none-any.whl", hash = "sha256:e755295063e5fd5a4c44acff782a569e37fa8f76a6c75d0ede3375c70d916b7f"},
- {file = "google_genai-1.45.0.tar.gz", hash = "sha256:96ec32ae99a30b5a1b54cb874b577ec6e41b5d5b808bf0f10ed4620e867f9386"},
+ {file = "google_genai-1.53.0-py3-none-any.whl", hash = "sha256:65a3f99e5c03c372d872cda7419f5940e723374bb12a2f3ffd5e3e56e8eb2094"},
+ {file = "google_genai-1.53.0.tar.gz", hash = "sha256:938a26d22f3fd32c6eeeb4276ef204ef82884e63af9842ce3eac05ceb39cbd8d"},
]
[package.dependencies]
anyio = ">=4.8.0,<5.0.0"
-google-auth = ">=2.14.1,<3.0.0"
+google-auth = {version = ">=2.14.1,<3.0.0", extras = ["requests"]}
httpx = ">=0.28.1,<1.0.0"
-pydantic = ">=2.0.0,<3.0.0"
+pydantic = ">=2.9.0,<3.0.0"
requests = ">=2.28.1,<3.0.0"
tenacity = ">=8.2.3,<9.2.0"
typing-extensions = ">=4.11.0,<5.0.0"
websockets = ">=13.0.0,<15.1.0"
[package.extras]
-aiohttp = ["aiohttp (<4.0.0)"]
+aiohttp = ["aiohttp (<3.13.3)"]
local-tokenizer = ["protobuf", "sentencepiece (>=0.2.0)"]
[[package]]
@@ -3991,67 +3999,71 @@ protobuf = ">=3.20.2,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4
[[package]]
name = "grpcio"
-version = "1.72.1"
+version = "1.67.1"
description = "HTTP/2-based RPC framework"
optional = false
-python-versions = ">=3.9"
+python-versions = ">=3.8"
groups = ["main"]
files = [
- {file = "grpcio-1.72.1-cp310-cp310-linux_armv7l.whl", hash = "sha256:ce2706ff37be7a6de68fbc4c3f8dde247cab48cc70fee5fedfbc9cd923b4ee5a"},
- {file = "grpcio-1.72.1-cp310-cp310-macosx_11_0_universal2.whl", hash = "sha256:7db9e15ee7618fbea748176a67d347f3100fa92d36acccd0e7eeb741bc82f72a"},
- {file = "grpcio-1.72.1-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:8d6e7764181ba4a8b74aa78c98a89c9f3441068ebcee5d6f14c44578214e0be3"},
- {file = "grpcio-1.72.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:237bb619ba33594006025e6f114f62e60d9563afd6f8e89633ee384868e26687"},
- {file = "grpcio-1.72.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a7f1d8a442fd242aa432c8e1b8411c79ebc409dad2c637614d726e226ce9ed0c"},
- {file = "grpcio-1.72.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:f2359bd4bba85bf94fd9ab8802671b9637a6803bb673d221157a11523a52e6a8"},
- {file = "grpcio-1.72.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:3269cfca37570a420a57a785f2a5d4234c5b12aced55f8843dafced2d3f8c9a6"},
- {file = "grpcio-1.72.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:06c023d86398714d6257194c21f2bc0b58a53ce45cee87dd3c54c7932c590e17"},
- {file = "grpcio-1.72.1-cp310-cp310-win32.whl", hash = "sha256:06dbe54eeea5f9dfb3e7ca2ff66c715ff5fc96b07a1feb322122fe14cb42f6aa"},
- {file = "grpcio-1.72.1-cp310-cp310-win_amd64.whl", hash = "sha256:ba593aa2cd52f4468ba29668c83f893d88c128198d6b1273ca788ef53e3ae5fe"},
- {file = "grpcio-1.72.1-cp311-cp311-linux_armv7l.whl", hash = "sha256:4e112c083f90c330b0eaa78a633fb206d49c20c443926e827f8cac9eb9d2ea32"},
- {file = "grpcio-1.72.1-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:c6f7e3275832adab7384193f78b8c1a98b82541562fa08d7244e8a6b4b5c78a4"},
- {file = "grpcio-1.72.1-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:dd03c8847c47ef7ac5455aafdfb5e553ecf84f228282bd6106762b379f27c25c"},
- {file = "grpcio-1.72.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7497dbdf220b88b66004e2630fb2b1627df5e279db970d3cc20f70d39dce978d"},
- {file = "grpcio-1.72.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:95c2cde3ae8ae901317c049394ed8d3c6964de6b814ae65fc68636a7337b63aa"},
- {file = "grpcio-1.72.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:7a66cef4bc1db81a54108a849e95650da640c9bc1901957bf7d3b1eeb3251ee8"},
- {file = "grpcio-1.72.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:fc0435ad45d540597f78978e3fd5515b448193f51f9065fb67dda566336e0f5f"},
- {file = "grpcio-1.72.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:524bad78d610fa1f9f316d47b3aab1ff89d438ba952ee34e3e335ca80a27ba96"},
- {file = "grpcio-1.72.1-cp311-cp311-win32.whl", hash = "sha256:409ee0abf7e74bbf88941046142452cf3d1f3863d34e11e8fd2b07375170c730"},
- {file = "grpcio-1.72.1-cp311-cp311-win_amd64.whl", hash = "sha256:ea483e408fac55569c11158c3e6d6d6a8c3b0f798b68f1c10db9b22c5996e19b"},
- {file = "grpcio-1.72.1-cp312-cp312-linux_armv7l.whl", hash = "sha256:65a5ef28e5852bd281c6d01a923906e8036736e95e370acab8626fcbec041e67"},
- {file = "grpcio-1.72.1-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:9e5c594a6c779d674204fb9bdaa1e7b71666ff10b34a62e7769fc6868b5d7511"},
- {file = "grpcio-1.72.1-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:d324f4bdb990d852d79b38c59a12d24fcd47cf3b1a38f2e4d2b6d0b1031bc818"},
- {file = "grpcio-1.72.1-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:841db55dd29cf2f4121b853b2f89813a1b6175163fbb92c5945fb1b0ca259ef2"},
- {file = "grpcio-1.72.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:00da930aa2711b955a538e835096aa365a4b7f2701bdc2ce1febb242a103f8a1"},
- {file = "grpcio-1.72.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:4b657773480267fbb7ad733fa85abc103c52ab62e5bc97791faf82c53836eefc"},
- {file = "grpcio-1.72.1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:a08b483f17a6abca2578283a7ae3aa8d4d90347242b0de2898bdb27395c3f20b"},
- {file = "grpcio-1.72.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:299f3ea4e03c1d0548f4a174b48d612412f92c667f2100e30a079ab76fdaa813"},
- {file = "grpcio-1.72.1-cp312-cp312-win32.whl", hash = "sha256:addc721a3708ff789da1bf69876018dc730c1ec9d3d3cb6912776a00c535a5bc"},
- {file = "grpcio-1.72.1-cp312-cp312-win_amd64.whl", hash = "sha256:22ea2aa92a60dff231ba5fcd7f0220a33c2218e556009996f858eeafe294d1c2"},
- {file = "grpcio-1.72.1-cp313-cp313-linux_armv7l.whl", hash = "sha256:294be6e9c323a197434569a41e0fb5b5aa0962fd5d55a3dc890ec5df985f611a"},
- {file = "grpcio-1.72.1-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:41ec164dac8df2862f67457d9cdf8d8f8b6a4ca475a3ed1ba6547fff98d93717"},
- {file = "grpcio-1.72.1-cp313-cp313-manylinux_2_17_aarch64.whl", hash = "sha256:761736f75c6ddea3732d97eaabe70c616271f5f542a8be95515135fdd1a638f6"},
- {file = "grpcio-1.72.1-cp313-cp313-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:082003cb93618964c111c70d69b60ac0dc6566d4c254c9b2a775faa2965ba8f8"},
- {file = "grpcio-1.72.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8660f736da75424949c14f7c8b1ac60a25b2f37cabdec95181834b405373e8a7"},
- {file = "grpcio-1.72.1-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:2ada1abe2ad122b42407b2bfd79d6706a4940d4797f44bd740f5c98ca1ecda9b"},
- {file = "grpcio-1.72.1-cp313-cp313-musllinux_1_1_i686.whl", hash = "sha256:0db2766d0c482ee740abbe7d00a06cc4fb54f7e5a24d3cf27c3352be18a2b1e8"},
- {file = "grpcio-1.72.1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:c4bdb404d9c2187260b34e2b22783c204fba8a9023a166cf77376190d9cf5a08"},
- {file = "grpcio-1.72.1-cp313-cp313-win32.whl", hash = "sha256:bb64722c3124c906a5b66e50a90fd36442642f653ba88a24f67d08e94bca59f3"},
- {file = "grpcio-1.72.1-cp313-cp313-win_amd64.whl", hash = "sha256:329cc6ff5b431df9614340d3825b066a1ff0a5809a01ba2e976ef48c65a0490b"},
- {file = "grpcio-1.72.1-cp39-cp39-linux_armv7l.whl", hash = "sha256:8941b83addd503c1982090b4631804d0ff1edbbc6c85c9c20ed503b1dc65fef9"},
- {file = "grpcio-1.72.1-cp39-cp39-macosx_11_0_universal2.whl", hash = "sha256:d29b80290c5eda561a4c291d6d5b4315a2a5095ab37061118d6e0781858aca0a"},
- {file = "grpcio-1.72.1-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:4ca56d955564db749c9c6d75e9c4c777854e22b2482d247fb6c5a02d5f28ea78"},
- {file = "grpcio-1.72.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b08a3ef14d2b01eef13882c6d3a2d8fb5fcd73db81bd1e3ab69d4ee75215433a"},
- {file = "grpcio-1.72.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fd7df49801b3b323e4a21047979e3834cd286b32ee5ceee46f5217826274721f"},
- {file = "grpcio-1.72.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:9717617ba2ff65c058ef53b0d5e50f03e8350f0c5597f93bb5c980a31db990c8"},
- {file = "grpcio-1.72.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:212db80b1e8aa7792d51269bfb32164e2333a9bb273370ace3ed2a378505cb01"},
- {file = "grpcio-1.72.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:1a0d19947d4480af5f363f077f221e665931f479e2604280ac4eafe6daa71f77"},
- {file = "grpcio-1.72.1-cp39-cp39-win32.whl", hash = "sha256:7622ef647dc911ed010a817d9be501df4ae83495b8e5cdd35b555bdcf3880a3e"},
- {file = "grpcio-1.72.1-cp39-cp39-win_amd64.whl", hash = "sha256:f8d8fa7cd2a7f1b4207e215dec8bc07f1202682d9a216ebe028185c15faece30"},
- {file = "grpcio-1.72.1.tar.gz", hash = "sha256:87f62c94a40947cec1a0f91f95f5ba0aa8f799f23a1d42ae5be667b6b27b959c"},
+ {file = "grpcio-1.67.1-cp310-cp310-linux_armv7l.whl", hash = "sha256:8b0341d66a57f8a3119b77ab32207072be60c9bf79760fa609c5609f2deb1f3f"},
+ {file = "grpcio-1.67.1-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:f5a27dddefe0e2357d3e617b9079b4bfdc91341a91565111a21ed6ebbc51b22d"},
+ {file = "grpcio-1.67.1-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:43112046864317498a33bdc4797ae6a268c36345a910de9b9c17159d8346602f"},
+ {file = "grpcio-1.67.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c9b929f13677b10f63124c1a410994a401cdd85214ad83ab67cc077fc7e480f0"},
+ {file = "grpcio-1.67.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e7d1797a8a3845437d327145959a2c0c47c05947c9eef5ff1a4c80e499dcc6fa"},
+ {file = "grpcio-1.67.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:0489063974d1452436139501bf6b180f63d4977223ee87488fe36858c5725292"},
+ {file = "grpcio-1.67.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:9fd042de4a82e3e7aca44008ee2fb5da01b3e5adb316348c21980f7f58adc311"},
+ {file = "grpcio-1.67.1-cp310-cp310-win32.whl", hash = "sha256:638354e698fd0c6c76b04540a850bf1db27b4d2515a19fcd5cf645c48d3eb1ed"},
+ {file = "grpcio-1.67.1-cp310-cp310-win_amd64.whl", hash = "sha256:608d87d1bdabf9e2868b12338cd38a79969eaf920c89d698ead08f48de9c0f9e"},
+ {file = "grpcio-1.67.1-cp311-cp311-linux_armv7l.whl", hash = "sha256:7818c0454027ae3384235a65210bbf5464bd715450e30a3d40385453a85a70cb"},
+ {file = "grpcio-1.67.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ea33986b70f83844cd00814cee4451055cd8cab36f00ac64a31f5bb09b31919e"},
+ {file = "grpcio-1.67.1-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:c7a01337407dd89005527623a4a72c5c8e2894d22bead0895306b23c6695698f"},
+ {file = "grpcio-1.67.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:80b866f73224b0634f4312a4674c1be21b2b4afa73cb20953cbbb73a6b36c3cc"},
+ {file = "grpcio-1.67.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f9fff78ba10d4250bfc07a01bd6254a6d87dc67f9627adece85c0b2ed754fa96"},
+ {file = "grpcio-1.67.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:8a23cbcc5bb11ea7dc6163078be36c065db68d915c24f5faa4f872c573bb400f"},
+ {file = "grpcio-1.67.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:1a65b503d008f066e994f34f456e0647e5ceb34cfcec5ad180b1b44020ad4970"},
+ {file = "grpcio-1.67.1-cp311-cp311-win32.whl", hash = "sha256:e29ca27bec8e163dca0c98084040edec3bc49afd10f18b412f483cc68c712744"},
+ {file = "grpcio-1.67.1-cp311-cp311-win_amd64.whl", hash = "sha256:786a5b18544622bfb1e25cc08402bd44ea83edfb04b93798d85dca4d1a0b5be5"},
+ {file = "grpcio-1.67.1-cp312-cp312-linux_armv7l.whl", hash = "sha256:267d1745894200e4c604958da5f856da6293f063327cb049a51fe67348e4f953"},
+ {file = "grpcio-1.67.1-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:85f69fdc1d28ce7cff8de3f9c67db2b0ca9ba4449644488c1e0303c146135ddb"},
+ {file = "grpcio-1.67.1-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:f26b0b547eb8d00e195274cdfc63ce64c8fc2d3e2d00b12bf468ece41a0423a0"},
+ {file = "grpcio-1.67.1-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4422581cdc628f77302270ff839a44f4c24fdc57887dc2a45b7e53d8fc2376af"},
+ {file = "grpcio-1.67.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1d7616d2ded471231c701489190379e0c311ee0a6c756f3c03e6a62b95a7146e"},
+ {file = "grpcio-1.67.1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:8a00efecde9d6fcc3ab00c13f816313c040a28450e5e25739c24f432fc6d3c75"},
+ {file = "grpcio-1.67.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:699e964923b70f3101393710793289e42845791ea07565654ada0969522d0a38"},
+ {file = "grpcio-1.67.1-cp312-cp312-win32.whl", hash = "sha256:4e7b904484a634a0fff132958dabdb10d63e0927398273917da3ee103e8d1f78"},
+ {file = "grpcio-1.67.1-cp312-cp312-win_amd64.whl", hash = "sha256:5721e66a594a6c4204458004852719b38f3d5522082be9061d6510b455c90afc"},
+ {file = "grpcio-1.67.1-cp313-cp313-linux_armv7l.whl", hash = "sha256:aa0162e56fd10a5547fac8774c4899fc3e18c1aa4a4759d0ce2cd00d3696ea6b"},
+ {file = "grpcio-1.67.1-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:beee96c8c0b1a75d556fe57b92b58b4347c77a65781ee2ac749d550f2a365dc1"},
+ {file = "grpcio-1.67.1-cp313-cp313-manylinux_2_17_aarch64.whl", hash = "sha256:a93deda571a1bf94ec1f6fcda2872dad3ae538700d94dc283c672a3b508ba3af"},
+ {file = "grpcio-1.67.1-cp313-cp313-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0e6f255980afef598a9e64a24efce87b625e3e3c80a45162d111a461a9f92955"},
+ {file = "grpcio-1.67.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9e838cad2176ebd5d4a8bb03955138d6589ce9e2ce5d51c3ada34396dbd2dba8"},
+ {file = "grpcio-1.67.1-cp313-cp313-musllinux_1_1_i686.whl", hash = "sha256:a6703916c43b1d468d0756c8077b12017a9fcb6a1ef13faf49e67d20d7ebda62"},
+ {file = "grpcio-1.67.1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:917e8d8994eed1d86b907ba2a61b9f0aef27a2155bca6cbb322430fc7135b7bb"},
+ {file = "grpcio-1.67.1-cp313-cp313-win32.whl", hash = "sha256:e279330bef1744040db8fc432becc8a727b84f456ab62b744d3fdb83f327e121"},
+ {file = "grpcio-1.67.1-cp313-cp313-win_amd64.whl", hash = "sha256:fa0c739ad8b1996bd24823950e3cb5152ae91fca1c09cc791190bf1627ffefba"},
+ {file = "grpcio-1.67.1-cp38-cp38-linux_armv7l.whl", hash = "sha256:178f5db771c4f9a9facb2ab37a434c46cb9be1a75e820f187ee3d1e7805c4f65"},
+ {file = "grpcio-1.67.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:0f3e49c738396e93b7ba9016e153eb09e0778e776df6090c1b8c91877cc1c426"},
+ {file = "grpcio-1.67.1-cp38-cp38-manylinux_2_17_aarch64.whl", hash = "sha256:24e8a26dbfc5274d7474c27759b54486b8de23c709d76695237515bc8b5baeab"},
+ {file = "grpcio-1.67.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3b6c16489326d79ead41689c4b84bc40d522c9a7617219f4ad94bc7f448c5085"},
+ {file = "grpcio-1.67.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:60e6a4dcf5af7bbc36fd9f81c9f372e8ae580870a9e4b6eafe948cd334b81cf3"},
+ {file = "grpcio-1.67.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:95b5f2b857856ed78d72da93cd7d09b6db8ef30102e5e7fe0961fe4d9f7d48e8"},
+ {file = "grpcio-1.67.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:b49359977c6ec9f5d0573ea4e0071ad278ef905aa74e420acc73fd28ce39e9ce"},
+ {file = "grpcio-1.67.1-cp38-cp38-win32.whl", hash = "sha256:f5b76ff64aaac53fede0cc93abf57894ab2a7362986ba22243d06218b93efe46"},
+ {file = "grpcio-1.67.1-cp38-cp38-win_amd64.whl", hash = "sha256:804c6457c3cd3ec04fe6006c739579b8d35c86ae3298ffca8de57b493524b771"},
+ {file = "grpcio-1.67.1-cp39-cp39-linux_armv7l.whl", hash = "sha256:a25bdea92b13ff4d7790962190bf6bf5c4639876e01c0f3dda70fc2769616335"},
+ {file = "grpcio-1.67.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:cdc491ae35a13535fd9196acb5afe1af37c8237df2e54427be3eecda3653127e"},
+ {file = "grpcio-1.67.1-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:85f862069b86a305497e74d0dc43c02de3d1d184fc2c180993aa8aa86fbd19b8"},
+ {file = "grpcio-1.67.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ec74ef02010186185de82cc594058a3ccd8d86821842bbac9873fd4a2cf8be8d"},
+ {file = "grpcio-1.67.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:01f616a964e540638af5130469451cf580ba8c7329f45ca998ab66e0c7dcdb04"},
+ {file = "grpcio-1.67.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:299b3d8c4f790c6bcca485f9963b4846dd92cf6f1b65d3697145d005c80f9fe8"},
+ {file = "grpcio-1.67.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:60336bff760fbb47d7e86165408126f1dded184448e9a4c892189eb7c9d3f90f"},
+ {file = "grpcio-1.67.1-cp39-cp39-win32.whl", hash = "sha256:5ed601c4c6008429e3d247ddb367fe8c7259c355757448d7c1ef7bd4a6739e8e"},
+ {file = "grpcio-1.67.1-cp39-cp39-win_amd64.whl", hash = "sha256:5db70d32d6703b89912af16d6d45d78406374a8b8ef0d28140351dd0ec610e98"},
+ {file = "grpcio-1.67.1.tar.gz", hash = "sha256:3dc2ed4cabea4dc14d5e708c2b426205956077cc5de419b4d4079315017e9732"},
]
[package.extras]
-protobuf = ["grpcio-tools (>=1.72.1)"]
+protobuf = ["grpcio-tools (>=1.67.1)"]
[[package]]
name = "grpcio-status"
@@ -4434,6 +4446,25 @@ files = [
{file = "iniconfig-2.1.0.tar.gz", hash = "sha256:3abbd2e30b36733fee78f9c7f7308f2d0050e88f0087fd25c2645f63c773e1c7"},
]
+[[package]]
+name = "inquirerpy"
+version = "0.3.4"
+description = "Python port of Inquirer.js (A collection of common interactive command-line user interfaces)"
+optional = false
+python-versions = ">=3.7,<4.0"
+groups = ["main"]
+files = [
+ {file = "InquirerPy-0.3.4-py3-none-any.whl", hash = "sha256:c65fdfbac1fa00e3ee4fb10679f4d3ed7a012abf4833910e63c295827fe2a7d4"},
+ {file = "InquirerPy-0.3.4.tar.gz", hash = "sha256:89d2ada0111f337483cb41ae31073108b2ec1e618a49d7110b0d7ade89fc197e"},
+]
+
+[package.dependencies]
+pfzy = ">=0.3.1,<0.4.0"
+prompt-toolkit = ">=3.0.1,<4.0.0"
+
+[package.extras]
+docs = ["Sphinx (>=4.1.2,<5.0.0)", "furo (>=2021.8.17-beta.43,<2022.0.0)", "myst-parser (>=0.15.1,<0.16.0)", "sphinx-autobuild (>=2021.3.14,<2022.0.0)", "sphinx-copybutton (>=0.4.0,<0.5.0)"]
+
[[package]]
name = "installer"
version = "0.7.0"
@@ -5609,25 +5640,26 @@ types-tqdm = "*"
[[package]]
name = "litellm"
-version = "1.77.7"
+version = "1.80.7"
description = "Library to easily interface with LLM API providers"
optional = false
-python-versions = "!=2.7.*,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,!=3.7.*,>=3.8"
+python-versions = "<4.0,>=3.9"
groups = ["main"]
files = [
- {file = "litellm-1.77.7-py3-none-any.whl", hash = "sha256:1b3a1b17bd521a0ad25226fb62a912602c803922aabb4a16adf83834673be574"},
- {file = "litellm-1.77.7.tar.gz", hash = "sha256:e3398fb2575b98726e787c0a1481daed5938d58cafdcd96fbca80c312221af3e"},
+ {file = "litellm-1.80.7-py3-none-any.whl", hash = "sha256:f7d993f78c1e0e4e1202b2a925cc6540b55b6e5fb055dd342d88b145ab3102ed"},
+ {file = "litellm-1.80.7.tar.gz", hash = "sha256:3977a8d195aef842d01c18bf9e22984829363c6a4b54daf9a43c9dd9f190b42c"},
]
[package.dependencies]
aiohttp = ">=3.10"
click = "*"
fastuuid = ">=0.13.0"
+grpcio = ">=1.62.3,<1.68.0"
httpx = ">=0.23.0"
importlib-metadata = ">=6.8.0"
jinja2 = ">=3.1.2,<4.0.0"
jsonschema = ">=4.22.0,<5.0.0"
-openai = ">=1.99.5"
+openai = ">=2.8.0"
pydantic = ">=2.5.0,<3.0.0"
python-dotenv = ">=0.2.0"
tiktoken = ">=0.7.0"
@@ -5635,22 +5667,22 @@ tokenizers = "*"
[package.extras]
caching = ["diskcache (>=5.6.1,<6.0.0)"]
-extra-proxy = ["azure-identity (>=1.15.0,<2.0.0)", "azure-keyvault-secrets (>=4.8.0,<5.0.0)", "google-cloud-iam (>=2.19.1,<3.0.0)", "google-cloud-kms (>=2.21.3,<3.0.0)", "prisma (==0.11.0)", "redisvl (>=0.4.1,<0.5.0) ; python_version >= \"3.9\" and python_version < \"3.14\"", "resend (>=0.8.0,<0.9.0)"]
+extra-proxy = ["azure-identity (>=1.15.0,<2.0.0) ; python_version >= \"3.9\"", "azure-keyvault-secrets (>=4.8.0,<5.0.0)", "google-cloud-iam (>=2.19.1,<3.0.0)", "google-cloud-kms (>=2.21.3,<3.0.0)", "prisma (==0.11.0)", "redisvl (>=0.4.1,<0.5.0) ; python_version >= \"3.9\" and python_version < \"3.14\"", "resend (>=0.8.0)"]
mlflow = ["mlflow (>3.1.4) ; python_version >= \"3.10\""]
-proxy = ["PyJWT (>=2.8.0,<3.0.0)", "apscheduler (>=3.10.4,<4.0.0)", "azure-identity (>=1.15.0,<2.0.0)", "azure-storage-blob (>=12.25.1,<13.0.0)", "backoff", "boto3 (==1.36.0)", "cryptography", "fastapi (>=0.115.5,<0.116.0)", "fastapi-sso (>=0.16.0,<0.17.0)", "gunicorn (>=23.0.0,<24.0.0)", "litellm-enterprise (==0.1.20)", "litellm-proxy-extras (==0.2.25)", "mcp (>=1.10.0,<2.0.0) ; python_version >= \"3.10\"", "orjson (>=3.9.7,<4.0.0)", "polars (>=1.31.0,<2.0.0) ; python_version >= \"3.10\"", "pynacl (>=1.5.0,<2.0.0)", "python-multipart (>=0.0.18,<0.0.19)", "pyyaml (>=6.0.1,<7.0.0)", "rich (==13.7.1)", "rq", "uvicorn (>=0.29.0,<0.30.0)", "uvloop (>=0.21.0,<0.22.0) ; sys_platform != \"win32\"", "websockets (>=13.1.0,<14.0.0)"]
-semantic-router = ["semantic-router ; python_version >= \"3.9\""]
+proxy = ["PyJWT (>=2.10.1,<3.0.0) ; python_version >= \"3.9\"", "apscheduler (>=3.10.4,<4.0.0)", "azure-identity (>=1.15.0,<2.0.0) ; python_version >= \"3.9\"", "azure-storage-blob (>=12.25.1,<13.0.0)", "backoff", "boto3 (==1.36.0)", "cryptography", "fastapi (>=0.120.1)", "fastapi-sso (>=0.16.0,<0.17.0)", "gunicorn (>=23.0.0,<24.0.0)", "litellm-enterprise (==0.1.22)", "litellm-proxy-extras (==0.4.9)", "mcp (>=1.21.2,<2.0.0) ; python_version >= \"3.10\"", "orjson (>=3.9.7,<4.0.0)", "polars (>=1.31.0,<2.0.0) ; python_version >= \"3.10\"", "pynacl (>=1.5.0,<2.0.0)", "python-multipart (>=0.0.18,<0.0.19)", "pyyaml (>=6.0.1,<7.0.0)", "rich (==13.7.1)", "rq", "soundfile (>=0.12.1,<0.13.0)", "uvicorn (>=0.31.1,<0.32.0)", "uvloop (>=0.21.0,<0.22.0) ; sys_platform != \"win32\"", "websockets (>=15.0.1,<16.0.0)"]
+semantic-router = ["semantic-router (>=0.1.12) ; python_version >= \"3.9\" and python_version < \"3.14\""]
utils = ["numpydoc"]
[[package]]
name = "lmnr"
-version = "0.7.20"
+version = "0.7.24"
description = "Python SDK for Laminar"
optional = false
python-versions = "<4,>=3.10"
groups = ["main"]
files = [
- {file = "lmnr-0.7.20-py3-none-any.whl", hash = "sha256:5f9fa7444e6f96c25e097f66484ff29e632bdd1de0e9346948bf5595f4a8af38"},
- {file = "lmnr-0.7.20.tar.gz", hash = "sha256:1f484cd618db2d71af65f90a0b8b36d20d80dc91a5138b811575c8677bf7c4fd"},
+ {file = "lmnr-0.7.24-py3-none-any.whl", hash = "sha256:ad780d4a62ece897048811f3368639c240a9329ab31027da8c96545137a3a08a"},
+ {file = "lmnr-0.7.24.tar.gz", hash = "sha256:aa6973f46fc4ba95c9061c1feceb58afc02eb43c9376c21e32545371ff6123d7"},
]
[package.dependencies]
@@ -5673,14 +5705,15 @@ tqdm = ">=4.0"
[package.extras]
alephalpha = ["opentelemetry-instrumentation-alephalpha (>=0.47.1)"]
-all = ["opentelemetry-instrumentation-alephalpha (>=0.47.1)", "opentelemetry-instrumentation-bedrock (>=0.47.1)", "opentelemetry-instrumentation-chromadb (>=0.47.1)", "opentelemetry-instrumentation-cohere (>=0.47.1)", "opentelemetry-instrumentation-crewai (>=0.47.1)", "opentelemetry-instrumentation-haystack (>=0.47.1)", "opentelemetry-instrumentation-lancedb (>=0.47.1)", "opentelemetry-instrumentation-langchain (>=0.47.1)", "opentelemetry-instrumentation-llamaindex (>=0.47.1)", "opentelemetry-instrumentation-marqo (>=0.47.1)", "opentelemetry-instrumentation-mcp (>=0.47.1)", "opentelemetry-instrumentation-milvus (>=0.47.1)", "opentelemetry-instrumentation-mistralai (>=0.47.1)", "opentelemetry-instrumentation-ollama (>=0.47.1)", "opentelemetry-instrumentation-pinecone (>=0.47.1)", "opentelemetry-instrumentation-qdrant (>=0.47.1)", "opentelemetry-instrumentation-replicate (>=0.47.1)", "opentelemetry-instrumentation-sagemaker (>=0.47.1)", "opentelemetry-instrumentation-together (>=0.47.1)", "opentelemetry-instrumentation-transformers (>=0.47.1)", "opentelemetry-instrumentation-vertexai (>=0.47.1)", "opentelemetry-instrumentation-watsonx (>=0.47.1)", "opentelemetry-instrumentation-weaviate (>=0.47.1)"]
+all = ["opentelemetry-instrumentation-alephalpha (>=0.47.1)", "opentelemetry-instrumentation-bedrock (>=0.47.1)", "opentelemetry-instrumentation-chromadb (>=0.47.1)", "opentelemetry-instrumentation-cohere (>=0.47.1)", "opentelemetry-instrumentation-crewai (>=0.47.1)", "opentelemetry-instrumentation-haystack (>=0.47.1)", "opentelemetry-instrumentation-lancedb (>=0.47.1)", "opentelemetry-instrumentation-langchain (>=0.47.1,<0.48.0)", "opentelemetry-instrumentation-llamaindex (>=0.47.1)", "opentelemetry-instrumentation-marqo (>=0.47.1)", "opentelemetry-instrumentation-mcp (>=0.47.1)", "opentelemetry-instrumentation-milvus (>=0.47.1)", "opentelemetry-instrumentation-mistralai (>=0.47.1)", "opentelemetry-instrumentation-ollama (>=0.47.1)", "opentelemetry-instrumentation-pinecone (>=0.47.1)", "opentelemetry-instrumentation-qdrant (>=0.47.1)", "opentelemetry-instrumentation-replicate (>=0.47.1)", "opentelemetry-instrumentation-sagemaker (>=0.47.1)", "opentelemetry-instrumentation-together (>=0.47.1)", "opentelemetry-instrumentation-transformers (>=0.47.1)", "opentelemetry-instrumentation-vertexai (>=0.47.1)", "opentelemetry-instrumentation-watsonx (>=0.47.1)", "opentelemetry-instrumentation-weaviate (>=0.47.1)"]
bedrock = ["opentelemetry-instrumentation-bedrock (>=0.47.1)"]
chromadb = ["opentelemetry-instrumentation-chromadb (>=0.47.1)"]
+claude-agent-sdk = ["lmnr-claude-code-proxy (>=0.1.0a5)"]
cohere = ["opentelemetry-instrumentation-cohere (>=0.47.1)"]
crewai = ["opentelemetry-instrumentation-crewai (>=0.47.1)"]
haystack = ["opentelemetry-instrumentation-haystack (>=0.47.1)"]
lancedb = ["opentelemetry-instrumentation-lancedb (>=0.47.1)"]
-langchain = ["opentelemetry-instrumentation-langchain (>=0.47.1)"]
+langchain = ["opentelemetry-instrumentation-langchain (>=0.47.1,<0.48.0)"]
llamaindex = ["opentelemetry-instrumentation-llamaindex (>=0.47.1)"]
marqo = ["opentelemetry-instrumentation-marqo (>=0.47.1)"]
mcp = ["opentelemetry-instrumentation-mcp (>=0.47.1)"]
@@ -5783,8 +5816,11 @@ files = [
{file = "lxml-5.4.0-cp36-cp36m-win_amd64.whl", hash = "sha256:7ce1a171ec325192c6a636b64c94418e71a1964f56d002cc28122fceff0b6121"},
{file = "lxml-5.4.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:795f61bcaf8770e1b37eec24edf9771b307df3af74d1d6f27d812e15a9ff3872"},
{file = "lxml-5.4.0-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:29f451a4b614a7b5b6c2e043d7b64a15bd8304d7e767055e8ab68387a8cacf4e"},
+ {file = "lxml-5.4.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:891f7f991a68d20c75cb13c5c9142b2a3f9eb161f1f12a9489c82172d1f133c0"},
{file = "lxml-5.4.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4aa412a82e460571fad592d0f93ce9935a20090029ba08eca05c614f99b0cc92"},
+ {file = "lxml-5.4.0-cp37-cp37m-manylinux_2_28_aarch64.whl", hash = "sha256:ac7ba71f9561cd7d7b55e1ea5511543c0282e2b6450f122672a2694621d63b7e"},
{file = "lxml-5.4.0-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:c5d32f5284012deaccd37da1e2cd42f081feaa76981f0eaa474351b68df813c5"},
+ {file = "lxml-5.4.0-cp37-cp37m-musllinux_1_2_aarch64.whl", hash = "sha256:ce31158630a6ac85bddd6b830cffd46085ff90498b397bd0a259f59d27a12188"},
{file = "lxml-5.4.0-cp37-cp37m-musllinux_1_2_x86_64.whl", hash = "sha256:31e63621e073e04697c1b2d23fcb89991790eef370ec37ce4d5d469f40924ed6"},
{file = "lxml-5.4.0-cp37-cp37m-win32.whl", hash = "sha256:be2ba4c3c5b7900246a8f866580700ef0d538f2ca32535e991027bdaba944063"},
{file = "lxml-5.4.0-cp37-cp37m-win_amd64.whl", hash = "sha256:09846782b1ef650b321484ad429217f5154da4d6e786636c38e434fa32e94e49"},
@@ -5905,14 +5941,14 @@ testing = ["coverage", "pytest", "pytest-cov", "pytest-regressions"]
[[package]]
name = "markdownify"
-version = "1.1.0"
+version = "1.2.2"
description = "Convert HTML to markdown."
optional = false
python-versions = "*"
groups = ["main"]
files = [
- {file = "markdownify-1.1.0-py3-none-any.whl", hash = "sha256:32a5a08e9af02c8a6528942224c91b933b4bd2c7d078f9012943776fc313eeef"},
- {file = "markdownify-1.1.0.tar.gz", hash = "sha256:449c0bbbf1401c5112379619524f33b63490a8fa479456d41de9dc9e37560ebd"},
+ {file = "markdownify-1.2.2-py3-none-any.whl", hash = "sha256:3f02d3cc52714084d6e589f70397b6fc9f2f3a8531481bf35e8cc39f975e186a"},
+ {file = "markdownify-1.2.2.tar.gz", hash = "sha256:b274f1b5943180b031b699b199cbaeb1e2ac938b75851849a31fd0c3d6603d09"},
]
[package.dependencies]
@@ -7188,28 +7224,28 @@ pydantic = ">=2.9"
[[package]]
name = "openai"
-version = "1.99.9"
+version = "2.8.0"
description = "The official Python library for the openai API"
optional = false
-python-versions = ">=3.8"
+python-versions = ">=3.9"
groups = ["main", "evaluation"]
files = [
- {file = "openai-1.99.9-py3-none-any.whl", hash = "sha256:9dbcdb425553bae1ac5d947147bebbd630d91bbfc7788394d4c4f3a35682ab3a"},
- {file = "openai-1.99.9.tar.gz", hash = "sha256:f2082d155b1ad22e83247c3de3958eb4255b20ccf4a1de2e6681b6957b554e92"},
+ {file = "openai-2.8.0-py3-none-any.whl", hash = "sha256:ba975e347f6add2fe13529ccb94d54a578280e960765e5224c34b08d7e029ddf"},
+ {file = "openai-2.8.0.tar.gz", hash = "sha256:4851908f6d6fcacbd47ba659c5ac084f7725b752b6bfa1e948b6fbfc111a6bad"},
]
[package.dependencies]
anyio = ">=3.5.0,<5"
distro = ">=1.7.0,<2"
httpx = ">=0.23.0,<1"
-jiter = ">=0.4.0,<1"
+jiter = ">=0.10.0,<1"
pydantic = ">=1.9.0,<3"
sniffio = "*"
tqdm = ">4"
typing-extensions = ">=4.11,<5"
[package.extras]
-aiohttp = ["aiohttp", "httpx-aiohttp (>=0.1.8)"]
+aiohttp = ["aiohttp", "httpx-aiohttp (>=0.1.9)"]
datalib = ["numpy (>=1)", "pandas (>=1.2.3)", "pandas-stubs (>=1.1.0.11)"]
realtime = ["websockets (>=13,<16)"]
voice-helpers = ["numpy (>=2.0.2)", "sounddevice (>=0.5.1)"]
@@ -7344,54 +7380,46 @@ llama = ["llama-index (>=0.12.29,<0.13.0)", "llama-index-core (>=0.12.29,<0.13.0
[[package]]
name = "openhands-agent-server"
-version = "1.1.0"
+version = "1.6.0"
description = "OpenHands Agent Server - REST/WebSocket interface for OpenHands AI Agent"
optional = false
python-versions = ">=3.12"
groups = ["main"]
files = [
- {file = "openhands_agent_server-1.1.0-py3-none-any.whl", hash = "sha256:59a856883df23488c0723e47655ef21649a321fcd4709a25a4690866eff6ac88"},
- {file = "openhands_agent_server-1.1.0.tar.gz", hash = "sha256:e39bebd39afd45cfcfd765005e7c4e5409e46678bd7612ae20bae79f7057b935"},
+ {file = "openhands_agent_server-1.6.0-py3-none-any.whl", hash = "sha256:e6ae865ac3e7a96b234e10a0faad23f6210e025bbf7721cb66bc7a71d160848c"},
+ {file = "openhands_agent_server-1.6.0.tar.gz", hash = "sha256:44ce7694ae2d4bb0666d318ef13e6618bd4dc73022c60354839fe6130e67d02a"},
]
-develop = false
[package.dependencies]
aiosqlite = ">=0.19"
alembic = ">=1.13"
docker = ">=7.1,<8"
fastapi = ">=0.104"
+openhands-sdk = "*"
pydantic = ">=2"
sqlalchemy = ">=2"
uvicorn = ">=0.31.1"
websockets = ">=12"
wsproto = ">=1.2.0"
-[package.source]
-type = "git"
-url = "https://github.com/OpenHands/agent-sdk.git"
-reference = "15f565b8ac38876e40dc05c08e2b04ccaae4a66d"
-resolved_reference = "15f565b8ac38876e40dc05c08e2b04ccaae4a66d"
-subdirectory = "openhands-agent-server"
-
[[package]]
name = "openhands-sdk"
-version = "1.1.0"
+version = "1.6.0"
description = "OpenHands SDK - Core functionality for building AI agents"
optional = false
python-versions = ">=3.12"
groups = ["main"]
files = [
- {file = "openhands_sdk-1.1.0-py3-none-any.whl", hash = "sha256:4a984ce1687a48cf99a67fdf3d37b116f8b2840743d4807810b5024af6a1d57e"},
- {file = "openhands_sdk-1.1.0.tar.gz", hash = "sha256:855e0d8f3657205e4119e50520c17e65b3358b1a923f7a051a82512a54bf426c"},
+ {file = "openhands_sdk-1.6.0-py3-none-any.whl", hash = "sha256:94d2f87fb35406373da6728ae2d88584137f9e9b67fa0e940444c72f2e44e7d3"},
+ {file = "openhands_sdk-1.6.0.tar.gz", hash = "sha256:f45742350e3874a7f5b08befc4a9d5adc7e4454f7ab5f8391c519eee3116090f"},
]
-develop = false
[package.dependencies]
deprecation = ">=2.1.0"
fastmcp = ">=2.11.3"
httpx = ">=0.27.0"
-litellm = ">=1.77.7.dev9"
-lmnr = ">=0.7.20"
+litellm = ">=1.80.7"
+lmnr = ">=0.7.24"
pydantic = ">=2.11.7"
python-frontmatter = ">=1.1.0"
python-json-logger = ">=3.3.0"
@@ -7401,25 +7429,17 @@ websockets = ">=12"
[package.extras]
boto3 = ["boto3 (>=1.35.0)"]
-[package.source]
-type = "git"
-url = "https://github.com/OpenHands/agent-sdk.git"
-reference = "15f565b8ac38876e40dc05c08e2b04ccaae4a66d"
-resolved_reference = "15f565b8ac38876e40dc05c08e2b04ccaae4a66d"
-subdirectory = "openhands-sdk"
-
[[package]]
name = "openhands-tools"
-version = "1.1.0"
+version = "1.6.0"
description = "OpenHands Tools - Runtime tools for AI agents"
optional = false
python-versions = ">=3.12"
groups = ["main"]
files = [
- {file = "openhands_tools-1.1.0-py3-none-any.whl", hash = "sha256:767d6746f05edade49263aa24450a037485a3dc23379f56917ef19aad22033f9"},
- {file = "openhands_tools-1.1.0.tar.gz", hash = "sha256:c2fadaa4f4e16e9a3df5781ea847565dcae7171584f09ef7c0e1d97c8dfc83f6"},
+ {file = "openhands_tools-1.6.0-py3-none-any.whl", hash = "sha256:176556d44186536751b23fe052d3505492cc2afb8d52db20fb7a2cc0169cd57a"},
+ {file = "openhands_tools-1.6.0.tar.gz", hash = "sha256:d07ba31050fd4a7891a4c48388aa53ce9f703e17064ddbd59146d6c77e5980b3"},
]
-develop = false
[package.dependencies]
bashlex = ">=0.18"
@@ -7430,13 +7450,7 @@ func-timeout = ">=4.3.5"
libtmux = ">=0.46.2"
openhands-sdk = "*"
pydantic = ">=2.11.7"
-
-[package.source]
-type = "git"
-url = "https://github.com/OpenHands/agent-sdk.git"
-reference = "15f565b8ac38876e40dc05c08e2b04ccaae4a66d"
-resolved_reference = "15f565b8ac38876e40dc05c08e2b04ccaae4a66d"
-subdirectory = "openhands-tools"
+tom-swe = ">=1.0.3"
[[package]]
name = "openpyxl"
@@ -7949,6 +7963,21 @@ files = [
[package.dependencies]
ptyprocess = ">=0.5"
+[[package]]
+name = "pfzy"
+version = "0.3.4"
+description = "Python port of the fzy fuzzy string matching algorithm"
+optional = false
+python-versions = ">=3.7,<4.0"
+groups = ["main"]
+files = [
+ {file = "pfzy-0.3.4-py3-none-any.whl", hash = "sha256:5f50d5b2b3207fa72e7ec0ef08372ef652685470974a107d0d4999fc5a903a96"},
+ {file = "pfzy-0.3.4.tar.gz", hash = "sha256:717ea765dd10b63618e7298b2d98efd819e0b30cd5905c9707223dceeb94b3f1"},
+]
+
+[package.extras]
+docs = ["Sphinx (>=4.1.2,<5.0.0)", "furo (>=2021.8.17-beta.43,<2022.0.0)", "myst-parser (>=0.15.1,<0.16.0)", "sphinx-autobuild (>=2021.3.14,<2022.0.0)", "sphinx-copybutton (>=0.4.0,<0.5.0)"]
+
[[package]]
name = "pg8000"
version = "1.31.5"
@@ -14990,6 +15019,31 @@ dev = ["tokenizers[testing]"]
docs = ["setuptools-rust", "sphinx", "sphinx-rtd-theme"]
testing = ["black (==22.3)", "datasets", "numpy", "pytest", "requests", "ruff"]
+[[package]]
+name = "tom-swe"
+version = "1.0.3"
+description = "Theory of Mind modeling for Software Engineering assistants"
+optional = false
+python-versions = ">=3.10"
+groups = ["main"]
+files = [
+ {file = "tom_swe-1.0.3-py3-none-any.whl", hash = "sha256:7b1172b29eb5c8fb7f1975016e7b6a238511b9ac2a7a980bd400dcb4e29773f2"},
+ {file = "tom_swe-1.0.3.tar.gz", hash = "sha256:57c97d0104e563f15bd39edaf2aa6ac4c3e9444afd437fb92458700d22c6c0f5"},
+]
+
+[package.dependencies]
+jinja2 = ">=3.0.0"
+json-repair = ">=0.1.0"
+litellm = ">=1.0.0"
+pydantic = ">=2.0.0"
+python-dotenv = ">=1.0.0"
+tiktoken = ">=0.8.0"
+tqdm = ">=4.65.0"
+
+[package.extras]
+dev = ["aiofiles (>=23.0.0)", "black (>=22.0.0)", "datasets (>=2.0.0)", "fastapi (>=0.104.0)", "httpx (>=0.25.0)", "huggingface-hub (>=0.0.0)", "isort (>=5.0.0)", "mypy (>=1.0.0)", "numpy (>=1.24.0)", "pandas (>=2.0.0)", "pre-commit (>=3.6.0)", "pytest (>=7.0.0)", "pytest-cov (>=6.2.1)", "rich (>=13.0.0)", "ruff (>=0.3.0)", "typing-extensions (>=4.0.0)", "uvicorn (>=0.24.0)"]
+search = ["bm25s (>=0.2.0)", "pystemmer (>=2.2.0)"]
+
[[package]]
name = "toml"
version = "0.10.2"
@@ -16769,4 +16823,4 @@ third-party-runtimes = ["daytona", "e2b-code-interpreter", "modal", "runloop-api
[metadata]
lock-version = "2.1"
python-versions = "^3.12,<3.14"
-content-hash = "44c6c1f432337d216b70a6654fb0cd20410ddeb56485999859032aec53e90458"
+content-hash = "9764f3b69ec8ed35feebd78a826bbc6bfa4ac6d5b56bc999be8bc738b644e538"
diff --git a/pyproject.toml b/pyproject.toml
index 75dada88a24d..c70c110dcc15 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,7 +6,7 @@ requires = [
[tool.poetry]
name = "openhands-ai"
-version = "0.62.0"
+version = "1.0.0"
description = "OpenHands: Code Less, Make More"
authors = [ "OpenHands" ]
license = "MIT"
@@ -26,8 +26,8 @@ build = "build_vscode.py" # Build VSCode extension during Poetry build
[tool.poetry.dependencies]
python = "^3.12,<3.14"
-litellm = ">=1.74.3, <1.78.0, !=1.64.4, !=1.67.*" # avoid 1.64.4 (known bug) & 1.67.* (known bug #10272)
-openai = "1.99.9" # Pin due to litellm incompatibility with >=1.100.0 (BerriAI/litellm#13711)
+litellm = ">=1.74.3, <=1.80.7, !=1.64.4, !=1.67.*" # avoid 1.64.4 (known bug) & 1.67.* (known bug #10272)
+openai = "2.8.0" # Pin due to litellm incompatibility with >=1.100.0 (BerriAI/litellm#13711)
aiohttp = ">=3.9.0,!=3.11.13" # Pin to avoid yanked version 3.11.13
google-genai = "*" # To use litellm with Gemini Pro API
google-api-python-client = "^2.164.0" # For Google Sheets API
@@ -116,9 +116,9 @@ pybase62 = "^1.0.0"
#openhands-agent-server = { git = "https://github.com/OpenHands/agent-sdk.git", subdirectory = "openhands-agent-server", rev = "15f565b8ac38876e40dc05c08e2b04ccaae4a66d" }
#openhands-sdk = { git = "https://github.com/OpenHands/agent-sdk.git", subdirectory = "openhands-sdk", rev = "15f565b8ac38876e40dc05c08e2b04ccaae4a66d" }
#openhands-tools = { git = "https://github.com/OpenHands/agent-sdk.git", subdirectory = "openhands-tools", rev = "15f565b8ac38876e40dc05c08e2b04ccaae4a66d" }
-openhands-sdk = "1.1.0"
-openhands-agent-server = "1.1.0"
-openhands-tools = "1.1.0"
+openhands-sdk = "1.6.0"
+openhands-agent-server = "1.6.0"
+openhands-tools = "1.6.0"
python-jose = { version = ">=3.3", extras = [ "cryptography" ] }
sqlalchemy = { extras = [ "asyncio" ], version = "^2.0.40" }
pg8000 = "^1.31.5"
diff --git a/tests/unit/agenthub/test_agents.py b/tests/unit/agenthub/test_agents.py
index 2a90dcb66830..09f28e991c86 100644
--- a/tests/unit/agenthub/test_agents.py
+++ b/tests/unit/agenthub/test_agents.py
@@ -393,7 +393,7 @@ def test_mismatched_tool_call_events_and_auto_add_system_message(
# 2. The action message
# 3. The observation message
mock_state.history = [initial_user_message, action, observation]
- messages = agent._get_messages(mock_state.history, initial_user_message)
+ messages = agent._get_messages(mock_state.history, initial_user_message, set())
assert len(messages) == 4 # System + initial user + action + observation
assert messages[0].role == 'system' # First message should be the system message
assert (
@@ -404,7 +404,7 @@ def test_mismatched_tool_call_events_and_auto_add_system_message(
# The same should hold if the events are presented out-of-order
mock_state.history = [initial_user_message, observation, action]
- messages = agent._get_messages(mock_state.history, initial_user_message)
+ messages = agent._get_messages(mock_state.history, initial_user_message, set())
assert len(messages) == 4
assert messages[0].role == 'system' # First message should be the system message
assert (
@@ -414,7 +414,7 @@ def test_mismatched_tool_call_events_and_auto_add_system_message(
# If only one of the two events is present, then we should just get the system message
# plus any valid message from the event
mock_state.history = [initial_user_message, action]
- messages = agent._get_messages(mock_state.history, initial_user_message)
+ messages = agent._get_messages(mock_state.history, initial_user_message, set())
assert (
len(messages) == 2
) # System + initial user message, action is waiting for its observation
@@ -422,7 +422,7 @@ def test_mismatched_tool_call_events_and_auto_add_system_message(
assert messages[1].role == 'user'
mock_state.history = [initial_user_message, observation]
- messages = agent._get_messages(mock_state.history, initial_user_message)
+ messages = agent._get_messages(mock_state.history, initial_user_message, set())
assert (
len(messages) == 2
) # System + initial user message, observation has no matching action
diff --git a/tests/unit/agenthub/test_prompt_caching.py b/tests/unit/agenthub/test_prompt_caching.py
index 60cc0bb16f84..2435b1320ace 100644
--- a/tests/unit/agenthub/test_prompt_caching.py
+++ b/tests/unit/agenthub/test_prompt_caching.py
@@ -80,7 +80,7 @@ def test_get_messages(codeact_agent: CodeActAgent):
history.append(message_action_5)
codeact_agent.reset()
- messages = codeact_agent._get_messages(history, message_action_1)
+ messages = codeact_agent._get_messages(history, message_action_1, set())
assert (
len(messages) == 6
@@ -122,7 +122,7 @@ def test_get_messages_prompt_caching(codeact_agent: CodeActAgent):
history.append(message_action_agent)
codeact_agent.reset()
- messages = codeact_agent._get_messages(history, initial_user_message)
+ messages = codeact_agent._get_messages(history, initial_user_message, set())
# Check that only the last two user messages have cache_prompt=True
cached_user_messages = [
diff --git a/tests/unit/app_server/test_app_conversation_service_base.py b/tests/unit/app_server/test_app_conversation_service_base.py
new file mode 100644
index 000000000000..db31d8d3d200
--- /dev/null
+++ b/tests/unit/app_server/test_app_conversation_service_base.py
@@ -0,0 +1,1266 @@
+"""Unit tests for git and security functionality in AppConversationServiceBase.
+
+This module tests the git-related functionality, specifically the clone_or_init_git_repo method
+and the recent bug fixes for git checkout operations.
+"""
+
+import subprocess
+from types import MethodType
+from unittest.mock import AsyncMock, MagicMock, Mock, patch
+from uuid import uuid4
+
+import pytest
+
+from openhands.app_server.app_conversation.app_conversation_models import AgentType
+from openhands.app_server.app_conversation.app_conversation_service_base import (
+ AppConversationServiceBase,
+)
+from openhands.app_server.sandbox.sandbox_models import SandboxInfo
+from openhands.app_server.user.user_context import UserContext
+
+
+class MockUserInfo:
+ """Mock class for UserInfo to simulate user settings."""
+
+ def __init__(
+ self, git_user_name: str | None = None, git_user_email: str | None = None
+ ):
+ self.git_user_name = git_user_name
+ self.git_user_email = git_user_email
+
+
+class MockCommandResult:
+ """Mock class for command execution result."""
+
+ def __init__(self, exit_code: int = 0, stderr: str = ''):
+ self.exit_code = exit_code
+ self.stderr = stderr
+
+
+class MockWorkspace:
+ """Mock class for AsyncRemoteWorkspace."""
+
+ def __init__(self, working_dir: str = '/workspace'):
+ self.working_dir = working_dir
+ self.execute_command = AsyncMock(return_value=MockCommandResult())
+
+
+class MockAppConversationServiceBase:
+ """Mock class to test git functionality without complex dependencies."""
+
+ def __init__(self):
+ self.logger = MagicMock()
+
+ async def clone_or_init_git_repo(
+ self,
+ workspace_path: str,
+ repo_url: str,
+ branch: str = 'main',
+ timeout: int = 300,
+ ) -> bool:
+ """Clone or initialize a git repository.
+
+ This is a simplified version of the actual method for testing purposes.
+ """
+ try:
+ # Try to clone the repository
+ clone_result = subprocess.run(
+ ['git', 'clone', '--branch', branch, repo_url, workspace_path],
+ capture_output=True,
+ text=True,
+ timeout=timeout,
+ )
+
+ if clone_result.returncode == 0:
+ self.logger.info(
+ f'Successfully cloned repository {repo_url} to {workspace_path}'
+ )
+ return True
+
+ # If clone fails, try to checkout the branch
+ checkout_result = subprocess.run(
+ ['git', 'checkout', branch],
+ cwd=workspace_path,
+ capture_output=True,
+ text=True,
+ timeout=timeout,
+ )
+
+ if checkout_result.returncode == 0:
+ self.logger.info(f'Successfully checked out branch {branch}')
+ return True
+ else:
+ self.logger.error(
+ f'Failed to checkout branch {branch}: {checkout_result.stderr}'
+ )
+ return False
+
+ except subprocess.TimeoutExpired:
+ self.logger.error(f'Git operation timed out after {timeout} seconds')
+ return False
+ except Exception as e:
+ self.logger.error(f'Git operation failed: {str(e)}')
+ return False
+
+
+@pytest.fixture
+def service():
+ """Create a mock service instance for testing."""
+ return MockAppConversationServiceBase()
+
+
+@pytest.mark.asyncio
+async def test_clone_or_init_git_repo_successful_clone(service):
+ """Test successful git clone operation."""
+ with patch('subprocess.run') as mock_run:
+ # Mock successful clone
+ mock_run.return_value = MagicMock(returncode=0, stderr='', stdout='Cloning...')
+
+ result = await service.clone_or_init_git_repo(
+ workspace_path='/tmp/test_repo',
+ repo_url='https://github.com/test/repo.git',
+ branch='main',
+ timeout=300,
+ )
+
+ assert result is True
+ mock_run.assert_called_once_with(
+ [
+ 'git',
+ 'clone',
+ '--branch',
+ 'main',
+ 'https://github.com/test/repo.git',
+ '/tmp/test_repo',
+ ],
+ capture_output=True,
+ text=True,
+ timeout=300,
+ )
+ service.logger.info.assert_called_with(
+ 'Successfully cloned repository https://github.com/test/repo.git to /tmp/test_repo'
+ )
+
+
+@pytest.mark.asyncio
+async def test_clone_or_init_git_repo_clone_fails_checkout_succeeds(service):
+ """Test git clone fails but checkout succeeds."""
+ with patch('subprocess.run') as mock_run:
+ # Mock clone failure, then checkout success
+ mock_run.side_effect = [
+ MagicMock(returncode=1, stderr='Clone failed', stdout=''), # Clone fails
+ MagicMock(
+ returncode=0, stderr='', stdout='Switched to branch'
+ ), # Checkout succeeds
+ ]
+
+ result = await service.clone_or_init_git_repo(
+ workspace_path='/tmp/test_repo',
+ repo_url='https://github.com/test/repo.git',
+ branch='feature-branch',
+ timeout=300,
+ )
+
+ assert result is True
+ assert mock_run.call_count == 2
+
+ # Check clone call
+ mock_run.assert_any_call(
+ [
+ 'git',
+ 'clone',
+ '--branch',
+ 'feature-branch',
+ 'https://github.com/test/repo.git',
+ '/tmp/test_repo',
+ ],
+ capture_output=True,
+ text=True,
+ timeout=300,
+ )
+
+ # Check checkout call
+ mock_run.assert_any_call(
+ ['git', 'checkout', 'feature-branch'],
+ cwd='/tmp/test_repo',
+ capture_output=True,
+ text=True,
+ timeout=300,
+ )
+
+ service.logger.info.assert_called_with(
+ 'Successfully checked out branch feature-branch'
+ )
+
+
+@pytest.mark.asyncio
+async def test_clone_or_init_git_repo_both_operations_fail(service):
+ """Test both git clone and checkout operations fail."""
+ with patch('subprocess.run') as mock_run:
+ # Mock both operations failing
+ mock_run.side_effect = [
+ MagicMock(returncode=1, stderr='Clone failed', stdout=''), # Clone fails
+ MagicMock(
+ returncode=1, stderr='Checkout failed', stdout=''
+ ), # Checkout fails
+ ]
+
+ result = await service.clone_or_init_git_repo(
+ workspace_path='/tmp/test_repo',
+ repo_url='https://github.com/test/repo.git',
+ branch='nonexistent-branch',
+ timeout=300,
+ )
+
+ assert result is False
+ assert mock_run.call_count == 2
+ service.logger.error.assert_called_with(
+ 'Failed to checkout branch nonexistent-branch: Checkout failed'
+ )
+
+
+@pytest.mark.asyncio
+async def test_clone_or_init_git_repo_timeout(service):
+ """Test git operation timeout."""
+ with patch('subprocess.run') as mock_run:
+ # Mock timeout exception
+ mock_run.side_effect = subprocess.TimeoutExpired(
+ cmd=['git', 'clone'], timeout=300
+ )
+
+ result = await service.clone_or_init_git_repo(
+ workspace_path='/tmp/test_repo',
+ repo_url='https://github.com/test/repo.git',
+ branch='main',
+ timeout=300,
+ )
+
+ assert result is False
+ service.logger.error.assert_called_with(
+ 'Git operation timed out after 300 seconds'
+ )
+
+
+@pytest.mark.asyncio
+async def test_clone_or_init_git_repo_exception(service):
+ """Test git operation with unexpected exception."""
+ with patch('subprocess.run') as mock_run:
+ # Mock unexpected exception
+ mock_run.side_effect = Exception('Unexpected error')
+
+ result = await service.clone_or_init_git_repo(
+ workspace_path='/tmp/test_repo',
+ repo_url='https://github.com/test/repo.git',
+ branch='main',
+ timeout=300,
+ )
+
+ assert result is False
+ service.logger.error.assert_called_with(
+ 'Git operation failed: Unexpected error'
+ )
+
+
+@pytest.mark.asyncio
+async def test_clone_or_init_git_repo_custom_timeout(service):
+ """Test git operation with custom timeout."""
+ with patch('subprocess.run') as mock_run:
+ # Mock successful clone with custom timeout
+ mock_run.return_value = MagicMock(returncode=0, stderr='', stdout='Cloning...')
+
+ result = await service.clone_or_init_git_repo(
+ workspace_path='/tmp/test_repo',
+ repo_url='https://github.com/test/repo.git',
+ branch='main',
+ timeout=600, # Custom timeout
+ )
+
+ assert result is True
+ mock_run.assert_called_once_with(
+ [
+ 'git',
+ 'clone',
+ '--branch',
+ 'main',
+ 'https://github.com/test/repo.git',
+ '/tmp/test_repo',
+ ],
+ capture_output=True,
+ text=True,
+ timeout=600, # Verify custom timeout is used
+ )
+
+
+@patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.LLMSummarizingCondenser'
+)
+def test_create_condenser_default_agent_with_none_max_size(mock_condenser_class):
+ """Test _create_condenser for DEFAULT agent with condenser_max_size = None uses default."""
+ # Arrange
+ mock_user_context = Mock(spec=UserContext)
+ with patch.object(
+ AppConversationServiceBase,
+ '__abstractmethods__',
+ set(),
+ ):
+ service = AppConversationServiceBase(
+ init_git_in_empty_workspace=True,
+ user_context=mock_user_context,
+ )
+ mock_llm = MagicMock()
+ mock_llm_copy = MagicMock()
+ mock_llm_copy.usage_id = 'condenser'
+ mock_llm.model_copy.return_value = mock_llm_copy
+ mock_condenser_instance = MagicMock()
+ mock_condenser_class.return_value = mock_condenser_instance
+
+ # Act
+ service._create_condenser(mock_llm, AgentType.DEFAULT, None)
+
+ # Assert
+ mock_condenser_class.assert_called_once()
+ call_kwargs = mock_condenser_class.call_args[1]
+ # When condenser_max_size is None, max_size should not be passed (uses SDK default of 120)
+ assert 'max_size' not in call_kwargs
+ # keep_first is never passed (uses SDK default of 4)
+ assert 'keep_first' not in call_kwargs
+ assert call_kwargs['llm'].usage_id == 'condenser'
+ mock_llm.model_copy.assert_called_once()
+
+
+@patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.LLMSummarizingCondenser'
+)
+def test_create_condenser_default_agent_with_custom_max_size(mock_condenser_class):
+ """Test _create_condenser for DEFAULT agent with custom condenser_max_size."""
+ # Arrange
+ mock_user_context = Mock(spec=UserContext)
+ with patch.object(
+ AppConversationServiceBase,
+ '__abstractmethods__',
+ set(),
+ ):
+ service = AppConversationServiceBase(
+ init_git_in_empty_workspace=True,
+ user_context=mock_user_context,
+ )
+ mock_llm = MagicMock()
+ mock_llm_copy = MagicMock()
+ mock_llm_copy.usage_id = 'condenser'
+ mock_llm.model_copy.return_value = mock_llm_copy
+ mock_condenser_instance = MagicMock()
+ mock_condenser_class.return_value = mock_condenser_instance
+
+ # Act
+ service._create_condenser(mock_llm, AgentType.DEFAULT, 150)
+
+ # Assert
+ mock_condenser_class.assert_called_once()
+ call_kwargs = mock_condenser_class.call_args[1]
+ assert call_kwargs['max_size'] == 150 # Custom value should be used
+ # keep_first is never passed (uses SDK default of 4)
+ assert 'keep_first' not in call_kwargs
+ assert call_kwargs['llm'].usage_id == 'condenser'
+ mock_llm.model_copy.assert_called_once()
+
+
+@patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.LLMSummarizingCondenser'
+)
+def test_create_condenser_plan_agent_with_none_max_size(mock_condenser_class):
+ """Test _create_condenser for PLAN agent with condenser_max_size = None uses default."""
+ # Arrange
+ mock_user_context = Mock(spec=UserContext)
+ with patch.object(
+ AppConversationServiceBase,
+ '__abstractmethods__',
+ set(),
+ ):
+ service = AppConversationServiceBase(
+ init_git_in_empty_workspace=True,
+ user_context=mock_user_context,
+ )
+ mock_llm = MagicMock()
+ mock_llm_copy = MagicMock()
+ mock_llm_copy.usage_id = 'planning_condenser'
+ mock_llm.model_copy.return_value = mock_llm_copy
+ mock_condenser_instance = MagicMock()
+ mock_condenser_class.return_value = mock_condenser_instance
+
+ # Act
+ service._create_condenser(mock_llm, AgentType.PLAN, None)
+
+ # Assert
+ mock_condenser_class.assert_called_once()
+ call_kwargs = mock_condenser_class.call_args[1]
+ # When condenser_max_size is None, max_size should not be passed (uses SDK default of 120)
+ assert 'max_size' not in call_kwargs
+ # keep_first is never passed (uses SDK default of 4)
+ assert 'keep_first' not in call_kwargs
+ assert call_kwargs['llm'].usage_id == 'planning_condenser'
+ mock_llm.model_copy.assert_called_once()
+
+
+@patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.LLMSummarizingCondenser'
+)
+def test_create_condenser_plan_agent_with_custom_max_size(mock_condenser_class):
+ """Test _create_condenser for PLAN agent with custom condenser_max_size."""
+ # Arrange
+ mock_user_context = Mock(spec=UserContext)
+ with patch.object(
+ AppConversationServiceBase,
+ '__abstractmethods__',
+ set(),
+ ):
+ service = AppConversationServiceBase(
+ init_git_in_empty_workspace=True,
+ user_context=mock_user_context,
+ )
+ mock_llm = MagicMock()
+ mock_llm_copy = MagicMock()
+ mock_llm_copy.usage_id = 'planning_condenser'
+ mock_llm.model_copy.return_value = mock_llm_copy
+ mock_condenser_instance = MagicMock()
+ mock_condenser_class.return_value = mock_condenser_instance
+
+ # Act
+ service._create_condenser(mock_llm, AgentType.PLAN, 200)
+
+ # Assert
+ mock_condenser_class.assert_called_once()
+ call_kwargs = mock_condenser_class.call_args[1]
+ assert call_kwargs['max_size'] == 200 # Custom value should be used
+ # keep_first is never passed (uses SDK default of 4)
+ assert 'keep_first' not in call_kwargs
+ assert call_kwargs['llm'].usage_id == 'planning_condenser'
+ mock_llm.model_copy.assert_called_once()
+
+
+# =============================================================================
+# Tests for security analyzer helpers
+# =============================================================================
+
+
+@pytest.mark.parametrize('value', [None, '', 'none', 'NoNe'])
+def test_create_security_analyzer_returns_none_for_empty_values(value):
+ """_create_security_analyzer_from_string returns None for empty/none values."""
+ # Arrange
+ service, _ = _create_service_with_mock_user_context(
+ MockUserInfo(), bind_methods=('_create_security_analyzer_from_string',)
+ )
+
+ # Act
+ result = service._create_security_analyzer_from_string(value)
+
+ # Assert
+ assert result is None
+
+
+def test_create_security_analyzer_returns_llm_analyzer():
+ """_create_security_analyzer_from_string returns LLMSecurityAnalyzer for llm string."""
+ # Arrange
+ security_analyzer_str = 'llm'
+ service, _ = _create_service_with_mock_user_context(
+ MockUserInfo(), bind_methods=('_create_security_analyzer_from_string',)
+ )
+
+ # Act
+ result = service._create_security_analyzer_from_string(security_analyzer_str)
+
+ # Assert
+ from openhands.sdk.security.llm_analyzer import LLMSecurityAnalyzer
+
+ assert isinstance(result, LLMSecurityAnalyzer)
+
+
+def test_create_security_analyzer_logs_warning_for_unknown_value():
+ """_create_security_analyzer_from_string logs warning and returns None for unknown."""
+ # Arrange
+ unknown_value = 'custom'
+ service, _ = _create_service_with_mock_user_context(
+ MockUserInfo(), bind_methods=('_create_security_analyzer_from_string',)
+ )
+
+ # Act
+ with patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base._logger'
+ ) as mock_logger:
+ result = service._create_security_analyzer_from_string(unknown_value)
+
+ # Assert
+ assert result is None
+ mock_logger.warning.assert_called_once()
+
+
+def test_select_confirmation_policy_when_disabled_returns_never_confirm():
+ """_select_confirmation_policy returns NeverConfirm when confirmation_mode is False."""
+ # Arrange
+ confirmation_mode = False
+ security_analyzer = 'llm'
+ service, _ = _create_service_with_mock_user_context(
+ MockUserInfo(), bind_methods=('_select_confirmation_policy',)
+ )
+
+ # Act
+ policy = service._select_confirmation_policy(confirmation_mode, security_analyzer)
+
+ # Assert
+ from openhands.sdk.security.confirmation_policy import NeverConfirm
+
+ assert isinstance(policy, NeverConfirm)
+
+
+def test_select_confirmation_policy_llm_returns_confirm_risky():
+ """_select_confirmation_policy uses ConfirmRisky when analyzer is llm."""
+ # Arrange
+ confirmation_mode = True
+ security_analyzer = 'llm'
+ service, _ = _create_service_with_mock_user_context(
+ MockUserInfo(), bind_methods=('_select_confirmation_policy',)
+ )
+
+ # Act
+ policy = service._select_confirmation_policy(confirmation_mode, security_analyzer)
+
+ # Assert
+ from openhands.sdk.security.confirmation_policy import ConfirmRisky
+
+ assert isinstance(policy, ConfirmRisky)
+
+
+@pytest.mark.parametrize('security_analyzer', [None, '', 'none', 'custom'])
+def test_select_confirmation_policy_non_llm_returns_always_confirm(
+ security_analyzer,
+):
+ """_select_confirmation_policy falls back to AlwaysConfirm for non-llm values."""
+ # Arrange
+ confirmation_mode = True
+ service, _ = _create_service_with_mock_user_context(
+ MockUserInfo(), bind_methods=('_select_confirmation_policy',)
+ )
+
+ # Act
+ policy = service._select_confirmation_policy(confirmation_mode, security_analyzer)
+
+ # Assert
+ from openhands.sdk.security.confirmation_policy import AlwaysConfirm
+
+ assert isinstance(policy, AlwaysConfirm)
+
+
+@pytest.mark.asyncio
+async def test_set_security_analyzer_skips_when_no_session_key():
+ """_set_security_analyzer_from_settings exits early without session_api_key."""
+ # Arrange
+ agent_server_url = 'https://agent.example.com'
+ conversation_id = uuid4()
+ httpx_client = AsyncMock()
+ service, _ = _create_service_with_mock_user_context(
+ MockUserInfo(),
+ bind_methods=(
+ '_create_security_analyzer_from_string',
+ '_set_security_analyzer_from_settings',
+ ),
+ )
+
+ with patch.object(service, '_create_security_analyzer_from_string') as mock_create:
+ # Act
+ await service._set_security_analyzer_from_settings(
+ agent_server_url=agent_server_url,
+ session_api_key=None,
+ conversation_id=conversation_id,
+ security_analyzer_str='llm',
+ httpx_client=httpx_client,
+ )
+
+ # Assert
+ mock_create.assert_not_called()
+ httpx_client.post.assert_not_called()
+
+
+@pytest.mark.asyncio
+async def test_set_security_analyzer_skips_when_analyzer_none():
+ """_set_security_analyzer_from_settings skips API call when analyzer resolves to None."""
+ # Arrange
+ agent_server_url = 'https://agent.example.com'
+ session_api_key = 'session-key'
+ conversation_id = uuid4()
+ httpx_client = AsyncMock()
+ service, _ = _create_service_with_mock_user_context(
+ MockUserInfo(),
+ bind_methods=(
+ '_create_security_analyzer_from_string',
+ '_set_security_analyzer_from_settings',
+ ),
+ )
+
+ with patch.object(
+ service, '_create_security_analyzer_from_string', return_value=None
+ ) as mock_create:
+ # Act
+ await service._set_security_analyzer_from_settings(
+ agent_server_url=agent_server_url,
+ session_api_key=session_api_key,
+ conversation_id=conversation_id,
+ security_analyzer_str='none',
+ httpx_client=httpx_client,
+ )
+
+ # Assert
+ mock_create.assert_called_once_with('none')
+ httpx_client.post.assert_not_called()
+
+
+class DummyAnalyzer:
+ """Simple analyzer stub for testing model_dump contract."""
+
+ def __init__(self, payload: dict):
+ self._payload = payload
+
+ def model_dump(self) -> dict:
+ return self._payload
+
+
+@pytest.mark.asyncio
+async def test_set_security_analyzer_successfully_calls_agent_server():
+ """_set_security_analyzer_from_settings posts analyzer payload when available."""
+ # Arrange
+ agent_server_url = 'https://agent.example.com'
+ session_api_key = 'session-key'
+ conversation_id = uuid4()
+ analyzer_payload = {'type': 'llm'}
+ httpx_client = AsyncMock()
+ http_response = MagicMock()
+ http_response.raise_for_status = MagicMock()
+ httpx_client.post.return_value = http_response
+ service, _ = _create_service_with_mock_user_context(
+ MockUserInfo(),
+ bind_methods=(
+ '_create_security_analyzer_from_string',
+ '_set_security_analyzer_from_settings',
+ ),
+ )
+
+ analyzer = DummyAnalyzer(analyzer_payload)
+
+ with (
+ patch.object(
+ service,
+ '_create_security_analyzer_from_string',
+ return_value=analyzer,
+ ) as mock_create,
+ patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base._logger'
+ ) as mock_logger,
+ ):
+ # Act
+ await service._set_security_analyzer_from_settings(
+ agent_server_url=agent_server_url,
+ session_api_key=session_api_key,
+ conversation_id=conversation_id,
+ security_analyzer_str='llm',
+ httpx_client=httpx_client,
+ )
+
+ # Assert
+ mock_create.assert_called_once_with('llm')
+ httpx_client.post.assert_awaited_once_with(
+ f'{agent_server_url}/api/conversations/{conversation_id}/security_analyzer',
+ json={'security_analyzer': analyzer_payload},
+ headers={'X-Session-API-Key': session_api_key},
+ timeout=30.0,
+ )
+ http_response.raise_for_status.assert_called_once()
+ mock_logger.info.assert_called()
+
+
+@pytest.mark.asyncio
+async def test_set_security_analyzer_logs_warning_on_failure():
+ """_set_security_analyzer_from_settings warns but does not raise on errors."""
+ # Arrange
+ agent_server_url = 'https://agent.example.com'
+ session_api_key = 'session-key'
+ conversation_id = uuid4()
+ analyzer_payload = {'type': 'llm'}
+ httpx_client = AsyncMock()
+ httpx_client.post.side_effect = RuntimeError('network down')
+ service, _ = _create_service_with_mock_user_context(
+ MockUserInfo(),
+ bind_methods=(
+ '_create_security_analyzer_from_string',
+ '_set_security_analyzer_from_settings',
+ ),
+ )
+
+ analyzer = DummyAnalyzer(analyzer_payload)
+
+ with (
+ patch.object(
+ service,
+ '_create_security_analyzer_from_string',
+ return_value=analyzer,
+ ) as mock_create,
+ patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base._logger'
+ ) as mock_logger,
+ ):
+ # Act
+ await service._set_security_analyzer_from_settings(
+ agent_server_url=agent_server_url,
+ session_api_key=session_api_key,
+ conversation_id=conversation_id,
+ security_analyzer_str='llm',
+ httpx_client=httpx_client,
+ )
+
+ # Assert
+ mock_create.assert_called_once_with('llm')
+ httpx_client.post.assert_awaited_once()
+ mock_logger.warning.assert_called()
+
+
+# =============================================================================
+# Tests for _configure_git_user_settings
+# =============================================================================
+
+
+def _create_service_with_mock_user_context(
+ user_info: MockUserInfo, bind_methods: tuple[str, ...] | None = None
+) -> tuple:
+ """Create a mock service with selected real methods bound for testing.
+
+ Uses MagicMock for the service but binds the real method for testing.
+
+ Returns a tuple of (service, mock_user_context) for testing.
+ """
+ mock_user_context = MagicMock()
+ mock_user_context.get_user_info = AsyncMock(return_value=user_info)
+
+ # Create a simple mock service and set required attribute
+ service = MagicMock()
+ service.user_context = mock_user_context
+ methods_to_bind = ['_configure_git_user_settings']
+ if bind_methods:
+ methods_to_bind.extend(bind_methods)
+ # Remove potential duplicates while keeping order
+ methods_to_bind = list(dict.fromkeys(methods_to_bind))
+
+ # Bind actual methods from the real class to test implementations directly
+ for method_name in methods_to_bind:
+ real_method = getattr(AppConversationServiceBase, method_name)
+ setattr(service, method_name, MethodType(real_method, service))
+
+ return service, mock_user_context
+
+
+@pytest.fixture
+def mock_workspace():
+ """Create a mock workspace instance for testing."""
+ return MockWorkspace(working_dir='/workspace/project')
+
+
+@pytest.mark.asyncio
+async def test_configure_git_user_settings_both_name_and_email(mock_workspace):
+ """Test configuring both git user name and email."""
+ user_info = MockUserInfo(
+ git_user_name='Test User', git_user_email='test@example.com'
+ )
+ service, mock_user_context = _create_service_with_mock_user_context(user_info)
+
+ await service._configure_git_user_settings(mock_workspace)
+
+ # Verify get_user_info was called
+ mock_user_context.get_user_info.assert_called_once()
+
+ # Verify both git config commands were executed
+ assert mock_workspace.execute_command.call_count == 2
+
+ # Check git config user.name call
+ mock_workspace.execute_command.assert_any_call(
+ 'git config --global user.name "Test User"', '/workspace/project'
+ )
+
+ # Check git config user.email call
+ mock_workspace.execute_command.assert_any_call(
+ 'git config --global user.email "test@example.com"', '/workspace/project'
+ )
+
+
+@pytest.mark.asyncio
+async def test_configure_git_user_settings_only_name(mock_workspace):
+ """Test configuring only git user name."""
+ user_info = MockUserInfo(git_user_name='Test User', git_user_email=None)
+ service, _ = _create_service_with_mock_user_context(user_info)
+
+ await service._configure_git_user_settings(mock_workspace)
+
+ # Verify only user.name was configured
+ assert mock_workspace.execute_command.call_count == 1
+ mock_workspace.execute_command.assert_called_once_with(
+ 'git config --global user.name "Test User"', '/workspace/project'
+ )
+
+
+@pytest.mark.asyncio
+async def test_configure_git_user_settings_only_email(mock_workspace):
+ """Test configuring only git user email."""
+ user_info = MockUserInfo(git_user_name=None, git_user_email='test@example.com')
+ service, _ = _create_service_with_mock_user_context(user_info)
+
+ await service._configure_git_user_settings(mock_workspace)
+
+ # Verify only user.email was configured
+ assert mock_workspace.execute_command.call_count == 1
+ mock_workspace.execute_command.assert_called_once_with(
+ 'git config --global user.email "test@example.com"', '/workspace/project'
+ )
+
+
+@pytest.mark.asyncio
+async def test_configure_git_user_settings_neither_set(mock_workspace):
+ """Test when neither git user name nor email is set."""
+ user_info = MockUserInfo(git_user_name=None, git_user_email=None)
+ service, _ = _create_service_with_mock_user_context(user_info)
+
+ await service._configure_git_user_settings(mock_workspace)
+
+ # Verify no git config commands were executed
+ mock_workspace.execute_command.assert_not_called()
+
+
+@pytest.mark.asyncio
+async def test_configure_git_user_settings_empty_strings(mock_workspace):
+ """Test when git user name and email are empty strings."""
+ user_info = MockUserInfo(git_user_name='', git_user_email='')
+ service, _ = _create_service_with_mock_user_context(user_info)
+
+ await service._configure_git_user_settings(mock_workspace)
+
+ # Empty strings are falsy, so no commands should be executed
+ mock_workspace.execute_command.assert_not_called()
+
+
+@pytest.mark.asyncio
+async def test_configure_git_user_settings_get_user_info_fails(mock_workspace):
+ """Test handling of exception when get_user_info fails."""
+ user_info = MockUserInfo()
+ service, mock_user_context = _create_service_with_mock_user_context(user_info)
+ mock_user_context.get_user_info = AsyncMock(
+ side_effect=Exception('User info error')
+ )
+
+ # Should not raise exception, just log warning
+ await service._configure_git_user_settings(mock_workspace)
+
+ # Verify no git config commands were executed
+ mock_workspace.execute_command.assert_not_called()
+
+
+@pytest.mark.asyncio
+async def test_configure_git_user_settings_name_command_fails(mock_workspace):
+ """Test handling when git config user.name command fails."""
+ user_info = MockUserInfo(
+ git_user_name='Test User', git_user_email='test@example.com'
+ )
+ service, _ = _create_service_with_mock_user_context(user_info)
+
+ # Make the first command fail (user.name), second succeed (user.email)
+ mock_workspace.execute_command = AsyncMock(
+ side_effect=[
+ MockCommandResult(exit_code=1, stderr='Permission denied'),
+ MockCommandResult(exit_code=0),
+ ]
+ )
+
+ # Should not raise exception
+ await service._configure_git_user_settings(mock_workspace)
+
+ # Verify both commands were still attempted
+ assert mock_workspace.execute_command.call_count == 2
+
+
+@pytest.mark.asyncio
+async def test_configure_git_user_settings_email_command_fails(mock_workspace):
+ """Test handling when git config user.email command fails."""
+ user_info = MockUserInfo(
+ git_user_name='Test User', git_user_email='test@example.com'
+ )
+ service, _ = _create_service_with_mock_user_context(user_info)
+
+ # Make the first command succeed (user.name), second fail (user.email)
+ mock_workspace.execute_command = AsyncMock(
+ side_effect=[
+ MockCommandResult(exit_code=0),
+ MockCommandResult(exit_code=1, stderr='Permission denied'),
+ ]
+ )
+
+ # Should not raise exception
+ await service._configure_git_user_settings(mock_workspace)
+
+ # Verify both commands were still attempted
+ assert mock_workspace.execute_command.call_count == 2
+
+
+@pytest.mark.asyncio
+async def test_configure_git_user_settings_special_characters_in_name(mock_workspace):
+ """Test git user name with special characters."""
+ user_info = MockUserInfo(
+ git_user_name="Test O'Brien", git_user_email='test@example.com'
+ )
+ service, _ = _create_service_with_mock_user_context(user_info)
+
+ await service._configure_git_user_settings(mock_workspace)
+
+ # Verify the name is passed with special characters
+ mock_workspace.execute_command.assert_any_call(
+ 'git config --global user.name "Test O\'Brien"', '/workspace/project'
+ )
+
+
+# =============================================================================
+# Tests for load_and_merge_all_skills with org skills
+# =============================================================================
+
+
+class TestLoadAndMergeAllSkillsWithOrgSkills:
+ """Test load_and_merge_all_skills includes organization skills."""
+
+ @pytest.mark.asyncio
+ @patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.load_sandbox_skills'
+ )
+ @patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.load_global_skills'
+ )
+ @patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.load_user_skills'
+ )
+ @patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.load_org_skills'
+ )
+ @patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.load_repo_skills'
+ )
+ async def test_load_and_merge_includes_org_skills(
+ self,
+ mock_load_repo,
+ mock_load_org,
+ mock_load_user,
+ mock_load_global,
+ mock_load_sandbox,
+ ):
+ """Test that load_and_merge_all_skills loads and merges org skills."""
+ # Arrange
+ mock_user_context = Mock(spec=UserContext)
+ with patch.object(
+ AppConversationServiceBase,
+ '__abstractmethods__',
+ set(),
+ ):
+ service = AppConversationServiceBase(
+ init_git_in_empty_workspace=True,
+ user_context=mock_user_context,
+ )
+
+ sandbox = Mock(spec=SandboxInfo)
+ sandbox.exposed_urls = []
+ remote_workspace = AsyncMock()
+
+ # Create distinct mock skills for each source
+ sandbox_skill = Mock()
+ sandbox_skill.name = 'sandbox_skill'
+ global_skill = Mock()
+ global_skill.name = 'global_skill'
+ user_skill = Mock()
+ user_skill.name = 'user_skill'
+ org_skill = Mock()
+ org_skill.name = 'org_skill'
+ repo_skill = Mock()
+ repo_skill.name = 'repo_skill'
+
+ mock_load_sandbox.return_value = [sandbox_skill]
+ mock_load_global.return_value = [global_skill]
+ mock_load_user.return_value = [user_skill]
+ mock_load_org.return_value = [org_skill]
+ mock_load_repo.return_value = [repo_skill]
+
+ # Act
+ result = await service.load_and_merge_all_skills(
+ sandbox, remote_workspace, 'owner/repo', '/workspace'
+ )
+
+ # Assert
+ assert len(result) == 5
+ names = {s.name for s in result}
+ assert names == {
+ 'sandbox_skill',
+ 'global_skill',
+ 'user_skill',
+ 'org_skill',
+ 'repo_skill',
+ }
+ mock_load_org.assert_called_once_with(
+ remote_workspace, 'owner/repo', '/workspace', mock_user_context
+ )
+
+ @pytest.mark.asyncio
+ @patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.load_sandbox_skills'
+ )
+ @patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.load_global_skills'
+ )
+ @patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.load_user_skills'
+ )
+ @patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.load_org_skills'
+ )
+ @patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.load_repo_skills'
+ )
+ async def test_load_and_merge_org_skills_precedence(
+ self,
+ mock_load_repo,
+ mock_load_org,
+ mock_load_user,
+ mock_load_global,
+ mock_load_sandbox,
+ ):
+ """Test that org skills have correct precedence (higher than user, lower than repo)."""
+ # Arrange
+ mock_user_context = Mock(spec=UserContext)
+ with patch.object(
+ AppConversationServiceBase,
+ '__abstractmethods__',
+ set(),
+ ):
+ service = AppConversationServiceBase(
+ init_git_in_empty_workspace=True,
+ user_context=mock_user_context,
+ )
+
+ sandbox = Mock(spec=SandboxInfo)
+ sandbox.exposed_urls = []
+ remote_workspace = AsyncMock()
+
+ # Create skills with same name but different sources
+ user_skill = Mock()
+ user_skill.name = 'common_skill'
+ user_skill.source = 'user'
+
+ org_skill = Mock()
+ org_skill.name = 'common_skill'
+ org_skill.source = 'org'
+
+ repo_skill = Mock()
+ repo_skill.name = 'common_skill'
+ repo_skill.source = 'repo'
+
+ mock_load_sandbox.return_value = []
+ mock_load_global.return_value = []
+ mock_load_user.return_value = [user_skill]
+ mock_load_org.return_value = [org_skill]
+ mock_load_repo.return_value = [repo_skill]
+
+ # Act
+ result = await service.load_and_merge_all_skills(
+ sandbox, remote_workspace, 'owner/repo', '/workspace'
+ )
+
+ # Assert
+ # Should have only one skill with repo source (highest precedence)
+ assert len(result) == 1
+ assert result[0].source == 'repo'
+
+ @pytest.mark.asyncio
+ @patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.load_sandbox_skills'
+ )
+ @patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.load_global_skills'
+ )
+ @patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.load_user_skills'
+ )
+ @patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.load_org_skills'
+ )
+ @patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.load_repo_skills'
+ )
+ async def test_load_and_merge_org_skills_override_user_skills(
+ self,
+ mock_load_repo,
+ mock_load_org,
+ mock_load_user,
+ mock_load_global,
+ mock_load_sandbox,
+ ):
+ """Test that org skills override user skills for same name."""
+ # Arrange
+ mock_user_context = Mock(spec=UserContext)
+ with patch.object(
+ AppConversationServiceBase,
+ '__abstractmethods__',
+ set(),
+ ):
+ service = AppConversationServiceBase(
+ init_git_in_empty_workspace=True,
+ user_context=mock_user_context,
+ )
+
+ sandbox = Mock(spec=SandboxInfo)
+ sandbox.exposed_urls = []
+ remote_workspace = AsyncMock()
+
+ # Create skills with same name
+ user_skill = Mock()
+ user_skill.name = 'shared_skill'
+ user_skill.priority = 'low'
+
+ org_skill = Mock()
+ org_skill.name = 'shared_skill'
+ org_skill.priority = 'high'
+
+ mock_load_sandbox.return_value = []
+ mock_load_global.return_value = []
+ mock_load_user.return_value = [user_skill]
+ mock_load_org.return_value = [org_skill]
+ mock_load_repo.return_value = []
+
+ # Act
+ result = await service.load_and_merge_all_skills(
+ sandbox, remote_workspace, 'owner/repo', '/workspace'
+ )
+
+ # Assert
+ assert len(result) == 1
+ assert result[0].priority == 'high' # Org skill should win
+
+ @pytest.mark.asyncio
+ @patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.load_sandbox_skills'
+ )
+ @patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.load_global_skills'
+ )
+ @patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.load_user_skills'
+ )
+ @patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.load_org_skills'
+ )
+ @patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.load_repo_skills'
+ )
+ async def test_load_and_merge_handles_org_skills_failure(
+ self,
+ mock_load_repo,
+ mock_load_org,
+ mock_load_user,
+ mock_load_global,
+ mock_load_sandbox,
+ ):
+ """Test that failure to load org skills doesn't break the overall process."""
+ # Arrange
+ mock_user_context = Mock(spec=UserContext)
+ with patch.object(
+ AppConversationServiceBase,
+ '__abstractmethods__',
+ set(),
+ ):
+ service = AppConversationServiceBase(
+ init_git_in_empty_workspace=True,
+ user_context=mock_user_context,
+ )
+
+ sandbox = Mock(spec=SandboxInfo)
+ sandbox.exposed_urls = []
+ remote_workspace = AsyncMock()
+
+ global_skill = Mock()
+ global_skill.name = 'global_skill'
+ repo_skill = Mock()
+ repo_skill.name = 'repo_skill'
+
+ mock_load_sandbox.return_value = []
+ mock_load_global.return_value = [global_skill]
+ mock_load_user.return_value = []
+ mock_load_org.return_value = [] # Org skills failed/empty
+ mock_load_repo.return_value = [repo_skill]
+
+ # Act
+ result = await service.load_and_merge_all_skills(
+ sandbox, remote_workspace, 'owner/repo', '/workspace'
+ )
+
+ # Assert
+ # Should still have skills from other sources
+ assert len(result) == 2
+ names = {s.name for s in result}
+ assert names == {'global_skill', 'repo_skill'}
+
+ @pytest.mark.asyncio
+ @patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.load_sandbox_skills'
+ )
+ @patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.load_global_skills'
+ )
+ @patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.load_user_skills'
+ )
+ @patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.load_org_skills'
+ )
+ @patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.load_repo_skills'
+ )
+ async def test_load_and_merge_no_selected_repository(
+ self,
+ mock_load_repo,
+ mock_load_org,
+ mock_load_user,
+ mock_load_global,
+ mock_load_sandbox,
+ ):
+ """Test skill loading when no repository is selected."""
+ # Arrange
+ mock_user_context = Mock(spec=UserContext)
+ with patch.object(
+ AppConversationServiceBase,
+ '__abstractmethods__',
+ set(),
+ ):
+ service = AppConversationServiceBase(
+ init_git_in_empty_workspace=True,
+ user_context=mock_user_context,
+ )
+
+ sandbox = Mock(spec=SandboxInfo)
+ sandbox.exposed_urls = []
+ remote_workspace = AsyncMock()
+
+ global_skill = Mock()
+ global_skill.name = 'global_skill'
+
+ mock_load_sandbox.return_value = []
+ mock_load_global.return_value = [global_skill]
+ mock_load_user.return_value = []
+ mock_load_org.return_value = []
+ mock_load_repo.return_value = []
+
+ # Act
+ result = await service.load_and_merge_all_skills(
+ sandbox, remote_workspace, None, '/workspace'
+ )
+
+ # Assert
+ assert len(result) == 1
+ # Org skills should be called even with None repository
+ mock_load_org.assert_called_once_with(
+ remote_workspace, None, '/workspace', mock_user_context
+ )
diff --git a/tests/unit/app_server/test_app_conversation_skills_endpoint.py b/tests/unit/app_server/test_app_conversation_skills_endpoint.py
new file mode 100644
index 000000000000..e84412bcd0aa
--- /dev/null
+++ b/tests/unit/app_server/test_app_conversation_skills_endpoint.py
@@ -0,0 +1,503 @@
+"""Unit tests for the V1 skills endpoint in app_conversation_router.
+
+This module tests the GET /{conversation_id}/skills endpoint functionality,
+following TDD best practices with AAA structure.
+"""
+
+from unittest.mock import AsyncMock, MagicMock
+from uuid import uuid4
+
+import pytest
+from fastapi import status
+
+from openhands.app_server.app_conversation.app_conversation_models import (
+ AppConversation,
+)
+from openhands.app_server.app_conversation.app_conversation_router import (
+ get_conversation_skills,
+)
+from openhands.app_server.app_conversation.app_conversation_service_base import (
+ AppConversationServiceBase,
+)
+from openhands.app_server.sandbox.sandbox_models import (
+ AGENT_SERVER,
+ ExposedUrl,
+ SandboxInfo,
+ SandboxStatus,
+)
+from openhands.app_server.sandbox.sandbox_spec_models import SandboxSpecInfo
+from openhands.app_server.user.user_context import UserContext
+from openhands.sdk.context.skills import KeywordTrigger, Skill, TaskTrigger
+
+
+def _make_service_mock(
+ *,
+ user_context: UserContext,
+ conversation_return: AppConversation | None = None,
+ skills_return: list[Skill] | None = None,
+ raise_on_load: bool = False,
+):
+ """Create a mock service that passes the isinstance check and returns the desired values."""
+
+ mock_cls = type('AppConversationServiceMock', (MagicMock,), {})
+ AppConversationServiceBase.register(mock_cls)
+
+ service = mock_cls()
+ service.user_context = user_context
+ service.get_app_conversation = AsyncMock(return_value=conversation_return)
+
+ async def _load_skills(*_args, **_kwargs):
+ if raise_on_load:
+ raise Exception('Skill loading failed')
+ return skills_return or []
+
+ service.load_and_merge_all_skills = AsyncMock(side_effect=_load_skills)
+ return service
+
+
+@pytest.mark.asyncio
+class TestGetConversationSkills:
+ """Test suite for get_conversation_skills endpoint."""
+
+ async def test_get_skills_returns_repo_and_knowledge_skills(self):
+ """Test successful retrieval of both repo and knowledge skills.
+
+ Arrange: Setup conversation, sandbox, and skills with different types
+ Act: Call get_conversation_skills endpoint
+ Assert: Response contains both repo and knowledge skills with correct types
+ """
+ # Arrange
+ conversation_id = uuid4()
+ sandbox_id = str(uuid4())
+ working_dir = '/workspace'
+
+ # Create mock conversation
+ mock_conversation = AppConversation(
+ id=conversation_id,
+ created_by_user_id='test-user',
+ sandbox_id=sandbox_id,
+ selected_repository='owner/repo',
+ sandbox_status=SandboxStatus.RUNNING,
+ )
+
+ # Create mock sandbox with agent server URL
+ mock_sandbox = SandboxInfo(
+ id=sandbox_id,
+ created_by_user_id='test-user',
+ status=SandboxStatus.RUNNING,
+ sandbox_spec_id=str(uuid4()),
+ session_api_key='test-api-key',
+ exposed_urls=[
+ ExposedUrl(name=AGENT_SERVER, url='http://localhost:8000', port=8000)
+ ],
+ )
+
+ # Create mock sandbox spec
+ mock_sandbox_spec = SandboxSpecInfo(
+ id=str(uuid4()), command=None, working_dir=working_dir
+ )
+
+ # Create mock skills - repo skill (no trigger)
+ repo_skill = Skill(
+ name='repo_skill',
+ content='Repository skill content',
+ trigger=None,
+ )
+
+ # Create mock skills - knowledge skill (with KeywordTrigger)
+ knowledge_skill = Skill(
+ name='knowledge_skill',
+ content='Knowledge skill content',
+ trigger=KeywordTrigger(keywords=['test', 'help']),
+ )
+
+ # Mock services
+ mock_user_context = MagicMock(spec=UserContext)
+ mock_app_conversation_service = _make_service_mock(
+ user_context=mock_user_context,
+ conversation_return=mock_conversation,
+ skills_return=[repo_skill, knowledge_skill],
+ )
+
+ mock_sandbox_service = MagicMock()
+ mock_sandbox_service.get_sandbox = AsyncMock(return_value=mock_sandbox)
+
+ mock_sandbox_spec_service = MagicMock()
+ mock_sandbox_spec_service.get_sandbox_spec = AsyncMock(
+ return_value=mock_sandbox_spec
+ )
+
+ # Act
+ response = await get_conversation_skills(
+ conversation_id=conversation_id,
+ app_conversation_service=mock_app_conversation_service,
+ sandbox_service=mock_sandbox_service,
+ sandbox_spec_service=mock_sandbox_spec_service,
+ )
+
+ # Assert
+ assert response.status_code == status.HTTP_200_OK
+ content = response.body.decode('utf-8')
+ import json
+
+ data = json.loads(content)
+ assert 'skills' in data
+ assert len(data['skills']) == 2
+
+ # Check repo skill
+ repo_skill_data = next(
+ (s for s in data['skills'] if s['name'] == 'repo_skill'), None
+ )
+ assert repo_skill_data is not None
+ assert repo_skill_data['type'] == 'repo'
+ assert repo_skill_data['content'] == 'Repository skill content'
+ assert repo_skill_data['triggers'] == []
+
+ # Check knowledge skill
+ knowledge_skill_data = next(
+ (s for s in data['skills'] if s['name'] == 'knowledge_skill'), None
+ )
+ assert knowledge_skill_data is not None
+ assert knowledge_skill_data['type'] == 'knowledge'
+ assert knowledge_skill_data['content'] == 'Knowledge skill content'
+ assert knowledge_skill_data['triggers'] == ['test', 'help']
+
+ async def test_get_skills_returns_404_when_conversation_not_found(self):
+ """Test endpoint returns 404 when conversation doesn't exist.
+
+ Arrange: Setup mocks to return None for conversation
+ Act: Call get_conversation_skills endpoint
+ Assert: Response is 404 with appropriate error message
+ """
+ # Arrange
+ conversation_id = uuid4()
+
+ mock_user_context = MagicMock(spec=UserContext)
+ mock_app_conversation_service = _make_service_mock(
+ user_context=mock_user_context,
+ conversation_return=None,
+ )
+
+ mock_sandbox_service = MagicMock()
+ mock_sandbox_spec_service = MagicMock()
+
+ # Act
+ response = await get_conversation_skills(
+ conversation_id=conversation_id,
+ app_conversation_service=mock_app_conversation_service,
+ sandbox_service=mock_sandbox_service,
+ sandbox_spec_service=mock_sandbox_spec_service,
+ )
+
+ # Assert
+ assert response.status_code == status.HTTP_404_NOT_FOUND
+ content = response.body.decode('utf-8')
+ import json
+
+ data = json.loads(content)
+ assert 'error' in data
+ assert str(conversation_id) in data['error']
+
+ async def test_get_skills_returns_404_when_sandbox_not_found(self):
+ """Test endpoint returns 404 when sandbox doesn't exist.
+
+ Arrange: Setup conversation but no sandbox
+ Act: Call get_conversation_skills endpoint
+ Assert: Response is 404 with sandbox error message
+ """
+ # Arrange
+ conversation_id = uuid4()
+ sandbox_id = str(uuid4())
+
+ mock_conversation = AppConversation(
+ id=conversation_id,
+ created_by_user_id='test-user',
+ sandbox_id=sandbox_id,
+ sandbox_status=SandboxStatus.RUNNING,
+ )
+
+ mock_user_context = MagicMock(spec=UserContext)
+ mock_app_conversation_service = _make_service_mock(
+ user_context=mock_user_context,
+ conversation_return=mock_conversation,
+ )
+
+ mock_sandbox_service = MagicMock()
+ mock_sandbox_service.get_sandbox = AsyncMock(return_value=None)
+
+ mock_sandbox_spec_service = MagicMock()
+
+ # Act
+ response = await get_conversation_skills(
+ conversation_id=conversation_id,
+ app_conversation_service=mock_app_conversation_service,
+ sandbox_service=mock_sandbox_service,
+ sandbox_spec_service=mock_sandbox_spec_service,
+ )
+
+ # Assert
+ assert response.status_code == status.HTTP_404_NOT_FOUND
+ content = response.body.decode('utf-8')
+ import json
+
+ data = json.loads(content)
+ assert 'error' in data
+ assert 'Sandbox not found' in data['error']
+
+ async def test_get_skills_returns_404_when_sandbox_not_running(self):
+ """Test endpoint returns 404 when sandbox is not in RUNNING state.
+
+ Arrange: Setup conversation with stopped sandbox
+ Act: Call get_conversation_skills endpoint
+ Assert: Response is 404 with sandbox not running message
+ """
+ # Arrange
+ conversation_id = uuid4()
+ sandbox_id = str(uuid4())
+
+ mock_conversation = AppConversation(
+ id=conversation_id,
+ created_by_user_id='test-user',
+ sandbox_id=sandbox_id,
+ sandbox_status=SandboxStatus.PAUSED,
+ )
+
+ mock_sandbox = SandboxInfo(
+ id=sandbox_id,
+ created_by_user_id='test-user',
+ status=SandboxStatus.PAUSED,
+ sandbox_spec_id=str(uuid4()),
+ session_api_key='test-api-key',
+ )
+
+ mock_user_context = MagicMock(spec=UserContext)
+ mock_app_conversation_service = _make_service_mock(
+ user_context=mock_user_context,
+ conversation_return=mock_conversation,
+ )
+
+ mock_sandbox_service = MagicMock()
+ mock_sandbox_service.get_sandbox = AsyncMock(return_value=mock_sandbox)
+
+ mock_sandbox_spec_service = MagicMock()
+
+ # Act
+ response = await get_conversation_skills(
+ conversation_id=conversation_id,
+ app_conversation_service=mock_app_conversation_service,
+ sandbox_service=mock_sandbox_service,
+ sandbox_spec_service=mock_sandbox_spec_service,
+ )
+
+ # Assert
+ assert response.status_code == status.HTTP_404_NOT_FOUND
+ content = response.body.decode('utf-8')
+ import json
+
+ data = json.loads(content)
+ assert 'error' in data
+ assert 'not running' in data['error']
+
+ async def test_get_skills_handles_task_trigger_skills(self):
+ """Test endpoint correctly handles skills with TaskTrigger.
+
+ Arrange: Setup skill with TaskTrigger
+ Act: Call get_conversation_skills endpoint
+ Assert: Skill is categorized as knowledge type with correct triggers
+ """
+ # Arrange
+ conversation_id = uuid4()
+ sandbox_id = str(uuid4())
+
+ mock_conversation = AppConversation(
+ id=conversation_id,
+ created_by_user_id='test-user',
+ sandbox_id=sandbox_id,
+ sandbox_status=SandboxStatus.RUNNING,
+ )
+
+ mock_sandbox = SandboxInfo(
+ id=sandbox_id,
+ created_by_user_id='test-user',
+ status=SandboxStatus.RUNNING,
+ sandbox_spec_id=str(uuid4()),
+ session_api_key='test-api-key',
+ exposed_urls=[
+ ExposedUrl(name=AGENT_SERVER, url='http://localhost:8000', port=8000)
+ ],
+ )
+
+ mock_sandbox_spec = SandboxSpecInfo(
+ id=str(uuid4()), command=None, working_dir='/workspace'
+ )
+
+ # Create task skill with TaskTrigger
+ task_skill = Skill(
+ name='task_skill',
+ content='Task skill content',
+ trigger=TaskTrigger(triggers=['task', 'execute']),
+ )
+
+ mock_user_context = MagicMock(spec=UserContext)
+ mock_app_conversation_service = _make_service_mock(
+ user_context=mock_user_context,
+ conversation_return=mock_conversation,
+ skills_return=[task_skill],
+ )
+
+ mock_sandbox_service = MagicMock()
+ mock_sandbox_service.get_sandbox = AsyncMock(return_value=mock_sandbox)
+
+ mock_sandbox_spec_service = MagicMock()
+ mock_sandbox_spec_service.get_sandbox_spec = AsyncMock(
+ return_value=mock_sandbox_spec
+ )
+
+ # Act
+ response = await get_conversation_skills(
+ conversation_id=conversation_id,
+ app_conversation_service=mock_app_conversation_service,
+ sandbox_service=mock_sandbox_service,
+ sandbox_spec_service=mock_sandbox_spec_service,
+ )
+
+ # Assert
+ assert response.status_code == status.HTTP_200_OK
+ content = response.body.decode('utf-8')
+ import json
+
+ data = json.loads(content)
+ assert len(data['skills']) == 1
+ skill_data = data['skills'][0]
+ assert skill_data['type'] == 'knowledge'
+ assert skill_data['triggers'] == ['task', 'execute']
+
+ async def test_get_skills_returns_500_on_skill_loading_error(self):
+ """Test endpoint returns 500 when skill loading fails.
+
+ Arrange: Setup mocks to raise exception during skill loading
+ Act: Call get_conversation_skills endpoint
+ Assert: Response is 500 with error message
+ """
+ # Arrange
+ conversation_id = uuid4()
+ sandbox_id = str(uuid4())
+
+ mock_conversation = AppConversation(
+ id=conversation_id,
+ created_by_user_id='test-user',
+ sandbox_id=sandbox_id,
+ sandbox_status=SandboxStatus.RUNNING,
+ )
+
+ mock_sandbox = SandboxInfo(
+ id=sandbox_id,
+ created_by_user_id='test-user',
+ status=SandboxStatus.RUNNING,
+ sandbox_spec_id=str(uuid4()),
+ session_api_key='test-api-key',
+ exposed_urls=[
+ ExposedUrl(name=AGENT_SERVER, url='http://localhost:8000', port=8000)
+ ],
+ )
+
+ mock_sandbox_spec = SandboxSpecInfo(
+ id=str(uuid4()), command=None, working_dir='/workspace'
+ )
+
+ mock_user_context = MagicMock(spec=UserContext)
+ mock_app_conversation_service = _make_service_mock(
+ user_context=mock_user_context,
+ conversation_return=mock_conversation,
+ raise_on_load=True,
+ )
+
+ mock_sandbox_service = MagicMock()
+ mock_sandbox_service.get_sandbox = AsyncMock(return_value=mock_sandbox)
+
+ mock_sandbox_spec_service = MagicMock()
+ mock_sandbox_spec_service.get_sandbox_spec = AsyncMock(
+ return_value=mock_sandbox_spec
+ )
+
+ # Act
+ response = await get_conversation_skills(
+ conversation_id=conversation_id,
+ app_conversation_service=mock_app_conversation_service,
+ sandbox_service=mock_sandbox_service,
+ sandbox_spec_service=mock_sandbox_spec_service,
+ )
+
+ # Assert
+ assert response.status_code == status.HTTP_500_INTERNAL_SERVER_ERROR
+ content = response.body.decode('utf-8')
+ import json
+
+ data = json.loads(content)
+ assert 'error' in data
+ assert 'Error getting skills' in data['error']
+
+ async def test_get_skills_returns_empty_list_when_no_skills_loaded(self):
+ """Test endpoint returns empty skills list when no skills are found.
+
+ Arrange: Setup all skill loaders to return empty lists
+ Act: Call get_conversation_skills endpoint
+ Assert: Response contains empty skills array
+ """
+ # Arrange
+ conversation_id = uuid4()
+ sandbox_id = str(uuid4())
+
+ mock_conversation = AppConversation(
+ id=conversation_id,
+ created_by_user_id='test-user',
+ sandbox_id=sandbox_id,
+ sandbox_status=SandboxStatus.RUNNING,
+ )
+
+ mock_sandbox = SandboxInfo(
+ id=sandbox_id,
+ created_by_user_id='test-user',
+ status=SandboxStatus.RUNNING,
+ sandbox_spec_id=str(uuid4()),
+ session_api_key='test-api-key',
+ exposed_urls=[
+ ExposedUrl(name=AGENT_SERVER, url='http://localhost:8000', port=8000)
+ ],
+ )
+
+ mock_sandbox_spec = SandboxSpecInfo(
+ id=str(uuid4()), command=None, working_dir='/workspace'
+ )
+
+ mock_user_context = MagicMock(spec=UserContext)
+ mock_app_conversation_service = _make_service_mock(
+ user_context=mock_user_context,
+ conversation_return=mock_conversation,
+ skills_return=[],
+ )
+
+ mock_sandbox_service = MagicMock()
+ mock_sandbox_service.get_sandbox = AsyncMock(return_value=mock_sandbox)
+
+ mock_sandbox_spec_service = MagicMock()
+ mock_sandbox_spec_service.get_sandbox_spec = AsyncMock(
+ return_value=mock_sandbox_spec
+ )
+
+ # Act
+ response = await get_conversation_skills(
+ conversation_id=conversation_id,
+ app_conversation_service=mock_app_conversation_service,
+ sandbox_service=mock_sandbox_service,
+ sandbox_spec_service=mock_sandbox_spec_service,
+ )
+
+ # Assert
+ assert response.status_code == status.HTTP_200_OK
+ content = response.body.decode('utf-8')
+ import json
+
+ data = json.loads(content)
+ assert 'skills' in data
+ assert len(data['skills']) == 0
diff --git a/tests/unit/app_server/test_github_v1_callback_processor.py b/tests/unit/app_server/test_github_v1_callback_processor.py
new file mode 100644
index 000000000000..acf958a8e3d1
--- /dev/null
+++ b/tests/unit/app_server/test_github_v1_callback_processor.py
@@ -0,0 +1,771 @@
+"""
+Tests for the GithubV1CallbackProcessor.
+
+Covers:
+- Event filtering
+- Successful summary + GitHub posting
+- Inline PR comments
+- Error conditions (missing IDs/credentials, conversation/sandbox issues)
+- Agent server HTTP/timeout errors
+- Low-level helper methods
+"""
+
+import os
+from unittest.mock import AsyncMock, MagicMock, patch
+from uuid import uuid4
+
+import httpx
+import pytest
+
+from openhands.app_server.app_conversation.app_conversation_models import (
+ AppConversationInfo,
+)
+from openhands.app_server.event_callback.event_callback_models import EventCallback
+from openhands.app_server.event_callback.event_callback_result_models import (
+ EventCallbackResultStatus,
+)
+from openhands.app_server.event_callback.github_v1_callback_processor import (
+ GithubV1CallbackProcessor,
+)
+from openhands.app_server.sandbox.sandbox_models import (
+ ExposedUrl,
+ SandboxInfo,
+ SandboxStatus,
+)
+from openhands.events.action.message import MessageAction
+from openhands.sdk.event import ConversationStateUpdateEvent
+
+# ---------------------------------------------------------------------------
+# Fixtures
+# ---------------------------------------------------------------------------
+
+
+@pytest.fixture
+def github_callback_processor():
+ return GithubV1CallbackProcessor(
+ github_view_data={
+ 'installation_id': 12345,
+ 'full_repo_name': 'test-owner/test-repo',
+ 'issue_number': 42,
+ },
+ should_request_summary=True,
+ should_extract=True,
+ inline_pr_comment=False,
+ )
+
+
+@pytest.fixture
+def github_callback_processor_inline():
+ return GithubV1CallbackProcessor(
+ github_view_data={
+ 'installation_id': 12345,
+ 'full_repo_name': 'test-owner/test-repo',
+ 'issue_number': 42,
+ 'comment_id': 'comment_123',
+ },
+ should_request_summary=True,
+ should_extract=True,
+ inline_pr_comment=True,
+ )
+
+
+@pytest.fixture
+def conversation_state_update_event():
+ return ConversationStateUpdateEvent(key='execution_status', value='finished')
+
+
+@pytest.fixture
+def wrong_event():
+ return MessageAction(content='Hello world')
+
+
+@pytest.fixture
+def wrong_state_event():
+ return ConversationStateUpdateEvent(key='execution_status', value='running')
+
+
+@pytest.fixture
+def event_callback():
+ return EventCallback(
+ id=uuid4(),
+ conversation_id=uuid4(),
+ processor=GithubV1CallbackProcessor(),
+ event_kind='ConversationStateUpdateEvent',
+ )
+
+
+@pytest.fixture
+def mock_app_conversation_info():
+ return AppConversationInfo(
+ conversation_id=uuid4(),
+ sandbox_id='sandbox_123',
+ title='Test Conversation',
+ created_by_user_id='test_user_123',
+ )
+
+
+@pytest.fixture
+def mock_sandbox_info():
+ return SandboxInfo(
+ id='sandbox_123',
+ status=SandboxStatus.RUNNING,
+ session_api_key='test_api_key',
+ created_by_user_id='test_user_123',
+ sandbox_spec_id='spec_123',
+ exposed_urls=[
+ ExposedUrl(name='AGENT_SERVER', url='http://localhost:8000', port=8000),
+ ],
+ )
+
+
+# ---------------------------------------------------------------------------
+# Helper for common service mocks
+# ---------------------------------------------------------------------------
+
+
+async def _setup_happy_path_services(
+ mock_get_app_conversation_info_service,
+ mock_get_sandbox_service,
+ mock_get_httpx_client,
+ app_conversation_info,
+ sandbox_info,
+ agent_response_text='Test summary from agent',
+):
+ # app_conversation_info_service
+ mock_app_conversation_info_service = AsyncMock()
+ mock_app_conversation_info_service.get_app_conversation_info.return_value = (
+ app_conversation_info
+ )
+ mock_get_app_conversation_info_service.return_value.__aenter__.return_value = (
+ mock_app_conversation_info_service
+ )
+
+ # sandbox_service
+ mock_sandbox_service = AsyncMock()
+ mock_sandbox_service.get_sandbox.return_value = sandbox_info
+ mock_get_sandbox_service.return_value.__aenter__.return_value = mock_sandbox_service
+
+ # httpx_client
+ mock_httpx_client = AsyncMock()
+ mock_response = MagicMock()
+ mock_response.json.return_value = {'response': agent_response_text}
+ mock_response.raise_for_status.return_value = None
+ mock_httpx_client.post.return_value = mock_response
+ mock_get_httpx_client.return_value.__aenter__.return_value = mock_httpx_client
+
+ return mock_httpx_client
+
+
+# ---------------------------------------------------------------------------
+# Tests
+# ---------------------------------------------------------------------------
+
+
+class TestGithubV1CallbackProcessor:
+ async def test_call_with_wrong_event_type(
+ self, github_callback_processor, wrong_event, event_callback
+ ):
+ result = await github_callback_processor(
+ conversation_id=uuid4(),
+ callback=event_callback,
+ event=wrong_event,
+ )
+ assert result is None
+
+ async def test_call_with_wrong_state_event(
+ self, github_callback_processor, wrong_state_event, event_callback
+ ):
+ result = await github_callback_processor(
+ conversation_id=uuid4(),
+ callback=event_callback,
+ event=wrong_state_event,
+ )
+ assert result is None
+
+ async def test_call_should_request_summary_false(
+ self, github_callback_processor, conversation_state_update_event, event_callback
+ ):
+ github_callback_processor.should_request_summary = False
+
+ result = await github_callback_processor(
+ conversation_id=uuid4(),
+ callback=event_callback,
+ event=conversation_state_update_event,
+ )
+ assert result is None
+
+ # ------------------------------------------------------------------ #
+ # Successful paths
+ # ------------------------------------------------------------------ #
+
+ @patch.dict(
+ os.environ,
+ {
+ 'GITHUB_APP_CLIENT_ID': 'test_client_id',
+ 'GITHUB_APP_PRIVATE_KEY': 'test_private_key',
+ },
+ )
+ @patch('openhands.app_server.config.get_app_conversation_info_service')
+ @patch('openhands.app_server.config.get_sandbox_service')
+ @patch('openhands.app_server.config.get_httpx_client')
+ @patch(
+ 'openhands.app_server.event_callback.github_v1_callback_processor.get_prompt_template'
+ )
+ @patch(
+ 'openhands.app_server.event_callback.github_v1_callback_processor.GithubIntegration'
+ )
+ @patch('openhands.app_server.event_callback.github_v1_callback_processor.Github')
+ async def test_successful_callback_execution(
+ self,
+ mock_github,
+ mock_github_integration,
+ mock_get_prompt_template,
+ mock_get_httpx_client,
+ mock_get_sandbox_service,
+ mock_get_app_conversation_info_service,
+ github_callback_processor,
+ conversation_state_update_event,
+ event_callback,
+ mock_app_conversation_info,
+ mock_sandbox_info,
+ ):
+ conversation_id = uuid4()
+
+ # Common service mocks
+ mock_httpx_client = await _setup_happy_path_services(
+ mock_get_app_conversation_info_service,
+ mock_get_sandbox_service,
+ mock_get_httpx_client,
+ mock_app_conversation_info,
+ mock_sandbox_info,
+ )
+
+ mock_get_prompt_template.return_value = 'Please provide a summary'
+
+ # GitHub integration
+ mock_token_data = MagicMock()
+ mock_token_data.token = 'test_access_token'
+ mock_integration_instance = MagicMock()
+ mock_integration_instance.get_access_token.return_value = mock_token_data
+ mock_github_integration.return_value = mock_integration_instance
+
+ # GitHub API
+ mock_github_client = MagicMock()
+ mock_repo = MagicMock()
+ mock_issue = MagicMock()
+ mock_repo.get_issue.return_value = mock_issue
+ mock_github_client.get_repo.return_value = mock_repo
+ mock_github.return_value.__enter__.return_value = mock_github_client
+
+ result = await github_callback_processor(
+ conversation_id=conversation_id,
+ callback=event_callback,
+ event=conversation_state_update_event,
+ )
+
+ assert result is not None
+ assert result.status == EventCallbackResultStatus.SUCCESS
+ assert result.event_callback_id == event_callback.id
+ assert result.event_id == conversation_state_update_event.id
+ assert result.conversation_id == conversation_id
+ assert result.detail == 'Test summary from agent'
+ assert github_callback_processor.should_request_summary is False
+
+ mock_github_integration.assert_called_once_with(
+ 'test_client_id', 'test_private_key'
+ )
+ mock_integration_instance.get_access_token.assert_called_once_with(12345)
+
+ mock_github.assert_called_once_with('test_access_token')
+ mock_github_client.get_repo.assert_called_once_with('test-owner/test-repo')
+ mock_repo.get_issue.assert_called_once_with(number=42)
+ mock_issue.create_comment.assert_called_once_with('Test summary from agent')
+
+ mock_httpx_client.post.assert_called_once()
+ url_arg, kwargs = mock_httpx_client.post.call_args
+ url = url_arg[0] if url_arg else kwargs['url']
+ assert 'ask_agent' in url
+ assert kwargs['headers']['X-Session-API-Key'] == 'test_api_key'
+ assert kwargs['json']['question'] == 'Please provide a summary'
+
+ @patch.dict(
+ os.environ,
+ {
+ 'GITHUB_APP_CLIENT_ID': 'test_client_id',
+ 'GITHUB_APP_PRIVATE_KEY': 'test_private_key',
+ },
+ )
+ @patch('openhands.app_server.config.get_app_conversation_info_service')
+ @patch('openhands.app_server.config.get_sandbox_service')
+ @patch('openhands.app_server.config.get_httpx_client')
+ @patch(
+ 'openhands.app_server.event_callback.github_v1_callback_processor.get_prompt_template'
+ )
+ @patch(
+ 'openhands.app_server.event_callback.github_v1_callback_processor.GithubIntegration'
+ )
+ @patch('openhands.app_server.event_callback.github_v1_callback_processor.Github')
+ async def test_successful_inline_pr_comment(
+ self,
+ mock_github,
+ mock_github_integration,
+ mock_get_prompt_template,
+ mock_get_httpx_client,
+ mock_get_sandbox_service,
+ mock_get_app_conversation_info_service,
+ github_callback_processor_inline,
+ conversation_state_update_event,
+ event_callback,
+ mock_app_conversation_info,
+ mock_sandbox_info,
+ ):
+ conversation_id = uuid4()
+
+ await _setup_happy_path_services(
+ mock_get_app_conversation_info_service,
+ mock_get_sandbox_service,
+ mock_get_httpx_client,
+ mock_app_conversation_info,
+ mock_sandbox_info,
+ )
+
+ mock_get_prompt_template.return_value = 'Please provide a summary'
+
+ mock_token_data = MagicMock()
+ mock_token_data.token = 'test_access_token'
+ mock_integration_instance = MagicMock()
+ mock_integration_instance.get_access_token.return_value = mock_token_data
+ mock_github_integration.return_value = mock_integration_instance
+
+ mock_github_client = MagicMock()
+ mock_repo = MagicMock()
+ mock_pr = MagicMock()
+ mock_repo.get_pull.return_value = mock_pr
+ mock_github_client.get_repo.return_value = mock_repo
+ mock_github.return_value.__enter__.return_value = mock_github_client
+
+ result = await github_callback_processor_inline(
+ conversation_id=conversation_id,
+ callback=event_callback,
+ event=conversation_state_update_event,
+ )
+
+ assert result is not None
+ assert result.status == EventCallbackResultStatus.SUCCESS
+
+ mock_repo.get_pull.assert_called_once_with(42)
+ mock_pr.create_review_comment_reply.assert_called_once_with(
+ comment_id='comment_123', body='Test summary from agent'
+ )
+
+ # ------------------------------------------------------------------ #
+ # Error paths
+ # ------------------------------------------------------------------ #
+
+ @patch('openhands.app_server.config.get_httpx_client')
+ @patch('openhands.app_server.config.get_sandbox_service')
+ @patch('openhands.app_server.config.get_app_conversation_info_service')
+ async def test_missing_installation_id(
+ self,
+ mock_get_app_conversation_info_service,
+ mock_get_sandbox_service,
+ mock_get_httpx_client,
+ conversation_state_update_event,
+ event_callback,
+ mock_app_conversation_info,
+ mock_sandbox_info,
+ ):
+ processor = GithubV1CallbackProcessor(
+ github_view_data={}, should_request_summary=True
+ )
+ conversation_id = uuid4()
+
+ await _setup_happy_path_services(
+ mock_get_app_conversation_info_service,
+ mock_get_sandbox_service,
+ mock_get_httpx_client,
+ mock_app_conversation_info,
+ mock_sandbox_info,
+ )
+
+ result = await processor(
+ conversation_id=conversation_id,
+ callback=event_callback,
+ event=conversation_state_update_event,
+ )
+
+ assert result is not None
+ assert result.status == EventCallbackResultStatus.ERROR
+ assert 'Missing installation ID' in result.detail
+
+ @patch.dict(os.environ, {}, clear=True)
+ @patch('openhands.app_server.config.get_httpx_client')
+ @patch('openhands.app_server.config.get_sandbox_service')
+ @patch('openhands.app_server.config.get_app_conversation_info_service')
+ async def test_missing_github_credentials(
+ self,
+ mock_get_app_conversation_info_service,
+ mock_get_sandbox_service,
+ mock_get_httpx_client,
+ github_callback_processor,
+ conversation_state_update_event,
+ event_callback,
+ mock_app_conversation_info,
+ mock_sandbox_info,
+ ):
+ conversation_id = uuid4()
+
+ await _setup_happy_path_services(
+ mock_get_app_conversation_info_service,
+ mock_get_sandbox_service,
+ mock_get_httpx_client,
+ mock_app_conversation_info,
+ mock_sandbox_info,
+ )
+
+ result = await github_callback_processor(
+ conversation_id=conversation_id,
+ callback=event_callback,
+ event=conversation_state_update_event,
+ )
+
+ assert result is not None
+ assert result.status == EventCallbackResultStatus.ERROR
+ assert 'GitHub App credentials are not configured' in result.detail
+
+ @patch.dict(
+ os.environ,
+ {
+ 'GITHUB_APP_CLIENT_ID': 'test_client_id',
+ 'GITHUB_APP_PRIVATE_KEY': 'test_private_key',
+ },
+ )
+ @patch('openhands.app_server.config.get_app_conversation_info_service')
+ @patch('openhands.app_server.config.get_sandbox_service')
+ async def test_sandbox_not_running(
+ self,
+ mock_get_sandbox_service,
+ mock_get_app_conversation_info_service,
+ github_callback_processor,
+ conversation_state_update_event,
+ event_callback,
+ mock_app_conversation_info,
+ ):
+ conversation_id = uuid4()
+
+ mock_app_conversation_info_service = AsyncMock()
+ mock_app_conversation_info_service.get_app_conversation_info.return_value = (
+ mock_app_conversation_info
+ )
+ mock_get_app_conversation_info_service.return_value.__aenter__.return_value = (
+ mock_app_conversation_info_service
+ )
+
+ non_running_sandbox = SandboxInfo(
+ id='sandbox_123',
+ status=SandboxStatus.PAUSED,
+ session_api_key='test_api_key',
+ created_by_user_id='test_user_123',
+ sandbox_spec_id='spec_123',
+ )
+ mock_sandbox_service = AsyncMock()
+ mock_sandbox_service.get_sandbox.return_value = non_running_sandbox
+ mock_get_sandbox_service.return_value.__aenter__.return_value = (
+ mock_sandbox_service
+ )
+
+ result = await github_callback_processor(
+ conversation_id=conversation_id,
+ callback=event_callback,
+ event=conversation_state_update_event,
+ )
+
+ assert result is not None
+ assert result.status == EventCallbackResultStatus.ERROR
+ assert 'Sandbox not running' in result.detail
+
+ @patch.dict(
+ os.environ,
+ {
+ 'GITHUB_APP_CLIENT_ID': 'test_client_id',
+ 'GITHUB_APP_PRIVATE_KEY': 'test_private_key',
+ },
+ )
+ @patch('openhands.app_server.config.get_app_conversation_info_service')
+ @patch('openhands.app_server.config.get_sandbox_service')
+ @patch('openhands.app_server.config.get_httpx_client')
+ @patch(
+ 'openhands.app_server.event_callback.github_v1_callback_processor.get_prompt_template'
+ )
+ async def test_agent_server_http_error(
+ self,
+ mock_get_prompt_template,
+ mock_get_httpx_client,
+ mock_get_sandbox_service,
+ mock_get_app_conversation_info_service,
+ github_callback_processor,
+ conversation_state_update_event,
+ event_callback,
+ mock_app_conversation_info,
+ mock_sandbox_info,
+ ):
+ conversation_id = uuid4()
+
+ # Set up happy path except httpx
+ await _setup_happy_path_services(
+ mock_get_app_conversation_info_service,
+ mock_get_sandbox_service,
+ mock_get_httpx_client,
+ mock_app_conversation_info,
+ mock_sandbox_info,
+ )
+
+ mock_get_prompt_template.return_value = 'Please provide a summary'
+
+ mock_httpx_client = mock_get_httpx_client.return_value.__aenter__.return_value
+ mock_response = MagicMock()
+ mock_response.status_code = 500
+ mock_response.text = 'Internal Server Error'
+ mock_response.headers = {}
+ mock_error = httpx.HTTPStatusError(
+ 'HTTP 500 error', request=MagicMock(), response=mock_response
+ )
+ mock_httpx_client.post.side_effect = mock_error
+
+ result = await github_callback_processor(
+ conversation_id=conversation_id,
+ callback=event_callback,
+ event=conversation_state_update_event,
+ )
+
+ assert result is not None
+ assert result.status == EventCallbackResultStatus.ERROR
+ assert 'Failed to send message to agent server' in result.detail
+
+ @patch.dict(
+ os.environ,
+ {
+ 'GITHUB_APP_CLIENT_ID': 'test_client_id',
+ 'GITHUB_APP_PRIVATE_KEY': 'test_private_key',
+ },
+ )
+ @patch('openhands.app_server.config.get_app_conversation_info_service')
+ @patch('openhands.app_server.config.get_sandbox_service')
+ @patch('openhands.app_server.config.get_httpx_client')
+ @patch(
+ 'openhands.app_server.event_callback.github_v1_callback_processor.get_prompt_template'
+ )
+ async def test_agent_server_timeout(
+ self,
+ mock_get_prompt_template,
+ mock_get_httpx_client,
+ mock_get_sandbox_service,
+ mock_get_app_conversation_info_service,
+ github_callback_processor,
+ conversation_state_update_event,
+ event_callback,
+ mock_app_conversation_info,
+ mock_sandbox_info,
+ ):
+ conversation_id = uuid4()
+
+ await _setup_happy_path_services(
+ mock_get_app_conversation_info_service,
+ mock_get_sandbox_service,
+ mock_get_httpx_client,
+ mock_app_conversation_info,
+ mock_sandbox_info,
+ )
+
+ mock_get_prompt_template.return_value = 'Please provide a summary'
+
+ mock_httpx_client = mock_get_httpx_client.return_value.__aenter__.return_value
+ mock_httpx_client.post.side_effect = httpx.TimeoutException('Request timeout')
+
+ result = await github_callback_processor(
+ conversation_id=conversation_id,
+ callback=event_callback,
+ event=conversation_state_update_event,
+ )
+
+ assert result is not None
+ assert result.status == EventCallbackResultStatus.ERROR
+ assert 'Request timeout after 30 seconds' in result.detail
+
+ # ------------------------------------------------------------------ #
+ # Low-level helper tests
+ # ------------------------------------------------------------------ #
+
+ def test_get_installation_access_token_missing_id(self):
+ processor = GithubV1CallbackProcessor(github_view_data={})
+
+ with pytest.raises(ValueError, match='Missing installation ID'):
+ processor._get_installation_access_token()
+
+ @patch.dict(os.environ, {}, clear=True)
+ def test_get_installation_access_token_missing_credentials(
+ self, github_callback_processor
+ ):
+ with pytest.raises(
+ ValueError, match='GitHub App credentials are not configured'
+ ):
+ github_callback_processor._get_installation_access_token()
+
+ @patch.dict(
+ os.environ,
+ {
+ 'GITHUB_APP_CLIENT_ID': 'test_client_id',
+ 'GITHUB_APP_PRIVATE_KEY': 'test_private_key\\nwith_newlines',
+ },
+ )
+ @patch(
+ 'openhands.app_server.event_callback.github_v1_callback_processor.GithubIntegration'
+ )
+ def test_get_installation_access_token_success(
+ self, mock_github_integration, github_callback_processor
+ ):
+ mock_token_data = MagicMock()
+ mock_token_data.token = 'test_access_token'
+ mock_integration_instance = MagicMock()
+ mock_integration_instance.get_access_token.return_value = mock_token_data
+ mock_github_integration.return_value = mock_integration_instance
+
+ token = github_callback_processor._get_installation_access_token()
+
+ assert token == 'test_access_token'
+ mock_github_integration.assert_called_once_with(
+ 'test_client_id', 'test_private_key\nwith_newlines'
+ )
+ mock_integration_instance.get_access_token.assert_called_once_with(12345)
+
+ @patch('openhands.app_server.event_callback.github_v1_callback_processor.Github')
+ async def test_post_summary_to_github_issue_comment(
+ self, mock_github, github_callback_processor
+ ):
+ mock_github_client = MagicMock()
+ mock_repo = MagicMock()
+ mock_issue = MagicMock()
+ mock_repo.get_issue.return_value = mock_issue
+ mock_github_client.get_repo.return_value = mock_repo
+ mock_github.return_value.__enter__.return_value = mock_github_client
+
+ with patch.object(
+ github_callback_processor,
+ '_get_installation_access_token',
+ return_value='test_token',
+ ):
+ await github_callback_processor._post_summary_to_github('Test summary')
+
+ mock_github.assert_called_once_with('test_token')
+ mock_github_client.get_repo.assert_called_once_with('test-owner/test-repo')
+ mock_repo.get_issue.assert_called_once_with(number=42)
+ mock_issue.create_comment.assert_called_once_with('Test summary')
+
+ @patch('openhands.app_server.event_callback.github_v1_callback_processor.Github')
+ async def test_post_summary_to_github_pr_comment(
+ self, mock_github, github_callback_processor_inline
+ ):
+ mock_github_client = MagicMock()
+ mock_repo = MagicMock()
+ mock_pr = MagicMock()
+ mock_repo.get_pull.return_value = mock_pr
+ mock_github_client.get_repo.return_value = mock_repo
+ mock_github.return_value.__enter__.return_value = mock_github_client
+
+ with patch.object(
+ github_callback_processor_inline,
+ '_get_installation_access_token',
+ return_value='test_token',
+ ):
+ await github_callback_processor_inline._post_summary_to_github(
+ 'Test summary'
+ )
+
+ mock_github.assert_called_once_with('test_token')
+ mock_github_client.get_repo.assert_called_once_with('test-owner/test-repo')
+ mock_repo.get_pull.assert_called_once_with(42)
+ mock_pr.create_review_comment_reply.assert_called_once_with(
+ comment_id='comment_123', body='Test summary'
+ )
+
+ async def test_post_summary_to_github_missing_token(
+ self, github_callback_processor
+ ):
+ with patch.object(
+ github_callback_processor, '_get_installation_access_token', return_value=''
+ ):
+ with pytest.raises(RuntimeError, match='Missing GitHub credentials'):
+ await github_callback_processor._post_summary_to_github('Test summary')
+
+ @patch.dict(
+ os.environ,
+ {
+ 'GITHUB_APP_CLIENT_ID': 'test_client_id',
+ 'GITHUB_APP_PRIVATE_KEY': 'test_private_key',
+ 'WEB_HOST': 'test.example.com',
+ },
+ )
+ @patch('openhands.app_server.config.get_httpx_client')
+ @patch('openhands.app_server.config.get_sandbox_service')
+ @patch('openhands.app_server.config.get_app_conversation_info_service')
+ async def test_exception_handling_posts_error_to_github(
+ self,
+ mock_get_app_conversation_info_service,
+ mock_get_sandbox_service,
+ mock_get_httpx_client,
+ github_callback_processor,
+ conversation_state_update_event,
+ event_callback,
+ mock_app_conversation_info,
+ mock_sandbox_info,
+ ):
+ conversation_id = uuid4()
+
+ # happy-ish path, except httpx error
+ mock_httpx_client = await _setup_happy_path_services(
+ mock_get_app_conversation_info_service,
+ mock_get_sandbox_service,
+ mock_get_httpx_client,
+ mock_app_conversation_info,
+ mock_sandbox_info,
+ )
+ mock_httpx_client.post.side_effect = Exception('Simulated agent server error')
+
+ with (
+ patch(
+ 'openhands.app_server.event_callback.github_v1_callback_processor.GithubIntegration'
+ ) as mock_github_integration,
+ patch(
+ 'openhands.app_server.event_callback.github_v1_callback_processor.Github'
+ ) as mock_github,
+ ):
+ mock_integration = MagicMock()
+ mock_github_integration.return_value = mock_integration
+ mock_integration.get_access_token.return_value.token = 'test_token'
+
+ mock_gh = MagicMock()
+ mock_github.return_value.__enter__.return_value = mock_gh
+ mock_repo = MagicMock()
+ mock_issue = MagicMock()
+ mock_repo.get_issue.return_value = mock_issue
+ mock_gh.get_repo.return_value = mock_repo
+
+ result = await github_callback_processor(
+ conversation_id=conversation_id,
+ callback=event_callback,
+ event=conversation_state_update_event,
+ )
+
+ assert result is not None
+ assert result.status == EventCallbackResultStatus.ERROR
+ assert 'Simulated agent server error' in result.detail
+
+ mock_issue.create_comment.assert_called_once()
+ call_args = mock_issue.create_comment.call_args
+ error_comment = call_args[1].get('body') or call_args[0][0]
+ assert (
+ 'OpenHands encountered an error: **Simulated agent server error**'
+ in error_comment
+ )
+ assert f'conversations/{conversation_id}' in error_comment
+ assert 'for more information.' in error_comment
diff --git a/tests/unit/app_server/test_live_status_app_conversation_service.py b/tests/unit/app_server/test_live_status_app_conversation_service.py
new file mode 100644
index 000000000000..f662f331465d
--- /dev/null
+++ b/tests/unit/app_server/test_live_status_app_conversation_service.py
@@ -0,0 +1,1356 @@
+"""Unit tests for the methods in LiveStatusAppConversationService."""
+
+from unittest.mock import AsyncMock, Mock, patch
+from uuid import UUID, uuid4
+
+import pytest
+
+from openhands.agent_server.models import SendMessageRequest, StartConversationRequest
+from openhands.app_server.app_conversation.app_conversation_models import (
+ AgentType,
+ AppConversationStartRequest,
+)
+from openhands.app_server.app_conversation.live_status_app_conversation_service import (
+ LiveStatusAppConversationService,
+)
+from openhands.app_server.sandbox.sandbox_models import (
+ AGENT_SERVER,
+ ExposedUrl,
+ SandboxInfo,
+ SandboxStatus,
+)
+from openhands.app_server.sandbox.sandbox_spec_models import SandboxSpecInfo
+from openhands.app_server.user.user_context import UserContext
+from openhands.integrations.provider import ProviderType
+from openhands.sdk import Agent
+from openhands.sdk.llm import LLM
+from openhands.sdk.secret import LookupSecret, StaticSecret
+from openhands.sdk.workspace import LocalWorkspace
+from openhands.sdk.workspace.remote.async_remote_workspace import AsyncRemoteWorkspace
+from openhands.server.types import AppMode
+
+
+class TestLiveStatusAppConversationService:
+ """Test cases for the methods in LiveStatusAppConversationService."""
+
+ def setup_method(self):
+ """Set up test fixtures."""
+ # Create mock dependencies
+ self.mock_user_context = Mock(spec=UserContext)
+ self.mock_user_auth = Mock()
+ self.mock_user_context.user_auth = self.mock_user_auth
+ self.mock_jwt_service = Mock()
+ self.mock_sandbox_service = Mock()
+ self.mock_sandbox_spec_service = Mock()
+ self.mock_app_conversation_info_service = Mock()
+ self.mock_app_conversation_start_task_service = Mock()
+ self.mock_event_callback_service = Mock()
+ self.mock_httpx_client = Mock()
+
+ # Create service instance
+ self.service = LiveStatusAppConversationService(
+ init_git_in_empty_workspace=True,
+ user_context=self.mock_user_context,
+ app_conversation_info_service=self.mock_app_conversation_info_service,
+ app_conversation_start_task_service=self.mock_app_conversation_start_task_service,
+ event_callback_service=self.mock_event_callback_service,
+ sandbox_service=self.mock_sandbox_service,
+ sandbox_spec_service=self.mock_sandbox_spec_service,
+ jwt_service=self.mock_jwt_service,
+ sandbox_startup_timeout=30,
+ sandbox_startup_poll_frequency=1,
+ httpx_client=self.mock_httpx_client,
+ web_url='https://test.example.com',
+ openhands_provider_base_url='https://provider.example.com',
+ access_token_hard_timeout=None,
+ app_mode='test',
+ keycloak_auth_cookie=None,
+ )
+
+ # Mock user info
+ self.mock_user = Mock()
+ self.mock_user.id = 'test_user_123'
+ self.mock_user.llm_model = 'gpt-4'
+ self.mock_user.llm_base_url = 'https://api.openai.com/v1'
+ self.mock_user.llm_api_key = 'test_api_key'
+ self.mock_user.confirmation_mode = False
+ self.mock_user.search_api_key = None # Default to None
+ self.mock_user.condenser_max_size = None # Default to None
+ self.mock_user.llm_base_url = 'https://api.openai.com/v1'
+ self.mock_user.mcp_config = None # Default to None to avoid error handling path
+
+ # Mock sandbox
+ self.mock_sandbox = Mock(spec=SandboxInfo)
+ self.mock_sandbox.id = uuid4()
+ self.mock_sandbox.status = SandboxStatus.RUNNING
+
+ @pytest.mark.asyncio
+ async def test_setup_secrets_for_git_providers_no_provider_tokens(self):
+ """Test _setup_secrets_for_git_providers with no provider tokens."""
+ # Arrange
+ base_secrets = {'existing': 'secret'}
+ self.mock_user_context.get_secrets.return_value = base_secrets
+ self.mock_user_context.get_provider_tokens = AsyncMock(return_value=None)
+
+ # Act
+ result = await self.service._setup_secrets_for_git_providers(self.mock_user)
+
+ # Assert
+ assert result == base_secrets
+ self.mock_user_context.get_secrets.assert_called_once()
+ self.mock_user_context.get_provider_tokens.assert_called_once()
+
+ @pytest.mark.asyncio
+ async def test_setup_secrets_for_git_providers_with_web_url(self):
+ """Test _setup_secrets_for_git_providers with web URL (creates access token)."""
+ # Arrange
+ from pydantic import SecretStr
+
+ from openhands.integrations.provider import ProviderToken
+
+ base_secrets = {}
+ self.mock_user_context.get_secrets.return_value = base_secrets
+ self.mock_jwt_service.create_jws_token.return_value = 'test_access_token'
+
+ # Mock provider tokens
+ provider_tokens = {
+ ProviderType.GITHUB: ProviderToken(token=SecretStr('github_token')),
+ ProviderType.GITLAB: ProviderToken(token=SecretStr('gitlab_token')),
+ }
+ self.mock_user_context.get_provider_tokens = AsyncMock(
+ return_value=provider_tokens
+ )
+
+ # Act
+ result = await self.service._setup_secrets_for_git_providers(self.mock_user)
+
+ # Assert
+ assert 'GITHUB_TOKEN' in result
+ assert 'GITLAB_TOKEN' in result
+ assert isinstance(result['GITHUB_TOKEN'], LookupSecret)
+ assert isinstance(result['GITLAB_TOKEN'], LookupSecret)
+ assert (
+ result['GITHUB_TOKEN'].url
+ == 'https://test.example.com/api/v1/webhooks/secrets'
+ )
+ assert result['GITHUB_TOKEN'].headers['X-Access-Token'] == 'test_access_token'
+
+ # Should be called twice, once for each provider
+ assert self.mock_jwt_service.create_jws_token.call_count == 2
+
+ @pytest.mark.asyncio
+ async def test_setup_secrets_for_git_providers_with_saas_mode(self):
+ """Test _setup_secrets_for_git_providers with SaaS mode (includes keycloak cookie)."""
+ # Arrange
+ from pydantic import SecretStr
+
+ from openhands.integrations.provider import ProviderToken
+
+ self.service.app_mode = 'saas'
+ self.service.keycloak_auth_cookie = 'test_cookie'
+ base_secrets = {}
+ self.mock_user_context.get_secrets.return_value = base_secrets
+ self.mock_jwt_service.create_jws_token.return_value = 'test_access_token'
+
+ # Mock provider tokens
+ provider_tokens = {
+ ProviderType.GITLAB: ProviderToken(token=SecretStr('gitlab_token')),
+ }
+ self.mock_user_context.get_provider_tokens = AsyncMock(
+ return_value=provider_tokens
+ )
+
+ # Act
+ result = await self.service._setup_secrets_for_git_providers(self.mock_user)
+
+ # Assert
+ assert 'GITLAB_TOKEN' in result
+ lookup_secret = result['GITLAB_TOKEN']
+ assert isinstance(lookup_secret, LookupSecret)
+ assert 'Cookie' in lookup_secret.headers
+ assert lookup_secret.headers['Cookie'] == 'keycloak_auth=test_cookie'
+
+ @pytest.mark.asyncio
+ async def test_setup_secrets_for_git_providers_without_web_url(self):
+ """Test _setup_secrets_for_git_providers without web URL (uses static token)."""
+ # Arrange
+ from pydantic import SecretStr
+
+ from openhands.integrations.provider import ProviderToken
+
+ self.service.web_url = None
+ base_secrets = {}
+ self.mock_user_context.get_secrets.return_value = base_secrets
+ self.mock_user_context.get_latest_token.return_value = 'static_token_value'
+
+ # Mock provider tokens
+ provider_tokens = {
+ ProviderType.GITHUB: ProviderToken(token=SecretStr('github_token')),
+ }
+ self.mock_user_context.get_provider_tokens = AsyncMock(
+ return_value=provider_tokens
+ )
+
+ # Act
+ result = await self.service._setup_secrets_for_git_providers(self.mock_user)
+
+ # Assert
+ assert 'GITHUB_TOKEN' in result
+ assert isinstance(result['GITHUB_TOKEN'], StaticSecret)
+ assert result['GITHUB_TOKEN'].value.get_secret_value() == 'static_token_value'
+ self.mock_user_context.get_latest_token.assert_called_once_with(
+ ProviderType.GITHUB
+ )
+
+ @pytest.mark.asyncio
+ async def test_setup_secrets_for_git_providers_no_static_token(self):
+ """Test _setup_secrets_for_git_providers when no static token is available."""
+ # Arrange
+ from pydantic import SecretStr
+
+ from openhands.integrations.provider import ProviderToken
+
+ self.service.web_url = None
+ base_secrets = {}
+ self.mock_user_context.get_secrets.return_value = base_secrets
+ self.mock_user_context.get_latest_token.return_value = None
+
+ # Mock provider tokens
+ provider_tokens = {
+ ProviderType.GITHUB: ProviderToken(token=SecretStr('github_token')),
+ }
+ self.mock_user_context.get_provider_tokens = AsyncMock(
+ return_value=provider_tokens
+ )
+
+ # Act
+ result = await self.service._setup_secrets_for_git_providers(self.mock_user)
+
+ # Assert
+ assert 'GITHUB_TOKEN' not in result
+ assert result == base_secrets
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_with_custom_model(self):
+ """Test _configure_llm_and_mcp with custom LLM model."""
+ # Arrange
+ custom_model = 'gpt-3.5-turbo'
+ self.mock_user_context.get_mcp_api_key.return_value = 'mcp_api_key'
+
+ # Act
+ llm, mcp_config = await self.service._configure_llm_and_mcp(
+ self.mock_user, custom_model
+ )
+
+ # Assert
+ assert isinstance(llm, LLM)
+ assert llm.model == custom_model
+ assert llm.base_url == self.mock_user.llm_base_url
+ assert llm.api_key.get_secret_value() == self.mock_user.llm_api_key
+ assert llm.usage_id == 'agent'
+
+ assert 'mcpServers' in mcp_config
+ assert 'default' in mcp_config['mcpServers']
+ assert (
+ mcp_config['mcpServers']['default']['url']
+ == 'https://test.example.com/mcp/mcp'
+ )
+ assert (
+ mcp_config['mcpServers']['default']['headers']['X-Session-API-Key']
+ == 'mcp_api_key'
+ )
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_openhands_model_prefers_user_base_url(self):
+ """openhands/* model uses user.llm_base_url when provided."""
+ # Arrange
+ self.mock_user.llm_model = 'openhands/special'
+ self.mock_user.llm_base_url = 'https://user-llm.example.com'
+ self.mock_user_context.get_mcp_api_key.return_value = None
+
+ # Act
+ llm, _ = await self.service._configure_llm_and_mcp(
+ self.mock_user, self.mock_user.llm_model
+ )
+
+ # Assert
+ assert llm.base_url == 'https://user-llm.example.com'
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_openhands_model_uses_provider_default(self):
+ """openhands/* model falls back to configured provider base URL."""
+ # Arrange
+ self.mock_user.llm_model = 'openhands/default'
+ self.mock_user.llm_base_url = None
+ self.mock_user_context.get_mcp_api_key.return_value = None
+
+ # Act
+ llm, _ = await self.service._configure_llm_and_mcp(
+ self.mock_user, self.mock_user.llm_model
+ )
+
+ # Assert
+ assert llm.base_url == 'https://provider.example.com'
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_openhands_model_no_base_urls(self):
+ """openhands/* model sets base_url to None when no sources available."""
+ # Arrange
+ self.mock_user.llm_model = 'openhands/default'
+ self.mock_user.llm_base_url = None
+ self.service.openhands_provider_base_url = None
+ self.mock_user_context.get_mcp_api_key.return_value = None
+
+ # Act
+ llm, _ = await self.service._configure_llm_and_mcp(
+ self.mock_user, self.mock_user.llm_model
+ )
+
+ # Assert
+ assert llm.base_url == 'https://llm-proxy.app.all-hands.dev/'
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_non_openhands_model_ignores_provider(self):
+ """Non-openhands model ignores provider base URL and uses user base URL."""
+ # Arrange
+ self.mock_user.llm_model = 'gpt-4'
+ self.mock_user.llm_base_url = 'https://user-llm.example.com'
+ self.service.openhands_provider_base_url = 'https://provider.example.com'
+ self.mock_user_context.get_mcp_api_key.return_value = None
+
+ # Act
+ llm, _ = await self.service._configure_llm_and_mcp(self.mock_user, None)
+
+ # Assert
+ assert llm.base_url == 'https://user-llm.example.com'
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_with_user_default_model(self):
+ """Test _configure_llm_and_mcp using user's default model."""
+ # Arrange
+ self.mock_user_context.get_mcp_api_key.return_value = None
+
+ # Act
+ llm, mcp_config = await self.service._configure_llm_and_mcp(
+ self.mock_user, None
+ )
+
+ # Assert
+ assert llm.model == self.mock_user.llm_model
+ assert 'mcpServers' in mcp_config
+ assert 'default' in mcp_config['mcpServers']
+ assert 'headers' not in mcp_config['mcpServers']['default']
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_without_web_url(self):
+ """Test _configure_llm_and_mcp without web URL (no MCP config)."""
+ # Arrange
+ self.service.web_url = None
+
+ # Act
+ llm, mcp_config = await self.service._configure_llm_and_mcp(
+ self.mock_user, None
+ )
+
+ # Assert
+ assert isinstance(llm, LLM)
+ assert mcp_config == {}
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_tavily_with_user_search_api_key(self):
+ """Test _configure_llm_and_mcp adds tavily when user has search_api_key."""
+ # Arrange
+ from pydantic import SecretStr
+
+ self.mock_user.search_api_key = SecretStr('user_search_key')
+ self.mock_user_context.get_mcp_api_key.return_value = 'mcp_api_key'
+
+ # Act
+ llm, mcp_config = await self.service._configure_llm_and_mcp(
+ self.mock_user, None
+ )
+
+ # Assert
+ assert isinstance(llm, LLM)
+ assert 'mcpServers' in mcp_config
+ assert 'default' in mcp_config['mcpServers']
+ assert 'tavily' in mcp_config['mcpServers']
+ assert (
+ mcp_config['mcpServers']['tavily']['url']
+ == 'https://mcp.tavily.com/mcp/?tavilyApiKey=user_search_key'
+ )
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_tavily_with_env_tavily_key(self):
+ """Test _configure_llm_and_mcp adds tavily when service has tavily_api_key."""
+ # Arrange
+ self.service.tavily_api_key = 'env_tavily_key'
+ self.mock_user_context.get_mcp_api_key.return_value = None
+
+ # Act
+ llm, mcp_config = await self.service._configure_llm_and_mcp(
+ self.mock_user, None
+ )
+
+ # Assert
+ assert isinstance(llm, LLM)
+ assert 'mcpServers' in mcp_config
+ assert 'default' in mcp_config['mcpServers']
+ assert 'tavily' in mcp_config['mcpServers']
+ assert (
+ mcp_config['mcpServers']['tavily']['url']
+ == 'https://mcp.tavily.com/mcp/?tavilyApiKey=env_tavily_key'
+ )
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_tavily_user_key_takes_precedence(self):
+ """Test _configure_llm_and_mcp user search_api_key takes precedence over env key."""
+ # Arrange
+ from pydantic import SecretStr
+
+ self.mock_user.search_api_key = SecretStr('user_search_key')
+ self.service.tavily_api_key = 'env_tavily_key'
+ self.mock_user_context.get_mcp_api_key.return_value = None
+
+ # Act
+ llm, mcp_config = await self.service._configure_llm_and_mcp(
+ self.mock_user, None
+ )
+
+ # Assert
+ assert isinstance(llm, LLM)
+ assert 'mcpServers' in mcp_config
+ assert 'tavily' in mcp_config['mcpServers']
+ assert (
+ mcp_config['mcpServers']['tavily']['url']
+ == 'https://mcp.tavily.com/mcp/?tavilyApiKey=user_search_key'
+ )
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_no_tavily_without_keys(self):
+ """Test _configure_llm_and_mcp does not add tavily when no keys are available."""
+ # Arrange
+ self.mock_user.search_api_key = None
+ self.service.tavily_api_key = None
+ self.mock_user_context.get_mcp_api_key.return_value = None
+
+ # Act
+ llm, mcp_config = await self.service._configure_llm_and_mcp(
+ self.mock_user, None
+ )
+
+ # Assert
+ assert isinstance(llm, LLM)
+ assert 'mcpServers' in mcp_config
+ assert 'default' in mcp_config['mcpServers']
+ assert 'tavily' not in mcp_config['mcpServers']
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_saas_mode_no_tavily_without_user_key(self):
+ """Test _configure_llm_and_mcp does not add tavily in SAAS mode without user search_api_key.
+
+ In SAAS mode, the global tavily_api_key should not be passed to the service instance,
+ so tavily should only be added if the user has their own search_api_key.
+ """
+ # Arrange - simulate SAAS mode where no global tavily key is available
+ self.service.app_mode = AppMode.SAAS.value
+ self.service.tavily_api_key = None # In SAAS mode, this should be None
+ self.mock_user.search_api_key = None
+ self.mock_user_context.get_mcp_api_key.return_value = None
+
+ # Act
+ llm, mcp_config = await self.service._configure_llm_and_mcp(
+ self.mock_user, None
+ )
+
+ # Assert
+ assert isinstance(llm, LLM)
+ assert 'mcpServers' in mcp_config
+ assert 'default' in mcp_config['mcpServers']
+ assert 'tavily' not in mcp_config['mcpServers']
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_saas_mode_with_user_search_key(self):
+ """Test _configure_llm_and_mcp adds tavily in SAAS mode when user has search_api_key.
+
+ Even in SAAS mode, if the user has their own search_api_key, tavily should be added.
+ """
+ # Arrange - simulate SAAS mode with user having their own search key
+ from pydantic import SecretStr
+
+ self.service.app_mode = AppMode.SAAS.value
+ self.service.tavily_api_key = None # In SAAS mode, this should be None
+ self.mock_user.search_api_key = SecretStr('user_search_key')
+ self.mock_user_context.get_mcp_api_key.return_value = None
+
+ # Act
+ llm, mcp_config = await self.service._configure_llm_and_mcp(
+ self.mock_user, None
+ )
+
+ # Assert
+ assert isinstance(llm, LLM)
+ assert 'mcpServers' in mcp_config
+ assert 'default' in mcp_config['mcpServers']
+ assert 'tavily' in mcp_config['mcpServers']
+ assert (
+ mcp_config['mcpServers']['tavily']['url']
+ == 'https://mcp.tavily.com/mcp/?tavilyApiKey=user_search_key'
+ )
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_tavily_with_empty_user_search_key(self):
+ """Test _configure_llm_and_mcp handles empty user search_api_key correctly."""
+ # Arrange
+ from pydantic import SecretStr
+
+ self.mock_user.search_api_key = SecretStr('') # Empty string
+ self.service.tavily_api_key = 'env_tavily_key'
+ self.mock_user_context.get_mcp_api_key.return_value = None
+
+ # Act
+ llm, mcp_config = await self.service._configure_llm_and_mcp(
+ self.mock_user, None
+ )
+
+ # Assert
+ assert isinstance(llm, LLM)
+ assert 'mcpServers' in mcp_config
+ assert 'tavily' in mcp_config['mcpServers']
+ # Should fall back to env key since user key is empty
+ assert (
+ mcp_config['mcpServers']['tavily']['url']
+ == 'https://mcp.tavily.com/mcp/?tavilyApiKey=env_tavily_key'
+ )
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_tavily_with_whitespace_user_search_key(self):
+ """Test _configure_llm_and_mcp handles whitespace-only user search_api_key correctly."""
+ # Arrange
+ from pydantic import SecretStr
+
+ self.mock_user.search_api_key = SecretStr(' ') # Whitespace only
+ self.service.tavily_api_key = 'env_tavily_key'
+ self.mock_user_context.get_mcp_api_key.return_value = None
+
+ # Act
+ llm, mcp_config = await self.service._configure_llm_and_mcp(
+ self.mock_user, None
+ )
+
+ # Assert
+ assert isinstance(llm, LLM)
+ assert 'mcpServers' in mcp_config
+ assert 'tavily' in mcp_config['mcpServers']
+ # Should fall back to env key since user key is whitespace only
+ assert (
+ mcp_config['mcpServers']['tavily']['url']
+ == 'https://mcp.tavily.com/mcp/?tavilyApiKey=env_tavily_key'
+ )
+
+ @patch(
+ 'openhands.app_server.app_conversation.live_status_app_conversation_service.get_planning_tools'
+ )
+ @patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.AppConversationServiceBase._create_condenser'
+ )
+ @patch(
+ 'openhands.app_server.app_conversation.live_status_app_conversation_service.format_plan_structure'
+ )
+ def test_create_agent_with_context_planning_agent(
+ self, mock_format_plan, mock_create_condenser, mock_get_tools
+ ):
+ """Test _create_agent_with_context for planning agent type."""
+ # Arrange
+ mock_llm = Mock(spec=LLM)
+ mock_llm.model_copy.return_value = mock_llm
+ mock_get_tools.return_value = []
+ mock_condenser = Mock()
+ mock_create_condenser.return_value = mock_condenser
+ mock_format_plan.return_value = 'test_plan_structure'
+ mcp_config = {'default': {'url': 'test'}}
+ system_message_suffix = 'Test suffix'
+
+ # Act
+ with patch(
+ 'openhands.app_server.app_conversation.live_status_app_conversation_service.Agent'
+ ) as mock_agent_class:
+ mock_agent_instance = Mock()
+ mock_agent_instance.model_copy.return_value = mock_agent_instance
+ mock_agent_class.return_value = mock_agent_instance
+
+ self.service._create_agent_with_context(
+ mock_llm,
+ AgentType.PLAN,
+ system_message_suffix,
+ mcp_config,
+ self.mock_user.condenser_max_size,
+ )
+
+ # Assert
+ mock_agent_class.assert_called_once()
+ call_kwargs = mock_agent_class.call_args[1]
+ assert call_kwargs['llm'] == mock_llm
+ assert call_kwargs['system_prompt_filename'] == 'system_prompt_planning.j2'
+ assert (
+ call_kwargs['system_prompt_kwargs']['plan_structure']
+ == 'test_plan_structure'
+ )
+ assert call_kwargs['mcp_config'] == mcp_config
+ assert call_kwargs['security_analyzer'] is None
+ assert call_kwargs['condenser'] == mock_condenser
+ mock_create_condenser.assert_called_once_with(
+ mock_llm, AgentType.PLAN, self.mock_user.condenser_max_size
+ )
+
+ @patch(
+ 'openhands.app_server.app_conversation.live_status_app_conversation_service.get_default_tools'
+ )
+ @patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base.AppConversationServiceBase._create_condenser'
+ )
+ def test_create_agent_with_context_default_agent(
+ self, mock_create_condenser, mock_get_tools
+ ):
+ """Test _create_agent_with_context for default agent type."""
+ # Arrange
+ mock_llm = Mock(spec=LLM)
+ mock_llm.model_copy.return_value = mock_llm
+ mock_get_tools.return_value = []
+ mock_condenser = Mock()
+ mock_create_condenser.return_value = mock_condenser
+ mcp_config = {'default': {'url': 'test'}}
+
+ # Act
+ with patch(
+ 'openhands.app_server.app_conversation.live_status_app_conversation_service.Agent'
+ ) as mock_agent_class:
+ mock_agent_instance = Mock()
+ mock_agent_instance.model_copy.return_value = mock_agent_instance
+ mock_agent_class.return_value = mock_agent_instance
+
+ self.service._create_agent_with_context(
+ mock_llm,
+ AgentType.DEFAULT,
+ None,
+ mcp_config,
+ self.mock_user.condenser_max_size,
+ )
+
+ # Assert
+ mock_agent_class.assert_called_once()
+ call_kwargs = mock_agent_class.call_args[1]
+ assert call_kwargs['llm'] == mock_llm
+ assert call_kwargs['system_prompt_kwargs']['cli_mode'] is False
+ assert call_kwargs['mcp_config'] == mcp_config
+ assert call_kwargs['condenser'] == mock_condenser
+ mock_get_tools.assert_called_once_with(enable_browser=True)
+ mock_create_condenser.assert_called_once_with(
+ mock_llm, AgentType.DEFAULT, self.mock_user.condenser_max_size
+ )
+
+ @pytest.mark.asyncio
+ @patch(
+ 'openhands.app_server.app_conversation.live_status_app_conversation_service.ExperimentManagerImpl'
+ )
+ async def test_finalize_conversation_request_with_skills(
+ self, mock_experiment_manager
+ ):
+ """Test _finalize_conversation_request with skills loading."""
+ # Arrange
+ mock_agent = Mock(spec=Agent)
+ mock_updated_agent = Mock(spec=Agent)
+ mock_experiment_manager.run_agent_variant_tests__v1.return_value = (
+ mock_updated_agent
+ )
+
+ conversation_id = uuid4()
+ workspace = LocalWorkspace(working_dir='/test')
+ initial_message = Mock(spec=SendMessageRequest)
+ secrets = {'test': StaticSecret(value='secret')}
+ remote_workspace = Mock(spec=AsyncRemoteWorkspace)
+
+ # Mock the skills loading method
+ self.service._load_skills_and_update_agent = AsyncMock(
+ return_value=mock_updated_agent
+ )
+
+ # Act
+ result = await self.service._finalize_conversation_request(
+ mock_agent,
+ conversation_id,
+ self.mock_user,
+ workspace,
+ initial_message,
+ secrets,
+ self.mock_sandbox,
+ remote_workspace,
+ 'test_repo',
+ '/test/dir',
+ )
+
+ # Assert
+ assert isinstance(result, StartConversationRequest)
+ assert result.conversation_id == conversation_id
+ assert result.agent == mock_updated_agent
+ assert result.workspace == workspace
+ assert result.initial_message == initial_message
+ assert result.secrets == secrets
+
+ mock_experiment_manager.run_agent_variant_tests__v1.assert_called_once_with(
+ self.mock_user.id, conversation_id, mock_agent
+ )
+ self.service._load_skills_and_update_agent.assert_called_once_with(
+ self.mock_sandbox,
+ mock_updated_agent,
+ remote_workspace,
+ 'test_repo',
+ '/test/dir',
+ )
+
+ @pytest.mark.asyncio
+ @patch(
+ 'openhands.app_server.app_conversation.live_status_app_conversation_service.ExperimentManagerImpl'
+ )
+ async def test_finalize_conversation_request_without_skills(
+ self, mock_experiment_manager
+ ):
+ """Test _finalize_conversation_request without remote workspace (no skills)."""
+ # Arrange
+ mock_agent = Mock(spec=Agent)
+ mock_updated_agent = Mock(spec=Agent)
+ mock_experiment_manager.run_agent_variant_tests__v1.return_value = (
+ mock_updated_agent
+ )
+
+ workspace = LocalWorkspace(working_dir='/test')
+ secrets = {'test': StaticSecret(value='secret')}
+
+ # Act
+ result = await self.service._finalize_conversation_request(
+ mock_agent,
+ None,
+ self.mock_user,
+ workspace,
+ None,
+ secrets,
+ self.mock_sandbox,
+ None,
+ None,
+ '/test/dir',
+ )
+
+ # Assert
+ assert isinstance(result, StartConversationRequest)
+ assert isinstance(result.conversation_id, UUID)
+ assert result.agent == mock_updated_agent
+ mock_experiment_manager.run_agent_variant_tests__v1.assert_called_once()
+
+ @pytest.mark.asyncio
+ @patch(
+ 'openhands.app_server.app_conversation.live_status_app_conversation_service.ExperimentManagerImpl'
+ )
+ async def test_finalize_conversation_request_skills_loading_fails(
+ self, mock_experiment_manager
+ ):
+ """Test _finalize_conversation_request when skills loading fails."""
+ # Arrange
+ mock_agent = Mock(spec=Agent)
+ mock_updated_agent = Mock(spec=Agent)
+ mock_experiment_manager.run_agent_variant_tests__v1.return_value = (
+ mock_updated_agent
+ )
+
+ workspace = LocalWorkspace(working_dir='/test')
+ secrets = {'test': StaticSecret(value='secret')}
+ remote_workspace = Mock(spec=AsyncRemoteWorkspace)
+
+ # Mock skills loading to raise an exception
+ self.service._load_skills_and_update_agent = AsyncMock(
+ side_effect=Exception('Skills loading failed')
+ )
+
+ # Act
+ with patch(
+ 'openhands.app_server.app_conversation.live_status_app_conversation_service._logger'
+ ) as mock_logger:
+ result = await self.service._finalize_conversation_request(
+ mock_agent,
+ None,
+ self.mock_user,
+ workspace,
+ None,
+ secrets,
+ self.mock_sandbox,
+ remote_workspace,
+ 'test_repo',
+ '/test/dir',
+ )
+
+ # Assert
+ assert isinstance(result, StartConversationRequest)
+ assert (
+ result.agent == mock_updated_agent
+ ) # Should still use the experiment-modified agent
+ mock_logger.warning.assert_called_once()
+
+ @pytest.mark.asyncio
+ async def test_build_start_conversation_request_for_user_integration(self):
+ """Test the main _build_start_conversation_request_for_user method integration."""
+ # Arrange
+ self.mock_user_context.get_user_info.return_value = self.mock_user
+
+ # Mock all the helper methods
+ mock_secrets = {'GITHUB_TOKEN': Mock()}
+ mock_llm = Mock(spec=LLM)
+ mock_mcp_config = {'default': {'url': 'test'}}
+ mock_agent = Mock(spec=Agent)
+ mock_final_request = Mock(spec=StartConversationRequest)
+
+ self.service._setup_secrets_for_git_providers = AsyncMock(
+ return_value=mock_secrets
+ )
+ self.service._configure_llm_and_mcp = AsyncMock(
+ return_value=(mock_llm, mock_mcp_config)
+ )
+ self.service._create_agent_with_context = Mock(return_value=mock_agent)
+ self.service._finalize_conversation_request = AsyncMock(
+ return_value=mock_final_request
+ )
+
+ # Act
+ result = await self.service._build_start_conversation_request_for_user(
+ sandbox=self.mock_sandbox,
+ initial_message=None,
+ system_message_suffix='Test suffix',
+ git_provider=ProviderType.GITHUB,
+ working_dir='/test/dir',
+ agent_type=AgentType.DEFAULT,
+ llm_model='gpt-4',
+ conversation_id=None,
+ remote_workspace=None,
+ selected_repository='test/repo',
+ )
+
+ # Assert
+ assert result == mock_final_request
+
+ self.service._setup_secrets_for_git_providers.assert_called_once_with(
+ self.mock_user
+ )
+ self.service._configure_llm_and_mcp.assert_called_once_with(
+ self.mock_user, 'gpt-4'
+ )
+ self.service._create_agent_with_context.assert_called_once_with(
+ mock_llm,
+ AgentType.DEFAULT,
+ 'Test suffix',
+ mock_mcp_config,
+ self.mock_user.condenser_max_size,
+ secrets=mock_secrets,
+ )
+ self.service._finalize_conversation_request.assert_called_once()
+
+ @pytest.mark.asyncio
+ @patch(
+ 'openhands.app_server.app_conversation.live_status_app_conversation_service.AsyncRemoteWorkspace'
+ )
+ @patch(
+ 'openhands.app_server.app_conversation.live_status_app_conversation_service.ConversationInfo'
+ )
+ async def test_start_app_conversation_default_title_uses_first_five_characters(
+ self, mock_conversation_info_class, mock_remote_workspace_class
+ ):
+ """Test that v1 conversations use first 5 characters of conversation ID for default title."""
+ # Arrange
+ conversation_id = uuid4()
+ conversation_id_hex = conversation_id.hex
+ expected_title = f'Conversation {conversation_id_hex[:5]}'
+
+ # Mock user context
+ self.mock_user_context.get_user_id = AsyncMock(return_value='test_user_123')
+ self.mock_user_context.get_user_info = AsyncMock(return_value=self.mock_user)
+
+ # Mock sandbox and sandbox spec
+ mock_sandbox_spec = Mock(spec=SandboxSpecInfo)
+ mock_sandbox_spec.working_dir = '/test/workspace'
+ self.mock_sandbox.sandbox_spec_id = str(uuid4())
+ self.mock_sandbox.id = str(uuid4()) # Ensure sandbox.id is a string
+ self.mock_sandbox.session_api_key = 'test_session_key'
+ exposed_url = ExposedUrl(
+ name=AGENT_SERVER, url='http://agent-server:8000', port=60000
+ )
+ self.mock_sandbox.exposed_urls = [exposed_url]
+
+ self.mock_sandbox_service.get_sandbox = AsyncMock(
+ return_value=self.mock_sandbox
+ )
+ self.mock_sandbox_spec_service.get_sandbox_spec = AsyncMock(
+ return_value=mock_sandbox_spec
+ )
+
+ # Mock remote workspace
+ mock_remote_workspace = Mock()
+ mock_remote_workspace_class.return_value = mock_remote_workspace
+
+ # Mock the wait for sandbox and setup scripts
+ async def mock_wait_for_sandbox(task):
+ task.sandbox_id = self.mock_sandbox.id
+ yield task
+
+ async def mock_run_setup_scripts(task, sandbox, workspace):
+ yield task
+
+ self.service._wait_for_sandbox_start = mock_wait_for_sandbox
+ self.service.run_setup_scripts = mock_run_setup_scripts
+
+ # Mock build start conversation request
+ mock_agent = Mock(spec=Agent)
+ mock_agent.llm = Mock(spec=LLM)
+ mock_agent.llm.model = 'gpt-4'
+ mock_start_request = Mock(spec=StartConversationRequest)
+ mock_start_request.agent = mock_agent
+ mock_start_request.model_dump.return_value = {'test': 'data'}
+
+ self.service._build_start_conversation_request_for_user = AsyncMock(
+ return_value=mock_start_request
+ )
+
+ # Mock ConversationInfo returned from agent server
+ mock_conversation_info = Mock()
+ mock_conversation_info.id = conversation_id
+ mock_conversation_info_class.model_validate.return_value = (
+ mock_conversation_info
+ )
+
+ # Mock HTTP response from agent server
+ mock_response = Mock()
+ mock_response.json.return_value = {'id': str(conversation_id)}
+ mock_response.raise_for_status = Mock()
+ self.mock_httpx_client.post = AsyncMock(return_value=mock_response)
+
+ # Mock event callback service
+ self.mock_event_callback_service.save_event_callback = AsyncMock()
+
+ # Create request
+ request = AppConversationStartRequest()
+
+ # Act
+ async for task in self.service._start_app_conversation(request):
+ # Consume all tasks to reach the point where title is set
+ pass
+
+ # Assert
+ # Verify that save_app_conversation_info was called with the correct title format
+ self.mock_app_conversation_info_service.save_app_conversation_info.assert_called_once()
+ call_args = (
+ self.mock_app_conversation_info_service.save_app_conversation_info.call_args
+ )
+ saved_info = call_args[0][0] # First positional argument
+
+ assert saved_info.title == expected_title, (
+ f'Expected title to be "{expected_title}" (first 5 chars), '
+ f'but got "{saved_info.title}"'
+ )
+ assert saved_info.id == conversation_id
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_with_custom_sse_servers(self):
+ """Test _configure_llm_and_mcp merges custom SSE servers with UUID-based names."""
+ # Arrange
+
+ from openhands.core.config.mcp_config import MCPConfig, MCPSSEServerConfig
+
+ self.mock_user.mcp_config = MCPConfig(
+ sse_servers=[
+ MCPSSEServerConfig(url='https://linear.app/sse', api_key='linear_key'),
+ MCPSSEServerConfig(url='https://notion.com/sse'),
+ ]
+ )
+ self.mock_user_context.get_mcp_api_key.return_value = None
+
+ # Act
+ llm, mcp_config = await self.service._configure_llm_and_mcp(
+ self.mock_user, None
+ )
+
+ # Assert
+ assert isinstance(llm, LLM)
+ assert 'mcpServers' in mcp_config
+
+ # Should have default server + 2 custom SSE servers
+ mcp_servers = mcp_config['mcpServers']
+ assert 'default' in mcp_servers
+
+ # Find SSE servers (they have sse_ prefix)
+ sse_servers = {k: v for k, v in mcp_servers.items() if k.startswith('sse_')}
+ assert len(sse_servers) == 2
+
+ # Verify SSE server configurations
+ for server_name, server_config in sse_servers.items():
+ assert server_name.startswith('sse_')
+ assert len(server_name) > 4 # Has UUID suffix
+ assert 'url' in server_config
+ assert 'transport' in server_config
+ assert server_config['transport'] == 'sse'
+
+ # Check if this is the Linear server (has headers)
+ if 'headers' in server_config:
+ assert server_config['headers']['Authorization'] == 'Bearer linear_key'
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_with_custom_shttp_servers(self):
+ """Test _configure_llm_and_mcp merges custom SHTTP servers with timeout."""
+ # Arrange
+ from openhands.core.config.mcp_config import MCPConfig, MCPSHTTPServerConfig
+
+ self.mock_user.mcp_config = MCPConfig(
+ shttp_servers=[
+ MCPSHTTPServerConfig(
+ url='https://example.com/mcp',
+ api_key='test_key',
+ timeout=120,
+ )
+ ]
+ )
+ self.mock_user_context.get_mcp_api_key.return_value = None
+
+ # Act
+ llm, mcp_config = await self.service._configure_llm_and_mcp(
+ self.mock_user, None
+ )
+
+ # Assert
+ assert isinstance(llm, LLM)
+ mcp_servers = mcp_config['mcpServers']
+
+ # Find SHTTP servers
+ shttp_servers = {k: v for k, v in mcp_servers.items() if k.startswith('shttp_')}
+ assert len(shttp_servers) == 1
+
+ server_config = list(shttp_servers.values())[0]
+ assert server_config['url'] == 'https://example.com/mcp'
+ assert server_config['transport'] == 'streamable-http'
+ assert server_config['headers']['Authorization'] == 'Bearer test_key'
+ assert server_config['timeout'] == 120
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_with_custom_stdio_servers(self):
+ """Test _configure_llm_and_mcp merges custom STDIO servers with explicit names."""
+ # Arrange
+ from openhands.core.config.mcp_config import MCPConfig, MCPStdioServerConfig
+
+ self.mock_user.mcp_config = MCPConfig(
+ stdio_servers=[
+ MCPStdioServerConfig(
+ name='my-custom-server',
+ command='npx',
+ args=['-y', 'my-package'],
+ env={'API_KEY': 'secret'},
+ )
+ ]
+ )
+ self.mock_user_context.get_mcp_api_key.return_value = None
+
+ # Act
+ llm, mcp_config = await self.service._configure_llm_and_mcp(
+ self.mock_user, None
+ )
+
+ # Assert
+ assert isinstance(llm, LLM)
+ mcp_servers = mcp_config['mcpServers']
+
+ # STDIO server should use its explicit name
+ assert 'my-custom-server' in mcp_servers
+ server_config = mcp_servers['my-custom-server']
+ assert server_config['command'] == 'npx'
+ assert server_config['args'] == ['-y', 'my-package']
+ assert server_config['env'] == {'API_KEY': 'secret'}
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_merges_system_and_custom_servers(self):
+ """Test _configure_llm_and_mcp merges both system and custom MCP servers."""
+ # Arrange
+ from pydantic import SecretStr
+
+ from openhands.core.config.mcp_config import (
+ MCPConfig,
+ MCPSSEServerConfig,
+ MCPStdioServerConfig,
+ )
+
+ self.mock_user.search_api_key = SecretStr('tavily_key')
+ self.mock_user.mcp_config = MCPConfig(
+ sse_servers=[MCPSSEServerConfig(url='https://custom.com/sse')],
+ stdio_servers=[
+ MCPStdioServerConfig(
+ name='custom-stdio', command='node', args=['app.js']
+ )
+ ],
+ )
+ self.mock_user_context.get_mcp_api_key.return_value = 'mcp_api_key'
+
+ # Act
+ llm, mcp_config = await self.service._configure_llm_and_mcp(
+ self.mock_user, None
+ )
+
+ # Assert
+ mcp_servers = mcp_config['mcpServers']
+
+ # Should have system servers
+ assert 'default' in mcp_servers
+ assert 'tavily' in mcp_servers
+
+ # Should have custom SSE server with UUID name
+ sse_servers = [k for k in mcp_servers if k.startswith('sse_')]
+ assert len(sse_servers) == 1
+
+ # Should have custom STDIO server with explicit name
+ assert 'custom-stdio' in mcp_servers
+
+ # Total: default + tavily + 1 SSE + 1 STDIO = 4 servers
+ assert len(mcp_servers) == 4
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_custom_config_error_handling(self):
+ """Test _configure_llm_and_mcp handles errors in custom MCP config gracefully."""
+ # Arrange
+ self.mock_user.mcp_config = Mock()
+ # Simulate error when accessing sse_servers
+ self.mock_user.mcp_config.sse_servers = property(
+ lambda self: (_ for _ in ()).throw(Exception('Config error'))
+ )
+ self.mock_user_context.get_mcp_api_key.return_value = None
+
+ # Act
+ llm, mcp_config = await self.service._configure_llm_and_mcp(
+ self.mock_user, None
+ )
+
+ # Assert - should still return valid config with system servers only
+ assert isinstance(llm, LLM)
+ mcp_servers = mcp_config['mcpServers']
+ assert 'default' in mcp_servers
+ # Custom servers should not be added due to error
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_sdk_format_with_mcpservers_wrapper(self):
+ """Test _configure_llm_and_mcp returns SDK-required format with mcpServers key."""
+ # Arrange
+ self.mock_user_context.get_mcp_api_key.return_value = 'mcp_key'
+
+ # Act
+ llm, mcp_config = await self.service._configure_llm_and_mcp(
+ self.mock_user, None
+ )
+
+ # Assert - SDK expects {'mcpServers': {...}} format
+ assert 'mcpServers' in mcp_config
+ assert isinstance(mcp_config['mcpServers'], dict)
+
+ # Verify structure matches SDK expectations
+ for server_name, server_config in mcp_config['mcpServers'].items():
+ assert isinstance(server_name, str)
+ assert isinstance(server_config, dict)
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_empty_custom_config(self):
+ """Test _configure_llm_and_mcp handles empty custom MCP config."""
+ # Arrange
+ from openhands.core.config.mcp_config import MCPConfig
+
+ self.mock_user.mcp_config = MCPConfig(
+ sse_servers=[], stdio_servers=[], shttp_servers=[]
+ )
+ self.mock_user_context.get_mcp_api_key.return_value = None
+
+ # Act
+ llm, mcp_config = await self.service._configure_llm_and_mcp(
+ self.mock_user, None
+ )
+
+ # Assert
+ mcp_servers = mcp_config['mcpServers']
+ # Should only have system default server
+ assert 'default' in mcp_servers
+ assert len(mcp_servers) == 1
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_sse_server_without_api_key(self):
+ """Test _configure_llm_and_mcp handles SSE servers without API keys."""
+ # Arrange
+ from openhands.core.config.mcp_config import MCPConfig, MCPSSEServerConfig
+
+ self.mock_user.mcp_config = MCPConfig(
+ sse_servers=[MCPSSEServerConfig(url='https://public.com/sse')]
+ )
+ self.mock_user_context.get_mcp_api_key.return_value = None
+
+ # Act
+ llm, mcp_config = await self.service._configure_llm_and_mcp(
+ self.mock_user, None
+ )
+
+ # Assert
+ mcp_servers = mcp_config['mcpServers']
+ sse_servers = {k: v for k, v in mcp_servers.items() if k.startswith('sse_')}
+
+ # Server should exist but without headers
+ assert len(sse_servers) == 1
+ server_config = list(sse_servers.values())[0]
+ assert 'headers' not in server_config
+ assert server_config['url'] == 'https://public.com/sse'
+ assert server_config['transport'] == 'sse'
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_shttp_server_without_timeout(self):
+ """Test _configure_llm_and_mcp handles SHTTP servers without timeout."""
+ # Arrange
+ from openhands.core.config.mcp_config import MCPConfig, MCPSHTTPServerConfig
+
+ self.mock_user.mcp_config = MCPConfig(
+ shttp_servers=[MCPSHTTPServerConfig(url='https://example.com/mcp')]
+ )
+ self.mock_user_context.get_mcp_api_key.return_value = None
+
+ # Act
+ llm, mcp_config = await self.service._configure_llm_and_mcp(
+ self.mock_user, None
+ )
+
+ # Assert
+ mcp_servers = mcp_config['mcpServers']
+ shttp_servers = {k: v for k, v in mcp_servers.items() if k.startswith('shttp_')}
+
+ assert len(shttp_servers) == 1
+ server_config = list(shttp_servers.values())[0]
+ # Timeout should be included even if None (defaults to 60)
+ assert 'timeout' in server_config
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_stdio_server_without_env(self):
+ """Test _configure_llm_and_mcp handles STDIO servers without environment variables."""
+ # Arrange
+ from openhands.core.config.mcp_config import MCPConfig, MCPStdioServerConfig
+
+ self.mock_user.mcp_config = MCPConfig(
+ stdio_servers=[
+ MCPStdioServerConfig(
+ name='simple-server', command='node', args=['app.js']
+ )
+ ]
+ )
+ self.mock_user_context.get_mcp_api_key.return_value = None
+
+ # Act
+ llm, mcp_config = await self.service._configure_llm_and_mcp(
+ self.mock_user, None
+ )
+
+ # Assert
+ mcp_servers = mcp_config['mcpServers']
+ assert 'simple-server' in mcp_servers
+ server_config = mcp_servers['simple-server']
+
+ # Should not have env key if not provided
+ assert 'env' not in server_config
+ assert server_config['command'] == 'node'
+ assert server_config['args'] == ['app.js']
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_multiple_servers_same_type(self):
+ """Test _configure_llm_and_mcp handles multiple custom servers of the same type."""
+ # Arrange
+ from openhands.core.config.mcp_config import MCPConfig, MCPSSEServerConfig
+
+ self.mock_user.mcp_config = MCPConfig(
+ sse_servers=[
+ MCPSSEServerConfig(url='https://server1.com/sse'),
+ MCPSSEServerConfig(url='https://server2.com/sse'),
+ MCPSSEServerConfig(url='https://server3.com/sse'),
+ ]
+ )
+ self.mock_user_context.get_mcp_api_key.return_value = None
+
+ # Act
+ llm, mcp_config = await self.service._configure_llm_and_mcp(
+ self.mock_user, None
+ )
+
+ # Assert
+ mcp_servers = mcp_config['mcpServers']
+ sse_servers = {k: v for k, v in mcp_servers.items() if k.startswith('sse_')}
+
+ # All 3 servers should be present with unique UUID-based names
+ assert len(sse_servers) == 3
+
+ # Verify all have unique names
+ server_names = list(sse_servers.keys())
+ assert len(set(server_names)) == 3 # All names are unique
+
+ # Verify all URLs are preserved
+ urls = [v['url'] for v in sse_servers.values()]
+ assert 'https://server1.com/sse' in urls
+ assert 'https://server2.com/sse' in urls
+ assert 'https://server3.com/sse' in urls
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_mixed_server_types(self):
+ """Test _configure_llm_and_mcp handles all three server types together."""
+ # Arrange
+ from openhands.core.config.mcp_config import (
+ MCPConfig,
+ MCPSHTTPServerConfig,
+ MCPSSEServerConfig,
+ MCPStdioServerConfig,
+ )
+
+ self.mock_user.mcp_config = MCPConfig(
+ sse_servers=[
+ MCPSSEServerConfig(url='https://sse.example.com/sse', api_key='sse_key')
+ ],
+ shttp_servers=[
+ MCPSHTTPServerConfig(url='https://shttp.example.com/mcp', timeout=90)
+ ],
+ stdio_servers=[
+ MCPStdioServerConfig(
+ name='stdio-server',
+ command='npx',
+ args=['mcp-server'],
+ env={'TOKEN': 'value'},
+ )
+ ],
+ )
+ self.mock_user_context.get_mcp_api_key.return_value = None
+
+ # Act
+ llm, mcp_config = await self.service._configure_llm_and_mcp(
+ self.mock_user, None
+ )
+
+ # Assert
+ mcp_servers = mcp_config['mcpServers']
+
+ # Check all server types are present
+ sse_count = len([k for k in mcp_servers if k.startswith('sse_')])
+ shttp_count = len([k for k in mcp_servers if k.startswith('shttp_')])
+ stdio_count = 1 if 'stdio-server' in mcp_servers else 0
+
+ assert sse_count == 1
+ assert shttp_count == 1
+ assert stdio_count == 1
+
+ # Verify each type has correct configuration
+ sse_server = next(v for k, v in mcp_servers.items() if k.startswith('sse_'))
+ assert sse_server['transport'] == 'sse'
+ assert sse_server['headers']['Authorization'] == 'Bearer sse_key'
+
+ shttp_server = next(v for k, v in mcp_servers.items() if k.startswith('shttp_'))
+ assert shttp_server['transport'] == 'streamable-http'
+ assert shttp_server['timeout'] == 90
+
+ stdio_server = mcp_servers['stdio-server']
+ assert stdio_server['command'] == 'npx'
+ assert stdio_server['env'] == {'TOKEN': 'value'}
diff --git a/tests/unit/app_server/test_remote_sandbox_service.py b/tests/unit/app_server/test_remote_sandbox_service.py
index 567ecad2e30a..c70ad7d324a1 100644
--- a/tests/unit/app_server/test_remote_sandbox_service.py
+++ b/tests/unit/app_server/test_remote_sandbox_service.py
@@ -291,9 +291,7 @@ async def test_init_environment_with_web_url(self, remote_sandbox_service):
)
# Verify
- expected_webhook_url = (
- 'https://web.example.com/api/v1/webhooks/test-sandbox-123'
- )
+ expected_webhook_url = 'https://web.example.com/api/v1/webhooks'
assert environment['EXISTING_VAR'] == 'existing_value'
assert environment[WEBHOOK_CALLBACK_VARIABLE] == expected_webhook_url
assert environment[ALLOW_CORS_ORIGINS_VARIABLE] == 'https://web.example.com'
@@ -333,7 +331,7 @@ async def test_to_sandbox_info_with_running_runtime(self, remote_sandbox_service
runtime_data = create_runtime_data(status='running', pod_status='ready')
# Execute
- sandbox_info = await remote_sandbox_service._to_sandbox_info(
+ sandbox_info = remote_sandbox_service._to_sandbox_info(
stored_sandbox, runtime_data
)
@@ -360,7 +358,7 @@ async def test_to_sandbox_info_with_starting_runtime(self, remote_sandbox_servic
runtime_data = create_runtime_data(status='running', pod_status='pending')
# Execute
- sandbox_info = await remote_sandbox_service._to_sandbox_info(
+ sandbox_info = remote_sandbox_service._to_sandbox_info(
stored_sandbox, runtime_data
)
@@ -369,23 +367,6 @@ async def test_to_sandbox_info_with_starting_runtime(self, remote_sandbox_servic
assert sandbox_info.session_api_key == 'test-session-key'
assert sandbox_info.exposed_urls is None
- @pytest.mark.asyncio
- async def test_to_sandbox_info_without_runtime(self, remote_sandbox_service):
- """Test conversion to SandboxInfo without runtime data."""
- # Setup
- stored_sandbox = create_stored_sandbox()
- remote_sandbox_service._get_runtime = AsyncMock(
- side_effect=Exception('Runtime not found')
- )
-
- # Execute
- sandbox_info = await remote_sandbox_service._to_sandbox_info(stored_sandbox)
-
- # Verify
- assert sandbox_info.status == SandboxStatus.MISSING
- assert sandbox_info.session_api_key is None
- assert sandbox_info.exposed_urls is None
-
@pytest.mark.asyncio
async def test_to_sandbox_info_loads_runtime_when_none_provided(
self, remote_sandbox_service
@@ -393,15 +374,12 @@ async def test_to_sandbox_info_loads_runtime_when_none_provided(
"""Test that runtime data is loaded when not provided."""
# Setup
stored_sandbox = create_stored_sandbox()
- runtime_data = create_runtime_data()
- remote_sandbox_service._get_runtime = AsyncMock(return_value=runtime_data)
# Execute
- sandbox_info = await remote_sandbox_service._to_sandbox_info(stored_sandbox)
+ sandbox_info = remote_sandbox_service._to_sandbox_info(stored_sandbox, None)
# Verify
- remote_sandbox_service._get_runtime.assert_called_once_with('test-sandbox-123')
- assert sandbox_info.status == SandboxStatus.RUNNING
+ assert sandbox_info.status == SandboxStatus.MISSING
class TestSandboxLifecycle:
@@ -679,15 +657,18 @@ async def test_search_sandboxes_basic(self, remote_sandbox_service):
mock_result = MagicMock()
mock_result.scalars.return_value = mock_scalars
remote_sandbox_service.db_session.execute = AsyncMock(return_value=mock_result)
- remote_sandbox_service._to_sandbox_info = AsyncMock(
- side_effect=lambda stored: SandboxInfo(
- id=stored.id,
- created_by_user_id=stored.created_by_user_id,
- sandbox_spec_id=stored.sandbox_spec_id,
- status=SandboxStatus.RUNNING,
- session_api_key='test-key',
- created_at=stored.created_at,
- )
+
+ # Mock the batch endpoint response
+ mock_batch_response = MagicMock()
+ mock_batch_response.raise_for_status.return_value = None
+ mock_batch_response.json.return_value = {
+ 'runtimes': [
+ create_runtime_data('sb1'),
+ create_runtime_data('sb2'),
+ ]
+ }
+ remote_sandbox_service.httpx_client.request = AsyncMock(
+ return_value=mock_batch_response
)
# Execute
@@ -699,6 +680,14 @@ async def test_search_sandboxes_basic(self, remote_sandbox_service):
assert result.items[0].id == 'sb1'
assert result.items[1].id == 'sb2'
+ # Verify that the batch endpoint was called
+ remote_sandbox_service.httpx_client.request.assert_called_once_with(
+ 'GET',
+ 'https://api.example.com/sessions/batch',
+ headers={'X-API-Key': 'test-api-key'},
+ params=[('ids', 'sb1'), ('ids', 'sb2')],
+ )
+
@pytest.mark.asyncio
async def test_search_sandboxes_with_pagination(self, remote_sandbox_service):
"""Test sandbox search with pagination."""
@@ -712,15 +701,15 @@ async def test_search_sandboxes_with_pagination(self, remote_sandbox_service):
mock_result = MagicMock()
mock_result.scalars.return_value = mock_scalars
remote_sandbox_service.db_session.execute = AsyncMock(return_value=mock_result)
- remote_sandbox_service._to_sandbox_info = AsyncMock(
- side_effect=lambda stored: SandboxInfo(
- id=stored.id,
- created_by_user_id=stored.created_by_user_id,
- sandbox_spec_id=stored.sandbox_spec_id,
- status=SandboxStatus.RUNNING,
- session_api_key='test-key',
- created_at=stored.created_at,
- )
+
+ # Mock the batch endpoint response
+ mock_batch_response = MagicMock()
+ mock_batch_response.raise_for_status.return_value = None
+ mock_batch_response.json.return_value = {
+ 'runtimes': [create_runtime_data(f'sb{i}') for i in range(6)]
+ }
+ remote_sandbox_service.httpx_client.request = AsyncMock(
+ return_value=mock_batch_response
)
# Execute
@@ -741,15 +730,15 @@ async def test_search_sandboxes_with_page_id(self, remote_sandbox_service):
mock_result = MagicMock()
mock_result.scalars.return_value = mock_scalars
remote_sandbox_service.db_session.execute = AsyncMock(return_value=mock_result)
- remote_sandbox_service._to_sandbox_info = AsyncMock(
- side_effect=lambda stored: SandboxInfo(
- id=stored.id,
- created_by_user_id=stored.created_by_user_id,
- sandbox_spec_id=stored.sandbox_spec_id,
- status=SandboxStatus.RUNNING,
- session_api_key='test-key',
- created_at=stored.created_at,
- )
+
+ # Mock the batch endpoint response
+ mock_batch_response = MagicMock()
+ mock_batch_response.raise_for_status.return_value = None
+ mock_batch_response.json.return_value = {
+ 'runtimes': [create_runtime_data('sb1')]
+ }
+ remote_sandbox_service.httpx_client.request = AsyncMock(
+ return_value=mock_batch_response
)
# Execute
@@ -759,6 +748,76 @@ async def test_search_sandboxes_with_page_id(self, remote_sandbox_service):
# Note: We can't easily verify the exact SQL query, but we can verify the method was called
remote_sandbox_service.db_session.execute.assert_called_once()
+ @pytest.mark.asyncio
+ async def test_get_runtimes_batch_success(self, remote_sandbox_service):
+ """Test successful batch runtime retrieval."""
+ # Setup
+ sandbox_ids = ['sb1', 'sb2', 'sb3']
+ mock_response = MagicMock()
+ mock_response.raise_for_status.return_value = None
+ mock_response.json.return_value = [
+ create_runtime_data('sb1'),
+ create_runtime_data('sb2'),
+ create_runtime_data('sb3'),
+ ]
+ remote_sandbox_service.httpx_client.request = AsyncMock(
+ return_value=mock_response
+ )
+
+ # Execute
+ result = await remote_sandbox_service._get_runtimes_batch(sandbox_ids)
+
+ # Verify
+ assert len(result) == 3
+ assert 'sb1' in result
+ assert 'sb2' in result
+ assert 'sb3' in result
+ assert result['sb1']['session_id'] == 'sb1'
+
+ # Verify the correct API call was made
+ remote_sandbox_service.httpx_client.request.assert_called_once_with(
+ 'GET',
+ 'https://api.example.com/sessions/batch',
+ headers={'X-API-Key': 'test-api-key'},
+ params=[('ids', 'sb1'), ('ids', 'sb2'), ('ids', 'sb3')],
+ )
+
+ @pytest.mark.asyncio
+ async def test_get_runtimes_batch_empty_list(self, remote_sandbox_service):
+ """Test batch runtime retrieval with empty sandbox list."""
+ # Execute
+ result = await remote_sandbox_service._get_runtimes_batch([])
+
+ # Verify
+ assert result == {}
+ # Verify no API call was made
+ remote_sandbox_service.httpx_client.request.assert_not_called()
+
+ @pytest.mark.asyncio
+ async def test_get_runtimes_batch_partial_results(self, remote_sandbox_service):
+ """Test batch runtime retrieval with partial results (some sandboxes not found)."""
+ # Setup
+ sandbox_ids = ['sb1', 'sb2', 'sb3']
+ mock_response = MagicMock()
+ mock_response.raise_for_status.return_value = None
+ mock_response.json.return_value = [
+ create_runtime_data('sb1'),
+ create_runtime_data('sb3'),
+ # sb2 is missing from the response
+ ]
+ remote_sandbox_service.httpx_client.request = AsyncMock(
+ return_value=mock_response
+ )
+
+ # Execute
+ result = await remote_sandbox_service._get_runtimes_batch(sandbox_ids)
+
+ # Verify
+ assert len(result) == 2
+ assert 'sb1' in result
+ assert 'sb2' not in result # Missing from response
+ assert 'sb3' in result
+
@pytest.mark.asyncio
async def test_get_sandbox_exists(self, remote_sandbox_service):
"""Test getting an existing sandbox."""
@@ -767,7 +826,7 @@ async def test_get_sandbox_exists(self, remote_sandbox_service):
remote_sandbox_service._get_stored_sandbox = AsyncMock(
return_value=stored_sandbox
)
- remote_sandbox_service._to_sandbox_info = AsyncMock(
+ remote_sandbox_service._to_sandbox_info = MagicMock(
return_value=SandboxInfo(
id='test-sandbox-123',
created_by_user_id='test-user-123',
diff --git a/tests/unit/app_server/test_sandbox_service.py b/tests/unit/app_server/test_sandbox_service.py
index 9a651318217e..f3eea1d2eaf6 100644
--- a/tests/unit/app_server/test_sandbox_service.py
+++ b/tests/unit/app_server/test_sandbox_service.py
@@ -27,6 +27,7 @@ class MockSandboxService(SandboxService):
def __init__(self):
self.search_sandboxes_mock = AsyncMock()
self.get_sandbox_mock = AsyncMock()
+ self.get_sandbox_by_session_api_key_mock = AsyncMock()
self.start_sandbox_mock = AsyncMock()
self.resume_sandbox_mock = AsyncMock()
self.pause_sandbox_mock = AsyncMock()
@@ -40,6 +41,11 @@ async def search_sandboxes(
async def get_sandbox(self, sandbox_id: str) -> SandboxInfo | None:
return await self.get_sandbox_mock(sandbox_id)
+ async def get_sandbox_by_session_api_key(
+ self, session_api_key: str
+ ) -> SandboxInfo | None:
+ return await self.get_sandbox_by_session_api_key_mock(session_api_key)
+
async def start_sandbox(self, sandbox_spec_id: str | None = None) -> SandboxInfo:
return await self.start_sandbox_mock(sandbox_spec_id)
diff --git a/tests/unit/app_server/test_skill_loader.py b/tests/unit/app_server/test_skill_loader.py
index c9e54ba5a1a5..e4daadfa1485 100644
--- a/tests/unit/app_server/test_skill_loader.py
+++ b/tests/unit/app_server/test_skill_loader.py
@@ -11,15 +11,27 @@
import pytest
from openhands.app_server.app_conversation.skill_loader import (
+ _cleanup_org_repository,
+ _clone_org_repository,
+ _determine_org_repo_path,
_determine_repo_root,
_find_and_load_global_skill_files,
_find_and_load_skill_md_files,
+ _get_org_repository_url,
+ _is_azure_devops_repository,
+ _is_gitlab_repository,
+ _load_skills_from_org_directories,
_load_special_files,
+ _merge_org_skills_with_precedence,
_read_file_from_workspace,
+ _validate_repository_for_org_skills,
load_global_skills,
+ load_org_skills,
load_repo_skills,
merge_skills,
)
+from openhands.integrations.provider import ProviderType
+from openhands.integrations.service_types import AuthenticationError
# ===== Test Fixtures =====
@@ -667,6 +679,669 @@ def test_merge_skills_mixed_empty_and_filled(self):
assert len(result) == 2
+# ===== Tests for Organization Skills Functions =====
+
+
+class TestIsGitlabRepository:
+ """Test _is_gitlab_repository helper function."""
+
+ @pytest.mark.asyncio
+ async def test_is_gitlab_repository_true(self):
+ """Test GitLab repository detection returns True."""
+ # Arrange
+ mock_user_context = AsyncMock()
+ mock_provider_handler = AsyncMock()
+ mock_repository = Mock()
+ mock_repository.git_provider = ProviderType.GITLAB
+
+ mock_user_context.get_provider_handler.return_value = mock_provider_handler
+ mock_provider_handler.verify_repo_provider.return_value = mock_repository
+
+ # Act
+ result = await _is_gitlab_repository('owner/repo', mock_user_context)
+
+ # Assert
+ assert result is True
+ mock_provider_handler.verify_repo_provider.assert_called_once_with('owner/repo')
+
+ @pytest.mark.asyncio
+ async def test_is_gitlab_repository_false(self):
+ """Test non-GitLab repository detection returns False."""
+ # Arrange
+ mock_user_context = AsyncMock()
+ mock_provider_handler = AsyncMock()
+ mock_repository = Mock()
+ mock_repository.git_provider = ProviderType.GITHUB
+
+ mock_user_context.get_provider_handler.return_value = mock_provider_handler
+ mock_provider_handler.verify_repo_provider.return_value = mock_repository
+
+ # Act
+ result = await _is_gitlab_repository('owner/repo', mock_user_context)
+
+ # Assert
+ assert result is False
+
+ @pytest.mark.asyncio
+ async def test_is_gitlab_repository_exception_handling(self):
+ """Test exception handling returns False."""
+ # Arrange
+ mock_user_context = AsyncMock()
+ mock_user_context.get_provider_handler.side_effect = Exception('API error')
+
+ # Act
+ result = await _is_gitlab_repository('owner/repo', mock_user_context)
+
+ # Assert
+ assert result is False
+
+
+class TestIsAzureDevOpsRepository:
+ """Test _is_azure_devops_repository helper function."""
+
+ @pytest.mark.asyncio
+ async def test_is_azure_devops_repository_true(self):
+ """Test Azure DevOps repository detection returns True."""
+ # Arrange
+ mock_user_context = AsyncMock()
+ mock_provider_handler = AsyncMock()
+ mock_repository = Mock()
+ mock_repository.git_provider = ProviderType.AZURE_DEVOPS
+
+ mock_user_context.get_provider_handler.return_value = mock_provider_handler
+ mock_provider_handler.verify_repo_provider.return_value = mock_repository
+
+ # Act
+ result = await _is_azure_devops_repository(
+ 'org/project/repo', mock_user_context
+ )
+
+ # Assert
+ assert result is True
+ mock_provider_handler.verify_repo_provider.assert_called_once_with(
+ 'org/project/repo'
+ )
+
+ @pytest.mark.asyncio
+ async def test_is_azure_devops_repository_false(self):
+ """Test non-Azure DevOps repository detection returns False."""
+ # Arrange
+ mock_user_context = AsyncMock()
+ mock_provider_handler = AsyncMock()
+ mock_repository = Mock()
+ mock_repository.git_provider = ProviderType.GITHUB
+
+ mock_user_context.get_provider_handler.return_value = mock_provider_handler
+ mock_provider_handler.verify_repo_provider.return_value = mock_repository
+
+ # Act
+ result = await _is_azure_devops_repository('owner/repo', mock_user_context)
+
+ # Assert
+ assert result is False
+
+ @pytest.mark.asyncio
+ async def test_is_azure_devops_repository_exception_handling(self):
+ """Test exception handling returns False."""
+ # Arrange
+ mock_user_context = AsyncMock()
+ mock_user_context.get_provider_handler.side_effect = Exception('Network error')
+
+ # Act
+ result = await _is_azure_devops_repository('owner/repo', mock_user_context)
+
+ # Assert
+ assert result is False
+
+
+class TestDetermineOrgRepoPath:
+ """Test _determine_org_repo_path helper function."""
+
+ @pytest.mark.asyncio
+ @patch('openhands.app_server.app_conversation.skill_loader._is_gitlab_repository')
+ @patch(
+ 'openhands.app_server.app_conversation.skill_loader._is_azure_devops_repository'
+ )
+ async def test_github_repository_path(self, mock_is_azure, mock_is_gitlab):
+ """Test org path for GitHub repository."""
+ # Arrange
+ mock_user_context = AsyncMock()
+ mock_is_gitlab.return_value = False
+ mock_is_azure.return_value = False
+
+ # Act
+ org_repo, org_name = await _determine_org_repo_path(
+ 'owner/repo', mock_user_context
+ )
+
+ # Assert
+ assert org_repo == 'owner/.openhands'
+ assert org_name == 'owner'
+
+ @pytest.mark.asyncio
+ @patch('openhands.app_server.app_conversation.skill_loader._is_gitlab_repository')
+ @patch(
+ 'openhands.app_server.app_conversation.skill_loader._is_azure_devops_repository'
+ )
+ async def test_gitlab_repository_path(self, mock_is_azure, mock_is_gitlab):
+ """Test org path for GitLab repository."""
+ # Arrange
+ mock_user_context = AsyncMock()
+ mock_is_gitlab.return_value = True
+ mock_is_azure.return_value = False
+
+ # Act
+ org_repo, org_name = await _determine_org_repo_path(
+ 'owner/repo', mock_user_context
+ )
+
+ # Assert
+ assert org_repo == 'owner/openhands-config'
+ assert org_name == 'owner'
+
+ @pytest.mark.asyncio
+ @patch('openhands.app_server.app_conversation.skill_loader._is_gitlab_repository')
+ @patch(
+ 'openhands.app_server.app_conversation.skill_loader._is_azure_devops_repository'
+ )
+ async def test_azure_devops_repository_path(self, mock_is_azure, mock_is_gitlab):
+ """Test org path for Azure DevOps repository."""
+ # Arrange
+ mock_user_context = AsyncMock()
+ mock_is_gitlab.return_value = False
+ mock_is_azure.return_value = True
+
+ # Act
+ org_repo, org_name = await _determine_org_repo_path(
+ 'org/project/repo', mock_user_context
+ )
+
+ # Assert
+ assert org_repo == 'org/openhands-config/openhands-config'
+ assert org_name == 'org'
+
+
+class TestValidateRepositoryForOrgSkills:
+ """Test _validate_repository_for_org_skills helper function."""
+
+ def test_valid_repository_two_parts(self):
+ """Test validation passes for repository with two parts."""
+ # Act
+ result = _validate_repository_for_org_skills('owner/repo')
+
+ # Assert
+ assert result is True
+
+ def test_valid_repository_three_parts(self):
+ """Test validation passes for repository with three parts (Azure DevOps)."""
+ # Act
+ result = _validate_repository_for_org_skills('org/project/repo')
+
+ # Assert
+ assert result is True
+
+ def test_invalid_repository_one_part(self):
+ """Test validation fails for repository with only one part."""
+ # Act
+ result = _validate_repository_for_org_skills('repo')
+
+ # Assert
+ assert result is False
+
+ def test_invalid_repository_empty_string(self):
+ """Test validation fails for empty string."""
+ # Act
+ result = _validate_repository_for_org_skills('')
+
+ # Assert
+ assert result is False
+
+
+class TestGetOrgRepositoryUrl:
+ """Test _get_org_repository_url helper function."""
+
+ @pytest.mark.asyncio
+ async def test_successful_url_retrieval(self):
+ """Test successfully retrieving authenticated URL."""
+ # Arrange
+ mock_user_context = AsyncMock()
+ expected_url = 'https://token@github.com/owner/.openhands.git'
+ mock_user_context.get_authenticated_git_url.return_value = expected_url
+
+ # Act
+ result = await _get_org_repository_url('owner/.openhands', mock_user_context)
+
+ # Assert
+ assert result == expected_url
+ mock_user_context.get_authenticated_git_url.assert_called_once_with(
+ 'owner/.openhands'
+ )
+
+ @pytest.mark.asyncio
+ async def test_authentication_error(self):
+ """Test handling of authentication error returns None."""
+ # Arrange
+ mock_user_context = AsyncMock()
+ mock_user_context.get_authenticated_git_url.side_effect = AuthenticationError(
+ 'Not found'
+ )
+
+ # Act
+ result = await _get_org_repository_url('owner/.openhands', mock_user_context)
+
+ # Assert
+ assert result is None
+
+ @pytest.mark.asyncio
+ async def test_general_exception(self):
+ """Test handling of general exception returns None."""
+ # Arrange
+ mock_user_context = AsyncMock()
+ mock_user_context.get_authenticated_git_url.side_effect = Exception(
+ 'Network error'
+ )
+
+ # Act
+ result = await _get_org_repository_url('owner/.openhands', mock_user_context)
+
+ # Assert
+ assert result is None
+
+
+class TestCloneOrgRepository:
+ """Test _clone_org_repository helper function."""
+
+ @pytest.mark.asyncio
+ async def test_successful_clone(self, mock_async_remote_workspace):
+ """Test successful repository clone."""
+ # Arrange
+ result_obj = Mock()
+ result_obj.exit_code = 0
+ mock_async_remote_workspace.execute_command.return_value = result_obj
+
+ # Act
+ success = await _clone_org_repository(
+ mock_async_remote_workspace,
+ 'https://github.com/owner/.openhands.git',
+ '/workspace/_org_openhands_owner',
+ '/workspace',
+ 'owner/.openhands',
+ )
+
+ # Assert
+ assert success is True
+ mock_async_remote_workspace.execute_command.assert_called_once()
+ call_args = mock_async_remote_workspace.execute_command.call_args
+ assert 'git clone' in call_args[0][0]
+ assert '--depth 1' in call_args[0][0]
+
+ @pytest.mark.asyncio
+ async def test_failed_clone(self, mock_async_remote_workspace):
+ """Test failed repository clone."""
+ # Arrange
+ result_obj = Mock()
+ result_obj.exit_code = 1
+ result_obj.stderr = 'Repository not found'
+ mock_async_remote_workspace.execute_command.return_value = result_obj
+
+ # Act
+ success = await _clone_org_repository(
+ mock_async_remote_workspace,
+ 'https://github.com/owner/.openhands.git',
+ '/workspace/_org_openhands_owner',
+ '/workspace',
+ 'owner/.openhands',
+ )
+
+ # Assert
+ assert success is False
+
+
+class TestLoadSkillsFromOrgDirectories:
+ """Test _load_skills_from_org_directories helper function."""
+
+ @pytest.mark.asyncio
+ @patch(
+ 'openhands.app_server.app_conversation.skill_loader._find_and_load_skill_md_files'
+ )
+ async def test_load_from_both_directories(
+ self, mock_find_and_load, mock_async_remote_workspace, mock_skills_list
+ ):
+ """Test loading skills from both skills/ and microagents/ directories."""
+ # Arrange
+ skills_dir_skills = [mock_skills_list[0]]
+ microagents_dir_skills = [mock_skills_list[1], mock_skills_list[2]]
+ mock_find_and_load.side_effect = [skills_dir_skills, microagents_dir_skills]
+
+ # Act
+ result_skills, result_microagents = await _load_skills_from_org_directories(
+ mock_async_remote_workspace, '/workspace/_org_openhands_owner', '/workspace'
+ )
+
+ # Assert
+ assert result_skills == skills_dir_skills
+ assert result_microagents == microagents_dir_skills
+ assert mock_find_and_load.call_count == 2
+
+ # Verify correct directories were checked
+ first_call = mock_find_and_load.call_args_list[0]
+ second_call = mock_find_and_load.call_args_list[1]
+ assert '/skills' in first_call[0][1]
+ assert '/microagents' in second_call[0][1]
+
+ @pytest.mark.asyncio
+ @patch(
+ 'openhands.app_server.app_conversation.skill_loader._find_and_load_skill_md_files'
+ )
+ async def test_load_with_empty_directories(
+ self, mock_find_and_load, mock_async_remote_workspace
+ ):
+ """Test loading when both directories are empty."""
+ # Arrange
+ mock_find_and_load.side_effect = [[], []]
+
+ # Act
+ result_skills, result_microagents = await _load_skills_from_org_directories(
+ mock_async_remote_workspace, '/workspace/_org_openhands_owner', '/workspace'
+ )
+
+ # Assert
+ assert result_skills == []
+ assert result_microagents == []
+
+
+class TestMergeOrgSkillsWithPrecedence:
+ """Test _merge_org_skills_with_precedence helper function."""
+
+ def test_merge_no_duplicates(self, mock_skills_list):
+ """Test merging skills with no name conflicts."""
+ # Arrange
+ skills_dir_skills = [mock_skills_list[0]]
+ microagents_dir_skills = [mock_skills_list[1], mock_skills_list[2]]
+
+ # Act
+ result = _merge_org_skills_with_precedence(
+ skills_dir_skills, microagents_dir_skills
+ )
+
+ # Assert
+ assert len(result) == 3
+ names = {s.name for s in result}
+ assert names == {'skill_0', 'skill_1', 'skill_2'}
+
+ def test_merge_with_duplicate_skills_dir_wins(self):
+ """Test skills/ directory takes precedence over microagents/."""
+ # Arrange
+ skill_from_microagents = Mock()
+ skill_from_microagents.name = 'common_skill'
+ skill_from_microagents.source = 'microagents'
+
+ skill_from_skills = Mock()
+ skill_from_skills.name = 'common_skill'
+ skill_from_skills.source = 'skills'
+
+ # Act
+ result = _merge_org_skills_with_precedence(
+ [skill_from_skills], [skill_from_microagents]
+ )
+
+ # Assert
+ assert len(result) == 1
+ assert result[0].source == 'skills'
+
+ def test_merge_with_empty_lists(self):
+ """Test merging with empty skill lists."""
+ # Act
+ result = _merge_org_skills_with_precedence([], [])
+
+ # Assert
+ assert result == []
+
+ def test_merge_with_only_skills_dir(self, mock_skills_list):
+ """Test merging with only skills/ directory populated."""
+ # Act
+ result = _merge_org_skills_with_precedence([mock_skills_list[0]], [])
+
+ # Assert
+ assert len(result) == 1
+ assert result[0] == mock_skills_list[0]
+
+ def test_merge_with_only_microagents_dir(self, mock_skills_list):
+ """Test merging with only microagents/ directory populated."""
+ # Act
+ result = _merge_org_skills_with_precedence([], [mock_skills_list[0]])
+
+ # Assert
+ assert len(result) == 1
+ assert result[0] == mock_skills_list[0]
+
+
+class TestCleanupOrgRepository:
+ """Test _cleanup_org_repository helper function."""
+
+ @pytest.mark.asyncio
+ async def test_cleanup_successful(self, mock_async_remote_workspace):
+ """Test successful cleanup of org repository directory."""
+ # Arrange
+ result_obj = Mock()
+ result_obj.exit_code = 0
+ mock_async_remote_workspace.execute_command.return_value = result_obj
+
+ # Act
+ await _cleanup_org_repository(
+ mock_async_remote_workspace,
+ '/workspace/_org_openhands_owner',
+ '/workspace',
+ )
+
+ # Assert
+ mock_async_remote_workspace.execute_command.assert_called_once()
+ call_args = mock_async_remote_workspace.execute_command.call_args
+ assert 'rm -rf' in call_args[0][0]
+ assert '/workspace/_org_openhands_owner' in call_args[0][0]
+
+
+class TestLoadOrgSkills:
+ """Test load_org_skills main function."""
+
+ @pytest.mark.asyncio
+ async def test_load_org_skills_no_selected_repository(
+ self, mock_async_remote_workspace
+ ):
+ """Test load_org_skills returns empty list when no repository selected."""
+ # Arrange
+ mock_user_context = AsyncMock()
+
+ # Act
+ result = await load_org_skills(
+ mock_async_remote_workspace, None, '/workspace', mock_user_context
+ )
+
+ # Assert
+ assert result == []
+
+ @pytest.mark.asyncio
+ @patch(
+ 'openhands.app_server.app_conversation.skill_loader._validate_repository_for_org_skills'
+ )
+ async def test_load_org_skills_invalid_repository(
+ self, mock_validate, mock_async_remote_workspace
+ ):
+ """Test load_org_skills returns empty list for invalid repository."""
+ # Arrange
+ mock_validate.return_value = False
+ mock_user_context = AsyncMock()
+
+ # Act
+ result = await load_org_skills(
+ mock_async_remote_workspace, 'invalid', '/workspace', mock_user_context
+ )
+
+ # Assert
+ assert result == []
+ mock_validate.assert_called_once_with('invalid')
+
+ @pytest.mark.asyncio
+ @patch(
+ 'openhands.app_server.app_conversation.skill_loader._validate_repository_for_org_skills'
+ )
+ @patch(
+ 'openhands.app_server.app_conversation.skill_loader._determine_org_repo_path'
+ )
+ @patch('openhands.app_server.app_conversation.skill_loader._get_org_repository_url')
+ async def test_load_org_skills_no_url_available(
+ self,
+ mock_get_url,
+ mock_determine_path,
+ mock_validate,
+ mock_async_remote_workspace,
+ ):
+ """Test load_org_skills returns empty list when URL cannot be retrieved."""
+ # Arrange
+ mock_validate.return_value = True
+ mock_determine_path.return_value = ('owner/.openhands', 'owner')
+ mock_get_url.return_value = None
+ mock_user_context = AsyncMock()
+
+ # Act
+ result = await load_org_skills(
+ mock_async_remote_workspace,
+ 'owner/repo',
+ '/workspace',
+ mock_user_context,
+ )
+
+ # Assert
+ assert result == []
+
+ @pytest.mark.asyncio
+ @patch(
+ 'openhands.app_server.app_conversation.skill_loader._validate_repository_for_org_skills'
+ )
+ @patch(
+ 'openhands.app_server.app_conversation.skill_loader._determine_org_repo_path'
+ )
+ @patch('openhands.app_server.app_conversation.skill_loader._get_org_repository_url')
+ @patch('openhands.app_server.app_conversation.skill_loader._clone_org_repository')
+ async def test_load_org_skills_clone_fails(
+ self,
+ mock_clone,
+ mock_get_url,
+ mock_determine_path,
+ mock_validate,
+ mock_async_remote_workspace,
+ ):
+ """Test load_org_skills returns empty list when clone fails."""
+ # Arrange
+ mock_validate.return_value = True
+ mock_determine_path.return_value = ('owner/.openhands', 'owner')
+ mock_get_url.return_value = 'https://github.com/owner/.openhands.git'
+ mock_clone.return_value = False
+ mock_user_context = AsyncMock()
+
+ # Act
+ result = await load_org_skills(
+ mock_async_remote_workspace,
+ 'owner/repo',
+ '/workspace',
+ mock_user_context,
+ )
+
+ # Assert
+ assert result == []
+
+ @pytest.mark.asyncio
+ @patch(
+ 'openhands.app_server.app_conversation.skill_loader._validate_repository_for_org_skills'
+ )
+ @patch(
+ 'openhands.app_server.app_conversation.skill_loader._determine_org_repo_path'
+ )
+ @patch('openhands.app_server.app_conversation.skill_loader._get_org_repository_url')
+ @patch('openhands.app_server.app_conversation.skill_loader._clone_org_repository')
+ @patch(
+ 'openhands.app_server.app_conversation.skill_loader._load_skills_from_org_directories'
+ )
+ @patch('openhands.app_server.app_conversation.skill_loader._cleanup_org_repository')
+ async def test_load_org_skills_success(
+ self,
+ mock_cleanup,
+ mock_load_skills,
+ mock_clone,
+ mock_get_url,
+ mock_determine_path,
+ mock_validate,
+ mock_async_remote_workspace,
+ mock_skills_list,
+ ):
+ """Test successful org skills loading."""
+ # Arrange
+ mock_validate.return_value = True
+ mock_determine_path.return_value = ('owner/.openhands', 'owner')
+ mock_get_url.return_value = 'https://github.com/owner/.openhands.git'
+ mock_clone.return_value = True
+ mock_load_skills.return_value = ([mock_skills_list[0]], [mock_skills_list[1]])
+ mock_user_context = AsyncMock()
+
+ # Act
+ result = await load_org_skills(
+ mock_async_remote_workspace,
+ 'owner/repo',
+ '/workspace',
+ mock_user_context,
+ )
+
+ # Assert
+ assert len(result) == 2
+ mock_cleanup.assert_called_once()
+
+ @pytest.mark.asyncio
+ @patch(
+ 'openhands.app_server.app_conversation.skill_loader._validate_repository_for_org_skills'
+ )
+ async def test_load_org_skills_handles_authentication_error(
+ self, mock_validate, mock_async_remote_workspace
+ ):
+ """Test load_org_skills handles AuthenticationError gracefully."""
+ # Arrange
+ mock_validate.side_effect = AuthenticationError('Auth failed')
+ mock_user_context = AsyncMock()
+
+ # Act
+ result = await load_org_skills(
+ mock_async_remote_workspace,
+ 'owner/repo',
+ '/workspace',
+ mock_user_context,
+ )
+
+ # Assert
+ assert result == []
+
+ @pytest.mark.asyncio
+ @patch(
+ 'openhands.app_server.app_conversation.skill_loader._validate_repository_for_org_skills'
+ )
+ async def test_load_org_skills_handles_general_exception(
+ self, mock_validate, mock_async_remote_workspace
+ ):
+ """Test load_org_skills handles general exceptions gracefully."""
+ # Arrange
+ mock_validate.side_effect = Exception('Unexpected error')
+ mock_user_context = AsyncMock()
+
+ # Act
+ result = await load_org_skills(
+ mock_async_remote_workspace,
+ 'owner/repo',
+ '/workspace',
+ mock_user_context,
+ )
+
+ # Assert
+ assert result == []
+
+
# ===== Integration Tests =====
@@ -754,3 +1429,110 @@ async def test_loading_with_override_precedence(
# Should have only one skill with repo source (highest precedence)
assert len(all_skills) == 1
assert all_skills[0].source == 'repo'
+
+ @pytest.mark.asyncio
+ @patch('openhands.app_server.app_conversation.skill_loader.load_global_skills')
+ @patch('openhands.sdk.context.skills.load_user_skills')
+ @patch('openhands.app_server.app_conversation.skill_loader.load_org_skills')
+ @patch('openhands.app_server.app_conversation.skill_loader.load_repo_skills')
+ async def test_loading_with_org_skills_precedence(
+ self,
+ mock_load_repo,
+ mock_load_org,
+ mock_load_user,
+ mock_load_global,
+ mock_async_remote_workspace,
+ ):
+ """Test that org skills fit correctly in precedence order."""
+ # Arrange
+ # Create skills with same name but different sources
+ global_skill = Mock()
+ global_skill.name = 'shared_skill'
+ global_skill.priority = 'low'
+
+ user_skill = Mock()
+ user_skill.name = 'shared_skill'
+ user_skill.priority = 'medium'
+
+ org_skill = Mock()
+ org_skill.name = 'shared_skill'
+ org_skill.priority = 'high'
+
+ repo_skill = Mock()
+ repo_skill.name = 'shared_skill'
+ repo_skill.priority = 'highest'
+
+ mock_load_global.return_value = [global_skill]
+ mock_load_user.return_value = [user_skill]
+ mock_load_org.return_value = [org_skill]
+ mock_load_repo.return_value = [repo_skill]
+
+ mock_user_context = AsyncMock()
+
+ # Act
+ global_skills = mock_load_global()
+ user_skills = mock_load_user()
+ org_skills = await mock_load_org(
+ mock_async_remote_workspace, 'owner/repo', '/workspace', mock_user_context
+ )
+ repo_skills = await mock_load_repo(
+ mock_async_remote_workspace, 'owner/repo', '/workspace'
+ )
+
+ # Merge with correct precedence: global < user < org < repo
+ all_skills = merge_skills([global_skills, user_skills, org_skills, repo_skills])
+
+ # Assert
+ assert len(all_skills) == 1
+ assert all_skills[0].priority == 'highest' # Repo has highest precedence
+
+ @pytest.mark.asyncio
+ @patch('openhands.app_server.app_conversation.skill_loader.load_global_skills')
+ @patch('openhands.sdk.context.skills.load_user_skills')
+ @patch('openhands.app_server.app_conversation.skill_loader.load_org_skills')
+ @patch('openhands.app_server.app_conversation.skill_loader.load_repo_skills')
+ async def test_loading_org_skills_with_unique_names(
+ self,
+ mock_load_repo,
+ mock_load_org,
+ mock_load_user,
+ mock_load_global,
+ mock_async_remote_workspace,
+ ):
+ """Test loading org skills with unique names alongside other sources."""
+ # Arrange
+ global_skill = Mock()
+ global_skill.name = 'global_skill'
+
+ user_skill = Mock()
+ user_skill.name = 'user_skill'
+
+ org_skill = Mock()
+ org_skill.name = 'org_skill'
+
+ repo_skill = Mock()
+ repo_skill.name = 'repo_skill'
+
+ mock_load_global.return_value = [global_skill]
+ mock_load_user.return_value = [user_skill]
+ mock_load_org.return_value = [org_skill]
+ mock_load_repo.return_value = [repo_skill]
+
+ mock_user_context = AsyncMock()
+
+ # Act
+ global_skills = mock_load_global()
+ user_skills = mock_load_user()
+ org_skills = await mock_load_org(
+ mock_async_remote_workspace, 'owner/repo', '/workspace', mock_user_context
+ )
+ repo_skills = await mock_load_repo(
+ mock_async_remote_workspace, 'owner/repo', '/workspace'
+ )
+
+ all_skills = merge_skills([global_skills, user_skills, org_skills, repo_skills])
+
+ # Assert
+ assert len(all_skills) == 4
+ names = {s.name for s in all_skills}
+ assert names == {'global_skill', 'user_skill', 'org_skill', 'repo_skill'}
diff --git a/tests/unit/app_server/test_webhook_router_stats.py b/tests/unit/app_server/test_webhook_router_stats.py
new file mode 100644
index 000000000000..ba5664a196b7
--- /dev/null
+++ b/tests/unit/app_server/test_webhook_router_stats.py
@@ -0,0 +1,615 @@
+"""Tests for stats event processing in webhook_router.
+
+This module tests the stats event processing functionality introduced for
+updating conversation statistics from ConversationStateUpdateEvent events.
+"""
+
+from datetime import datetime, timezone
+from typing import AsyncGenerator
+from unittest.mock import AsyncMock, MagicMock, patch
+from uuid import uuid4
+
+import pytest
+from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
+from sqlalchemy.pool import StaticPool
+
+from openhands.app_server.app_conversation.app_conversation_models import (
+ AppConversationInfo,
+)
+from openhands.app_server.app_conversation.sql_app_conversation_info_service import (
+ SQLAppConversationInfoService,
+ StoredConversationMetadata,
+)
+from openhands.app_server.user.specifiy_user_context import SpecifyUserContext
+from openhands.app_server.utils.sql_utils import Base
+from openhands.sdk.conversation.conversation_stats import ConversationStats
+from openhands.sdk.event import ConversationStateUpdateEvent
+from openhands.sdk.llm.utils.metrics import Metrics, TokenUsage
+
+# ---------------------------------------------------------------------------
+# Fixtures
+# ---------------------------------------------------------------------------
+
+
+@pytest.fixture
+async def async_engine():
+ """Create an async SQLite engine for testing."""
+ engine = create_async_engine(
+ 'sqlite+aiosqlite:///:memory:',
+ poolclass=StaticPool,
+ connect_args={'check_same_thread': False},
+ echo=False,
+ )
+
+ # Create all tables
+ async with engine.begin() as conn:
+ await conn.run_sync(Base.metadata.create_all)
+
+ yield engine
+
+ await engine.dispose()
+
+
+@pytest.fixture
+async def async_session(async_engine) -> AsyncGenerator[AsyncSession, None]:
+ """Create an async session for testing."""
+ async_session_maker = async_sessionmaker(
+ async_engine, class_=AsyncSession, expire_on_commit=False
+ )
+
+ async with async_session_maker() as db_session:
+ yield db_session
+
+
+@pytest.fixture
+def service(async_session) -> SQLAppConversationInfoService:
+ """Create a SQLAppConversationInfoService instance for testing."""
+ return SQLAppConversationInfoService(
+ db_session=async_session, user_context=SpecifyUserContext(user_id=None)
+ )
+
+
+@pytest.fixture
+async def v1_conversation_metadata(async_session, service):
+ """Create a V1 conversation metadata record for testing."""
+ conversation_id = uuid4()
+ stored = StoredConversationMetadata(
+ conversation_id=str(conversation_id),
+ user_id='test_user_123',
+ sandbox_id='sandbox_123',
+ conversation_version='V1',
+ title='Test Conversation',
+ accumulated_cost=0.0,
+ prompt_tokens=0,
+ completion_tokens=0,
+ cache_read_tokens=0,
+ cache_write_tokens=0,
+ reasoning_tokens=0,
+ context_window=0,
+ per_turn_token=0,
+ created_at=datetime.now(timezone.utc),
+ last_updated_at=datetime.now(timezone.utc),
+ )
+ async_session.add(stored)
+ await async_session.commit()
+ return conversation_id, stored
+
+
+@pytest.fixture
+def stats_event_with_dict_value():
+ """Create a ConversationStateUpdateEvent with dict value."""
+ event_value = {
+ 'usage_to_metrics': {
+ 'agent': {
+ 'accumulated_cost': 0.03411525,
+ 'max_budget_per_task': None,
+ 'accumulated_token_usage': {
+ 'prompt_tokens': 8770,
+ 'completion_tokens': 82,
+ 'cache_read_tokens': 0,
+ 'cache_write_tokens': 8767,
+ 'reasoning_tokens': 0,
+ 'context_window': 0,
+ 'per_turn_token': 8852,
+ },
+ },
+ 'condenser': {
+ 'accumulated_cost': 0.0,
+ 'accumulated_token_usage': {
+ 'prompt_tokens': 0,
+ 'completion_tokens': 0,
+ },
+ },
+ }
+ }
+ return ConversationStateUpdateEvent(key='stats', value=event_value)
+
+
+@pytest.fixture
+def stats_event_with_object_value():
+ """Create a ConversationStateUpdateEvent with object value."""
+ event_value = MagicMock()
+ event_value.usage_to_metrics = {
+ 'agent': {
+ 'accumulated_cost': 0.05,
+ 'accumulated_token_usage': {
+ 'prompt_tokens': 1000,
+ 'completion_tokens': 100,
+ },
+ }
+ }
+ return ConversationStateUpdateEvent(key='stats', value=event_value)
+
+
+@pytest.fixture
+def stats_event_no_usage_to_metrics():
+ """Create a ConversationStateUpdateEvent without usage_to_metrics."""
+ event_value = {'some_other_key': 'value'}
+ return ConversationStateUpdateEvent(key='stats', value=event_value)
+
+
+# ---------------------------------------------------------------------------
+# Tests for update_conversation_statistics
+# ---------------------------------------------------------------------------
+
+
+class TestUpdateConversationStatistics:
+ """Test the update_conversation_statistics method."""
+
+ @pytest.mark.asyncio
+ async def test_update_statistics_success(
+ self, service, async_session, v1_conversation_metadata
+ ):
+ """Test successfully updating conversation statistics."""
+ conversation_id, stored = v1_conversation_metadata
+
+ agent_metrics = Metrics(
+ model_name='test-model',
+ accumulated_cost=0.03411525,
+ max_budget_per_task=10.0,
+ accumulated_token_usage=TokenUsage(
+ model='test-model',
+ prompt_tokens=8770,
+ completion_tokens=82,
+ cache_read_tokens=0,
+ cache_write_tokens=8767,
+ reasoning_tokens=0,
+ context_window=0,
+ per_turn_token=8852,
+ ),
+ )
+ stats = ConversationStats(usage_to_metrics={'agent': agent_metrics})
+
+ await service.update_conversation_statistics(conversation_id, stats)
+
+ # Verify the update
+ await async_session.refresh(stored)
+ assert stored.accumulated_cost == 0.03411525
+ assert stored.max_budget_per_task == 10.0
+ assert stored.prompt_tokens == 8770
+ assert stored.completion_tokens == 82
+ assert stored.cache_read_tokens == 0
+ assert stored.cache_write_tokens == 8767
+ assert stored.reasoning_tokens == 0
+ assert stored.context_window == 0
+ assert stored.per_turn_token == 8852
+ assert stored.last_updated_at is not None
+
+ @pytest.mark.asyncio
+ async def test_update_statistics_partial_update(
+ self, service, async_session, v1_conversation_metadata
+ ):
+ """Test updating only some statistics fields."""
+ conversation_id, stored = v1_conversation_metadata
+
+ # Set initial values
+ stored.accumulated_cost = 0.01
+ stored.prompt_tokens = 100
+ await async_session.commit()
+
+ agent_metrics = Metrics(
+ model_name='test-model',
+ accumulated_cost=0.05,
+ accumulated_token_usage=TokenUsage(
+ model='test-model',
+ prompt_tokens=200,
+ completion_tokens=0, # Default value
+ ),
+ )
+ stats = ConversationStats(usage_to_metrics={'agent': agent_metrics})
+
+ await service.update_conversation_statistics(conversation_id, stats)
+
+ # Verify updated fields
+ await async_session.refresh(stored)
+ assert stored.accumulated_cost == 0.05
+ assert stored.prompt_tokens == 200
+ # completion_tokens should remain unchanged (not None in stats)
+ assert stored.completion_tokens == 0
+
+ @pytest.mark.asyncio
+ async def test_update_statistics_no_agent_metrics(
+ self, service, v1_conversation_metadata
+ ):
+ """Test that update is skipped when no agent metrics are present."""
+ conversation_id, stored = v1_conversation_metadata
+ original_cost = stored.accumulated_cost
+
+ condenser_metrics = Metrics(
+ model_name='test-model',
+ accumulated_cost=0.1,
+ )
+ stats = ConversationStats(usage_to_metrics={'condenser': condenser_metrics})
+
+ await service.update_conversation_statistics(conversation_id, stats)
+
+ # Verify no update occurred
+ assert stored.accumulated_cost == original_cost
+
+ @pytest.mark.asyncio
+ async def test_update_statistics_conversation_not_found(self, service):
+ """Test that update is skipped when conversation doesn't exist."""
+ nonexistent_id = uuid4()
+ agent_metrics = Metrics(
+ model_name='test-model',
+ accumulated_cost=0.1,
+ )
+ stats = ConversationStats(usage_to_metrics={'agent': agent_metrics})
+
+ # Should not raise an exception
+ await service.update_conversation_statistics(nonexistent_id, stats)
+
+ @pytest.mark.asyncio
+ async def test_update_statistics_v0_conversation_skipped(
+ self, service, async_session
+ ):
+ """Test that V0 conversations are skipped."""
+ conversation_id = uuid4()
+ stored = StoredConversationMetadata(
+ conversation_id=str(conversation_id),
+ user_id='test_user_123',
+ sandbox_id='sandbox_123',
+ conversation_version='V0', # V0 conversation
+ title='V0 Conversation',
+ accumulated_cost=0.0,
+ created_at=datetime.now(timezone.utc),
+ last_updated_at=datetime.now(timezone.utc),
+ )
+ async_session.add(stored)
+ await async_session.commit()
+
+ original_cost = stored.accumulated_cost
+
+ agent_metrics = Metrics(
+ model_name='test-model',
+ accumulated_cost=0.1,
+ )
+ stats = ConversationStats(usage_to_metrics={'agent': agent_metrics})
+
+ await service.update_conversation_statistics(conversation_id, stats)
+
+ # Verify no update occurred
+ await async_session.refresh(stored)
+ assert stored.accumulated_cost == original_cost
+
+ @pytest.mark.asyncio
+ async def test_update_statistics_with_none_values(
+ self, service, async_session, v1_conversation_metadata
+ ):
+ """Test that None values in stats don't overwrite existing values."""
+ conversation_id, stored = v1_conversation_metadata
+
+ # Set initial values
+ stored.accumulated_cost = 0.01
+ stored.max_budget_per_task = 5.0
+ stored.prompt_tokens = 100
+ await async_session.commit()
+
+ agent_metrics = Metrics(
+ model_name='test-model',
+ accumulated_cost=0.05,
+ max_budget_per_task=None, # None value
+ accumulated_token_usage=TokenUsage(
+ model='test-model',
+ prompt_tokens=200,
+ completion_tokens=0, # Default value (None is not valid for int)
+ ),
+ )
+ stats = ConversationStats(usage_to_metrics={'agent': agent_metrics})
+
+ await service.update_conversation_statistics(conversation_id, stats)
+
+ # Verify updated fields and that None values didn't overwrite
+ await async_session.refresh(stored)
+ assert stored.accumulated_cost == 0.05
+ assert stored.max_budget_per_task == 5.0 # Should remain unchanged
+ assert stored.prompt_tokens == 200
+ assert (
+ stored.completion_tokens == 0
+ ) # Should remain unchanged (was 0, None doesn't update)
+
+
+# ---------------------------------------------------------------------------
+# Tests for process_stats_event
+# ---------------------------------------------------------------------------
+
+
+class TestProcessStatsEvent:
+ """Test the process_stats_event method."""
+
+ @pytest.mark.asyncio
+ async def test_process_stats_event_with_dict_value(
+ self,
+ service,
+ async_session,
+ stats_event_with_dict_value,
+ v1_conversation_metadata,
+ ):
+ """Test processing stats event with dict value."""
+ conversation_id, stored = v1_conversation_metadata
+
+ await service.process_stats_event(stats_event_with_dict_value, conversation_id)
+
+ # Verify the update occurred
+ await async_session.refresh(stored)
+ assert stored.accumulated_cost == 0.03411525
+ assert stored.prompt_tokens == 8770
+ assert stored.completion_tokens == 82
+
+ @pytest.mark.asyncio
+ async def test_process_stats_event_with_object_value(
+ self,
+ service,
+ async_session,
+ stats_event_with_object_value,
+ v1_conversation_metadata,
+ ):
+ """Test processing stats event with object value."""
+ conversation_id, stored = v1_conversation_metadata
+
+ await service.process_stats_event(
+ stats_event_with_object_value, conversation_id
+ )
+
+ # Verify the update occurred
+ await async_session.refresh(stored)
+ assert stored.accumulated_cost == 0.05
+ assert stored.prompt_tokens == 1000
+ assert stored.completion_tokens == 100
+
+ @pytest.mark.asyncio
+ async def test_process_stats_event_no_usage_to_metrics(
+ self,
+ service,
+ async_session,
+ stats_event_no_usage_to_metrics,
+ v1_conversation_metadata,
+ ):
+ """Test processing stats event without usage_to_metrics."""
+ conversation_id, stored = v1_conversation_metadata
+ original_cost = stored.accumulated_cost
+
+ await service.process_stats_event(
+ stats_event_no_usage_to_metrics, conversation_id
+ )
+
+ # Verify update_conversation_statistics was NOT called
+ await async_session.refresh(stored)
+ assert stored.accumulated_cost == original_cost
+
+ @pytest.mark.asyncio
+ async def test_process_stats_event_service_error_handled(
+ self, service, stats_event_with_dict_value
+ ):
+ """Test that errors from service are caught and logged."""
+ conversation_id = uuid4()
+
+ # Should not raise an exception
+ with (
+ patch.object(
+ service,
+ 'update_conversation_statistics',
+ side_effect=Exception('Database error'),
+ ),
+ patch(
+ 'openhands.app_server.app_conversation.sql_app_conversation_info_service.logger'
+ ) as mock_logger,
+ ):
+ await service.process_stats_event(
+ stats_event_with_dict_value, conversation_id
+ )
+
+ # Verify error was logged
+ mock_logger.exception.assert_called_once()
+
+ @pytest.mark.asyncio
+ async def test_process_stats_event_empty_usage_to_metrics(
+ self, service, async_session, v1_conversation_metadata
+ ):
+ """Test processing stats event with empty usage_to_metrics."""
+ conversation_id, stored = v1_conversation_metadata
+ original_cost = stored.accumulated_cost
+
+ # Create event with empty usage_to_metrics
+ event = ConversationStateUpdateEvent(
+ key='stats', value={'usage_to_metrics': {}}
+ )
+
+ await service.process_stats_event(event, conversation_id)
+
+ # Empty dict is falsy, so update_conversation_statistics should NOT be called
+ await async_session.refresh(stored)
+ assert stored.accumulated_cost == original_cost
+
+
+# ---------------------------------------------------------------------------
+# Integration tests for on_event endpoint
+# ---------------------------------------------------------------------------
+
+
+class TestOnEventStatsProcessing:
+ """Test stats event processing in the on_event endpoint."""
+
+ @pytest.mark.asyncio
+ async def test_on_event_processes_stats_events(self):
+ """Test that on_event processes stats events."""
+ from openhands.app_server.event_callback.webhook_router import on_event
+ from openhands.app_server.sandbox.sandbox_models import (
+ SandboxInfo,
+ SandboxStatus,
+ )
+
+ conversation_id = uuid4()
+ sandbox_id = 'sandbox_123'
+
+ # Create stats event
+ stats_event = ConversationStateUpdateEvent(
+ key='stats',
+ value={
+ 'usage_to_metrics': {
+ 'agent': {
+ 'accumulated_cost': 0.1,
+ 'accumulated_token_usage': {
+ 'prompt_tokens': 1000,
+ },
+ }
+ }
+ },
+ )
+
+ # Create non-stats event
+ other_event = ConversationStateUpdateEvent(
+ key='execution_status', value='running'
+ )
+
+ events = [stats_event, other_event]
+
+ # Mock dependencies
+ mock_sandbox = SandboxInfo(
+ id=sandbox_id,
+ status=SandboxStatus.RUNNING,
+ session_api_key='test_key',
+ created_by_user_id='user_123',
+ sandbox_spec_id='spec_123',
+ )
+
+ mock_app_conversation_info = AppConversationInfo(
+ id=conversation_id,
+ sandbox_id=sandbox_id,
+ created_by_user_id='user_123',
+ )
+
+ mock_event_service = AsyncMock()
+ mock_app_conversation_info_service = AsyncMock()
+ mock_app_conversation_info_service.get_app_conversation_info.return_value = (
+ mock_app_conversation_info
+ )
+
+ # Set up process_stats_event to call update_conversation_statistics
+ async def process_stats_event_side_effect(event, conversation_id):
+ # Simulate what process_stats_event does - call update_conversation_statistics
+ from openhands.sdk.conversation.conversation_stats import ConversationStats
+
+ if isinstance(event.value, dict):
+ stats = ConversationStats.model_validate(event.value)
+ if stats and stats.usage_to_metrics:
+ await mock_app_conversation_info_service.update_conversation_statistics(
+ conversation_id, stats
+ )
+
+ mock_app_conversation_info_service.process_stats_event.side_effect = (
+ process_stats_event_side_effect
+ )
+
+ with (
+ patch(
+ 'openhands.app_server.event_callback.webhook_router.valid_sandbox',
+ return_value=mock_sandbox,
+ ),
+ patch(
+ 'openhands.app_server.event_callback.webhook_router.valid_conversation',
+ return_value=mock_app_conversation_info,
+ ),
+ patch(
+ 'openhands.app_server.event_callback.webhook_router._run_callbacks_in_bg_and_close'
+ ) as mock_callbacks,
+ ):
+ await on_event(
+ events=events,
+ conversation_id=conversation_id,
+ sandbox_info=mock_sandbox,
+ app_conversation_info_service=mock_app_conversation_info_service,
+ event_service=mock_event_service,
+ )
+
+ # Verify events were saved
+ assert mock_event_service.save_event.call_count == 2
+
+ # Verify stats event was processed
+ mock_app_conversation_info_service.update_conversation_statistics.assert_called_once()
+
+ # Verify callbacks were scheduled
+ mock_callbacks.assert_called_once()
+
+ @pytest.mark.asyncio
+ async def test_on_event_skips_non_stats_events(self):
+ """Test that on_event skips non-stats events."""
+ from openhands.app_server.event_callback.webhook_router import on_event
+ from openhands.app_server.sandbox.sandbox_models import (
+ SandboxInfo,
+ SandboxStatus,
+ )
+ from openhands.events.action.message import MessageAction
+
+ conversation_id = uuid4()
+ sandbox_id = 'sandbox_123'
+
+ # Create non-stats events
+ events = [
+ ConversationStateUpdateEvent(key='execution_status', value='running'),
+ MessageAction(content='test'),
+ ]
+
+ mock_sandbox = SandboxInfo(
+ id=sandbox_id,
+ status=SandboxStatus.RUNNING,
+ session_api_key='test_key',
+ created_by_user_id='user_123',
+ sandbox_spec_id='spec_123',
+ )
+
+ mock_app_conversation_info = AppConversationInfo(
+ id=conversation_id,
+ sandbox_id=sandbox_id,
+ created_by_user_id='user_123',
+ )
+
+ mock_event_service = AsyncMock()
+ mock_app_conversation_info_service = AsyncMock()
+ mock_app_conversation_info_service.get_app_conversation_info.return_value = (
+ mock_app_conversation_info
+ )
+
+ with (
+ patch(
+ 'openhands.app_server.event_callback.webhook_router.valid_sandbox',
+ return_value=mock_sandbox,
+ ),
+ patch(
+ 'openhands.app_server.event_callback.webhook_router.valid_conversation',
+ return_value=mock_app_conversation_info,
+ ),
+ patch(
+ 'openhands.app_server.event_callback.webhook_router._run_callbacks_in_bg_and_close'
+ ),
+ ):
+ await on_event(
+ events=events,
+ conversation_id=conversation_id,
+ sandbox_info=mock_sandbox,
+ app_conversation_info_service=mock_app_conversation_info_service,
+ event_service=mock_event_service,
+ )
+
+ # Verify stats update was NOT called
+ mock_app_conversation_info_service.update_conversation_statistics.assert_not_called()
diff --git a/tests/unit/controller/test_agent_controller.py b/tests/unit/controller/test_agent_controller.py
index da12ee8f9e4e..3da87ecfdf36 100644
--- a/tests/unit/controller/test_agent_controller.py
+++ b/tests/unit/controller/test_agent_controller.py
@@ -24,6 +24,7 @@
from openhands.events import Event, EventSource, EventStream, EventStreamSubscriber
from openhands.events.action import ChangeAgentStateAction, CmdRunAction, MessageAction
from openhands.events.action.agent import CondensationAction, RecallAction
+from openhands.events.action.empty import NullAction
from openhands.events.action.message import SystemMessageAction
from openhands.events.event import RecallType
from openhands.events.observation import (
@@ -299,6 +300,64 @@ async def test_react_to_content_policy_violation(
await controller.close()
+@pytest.mark.asyncio
+async def test_tool_call_validation_error_handling(
+ mock_agent_with_stats,
+ test_event_stream,
+):
+ """Test that tool call validation errors from Groq are handled as recoverable errors."""
+ mock_agent, conversation_stats, llm_registry = mock_agent_with_stats
+
+ controller = AgentController(
+ agent=mock_agent,
+ event_stream=test_event_stream,
+ conversation_stats=conversation_stats,
+ iteration_delta=10,
+ sid='test',
+ confirmation_mode=False,
+ headless_mode=True,
+ )
+
+ controller.state.agent_state = AgentState.RUNNING
+
+ # Track call count to only raise error on first call
+ # This prevents a feedback loop where ErrorObservation triggers another step
+ # which raises the same error again (since the mock always raises)
+ call_count = 0
+
+ def mock_step(state):
+ nonlocal call_count
+ call_count += 1
+ if call_count == 1:
+ raise BadRequestError(
+ message='litellm.BadRequestError: GroqException - {"error":{"message":"tool call validation failed: parameters for tool str_replace_editor did not match schema: errors: [missing properties: \'path\']","type":"invalid_request_error","code":"tool_use_failed"}}',
+ model='groq/llama3-8b-8192',
+ llm_provider='groq',
+ )
+ # Return NullAction on subsequent calls to break the feedback loop
+ return NullAction()
+
+ mock_agent.step = mock_step
+
+ # Call _step which should handle the tool validation error
+ await controller._step()
+
+ # Verify that the agent state is still RUNNING (not ERROR)
+ assert controller.state.agent_state == AgentState.RUNNING
+
+ # Verify that an ErrorObservation was added to the event stream
+ events = list(test_event_stream.get_events())
+ error_observations = [e for e in events if isinstance(e, ErrorObservation)]
+ assert len(error_observations) == 1
+
+ error_obs = error_observations[0]
+ assert 'tool call validation failed' in error_obs.content
+ assert 'missing properties' in error_obs.content
+ assert 'path' in error_obs.content
+
+ await controller.close()
+
+
@pytest.mark.asyncio
async def test_run_controller_with_fatal_error(
test_event_stream, mock_memory, mock_agent_with_stats
diff --git a/tests/unit/controller/test_agent_controller_posthog.py b/tests/unit/controller/test_agent_controller_posthog.py
deleted file mode 100644
index 630c18e3aa53..000000000000
--- a/tests/unit/controller/test_agent_controller_posthog.py
+++ /dev/null
@@ -1,243 +0,0 @@
-"""Integration tests for PostHog tracking in AgentController."""
-
-import asyncio
-from unittest.mock import MagicMock, patch
-
-import pytest
-
-from openhands.controller.agent import Agent
-from openhands.controller.agent_controller import AgentController
-from openhands.core.config import OpenHandsConfig
-from openhands.core.config.agent_config import AgentConfig
-from openhands.core.config.llm_config import LLMConfig
-from openhands.core.schema import AgentState
-from openhands.events import EventSource, EventStream
-from openhands.events.action.message import SystemMessageAction
-from openhands.llm.llm_registry import LLMRegistry
-from openhands.server.services.conversation_stats import ConversationStats
-from openhands.storage.memory import InMemoryFileStore
-
-
-@pytest.fixture(scope='function')
-def event_loop():
- """Create event loop for async tests."""
- loop = asyncio.get_event_loop_policy().new_event_loop()
- yield loop
- loop.close()
-
-
-@pytest.fixture
-def mock_agent_with_stats():
- """Create a mock agent with properly connected LLM registry and conversation stats."""
- import uuid
-
- # Create LLM registry
- config = OpenHandsConfig()
- llm_registry = LLMRegistry(config=config)
-
- # Create conversation stats
- file_store = InMemoryFileStore({})
- conversation_id = f'test-conversation-{uuid.uuid4()}'
- conversation_stats = ConversationStats(
- file_store=file_store, conversation_id=conversation_id, user_id='test-user'
- )
-
- # Connect registry to stats
- llm_registry.subscribe(conversation_stats.register_llm)
-
- # Create mock agent
- agent = MagicMock(spec=Agent)
- agent_config = MagicMock(spec=AgentConfig)
- llm_config = LLMConfig(
- model='gpt-4o',
- api_key='test_key',
- num_retries=2,
- retry_min_wait=1,
- retry_max_wait=2,
- )
- agent_config.disabled_microagents = []
- agent_config.enable_mcp = True
- agent_config.enable_stuck_detection = True
- llm_registry.service_to_llm.clear()
- mock_llm = llm_registry.get_llm('agent_llm', llm_config)
- agent.llm = mock_llm
- agent.name = 'test-agent'
- agent.sandbox_plugins = []
- agent.config = agent_config
- agent.llm_registry = llm_registry
- agent.prompt_manager = MagicMock()
-
- # Add a proper system message mock
- system_message = SystemMessageAction(
- content='Test system message', tools=['test_tool']
- )
- system_message._source = EventSource.AGENT
- system_message._id = -1 # Set invalid ID to avoid the ID check
- agent.get_system_message.return_value = system_message
-
- return agent, conversation_stats, llm_registry
-
-
-@pytest.fixture
-def mock_event_stream():
- """Create a mock event stream."""
- mock = MagicMock(
- spec=EventStream,
- event_stream=EventStream(sid='test', file_store=InMemoryFileStore({})),
- )
- mock.get_latest_event_id.return_value = 0
- return mock
-
-
-@pytest.mark.asyncio
-async def test_agent_finish_triggers_posthog_tracking(
- mock_agent_with_stats, mock_event_stream
-):
- """Test that setting agent state to FINISHED triggers PostHog tracking."""
- mock_agent, conversation_stats, llm_registry = mock_agent_with_stats
-
- controller = AgentController(
- agent=mock_agent,
- event_stream=mock_event_stream,
- conversation_stats=conversation_stats,
- iteration_delta=10,
- sid='test-conversation-123',
- user_id='test-user-456',
- confirmation_mode=False,
- headless_mode=True,
- )
-
- with (
- patch('openhands.utils.posthog_tracker.posthog') as mock_posthog,
- patch('os.environ.get') as mock_env_get,
- ):
- # Setup mocks
- mock_posthog.capture = MagicMock()
- mock_env_get.return_value = 'saas'
-
- # Initialize posthog in the tracker module
- import openhands.utils.posthog_tracker as tracker
-
- tracker.posthog = mock_posthog
-
- # Set agent state to FINISHED
- await controller.set_agent_state_to(AgentState.FINISHED)
-
- # Verify PostHog tracking was called
- mock_posthog.capture.assert_called_once()
- call_args = mock_posthog.capture.call_args
-
- assert call_args[1]['distinct_id'] == 'test-user-456'
- assert call_args[1]['event'] == 'agent_task_completed'
- assert 'conversation_id' in call_args[1]['properties']
- assert call_args[1]['properties']['user_id'] == 'test-user-456'
- assert call_args[1]['properties']['app_mode'] == 'saas'
-
- await controller.close()
-
-
-@pytest.mark.asyncio
-async def test_agent_finish_without_user_id(mock_agent_with_stats, mock_event_stream):
- """Test tracking when user_id is None."""
- mock_agent, conversation_stats, llm_registry = mock_agent_with_stats
-
- controller = AgentController(
- agent=mock_agent,
- event_stream=mock_event_stream,
- conversation_stats=conversation_stats,
- iteration_delta=10,
- sid='test-conversation-789',
- user_id=None,
- confirmation_mode=False,
- headless_mode=True,
- )
-
- with (
- patch('openhands.utils.posthog_tracker.posthog') as mock_posthog,
- patch('os.environ.get') as mock_env_get,
- ):
- mock_posthog.capture = MagicMock()
- mock_env_get.return_value = 'oss'
-
- import openhands.utils.posthog_tracker as tracker
-
- tracker.posthog = mock_posthog
-
- await controller.set_agent_state_to(AgentState.FINISHED)
-
- mock_posthog.capture.assert_called_once()
- call_args = mock_posthog.capture.call_args
-
- # When user_id is None, distinct_id should be conversation_id
- assert call_args[1]['distinct_id'].startswith('conversation_')
- assert call_args[1]['properties']['user_id'] is None
-
- await controller.close()
-
-
-@pytest.mark.asyncio
-async def test_other_states_dont_trigger_tracking(
- mock_agent_with_stats, mock_event_stream
-):
- """Test that non-FINISHED states don't trigger tracking."""
- mock_agent, conversation_stats, llm_registry = mock_agent_with_stats
-
- controller = AgentController(
- agent=mock_agent,
- event_stream=mock_event_stream,
- conversation_stats=conversation_stats,
- iteration_delta=10,
- sid='test-conversation-999',
- confirmation_mode=False,
- headless_mode=True,
- )
-
- with patch('openhands.utils.posthog_tracker.posthog') as mock_posthog:
- mock_posthog.capture = MagicMock()
-
- import openhands.utils.posthog_tracker as tracker
-
- tracker.posthog = mock_posthog
-
- # Try different states
- await controller.set_agent_state_to(AgentState.RUNNING)
- await controller.set_agent_state_to(AgentState.PAUSED)
- await controller.set_agent_state_to(AgentState.STOPPED)
-
- # PostHog should not be called for non-FINISHED states
- mock_posthog.capture.assert_not_called()
-
- await controller.close()
-
-
-@pytest.mark.asyncio
-async def test_tracking_error_doesnt_break_agent(
- mock_agent_with_stats, mock_event_stream
-):
- """Test that tracking errors don't interrupt agent operation."""
- mock_agent, conversation_stats, llm_registry = mock_agent_with_stats
-
- controller = AgentController(
- agent=mock_agent,
- event_stream=mock_event_stream,
- conversation_stats=conversation_stats,
- iteration_delta=10,
- sid='test-conversation-error',
- confirmation_mode=False,
- headless_mode=True,
- )
-
- with patch('openhands.utils.posthog_tracker.posthog') as mock_posthog:
- mock_posthog.capture = MagicMock(side_effect=Exception('PostHog error'))
-
- import openhands.utils.posthog_tracker as tracker
-
- tracker.posthog = mock_posthog
-
- # Should not raise an exception
- await controller.set_agent_state_to(AgentState.FINISHED)
-
- # Agent state should still be FINISHED despite tracking error
- assert controller.state.agent_state == AgentState.FINISHED
-
- await controller.close()
diff --git a/tests/unit/experiments/test_experiment_manager.py b/tests/unit/experiments/test_experiment_manager.py
index e891b9893a36..c389423cf597 100644
--- a/tests/unit/experiments/test_experiment_manager.py
+++ b/tests/unit/experiments/test_experiment_manager.py
@@ -126,11 +126,8 @@ async def test_experiment_manager_called_with_correct_parameters_in_context__noo
self,
):
"""
- Use the real LiveStatusAppConversationService to build a StartConversationRequest,
- and verify ExperimentManagerImpl.run_agent_variant_tests__v1:
- - is called exactly once with the (user_id, generated conversation_id, agent)
- - returns the *same* agent instance (no copy/mutation)
- - does not tweak agent fields (LLM, system prompt, etc.)
+ Test that ExperimentManagerImpl.run_agent_variant_tests__v1 is called with correct parameters
+ and returns the same agent instance (no copy/mutation) when building a StartConversationRequest.
"""
# --- Arrange: fixed UUID to assert call parameters deterministically
fixed_conversation_id = UUID('00000000-0000-0000-0000-000000000001')
@@ -143,6 +140,7 @@ async def test_experiment_manager_called_with_correct_parameters_in_context__noo
mock_agent = Mock(spec=Agent)
mock_agent.llm = mock_llm
mock_agent.system_prompt_filename = 'default_system_prompt.j2'
+ mock_agent.model_copy = Mock(return_value=mock_agent)
# Minimal, real-ish user context used by the service
class DummyUserContext:
@@ -154,6 +152,8 @@ async def get_user_info(self):
llm_base_url=None,
llm_api_key=None,
confirmation_mode=False,
+ condenser_max_size=None,
+ security_analyzer=None,
)
async def get_secrets(self):
@@ -189,6 +189,7 @@ async def get_user_id(self):
sandbox_startup_poll_frequency=1,
httpx_client=httpx_client,
web_url=None,
+ openhands_provider_base_url=None,
access_token_hard_timeout=None,
)
@@ -202,24 +203,56 @@ async def get_user_id(self):
# Patch the pieces invoked by the service
with (
- patch(
- 'openhands.app_server.app_conversation.live_status_app_conversation_service.get_default_agent',
+ patch.object(
+ service,
+ '_setup_secrets_for_git_providers',
+ return_value={},
+ ),
+ patch.object(
+ service,
+ '_configure_llm_and_mcp',
+ return_value=(mock_llm, {}),
+ ),
+ patch.object(
+ service,
+ '_create_agent_with_context',
+ return_value=mock_agent,
+ ),
+ patch.object(
+ service,
+ '_load_skills_and_update_agent',
return_value=mock_agent,
),
patch(
'openhands.app_server.app_conversation.live_status_app_conversation_service.uuid4',
return_value=fixed_conversation_id,
),
+ patch(
+ 'openhands.app_server.app_conversation.live_status_app_conversation_service.ExperimentManagerImpl'
+ ) as mock_experiment_manager,
):
+ # Configure the experiment manager mock to return the same agent
+ mock_experiment_manager.run_agent_variant_tests__v1.return_value = (
+ mock_agent
+ )
+
# --- Act: build the start request
start_req = await service._build_start_conversation_request_for_user(
sandbox=sandbox,
initial_message=None,
+ system_message_suffix=None, # No additional system message suffix
git_provider=None, # Keep secrets path simple
working_dir='/tmp/project', # Arbitrary path
)
- # The agent in the StartConversationRequest is the *same* object we provided
+ # --- Assert: verify experiment manager was called with correct parameters
+ mock_experiment_manager.run_agent_variant_tests__v1.assert_called_once_with(
+ 'test_user_123', # user_id
+ fixed_conversation_id, # conversation_id
+ mock_agent, # agent (after model_copy with agent_context)
+ )
+
+ # The agent in the StartConversationRequest is the *same* object returned by experiment manager
assert start_req.agent is mock_agent
# No tweaks to agent fields by the experiment manager (noop)
diff --git a/tests/unit/llm/test_llm.py b/tests/unit/llm/test_llm.py
index dfdb4e05b475..b04425e631da 100644
--- a/tests/unit/llm/test_llm.py
+++ b/tests/unit/llm/test_llm.py
@@ -1255,6 +1255,25 @@ def test_opus_41_keeps_temperature_top_p(mock_completion):
assert 'top_p' not in call_kwargs
+@patch('openhands.llm.llm.litellm_completion')
+def test_opus_45_keeps_temperature_drops_top_p(mock_completion):
+ mock_completion.return_value = {
+ 'choices': [{'message': {'content': 'ok'}}],
+ }
+ config = LLMConfig(
+ model='anthropic/claude-opus-4-5-20251101',
+ api_key='k',
+ temperature=0.7,
+ top_p=0.9,
+ )
+ llm = LLM(config, service_id='svc')
+ llm.completion(messages=[{'role': 'user', 'content': 'hi'}])
+ call_kwargs = mock_completion.call_args[1]
+ assert call_kwargs.get('temperature') == 0.7
+ # Anthropic rejects both temperature and top_p together on Opus 4.5; we keep temperature and drop top_p
+ assert 'top_p' not in call_kwargs
+
+
@patch('openhands.llm.llm.litellm_completion')
def test_sonnet_4_keeps_temperature_drops_top_p(mock_completion):
mock_completion.return_value = {
diff --git a/tests/unit/llm/test_llm_fncall_converter.py b/tests/unit/llm/test_llm_fncall_converter.py
index ff4b7961efe6..b4270f89b023 100644
--- a/tests/unit/llm/test_llm_fncall_converter.py
+++ b/tests/unit/llm/test_llm_fncall_converter.py
@@ -701,6 +701,8 @@ def test_get_example_for_tools_all_tools():
""",
),
# Test case with indented code block to verify indentation is preserved
+ # Note: multiline parameter values should NOT have extra newlines before/after
+ # to prevent newline accumulation across multiple LLM response cycles
(
[
{
@@ -716,16 +718,12 @@ def test_get_example_for_tools_all_tools():
"""
str_replace
/test/file.py
-
-def example():
- pass
-
-
-def example():
+def example():
+ pass
+def example():
# This is indented
print("hello")
- return True
-
+ return True
""",
),
# Test case with list parameter value
diff --git a/tests/unit/memory/test_conversation_memory.py b/tests/unit/memory/test_conversation_memory.py
index abaa8d9a3d17..50fd48f49a35 100644
--- a/tests/unit/memory/test_conversation_memory.py
+++ b/tests/unit/memory/test_conversation_memory.py
@@ -158,7 +158,8 @@ def test_ensure_initial_user_message_adds_if_only_system(
system_message = SystemMessageAction(content='System')
system_message._source = EventSource.AGENT
events = [system_message]
- conversation_memory._ensure_initial_user_message(events, initial_user_action)
+ # Pass empty set for forgotten_event_ids (no events have been condensed)
+ conversation_memory._ensure_initial_user_message(events, initial_user_action, set())
assert len(events) == 2
assert events[0] == system_message
assert events[1] == initial_user_action
@@ -177,7 +178,8 @@ def test_ensure_initial_user_message_correct_already_present(
agent_message,
]
original_events = list(events)
- conversation_memory._ensure_initial_user_message(events, initial_user_action)
+ # Pass empty set for forgotten_event_ids (no events have been condensed)
+ conversation_memory._ensure_initial_user_message(events, initial_user_action, set())
assert events == original_events
@@ -189,7 +191,8 @@ def test_ensure_initial_user_message_incorrect_at_index_1(
incorrect_second_message = MessageAction(content='Assistant')
incorrect_second_message._source = EventSource.AGENT
events = [system_message, incorrect_second_message]
- conversation_memory._ensure_initial_user_message(events, initial_user_action)
+ # Pass empty set for forgotten_event_ids (no events have been condensed)
+ conversation_memory._ensure_initial_user_message(events, initial_user_action, set())
assert len(events) == 3
assert events[0] == system_message
assert events[1] == initial_user_action # Correct one inserted
@@ -206,7 +209,8 @@ def test_ensure_initial_user_message_correct_present_later(
# Correct initial message is present, but later in the list
events = [system_message, incorrect_second_message]
conversation_memory._ensure_system_message(events)
- conversation_memory._ensure_initial_user_message(events, initial_user_action)
+ # Pass empty set for forgotten_event_ids (no events have been condensed)
+ conversation_memory._ensure_initial_user_message(events, initial_user_action, set())
assert len(events) == 3 # Should still insert at index 1, not remove the later one
assert events[0] == system_message
assert events[1] == initial_user_action # Correct one inserted at index 1
@@ -222,7 +226,8 @@ def test_ensure_initial_user_message_different_user_msg_at_index_1(
different_user_message = MessageAction(content='Different User Message')
different_user_message._source = EventSource.USER
events = [system_message, different_user_message]
- conversation_memory._ensure_initial_user_message(events, initial_user_action)
+ # Pass empty set for forgotten_event_ids (no events have been condensed)
+ conversation_memory._ensure_initial_user_message(events, initial_user_action, set())
assert len(events) == 2
assert events[0] == system_message
assert events[1] == different_user_message # Original second message remains
@@ -1583,3 +1588,132 @@ def test_process_ipython_observation_with_vision_disabled(
assert isinstance(message.content[1], ImageContent)
# Check that NO explanatory text about filtered images was added when vision is disabled
assert 'invalid or empty image(s) were filtered' not in message.content[0].text
+
+
+def test_ensure_initial_user_message_not_reinserted_when_condensed(
+ conversation_memory, initial_user_action
+):
+ """Test that initial user message is NOT re-inserted when it has been condensed.
+
+ This is a critical test for bug #11910: Old instructions should not be re-executed
+ after conversation condensation. If the initial user message has been condensed
+ (its ID is in the forgotten_event_ids set), we should NOT re-insert it to prevent
+ the LLM from seeing old instructions as fresh commands.
+ """
+ system_message = SystemMessageAction(content='System')
+ system_message._source = EventSource.AGENT
+
+ # Simulate that the initial_user_action has been condensed by adding its ID
+ # to the forgotten_event_ids set
+ initial_user_action._id = 1 # Assign an ID to the initial user action
+ forgotten_event_ids = {1} # The initial user action's ID is in the forgotten set
+
+ events = [system_message] # Only system message, no user message
+
+ # Call _ensure_initial_user_message with the condensed event ID
+ conversation_memory._ensure_initial_user_message(
+ events, initial_user_action, forgotten_event_ids
+ )
+
+ # The initial user action should NOT be inserted because it was condensed
+ assert len(events) == 1
+ assert events[0] == system_message
+ # Verify the initial user action was NOT added
+ assert initial_user_action not in events
+
+
+def test_ensure_initial_user_message_reinserted_when_not_condensed(
+ conversation_memory, initial_user_action
+):
+ """Test that initial user message IS re-inserted when it has NOT been condensed.
+
+ This ensures backward compatibility: when no condensation has happened,
+ the initial user message should still be inserted as before.
+ """
+ system_message = SystemMessageAction(content='System')
+ system_message._source = EventSource.AGENT
+
+ # The initial user action has NOT been condensed
+ initial_user_action._id = 1
+ forgotten_event_ids = {5, 10, 15} # Different IDs, not including the initial action
+
+ events = [system_message]
+
+ # Call _ensure_initial_user_message with non-matching forgotten IDs
+ conversation_memory._ensure_initial_user_message(
+ events, initial_user_action, forgotten_event_ids
+ )
+
+ # The initial user action SHOULD be inserted because it was NOT condensed
+ assert len(events) == 2
+ assert events[0] == system_message
+ assert events[1] == initial_user_action
+
+
+def test_process_events_does_not_reinsert_condensed_initial_message(
+ conversation_memory,
+):
+ """Test that process_events does not re-insert initial user message when condensed.
+
+ This is an integration test for the full process_events flow, verifying that
+ when the initial user message has been condensed, it is not re-inserted into
+ the conversation sent to the LLM.
+ """
+ # Create a system message
+ system_message = SystemMessageAction(content='System message')
+ system_message._source = EventSource.AGENT
+ system_message._id = 0
+
+ # Create the initial user message (will be marked as condensed)
+ initial_user_message = MessageAction(content='Do task A, B, and C')
+ initial_user_message._source = EventSource.USER
+ initial_user_message._id = 1
+
+ # Create a condensation summary observation
+ from openhands.events.observation.agent import AgentCondensationObservation
+
+ condensation_summary = AgentCondensationObservation(
+ content='Summary: User requested tasks A, B, C. Task A was completed successfully.'
+ )
+ condensation_summary._id = 2
+
+ # Create a recent user message (not condensed)
+ recent_user_message = MessageAction(content='Now continue with task D')
+ recent_user_message._source = EventSource.USER
+ recent_user_message._id = 3
+
+ # Simulate condensed history: system + summary + recent message
+ # The initial user message (id=1) has been condensed/forgotten
+ condensed_history = [system_message, condensation_summary, recent_user_message]
+
+ # The initial user message's ID is in the forgotten set
+ forgotten_event_ids = {1}
+
+ messages = conversation_memory.process_events(
+ condensed_history=condensed_history,
+ initial_user_action=initial_user_message,
+ forgotten_event_ids=forgotten_event_ids,
+ max_message_chars=None,
+ vision_is_active=False,
+ )
+
+ # Verify the structure of messages
+ # Should have: system, condensation summary, recent user message
+ # Should NOT have the initial user message "Do task A, B, and C"
+ assert len(messages) == 3
+ assert messages[0].role == 'system'
+ assert messages[0].content[0].text == 'System message'
+
+ # The second message should be the condensation summary, NOT the initial user message
+ assert messages[1].role == 'user'
+ assert 'Summary: User requested tasks A, B, C' in messages[1].content[0].text
+
+ # The third message should be the recent user message
+ assert messages[2].role == 'user'
+ assert 'Now continue with task D' in messages[2].content[0].text
+
+ # Critically, the old instruction should NOT appear
+ for msg in messages:
+ for content in msg.content:
+ if hasattr(content, 'text'):
+ assert 'Do task A, B, and C' not in content.text
diff --git a/tests/unit/server/data_models/test_conversation.py b/tests/unit/server/data_models/test_conversation.py
index 98cf9b09ea98..79ff91fa7fd8 100644
--- a/tests/unit/server/data_models/test_conversation.py
+++ b/tests/unit/server/data_models/test_conversation.py
@@ -15,6 +15,9 @@
AppConversation,
AppConversationPage,
)
+from openhands.app_server.app_conversation.app_conversation_router import (
+ read_conversation_file,
+)
from openhands.app_server.app_conversation.live_status_app_conversation_service import (
LiveStatusAppConversationService,
)
@@ -27,6 +30,7 @@
SandboxInfo,
SandboxStatus,
)
+from openhands.app_server.sandbox.sandbox_spec_models import SandboxSpecInfo
from openhands.app_server.user.user_context import UserContext
from openhands.integrations.service_types import (
AuthenticationError,
@@ -37,6 +41,10 @@
)
from openhands.runtime.runtime_status import RuntimeStatus
from openhands.sdk.conversation.state import ConversationExecutionStatus
+from openhands.sdk.workspace.models import FileOperationResult
+from openhands.sdk.workspace.remote.async_remote_workspace import (
+ AsyncRemoteWorkspace,
+)
from openhands.server.data_models.conversation_info import ConversationInfo
from openhands.server.data_models.conversation_info_result_set import (
ConversationInfoResultSet,
@@ -980,14 +988,6 @@ async def test_delete_conversation():
@pytest.mark.asyncio
async def test_delete_v1_conversation_success():
"""Test successful deletion of a V1 conversation."""
- from uuid import uuid4
-
- from openhands.app_server.app_conversation.app_conversation_models import (
- AppConversation,
- )
- from openhands.app_server.sandbox.sandbox_models import SandboxStatus
- from openhands.sdk.conversation.state import ConversationExecutionStatus
-
conversation_uuid = uuid4()
conversation_id = str(conversation_uuid)
@@ -1060,8 +1060,6 @@ async def test_delete_v1_conversation_success():
@pytest.mark.asyncio
async def test_delete_v1_conversation_not_found():
"""Test deletion of a V1 conversation that doesn't exist."""
- from uuid import uuid4
-
conversation_uuid = uuid4()
conversation_id = str(conversation_uuid)
@@ -1198,8 +1196,6 @@ async def test_delete_v1_conversation_invalid_uuid():
@pytest.mark.asyncio
async def test_delete_v1_conversation_service_error():
"""Test deletion when app conversation service raises an error."""
- from uuid import uuid4
-
conversation_uuid = uuid4()
conversation_id = str(conversation_uuid)
@@ -1293,14 +1289,6 @@ async def test_delete_v1_conversation_service_error():
@pytest.mark.asyncio
async def test_delete_v1_conversation_with_agent_server():
"""Test V1 conversation deletion with agent server integration."""
- from uuid import uuid4
-
- from openhands.app_server.app_conversation.app_conversation_models import (
- AppConversation,
- )
- from openhands.app_server.sandbox.sandbox_models import SandboxStatus
- from openhands.sdk.conversation.state import ConversationExecutionStatus
-
conversation_uuid = uuid4()
conversation_id = str(conversation_uuid)
@@ -2178,6 +2166,7 @@ async def mock_get_app_conversation(conv_id):
sandbox_startup_poll_frequency=2,
httpx_client=mock_httpx_client,
web_url=None,
+ openhands_provider_base_url=None,
access_token_hard_timeout=None,
)
@@ -2299,6 +2288,7 @@ async def test_delete_v1_conversation_with_no_sub_conversations():
sandbox_startup_poll_frequency=2,
httpx_client=mock_httpx_client,
web_url=None,
+ openhands_provider_base_url=None,
access_token_hard_timeout=None,
)
@@ -2450,6 +2440,7 @@ def mock_delete_info(conv_id: uuid.UUID):
sandbox_startup_poll_frequency=2,
httpx_client=mock_httpx_client,
web_url=None,
+ openhands_provider_base_url=None,
access_token_hard_timeout=None,
)
@@ -2475,3 +2466,919 @@ def mock_delete_info(conv_id: uuid.UUID):
assert sub2_uuid in delete_calls
assert parent_uuid in delete_calls
assert sub1_uuid not in delete_calls # Failed before deletion
+
+
+@pytest.mark.asyncio
+async def test_read_conversation_file_success():
+ """Test successfully retrieving file content from conversation workspace."""
+ conversation_id = uuid4()
+ file_path = '/workspace/project/PLAN.md'
+ file_content = '# Project Plan\n\n## Phase 1\n- Task 1\n- Task 2\n'
+
+ # Mock conversation
+ mock_conversation = AppConversation(
+ id=conversation_id,
+ created_by_user_id='test_user',
+ sandbox_id='test-sandbox-id',
+ title='Test Conversation',
+ sandbox_status=SandboxStatus.RUNNING,
+ execution_status=ConversationExecutionStatus.RUNNING,
+ session_api_key='test-api-key',
+ selected_repository='test/repo',
+ selected_branch='main',
+ git_provider=ProviderType.GITHUB,
+ trigger=ConversationTrigger.GUI,
+ created_at=datetime.now(timezone.utc),
+ updated_at=datetime.now(timezone.utc),
+ )
+
+ # Mock sandbox
+ mock_sandbox = SandboxInfo(
+ id='test-sandbox-id',
+ created_by_user_id='test_user',
+ sandbox_spec_id='test-spec-id',
+ status=SandboxStatus.RUNNING,
+ session_api_key='test-api-key',
+ exposed_urls=[
+ ExposedUrl(name=AGENT_SERVER, url='http://agent:8000', port=8000)
+ ],
+ )
+
+ # Mock sandbox spec
+ mock_sandbox_spec = SandboxSpecInfo(
+ id='test-spec-id',
+ command=None,
+ working_dir='/workspace',
+ created_at=datetime.now(timezone.utc),
+ )
+
+ # Mock services
+ mock_app_conversation_service = MagicMock()
+ mock_app_conversation_service.get_app_conversation = AsyncMock(
+ return_value=mock_conversation
+ )
+
+ mock_sandbox_service = MagicMock()
+ mock_sandbox_service.get_sandbox = AsyncMock(return_value=mock_sandbox)
+
+ mock_sandbox_spec_service = MagicMock()
+ mock_sandbox_spec_service.get_sandbox_spec = AsyncMock(
+ return_value=mock_sandbox_spec
+ )
+
+ # Mock tempfile and file operations
+ temp_file_path = '/tmp/test_file_12345'
+ mock_file_result = FileOperationResult(
+ success=True,
+ source_path=file_path,
+ destination_path=temp_file_path,
+ file_size=len(file_content.encode('utf-8')),
+ )
+
+ with patch(
+ 'openhands.app_server.app_conversation.app_conversation_router.AsyncRemoteWorkspace'
+ ) as mock_workspace_class:
+ mock_workspace = MagicMock(spec=AsyncRemoteWorkspace)
+ mock_workspace.file_download = AsyncMock(return_value=mock_file_result)
+ mock_workspace_class.return_value = mock_workspace
+
+ with patch(
+ 'openhands.app_server.app_conversation.app_conversation_router.tempfile.NamedTemporaryFile'
+ ) as mock_tempfile:
+ mock_temp_file = MagicMock()
+ mock_temp_file.name = temp_file_path
+ mock_tempfile.return_value.__enter__ = MagicMock(
+ return_value=mock_temp_file
+ )
+ mock_tempfile.return_value.__exit__ = MagicMock(return_value=None)
+
+ with patch('builtins.open', create=True) as mock_open:
+ mock_file_handle = MagicMock()
+ mock_file_handle.read.return_value = file_content.encode('utf-8')
+ mock_open.return_value.__enter__ = MagicMock(
+ return_value=mock_file_handle
+ )
+ mock_open.return_value.__exit__ = MagicMock(return_value=None)
+
+ with patch(
+ 'openhands.app_server.app_conversation.app_conversation_router.os.unlink'
+ ) as mock_unlink:
+ # Call the endpoint
+ result = await read_conversation_file(
+ conversation_id=conversation_id,
+ file_path=file_path,
+ app_conversation_service=mock_app_conversation_service,
+ sandbox_service=mock_sandbox_service,
+ sandbox_spec_service=mock_sandbox_spec_service,
+ )
+
+ # Verify result
+ assert result == file_content
+
+ # Verify services were called correctly
+ mock_app_conversation_service.get_app_conversation.assert_called_once_with(
+ conversation_id
+ )
+ mock_sandbox_service.get_sandbox.assert_called_once_with(
+ 'test-sandbox-id'
+ )
+ mock_sandbox_spec_service.get_sandbox_spec.assert_called_once_with(
+ 'test-spec-id'
+ )
+
+ # Verify workspace was created and file_download was called
+ mock_workspace_class.assert_called_once()
+ mock_workspace.file_download.assert_called_once_with(
+ source_path=file_path,
+ destination_path=temp_file_path,
+ )
+
+ # Verify file was read and cleaned up
+ mock_open.assert_called_once_with(temp_file_path, 'rb')
+ mock_unlink.assert_called_once_with(temp_file_path)
+
+
+@pytest.mark.asyncio
+async def test_read_conversation_file_different_path():
+ """Test successfully retrieving file content from a different file path."""
+ conversation_id = uuid4()
+ file_path = '/workspace/project/src/main.py'
+ file_content = 'def main():\n print("Hello, World!")\n'
+
+ # Mock conversation
+ mock_conversation = AppConversation(
+ id=conversation_id,
+ created_by_user_id='test_user',
+ sandbox_id='test-sandbox-id',
+ title='Test Conversation',
+ sandbox_status=SandboxStatus.RUNNING,
+ execution_status=ConversationExecutionStatus.RUNNING,
+ session_api_key='test-api-key',
+ selected_repository='test/repo',
+ selected_branch='main',
+ git_provider=ProviderType.GITHUB,
+ trigger=ConversationTrigger.GUI,
+ created_at=datetime.now(timezone.utc),
+ updated_at=datetime.now(timezone.utc),
+ )
+
+ # Mock sandbox
+ mock_sandbox = SandboxInfo(
+ id='test-sandbox-id',
+ created_by_user_id='test_user',
+ sandbox_spec_id='test-spec-id',
+ status=SandboxStatus.RUNNING,
+ session_api_key='test-api-key',
+ exposed_urls=[
+ ExposedUrl(name=AGENT_SERVER, url='http://agent:8000', port=8000)
+ ],
+ )
+
+ # Mock sandbox spec
+ mock_sandbox_spec = SandboxSpecInfo(
+ id='test-spec-id',
+ command=None,
+ working_dir='/workspace',
+ created_at=datetime.now(timezone.utc),
+ )
+
+ # Mock services
+ mock_app_conversation_service = MagicMock()
+ mock_app_conversation_service.get_app_conversation = AsyncMock(
+ return_value=mock_conversation
+ )
+
+ mock_sandbox_service = MagicMock()
+ mock_sandbox_service.get_sandbox = AsyncMock(return_value=mock_sandbox)
+
+ mock_sandbox_spec_service = MagicMock()
+ mock_sandbox_spec_service.get_sandbox_spec = AsyncMock(
+ return_value=mock_sandbox_spec
+ )
+
+ # Mock tempfile and file operations
+ temp_file_path = '/tmp/test_file_67890'
+ mock_file_result = FileOperationResult(
+ success=True,
+ source_path=file_path,
+ destination_path=temp_file_path,
+ file_size=len(file_content.encode('utf-8')),
+ )
+
+ with patch(
+ 'openhands.app_server.app_conversation.app_conversation_router.AsyncRemoteWorkspace'
+ ) as mock_workspace_class:
+ mock_workspace = MagicMock(spec=AsyncRemoteWorkspace)
+ mock_workspace.file_download = AsyncMock(return_value=mock_file_result)
+ mock_workspace_class.return_value = mock_workspace
+
+ with patch(
+ 'openhands.app_server.app_conversation.app_conversation_router.tempfile.NamedTemporaryFile'
+ ) as mock_tempfile:
+ mock_temp_file = MagicMock()
+ mock_temp_file.name = temp_file_path
+ mock_tempfile.return_value.__enter__ = MagicMock(
+ return_value=mock_temp_file
+ )
+ mock_tempfile.return_value.__exit__ = MagicMock(return_value=None)
+
+ with patch('builtins.open', create=True) as mock_open:
+ mock_file_handle = MagicMock()
+ mock_file_handle.read.return_value = file_content.encode('utf-8')
+ mock_open.return_value.__enter__ = MagicMock(
+ return_value=mock_file_handle
+ )
+ mock_open.return_value.__exit__ = MagicMock(return_value=None)
+
+ with patch(
+ 'openhands.app_server.app_conversation.app_conversation_router.os.unlink'
+ ) as mock_unlink:
+ # Call the endpoint
+ result = await read_conversation_file(
+ conversation_id=conversation_id,
+ file_path=file_path,
+ app_conversation_service=mock_app_conversation_service,
+ sandbox_service=mock_sandbox_service,
+ sandbox_spec_service=mock_sandbox_spec_service,
+ )
+
+ # Verify result
+ assert result == file_content
+
+ # Verify workspace was created and file_download was called
+ mock_workspace_class.assert_called_once()
+ mock_workspace.file_download.assert_called_once_with(
+ source_path=file_path,
+ destination_path=temp_file_path,
+ )
+
+ # Verify file was read and cleaned up
+ mock_open.assert_called_once_with(temp_file_path, 'rb')
+ mock_unlink.assert_called_once_with(temp_file_path)
+
+
+@pytest.mark.asyncio
+async def test_read_conversation_file_conversation_not_found():
+ """Test when conversation doesn't exist."""
+ conversation_id = uuid4()
+ file_path = '/workspace/project/PLAN.md'
+
+ # Mock services
+ mock_app_conversation_service = MagicMock()
+ mock_app_conversation_service.get_app_conversation = AsyncMock(return_value=None)
+
+ mock_sandbox_service = MagicMock()
+ mock_sandbox_spec_service = MagicMock()
+
+ # Call the endpoint
+ result = await read_conversation_file(
+ conversation_id=conversation_id,
+ file_path=file_path,
+ app_conversation_service=mock_app_conversation_service,
+ sandbox_service=mock_sandbox_service,
+ sandbox_spec_service=mock_sandbox_spec_service,
+ )
+
+ # Verify result
+ assert result == ''
+
+ # Verify only conversation service was called
+ mock_app_conversation_service.get_app_conversation.assert_called_once_with(
+ conversation_id
+ )
+ mock_sandbox_service.get_sandbox.assert_not_called()
+ mock_sandbox_spec_service.get_sandbox_spec.assert_not_called()
+
+
+@pytest.mark.asyncio
+async def test_read_conversation_file_sandbox_not_found():
+ """Test when sandbox doesn't exist."""
+ conversation_id = uuid4()
+ file_path = '/workspace/project/PLAN.md'
+
+ # Mock conversation
+ mock_conversation = AppConversation(
+ id=conversation_id,
+ created_by_user_id='test_user',
+ sandbox_id='test-sandbox-id',
+ title='Test Conversation',
+ sandbox_status=SandboxStatus.RUNNING,
+ execution_status=ConversationExecutionStatus.RUNNING,
+ session_api_key='test-api-key',
+ selected_repository='test/repo',
+ selected_branch='main',
+ git_provider=ProviderType.GITHUB,
+ trigger=ConversationTrigger.GUI,
+ created_at=datetime.now(timezone.utc),
+ updated_at=datetime.now(timezone.utc),
+ )
+
+ # Mock services
+ mock_app_conversation_service = MagicMock()
+ mock_app_conversation_service.get_app_conversation = AsyncMock(
+ return_value=mock_conversation
+ )
+
+ mock_sandbox_service = MagicMock()
+ mock_sandbox_service.get_sandbox = AsyncMock(return_value=None)
+
+ mock_sandbox_spec_service = MagicMock()
+
+ # Call the endpoint
+ result = await read_conversation_file(
+ conversation_id=conversation_id,
+ file_path=file_path,
+ app_conversation_service=mock_app_conversation_service,
+ sandbox_service=mock_sandbox_service,
+ sandbox_spec_service=mock_sandbox_spec_service,
+ )
+
+ # Verify result
+ assert result == ''
+
+ # Verify services were called
+ mock_app_conversation_service.get_app_conversation.assert_called_once_with(
+ conversation_id
+ )
+ mock_sandbox_service.get_sandbox.assert_called_once_with('test-sandbox-id')
+ mock_sandbox_spec_service.get_sandbox_spec.assert_not_called()
+
+
+@pytest.mark.asyncio
+async def test_read_conversation_file_sandbox_not_running():
+ """Test when sandbox is not in RUNNING status."""
+ conversation_id = uuid4()
+ file_path = '/workspace/project/PLAN.md'
+
+ # Mock conversation
+ mock_conversation = AppConversation(
+ id=conversation_id,
+ created_by_user_id='test_user',
+ sandbox_id='test-sandbox-id',
+ title='Test Conversation',
+ sandbox_status=SandboxStatus.PAUSED,
+ execution_status=None,
+ session_api_key=None,
+ selected_repository='test/repo',
+ selected_branch='main',
+ git_provider=ProviderType.GITHUB,
+ trigger=ConversationTrigger.GUI,
+ created_at=datetime.now(timezone.utc),
+ updated_at=datetime.now(timezone.utc),
+ )
+
+ # Mock sandbox
+ mock_sandbox = SandboxInfo(
+ id='test-sandbox-id',
+ created_by_user_id='test_user',
+ sandbox_spec_id='test-spec-id',
+ status=SandboxStatus.PAUSED,
+ session_api_key=None,
+ exposed_urls=None,
+ )
+
+ # Mock services
+ mock_app_conversation_service = MagicMock()
+ mock_app_conversation_service.get_app_conversation = AsyncMock(
+ return_value=mock_conversation
+ )
+
+ mock_sandbox_service = MagicMock()
+ mock_sandbox_service.get_sandbox = AsyncMock(return_value=mock_sandbox)
+
+ mock_sandbox_spec_service = MagicMock()
+
+ # Call the endpoint
+ result = await read_conversation_file(
+ conversation_id=conversation_id,
+ file_path=file_path,
+ app_conversation_service=mock_app_conversation_service,
+ sandbox_service=mock_sandbox_service,
+ sandbox_spec_service=mock_sandbox_spec_service,
+ )
+
+ # Verify result
+ assert result == ''
+
+ # Verify services were called
+ mock_app_conversation_service.get_app_conversation.assert_called_once_with(
+ conversation_id
+ )
+ mock_sandbox_service.get_sandbox.assert_called_once_with('test-sandbox-id')
+ mock_sandbox_spec_service.get_sandbox_spec.assert_not_called()
+
+
+@pytest.mark.asyncio
+async def test_read_conversation_file_sandbox_spec_not_found():
+ """Test when sandbox spec doesn't exist."""
+ conversation_id = uuid4()
+ file_path = '/workspace/project/PLAN.md'
+
+ # Mock conversation
+ mock_conversation = AppConversation(
+ id=conversation_id,
+ created_by_user_id='test_user',
+ sandbox_id='test-sandbox-id',
+ title='Test Conversation',
+ sandbox_status=SandboxStatus.RUNNING,
+ execution_status=ConversationExecutionStatus.RUNNING,
+ session_api_key='test-api-key',
+ selected_repository='test/repo',
+ selected_branch='main',
+ git_provider=ProviderType.GITHUB,
+ trigger=ConversationTrigger.GUI,
+ created_at=datetime.now(timezone.utc),
+ updated_at=datetime.now(timezone.utc),
+ )
+
+ # Mock sandbox
+ mock_sandbox = SandboxInfo(
+ id='test-sandbox-id',
+ created_by_user_id='test_user',
+ sandbox_spec_id='test-spec-id',
+ status=SandboxStatus.RUNNING,
+ session_api_key='test-api-key',
+ exposed_urls=[
+ ExposedUrl(name=AGENT_SERVER, url='http://agent:8000', port=8000)
+ ],
+ )
+
+ # Mock services
+ mock_app_conversation_service = MagicMock()
+ mock_app_conversation_service.get_app_conversation = AsyncMock(
+ return_value=mock_conversation
+ )
+
+ mock_sandbox_service = MagicMock()
+ mock_sandbox_service.get_sandbox = AsyncMock(return_value=mock_sandbox)
+
+ mock_sandbox_spec_service = MagicMock()
+ mock_sandbox_spec_service.get_sandbox_spec = AsyncMock(return_value=None)
+
+ # Call the endpoint
+ result = await read_conversation_file(
+ conversation_id=conversation_id,
+ file_path=file_path,
+ app_conversation_service=mock_app_conversation_service,
+ sandbox_service=mock_sandbox_service,
+ sandbox_spec_service=mock_sandbox_spec_service,
+ )
+
+ # Verify result
+ assert result == ''
+
+ # Verify services were called
+ mock_app_conversation_service.get_app_conversation.assert_called_once_with(
+ conversation_id
+ )
+ mock_sandbox_service.get_sandbox.assert_called_once_with('test-sandbox-id')
+ mock_sandbox_spec_service.get_sandbox_spec.assert_called_once_with('test-spec-id')
+
+
+@pytest.mark.asyncio
+async def test_read_conversation_file_no_exposed_urls():
+ """Test when sandbox has no exposed URLs."""
+ conversation_id = uuid4()
+ file_path = '/workspace/project/PLAN.md'
+
+ # Mock conversation
+ mock_conversation = AppConversation(
+ id=conversation_id,
+ created_by_user_id='test_user',
+ sandbox_id='test-sandbox-id',
+ title='Test Conversation',
+ sandbox_status=SandboxStatus.RUNNING,
+ execution_status=ConversationExecutionStatus.RUNNING,
+ session_api_key='test-api-key',
+ selected_repository='test/repo',
+ selected_branch='main',
+ git_provider=ProviderType.GITHUB,
+ trigger=ConversationTrigger.GUI,
+ created_at=datetime.now(timezone.utc),
+ updated_at=datetime.now(timezone.utc),
+ )
+
+ # Mock sandbox with no exposed URLs
+ mock_sandbox = SandboxInfo(
+ id='test-sandbox-id',
+ created_by_user_id='test_user',
+ sandbox_spec_id='test-spec-id',
+ status=SandboxStatus.RUNNING,
+ session_api_key='test-api-key',
+ exposed_urls=None,
+ )
+
+ # Mock sandbox spec
+ mock_sandbox_spec = SandboxSpecInfo(
+ id='test-spec-id',
+ command=None,
+ working_dir='/workspace',
+ created_at=datetime.now(timezone.utc),
+ )
+
+ # Mock services
+ mock_app_conversation_service = MagicMock()
+ mock_app_conversation_service.get_app_conversation = AsyncMock(
+ return_value=mock_conversation
+ )
+
+ mock_sandbox_service = MagicMock()
+ mock_sandbox_service.get_sandbox = AsyncMock(return_value=mock_sandbox)
+
+ mock_sandbox_spec_service = MagicMock()
+ mock_sandbox_spec_service.get_sandbox_spec = AsyncMock(
+ return_value=mock_sandbox_spec
+ )
+
+ # Call the endpoint
+ result = await read_conversation_file(
+ conversation_id=conversation_id,
+ file_path=file_path,
+ app_conversation_service=mock_app_conversation_service,
+ sandbox_service=mock_sandbox_service,
+ sandbox_spec_service=mock_sandbox_spec_service,
+ )
+
+ # Verify result
+ assert result == ''
+
+
+@pytest.mark.asyncio
+async def test_read_conversation_file_no_agent_server_url():
+ """Test when sandbox has exposed URLs but no AGENT_SERVER."""
+ conversation_id = uuid4()
+ file_path = '/workspace/project/PLAN.md'
+
+ # Mock conversation
+ mock_conversation = AppConversation(
+ id=conversation_id,
+ created_by_user_id='test_user',
+ sandbox_id='test-sandbox-id',
+ title='Test Conversation',
+ sandbox_status=SandboxStatus.RUNNING,
+ execution_status=ConversationExecutionStatus.RUNNING,
+ session_api_key='test-api-key',
+ selected_repository='test/repo',
+ selected_branch='main',
+ git_provider=ProviderType.GITHUB,
+ trigger=ConversationTrigger.GUI,
+ created_at=datetime.now(timezone.utc),
+ updated_at=datetime.now(timezone.utc),
+ )
+
+ # Mock sandbox with exposed URLs but no AGENT_SERVER
+ mock_sandbox = SandboxInfo(
+ id='test-sandbox-id',
+ created_by_user_id='test_user',
+ sandbox_spec_id='test-spec-id',
+ status=SandboxStatus.RUNNING,
+ session_api_key='test-api-key',
+ exposed_urls=[
+ ExposedUrl(name='OTHER_SERVICE', url='http://other:9000', port=9000)
+ ],
+ )
+
+ # Mock sandbox spec
+ mock_sandbox_spec = SandboxSpecInfo(
+ id='test-spec-id',
+ command=None,
+ working_dir='/workspace',
+ created_at=datetime.now(timezone.utc),
+ )
+
+ # Mock services
+ mock_app_conversation_service = MagicMock()
+ mock_app_conversation_service.get_app_conversation = AsyncMock(
+ return_value=mock_conversation
+ )
+
+ mock_sandbox_service = MagicMock()
+ mock_sandbox_service.get_sandbox = AsyncMock(return_value=mock_sandbox)
+
+ mock_sandbox_spec_service = MagicMock()
+ mock_sandbox_spec_service.get_sandbox_spec = AsyncMock(
+ return_value=mock_sandbox_spec
+ )
+
+ # Call the endpoint
+ result = await read_conversation_file(
+ conversation_id=conversation_id,
+ file_path=file_path,
+ app_conversation_service=mock_app_conversation_service,
+ sandbox_service=mock_sandbox_service,
+ sandbox_spec_service=mock_sandbox_spec_service,
+ )
+
+ # Verify result
+ assert result == ''
+
+
+@pytest.mark.asyncio
+async def test_read_conversation_file_file_not_found():
+ """Test when file doesn't exist."""
+ conversation_id = uuid4()
+ file_path = '/workspace/project/PLAN.md'
+
+ # Mock conversation
+ mock_conversation = AppConversation(
+ id=conversation_id,
+ created_by_user_id='test_user',
+ sandbox_id='test-sandbox-id',
+ title='Test Conversation',
+ sandbox_status=SandboxStatus.RUNNING,
+ execution_status=ConversationExecutionStatus.RUNNING,
+ session_api_key='test-api-key',
+ selected_repository='test/repo',
+ selected_branch='main',
+ git_provider=ProviderType.GITHUB,
+ trigger=ConversationTrigger.GUI,
+ created_at=datetime.now(timezone.utc),
+ updated_at=datetime.now(timezone.utc),
+ )
+
+ # Mock sandbox
+ mock_sandbox = SandboxInfo(
+ id='test-sandbox-id',
+ created_by_user_id='test_user',
+ sandbox_spec_id='test-spec-id',
+ status=SandboxStatus.RUNNING,
+ session_api_key='test-api-key',
+ exposed_urls=[
+ ExposedUrl(name=AGENT_SERVER, url='http://agent:8000', port=8000)
+ ],
+ )
+
+ # Mock sandbox spec
+ mock_sandbox_spec = SandboxSpecInfo(
+ id='test-spec-id',
+ command=None,
+ working_dir='/workspace',
+ created_at=datetime.now(timezone.utc),
+ )
+
+ # Mock services
+ mock_app_conversation_service = MagicMock()
+ mock_app_conversation_service.get_app_conversation = AsyncMock(
+ return_value=mock_conversation
+ )
+
+ mock_sandbox_service = MagicMock()
+ mock_sandbox_service.get_sandbox = AsyncMock(return_value=mock_sandbox)
+
+ mock_sandbox_spec_service = MagicMock()
+ mock_sandbox_spec_service.get_sandbox_spec = AsyncMock(
+ return_value=mock_sandbox_spec
+ )
+
+ # Mock tempfile and file operations for file not found
+ temp_file_path = '/tmp/test_file_not_found'
+ mock_file_result = FileOperationResult(
+ success=False,
+ source_path=file_path,
+ destination_path=temp_file_path,
+ error=f'File not found: {file_path}',
+ )
+
+ with patch(
+ 'openhands.app_server.app_conversation.app_conversation_router.AsyncRemoteWorkspace'
+ ) as mock_workspace_class:
+ mock_workspace = MagicMock(spec=AsyncRemoteWorkspace)
+ mock_workspace.file_download = AsyncMock(return_value=mock_file_result)
+ mock_workspace_class.return_value = mock_workspace
+
+ with patch(
+ 'openhands.app_server.app_conversation.app_conversation_router.tempfile.NamedTemporaryFile'
+ ) as mock_tempfile:
+ mock_temp_file = MagicMock()
+ mock_temp_file.name = temp_file_path
+ mock_tempfile.return_value.__enter__ = MagicMock(
+ return_value=mock_temp_file
+ )
+ mock_tempfile.return_value.__exit__ = MagicMock(return_value=None)
+
+ with patch(
+ 'openhands.app_server.app_conversation.app_conversation_router.os.unlink'
+ ) as mock_unlink:
+ # Call the endpoint
+ result = await read_conversation_file(
+ conversation_id=conversation_id,
+ file_path=file_path,
+ app_conversation_service=mock_app_conversation_service,
+ sandbox_service=mock_sandbox_service,
+ sandbox_spec_service=mock_sandbox_spec_service,
+ )
+
+ # Verify result (empty string when file_download fails)
+ assert result == ''
+
+ # Verify cleanup still happens
+ mock_unlink.assert_called_once_with(temp_file_path)
+
+
+@pytest.mark.asyncio
+async def test_read_conversation_file_empty_file():
+ """Test when file exists but is empty."""
+ conversation_id = uuid4()
+ file_path = '/workspace/project/PLAN.md'
+
+ # Mock conversation
+ mock_conversation = AppConversation(
+ id=conversation_id,
+ created_by_user_id='test_user',
+ sandbox_id='test-sandbox-id',
+ title='Test Conversation',
+ sandbox_status=SandboxStatus.RUNNING,
+ execution_status=ConversationExecutionStatus.RUNNING,
+ session_api_key='test-api-key',
+ selected_repository='test/repo',
+ selected_branch='main',
+ git_provider=ProviderType.GITHUB,
+ trigger=ConversationTrigger.GUI,
+ created_at=datetime.now(timezone.utc),
+ updated_at=datetime.now(timezone.utc),
+ )
+
+ # Mock sandbox
+ mock_sandbox = SandboxInfo(
+ id='test-sandbox-id',
+ created_by_user_id='test_user',
+ sandbox_spec_id='test-spec-id',
+ status=SandboxStatus.RUNNING,
+ session_api_key='test-api-key',
+ exposed_urls=[
+ ExposedUrl(name=AGENT_SERVER, url='http://agent:8000', port=8000)
+ ],
+ )
+
+ # Mock sandbox spec
+ mock_sandbox_spec = SandboxSpecInfo(
+ id='test-spec-id',
+ command=None,
+ working_dir='/workspace',
+ created_at=datetime.now(timezone.utc),
+ )
+
+ # Mock services
+ mock_app_conversation_service = MagicMock()
+ mock_app_conversation_service.get_app_conversation = AsyncMock(
+ return_value=mock_conversation
+ )
+
+ mock_sandbox_service = MagicMock()
+ mock_sandbox_service.get_sandbox = AsyncMock(return_value=mock_sandbox)
+
+ mock_sandbox_spec_service = MagicMock()
+ mock_sandbox_spec_service.get_sandbox_spec = AsyncMock(
+ return_value=mock_sandbox_spec
+ )
+
+ # Mock tempfile and file operations for empty file
+ temp_file_path = '/tmp/test_file_empty'
+ empty_content = ''
+ mock_file_result = FileOperationResult(
+ success=True,
+ source_path=file_path,
+ destination_path=temp_file_path,
+ file_size=0,
+ )
+
+ with patch(
+ 'openhands.app_server.app_conversation.app_conversation_router.AsyncRemoteWorkspace'
+ ) as mock_workspace_class:
+ mock_workspace = MagicMock(spec=AsyncRemoteWorkspace)
+ mock_workspace.file_download = AsyncMock(return_value=mock_file_result)
+ mock_workspace_class.return_value = mock_workspace
+
+ with patch(
+ 'openhands.app_server.app_conversation.app_conversation_router.tempfile.NamedTemporaryFile'
+ ) as mock_tempfile:
+ mock_temp_file = MagicMock()
+ mock_temp_file.name = temp_file_path
+ mock_tempfile.return_value.__enter__ = MagicMock(
+ return_value=mock_temp_file
+ )
+ mock_tempfile.return_value.__exit__ = MagicMock(return_value=None)
+
+ with patch('builtins.open', create=True) as mock_open:
+ mock_file_handle = MagicMock()
+ mock_file_handle.read.return_value = empty_content.encode('utf-8')
+ mock_open.return_value.__enter__ = MagicMock(
+ return_value=mock_file_handle
+ )
+ mock_open.return_value.__exit__ = MagicMock(return_value=None)
+
+ with patch(
+ 'openhands.app_server.app_conversation.app_conversation_router.os.unlink'
+ ) as mock_unlink:
+ # Call the endpoint
+ result = await read_conversation_file(
+ conversation_id=conversation_id,
+ file_path=file_path,
+ app_conversation_service=mock_app_conversation_service,
+ sandbox_service=mock_sandbox_service,
+ sandbox_spec_service=mock_sandbox_spec_service,
+ )
+
+ # Verify result (empty string when file is empty)
+ assert result == ''
+
+ # Verify cleanup happens
+ mock_unlink.assert_called_once_with(temp_file_path)
+
+
+@pytest.mark.asyncio
+async def test_read_conversation_file_command_exception():
+ """Test when command execution raises an exception."""
+ conversation_id = uuid4()
+ file_path = '/workspace/project/PLAN.md'
+
+ # Mock conversation
+ mock_conversation = AppConversation(
+ id=conversation_id,
+ created_by_user_id='test_user',
+ sandbox_id='test-sandbox-id',
+ title='Test Conversation',
+ sandbox_status=SandboxStatus.RUNNING,
+ execution_status=ConversationExecutionStatus.RUNNING,
+ session_api_key='test-api-key',
+ selected_repository='test/repo',
+ selected_branch='main',
+ git_provider=ProviderType.GITHUB,
+ trigger=ConversationTrigger.GUI,
+ created_at=datetime.now(timezone.utc),
+ updated_at=datetime.now(timezone.utc),
+ )
+
+ # Mock sandbox
+ mock_sandbox = SandboxInfo(
+ id='test-sandbox-id',
+ created_by_user_id='test_user',
+ sandbox_spec_id='test-spec-id',
+ status=SandboxStatus.RUNNING,
+ session_api_key='test-api-key',
+ exposed_urls=[
+ ExposedUrl(name=AGENT_SERVER, url='http://agent:8000', port=8000)
+ ],
+ )
+
+ # Mock sandbox spec
+ mock_sandbox_spec = SandboxSpecInfo(
+ id='test-spec-id',
+ command=None,
+ working_dir='/workspace',
+ created_at=datetime.now(timezone.utc),
+ )
+
+ # Mock services
+ mock_app_conversation_service = MagicMock()
+ mock_app_conversation_service.get_app_conversation = AsyncMock(
+ return_value=mock_conversation
+ )
+
+ mock_sandbox_service = MagicMock()
+ mock_sandbox_service.get_sandbox = AsyncMock(return_value=mock_sandbox)
+
+ mock_sandbox_spec_service = MagicMock()
+ mock_sandbox_spec_service.get_sandbox_spec = AsyncMock(
+ return_value=mock_sandbox_spec
+ )
+
+ # Mock tempfile and file operations for exception case
+ temp_file_path = '/tmp/test_file_exception'
+
+ with patch(
+ 'openhands.app_server.app_conversation.app_conversation_router.AsyncRemoteWorkspace'
+ ) as mock_workspace_class:
+ mock_workspace = MagicMock(spec=AsyncRemoteWorkspace)
+ mock_workspace.file_download = AsyncMock(
+ side_effect=Exception('Connection timeout')
+ )
+ mock_workspace_class.return_value = mock_workspace
+
+ with patch(
+ 'openhands.app_server.app_conversation.app_conversation_router.tempfile.NamedTemporaryFile'
+ ) as mock_tempfile:
+ mock_temp_file = MagicMock()
+ mock_temp_file.name = temp_file_path
+ mock_tempfile.return_value.__enter__ = MagicMock(
+ return_value=mock_temp_file
+ )
+ mock_tempfile.return_value.__exit__ = MagicMock(return_value=None)
+
+ with patch(
+ 'openhands.app_server.app_conversation.app_conversation_router.os.unlink'
+ ) as mock_unlink:
+ # Call the endpoint
+ result = await read_conversation_file(
+ conversation_id=conversation_id,
+ file_path=file_path,
+ app_conversation_service=mock_app_conversation_service,
+ sandbox_service=mock_sandbox_service,
+ sandbox_spec_service=mock_sandbox_spec_service,
+ )
+
+ # Verify result (empty string on exception)
+ assert result == ''
+
+ # Verify cleanup still happens even on exception
+ mock_unlink.assert_called_once_with(temp_file_path)
diff --git a/tests/unit/server/routes/test_mcp_routes.py b/tests/unit/server/routes/test_mcp_routes.py
index 1a55cc0a39e4..8677b8c85c37 100644
--- a/tests/unit/server/routes/test_mcp_routes.py
+++ b/tests/unit/server/routes/test_mcp_routes.py
@@ -1,3 +1,4 @@
+import warnings
from unittest.mock import AsyncMock, patch
import pytest
@@ -7,6 +8,38 @@
from openhands.server.types import AppMode
+def test_mcp_server_no_stateless_http_deprecation_warning():
+ """Test that mcp_server is created without stateless_http deprecation warning.
+
+ This test verifies the fix for the fastmcp deprecation warning:
+ 'Providing `stateless_http` when creating a server is deprecated.
+ Provide it when calling `run` or as a global setting instead.'
+
+ The fix moves the stateless_http parameter from FastMCP() constructor
+ to the http_app() method call.
+ """
+ with warnings.catch_warnings(record=True) as w:
+ warnings.simplefilter('always')
+
+ # Import the mcp_server which triggers FastMCP creation
+ from openhands.server.routes.mcp import mcp_server
+
+ # Check that no deprecation warning about stateless_http was raised
+ stateless_http_warnings = [
+ warning
+ for warning in w
+ if issubclass(warning.category, DeprecationWarning)
+ and 'stateless_http' in str(warning.message)
+ ]
+
+ assert len(stateless_http_warnings) == 0, (
+ f'Unexpected stateless_http deprecation warning: {stateless_http_warnings}'
+ )
+
+ # Verify mcp_server was created successfully
+ assert mcp_server is not None
+
+
@pytest.mark.asyncio
async def test_get_conversation_link_non_saas_mode():
"""Test get_conversation_link in non-SAAS mode."""
diff --git a/tests/unit/server/routes/test_settings_api.py b/tests/unit/server/routes/test_settings_api.py
index f01b1d77df3a..6ea408038810 100644
--- a/tests/unit/server/routes/test_settings_api.py
+++ b/tests/unit/server/routes/test_settings_api.py
@@ -46,6 +46,9 @@ async def get_secrets_store(self) -> SecretsStore | None:
async def get_secrets(self) -> Secrets | None:
return None
+ async def get_mcp_api_key(self) -> str | None:
+ return None
+
@classmethod
async def get_instance(cls, request: Request) -> UserAuth:
return MockUserAuth()
diff --git a/tests/unit/server/routes/test_settings_store_functions.py b/tests/unit/server/routes/test_settings_store_functions.py
index 6296a8e354cf..c6eb6f5628c8 100644
--- a/tests/unit/server/routes/test_settings_store_functions.py
+++ b/tests/unit/server/routes/test_settings_store_functions.py
@@ -2,13 +2,16 @@
from unittest.mock import AsyncMock, MagicMock, patch
import pytest
+from fastapi import FastAPI
from fastapi.testclient import TestClient
from pydantic import SecretStr
from openhands.integrations.provider import ProviderToken
from openhands.integrations.service_types import ProviderType
from openhands.server.routes.secrets import (
- app,
+ app as secrets_router,
+)
+from openhands.server.routes.secrets import (
check_provider_tokens,
)
from openhands.server.routes.settings import store_llm_settings
@@ -27,7 +30,12 @@ async def get_settings_store(request):
@pytest.fixture
def test_client():
- # Create a test client
+ # Create a test client with a FastAPI app that includes the secrets router
+ # This is necessary because TestClient with APIRouter directly doesn't set up
+ # the full middleware stack in newer FastAPI versions (0.118.0+)
+ test_app = FastAPI()
+ test_app.include_router(secrets_router)
+
with (
patch.dict(os.environ, {'SESSION_API_KEY': ''}, clear=False),
patch('openhands.server.dependencies._SESSION_API_KEY', None),
@@ -36,7 +44,7 @@ def test_client():
AsyncMock(return_value=''),
),
):
- client = TestClient(app)
+ client = TestClient(test_app)
yield client
diff --git a/tests/unit/server/session/test_conversation_init_data.py b/tests/unit/server/session/test_conversation_init_data.py
new file mode 100644
index 000000000000..3c5d7d97f792
--- /dev/null
+++ b/tests/unit/server/session/test_conversation_init_data.py
@@ -0,0 +1,272 @@
+"""Unit tests for ConversationInitData - specifically testing the field validator.
+
+These tests verify that the immutable_validator correctly converts dict to MappingProxyType
+for git_provider_tokens and custom_secrets fields, ensuring type safety.
+"""
+
+from types import MappingProxyType
+
+import pytest
+from pydantic import SecretStr
+
+from openhands.integrations.provider import CustomSecret, ProviderToken, ProviderType
+from openhands.server.session.conversation_init_data import ConversationInitData
+from openhands.storage.data_models.settings import Settings
+
+
+@pytest.fixture
+def base_settings():
+ """Create a base Settings object with minimal required fields."""
+ return Settings(
+ language='en',
+ agent='CodeActAgent',
+ max_iterations=100,
+ llm_model='anthropic/claude-3-5-sonnet-20241022',
+ llm_api_key=SecretStr('test_api_key_12345'),
+ llm_base_url=None,
+ )
+
+
+class TestConversationInitDataValidator:
+ """Test suite for ConversationInitData field validator."""
+
+ def test_git_provider_tokens_dict_converted_to_mappingproxy(self, base_settings):
+ """Test that dict passed as git_provider_tokens is converted to MappingProxyType."""
+ # Create provider tokens as a regular dict
+ provider_tokens_dict = {
+ ProviderType.GITHUB: ProviderToken(
+ token=SecretStr('ghp_test_token_123'), user_id='test_user'
+ ),
+ ProviderType.GITLAB: ProviderToken(
+ token=SecretStr('glpat_test_token_456'), user_id='test_user_2'
+ ),
+ }
+
+ # Create ConversationInitData with dict
+ init_data = ConversationInitData(
+ **base_settings.__dict__,
+ git_provider_tokens=provider_tokens_dict,
+ )
+
+ # Verify it's now a MappingProxyType
+ assert isinstance(init_data.git_provider_tokens, MappingProxyType)
+ assert ProviderType.GITHUB in init_data.git_provider_tokens
+ assert ProviderType.GITLAB in init_data.git_provider_tokens
+ assert (
+ init_data.git_provider_tokens[ProviderType.GITHUB].token.get_secret_value()
+ == 'ghp_test_token_123'
+ )
+
+ def test_git_provider_tokens_mappingproxy_preserved(self, base_settings):
+ """Test that MappingProxyType passed as git_provider_tokens is converted to MappingProxyType."""
+ # Create provider tokens as MappingProxyType
+ provider_token = ProviderToken(
+ token=SecretStr('ghp_test_token_789'), user_id='test_user_3'
+ )
+ provider_tokens_proxy = MappingProxyType({ProviderType.GITHUB: provider_token})
+
+ # Create ConversationInitData with MappingProxyType
+ init_data = ConversationInitData(
+ **base_settings.__dict__,
+ git_provider_tokens=provider_tokens_proxy,
+ )
+
+ # Verify it's a MappingProxyType (Pydantic may create a new one, but type is preserved)
+ assert isinstance(init_data.git_provider_tokens, MappingProxyType)
+ assert (
+ init_data.git_provider_tokens[ProviderType.GITHUB].token.get_secret_value()
+ == 'ghp_test_token_789'
+ )
+ assert (
+ init_data.git_provider_tokens[ProviderType.GITHUB].user_id == 'test_user_3'
+ )
+
+ def test_git_provider_tokens_none_preserved(self, base_settings):
+ """Test that None passed as git_provider_tokens is preserved."""
+ # Create ConversationInitData with None
+ init_data = ConversationInitData(
+ **base_settings.__dict__,
+ git_provider_tokens=None,
+ )
+
+ # Verify it's still None
+ assert init_data.git_provider_tokens is None
+
+ def test_custom_secrets_dict_converted_to_mappingproxy(self, base_settings):
+ """Test that dict passed as custom_secrets is converted to MappingProxyType."""
+ # Create custom secrets as a regular dict
+ custom_secrets_dict = {
+ 'API_KEY': CustomSecret(
+ secret=SecretStr('api_key_123'), description='API key for service'
+ ),
+ 'DATABASE_URL': CustomSecret(
+ secret=SecretStr('postgres://localhost'), description='Database URL'
+ ),
+ }
+
+ # Create ConversationInitData with dict
+ init_data = ConversationInitData(
+ **base_settings.__dict__,
+ custom_secrets=custom_secrets_dict,
+ )
+
+ # Verify it's now a MappingProxyType
+ assert isinstance(init_data.custom_secrets, MappingProxyType)
+ assert 'API_KEY' in init_data.custom_secrets
+ assert 'DATABASE_URL' in init_data.custom_secrets
+ assert (
+ init_data.custom_secrets['API_KEY'].secret.get_secret_value()
+ == 'api_key_123'
+ )
+
+ def test_custom_secrets_mappingproxy_preserved(self, base_settings):
+ """Test that MappingProxyType passed as custom_secrets is converted to MappingProxyType."""
+ # Create custom secrets as MappingProxyType
+ custom_secret = CustomSecret(
+ secret=SecretStr('api_key_456'), description='API key'
+ )
+ custom_secrets_proxy = MappingProxyType({'API_KEY': custom_secret})
+
+ # Create ConversationInitData with MappingProxyType
+ init_data = ConversationInitData(
+ **base_settings.__dict__,
+ custom_secrets=custom_secrets_proxy,
+ )
+
+ # Verify it's a MappingProxyType (Pydantic may create a new one, but type is preserved)
+ assert isinstance(init_data.custom_secrets, MappingProxyType)
+ assert (
+ init_data.custom_secrets['API_KEY'].secret.get_secret_value()
+ == 'api_key_456'
+ )
+ assert init_data.custom_secrets['API_KEY'].description == 'API key'
+
+ def test_custom_secrets_none_preserved(self, base_settings):
+ """Test that None passed as custom_secrets is preserved."""
+ # Create ConversationInitData with None
+ init_data = ConversationInitData(
+ **base_settings.__dict__,
+ custom_secrets=None,
+ )
+
+ # Verify it's still None
+ assert init_data.custom_secrets is None
+
+ def test_both_fields_dict_converted(self, base_settings):
+ """Test that both fields are converted when passed as dicts."""
+ provider_tokens_dict = {
+ ProviderType.GITHUB: ProviderToken(
+ token=SecretStr('ghp_token'), user_id='user1'
+ )
+ }
+ custom_secrets_dict = {
+ 'SECRET': CustomSecret(
+ secret=SecretStr('secret_value'), description='A secret'
+ )
+ }
+
+ init_data = ConversationInitData(
+ **base_settings.__dict__,
+ git_provider_tokens=provider_tokens_dict,
+ custom_secrets=custom_secrets_dict,
+ )
+
+ # Both should be MappingProxyType
+ assert isinstance(init_data.git_provider_tokens, MappingProxyType)
+ assert isinstance(init_data.custom_secrets, MappingProxyType)
+
+ def test_empty_dict_converted_to_mappingproxy(self, base_settings):
+ """Test that empty dict is converted to empty MappingProxyType."""
+ # Create ConversationInitData with empty dicts
+ init_data = ConversationInitData(
+ **base_settings.__dict__,
+ git_provider_tokens={},
+ custom_secrets={},
+ )
+
+ # Both should be MappingProxyType (even if empty)
+ assert isinstance(init_data.git_provider_tokens, MappingProxyType)
+ assert isinstance(init_data.custom_secrets, MappingProxyType)
+ assert len(init_data.git_provider_tokens) == 0
+ assert len(init_data.custom_secrets) == 0
+
+ def test_validator_prevents_mutation(self, base_settings):
+ """Test that MappingProxyType prevents mutation of the underlying data."""
+ provider_tokens_dict = {
+ ProviderType.GITHUB: ProviderToken(
+ token=SecretStr('ghp_token'), user_id='user1'
+ )
+ }
+
+ init_data = ConversationInitData(
+ **base_settings.__dict__,
+ git_provider_tokens=provider_tokens_dict,
+ )
+
+ # Verify it's a MappingProxyType (which is immutable)
+ assert isinstance(init_data.git_provider_tokens, MappingProxyType)
+
+ # Verify that attempting to modify would raise (MappingProxyType is read-only)
+ with pytest.raises(TypeError):
+ # MappingProxyType doesn't support item assignment
+ init_data.git_provider_tokens[ProviderType.GITLAB] = ProviderToken(
+ token=SecretStr('new_token')
+ )
+
+ def test_validator_with_settings_dict_unpacking(self, base_settings):
+ """Test validator works when creating from unpacked settings dict.
+
+ This simulates the real-world usage in conversation_service.py where
+ session_init_args is created from settings.__dict__.
+ """
+ # Simulate the pattern used in conversation_service.py
+ session_init_args = {**base_settings.__dict__}
+ session_init_args['git_provider_tokens'] = {
+ ProviderType.GITHUB: ProviderToken(
+ token=SecretStr('ghp_from_dict'), user_id='user_from_dict'
+ )
+ }
+
+ # Create ConversationInitData from unpacked dict
+ init_data = ConversationInitData(**session_init_args)
+
+ # Verify it's converted to MappingProxyType
+ assert isinstance(init_data.git_provider_tokens, MappingProxyType)
+ assert (
+ init_data.git_provider_tokens[ProviderType.GITHUB].token.get_secret_value()
+ == 'ghp_from_dict'
+ )
+
+ def test_validator_with_mixed_types(self, base_settings):
+ """Test validator with one field as dict and one as MappingProxyType."""
+ # git_provider_tokens as dict
+ provider_tokens_dict = {
+ ProviderType.GITHUB: ProviderToken(
+ token=SecretStr('ghp_dict_token'), user_id='user_dict'
+ )
+ }
+
+ # custom_secrets as MappingProxyType
+ custom_secret = CustomSecret(
+ secret=SecretStr('secret_proxy'), description='From proxy'
+ )
+ custom_secrets_proxy = MappingProxyType({'SECRET': custom_secret})
+
+ init_data = ConversationInitData(
+ **base_settings.__dict__,
+ git_provider_tokens=provider_tokens_dict,
+ custom_secrets=custom_secrets_proxy,
+ )
+
+ # Both should be MappingProxyType
+ assert isinstance(init_data.git_provider_tokens, MappingProxyType)
+ assert isinstance(init_data.custom_secrets, MappingProxyType)
+ # Verify the content is preserved (Pydantic may create new MappingProxyType instances)
+ assert (
+ init_data.git_provider_tokens[ProviderType.GITHUB].token.get_secret_value()
+ == 'ghp_dict_token'
+ )
+ assert (
+ init_data.custom_secrets['SECRET'].secret.get_secret_value()
+ == 'secret_proxy'
+ )
diff --git a/tests/unit/server/test_openapi_schema_generation.py b/tests/unit/server/test_openapi_schema_generation.py
index 2aa798e1e650..eb967e496c68 100644
--- a/tests/unit/server/test_openapi_schema_generation.py
+++ b/tests/unit/server/test_openapi_schema_generation.py
@@ -46,6 +46,9 @@ async def get_secrets_store(self) -> SecretsStore | None:
async def get_secrets(self) -> Secrets | None:
return None
+ async def get_mcp_api_key(self) -> str | None:
+ return None
+
@classmethod
async def get_instance(cls, request: Request) -> UserAuth:
return MockUserAuth()
diff --git a/tests/unit/utils/test_posthog_tracker.py b/tests/unit/utils/test_posthog_tracker.py
deleted file mode 100644
index cec0eff0ccc0..000000000000
--- a/tests/unit/utils/test_posthog_tracker.py
+++ /dev/null
@@ -1,356 +0,0 @@
-"""Unit tests for PostHog tracking utilities."""
-
-from unittest.mock import MagicMock, patch
-
-import pytest
-
-from openhands.utils.posthog_tracker import (
- alias_user_identities,
- track_agent_task_completed,
- track_credit_limit_reached,
- track_credits_purchased,
- track_user_signup_completed,
-)
-
-
-@pytest.fixture
-def mock_posthog():
- """Mock the posthog module."""
- with patch('openhands.utils.posthog_tracker.posthog') as mock_ph:
- mock_ph.capture = MagicMock()
- yield mock_ph
-
-
-def test_track_agent_task_completed_with_user_id(mock_posthog):
- """Test tracking agent task completion with user ID."""
- # Initialize posthog manually in the test
- import openhands.utils.posthog_tracker as tracker
-
- tracker.posthog = mock_posthog
-
- track_agent_task_completed(
- conversation_id='test-conversation-123',
- user_id='user-456',
- app_mode='saas',
- )
-
- mock_posthog.capture.assert_called_once_with(
- distinct_id='user-456',
- event='agent_task_completed',
- properties={
- 'conversation_id': 'test-conversation-123',
- 'user_id': 'user-456',
- 'app_mode': 'saas',
- },
- )
-
-
-def test_track_agent_task_completed_without_user_id(mock_posthog):
- """Test tracking agent task completion without user ID (anonymous)."""
- import openhands.utils.posthog_tracker as tracker
-
- tracker.posthog = mock_posthog
-
- track_agent_task_completed(
- conversation_id='test-conversation-789',
- user_id=None,
- app_mode='oss',
- )
-
- mock_posthog.capture.assert_called_once_with(
- distinct_id='conversation_test-conversation-789',
- event='agent_task_completed',
- properties={
- 'conversation_id': 'test-conversation-789',
- 'user_id': None,
- 'app_mode': 'oss',
- },
- )
-
-
-def test_track_agent_task_completed_default_app_mode(mock_posthog):
- """Test tracking with default app_mode."""
- import openhands.utils.posthog_tracker as tracker
-
- tracker.posthog = mock_posthog
-
- track_agent_task_completed(
- conversation_id='test-conversation-999',
- user_id='user-111',
- )
-
- mock_posthog.capture.assert_called_once_with(
- distinct_id='user-111',
- event='agent_task_completed',
- properties={
- 'conversation_id': 'test-conversation-999',
- 'user_id': 'user-111',
- 'app_mode': 'unknown',
- },
- )
-
-
-def test_track_agent_task_completed_handles_errors(mock_posthog):
- """Test that tracking errors are handled gracefully."""
- import openhands.utils.posthog_tracker as tracker
-
- tracker.posthog = mock_posthog
- mock_posthog.capture.side_effect = Exception('PostHog API error')
-
- # Should not raise an exception
- track_agent_task_completed(
- conversation_id='test-conversation-error',
- user_id='user-error',
- app_mode='saas',
- )
-
-
-def test_track_agent_task_completed_when_posthog_not_installed():
- """Test tracking when posthog is not installed."""
- import openhands.utils.posthog_tracker as tracker
-
- # Simulate posthog not being installed
- tracker.posthog = None
-
- # Should not raise an exception
- track_agent_task_completed(
- conversation_id='test-conversation-no-ph',
- user_id='user-no-ph',
- app_mode='oss',
- )
-
-
-def test_track_user_signup_completed(mock_posthog):
- """Test tracking user signup completion."""
- import openhands.utils.posthog_tracker as tracker
-
- tracker.posthog = mock_posthog
-
- track_user_signup_completed(
- user_id='test-user-123',
- signup_timestamp='2025-01-15T10:30:00Z',
- )
-
- mock_posthog.capture.assert_called_once_with(
- distinct_id='test-user-123',
- event='user_signup_completed',
- properties={
- 'user_id': 'test-user-123',
- 'signup_timestamp': '2025-01-15T10:30:00Z',
- },
- )
-
-
-def test_track_user_signup_completed_handles_errors(mock_posthog):
- """Test that user signup tracking errors are handled gracefully."""
- import openhands.utils.posthog_tracker as tracker
-
- tracker.posthog = mock_posthog
- mock_posthog.capture.side_effect = Exception('PostHog API error')
-
- # Should not raise an exception
- track_user_signup_completed(
- user_id='test-user-error',
- signup_timestamp='2025-01-15T12:00:00Z',
- )
-
-
-def test_track_user_signup_completed_when_posthog_not_installed():
- """Test user signup tracking when posthog is not installed."""
- import openhands.utils.posthog_tracker as tracker
-
- # Simulate posthog not being installed
- tracker.posthog = None
-
- # Should not raise an exception
- track_user_signup_completed(
- user_id='test-user-no-ph',
- signup_timestamp='2025-01-15T13:00:00Z',
- )
-
-
-def test_track_credit_limit_reached_with_user_id(mock_posthog):
- """Test tracking credit limit reached with user ID."""
- import openhands.utils.posthog_tracker as tracker
-
- tracker.posthog = mock_posthog
-
- track_credit_limit_reached(
- conversation_id='test-conversation-456',
- user_id='user-789',
- current_budget=10.50,
- max_budget=10.00,
- )
-
- mock_posthog.capture.assert_called_once_with(
- distinct_id='user-789',
- event='credit_limit_reached',
- properties={
- 'conversation_id': 'test-conversation-456',
- 'user_id': 'user-789',
- 'current_budget': 10.50,
- 'max_budget': 10.00,
- },
- )
-
-
-def test_track_credit_limit_reached_without_user_id(mock_posthog):
- """Test tracking credit limit reached without user ID (anonymous)."""
- import openhands.utils.posthog_tracker as tracker
-
- tracker.posthog = mock_posthog
-
- track_credit_limit_reached(
- conversation_id='test-conversation-999',
- user_id=None,
- current_budget=5.25,
- max_budget=5.00,
- )
-
- mock_posthog.capture.assert_called_once_with(
- distinct_id='conversation_test-conversation-999',
- event='credit_limit_reached',
- properties={
- 'conversation_id': 'test-conversation-999',
- 'user_id': None,
- 'current_budget': 5.25,
- 'max_budget': 5.00,
- },
- )
-
-
-def test_track_credit_limit_reached_handles_errors(mock_posthog):
- """Test that credit limit tracking errors are handled gracefully."""
- import openhands.utils.posthog_tracker as tracker
-
- tracker.posthog = mock_posthog
- mock_posthog.capture.side_effect = Exception('PostHog API error')
-
- # Should not raise an exception
- track_credit_limit_reached(
- conversation_id='test-conversation-error',
- user_id='user-error',
- current_budget=15.00,
- max_budget=10.00,
- )
-
-
-def test_track_credit_limit_reached_when_posthog_not_installed():
- """Test credit limit tracking when posthog is not installed."""
- import openhands.utils.posthog_tracker as tracker
-
- # Simulate posthog not being installed
- tracker.posthog = None
-
- # Should not raise an exception
- track_credit_limit_reached(
- conversation_id='test-conversation-no-ph',
- user_id='user-no-ph',
- current_budget=8.00,
- max_budget=5.00,
- )
-
-
-def test_track_credits_purchased(mock_posthog):
- """Test tracking credits purchased."""
- import openhands.utils.posthog_tracker as tracker
-
- tracker.posthog = mock_posthog
-
- track_credits_purchased(
- user_id='test-user-999',
- amount_usd=50.00,
- credits_added=50.00,
- stripe_session_id='cs_test_abc123',
- )
-
- mock_posthog.capture.assert_called_once_with(
- distinct_id='test-user-999',
- event='credits_purchased',
- properties={
- 'user_id': 'test-user-999',
- 'amount_usd': 50.00,
- 'credits_added': 50.00,
- 'stripe_session_id': 'cs_test_abc123',
- },
- )
-
-
-def test_track_credits_purchased_handles_errors(mock_posthog):
- """Test that credits purchased tracking errors are handled gracefully."""
- import openhands.utils.posthog_tracker as tracker
-
- tracker.posthog = mock_posthog
- mock_posthog.capture.side_effect = Exception('PostHog API error')
-
- # Should not raise an exception
- track_credits_purchased(
- user_id='test-user-error',
- amount_usd=100.00,
- credits_added=100.00,
- stripe_session_id='cs_test_error',
- )
-
-
-def test_track_credits_purchased_when_posthog_not_installed():
- """Test credits purchased tracking when posthog is not installed."""
- import openhands.utils.posthog_tracker as tracker
-
- # Simulate posthog not being installed
- tracker.posthog = None
-
- # Should not raise an exception
- track_credits_purchased(
- user_id='test-user-no-ph',
- amount_usd=25.00,
- credits_added=25.00,
- stripe_session_id='cs_test_no_ph',
- )
-
-
-def test_alias_user_identities(mock_posthog):
- """Test aliasing user identities.
-
- Verifies that posthog.alias(previous_id, distinct_id) is called correctly
- where git_login is the previous_id and keycloak_user_id is the distinct_id.
- """
- import openhands.utils.posthog_tracker as tracker
-
- tracker.posthog = mock_posthog
- mock_posthog.alias = MagicMock()
-
- alias_user_identities(
- keycloak_user_id='keycloak-123',
- git_login='git-user',
- )
-
- # Verify: posthog.alias(previous_id='git-user', distinct_id='keycloak-123')
- mock_posthog.alias.assert_called_once_with('git-user', 'keycloak-123')
-
-
-def test_alias_user_identities_handles_errors(mock_posthog):
- """Test that aliasing errors are handled gracefully."""
- import openhands.utils.posthog_tracker as tracker
-
- tracker.posthog = mock_posthog
- mock_posthog.alias = MagicMock(side_effect=Exception('PostHog API error'))
-
- # Should not raise an exception
- alias_user_identities(
- keycloak_user_id='keycloak-error',
- git_login='git-error',
- )
-
-
-def test_alias_user_identities_when_posthog_not_installed():
- """Test aliasing when posthog is not installed."""
- import openhands.utils.posthog_tracker as tracker
-
- # Simulate posthog not being installed
- tracker.posthog = None
-
- # Should not raise an exception
- alias_user_identities(
- keycloak_user_id='keycloak-no-ph',
- git_login='git-no-ph',
- )
diff --git a/trigger_commit.txt b/trigger_commit.txt
deleted file mode 100644
index 402f8bb0e55f..000000000000
--- a/trigger_commit.txt
+++ /dev/null
@@ -1 +0,0 @@
-# Trigger E2E test run
+ 
- 
+ 
@@ -35,9 +35,9 @@ There are a few ways to work with OpenHands:
### OpenHands Software Agent SDK
The SDK is a composable Python library that contains all of our agentic tech. It's the engine that powers everything else below.
-Define agents in code, then run them locally, or scale to 1000s of agents in the cloud
+Define agents in code, then run them locally, or scale to 1000s of agents in the cloud.
-[Check out the docs](https://docs.openhands.dev/sdk) or [view the source](https://github.com/All-Hands-AI/agent-sdk/)
+[Check out the docs](https://docs.openhands.dev/sdk) or [view the source](https://github.com/OpenHands/software-agent-sdk/)
### OpenHands CLI
The CLI is the easiest way to start using OpenHands. The experience will be familiar to anyone who has worked
@@ -52,18 +52,15 @@ The experience will be familiar to anyone who has used Devin or Jules.
[Check out the docs](https://docs.openhands.dev/openhands/usage/run-openhands/local-setup) or view the source in this repo.
### OpenHands Cloud
-This is a commercial deployment of OpenHands GUI, running on hosted infrastructure.
+This is a deployment of OpenHands GUI, running on hosted infrastructure.
You can try it with a free $10 credit by [signing in with your GitHub account](https://app.all-hands.dev).
OpenHands Cloud comes with source-available features and integrations:
-- Deeper integrations with GitHub, GitLab, and Bitbucket
- Integrations with Slack, Jira, and Linear
- Multi-user support
- RBAC and permissions
- Collaboration features (e.g., conversation sharing)
-- Usage reporting
-- Budgeting enforcement
### OpenHands Enterprise
Large enterprises can work with us to self-host OpenHands Cloud in their own VPC, via Kubernetes.
diff --git a/containers/dev/compose.yml b/containers/dev/compose.yml
index c6168b094f59..7ff504208136 100644
--- a/containers/dev/compose.yml
+++ b/containers/dev/compose.yml
@@ -12,7 +12,7 @@ services:
- SANDBOX_API_HOSTNAME=host.docker.internal
- DOCKER_HOST_ADDR=host.docker.internal
#
- - SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-ghcr.io/openhands/runtime:0.62-nikolaik}
+ - SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-ghcr.io/openhands/runtime:1.0-nikolaik}
- SANDBOX_USER_ID=${SANDBOX_USER_ID:-1234}
- WORKSPACE_MOUNT_PATH=${WORKSPACE_BASE:-$PWD/workspace}
ports:
diff --git a/docker-compose.yml b/docker-compose.yml
index b66332462538..d4aef552c0dd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
image: openhands:latest
container_name: openhands-app-${DATE:-}
environment:
- - SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-docker.openhands.dev/openhands/runtime:0.62-nikolaik}
+ - SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-docker.openhands.dev/openhands/runtime:1.0-nikolaik}
#- SANDBOX_USER_ID=${SANDBOX_USER_ID:-1234} # enable this only if you want a specific non-root sandbox user but you will have to manually adjust permissions of ~/.openhands for this user
- WORKSPACE_MOUNT_PATH=${WORKSPACE_BASE:-$PWD/workspace}
ports:
diff --git a/enterprise/Dockerfile b/enterprise/Dockerfile
index b0ca56a7f693..7b50748ffb1f 100644
--- a/enterprise/Dockerfile
+++ b/enterprise/Dockerfile
@@ -31,9 +31,8 @@ RUN pip install alembic psycopg2-binary cloud-sql-python-connector pg8000 gsprea
"pillow>=11.3.0"
WORKDIR /app
-COPY enterprise .
+COPY --chown=openhands:openhands --chmod=770 enterprise .
-RUN chown -R openhands:openhands /app && chmod -R 770 /app
USER openhands
# Command will be overridden by Kubernetes deployment template
diff --git a/enterprise/allhands-realm-github-provider.json.tmpl b/enterprise/allhands-realm-github-provider.json.tmpl
index 6cdaa343835b..35ff5f0afc79 100644
--- a/enterprise/allhands-realm-github-provider.json.tmpl
+++ b/enterprise/allhands-realm-github-provider.json.tmpl
@@ -721,6 +721,7 @@
"https://$WEB_HOST/oauth/keycloak/callback",
"https://$WEB_HOST/oauth/keycloak/offline/callback",
"https://$WEB_HOST/slack/keycloak-callback",
+ "https://$WEB_HOST/oauth/device/keycloak-callback",
"https://$WEB_HOST/api/email/verified",
"/realms/$KEYCLOAK_REALM_NAME/$KEYCLOAK_CLIENT_ID/*"
],
diff --git a/enterprise/enterprise_local/convert_to_env.py b/enterprise/enterprise_local/convert_to_env.py
index 54e2c5d71b8f..cbd04b644938 100644
--- a/enterprise/enterprise_local/convert_to_env.py
+++ b/enterprise/enterprise_local/convert_to_env.py
@@ -116,7 +116,7 @@ def convert_yaml_to_env(yaml_file, target_parameters, output_env_file, prefix):
lines.append('ENABLE_PROACTIVE_CONVERSATION_STARTERS=true')
lines.append('MAX_CONCURRENT_CONVERSATIONS=10')
lines.append('LITE_LLM_API_URL=https://llm-proxy.eval.all-hands.dev')
-lines.append('LITELLM_DEFAULT_MODEL=litellm_proxy/claude-sonnet-4-20250514')
+lines.append('LITELLM_DEFAULT_MODEL=litellm_proxy/claude-opus-4-5-20251101')
lines.append(f'LITE_LLM_API_KEY={lite_llm_api_key}')
lines.append('LOCAL_DEPLOYMENT=true')
lines.append('DB_HOST=localhost')
diff --git a/enterprise/integrations/github/github_manager.py b/enterprise/integrations/github/github_manager.py
index 1d16dd40d7f3..00ad5124cebd 100644
--- a/enterprise/integrations/github/github_manager.py
+++ b/enterprise/integrations/github/github_manager.py
@@ -22,6 +22,7 @@
HOST_URL,
OPENHANDS_RESOLVER_TEMPLATES_DIR,
)
+from integrations.v1_utils import get_saas_user_auth
from jinja2 import Environment, FileSystemLoader
from pydantic import SecretStr
from server.auth.constants import GITHUB_APP_CLIENT_ID, GITHUB_APP_PRIVATE_KEY
@@ -164,8 +165,13 @@ async def receive_message(self, message: Message):
)
if await self.is_job_requested(message):
+ payload = message.message.get('payload', {})
+ user_id = payload['sender']['id']
+ keycloak_user_id = await self.token_manager.get_user_id_from_idp_user_id(
+ user_id, ProviderType.GITHUB
+ )
github_view = await GithubFactory.create_github_view_from_payload(
- message, self.token_manager
+ message, keycloak_user_id
)
logger.info(
f'[GitHub] Creating job for {github_view.user_info.username} in {github_view.full_repo_name}#{github_view.issue_number}'
@@ -282,8 +288,15 @@ async def start_job(self, github_view: ResolverViewInterface):
f'[Github]: Error summarizing issue solvability: {str(e)}'
)
+ saas_user_auth = await get_saas_user_auth(
+ github_view.user_info.keycloak_user_id, self.token_manager
+ )
+
await github_view.create_new_conversation(
- self.jinja_env, secret_store.provider_tokens, convo_metadata
+ self.jinja_env,
+ secret_store.provider_tokens,
+ convo_metadata,
+ saas_user_auth,
)
conversation_id = github_view.conversation_id
@@ -292,18 +305,19 @@ async def start_job(self, github_view: ResolverViewInterface):
f'[GitHub] Created conversation {conversation_id} for user {user_info.username}'
)
- # Create a GithubCallbackProcessor
- processor = GithubCallbackProcessor(
- github_view=github_view,
- send_summary_instruction=True,
- )
+ if not github_view.v1:
+ # Create a GithubCallbackProcessor
+ processor = GithubCallbackProcessor(
+ github_view=github_view,
+ send_summary_instruction=True,
+ )
- # Register the callback processor
- register_callback_processor(conversation_id, processor)
+ # Register the callback processor
+ register_callback_processor(conversation_id, processor)
- logger.info(
- f'[Github] Registered callback processor for conversation {conversation_id}'
- )
+ logger.info(
+ f'[Github] Registered callback processor for conversation {conversation_id}'
+ )
# Send message with conversation link
conversation_link = CONVERSATION_URL.format(conversation_id)
diff --git a/enterprise/integrations/github/github_view.py b/enterprise/integrations/github/github_view.py
index 435dec8b3f60..a01457f88c1c 100644
--- a/enterprise/integrations/github/github_view.py
+++ b/enterprise/integrations/github/github_view.py
@@ -1,4 +1,5 @@
-from uuid import uuid4
+from dataclasses import dataclass
+from uuid import UUID, uuid4
from github import Github, GithubIntegration
from github.Issue import Issue
@@ -8,16 +9,17 @@
WorkflowRunStatus,
)
from integrations.models import Message
+from integrations.resolver_context import ResolverUserContext
from integrations.types import ResolverViewInterface, UserData
from integrations.utils import (
ENABLE_PROACTIVE_CONVERSATION_STARTERS,
+ ENABLE_V1_GITHUB_RESOLVER,
HOST,
HOST_URL,
get_oh_labels,
has_exact_mention,
)
from jinja2 import Environment
-from pydantic.dataclasses import dataclass
from server.auth.constants import GITHUB_APP_CLIENT_ID, GITHUB_APP_PRIVATE_KEY
from server.auth.token_manager import TokenManager
from server.config import get_config
@@ -26,14 +28,24 @@
from storage.saas_secrets_store import SaasSecretsStore
from storage.saas_settings_store import SaasSettingsStore
+from openhands.agent_server.models import SendMessageRequest
+from openhands.app_server.app_conversation.app_conversation_models import (
+ AppConversationStartRequest,
+ AppConversationStartTaskStatus,
+)
+from openhands.app_server.config import get_app_conversation_service
+from openhands.app_server.services.injector import InjectorState
+from openhands.app_server.user.specifiy_user_context import USER_CONTEXT_ATTR
from openhands.core.logger import openhands_logger as logger
from openhands.integrations.github.github_service import GithubServiceImpl
from openhands.integrations.provider import PROVIDER_TOKEN_TYPE, ProviderType
from openhands.integrations.service_types import Comment
+from openhands.sdk import TextContent
from openhands.server.services.conversation_service import (
initialize_conversation,
start_conversation,
)
+from openhands.server.user_auth.user_auth import UserAuth
from openhands.storage.data_models.conversation_metadata import (
ConversationMetadata,
ConversationTrigger,
@@ -76,6 +88,38 @@ async def get_user_proactive_conversation_setting(user_id: str | None) -> bool:
return settings.enable_proactive_conversation_starters
+async def get_user_v1_enabled_setting(user_id: str) -> bool:
+ """Get the user's V1 conversation API setting.
+
+ Args:
+ user_id: The keycloak user ID
+
+ Returns:
+ True if V1 conversations are enabled for this user, False otherwise
+
+ Note:
+ This function checks both the global environment variable kill switch AND
+ the user's individual setting. Both must be true for the function to return true.
+ """
+ # Check the global environment variable first
+ if not ENABLE_V1_GITHUB_RESOLVER:
+ return False
+
+ config = get_config()
+ settings_store = SaasSettingsStore(
+ user_id=user_id, session_maker=session_maker, config=config
+ )
+
+ settings = await call_sync_from_async(
+ settings_store.get_user_settings_by_keycloak_id, user_id
+ )
+
+ if not settings or settings.v1_enabled is None:
+ return False
+
+ return settings.v1_enabled
+
+
# =================================================
# SECTION: Github view types
# =================================================
@@ -96,6 +140,7 @@ class GithubIssue(ResolverViewInterface):
title: str
description: str
previous_comments: list[Comment]
+ v1: bool
async def _load_resolver_context(self):
github_service = GithubServiceImpl(
@@ -142,6 +187,19 @@ async def _get_user_secrets(self):
async def initialize_new_conversation(self) -> ConversationMetadata:
# FIXME: Handle if initialize_conversation returns None
+
+ v1_enabled = await get_user_v1_enabled_setting(self.user_info.keycloak_user_id)
+ logger.info(
+ f'[GitHub V1]: User flag found for {self.user_info.keycloak_user_id} is {v1_enabled}'
+ )
+ if v1_enabled:
+ # Create dummy conversationm metadata
+ # Don't save to conversation store
+ # V1 conversations are stored in a separate table
+ return ConversationMetadata(
+ conversation_id=uuid4().hex, selected_repository=self.full_repo_name
+ )
+
conversation_metadata: ConversationMetadata = await initialize_conversation( # type: ignore[assignment]
user_id=self.user_info.keycloak_user_id,
conversation_id=None,
@@ -158,7 +216,36 @@ async def create_new_conversation(
jinja_env: Environment,
git_provider_tokens: PROVIDER_TOKEN_TYPE,
conversation_metadata: ConversationMetadata,
+ saas_user_auth: UserAuth,
+ ):
+ v1_enabled = await get_user_v1_enabled_setting(self.user_info.keycloak_user_id)
+ logger.info(
+ f'[GitHub V1]: User flag found for {self.user_info.keycloak_user_id} is {v1_enabled}'
+ )
+ if v1_enabled:
+ try:
+ # Use V1 app conversation service
+ await self._create_v1_conversation(
+ jinja_env, saas_user_auth, conversation_metadata
+ )
+ return
+
+ except Exception as e:
+ logger.warning(f'Error checking V1 settings, falling back to V0: {e}')
+
+ # Use existing V0 conversation service
+ await self._create_v0_conversation(
+ jinja_env, git_provider_tokens, conversation_metadata
+ )
+
+ async def _create_v0_conversation(
+ self,
+ jinja_env: Environment,
+ git_provider_tokens: PROVIDER_TOKEN_TYPE,
+ conversation_metadata: ConversationMetadata,
):
+ """Create conversation using the legacy V0 system."""
+ logger.info('[GitHub]: Creating V0 conversation')
custom_secrets = await self._get_user_secrets()
user_instructions, conversation_instructions = await self._get_instructions(
@@ -177,6 +264,78 @@ async def create_new_conversation(
conversation_instructions=conversation_instructions,
)
+ async def _create_v1_conversation(
+ self,
+ jinja_env: Environment,
+ saas_user_auth: UserAuth,
+ conversation_metadata: ConversationMetadata,
+ ):
+ """Create conversation using the new V1 app conversation system."""
+ logger.info('[GitHub V1]: Creating V1 conversation')
+
+ user_instructions, conversation_instructions = await self._get_instructions(
+ jinja_env
+ )
+
+ # Create the initial message request
+ initial_message = SendMessageRequest(
+ role='user', content=[TextContent(text=user_instructions)]
+ )
+
+ # Create the GitHub V1 callback processor
+ github_callback_processor = self._create_github_v1_callback_processor()
+
+ # Get the app conversation service and start the conversation
+ injector_state = InjectorState()
+
+ # Create the V1 conversation start request with the callback processor
+ start_request = AppConversationStartRequest(
+ conversation_id=UUID(conversation_metadata.conversation_id),
+ system_message_suffix=conversation_instructions,
+ initial_message=initial_message,
+ selected_repository=self.full_repo_name,
+ git_provider=ProviderType.GITHUB,
+ title=f'GitHub Issue #{self.issue_number}: {self.title}',
+ trigger=ConversationTrigger.RESOLVER,
+ processors=[
+ github_callback_processor
+ ], # Pass the callback processor directly
+ )
+
+ # Set up the GitHub user context for the V1 system
+ github_user_context = ResolverUserContext(saas_user_auth=saas_user_auth)
+ setattr(injector_state, USER_CONTEXT_ATTR, github_user_context)
+
+ async with get_app_conversation_service(
+ injector_state
+ ) as app_conversation_service:
+ async for task in app_conversation_service.start_app_conversation(
+ start_request
+ ):
+ if task.status == AppConversationStartTaskStatus.ERROR:
+ logger.error(f'Failed to start V1 conversation: {task.detail}')
+ raise RuntimeError(
+ f'Failed to start V1 conversation: {task.detail}'
+ )
+
+ self.v1 = True
+
+ def _create_github_v1_callback_processor(self):
+ """Create a V1 callback processor for GitHub integration."""
+ from openhands.app_server.event_callback.github_v1_callback_processor import (
+ GithubV1CallbackProcessor,
+ )
+
+ # Create and return the GitHub V1 callback processor
+ return GithubV1CallbackProcessor(
+ github_view_data={
+ 'issue_number': self.issue_number,
+ 'full_repo_name': self.full_repo_name,
+ 'installation_id': self.installation_id,
+ },
+ send_summary_instruction=self.send_summary_instruction,
+ )
+
@dataclass
class GithubIssueComment(GithubIssue):
@@ -232,7 +391,18 @@ async def _get_instructions(self, jinja_env: Environment) -> tuple[str, str]:
return user_instructions, conversation_instructions
async def initialize_new_conversation(self) -> ConversationMetadata:
- # FIXME: Handle if initialize_conversation returns None
+ v1_enabled = await get_user_v1_enabled_setting(self.user_info.keycloak_user_id)
+ logger.info(
+ f'[GitHub V1]: User flag found for {self.user_info.keycloak_user_id} is {v1_enabled}'
+ )
+ if v1_enabled:
+ # Create dummy conversationm metadata
+ # Don't save to conversation store
+ # V1 conversations are stored in a separate table
+ return ConversationMetadata(
+ conversation_id=uuid4().hex, selected_repository=self.full_repo_name
+ )
+
conversation_metadata: ConversationMetadata = await initialize_conversation( # type: ignore[assignment]
user_id=self.user_info.keycloak_user_id,
conversation_id=None,
@@ -292,6 +462,24 @@ async def _get_instructions(self, jinja_env: Environment) -> tuple[str, str]:
return user_instructions, conversation_instructions
+ def _create_github_v1_callback_processor(self):
+ """Create a V1 callback processor for GitHub integration."""
+ from openhands.app_server.event_callback.github_v1_callback_processor import (
+ GithubV1CallbackProcessor,
+ )
+
+ # Create and return the GitHub V1 callback processor
+ return GithubV1CallbackProcessor(
+ github_view_data={
+ 'issue_number': self.issue_number,
+ 'full_repo_name': self.full_repo_name,
+ 'installation_id': self.installation_id,
+ 'comment_id': self.comment_id,
+ },
+ inline_pr_comment=True,
+ send_summary_instruction=self.send_summary_instruction,
+ )
+
@dataclass
class GithubFailingAction:
@@ -605,7 +793,7 @@ def get_full_repo_name(repo_obj: dict) -> str:
@staticmethod
async def create_github_view_from_payload(
- message: Message, token_manager: TokenManager
+ message: Message, keycloak_user_id: str
) -> ResolverViewInterface:
"""Create the appropriate class (GithubIssue or GithubPRComment) based on the payload.
Also return metadata about the event (e.g., action type).
@@ -615,17 +803,10 @@ async def create_github_view_from_payload(
user_id = payload['sender']['id']
username = payload['sender']['login']
- keyloak_user_id = await token_manager.get_user_id_from_idp_user_id(
- user_id, ProviderType.GITHUB
- )
-
- if keyloak_user_id is None:
- logger.warning(f'Got invalid keyloak user id for GitHub User {user_id} ')
-
selected_repo = GithubFactory.get_full_repo_name(repo_obj)
is_public_repo = not repo_obj.get('private', True)
user_info = UserData(
- user_id=user_id, username=username, keycloak_user_id=keyloak_user_id
+ user_id=user_id, username=username, keycloak_user_id=keycloak_user_id
)
installation_id = message.message['installation']
@@ -649,6 +830,7 @@ async def create_github_view_from_payload(
title='',
description='',
previous_comments=[],
+ v1=False,
)
elif GithubFactory.is_issue_comment(message):
@@ -674,6 +856,7 @@ async def create_github_view_from_payload(
title='',
description='',
previous_comments=[],
+ v1=False,
)
elif GithubFactory.is_pr_comment(message):
@@ -715,6 +898,7 @@ async def create_github_view_from_payload(
title='',
description='',
previous_comments=[],
+ v1=False,
)
elif GithubFactory.is_inline_pr_comment(message):
@@ -748,6 +932,7 @@ async def create_github_view_from_payload(
title='',
description='',
previous_comments=[],
+ v1=False,
)
else:
diff --git a/enterprise/integrations/resolver_context.py b/enterprise/integrations/resolver_context.py
new file mode 100644
index 000000000000..5829122e6f9d
--- /dev/null
+++ b/enterprise/integrations/resolver_context.py
@@ -0,0 +1,63 @@
+from openhands.app_server.user.user_context import UserContext
+from openhands.app_server.user.user_models import UserInfo
+from openhands.integrations.provider import PROVIDER_TOKEN_TYPE
+from openhands.integrations.service_types import ProviderType
+from openhands.sdk.secret import SecretSource, StaticSecret
+from openhands.server.user_auth.user_auth import UserAuth
+
+
+class ResolverUserContext(UserContext):
+ """User context for resolver operations that inherits from UserContext."""
+
+ def __init__(
+ self,
+ saas_user_auth: UserAuth,
+ ):
+ self.saas_user_auth = saas_user_auth
+
+ async def get_user_id(self) -> str | None:
+ return await self.saas_user_auth.get_user_id()
+
+ async def get_user_info(self) -> UserInfo:
+ user_settings = await self.saas_user_auth.get_user_settings()
+ user_id = await self.saas_user_auth.get_user_id()
+ if user_settings:
+ return UserInfo(
+ id=user_id,
+ **user_settings.model_dump(context={'expose_secrets': True}),
+ )
+
+ return UserInfo(id=user_id)
+
+ async def get_authenticated_git_url(self, repository: str) -> str:
+ # This would need to be implemented based on the git provider tokens
+ # For now, return a basic HTTPS URL
+ return f'https://github.com/{repository}.git'
+
+ async def get_latest_token(self, provider_type: ProviderType) -> str | None:
+ # Return the appropriate token from git_provider_tokens
+
+ provider_tokens = await self.saas_user_auth.get_provider_tokens()
+ if provider_tokens:
+ return provider_tokens.get(provider_type)
+ return None
+
+ async def get_provider_tokens(self) -> PROVIDER_TOKEN_TYPE | None:
+ return await self.saas_user_auth.get_provider_tokens()
+
+ async def get_secrets(self) -> dict[str, SecretSource]:
+ """Get secrets for the user, including custom secrets."""
+ secrets = await self.saas_user_auth.get_secrets()
+ if secrets:
+ # Convert custom secrets to StaticSecret objects for SDK compatibility
+ # secrets.custom_secrets is of type Mapping[str, CustomSecret]
+ converted_secrets = {}
+ for key, custom_secret in secrets.custom_secrets.items():
+ # Extract the secret value from CustomSecret and convert to StaticSecret
+ secret_value = custom_secret.secret.get_secret_value()
+ converted_secrets[key] = StaticSecret(value=secret_value)
+ return converted_secrets
+ return {}
+
+ async def get_mcp_api_key(self) -> str | None:
+ return await self.saas_user_auth.get_mcp_api_key()
diff --git a/enterprise/integrations/types.py b/enterprise/integrations/types.py
index dcbcc9b7d3ce..0b8d79228c18 100644
--- a/enterprise/integrations/types.py
+++ b/enterprise/integrations/types.py
@@ -19,7 +19,7 @@ class PRStatus(Enum):
class UserData(BaseModel):
user_id: int
username: str
- keycloak_user_id: str | None
+ keycloak_user_id: str
@dataclass
diff --git a/enterprise/integrations/utils.py b/enterprise/integrations/utils.py
index ffe4f81360c2..a4721d9ab2c8 100644
--- a/enterprise/integrations/utils.py
+++ b/enterprise/integrations/utils.py
@@ -51,6 +51,11 @@
os.getenv('ENABLE_SOLVABILITY_ANALYSIS', 'false').lower() == 'true'
)
+# Toggle for V1 GitHub resolver feature
+ENABLE_V1_GITHUB_RESOLVER = (
+ os.getenv('ENABLE_V1_GITHUB_RESOLVER', 'false').lower() == 'true'
+)
+
OPENHANDS_RESOLVER_TEMPLATES_DIR = 'openhands/integrations/templates/resolver/'
jinja_env = Environment(loader=FileSystemLoader(OPENHANDS_RESOLVER_TEMPLATES_DIR))
diff --git a/enterprise/integrations/v1_utils.py b/enterprise/integrations/v1_utils.py
new file mode 100644
index 000000000000..78953e4e93dc
--- /dev/null
+++ b/enterprise/integrations/v1_utils.py
@@ -0,0 +1,20 @@
+from pydantic import SecretStr
+from server.auth.saas_user_auth import SaasUserAuth
+from server.auth.token_manager import TokenManager
+
+from openhands.core.logger import openhands_logger as logger
+from openhands.server.user_auth.user_auth import UserAuth
+
+
+async def get_saas_user_auth(
+ keycloak_user_id: str, token_manager: TokenManager
+) -> UserAuth:
+ offline_token = await token_manager.load_offline_token(keycloak_user_id)
+ if offline_token is None:
+ logger.info('no_offline_token_found')
+
+ user_auth = SaasUserAuth(
+ user_id=keycloak_user_id,
+ refresh_token=SecretStr(offline_token),
+ )
+ return user_auth
diff --git a/enterprise/migrations/versions/083_add_v1_enabled_to_user_settings.py b/enterprise/migrations/versions/083_add_v1_enabled_to_user_settings.py
new file mode 100644
index 000000000000..33fdb470af9e
--- /dev/null
+++ b/enterprise/migrations/versions/083_add_v1_enabled_to_user_settings.py
@@ -0,0 +1,35 @@
+"""Add v1_enabled column to user_settings
+
+Revision ID: 083
+Revises: 082
+Create Date: 2025-11-18 00:00:00.000000
+
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = '083'
+down_revision: Union[str, None] = '082'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+ """Add v1_enabled column to user_settings table."""
+ op.add_column(
+ 'user_settings',
+ sa.Column(
+ 'v1_enabled',
+ sa.Boolean(),
+ nullable=True,
+ ),
+ )
+
+
+def downgrade() -> None:
+ """Remove v1_enabled column from user_settings table."""
+ op.drop_column('user_settings', 'v1_enabled')
diff --git a/enterprise/migrations/versions/084_create_device_codes_table.py b/enterprise/migrations/versions/084_create_device_codes_table.py
new file mode 100644
index 000000000000..0898e09ef58b
--- /dev/null
+++ b/enterprise/migrations/versions/084_create_device_codes_table.py
@@ -0,0 +1,49 @@
+"""Create device_codes table for OAuth 2.0 Device Flow
+
+Revision ID: 084
+Revises: 083
+Create Date: 2024-12-10 12:00:00.000000
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = '084'
+down_revision = '083'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+ """Create device_codes table for OAuth 2.0 Device Flow."""
+ op.create_table(
+ 'device_codes',
+ sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+ sa.Column('device_code', sa.String(length=128), nullable=False),
+ sa.Column('user_code', sa.String(length=16), nullable=False),
+ sa.Column('status', sa.String(length=32), nullable=False),
+ sa.Column('keycloak_user_id', sa.String(length=255), nullable=True),
+ sa.Column('expires_at', sa.DateTime(timezone=True), nullable=False),
+ sa.Column('authorized_at', sa.DateTime(timezone=True), nullable=True),
+ # Rate limiting fields for RFC 8628 section 3.5 compliance
+ sa.Column('last_poll_time', sa.DateTime(timezone=True), nullable=True),
+ sa.Column('current_interval', sa.Integer(), nullable=False, default=5),
+ sa.PrimaryKeyConstraint('id'),
+ )
+
+ # Create indexes for efficient lookups
+ op.create_index(
+ 'ix_device_codes_device_code', 'device_codes', ['device_code'], unique=True
+ )
+ op.create_index(
+ 'ix_device_codes_user_code', 'device_codes', ['user_code'], unique=True
+ )
+
+
+def downgrade():
+ """Drop device_codes table."""
+ op.drop_index('ix_device_codes_user_code', table_name='device_codes')
+ op.drop_index('ix_device_codes_device_code', table_name='device_codes')
+ op.drop_table('device_codes')
diff --git a/enterprise/poetry.lock b/enterprise/poetry.lock
index c359147ba673..bd2c55c31750 100644
--- a/enterprise/poetry.lock
+++ b/enterprise/poetry.lock
@@ -201,14 +201,14 @@ files = [
[[package]]
name = "anthropic"
-version = "0.72.0"
+version = "0.75.0"
description = "The official Python library for the anthropic API"
optional = false
-python-versions = ">=3.8"
+python-versions = ">=3.9"
groups = ["main"]
files = [
- {file = "anthropic-0.72.0-py3-none-any.whl", hash = "sha256:0e9f5a7582f038cab8efbb4c959e49ef654a56bfc7ba2da51b5a7b8a84de2e4d"},
- {file = "anthropic-0.72.0.tar.gz", hash = "sha256:8971fe76dcffc644f74ac3883069beb1527641115ae0d6eb8fa21c1ce4082f7a"},
+ {file = "anthropic-0.75.0-py3-none-any.whl", hash = "sha256:ea8317271b6c15d80225a9f3c670152746e88805a7a61e14d4a374577164965b"},
+ {file = "anthropic-0.75.0.tar.gz", hash = "sha256:e8607422f4ab616db2ea5baacc215dd5f028da99ce2f022e33c7c535b29f3dfb"},
]
[package.dependencies]
@@ -682,37 +682,37 @@ crt = ["awscrt (==0.27.6)"]
[[package]]
name = "browser-use"
-version = "0.9.5"
+version = "0.10.1"
description = "Make websites accessible for AI agents"
optional = false
python-versions = "<4.0,>=3.11"
groups = ["main"]
files = [
- {file = "browser_use-0.9.5-py3-none-any.whl", hash = "sha256:4a2e92847204d1ded269026a99cb0cc0e60e38bd2751fa3f58aedd78f00b4e67"},
- {file = "browser_use-0.9.5.tar.gz", hash = "sha256:f8285fe253b149d01769a7084883b4cf4db351e2f38e26302c157bcbf14a703f"},
+ {file = "browser_use-0.10.1-py3-none-any.whl", hash = "sha256:96e603bfc71098175342cdcb0592519e6f244412e740f0254e4389fdd82a977f"},
+ {file = "browser_use-0.10.1.tar.gz", hash = "sha256:5f211ecfdf1f9fd186160f10df70dedd661821231e30f1bce40939787abab223"},
]
[package.dependencies]
aiohttp = "3.12.15"
-anthropic = ">=0.68.1,<1.0.0"
+anthropic = ">=0.72.1,<1.0.0"
anyio = ">=4.9.0"
authlib = ">=1.6.0"
bubus = ">=1.5.6"
-cdp-use = ">=1.4.0"
+cdp-use = ">=1.4.4"
click = ">=8.1.8"
cloudpickle = ">=3.1.1"
google-api-core = ">=2.25.0"
google-api-python-client = ">=2.174.0"
google-auth = ">=2.40.3"
google-auth-oauthlib = ">=1.2.2"
-google-genai = ">=1.29.0,<2.0.0"
+google-genai = ">=1.50.0,<2.0.0"
groq = ">=0.30.0"
httpx = ">=0.28.1"
inquirerpy = ">=0.3.4"
markdownify = ">=1.2.0"
mcp = ">=1.10.1"
ollama = ">=0.5.1"
-openai = ">=1.99.2,<2.0.0"
+openai = ">=2.7.2,<3.0.0"
pillow = ">=11.2.1"
portalocker = ">=2.7.0,<3.0.0"
posthog = ">=3.7.0"
@@ -721,6 +721,7 @@ pydantic = ">=2.11.5"
pyobjc = {version = ">=11.0", markers = "platform_system == \"darwin\""}
pyotp = ">=2.9.0"
pypdf = ">=5.7.0"
+python-docx = ">=1.2.0"
python-dotenv = ">=1.0.1"
reportlab = ">=4.0.0"
requests = ">=2.32.3"
@@ -850,14 +851,14 @@ files = [
[[package]]
name = "cdp-use"
-version = "1.4.3"
+version = "1.4.4"
description = "Type safe generator/client library for CDP"
optional = false
python-versions = ">=3.11"
groups = ["main"]
files = [
- {file = "cdp_use-1.4.3-py3-none-any.whl", hash = "sha256:c48664604470c2579aa1e677c3e3e7e24c4f300c54804c093d935abb50479ecd"},
- {file = "cdp_use-1.4.3.tar.gz", hash = "sha256:9029c04bdc49fbd3939d2bf1988ad8d88e260729c7d5e35c2f6c87591f5a10e9"},
+ {file = "cdp_use-1.4.4-py3-none-any.whl", hash = "sha256:e37e80e067db2653d6fdf953d4ff9e5d80d75daa27b7c6d48c0261cccbef73e1"},
+ {file = "cdp_use-1.4.4.tar.gz", hash = "sha256:330a848b517006eb9ad1dc468aa6434d913cf0c6918610760c36c3fdfdba0fab"},
]
[package.dependencies]
@@ -2978,28 +2979,29 @@ testing = ["pytest"]
[[package]]
name = "google-genai"
-version = "1.32.0"
+version = "1.53.0"
description = "GenAI Python SDK"
optional = false
-python-versions = ">=3.9"
+python-versions = ">=3.10"
groups = ["main"]
files = [
- {file = "google_genai-1.32.0-py3-none-any.whl", hash = "sha256:c0c4b1d45adf3aa99501050dd73da2f0dea09374002231052d81a6765d15e7f6"},
- {file = "google_genai-1.32.0.tar.gz", hash = "sha256:349da3f5ff0e981066bd508585fcdd308d28fc4646f318c8f6d1aa6041f4c7e3"},
+ {file = "google_genai-1.53.0-py3-none-any.whl", hash = "sha256:65a3f99e5c03c372d872cda7419f5940e723374bb12a2f3ffd5e3e56e8eb2094"},
+ {file = "google_genai-1.53.0.tar.gz", hash = "sha256:938a26d22f3fd32c6eeeb4276ef204ef82884e63af9842ce3eac05ceb39cbd8d"},
]
[package.dependencies]
anyio = ">=4.8.0,<5.0.0"
-google-auth = ">=2.14.1,<3.0.0"
+google-auth = {version = ">=2.14.1,<3.0.0", extras = ["requests"]}
httpx = ">=0.28.1,<1.0.0"
-pydantic = ">=2.0.0,<3.0.0"
+pydantic = ">=2.9.0,<3.0.0"
requests = ">=2.28.1,<3.0.0"
tenacity = ">=8.2.3,<9.2.0"
typing-extensions = ">=4.11.0,<5.0.0"
websockets = ">=13.0.0,<15.1.0"
[package.extras]
-aiohttp = ["aiohttp (<4.0.0)"]
+aiohttp = ["aiohttp (<3.13.3)"]
+local-tokenizer = ["protobuf", "sentencepiece (>=0.2.0)"]
[[package]]
name = "google-resumable-media"
@@ -3055,6 +3057,8 @@ files = [
{file = "greenlet-3.2.4-cp310-cp310-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c2ca18a03a8cfb5b25bc1cbe20f3d9a4c80d8c3b13ba3df49ac3961af0b1018d"},
{file = "greenlet-3.2.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:9fe0a28a7b952a21e2c062cd5756d34354117796c6d9215a87f55e38d15402c5"},
{file = "greenlet-3.2.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:8854167e06950ca75b898b104b63cc646573aa5fef1353d4508ecdd1ee76254f"},
+ {file = "greenlet-3.2.4-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:f47617f698838ba98f4ff4189aef02e7343952df3a615f847bb575c3feb177a7"},
+ {file = "greenlet-3.2.4-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:af41be48a4f60429d5cad9d22175217805098a9ef7c40bfef44f7669fb9d74d8"},
{file = "greenlet-3.2.4-cp310-cp310-win_amd64.whl", hash = "sha256:73f49b5368b5359d04e18d15828eecc1806033db5233397748f4ca813ff1056c"},
{file = "greenlet-3.2.4-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:96378df1de302bc38e99c3a9aa311967b7dc80ced1dcc6f171e99842987882a2"},
{file = "greenlet-3.2.4-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:1ee8fae0519a337f2329cb78bd7a8e128ec0f881073d43f023c7b8d4831d5246"},
@@ -3064,6 +3068,8 @@ files = [
{file = "greenlet-3.2.4-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2523e5246274f54fdadbce8494458a2ebdcdbc7b802318466ac5606d3cded1f8"},
{file = "greenlet-3.2.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:1987de92fec508535687fb807a5cea1560f6196285a4cde35c100b8cd632cc52"},
{file = "greenlet-3.2.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:55e9c5affaa6775e2c6b67659f3a71684de4c549b3dd9afca3bc773533d284fa"},
+ {file = "greenlet-3.2.4-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:c9c6de1940a7d828635fbd254d69db79e54619f165ee7ce32fda763a9cb6a58c"},
+ {file = "greenlet-3.2.4-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:03c5136e7be905045160b1b9fdca93dd6727b180feeafda6818e6496434ed8c5"},
{file = "greenlet-3.2.4-cp311-cp311-win_amd64.whl", hash = "sha256:9c40adce87eaa9ddb593ccb0fa6a07caf34015a29bf8d344811665b573138db9"},
{file = "greenlet-3.2.4-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:3b67ca49f54cede0186854a008109d6ee71f66bd57bb36abd6d0a0267b540cdd"},
{file = "greenlet-3.2.4-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:ddf9164e7a5b08e9d22511526865780a576f19ddd00d62f8a665949327fde8bb"},
@@ -3073,6 +3079,8 @@ files = [
{file = "greenlet-3.2.4-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:3b3812d8d0c9579967815af437d96623f45c0f2ae5f04e366de62a12d83a8fb0"},
{file = "greenlet-3.2.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:abbf57b5a870d30c4675928c37278493044d7c14378350b3aa5d484fa65575f0"},
{file = "greenlet-3.2.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:20fb936b4652b6e307b8f347665e2c615540d4b42b3b4c8a321d8286da7e520f"},
+ {file = "greenlet-3.2.4-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:ee7a6ec486883397d70eec05059353b8e83eca9168b9f3f9a361971e77e0bcd0"},
+ {file = "greenlet-3.2.4-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:326d234cbf337c9c3def0676412eb7040a35a768efc92504b947b3e9cfc7543d"},
{file = "greenlet-3.2.4-cp312-cp312-win_amd64.whl", hash = "sha256:a7d4e128405eea3814a12cc2605e0e6aedb4035bf32697f72deca74de4105e02"},
{file = "greenlet-3.2.4-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:1a921e542453fe531144e91e1feedf12e07351b1cf6c9e8a3325ea600a715a31"},
{file = "greenlet-3.2.4-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:cd3c8e693bff0fff6ba55f140bf390fa92c994083f838fece0f63be121334945"},
@@ -3082,6 +3090,8 @@ files = [
{file = "greenlet-3.2.4-cp313-cp313-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:23768528f2911bcd7e475210822ffb5254ed10d71f4028387e5a99b4c6699671"},
{file = "greenlet-3.2.4-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:00fadb3fedccc447f517ee0d3fd8fe49eae949e1cd0f6a611818f4f6fb7dc83b"},
{file = "greenlet-3.2.4-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:d25c5091190f2dc0eaa3f950252122edbbadbb682aa7b1ef2f8af0f8c0afefae"},
+ {file = "greenlet-3.2.4-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:6e343822feb58ac4d0a1211bd9399de2b3a04963ddeec21530fc426cc121f19b"},
+ {file = "greenlet-3.2.4-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:ca7f6f1f2649b89ce02f6f229d7c19f680a6238af656f61e0115b24857917929"},
{file = "greenlet-3.2.4-cp313-cp313-win_amd64.whl", hash = "sha256:554b03b6e73aaabec3745364d6239e9e012d64c68ccd0b8430c64ccc14939a8b"},
{file = "greenlet-3.2.4-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:49a30d5fda2507ae77be16479bdb62a660fa51b1eb4928b524975b3bde77b3c0"},
{file = "greenlet-3.2.4-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:299fd615cd8fc86267b47597123e3f43ad79c9d8a22bebdce535e53550763e2f"},
@@ -3089,6 +3099,8 @@ files = [
{file = "greenlet-3.2.4-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:b4a1870c51720687af7fa3e7cda6d08d801dae660f75a76f3845b642b4da6ee1"},
{file = "greenlet-3.2.4-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:061dc4cf2c34852b052a8620d40f36324554bc192be474b9e9770e8c042fd735"},
{file = "greenlet-3.2.4-cp314-cp314-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:44358b9bf66c8576a9f57a590d5f5d6e72fa4228b763d0e43fee6d3b06d3a337"},
+ {file = "greenlet-3.2.4-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:2917bdf657f5859fbf3386b12d68ede4cf1f04c90c3a6bc1f013dd68a22e2269"},
+ {file = "greenlet-3.2.4-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:015d48959d4add5d6c9f6c5210ee3803a830dce46356e3bc326d6776bde54681"},
{file = "greenlet-3.2.4-cp314-cp314-win_amd64.whl", hash = "sha256:e37ab26028f12dbb0ff65f29a8d3d44a765c61e729647bf2ddfbbed621726f01"},
{file = "greenlet-3.2.4-cp39-cp39-macosx_11_0_universal2.whl", hash = "sha256:b6a7c19cf0d2742d0809a4c05975db036fdff50cd294a93632d6a310bf9ac02c"},
{file = "greenlet-3.2.4-cp39-cp39-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:27890167f55d2387576d1f41d9487ef171849ea0359ce1510ca6e06c8bece11d"},
@@ -3098,6 +3110,8 @@ files = [
{file = "greenlet-3.2.4-cp39-cp39-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c9913f1a30e4526f432991f89ae263459b1c64d1608c0d22a5c79c287b3c70df"},
{file = "greenlet-3.2.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b90654e092f928f110e0007f572007c9727b5265f7632c2fa7415b4689351594"},
{file = "greenlet-3.2.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:81701fd84f26330f0d5f4944d4e92e61afe6319dcd9775e39396e39d7c3e5f98"},
+ {file = "greenlet-3.2.4-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:28a3c6b7cd72a96f61b0e4b2a36f681025b60ae4779cc73c1535eb5f29560b10"},
+ {file = "greenlet-3.2.4-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:52206cd642670b0b320a1fd1cbfd95bca0e043179c1d8a045f2c6109dfe973be"},
{file = "greenlet-3.2.4-cp39-cp39-win32.whl", hash = "sha256:65458b409c1ed459ea899e939f0e1cdb14f58dbc803f2f93c5eab5694d32671b"},
{file = "greenlet-3.2.4-cp39-cp39-win_amd64.whl", hash = "sha256:d2e685ade4dafd447ede19c31277a224a239a0a1a4eca4e6390efedf20260cfb"},
{file = "greenlet-3.2.4.tar.gz", hash = "sha256:0dca0d95ff849f9a364385f36ab49f50065d76964944638be9691e1832e9f86d"},
@@ -3166,83 +3180,87 @@ protobuf = ">=3.20.2,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4
[[package]]
name = "grpcio"
-version = "1.74.0"
+version = "1.67.1"
description = "HTTP/2-based RPC framework"
optional = false
-python-versions = ">=3.9"
+python-versions = ">=3.8"
groups = ["main"]
files = [
- {file = "grpcio-1.74.0-cp310-cp310-linux_armv7l.whl", hash = "sha256:85bd5cdf4ed7b2d6438871adf6afff9af7096486fcf51818a81b77ef4dd30907"},
- {file = "grpcio-1.74.0-cp310-cp310-macosx_11_0_universal2.whl", hash = "sha256:68c8ebcca945efff9d86d8d6d7bfb0841cf0071024417e2d7f45c5e46b5b08eb"},
- {file = "grpcio-1.74.0-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:e154d230dc1bbbd78ad2fdc3039fa50ad7ffcf438e4eb2fa30bce223a70c7486"},
- {file = "grpcio-1.74.0-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e8978003816c7b9eabe217f88c78bc26adc8f9304bf6a594b02e5a49b2ef9c11"},
- {file = "grpcio-1.74.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c3d7bd6e3929fd2ea7fbc3f562e4987229ead70c9ae5f01501a46701e08f1ad9"},
- {file = "grpcio-1.74.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:136b53c91ac1d02c8c24201bfdeb56f8b3ac3278668cbb8e0ba49c88069e1bdc"},
- {file = "grpcio-1.74.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:fe0f540750a13fd8e5da4b3eaba91a785eea8dca5ccd2bc2ffe978caa403090e"},
- {file = "grpcio-1.74.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:4e4181bfc24413d1e3a37a0b7889bea68d973d4b45dd2bc68bb766c140718f82"},
- {file = "grpcio-1.74.0-cp310-cp310-win32.whl", hash = "sha256:1733969040989f7acc3d94c22f55b4a9501a30f6aaacdbccfaba0a3ffb255ab7"},
- {file = "grpcio-1.74.0-cp310-cp310-win_amd64.whl", hash = "sha256:9e912d3c993a29df6c627459af58975b2e5c897d93287939b9d5065f000249b5"},
- {file = "grpcio-1.74.0-cp311-cp311-linux_armv7l.whl", hash = "sha256:69e1a8180868a2576f02356565f16635b99088da7df3d45aaa7e24e73a054e31"},
- {file = "grpcio-1.74.0-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:8efe72fde5500f47aca1ef59495cb59c885afe04ac89dd11d810f2de87d935d4"},
- {file = "grpcio-1.74.0-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:a8f0302f9ac4e9923f98d8e243939a6fb627cd048f5cd38595c97e38020dffce"},
- {file = "grpcio-1.74.0-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2f609a39f62a6f6f05c7512746798282546358a37ea93c1fcbadf8b2fed162e3"},
- {file = "grpcio-1.74.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c98e0b7434a7fa4e3e63f250456eaef52499fba5ae661c58cc5b5477d11e7182"},
- {file = "grpcio-1.74.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:662456c4513e298db6d7bd9c3b8df6f75f8752f0ba01fb653e252ed4a59b5a5d"},
- {file = "grpcio-1.74.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:3d14e3c4d65e19d8430a4e28ceb71ace4728776fd6c3ce34016947474479683f"},
- {file = "grpcio-1.74.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:1bf949792cee20d2078323a9b02bacbbae002b9e3b9e2433f2741c15bdeba1c4"},
- {file = "grpcio-1.74.0-cp311-cp311-win32.whl", hash = "sha256:55b453812fa7c7ce2f5c88be3018fb4a490519b6ce80788d5913f3f9d7da8c7b"},
- {file = "grpcio-1.74.0-cp311-cp311-win_amd64.whl", hash = "sha256:86ad489db097141a907c559988c29718719aa3e13370d40e20506f11b4de0d11"},
- {file = "grpcio-1.74.0-cp312-cp312-linux_armv7l.whl", hash = "sha256:8533e6e9c5bd630ca98062e3a1326249e6ada07d05acf191a77bc33f8948f3d8"},
- {file = "grpcio-1.74.0-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:2918948864fec2a11721d91568effffbe0a02b23ecd57f281391d986847982f6"},
- {file = "grpcio-1.74.0-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:60d2d48b0580e70d2e1954d0d19fa3c2e60dd7cbed826aca104fff518310d1c5"},
- {file = "grpcio-1.74.0-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3601274bc0523f6dc07666c0e01682c94472402ac2fd1226fd96e079863bfa49"},
- {file = "grpcio-1.74.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:176d60a5168d7948539def20b2a3adcce67d72454d9ae05969a2e73f3a0feee7"},
- {file = "grpcio-1.74.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:e759f9e8bc908aaae0412642afe5416c9f983a80499448fcc7fab8692ae044c3"},
- {file = "grpcio-1.74.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:9e7c4389771855a92934b2846bd807fc25a3dfa820fd912fe6bd8136026b2707"},
- {file = "grpcio-1.74.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:cce634b10aeab37010449124814b05a62fb5f18928ca878f1bf4750d1f0c815b"},
- {file = "grpcio-1.74.0-cp312-cp312-win32.whl", hash = "sha256:885912559974df35d92219e2dc98f51a16a48395f37b92865ad45186f294096c"},
- {file = "grpcio-1.74.0-cp312-cp312-win_amd64.whl", hash = "sha256:42f8fee287427b94be63d916c90399ed310ed10aadbf9e2e5538b3e497d269bc"},
- {file = "grpcio-1.74.0-cp313-cp313-linux_armv7l.whl", hash = "sha256:2bc2d7d8d184e2362b53905cb1708c84cb16354771c04b490485fa07ce3a1d89"},
- {file = "grpcio-1.74.0-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:c14e803037e572c177ba54a3e090d6eb12efd795d49327c5ee2b3bddb836bf01"},
- {file = "grpcio-1.74.0-cp313-cp313-manylinux_2_17_aarch64.whl", hash = "sha256:f6ec94f0e50eb8fa1744a731088b966427575e40c2944a980049798b127a687e"},
- {file = "grpcio-1.74.0-cp313-cp313-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:566b9395b90cc3d0d0c6404bc8572c7c18786ede549cdb540ae27b58afe0fb91"},
- {file = "grpcio-1.74.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e1ea6176d7dfd5b941ea01c2ec34de9531ba494d541fe2057c904e601879f249"},
- {file = "grpcio-1.74.0-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:64229c1e9cea079420527fa8ac45d80fc1e8d3f94deaa35643c381fa8d98f362"},
- {file = "grpcio-1.74.0-cp313-cp313-musllinux_1_1_i686.whl", hash = "sha256:0f87bddd6e27fc776aacf7ebfec367b6d49cad0455123951e4488ea99d9b9b8f"},
- {file = "grpcio-1.74.0-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:3b03d8f2a07f0fea8c8f74deb59f8352b770e3900d143b3d1475effcb08eec20"},
- {file = "grpcio-1.74.0-cp313-cp313-win32.whl", hash = "sha256:b6a73b2ba83e663b2480a90b82fdae6a7aa6427f62bf43b29912c0cfd1aa2bfa"},
- {file = "grpcio-1.74.0-cp313-cp313-win_amd64.whl", hash = "sha256:fd3c71aeee838299c5887230b8a1822795325ddfea635edd82954c1eaa831e24"},
- {file = "grpcio-1.74.0-cp39-cp39-linux_armv7l.whl", hash = "sha256:4bc5fca10aaf74779081e16c2bcc3d5ec643ffd528d9e7b1c9039000ead73bae"},
- {file = "grpcio-1.74.0-cp39-cp39-macosx_11_0_universal2.whl", hash = "sha256:6bab67d15ad617aff094c382c882e0177637da73cbc5532d52c07b4ee887a87b"},
- {file = "grpcio-1.74.0-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:655726919b75ab3c34cdad39da5c530ac6fa32696fb23119e36b64adcfca174a"},
- {file = "grpcio-1.74.0-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1a2b06afe2e50ebfd46247ac3ba60cac523f54ec7792ae9ba6073c12daf26f0a"},
- {file = "grpcio-1.74.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5f251c355167b2360537cf17bea2cf0197995e551ab9da6a0a59b3da5e8704f9"},
- {file = "grpcio-1.74.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8f7b5882fb50632ab1e48cb3122d6df55b9afabc265582808036b6e51b9fd6b7"},
- {file = "grpcio-1.74.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:834988b6c34515545b3edd13e902c1acdd9f2465d386ea5143fb558f153a7176"},
- {file = "grpcio-1.74.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:22b834cef33429ca6cc28303c9c327ba9a3fafecbf62fae17e9a7b7163cc43ac"},
- {file = "grpcio-1.74.0-cp39-cp39-win32.whl", hash = "sha256:7d95d71ff35291bab3f1c52f52f474c632db26ea12700c2ff0ea0532cb0b5854"},
- {file = "grpcio-1.74.0-cp39-cp39-win_amd64.whl", hash = "sha256:ecde9ab49f58433abe02f9ed076c7b5be839cf0153883a6d23995937a82392fa"},
- {file = "grpcio-1.74.0.tar.gz", hash = "sha256:80d1f4fbb35b0742d3e3d3bb654b7381cd5f015f8497279a1e9c21ba623e01b1"},
-]
-
-[package.extras]
-protobuf = ["grpcio-tools (>=1.74.0)"]
+ {file = "grpcio-1.67.1-cp310-cp310-linux_armv7l.whl", hash = "sha256:8b0341d66a57f8a3119b77ab32207072be60c9bf79760fa609c5609f2deb1f3f"},
+ {file = "grpcio-1.67.1-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:f5a27dddefe0e2357d3e617b9079b4bfdc91341a91565111a21ed6ebbc51b22d"},
+ {file = "grpcio-1.67.1-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:43112046864317498a33bdc4797ae6a268c36345a910de9b9c17159d8346602f"},
+ {file = "grpcio-1.67.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c9b929f13677b10f63124c1a410994a401cdd85214ad83ab67cc077fc7e480f0"},
+ {file = "grpcio-1.67.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e7d1797a8a3845437d327145959a2c0c47c05947c9eef5ff1a4c80e499dcc6fa"},
+ {file = "grpcio-1.67.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:0489063974d1452436139501bf6b180f63d4977223ee87488fe36858c5725292"},
+ {file = "grpcio-1.67.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:9fd042de4a82e3e7aca44008ee2fb5da01b3e5adb316348c21980f7f58adc311"},
+ {file = "grpcio-1.67.1-cp310-cp310-win32.whl", hash = "sha256:638354e698fd0c6c76b04540a850bf1db27b4d2515a19fcd5cf645c48d3eb1ed"},
+ {file = "grpcio-1.67.1-cp310-cp310-win_amd64.whl", hash = "sha256:608d87d1bdabf9e2868b12338cd38a79969eaf920c89d698ead08f48de9c0f9e"},
+ {file = "grpcio-1.67.1-cp311-cp311-linux_armv7l.whl", hash = "sha256:7818c0454027ae3384235a65210bbf5464bd715450e30a3d40385453a85a70cb"},
+ {file = "grpcio-1.67.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ea33986b70f83844cd00814cee4451055cd8cab36f00ac64a31f5bb09b31919e"},
+ {file = "grpcio-1.67.1-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:c7a01337407dd89005527623a4a72c5c8e2894d22bead0895306b23c6695698f"},
+ {file = "grpcio-1.67.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:80b866f73224b0634f4312a4674c1be21b2b4afa73cb20953cbbb73a6b36c3cc"},
+ {file = "grpcio-1.67.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f9fff78ba10d4250bfc07a01bd6254a6d87dc67f9627adece85c0b2ed754fa96"},
+ {file = "grpcio-1.67.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:8a23cbcc5bb11ea7dc6163078be36c065db68d915c24f5faa4f872c573bb400f"},
+ {file = "grpcio-1.67.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:1a65b503d008f066e994f34f456e0647e5ceb34cfcec5ad180b1b44020ad4970"},
+ {file = "grpcio-1.67.1-cp311-cp311-win32.whl", hash = "sha256:e29ca27bec8e163dca0c98084040edec3bc49afd10f18b412f483cc68c712744"},
+ {file = "grpcio-1.67.1-cp311-cp311-win_amd64.whl", hash = "sha256:786a5b18544622bfb1e25cc08402bd44ea83edfb04b93798d85dca4d1a0b5be5"},
+ {file = "grpcio-1.67.1-cp312-cp312-linux_armv7l.whl", hash = "sha256:267d1745894200e4c604958da5f856da6293f063327cb049a51fe67348e4f953"},
+ {file = "grpcio-1.67.1-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:85f69fdc1d28ce7cff8de3f9c67db2b0ca9ba4449644488c1e0303c146135ddb"},
+ {file = "grpcio-1.67.1-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:f26b0b547eb8d00e195274cdfc63ce64c8fc2d3e2d00b12bf468ece41a0423a0"},
+ {file = "grpcio-1.67.1-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4422581cdc628f77302270ff839a44f4c24fdc57887dc2a45b7e53d8fc2376af"},
+ {file = "grpcio-1.67.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1d7616d2ded471231c701489190379e0c311ee0a6c756f3c03e6a62b95a7146e"},
+ {file = "grpcio-1.67.1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:8a00efecde9d6fcc3ab00c13f816313c040a28450e5e25739c24f432fc6d3c75"},
+ {file = "grpcio-1.67.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:699e964923b70f3101393710793289e42845791ea07565654ada0969522d0a38"},
+ {file = "grpcio-1.67.1-cp312-cp312-win32.whl", hash = "sha256:4e7b904484a634a0fff132958dabdb10d63e0927398273917da3ee103e8d1f78"},
+ {file = "grpcio-1.67.1-cp312-cp312-win_amd64.whl", hash = "sha256:5721e66a594a6c4204458004852719b38f3d5522082be9061d6510b455c90afc"},
+ {file = "grpcio-1.67.1-cp313-cp313-linux_armv7l.whl", hash = "sha256:aa0162e56fd10a5547fac8774c4899fc3e18c1aa4a4759d0ce2cd00d3696ea6b"},
+ {file = "grpcio-1.67.1-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:beee96c8c0b1a75d556fe57b92b58b4347c77a65781ee2ac749d550f2a365dc1"},
+ {file = "grpcio-1.67.1-cp313-cp313-manylinux_2_17_aarch64.whl", hash = "sha256:a93deda571a1bf94ec1f6fcda2872dad3ae538700d94dc283c672a3b508ba3af"},
+ {file = "grpcio-1.67.1-cp313-cp313-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0e6f255980afef598a9e64a24efce87b625e3e3c80a45162d111a461a9f92955"},
+ {file = "grpcio-1.67.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9e838cad2176ebd5d4a8bb03955138d6589ce9e2ce5d51c3ada34396dbd2dba8"},
+ {file = "grpcio-1.67.1-cp313-cp313-musllinux_1_1_i686.whl", hash = "sha256:a6703916c43b1d468d0756c8077b12017a9fcb6a1ef13faf49e67d20d7ebda62"},
+ {file = "grpcio-1.67.1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:917e8d8994eed1d86b907ba2a61b9f0aef27a2155bca6cbb322430fc7135b7bb"},
+ {file = "grpcio-1.67.1-cp313-cp313-win32.whl", hash = "sha256:e279330bef1744040db8fc432becc8a727b84f456ab62b744d3fdb83f327e121"},
+ {file = "grpcio-1.67.1-cp313-cp313-win_amd64.whl", hash = "sha256:fa0c739ad8b1996bd24823950e3cb5152ae91fca1c09cc791190bf1627ffefba"},
+ {file = "grpcio-1.67.1-cp38-cp38-linux_armv7l.whl", hash = "sha256:178f5db771c4f9a9facb2ab37a434c46cb9be1a75e820f187ee3d1e7805c4f65"},
+ {file = "grpcio-1.67.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:0f3e49c738396e93b7ba9016e153eb09e0778e776df6090c1b8c91877cc1c426"},
+ {file = "grpcio-1.67.1-cp38-cp38-manylinux_2_17_aarch64.whl", hash = "sha256:24e8a26dbfc5274d7474c27759b54486b8de23c709d76695237515bc8b5baeab"},
+ {file = "grpcio-1.67.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3b6c16489326d79ead41689c4b84bc40d522c9a7617219f4ad94bc7f448c5085"},
+ {file = "grpcio-1.67.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:60e6a4dcf5af7bbc36fd9f81c9f372e8ae580870a9e4b6eafe948cd334b81cf3"},
+ {file = "grpcio-1.67.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:95b5f2b857856ed78d72da93cd7d09b6db8ef30102e5e7fe0961fe4d9f7d48e8"},
+ {file = "grpcio-1.67.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:b49359977c6ec9f5d0573ea4e0071ad278ef905aa74e420acc73fd28ce39e9ce"},
+ {file = "grpcio-1.67.1-cp38-cp38-win32.whl", hash = "sha256:f5b76ff64aaac53fede0cc93abf57894ab2a7362986ba22243d06218b93efe46"},
+ {file = "grpcio-1.67.1-cp38-cp38-win_amd64.whl", hash = "sha256:804c6457c3cd3ec04fe6006c739579b8d35c86ae3298ffca8de57b493524b771"},
+ {file = "grpcio-1.67.1-cp39-cp39-linux_armv7l.whl", hash = "sha256:a25bdea92b13ff4d7790962190bf6bf5c4639876e01c0f3dda70fc2769616335"},
+ {file = "grpcio-1.67.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:cdc491ae35a13535fd9196acb5afe1af37c8237df2e54427be3eecda3653127e"},
+ {file = "grpcio-1.67.1-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:85f862069b86a305497e74d0dc43c02de3d1d184fc2c180993aa8aa86fbd19b8"},
+ {file = "grpcio-1.67.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ec74ef02010186185de82cc594058a3ccd8d86821842bbac9873fd4a2cf8be8d"},
+ {file = "grpcio-1.67.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:01f616a964e540638af5130469451cf580ba8c7329f45ca998ab66e0c7dcdb04"},
+ {file = "grpcio-1.67.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:299b3d8c4f790c6bcca485f9963b4846dd92cf6f1b65d3697145d005c80f9fe8"},
+ {file = "grpcio-1.67.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:60336bff760fbb47d7e86165408126f1dded184448e9a4c892189eb7c9d3f90f"},
+ {file = "grpcio-1.67.1-cp39-cp39-win32.whl", hash = "sha256:5ed601c4c6008429e3d247ddb367fe8c7259c355757448d7c1ef7bd4a6739e8e"},
+ {file = "grpcio-1.67.1-cp39-cp39-win_amd64.whl", hash = "sha256:5db70d32d6703b89912af16d6d45d78406374a8b8ef0d28140351dd0ec610e98"},
+ {file = "grpcio-1.67.1.tar.gz", hash = "sha256:3dc2ed4cabea4dc14d5e708c2b426205956077cc5de419b4d4079315017e9732"},
+]
+
+[package.extras]
+protobuf = ["grpcio-tools (>=1.67.1)"]
[[package]]
name = "grpcio-status"
-version = "1.71.2"
+version = "1.67.1"
description = "Status proto mapping for gRPC"
optional = false
-python-versions = ">=3.9"
+python-versions = ">=3.8"
groups = ["main"]
files = [
- {file = "grpcio_status-1.71.2-py3-none-any.whl", hash = "sha256:803c98cb6a8b7dc6dbb785b1111aed739f241ab5e9da0bba96888aa74704cfd3"},
- {file = "grpcio_status-1.71.2.tar.gz", hash = "sha256:c7a97e176df71cdc2c179cd1847d7fc86cca5832ad12e9798d7fed6b7a1aab50"},
+ {file = "grpcio_status-1.67.1-py3-none-any.whl", hash = "sha256:16e6c085950bdacac97c779e6a502ea671232385e6e37f258884d6883392c2bd"},
+ {file = "grpcio_status-1.67.1.tar.gz", hash = "sha256:2bf38395e028ceeecfd8866b081f61628114b384da7d51ae064ddc8d766a5d11"},
]
[package.dependencies]
googleapis-common-protos = ">=1.5.5"
-grpcio = ">=1.71.2"
+grpcio = ">=1.67.1"
protobuf = ">=5.26.1,<6.0dev"
[[package]]
@@ -4540,42 +4558,39 @@ valkey = ["valkey (>=6)"]
[[package]]
name = "litellm"
-version = "1.77.7"
+version = "1.80.7"
description = "Library to easily interface with LLM API providers"
optional = false
-python-versions = ">=3.8.1,<4.0, !=3.9.7"
+python-versions = "<4.0,>=3.9"
groups = ["main"]
-files = []
-develop = false
+files = [
+ {file = "litellm-1.80.7-py3-none-any.whl", hash = "sha256:f7d993f78c1e0e4e1202b2a925cc6540b55b6e5fb055dd342d88b145ab3102ed"},
+ {file = "litellm-1.80.7.tar.gz", hash = "sha256:3977a8d195aef842d01c18bf9e22984829363c6a4b54daf9a43c9dd9f190b42c"},
+]
[package.dependencies]
aiohttp = ">=3.10"
click = "*"
fastuuid = ">=0.13.0"
+grpcio = ">=1.62.3,<1.68.0"
httpx = ">=0.23.0"
importlib-metadata = ">=6.8.0"
-jinja2 = "^3.1.2"
-jsonschema = "^4.22.0"
-openai = ">=1.99.5"
-pydantic = "^2.5.0"
+jinja2 = ">=3.1.2,<4.0.0"
+jsonschema = ">=4.22.0,<5.0.0"
+openai = ">=2.8.0"
+pydantic = ">=2.5.0,<3.0.0"
python-dotenv = ">=0.2.0"
tiktoken = ">=0.7.0"
tokenizers = "*"
[package.extras]
caching = ["diskcache (>=5.6.1,<6.0.0)"]
-extra-proxy = ["azure-identity (>=1.15.0,<2.0.0)", "azure-keyvault-secrets (>=4.8.0,<5.0.0)", "google-cloud-iam (>=2.19.1,<3.0.0)", "google-cloud-kms (>=2.21.3,<3.0.0)", "prisma (==0.11.0)", "redisvl (>=0.4.1,<0.5.0) ; python_version >= \"3.9\" and python_version < \"3.14\"", "resend (>=0.8.0,<0.9.0)"]
+extra-proxy = ["azure-identity (>=1.15.0,<2.0.0) ; python_version >= \"3.9\"", "azure-keyvault-secrets (>=4.8.0,<5.0.0)", "google-cloud-iam (>=2.19.1,<3.0.0)", "google-cloud-kms (>=2.21.3,<3.0.0)", "prisma (==0.11.0)", "redisvl (>=0.4.1,<0.5.0) ; python_version >= \"3.9\" and python_version < \"3.14\"", "resend (>=0.8.0)"]
mlflow = ["mlflow (>3.1.4) ; python_version >= \"3.10\""]
-proxy = ["PyJWT (>=2.8.0,<3.0.0)", "apscheduler (>=3.10.4,<4.0.0)", "azure-identity (>=1.15.0,<2.0.0)", "azure-storage-blob (>=12.25.1,<13.0.0)", "backoff", "boto3 (==1.36.0)", "cryptography", "fastapi (>=0.115.5,<0.116.0)", "fastapi-sso (>=0.16.0,<0.17.0)", "gunicorn (>=23.0.0,<24.0.0)", "litellm-enterprise (==0.1.20)", "litellm-proxy-extras (==0.2.25)", "mcp (>=1.10.0,<2.0.0) ; python_version >= \"3.10\"", "orjson (>=3.9.7,<4.0.0)", "polars (>=1.31.0,<2.0.0) ; python_version >= \"3.10\"", "pynacl (>=1.5.0,<2.0.0)", "python-multipart (>=0.0.18,<0.0.19)", "pyyaml (>=6.0.1,<7.0.0)", "rich (==13.7.1)", "rq", "uvicorn (>=0.29.0,<0.30.0)", "uvloop (>=0.21.0,<0.22.0) ; sys_platform != \"win32\"", "websockets (>=13.1.0,<14.0.0)"]
-semantic-router = ["semantic-router ; python_version >= \"3.9\""]
+proxy = ["PyJWT (>=2.10.1,<3.0.0) ; python_version >= \"3.9\"", "apscheduler (>=3.10.4,<4.0.0)", "azure-identity (>=1.15.0,<2.0.0) ; python_version >= \"3.9\"", "azure-storage-blob (>=12.25.1,<13.0.0)", "backoff", "boto3 (==1.36.0)", "cryptography", "fastapi (>=0.120.1)", "fastapi-sso (>=0.16.0,<0.17.0)", "gunicorn (>=23.0.0,<24.0.0)", "litellm-enterprise (==0.1.22)", "litellm-proxy-extras (==0.4.9)", "mcp (>=1.21.2,<2.0.0) ; python_version >= \"3.10\"", "orjson (>=3.9.7,<4.0.0)", "polars (>=1.31.0,<2.0.0) ; python_version >= \"3.10\"", "pynacl (>=1.5.0,<2.0.0)", "python-multipart (>=0.0.18,<0.0.19)", "pyyaml (>=6.0.1,<7.0.0)", "rich (==13.7.1)", "rq", "soundfile (>=0.12.1,<0.13.0)", "uvicorn (>=0.31.1,<0.32.0)", "uvloop (>=0.21.0,<0.22.0) ; sys_platform != \"win32\"", "websockets (>=15.0.1,<16.0.0)"]
+semantic-router = ["semantic-router (>=0.1.12) ; python_version >= \"3.9\" and python_version < \"3.14\""]
utils = ["numpydoc"]
-[package.source]
-type = "git"
-url = "https://github.com/BerriAI/litellm.git"
-reference = "v1.77.7.dev9"
-resolved_reference = "763d2f8ccdd8412dbe6d4ac0e136d9ac34dcd4c0"
-
[[package]]
name = "llvmlite"
version = "0.44.0"
@@ -4609,14 +4624,14 @@ files = [
[[package]]
name = "lmnr"
-version = "0.7.20"
+version = "0.7.24"
description = "Python SDK for Laminar"
optional = false
python-versions = "<4,>=3.10"
groups = ["main"]
files = [
- {file = "lmnr-0.7.20-py3-none-any.whl", hash = "sha256:5f9fa7444e6f96c25e097f66484ff29e632bdd1de0e9346948bf5595f4a8af38"},
- {file = "lmnr-0.7.20.tar.gz", hash = "sha256:1f484cd618db2d71af65f90a0b8b36d20d80dc91a5138b811575c8677bf7c4fd"},
+ {file = "lmnr-0.7.24-py3-none-any.whl", hash = "sha256:ad780d4a62ece897048811f3368639c240a9329ab31027da8c96545137a3a08a"},
+ {file = "lmnr-0.7.24.tar.gz", hash = "sha256:aa6973f46fc4ba95c9061c1feceb58afc02eb43c9376c21e32545371ff6123d7"},
]
[package.dependencies]
@@ -4639,14 +4654,15 @@ tqdm = ">=4.0"
[package.extras]
alephalpha = ["opentelemetry-instrumentation-alephalpha (>=0.47.1)"]
-all = ["opentelemetry-instrumentation-alephalpha (>=0.47.1)", "opentelemetry-instrumentation-bedrock (>=0.47.1)", "opentelemetry-instrumentation-chromadb (>=0.47.1)", "opentelemetry-instrumentation-cohere (>=0.47.1)", "opentelemetry-instrumentation-crewai (>=0.47.1)", "opentelemetry-instrumentation-haystack (>=0.47.1)", "opentelemetry-instrumentation-lancedb (>=0.47.1)", "opentelemetry-instrumentation-langchain (>=0.47.1)", "opentelemetry-instrumentation-llamaindex (>=0.47.1)", "opentelemetry-instrumentation-marqo (>=0.47.1)", "opentelemetry-instrumentation-mcp (>=0.47.1)", "opentelemetry-instrumentation-milvus (>=0.47.1)", "opentelemetry-instrumentation-mistralai (>=0.47.1)", "opentelemetry-instrumentation-ollama (>=0.47.1)", "opentelemetry-instrumentation-pinecone (>=0.47.1)", "opentelemetry-instrumentation-qdrant (>=0.47.1)", "opentelemetry-instrumentation-replicate (>=0.47.1)", "opentelemetry-instrumentation-sagemaker (>=0.47.1)", "opentelemetry-instrumentation-together (>=0.47.1)", "opentelemetry-instrumentation-transformers (>=0.47.1)", "opentelemetry-instrumentation-vertexai (>=0.47.1)", "opentelemetry-instrumentation-watsonx (>=0.47.1)", "opentelemetry-instrumentation-weaviate (>=0.47.1)"]
+all = ["opentelemetry-instrumentation-alephalpha (>=0.47.1)", "opentelemetry-instrumentation-bedrock (>=0.47.1)", "opentelemetry-instrumentation-chromadb (>=0.47.1)", "opentelemetry-instrumentation-cohere (>=0.47.1)", "opentelemetry-instrumentation-crewai (>=0.47.1)", "opentelemetry-instrumentation-haystack (>=0.47.1)", "opentelemetry-instrumentation-lancedb (>=0.47.1)", "opentelemetry-instrumentation-langchain (>=0.47.1,<0.48.0)", "opentelemetry-instrumentation-llamaindex (>=0.47.1)", "opentelemetry-instrumentation-marqo (>=0.47.1)", "opentelemetry-instrumentation-mcp (>=0.47.1)", "opentelemetry-instrumentation-milvus (>=0.47.1)", "opentelemetry-instrumentation-mistralai (>=0.47.1)", "opentelemetry-instrumentation-ollama (>=0.47.1)", "opentelemetry-instrumentation-pinecone (>=0.47.1)", "opentelemetry-instrumentation-qdrant (>=0.47.1)", "opentelemetry-instrumentation-replicate (>=0.47.1)", "opentelemetry-instrumentation-sagemaker (>=0.47.1)", "opentelemetry-instrumentation-together (>=0.47.1)", "opentelemetry-instrumentation-transformers (>=0.47.1)", "opentelemetry-instrumentation-vertexai (>=0.47.1)", "opentelemetry-instrumentation-watsonx (>=0.47.1)", "opentelemetry-instrumentation-weaviate (>=0.47.1)"]
bedrock = ["opentelemetry-instrumentation-bedrock (>=0.47.1)"]
chromadb = ["opentelemetry-instrumentation-chromadb (>=0.47.1)"]
+claude-agent-sdk = ["lmnr-claude-code-proxy (>=0.1.0a5)"]
cohere = ["opentelemetry-instrumentation-cohere (>=0.47.1)"]
crewai = ["opentelemetry-instrumentation-crewai (>=0.47.1)"]
haystack = ["opentelemetry-instrumentation-haystack (>=0.47.1)"]
lancedb = ["opentelemetry-instrumentation-lancedb (>=0.47.1)"]
-langchain = ["opentelemetry-instrumentation-langchain (>=0.47.1)"]
+langchain = ["opentelemetry-instrumentation-langchain (>=0.47.1,<0.48.0)"]
llamaindex = ["opentelemetry-instrumentation-llamaindex (>=0.47.1)"]
marqo = ["opentelemetry-instrumentation-marqo (>=0.47.1)"]
mcp = ["opentelemetry-instrumentation-mcp (>=0.47.1)"]
@@ -5644,28 +5660,28 @@ pydantic = ">=2.9"
[[package]]
name = "openai"
-version = "1.99.9"
+version = "2.8.0"
description = "The official Python library for the openai API"
optional = false
-python-versions = ">=3.8"
+python-versions = ">=3.9"
groups = ["main", "test"]
files = [
- {file = "openai-1.99.9-py3-none-any.whl", hash = "sha256:9dbcdb425553bae1ac5d947147bebbd630d91bbfc7788394d4c4f3a35682ab3a"},
- {file = "openai-1.99.9.tar.gz", hash = "sha256:f2082d155b1ad22e83247c3de3958eb4255b20ccf4a1de2e6681b6957b554e92"},
+ {file = "openai-2.8.0-py3-none-any.whl", hash = "sha256:ba975e347f6add2fe13529ccb94d54a578280e960765e5224c34b08d7e029ddf"},
+ {file = "openai-2.8.0.tar.gz", hash = "sha256:4851908f6d6fcacbd47ba659c5ac084f7725b752b6bfa1e948b6fbfc111a6bad"},
]
[package.dependencies]
anyio = ">=3.5.0,<5"
distro = ">=1.7.0,<2"
httpx = ">=0.23.0,<1"
-jiter = ">=0.4.0,<1"
+jiter = ">=0.10.0,<1"
pydantic = ">=1.9.0,<3"
sniffio = "*"
tqdm = ">4"
typing-extensions = ">=4.11,<5"
[package.extras]
-aiohttp = ["aiohttp", "httpx-aiohttp (>=0.1.8)"]
+aiohttp = ["aiohttp", "httpx-aiohttp (>=0.1.9)"]
datalib = ["numpy (>=1)", "pandas (>=1.2.3)", "pandas-stubs (>=1.1.0.11)"]
realtime = ["websockets (>=13,<16)"]
voice-helpers = ["numpy (>=2.0.2)", "sounddevice (>=0.5.1)"]
@@ -5820,38 +5836,31 @@ llama = ["llama-index (>=0.12.29,<0.13.0)", "llama-index-core (>=0.12.29,<0.13.0
[[package]]
name = "openhands-agent-server"
-version = "1.1.0"
+version = "1.6.0"
description = "OpenHands Agent Server - REST/WebSocket interface for OpenHands AI Agent"
optional = false
python-versions = ">=3.12"
groups = ["main"]
files = [
- {file = "openhands_agent_server-1.1.0-py3-none-any.whl", hash = "sha256:59a856883df23488c0723e47655ef21649a321fcd4709a25a4690866eff6ac88"},
- {file = "openhands_agent_server-1.1.0.tar.gz", hash = "sha256:e39bebd39afd45cfcfd765005e7c4e5409e46678bd7612ae20bae79f7057b935"},
+ {file = "openhands_agent_server-1.6.0-py3-none-any.whl", hash = "sha256:e6ae865ac3e7a96b234e10a0faad23f6210e025bbf7721cb66bc7a71d160848c"},
+ {file = "openhands_agent_server-1.6.0.tar.gz", hash = "sha256:44ce7694ae2d4bb0666d318ef13e6618bd4dc73022c60354839fe6130e67d02a"},
]
-develop = false
[package.dependencies]
aiosqlite = ">=0.19"
alembic = ">=1.13"
docker = ">=7.1,<8"
fastapi = ">=0.104"
+openhands-sdk = "*"
pydantic = ">=2"
sqlalchemy = ">=2"
uvicorn = ">=0.31.1"
websockets = ">=12"
wsproto = ">=1.2.0"
-[package.source]
-type = "git"
-url = "https://github.com/OpenHands/agent-sdk.git"
-reference = "15f565b8ac38876e40dc05c08e2b04ccaae4a66d"
-resolved_reference = "15f565b8ac38876e40dc05c08e2b04ccaae4a66d"
-subdirectory = "openhands-agent-server"
-
[[package]]
name = "openhands-ai"
-version = "0.0.0-post.5576+ed2ac6040"
+version = "0.0.0-post.5687+7853b41ad"
description = "OpenHands: Code Less, Make More"
optional = false
python-versions = "^3.12,<3.14"
@@ -5887,15 +5896,15 @@ json-repair = "*"
jupyter_kernel_gateway = "*"
kubernetes = "^33.1.0"
libtmux = ">=0.46.2"
-litellm = ">=1.74.3, <1.78.0, !=1.64.4, !=1.67.*"
+litellm = ">=1.74.3, <=1.80.7, !=1.64.4, !=1.67.*"
lmnr = "^0.7.20"
memory-profiler = "^0.61.0"
numpy = "*"
-openai = "1.99.9"
+openai = "2.8.0"
openhands-aci = "0.3.2"
-openhands-agent-server = "1.1.0"
-openhands-sdk = "1.1.0"
-openhands-tools = "1.1.0"
+openhands-agent-server = "1.6.0"
+openhands-sdk = "1.6.0"
+openhands-tools = "1.6.0"
opentelemetry-api = "^1.33.1"
opentelemetry-exporter-otlp-proto-grpc = "^1.33.1"
pathspec = "^0.12.1"
@@ -5951,23 +5960,22 @@ url = ".."
[[package]]
name = "openhands-sdk"
-version = "1.1.0"
+version = "1.6.0"
description = "OpenHands SDK - Core functionality for building AI agents"
optional = false
python-versions = ">=3.12"
groups = ["main"]
files = [
- {file = "openhands_sdk-1.1.0-py3-none-any.whl", hash = "sha256:4a984ce1687a48cf99a67fdf3d37b116f8b2840743d4807810b5024af6a1d57e"},
- {file = "openhands_sdk-1.1.0.tar.gz", hash = "sha256:855e0d8f3657205e4119e50520c17e65b3358b1a923f7a051a82512a54bf426c"},
+ {file = "openhands_sdk-1.6.0-py3-none-any.whl", hash = "sha256:94d2f87fb35406373da6728ae2d88584137f9e9b67fa0e940444c72f2e44e7d3"},
+ {file = "openhands_sdk-1.6.0.tar.gz", hash = "sha256:f45742350e3874a7f5b08befc4a9d5adc7e4454f7ab5f8391c519eee3116090f"},
]
-develop = false
[package.dependencies]
deprecation = ">=2.1.0"
fastmcp = ">=2.11.3"
httpx = ">=0.27.0"
-litellm = ">=1.77.7.dev9"
-lmnr = ">=0.7.20"
+litellm = ">=1.80.7"
+lmnr = ">=0.7.24"
pydantic = ">=2.11.7"
python-frontmatter = ">=1.1.0"
python-json-logger = ">=3.3.0"
@@ -5977,25 +5985,17 @@ websockets = ">=12"
[package.extras]
boto3 = ["boto3 (>=1.35.0)"]
-[package.source]
-type = "git"
-url = "https://github.com/OpenHands/agent-sdk.git"
-reference = "15f565b8ac38876e40dc05c08e2b04ccaae4a66d"
-resolved_reference = "15f565b8ac38876e40dc05c08e2b04ccaae4a66d"
-subdirectory = "openhands-sdk"
-
[[package]]
name = "openhands-tools"
-version = "1.1.0"
+version = "1.6.0"
description = "OpenHands Tools - Runtime tools for AI agents"
optional = false
python-versions = ">=3.12"
groups = ["main"]
files = [
- {file = "openhands_tools-1.1.0-py3-none-any.whl", hash = "sha256:767d6746f05edade49263aa24450a037485a3dc23379f56917ef19aad22033f9"},
- {file = "openhands_tools-1.1.0.tar.gz", hash = "sha256:c2fadaa4f4e16e9a3df5781ea847565dcae7171584f09ef7c0e1d97c8dfc83f6"},
+ {file = "openhands_tools-1.6.0-py3-none-any.whl", hash = "sha256:176556d44186536751b23fe052d3505492cc2afb8d52db20fb7a2cc0169cd57a"},
+ {file = "openhands_tools-1.6.0.tar.gz", hash = "sha256:d07ba31050fd4a7891a4c48388aa53ce9f703e17064ddbd59146d6c77e5980b3"},
]
-develop = false
[package.dependencies]
bashlex = ">=0.18"
@@ -6006,13 +6006,7 @@ func-timeout = ">=4.3.5"
libtmux = ">=0.46.2"
openhands-sdk = "*"
pydantic = ">=2.11.7"
-
-[package.source]
-type = "git"
-url = "https://github.com/OpenHands/agent-sdk.git"
-reference = "15f565b8ac38876e40dc05c08e2b04ccaae4a66d"
-resolved_reference = "15f565b8ac38876e40dc05c08e2b04ccaae4a66d"
-subdirectory = "openhands-tools"
+tom-swe = ">=1.0.3"
[[package]]
name = "openpyxl"
@@ -13329,6 +13323,31 @@ dev = ["tokenizers[testing]"]
docs = ["setuptools-rust", "sphinx", "sphinx-rtd-theme"]
testing = ["black (==22.3)", "datasets", "numpy", "pytest", "pytest-asyncio", "requests", "ruff"]
+[[package]]
+name = "tom-swe"
+version = "1.0.3"
+description = "Theory of Mind modeling for Software Engineering assistants"
+optional = false
+python-versions = ">=3.10"
+groups = ["main"]
+files = [
+ {file = "tom_swe-1.0.3-py3-none-any.whl", hash = "sha256:7b1172b29eb5c8fb7f1975016e7b6a238511b9ac2a7a980bd400dcb4e29773f2"},
+ {file = "tom_swe-1.0.3.tar.gz", hash = "sha256:57c97d0104e563f15bd39edaf2aa6ac4c3e9444afd437fb92458700d22c6c0f5"},
+]
+
+[package.dependencies]
+jinja2 = ">=3.0.0"
+json-repair = ">=0.1.0"
+litellm = ">=1.0.0"
+pydantic = ">=2.0.0"
+python-dotenv = ">=1.0.0"
+tiktoken = ">=0.8.0"
+tqdm = ">=4.65.0"
+
+[package.extras]
+dev = ["aiofiles (>=23.0.0)", "black (>=22.0.0)", "datasets (>=2.0.0)", "fastapi (>=0.104.0)", "httpx (>=0.25.0)", "huggingface-hub (>=0.0.0)", "isort (>=5.0.0)", "mypy (>=1.0.0)", "numpy (>=1.24.0)", "pandas (>=2.0.0)", "pre-commit (>=3.6.0)", "pytest (>=7.0.0)", "pytest-cov (>=6.2.1)", "rich (>=13.0.0)", "ruff (>=0.3.0)", "typing-extensions (>=4.0.0)", "uvicorn (>=0.24.0)"]
+search = ["bm25s (>=0.2.0)", "pystemmer (>=2.2.0)"]
+
[[package]]
name = "toml"
version = "0.10.2"
diff --git a/enterprise/saas_server.py b/enterprise/saas_server.py
index 4c3c7c49ba87..96e19a981518 100644
--- a/enterprise/saas_server.py
+++ b/enterprise/saas_server.py
@@ -34,6 +34,7 @@
from server.routes.integration.linear import linear_integration_router # noqa: E402
from server.routes.integration.slack import slack_router # noqa: E402
from server.routes.mcp_patch import patch_mcp_server # noqa: E402
+from server.routes.oauth_device import oauth_device_router # noqa: E402
from server.routes.readiness import readiness_router # noqa: E402
from server.routes.user import saas_user_router # noqa: E402
@@ -60,6 +61,7 @@ def is_saas():
base_app.include_router(readiness_router) # Add routes for readiness checks
base_app.include_router(api_router) # Add additional route for github auth
base_app.include_router(oauth_router) # Add additional route for oauth callback
+base_app.include_router(oauth_device_router) # Add OAuth 2.0 Device Flow routes
base_app.include_router(saas_user_router) # Add additional route SAAS user calls
base_app.include_router(
billing_router
diff --git a/enterprise/server/auth/saas_user_auth.py b/enterprise/server/auth/saas_user_auth.py
index eafb7c5b742b..2f399a74cfad 100644
--- a/enterprise/server/auth/saas_user_auth.py
+++ b/enterprise/server/auth/saas_user_auth.py
@@ -203,6 +203,15 @@ async def get_user_settings_store(self) -> SettingsStore:
self.settings_store = settings_store
return settings_store
+ async def get_mcp_api_key(self) -> str:
+ api_key_store = ApiKeyStore.get_instance()
+ mcp_api_key = api_key_store.retrieve_mcp_api_key(self.user_id)
+ if not mcp_api_key:
+ mcp_api_key = api_key_store.create_api_key(
+ self.user_id, 'MCP_API_KEY', None
+ )
+ return mcp_api_key
+
@classmethod
async def get_instance(cls, request: Request) -> UserAuth:
logger.debug('saas_user_auth_get_instance')
@@ -243,7 +252,12 @@ def get_api_key_from_header(request: Request):
# This is a temp hack
# Streamable HTTP MCP Client works via redirect requests, but drops the Authorization header for reason
# We include `X-Session-API-Key` header by default due to nested runtimes, so it used as a drop in replacement here
- return request.headers.get('X-Session-API-Key')
+ session_api_key = request.headers.get('X-Session-API-Key')
+ if session_api_key:
+ return session_api_key
+
+ # Fallback to X-Access-Token header as an additional option
+ return request.headers.get('X-Access-Token')
async def saas_user_auth_from_bearer(request: Request) -> SaasUserAuth | None:
diff --git a/enterprise/server/constants.py b/enterprise/server/constants.py
index 74176d19a104..e2020ba2b9ac 100644
--- a/enterprise/server/constants.py
+++ b/enterprise/server/constants.py
@@ -25,6 +25,7 @@
2: 'claude-3-7-sonnet-20250219',
3: 'claude-sonnet-4-20250514',
4: 'claude-sonnet-4-20250514',
+ 5: 'claude-opus-4-5-20251101',
}
LITELLM_DEFAULT_MODEL = os.getenv('LITELLM_DEFAULT_MODEL')
diff --git a/enterprise/server/legacy_conversation_manager.py b/enterprise/server/legacy_conversation_manager.py
deleted file mode 100644
index 5c82b5b42042..000000000000
--- a/enterprise/server/legacy_conversation_manager.py
+++ /dev/null
@@ -1,331 +0,0 @@
-from __future__ import annotations
-
-import time
-from dataclasses import dataclass, field
-
-import socketio
-from server.clustered_conversation_manager import ClusteredConversationManager
-from server.saas_nested_conversation_manager import SaasNestedConversationManager
-
-from openhands.core.config import LLMConfig, OpenHandsConfig
-from openhands.events.action import MessageAction
-from openhands.server.config.server_config import ServerConfig
-from openhands.server.conversation_manager.conversation_manager import (
- ConversationManager,
-)
-from openhands.server.data_models.agent_loop_info import AgentLoopInfo
-from openhands.server.monitoring import MonitoringListener
-from openhands.server.session.conversation import ServerConversation
-from openhands.storage.data_models.settings import Settings
-from openhands.storage.files import FileStore
-from openhands.utils.async_utils import wait_all
-
-_LEGACY_ENTRY_TIMEOUT_SECONDS = 3600
-
-
-@dataclass
-class LegacyCacheEntry:
- """Cache entry for legacy mode status."""
-
- is_legacy: bool
- timestamp: float
-
-
-@dataclass
-class LegacyConversationManager(ConversationManager):
- """
- Conversation manager for use while migrating - since existing conversations are not nested!
- Separate class from SaasNestedConversationManager so it can be easliy removed in a few weeks.
- (As of 2025-07-23)
- """
-
- sio: socketio.AsyncServer
- config: OpenHandsConfig
- server_config: ServerConfig
- file_store: FileStore
- conversation_manager: SaasNestedConversationManager
- legacy_conversation_manager: ClusteredConversationManager
- _legacy_cache: dict[str, LegacyCacheEntry] = field(default_factory=dict)
-
- async def __aenter__(self):
- await wait_all(
- [
- self.conversation_manager.__aenter__(),
- self.legacy_conversation_manager.__aenter__(),
- ]
- )
- return self
-
- async def __aexit__(self, exc_type, exc_value, traceback):
- await wait_all(
- [
- self.conversation_manager.__aexit__(exc_type, exc_value, traceback),
- self.legacy_conversation_manager.__aexit__(
- exc_type, exc_value, traceback
- ),
- ]
- )
-
- async def request_llm_completion(
- self,
- sid: str,
- service_id: str,
- llm_config: LLMConfig,
- messages: list[dict[str, str]],
- ) -> str:
- session = self.get_agent_session(sid)
- llm_registry = session.llm_registry
- return llm_registry.request_extraneous_completion(
- service_id, llm_config, messages
- )
-
- async def attach_to_conversation(
- self, sid: str, user_id: str | None = None
- ) -> ServerConversation | None:
- if await self.should_start_in_legacy_mode(sid):
- return await self.legacy_conversation_manager.attach_to_conversation(
- sid, user_id
- )
- return await self.conversation_manager.attach_to_conversation(sid, user_id)
-
- async def detach_from_conversation(self, conversation: ServerConversation):
- if await self.should_start_in_legacy_mode(conversation.sid):
- return await self.legacy_conversation_manager.detach_from_conversation(
- conversation
- )
- return await self.conversation_manager.detach_from_conversation(conversation)
-
- async def join_conversation(
- self,
- sid: str,
- connection_id: str,
- settings: Settings,
- user_id: str | None,
- ) -> AgentLoopInfo:
- if await self.should_start_in_legacy_mode(sid):
- return await self.legacy_conversation_manager.join_conversation(
- sid, connection_id, settings, user_id
- )
- return await self.conversation_manager.join_conversation(
- sid, connection_id, settings, user_id
- )
-
- def get_agent_session(self, sid: str):
- session = self.legacy_conversation_manager.get_agent_session(sid)
- if session is None:
- session = self.conversation_manager.get_agent_session(sid)
- return session
-
- async def get_running_agent_loops(
- self, user_id: str | None = None, filter_to_sids: set[str] | None = None
- ) -> set[str]:
- if filter_to_sids and len(filter_to_sids) == 1:
- sid = next(iter(filter_to_sids))
- if await self.should_start_in_legacy_mode(sid):
- return await self.legacy_conversation_manager.get_running_agent_loops(
- user_id, filter_to_sids
- )
- return await self.conversation_manager.get_running_agent_loops(
- user_id, filter_to_sids
- )
-
- # Get all running agent loops from both managers
- agent_loops, legacy_agent_loops = await wait_all(
- [
- self.conversation_manager.get_running_agent_loops(
- user_id, filter_to_sids
- ),
- self.legacy_conversation_manager.get_running_agent_loops(
- user_id, filter_to_sids
- ),
- ]
- )
-
- # Combine the results
- result = set()
- for sid in legacy_agent_loops:
- if await self.should_start_in_legacy_mode(sid):
- result.add(sid)
-
- for sid in agent_loops:
- if not await self.should_start_in_legacy_mode(sid):
- result.add(sid)
-
- return result
-
- async def is_agent_loop_running(self, sid: str) -> bool:
- return bool(await self.get_running_agent_loops(filter_to_sids={sid}))
-
- async def get_connections(
- self, user_id: str | None = None, filter_to_sids: set[str] | None = None
- ) -> dict[str, str]:
- if filter_to_sids and len(filter_to_sids) == 1:
- sid = next(iter(filter_to_sids))
- if await self.should_start_in_legacy_mode(sid):
- return await self.legacy_conversation_manager.get_connections(
- user_id, filter_to_sids
- )
- return await self.conversation_manager.get_connections(
- user_id, filter_to_sids
- )
- agent_loops, legacy_agent_loops = await wait_all(
- [
- self.conversation_manager.get_connections(user_id, filter_to_sids),
- self.legacy_conversation_manager.get_connections(
- user_id, filter_to_sids
- ),
- ]
- )
- legacy_agent_loops.update(agent_loops)
- return legacy_agent_loops
-
- async def maybe_start_agent_loop(
- self,
- sid: str,
- settings: Settings,
- user_id: str, # type: ignore[override]
- initial_user_msg: MessageAction | None = None,
- replay_json: str | None = None,
- ) -> AgentLoopInfo:
- if await self.should_start_in_legacy_mode(sid):
- return await self.legacy_conversation_manager.maybe_start_agent_loop(
- sid, settings, user_id, initial_user_msg, replay_json
- )
- return await self.conversation_manager.maybe_start_agent_loop(
- sid, settings, user_id, initial_user_msg, replay_json
- )
-
- async def send_to_event_stream(self, connection_id: str, data: dict):
- return await self.legacy_conversation_manager.send_to_event_stream(
- connection_id, data
- )
-
- async def send_event_to_conversation(self, sid: str, data: dict):
- if await self.should_start_in_legacy_mode(sid):
- await self.legacy_conversation_manager.send_event_to_conversation(sid, data)
- await self.conversation_manager.send_event_to_conversation(sid, data)
-
- async def disconnect_from_session(self, connection_id: str):
- return await self.legacy_conversation_manager.disconnect_from_session(
- connection_id
- )
-
- async def close_session(self, sid: str):
- if await self.should_start_in_legacy_mode(sid):
- await self.legacy_conversation_manager.close_session(sid)
- await self.conversation_manager.close_session(sid)
-
- async def get_agent_loop_info(
- self, user_id: str | None = None, filter_to_sids: set[str] | None = None
- ) -> list[AgentLoopInfo]:
- if filter_to_sids and len(filter_to_sids) == 1:
- sid = next(iter(filter_to_sids))
- if await self.should_start_in_legacy_mode(sid):
- return await self.legacy_conversation_manager.get_agent_loop_info(
- user_id, filter_to_sids
- )
- return await self.conversation_manager.get_agent_loop_info(
- user_id, filter_to_sids
- )
- agent_loops, legacy_agent_loops = await wait_all(
- [
- self.conversation_manager.get_agent_loop_info(user_id, filter_to_sids),
- self.legacy_conversation_manager.get_agent_loop_info(
- user_id, filter_to_sids
- ),
- ]
- )
-
- # Combine results
- result = []
- legacy_sids = set()
-
- # Add legacy agent loops
- for agent_loop in legacy_agent_loops:
- if await self.should_start_in_legacy_mode(agent_loop.conversation_id):
- result.append(agent_loop)
- legacy_sids.add(agent_loop.conversation_id)
-
- # Add non-legacy agent loops
- for agent_loop in agent_loops:
- if (
- agent_loop.conversation_id not in legacy_sids
- and not await self.should_start_in_legacy_mode(
- agent_loop.conversation_id
- )
- ):
- result.append(agent_loop)
-
- return result
-
- def _cleanup_expired_cache_entries(self):
- """Remove expired entries from the local cache."""
- current_time = time.time()
- expired_keys = [
- key
- for key, entry in self._legacy_cache.items()
- if current_time - entry.timestamp > _LEGACY_ENTRY_TIMEOUT_SECONDS
- ]
- for key in expired_keys:
- del self._legacy_cache[key]
-
- async def should_start_in_legacy_mode(self, conversation_id: str) -> bool:
- """
- Check if a conversation should run in legacy mode by directly checking the runtime.
- The /list method does not include stopped conversations even though the PVC for these
- may not yet have been deleted, so we need to check /sessions/{session_id} directly.
- """
- # Clean up expired entries periodically
- self._cleanup_expired_cache_entries()
-
- # First check the local cache
- if conversation_id in self._legacy_cache:
- cached_entry = self._legacy_cache[conversation_id]
- # Check if the cached value is still valid
- if time.time() - cached_entry.timestamp <= _LEGACY_ENTRY_TIMEOUT_SECONDS:
- return cached_entry.is_legacy
-
- # If not in cache or expired, check the runtime directly
- runtime = await self.conversation_manager._get_runtime(conversation_id)
- is_legacy = self.is_legacy_runtime(runtime)
-
- # Cache the result with current timestamp
- self._legacy_cache[conversation_id] = LegacyCacheEntry(is_legacy, time.time())
-
- return is_legacy
-
- def is_legacy_runtime(self, runtime: dict | None) -> bool:
- """
- Determine if a runtime is a legacy runtime based on its command.
-
- Args:
- runtime: The runtime dictionary or None if not found
-
- Returns:
- bool: True if this is a legacy runtime, False otherwise
- """
- if runtime is None:
- return False
- return 'openhands.server' not in runtime['command']
-
- @classmethod
- def get_instance(
- cls,
- sio: socketio.AsyncServer,
- config: OpenHandsConfig,
- file_store: FileStore,
- server_config: ServerConfig,
- monitoring_listener: MonitoringListener,
- ) -> ConversationManager:
- return LegacyConversationManager(
- sio=sio,
- config=config,
- server_config=server_config,
- file_store=file_store,
- conversation_manager=SaasNestedConversationManager.get_instance(
- sio, config, file_store, server_config, monitoring_listener
- ),
- legacy_conversation_manager=ClusteredConversationManager.get_instance(
- sio, config, file_store, server_config, monitoring_listener
- ),
- )
diff --git a/enterprise/server/middleware.py b/enterprise/server/middleware.py
index 2972c1ec3808..54e3319595f3 100644
--- a/enterprise/server/middleware.py
+++ b/enterprise/server/middleware.py
@@ -152,17 +152,22 @@ def _should_attach(self, request: Request) -> bool:
return False
path = request.url.path
- is_api_that_should_attach = path.startswith('/api') and path not in (
+ ignore_paths = (
'/api/options/config',
'/api/keycloak/callback',
'/api/billing/success',
'/api/billing/cancel',
'/api/billing/customer-setup-success',
'/api/billing/stripe-webhook',
+ '/oauth/device/authorize',
+ '/oauth/device/token',
)
+ if path in ignore_paths:
+ return False
is_mcp = path.startswith('/mcp')
- return is_api_that_should_attach or is_mcp
+ is_api_route = path.startswith('/api')
+ return is_api_route or is_mcp
async def _logout(self, request: Request):
# Log out of keycloak - this prevents issues where you did not log in with the idp you believe you used
diff --git a/enterprise/server/routes/auth.py b/enterprise/server/routes/auth.py
index c9e92d54f7f5..ba7aadb88316 100644
--- a/enterprise/server/routes/auth.py
+++ b/enterprise/server/routes/auth.py
@@ -31,7 +31,6 @@
from openhands.server.shared import config
from openhands.server.user_auth import get_access_token
from openhands.server.user_auth.user_auth import get_user_auth
-from openhands.utils.posthog_tracker import track_user_signup_completed
with warnings.catch_warnings():
warnings.simplefilter('ignore')
@@ -370,12 +369,6 @@ async def accept_tos(request: Request):
logger.info(f'User {user_id} accepted TOS')
- # Track user signup completion in PostHog
- track_user_signup_completed(
- user_id=user_id,
- signup_timestamp=user_settings.accepted_tos.isoformat(),
- )
-
response = JSONResponse(
status_code=status.HTTP_200_OK, content={'redirect_url': redirect_url}
)
diff --git a/enterprise/server/routes/billing.py b/enterprise/server/routes/billing.py
index f1c0c5376bec..5a8b59e2d76b 100644
--- a/enterprise/server/routes/billing.py
+++ b/enterprise/server/routes/billing.py
@@ -28,7 +28,6 @@
from openhands.server.user_auth import get_user_id
from openhands.utils.http_session import httpx_verify_option
-from openhands.utils.posthog_tracker import track_credits_purchased
stripe.api_key = STRIPE_API_KEY
billing_router = APIRouter(prefix='/api/billing')
@@ -458,20 +457,6 @@ async def success_callback(session_id: str, request: Request):
)
session.commit()
- # Track credits purchased in PostHog
- try:
- track_credits_purchased(
- user_id=billing_session.user_id,
- amount_usd=amount_subtotal / 100, # Convert cents to dollars
- credits_added=add_credits,
- stripe_session_id=session_id,
- )
- except Exception as e:
- logger.warning(
- f'Failed to track credits purchase: {e}',
- extra={'user_id': billing_session.user_id, 'error': str(e)},
- )
-
return RedirectResponse(
f'{request.base_url}settings/billing?checkout=success', status_code=302
)
diff --git a/enterprise/server/routes/integration/github.py b/enterprise/server/routes/integration/github.py
index d7bf857a3f1c..204b8297f78c 100644
--- a/enterprise/server/routes/integration/github.py
+++ b/enterprise/server/routes/integration/github.py
@@ -1,3 +1,4 @@
+import asyncio
import hashlib
import hmac
import os
@@ -58,7 +59,8 @@ async def github_events(
)
try:
- payload = await request.body()
+ # Add timeout to prevent hanging on slow/stalled clients
+ payload = await asyncio.wait_for(request.body(), timeout=15.0)
verify_github_signature(payload, x_hub_signature_256)
payload_data = await request.json()
@@ -78,6 +80,12 @@ async def github_events(
status_code=200,
content={'message': 'GitHub events endpoint reached successfully.'},
)
+ except asyncio.TimeoutError:
+ logger.warning('GitHub webhook request timed out waiting for request body')
+ return JSONResponse(
+ status_code=408,
+ content={'error': 'Request timeout - client took too long to send data.'},
+ )
except Exception as e:
logger.exception(f'Error processing GitHub event: {e}')
return JSONResponse(status_code=400, content={'error': 'Invalid payload.'})
diff --git a/enterprise/server/routes/oauth_device.py b/enterprise/server/routes/oauth_device.py
new file mode 100644
index 000000000000..39ff9a4081a3
--- /dev/null
+++ b/enterprise/server/routes/oauth_device.py
@@ -0,0 +1,324 @@
+"""OAuth 2.0 Device Flow endpoints for CLI authentication."""
+
+from datetime import UTC, datetime, timedelta
+from typing import Optional
+
+from fastapi import APIRouter, Depends, Form, HTTPException, Request, status
+from fastapi.responses import JSONResponse
+from pydantic import BaseModel
+from storage.api_key_store import ApiKeyStore
+from storage.database import session_maker
+from storage.device_code_store import DeviceCodeStore
+
+from openhands.core.logger import openhands_logger as logger
+from openhands.server.user_auth import get_user_id
+
+# ---------------------------------------------------------------------------
+# Constants
+# ---------------------------------------------------------------------------
+
+DEVICE_CODE_EXPIRES_IN = 600 # 10 minutes
+DEVICE_TOKEN_POLL_INTERVAL = 5 # seconds
+
+API_KEY_NAME = 'Device Link Access Key'
+KEY_EXPIRATION_TIME = timedelta(days=1) # Key expires in 24 hours
+
+# ---------------------------------------------------------------------------
+# Models
+# ---------------------------------------------------------------------------
+
+
+class DeviceAuthorizationResponse(BaseModel):
+ device_code: str
+ user_code: str
+ verification_uri: str
+ verification_uri_complete: str
+ expires_in: int
+ interval: int
+
+
+class DeviceTokenResponse(BaseModel):
+ access_token: str # This will be the user's API key
+ token_type: str = 'Bearer'
+ expires_in: Optional[int] = None # API keys may not have expiration
+
+
+class DeviceTokenErrorResponse(BaseModel):
+ error: str
+ error_description: Optional[str] = None
+ interval: Optional[int] = None # Required for slow_down error
+
+
+# ---------------------------------------------------------------------------
+# Router + stores
+# ---------------------------------------------------------------------------
+
+oauth_device_router = APIRouter(prefix='/oauth/device')
+device_code_store = DeviceCodeStore(session_maker)
+
+
+# ---------------------------------------------------------------------------
+# Helpers
+# ---------------------------------------------------------------------------
+
+
+def _oauth_error(
+ status_code: int,
+ error: str,
+ description: str,
+ interval: Optional[int] = None,
+) -> JSONResponse:
+ """Return a JSON OAuth-style error response."""
+ return JSONResponse(
+ status_code=status_code,
+ content=DeviceTokenErrorResponse(
+ error=error,
+ error_description=description,
+ interval=interval,
+ ).model_dump(),
+ )
+
+
+# ---------------------------------------------------------------------------
+# Endpoints
+# ---------------------------------------------------------------------------
+
+
+@oauth_device_router.post('/authorize', response_model=DeviceAuthorizationResponse)
+async def device_authorization(
+ http_request: Request,
+) -> DeviceAuthorizationResponse:
+ """Start device flow by generating device and user codes."""
+ try:
+ device_code_entry = device_code_store.create_device_code(
+ expires_in=DEVICE_CODE_EXPIRES_IN,
+ )
+
+ base_url = str(http_request.base_url).rstrip('/')
+ verification_uri = f'{base_url}/oauth/device/verify'
+ verification_uri_complete = (
+ f'{verification_uri}?user_code={device_code_entry.user_code}'
+ )
+
+ logger.info(
+ 'Device authorization initiated',
+ extra={'user_code': device_code_entry.user_code},
+ )
+
+ return DeviceAuthorizationResponse(
+ device_code=device_code_entry.device_code,
+ user_code=device_code_entry.user_code,
+ verification_uri=verification_uri,
+ verification_uri_complete=verification_uri_complete,
+ expires_in=DEVICE_CODE_EXPIRES_IN,
+ interval=device_code_entry.current_interval,
+ )
+ except Exception as e:
+ logger.exception('Error in device authorization: %s', str(e))
+ raise HTTPException(
+ status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+ detail='Internal server error',
+ ) from e
+
+
+@oauth_device_router.post('/token')
+async def device_token(device_code: str = Form(...)):
+ """Poll for a token until the user authorizes or the code expires."""
+ try:
+ device_code_entry = device_code_store.get_by_device_code(device_code)
+
+ if not device_code_entry:
+ return _oauth_error(
+ status.HTTP_400_BAD_REQUEST,
+ 'invalid_grant',
+ 'Invalid device code',
+ )
+
+ # Check rate limiting (RFC 8628 section 3.5)
+ is_too_fast, current_interval = device_code_entry.check_rate_limit()
+ if is_too_fast:
+ # Update poll time and increase interval
+ device_code_store.update_poll_time(device_code, increase_interval=True)
+ logger.warning(
+ 'Client polling too fast, returning slow_down error',
+ extra={
+ 'device_code': device_code[:8] + '...', # Log partial for privacy
+ 'new_interval': current_interval,
+ },
+ )
+ return _oauth_error(
+ status.HTTP_400_BAD_REQUEST,
+ 'slow_down',
+ f'Polling too frequently. Wait at least {current_interval} seconds between requests.',
+ interval=current_interval,
+ )
+
+ # Update poll time for successful rate limit check
+ device_code_store.update_poll_time(device_code, increase_interval=False)
+
+ if device_code_entry.is_expired():
+ return _oauth_error(
+ status.HTTP_400_BAD_REQUEST,
+ 'expired_token',
+ 'Device code has expired',
+ )
+
+ if device_code_entry.status == 'denied':
+ return _oauth_error(
+ status.HTTP_400_BAD_REQUEST,
+ 'access_denied',
+ 'User denied the authorization request',
+ )
+
+ if device_code_entry.status == 'pending':
+ return _oauth_error(
+ status.HTTP_400_BAD_REQUEST,
+ 'authorization_pending',
+ 'User has not yet completed authorization',
+ )
+
+ if device_code_entry.status == 'authorized':
+ # Retrieve the specific API key for this device using the user_code
+ api_key_store = ApiKeyStore.get_instance()
+ device_key_name = f'{API_KEY_NAME} ({device_code_entry.user_code})'
+ device_api_key = api_key_store.retrieve_api_key_by_name(
+ device_code_entry.keycloak_user_id, device_key_name
+ )
+
+ if not device_api_key:
+ logger.error(
+ 'No device API key found for authorized device',
+ extra={
+ 'user_id': device_code_entry.keycloak_user_id,
+ 'user_code': device_code_entry.user_code,
+ },
+ )
+ return _oauth_error(
+ status.HTTP_500_INTERNAL_SERVER_ERROR,
+ 'server_error',
+ 'API key not found',
+ )
+
+ # Return the API key as access_token
+ return DeviceTokenResponse(
+ access_token=device_api_key,
+ )
+
+ # Fallback for unexpected status values
+ logger.error(
+ 'Unknown device code status',
+ extra={'status': device_code_entry.status},
+ )
+ return _oauth_error(
+ status.HTTP_500_INTERNAL_SERVER_ERROR,
+ 'server_error',
+ 'Unknown device code status',
+ )
+
+ except Exception as e:
+ logger.exception('Error in device token: %s', str(e))
+ return _oauth_error(
+ status.HTTP_500_INTERNAL_SERVER_ERROR,
+ 'server_error',
+ 'Internal server error',
+ )
+
+
+@oauth_device_router.post('/verify-authenticated')
+async def device_verification_authenticated(
+ user_code: str = Form(...),
+ user_id: str = Depends(get_user_id),
+):
+ """Process device verification for authenticated users (called by frontend)."""
+ try:
+ if not user_id:
+ raise HTTPException(
+ status_code=status.HTTP_401_UNAUTHORIZED,
+ detail='Authentication required',
+ )
+
+ # Validate device code
+ device_code_entry = device_code_store.get_by_user_code(user_code)
+ if not device_code_entry:
+ raise HTTPException(
+ status_code=status.HTTP_400_BAD_REQUEST,
+ detail='The device code is invalid or has expired.',
+ )
+
+ if not device_code_entry.is_pending():
+ raise HTTPException(
+ status_code=status.HTTP_400_BAD_REQUEST,
+ detail='This device code has already been processed.',
+ )
+
+ # First, authorize the device code
+ success = device_code_store.authorize_device_code(
+ user_code=user_code,
+ user_id=user_id,
+ )
+
+ if not success:
+ logger.error(
+ 'Failed to authorize device code',
+ extra={'user_code': user_code, 'user_id': user_id},
+ )
+ raise HTTPException(
+ status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+ detail='Failed to authorize the device. Please try again.',
+ )
+
+ # Only create API key AFTER successful authorization
+ api_key_store = ApiKeyStore.get_instance()
+ try:
+ # Create a unique API key for this device using user_code in the name
+ device_key_name = f'{API_KEY_NAME} ({user_code})'
+ api_key_store.create_api_key(
+ user_id,
+ name=device_key_name,
+ expires_at=datetime.now(UTC) + KEY_EXPIRATION_TIME,
+ )
+ logger.info(
+ 'Created new device API key for user after successful authorization',
+ extra={'user_id': user_id, 'user_code': user_code},
+ )
+ except Exception as e:
+ logger.exception(
+ 'Failed to create device API key after authorization: %s', str(e)
+ )
+
+ # Clean up: revert the device authorization since API key creation failed
+ # This prevents the device from being in an authorized state without an API key
+ try:
+ device_code_store.deny_device_code(user_code)
+ logger.info(
+ 'Reverted device authorization due to API key creation failure',
+ extra={'user_code': user_code, 'user_id': user_id},
+ )
+ except Exception as cleanup_error:
+ logger.exception(
+ 'Failed to revert device authorization during cleanup: %s',
+ str(cleanup_error),
+ )
+
+ raise HTTPException(
+ status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+ detail='Failed to create API key for device access.',
+ )
+
+ logger.info(
+ 'Device code authorized with API key successfully',
+ extra={'user_code': user_code, 'user_id': user_id},
+ )
+ return JSONResponse(
+ status_code=status.HTTP_200_OK,
+ content={'message': 'Device authorized successfully!'},
+ )
+
+ except HTTPException:
+ raise
+ except Exception as e:
+ logger.exception('Error in device verification: %s', str(e))
+ raise HTTPException(
+ status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+ detail='An unexpected error occurred. Please try again.',
+ )
diff --git a/enterprise/server/saas_nested_conversation_manager.py b/enterprise/server/saas_nested_conversation_manager.py
index e0727996de14..d92e67b9ff9f 100644
--- a/enterprise/server/saas_nested_conversation_manager.py
+++ b/enterprise/server/saas_nested_conversation_manager.py
@@ -31,6 +31,7 @@
from openhands.events.serialization.event import event_to_dict
from openhands.integrations.provider import PROVIDER_TOKEN_TYPE, ProviderHandler
from openhands.runtime.impl.remote.remote_runtime import RemoteRuntime
+from openhands.runtime.plugins.vscode import VSCodeRequirement
from openhands.runtime.runtime_status import RuntimeStatus
from openhands.server.config.server_config import ServerConfig
from openhands.server.constants import ROOM_KEY
@@ -70,6 +71,14 @@
else '/api/conversations/{conversation_id}'
)
+RUNTIME_USERNAME = os.getenv('RUNTIME_USERNAME')
+
+SU_TO_USER = os.getenv('SU_TO_USER', 'false')
+truthy = {'1', 'true', 't', 'yes', 'y', 'on'}
+SU_TO_USER = str(SU_TO_USER.lower() in truthy).lower()
+
+DISABLE_VSCODE_PLUGIN = os.getenv('DISABLE_VSCODE_PLUGIN', 'false').lower() == 'true'
+
# Time in seconds before a Redis entry is considered expired if not refreshed
_REDIS_ENTRY_TIMEOUT_SECONDS = 300
@@ -772,7 +781,11 @@ async def _create_runtime(
env_vars['SERVE_FRONTEND'] = '0'
env_vars['RUNTIME'] = 'local'
# TODO: In the long term we may come up with a more secure strategy for user management within the nested runtime.
- env_vars['USER'] = 'openhands' if config.run_as_openhands else 'root'
+ env_vars['USER'] = (
+ RUNTIME_USERNAME
+ if RUNTIME_USERNAME
+ else ('openhands' if config.run_as_openhands else 'root')
+ )
env_vars['PERMITTED_CORS_ORIGINS'] = ','.join(PERMITTED_CORS_ORIGINS)
env_vars['port'] = '60000'
# TODO: These values are static in the runtime-api project, but do not get copied into the runtime ENV
@@ -789,6 +802,8 @@ async def _create_runtime(
env_vars['INITIAL_NUM_WARM_SERVERS'] = '1'
env_vars['INIT_GIT_IN_EMPTY_WORKSPACE'] = '1'
env_vars['ENABLE_V1'] = '0'
+ env_vars['SU_TO_USER'] = SU_TO_USER
+ env_vars['DISABLE_VSCODE_PLUGIN'] = str(DISABLE_VSCODE_PLUGIN).lower()
# We need this for LLM traces tracking to identify the source of the LLM calls
env_vars['WEB_HOST'] = WEB_HOST
@@ -804,11 +819,18 @@ async def _create_runtime(
if self._runtime_container_image:
config.sandbox.runtime_container_image = self._runtime_container_image
+ plugins = [
+ plugin
+ for plugin in agent.sandbox_plugins
+ if not (DISABLE_VSCODE_PLUGIN and isinstance(plugin, VSCodeRequirement))
+ ]
+ logger.info(f'Loaded plugins for runtime {sid}: {plugins}')
+
runtime = RemoteRuntime(
config=config,
event_stream=None, # type: ignore[arg-type]
sid=sid,
- plugins=agent.sandbox_plugins,
+ plugins=plugins,
# env_vars=env_vars,
# status_callback: Callable[..., None] | None = None,
attach_to_existing=False,
diff --git a/enterprise/storage/api_key_store.py b/enterprise/storage/api_key_store.py
index 162ed415c150..9714d7476a31 100644
--- a/enterprise/storage/api_key_store.py
+++ b/enterprise/storage/api_key_store.py
@@ -17,10 +17,13 @@
class ApiKeyStore:
session_maker: sessionmaker
+ API_KEY_PREFIX = 'sk-oh-'
+
def generate_api_key(self, length: int = 32) -> str:
- """Generate a random API key."""
+ """Generate a random API key with the sk-oh- prefix."""
alphabet = string.ascii_letters + string.digits
- return ''.join(secrets.choice(alphabet) for _ in range(length))
+ random_part = ''.join(secrets.choice(alphabet) for _ in range(length))
+ return f'{self.API_KEY_PREFIX}{random_part}'
def create_api_key(
self, user_id: str, name: str | None = None, expires_at: datetime | None = None
@@ -57,9 +60,15 @@ def validate_api_key(self, api_key: str) -> str | None:
return None
# Check if the key has expired
- if key_record.expires_at and key_record.expires_at < now:
- logger.info(f'API key has expired: {key_record.id}')
- return None
+ if key_record.expires_at:
+ # Handle timezone-naive datetime from database by assuming it's UTC
+ expires_at = key_record.expires_at
+ if expires_at.tzinfo is None:
+ expires_at = expires_at.replace(tzinfo=UTC)
+
+ if expires_at < now:
+ logger.info(f'API key has expired: {key_record.id}')
+ return None
# Update last_used_at timestamp
session.execute(
@@ -125,6 +134,33 @@ def retrieve_mcp_api_key(self, user_id: str) -> str | None:
return None
+ def retrieve_api_key_by_name(self, user_id: str, name: str) -> str | None:
+ """Retrieve an API key by name for a specific user."""
+ with self.session_maker() as session:
+ key_record = (
+ session.query(ApiKey)
+ .filter(ApiKey.user_id == user_id, ApiKey.name == name)
+ .first()
+ )
+ return key_record.key if key_record else None
+
+ def delete_api_key_by_name(self, user_id: str, name: str) -> bool:
+ """Delete an API key by name for a specific user."""
+ with self.session_maker() as session:
+ key_record = (
+ session.query(ApiKey)
+ .filter(ApiKey.user_id == user_id, ApiKey.name == name)
+ .first()
+ )
+
+ if not key_record:
+ return False
+
+ session.delete(key_record)
+ session.commit()
+
+ return True
+
@classmethod
def get_instance(cls) -> ApiKeyStore:
"""Get an instance of the ApiKeyStore."""
diff --git a/enterprise/storage/device_code.py b/enterprise/storage/device_code.py
new file mode 100644
index 000000000000..47e18b51bcc5
--- /dev/null
+++ b/enterprise/storage/device_code.py
@@ -0,0 +1,109 @@
+"""Device code storage model for OAuth 2.0 Device Flow."""
+
+from datetime import datetime, timezone
+from enum import Enum
+
+from sqlalchemy import Column, DateTime, Integer, String
+from storage.base import Base
+
+
+class DeviceCodeStatus(Enum):
+ """Status of a device code authorization request."""
+
+ PENDING = 'pending'
+ AUTHORIZED = 'authorized'
+ EXPIRED = 'expired'
+ DENIED = 'denied'
+
+
+class DeviceCode(Base):
+ """Device code for OAuth 2.0 Device Flow.
+
+ This stores the device codes issued during the device authorization flow,
+ along with their status and associated user information once authorized.
+ """
+
+ __tablename__ = 'device_codes'
+
+ id = Column(Integer, primary_key=True, autoincrement=True)
+ device_code = Column(String(128), unique=True, nullable=False, index=True)
+ user_code = Column(String(16), unique=True, nullable=False, index=True)
+ status = Column(String(32), nullable=False, default=DeviceCodeStatus.PENDING.value)
+
+ # Keycloak user ID who authorized the device (set during verification)
+ keycloak_user_id = Column(String(255), nullable=True)
+
+ # Timestamps
+ expires_at = Column(DateTime(timezone=True), nullable=False)
+ authorized_at = Column(DateTime(timezone=True), nullable=True)
+
+ # Rate limiting fields for RFC 8628 section 3.5 compliance
+ last_poll_time = Column(DateTime(timezone=True), nullable=True)
+ current_interval = Column(Integer, nullable=False, default=5)
+
+ def __repr__(self) -> str:
+ return f"