mirror of
https://github.com/RooVetGit/Roo-Code.git
synced 2026-10-10 03:28:03 +00:00
* fix: add embedder validation to prevent misleading status indicators (#4398) * fix: address PR feedback and fix critical issues - Fixed settings-save flow to save before validation - Fixed Error constructor usage in scanner.ts - Fixed segment identification in file-watcher.ts - Added missing translation keys for embedder validation errors * fix: add missing Ollama translation keys - Added missing ollama.title, description, and settings keys - Fixed translation check failure in CI/CD pipeline - Synchronized all 17 non-English locale files * feat: add proactive embedder validation on provider switch - Validate embedder connection when switching providers - Prevent misleading 'Indexed' status when embedder is unavailable - Show immediate error feedback for invalid configurations - Add comprehensive test coverage for validation flow This ensures users get immediate feedback when configuring embedders, preventing confusion when providers like Ollama are not accessible. * fix: improve error handling and validation in code indexing process * refactor: extract common embedder validation and error handling logic - Created shared/validation-helpers.ts with centralized error handling utilities - Refactored OpenAI, OpenAI-Compatible, and Ollama embedders to use shared helpers - Eliminated duplicate error handling code across embedders - Improved maintainability and consistency of error handling - Fixed test compatibility in manager.spec.ts - All 2721 tests passing * refactor: simplify validation helpers by removing unnecessary wrapper functions - Removed getErrorMessageForConnectionError and inlined logic into handleValidationError - Removed isRateLimitError, logRateLimitRetry, and logEmbeddingError wrapper functions - Updated openai.ts and openai-compatible.ts to inline rate limit checking and logging - Reduced code complexity while maintaining all functionality - All 311 tests continue to pass * fix: add missing invalidResponse i18n key and fix French translation - Added missing 'invalidResponse' key to all locale files - Fixed French translation: changed 'and accessible' to 'et accessible' - Ensures proper error messages are displayed when embedder returns invalid responses * fix: restore removed score settings in webviewMessageHandler - Restored codebaseIndexSearchMaxResults and codebaseIndexSearchMinScore settings that were unintentionally removed - Keep embedder validation related changes * fix: revert unintended changes to file-watcher and scanner - Reverted point ID generation back to using line numbers instead of segmentHash - Restored { cause: deleteError } parameter in scanner error handling - These changes were unrelated to the embedder validation feature --------- Co-authored-by: Daniel Riccio <ricciodaniel98@gmail.com>
199 lines
6.1 KiB
TypeScript
199 lines
6.1 KiB
TypeScript
import { OpenAI } from "openai"
|
|
import { OpenAiNativeHandler } from "../../../api/providers/openai-native"
|
|
import { ApiHandlerOptions } from "../../../shared/api"
|
|
import { IEmbedder, EmbeddingResponse, EmbedderInfo } from "../interfaces"
|
|
import {
|
|
MAX_BATCH_TOKENS,
|
|
MAX_ITEM_TOKENS,
|
|
MAX_BATCH_RETRIES as MAX_RETRIES,
|
|
INITIAL_RETRY_DELAY_MS as INITIAL_DELAY_MS,
|
|
} from "../constants"
|
|
import { getModelQueryPrefix } from "../../../shared/embeddingModels"
|
|
import { t } from "../../../i18n"
|
|
import { withValidationErrorHandling, formatEmbeddingError, HttpError } from "../shared/validation-helpers"
|
|
|
|
/**
|
|
* OpenAI implementation of the embedder interface with batching and rate limiting
|
|
*/
|
|
export class OpenAiEmbedder extends OpenAiNativeHandler implements IEmbedder {
|
|
private embeddingsClient: OpenAI
|
|
private readonly defaultModelId: string
|
|
|
|
/**
|
|
* Creates a new OpenAI embedder
|
|
* @param options API handler options
|
|
*/
|
|
constructor(options: ApiHandlerOptions & { openAiEmbeddingModelId?: string }) {
|
|
super(options)
|
|
const apiKey = this.options.openAiNativeApiKey ?? "not-provided"
|
|
this.embeddingsClient = new OpenAI({ apiKey })
|
|
this.defaultModelId = options.openAiEmbeddingModelId || "text-embedding-3-small"
|
|
}
|
|
|
|
/**
|
|
* Creates embeddings for the given texts with batching and rate limiting
|
|
* @param texts Array of text strings to embed
|
|
* @param model Optional model identifier
|
|
* @returns Promise resolving to embedding response
|
|
*/
|
|
async createEmbeddings(texts: string[], model?: string): Promise<EmbeddingResponse> {
|
|
const modelToUse = model || this.defaultModelId
|
|
|
|
// Apply model-specific query prefix if required
|
|
const queryPrefix = getModelQueryPrefix("openai", modelToUse)
|
|
const processedTexts = queryPrefix
|
|
? texts.map((text, index) => {
|
|
// Prevent double-prefixing
|
|
if (text.startsWith(queryPrefix)) {
|
|
return text
|
|
}
|
|
const prefixedText = `${queryPrefix}${text}`
|
|
const estimatedTokens = Math.ceil(prefixedText.length / 4)
|
|
if (estimatedTokens > MAX_ITEM_TOKENS) {
|
|
console.warn(
|
|
t("embeddings:textWithPrefixExceedsTokenLimit", {
|
|
index,
|
|
estimatedTokens,
|
|
maxTokens: MAX_ITEM_TOKENS,
|
|
}),
|
|
)
|
|
// Return original text if adding prefix would exceed limit
|
|
return text
|
|
}
|
|
return prefixedText
|
|
})
|
|
: texts
|
|
|
|
const allEmbeddings: number[][] = []
|
|
const usage = { promptTokens: 0, totalTokens: 0 }
|
|
const remainingTexts = [...processedTexts]
|
|
|
|
while (remainingTexts.length > 0) {
|
|
const currentBatch: string[] = []
|
|
let currentBatchTokens = 0
|
|
const processedIndices: number[] = []
|
|
|
|
for (let i = 0; i < remainingTexts.length; i++) {
|
|
const text = remainingTexts[i]
|
|
const itemTokens = Math.ceil(text.length / 4)
|
|
|
|
if (itemTokens > MAX_ITEM_TOKENS) {
|
|
console.warn(
|
|
t("embeddings:textExceedsTokenLimit", {
|
|
index: i,
|
|
itemTokens,
|
|
maxTokens: MAX_ITEM_TOKENS,
|
|
}),
|
|
)
|
|
processedIndices.push(i)
|
|
continue
|
|
}
|
|
|
|
if (currentBatchTokens + itemTokens <= MAX_BATCH_TOKENS) {
|
|
currentBatch.push(text)
|
|
currentBatchTokens += itemTokens
|
|
processedIndices.push(i)
|
|
} else {
|
|
break
|
|
}
|
|
}
|
|
|
|
// Remove processed items from remainingTexts (in reverse order to maintain correct indices)
|
|
for (let i = processedIndices.length - 1; i >= 0; i--) {
|
|
remainingTexts.splice(processedIndices[i], 1)
|
|
}
|
|
|
|
if (currentBatch.length > 0) {
|
|
const batchResult = await this._embedBatchWithRetries(currentBatch, modelToUse)
|
|
allEmbeddings.push(...batchResult.embeddings)
|
|
usage.promptTokens += batchResult.usage.promptTokens
|
|
usage.totalTokens += batchResult.usage.totalTokens
|
|
}
|
|
}
|
|
|
|
return { embeddings: allEmbeddings, usage }
|
|
}
|
|
|
|
/**
|
|
* Helper method to handle batch embedding with retries and exponential backoff
|
|
* @param batchTexts Array of texts to embed in this batch
|
|
* @param model Model identifier to use
|
|
* @returns Promise resolving to embeddings and usage statistics
|
|
*/
|
|
private async _embedBatchWithRetries(
|
|
batchTexts: string[],
|
|
model: string,
|
|
): Promise<{ embeddings: number[][]; usage: { promptTokens: number; totalTokens: number } }> {
|
|
for (let attempts = 0; attempts < MAX_RETRIES; attempts++) {
|
|
try {
|
|
const response = await this.embeddingsClient.embeddings.create({
|
|
input: batchTexts,
|
|
model: model,
|
|
})
|
|
|
|
return {
|
|
embeddings: response.data.map((item) => item.embedding),
|
|
usage: {
|
|
promptTokens: response.usage?.prompt_tokens || 0,
|
|
totalTokens: response.usage?.total_tokens || 0,
|
|
},
|
|
}
|
|
} catch (error: any) {
|
|
const hasMoreAttempts = attempts < MAX_RETRIES - 1
|
|
|
|
// Check if it's a rate limit error
|
|
const httpError = error as HttpError
|
|
if (httpError?.status === 429 && hasMoreAttempts) {
|
|
const delayMs = INITIAL_DELAY_MS * Math.pow(2, attempts)
|
|
console.warn(
|
|
t("embeddings:rateLimitRetry", {
|
|
delayMs,
|
|
attempt: attempts + 1,
|
|
maxRetries: MAX_RETRIES,
|
|
}),
|
|
)
|
|
await new Promise((resolve) => setTimeout(resolve, delayMs))
|
|
continue
|
|
}
|
|
|
|
// Log the error for debugging
|
|
console.error(`OpenAI embedder error (attempt ${attempts + 1}/${MAX_RETRIES}):`, error)
|
|
|
|
// Format and throw the error
|
|
throw formatEmbeddingError(error, MAX_RETRIES)
|
|
}
|
|
}
|
|
|
|
throw new Error(t("embeddings:failedMaxAttempts", { attempts: MAX_RETRIES }))
|
|
}
|
|
|
|
/**
|
|
* Validates the OpenAI embedder configuration by attempting a minimal embedding request
|
|
* @returns Promise resolving to validation result with success status and optional error message
|
|
*/
|
|
async validateConfiguration(): Promise<{ valid: boolean; error?: string }> {
|
|
return withValidationErrorHandling(async () => {
|
|
// Test with a minimal embedding request
|
|
const response = await this.embeddingsClient.embeddings.create({
|
|
input: ["test"],
|
|
model: this.defaultModelId,
|
|
})
|
|
|
|
// Check if we got a valid response
|
|
if (!response.data || response.data.length === 0) {
|
|
return {
|
|
valid: false,
|
|
error: t("embeddings:openai.invalidResponseFormat"),
|
|
}
|
|
}
|
|
|
|
return { valid: true }
|
|
}, "openai")
|
|
}
|
|
|
|
get embedderInfo(): EmbedderInfo {
|
|
return {
|
|
name: "openai",
|
|
}
|
|
}
|
|
}
|