Skip to content

Commit 2c0f91d

Browse files
committed
fix(code-index): localize validation errors and identify missing settings
1 parent ac8170e commit 2c0f91d

4 files changed

Lines changed: 18 additions & 19 deletions

File tree

‎src/services/code-index/__tests__/service-factory.spec.ts‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ describe("CodeIndexServiceFactory", () => {
108108
const requiredSettings = [
109109
["openai", "openAiOptions", "openAiNativeApiKey", "openAiConfigMissing"],
110110
["ollama", "ollamaOptions", "ollamaBaseUrl", "ollamaConfigMissing"],
111-
["openai-compatible", "openAiCompatibleOptions", "baseUrl", "openAiCompatibleConfigMissing"],
112-
["openai-compatible", "openAiCompatibleOptions", "apiKey", "openAiCompatibleConfigMissing"],
113111
["gemini", "geminiOptions", "apiKey", "geminiConfigMissing"],
114112
["mistral", "mistralOptions", "apiKey", "mistralConfigMissing"],
115113
["vercel-ai-gateway", "vercelAiGatewayOptions", "apiKey", "vercelAiGatewayConfigMissing"],
@@ -352,40 +350,36 @@ describe("CodeIndexServiceFactory", () => {
352350
)
353351
})
354352

355-
it("should throw error when OpenAI Compatible base URL is missing", () => {
353+
it.each([undefined, ""])("rejects missing or empty OpenAI Compatible base URL: %s", (baseUrl) => {
356354
// Arrange
357355
const testConfig = {
358356
embedderProvider: "openai-compatible",
359357
modelId: "text-embedding-3-large",
360358
openAiCompatibleOptions: {
361-
baseUrl: undefined,
359+
baseUrl,
362360
apiKey: "test-api-key",
363361
},
364362
}
365363
mockConfigManager.getConfig.mockReturnValue(testConfig as any)
366364

367365
// Act & Assert
368-
expect(() => embedderFactory.create(mockConfigManager.getConfig())).toThrow(
369-
"serviceFactory.openAiCompatibleConfigMissing",
370-
)
366+
expect(() => embedderFactory.create(mockConfigManager.getConfig())).toThrow("validation.baseUrlRequired")
371367
})
372368

373-
it("should throw error when OpenAI Compatible API key is missing", () => {
369+
it.each([undefined, ""])("rejects missing or empty OpenAI Compatible API key: %s", (apiKey) => {
374370
// Arrange
375371
const testConfig = {
376372
embedderProvider: "openai-compatible",
377373
modelId: "text-embedding-3-large",
378374
openAiCompatibleOptions: {
379375
baseUrl: "https://api.example.com/v1",
380-
apiKey: undefined,
376+
apiKey,
381377
},
382378
}
383379
mockConfigManager.getConfig.mockReturnValue(testConfig as any)
384380

385381
// Act & Assert
386-
expect(() => embedderFactory.create(mockConfigManager.getConfig())).toThrow(
387-
"serviceFactory.openAiCompatibleConfigMissing",
388-
)
382+
expect(() => embedderFactory.create(mockConfigManager.getConfig())).toThrow("validation.apiKeyRequired")
389383
})
390384

391385
it("should throw error when OpenAI Compatible options are missing", () => {
@@ -398,9 +392,7 @@ describe("CodeIndexServiceFactory", () => {
398392
mockConfigManager.getConfig.mockReturnValue(testConfig as any)
399393

400394
// Act & Assert
401-
expect(() => embedderFactory.create(mockConfigManager.getConfig())).toThrow(
402-
"serviceFactory.openAiCompatibleConfigMissing",
403-
)
395+
expect(() => embedderFactory.create(mockConfigManager.getConfig())).toThrow("validation.baseUrlRequired")
404396
})
405397

406398
it("should create GeminiEmbedder with default model when no modelId specified", () => {

‎src/services/code-index/embedders/__tests__/embedder-validation-manager.spec.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
import { TelemetryService } from "@roo-code/telemetry"
22
import { TelemetryEventName } from "@roo-code/types"
3+
import { t } from "../../../../i18n"
4+
import embeddings from "../../../../i18n/locales/en/embeddings.json"
35
import { OpenAiEmbedder } from "../openai"
46
import { EmbedderValidationManager } from "../embedder-validation-manager"
57

68
vi.mock("../openai")
9+
vi.mock("../../../../i18n", () => ({ t: vi.fn() }))
710
vi.mock("@roo-code/telemetry", () => ({
811
TelemetryService: { instance: { captureEvent: vi.fn() } },
912
}))
@@ -31,6 +34,7 @@ describe("EmbedderValidationManager", () => {
3134
vi.mocked(embedder.validateConfiguration).mockRejectedValue(error)
3235

3336
expect(await manager.validateEmbedder(embedder)).toEqual({ valid: false, error: error.message })
37+
expect(t).not.toHaveBeenCalled()
3438
expect(TelemetryService.instance.captureEvent).toHaveBeenCalledExactlyOnceWith(
3539
TelemetryEventName.CODE_INDEX_ERROR,
3640
{ error: error.message, stack: error.stack, location: "validateEmbedder" },
@@ -40,11 +44,13 @@ describe("EmbedderValidationManager", () => {
4044
it.each(["unavailable", null, undefined])("handles non-Error rejection %s", async (error) => {
4145
const embedder = new OpenAiEmbedder({ openAiNativeApiKey: "test-key" })
4246
vi.mocked(embedder.validateConfiguration).mockRejectedValue(error)
47+
vi.mocked(t).mockReturnValue(embeddings.validation.configurationError)
4348

4449
expect(await manager.validateEmbedder(embedder)).toEqual({
4550
valid: false,
46-
error: "embeddings:validation.configurationError",
51+
error: embeddings.validation.configurationError,
4752
})
53+
expect(t).toHaveBeenCalledExactlyOnceWith("embeddings:validation.configurationError")
4854
expect(TelemetryService.instance.captureEvent).toHaveBeenCalledExactlyOnceWith(
4955
TelemetryEventName.CODE_INDEX_ERROR,
5056
{ error: String(error), stack: undefined, location: "validateEmbedder" },

‎src/services/code-index/embedders/embedder-validation-manager.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { TelemetryService } from "@roo-code/telemetry"
22
import { TelemetryEventName } from "@roo-code/types"
3+
import { t } from "../../../i18n"
34
import type { IEmbedder } from "../interfaces"
45

56
export class EmbedderValidationManager {
@@ -15,7 +16,7 @@ export class EmbedderValidationManager {
1516

1617
return {
1718
valid: false,
18-
error: error instanceof Error ? error.message : "embeddings:validation.configurationError",
19+
error: error instanceof Error ? error.message : t("embeddings:validation.configurationError"),
1920
}
2021
}
2122
}

‎src/services/code-index/embedders/factories/openai-compatible-embedder-factory.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import { requireSetting } from "./require-setting"
66
export class OpenAICompatibleEmbedderFactory implements IEmbedderFactory {
77
create({ openAiCompatibleOptions, modelId }: CodeIndexConfig): OpenAICompatibleEmbedder {
88
return new OpenAICompatibleEmbedder(
9-
requireSetting(openAiCompatibleOptions?.baseUrl, "embeddings:serviceFactory.openAiCompatibleConfigMissing"),
10-
requireSetting(openAiCompatibleOptions?.apiKey, "embeddings:serviceFactory.openAiCompatibleConfigMissing"),
9+
requireSetting(openAiCompatibleOptions?.baseUrl, "embeddings:validation.baseUrlRequired"),
10+
requireSetting(openAiCompatibleOptions?.apiKey, "embeddings:validation.apiKeyRequired"),
1111
modelId,
1212
)
1313
}

0 commit comments

Comments
 (0)