Skip to content

Indexing field validation #5483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Jul 9, 2025
Merged

Indexing field validation #5483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
083e90f
feat: enhance CodeIndexPopover with validation, error handling, and U…
MuriloFP Jul 8, 2025
daae461
fix(ui): Fix OpenAI Compatible Model Dimension field not saving
MuriloFP Jul 8, 2025
f0a0011
fix(ui): correct validation logic for OpenAI Compatible model dimension
MuriloFP Jul 8, 2025
c607a01
feat(i18n): add validation messages for Qdrant URL and OpenAI API key…
daniel-lxs Jul 8, 2025
808c520
refactor(ui): remove unused saving state variables in CodeIndexPopover
daniel-lxs Jul 8, 2025
3fae369
fix: use i18n keys for validation error messages
daniel-lxs Jul 9, 2025
aad292a
refactor: consolidate validation logic into Zod schema
daniel-lxs Jul 9, 2025
c1b048c
chore: temporarily disable flaky bedrock error handling test
daniel-lxs Jul 9, 2025
458bc91
Revert "chore: temporarily disable flaky bedrock error handling test"
daniel-lxs Jul 9, 2025
7e471f7
Update webview-ui/src/i18n/locales/tr/settings.json
daniel-lxs Jul 9, 2025
a80e1e6
Update webview-ui/src/i18n/locales/tr/settings.json
daniel-lxs Jul 9, 2025
d812dec
feat: add default URLs for providers and improve form validation hand…
daniel-lxs Jul 9, 2025
9caf8f3
feat: add timeout handling and improve error messages in Ollama embedder
daniel-lxs Jul 9, 2025
1644218
fix: update error messages in Ollama embedder validation to use trans…
daniel-lxs Jul 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions src/services/code-index/embedders/__tests__/ollama.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ describe("CodeIndexOllamaEmbedder", () => {
const result = await embedder.validateConfiguration()

expect(result.valid).toBe(false)
expect(result.error).toBe("Connection to Ollama timed out at http://localhost:11434")
expect(result.error).toBe("embeddings:ollama.serviceNotRunning")
})

it("should fail validation when tags endpoint returns 404", async () => {
Expand All @@ -141,9 +141,7 @@ describe("CodeIndexOllamaEmbedder", () => {
const result = await embedder.validateConfiguration()

expect(result.valid).toBe(false)
expect(result.error).toBe(
"Ollama service is not running at http://localhost:11434. Please start Ollama first.",
)
expect(result.error).toBe("embeddings:ollama.serviceNotRunning")
})

it("should fail validation when tags endpoint returns other error", async () => {
Expand All @@ -157,7 +155,7 @@ describe("CodeIndexOllamaEmbedder", () => {
const result = await embedder.validateConfiguration()

expect(result.valid).toBe(false)
expect(result.error).toBe("Ollama service is unavailable at http://localhost:11434. HTTP status: 500")
expect(result.error).toBe("embeddings:ollama.serviceUnavailable")
})

it("should fail validation when model does not exist", async () => {
Expand All @@ -176,9 +174,7 @@ describe("CodeIndexOllamaEmbedder", () => {
const result = await embedder.validateConfiguration()

expect(result.valid).toBe(false)
expect(result.error).toBe(
"Model 'nomic-embed-text' not found. Available models: llama2:latest, mistral:latest",
)
expect(result.error).toBe("embeddings:ollama.modelNotFound")
})

it("should fail validation when model exists but doesn't support embeddings", async () => {
Expand All @@ -205,7 +201,7 @@ describe("CodeIndexOllamaEmbedder", () => {
const result = await embedder.validateConfiguration()

expect(result.valid).toBe(false)
expect(result.error).toBe("Model 'nomic-embed-text' is not embedding capable")
expect(result.error).toBe("embeddings:ollama.modelNotEmbeddingCapable")
})

it("should handle ECONNREFUSED errors", async () => {
Expand All @@ -214,7 +210,7 @@ describe("CodeIndexOllamaEmbedder", () => {
const result = await embedder.validateConfiguration()

expect(result.valid).toBe(false)
expect(result.error).toBe("Connection to Ollama timed out at http://localhost:11434")
expect(result.error).toBe("embeddings:ollama.serviceNotRunning")
})

it("should handle ENOTFOUND errors", async () => {
Expand All @@ -223,7 +219,7 @@ describe("CodeIndexOllamaEmbedder", () => {
const result = await embedder.validateConfiguration()

expect(result.valid).toBe(false)
expect(result.error).toBe("Ollama host not found: http://localhost:11434")
expect(result.error).toBe("embeddings:ollama.hostNotFound")
})

it("should handle generic network errors", async () => {
Expand Down
42 changes: 32 additions & 10 deletions src/services/code-index/embedders/ollama.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ export class CodeIndexOllamaEmbedder implements IEmbedder {
try {
// Note: Standard Ollama API uses 'prompt' for single text, not 'input' for array.
// Implementing based on user's specific request structure.

// Add timeout to prevent indefinite hanging
const controller = new AbortController()
const timeoutId = setTimeout(() => controller.abort(), 10000) // 10 second timeout

const response = await fetch(url, {
method: "POST",
headers: {
Expand All @@ -65,7 +70,9 @@ export class CodeIndexOllamaEmbedder implements IEmbedder {
model: modelToUse,
input: processedTexts, // Using 'input' as requested
}),
signal: controller.signal,
})
clearTimeout(timeoutId)

if (!response.ok) {
let errorBody = t("embeddings:ollama.couldNotReadErrorBody")
Expand Down Expand Up @@ -97,6 +104,16 @@ export class CodeIndexOllamaEmbedder implements IEmbedder {
} catch (error: any) {
// Log the original error for debugging purposes
console.error("Ollama embedding failed:", error)

// Handle specific error types with better messages
if (error.name === "AbortError") {
throw new Error(t("embeddings:validation.connectionFailed"))
} else if (error.message?.includes("fetch failed") || error.code === "ECONNREFUSED") {
throw new Error(t("embeddings:ollama.serviceNotRunning", { baseUrl: this.baseUrl }))
} else if (error.code === "ENOTFOUND") {
throw new Error(t("embeddings:ollama.hostNotFound", { baseUrl: this.baseUrl }))
}

// Re-throw a more specific error for the caller
throw new Error(t("embeddings:ollama.embeddingFailed", { message: error.message }))
}
Expand Down Expand Up @@ -129,12 +146,12 @@ export class CodeIndexOllamaEmbedder implements IEmbedder {
if (modelsResponse.status === 404) {
return {
valid: false,
error: t("embeddings:errors.ollama.serviceNotRunning", { baseUrl: this.baseUrl }),
error: t("embeddings:ollama.serviceNotRunning", { baseUrl: this.baseUrl }),
}
}
return {
valid: false,
error: t("embeddings:errors.ollama.serviceUnavailable", {
error: t("embeddings:ollama.serviceUnavailable", {
baseUrl: this.baseUrl,
status: modelsResponse.status,
}),
Expand All @@ -159,8 +176,8 @@ export class CodeIndexOllamaEmbedder implements IEmbedder {
const availableModels = models.map((m: any) => m.name).join(", ")
return {
valid: false,
error: t("embeddings:errors.ollama.modelNotFound", {
model: this.defaultModelId,
error: t("embeddings:ollama.modelNotFound", {
modelId: this.defaultModelId,
availableModels,
}),
}
Expand Down Expand Up @@ -189,7 +206,7 @@ export class CodeIndexOllamaEmbedder implements IEmbedder {
if (!testResponse.ok) {
return {
valid: false,
error: t("embeddings:errors.ollama.modelNotEmbedding", { model: this.defaultModelId }),
error: t("embeddings:ollama.modelNotEmbeddingCapable", { modelId: this.defaultModelId }),
}
}

Expand All @@ -199,21 +216,26 @@ export class CodeIndexOllamaEmbedder implements IEmbedder {
{
beforeStandardHandling: (error: any) => {
// Handle Ollama-specific connection errors
if (error?.message === "ECONNREFUSED") {
// Check for fetch failed errors which indicate Ollama is not running
if (
error?.message?.includes("fetch failed") ||
error?.code === "ECONNREFUSED" ||
error?.message?.includes("ECONNREFUSED")
) {
return {
valid: false,
error: t("embeddings:errors.ollama.connectionTimeout", { baseUrl: this.baseUrl }),
error: t("embeddings:ollama.serviceNotRunning", { baseUrl: this.baseUrl }),
}
} else if (error?.message === "ENOTFOUND") {
} else if (error?.code === "ENOTFOUND" || error?.message?.includes("ENOTFOUND")) {
return {
valid: false,
error: t("embeddings:errors.ollama.hostNotFound", { baseUrl: this.baseUrl }),
error: t("embeddings:ollama.hostNotFound", { baseUrl: this.baseUrl }),
}
} else if (error?.name === "AbortError") {
// Handle timeout
return {
valid: false,
error: t("embeddings:errors.ollama.connectionTimeout", { baseUrl: this.baseUrl }),
error: t("embeddings:validation.connectionFailed"),
}
}
// Let standard handling take over
Expand Down
Loading
Loading