feat(fetch): add Ollama Cloud web fetch provider
This commit is contained in:
@@ -85,7 +85,40 @@ describe("web fetch account state", () => {
|
||||
expect(mocks.clearAccountError).toHaveBeenCalledWith(
|
||||
"jina-connection",
|
||||
expect.objectContaining({ connectionName: "Jina Test" }),
|
||||
"webfetch:jina-reader",
|
||||
);
|
||||
expect(mocks.getProviderCredentials).toHaveBeenCalledWith(
|
||||
"jina-reader",
|
||||
expect.any(Set),
|
||||
"webfetch:jina-reader",
|
||||
);
|
||||
expect(mocks.markAccountUnavailable).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("scopes provider failures to web fetch", async () => {
|
||||
mocks.handleFetchCore.mockResolvedValue({
|
||||
success: false,
|
||||
status: 429,
|
||||
error: "quota exceeded",
|
||||
});
|
||||
mocks.markAccountUnavailable.mockResolvedValue({ shouldFallback: false });
|
||||
|
||||
const response = await handleFetch(new Request("http://localhost/v1/web/fetch", {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({
|
||||
provider: "jina-reader",
|
||||
url: "https://example.com/article",
|
||||
}),
|
||||
}));
|
||||
|
||||
expect(response.status).toBe(429);
|
||||
expect(mocks.markAccountUnavailable).toHaveBeenCalledWith(
|
||||
"jina-connection",
|
||||
429,
|
||||
"quota exceeded",
|
||||
"jina-reader",
|
||||
"webfetch:jina-reader",
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
112
tests/unit/ollama-web-fetch-provider.test.js
Normal file
112
tests/unit/ollama-web-fetch-provider.test.js
Normal file
@@ -0,0 +1,112 @@
|
||||
import { afterEach, describe, expect, it, vi } from "vitest";
|
||||
|
||||
import REGISTRY from "../../open-sse/providers/registry/index.js";
|
||||
import { handleFetchCore } from "../../open-sse/handlers/fetch/index.js";
|
||||
import { AI_PROVIDERS, getProvidersByKind } from "@/shared/constants/providers.js";
|
||||
|
||||
const CONFIG = {
|
||||
baseUrl: "https://ollama.com/api/web_fetch",
|
||||
timeoutMs: 30000,
|
||||
};
|
||||
|
||||
afterEach(() => {
|
||||
vi.unstubAllGlobals();
|
||||
});
|
||||
|
||||
describe("Ollama Cloud web fetch provider", () => {
|
||||
it("registers web fetch on the existing Ollama Cloud connection", () => {
|
||||
const entry = REGISTRY.find((candidate) => candidate.id === "ollama");
|
||||
|
||||
expect(entry).toMatchObject({
|
||||
category: "freeTier",
|
||||
serviceKinds: ["llm", "webFetch"],
|
||||
fetchConfig: {
|
||||
baseUrl: "https://ollama.com/api/web_fetch",
|
||||
method: "POST",
|
||||
authHeader: "bearer",
|
||||
formats: ["markdown"],
|
||||
},
|
||||
});
|
||||
expect(AI_PROVIDERS.ollama?.fetchConfig).toEqual(entry.fetchConfig);
|
||||
expect(getProvidersByKind("webFetch").map((provider) => provider.id)).toContain("ollama");
|
||||
});
|
||||
|
||||
it("calls Ollama with bearer auth and normalizes the response", async () => {
|
||||
vi.stubGlobal("fetch", vi.fn(async () => new Response(JSON.stringify({
|
||||
title: "Example Domain",
|
||||
content: "Hello from Ollama",
|
||||
links: ["https://www.iana.org/domains/example"],
|
||||
}), {
|
||||
status: 200,
|
||||
headers: { "Content-Type": "application/json" },
|
||||
})));
|
||||
|
||||
const result = await handleFetchCore({
|
||||
url: "https://example.com",
|
||||
format: "markdown",
|
||||
maxCharacters: 5,
|
||||
provider: "ollama",
|
||||
providerConfig: CONFIG,
|
||||
credentials: { apiKey: "ollama-test-key" },
|
||||
});
|
||||
|
||||
expect(result.success).toBe(true);
|
||||
expect(global.fetch).toHaveBeenCalledTimes(1);
|
||||
const [requestUrl, init] = global.fetch.mock.calls[0];
|
||||
expect(requestUrl).toBe("https://ollama.com/api/web_fetch");
|
||||
expect(init.method).toBe("POST");
|
||||
expect(init.headers).toEqual({
|
||||
"content-type": "application/json",
|
||||
authorization: "Bearer ollama-test-key",
|
||||
});
|
||||
expect(JSON.parse(init.body)).toEqual({ url: "https://example.com" });
|
||||
expect(result.data).toMatchObject({
|
||||
provider: "ollama",
|
||||
url: "https://example.com",
|
||||
title: "Example Domain",
|
||||
content: { format: "markdown", text: "Hello", length: 5 },
|
||||
links: ["https://www.iana.org/domains/example"],
|
||||
usage: { fetch_cost_usd: null },
|
||||
});
|
||||
});
|
||||
|
||||
it("returns the upstream status and error message", async () => {
|
||||
vi.stubGlobal("fetch", vi.fn(async () => new Response(
|
||||
JSON.stringify({ error: "invalid API key" }),
|
||||
{ status: 401, headers: { "Content-Type": "application/json" } },
|
||||
)));
|
||||
|
||||
const result = await handleFetchCore({
|
||||
url: "https://example.com",
|
||||
provider: "ollama",
|
||||
providerConfig: CONFIG,
|
||||
credentials: { apiKey: "bad-key" },
|
||||
});
|
||||
|
||||
expect(result).toMatchObject({
|
||||
success: false,
|
||||
status: 401,
|
||||
error: "invalid API key",
|
||||
});
|
||||
});
|
||||
|
||||
it("treats an empty successful response as an upstream error", async () => {
|
||||
vi.stubGlobal("fetch", vi.fn(async () => new Response(null, {
|
||||
status: 200,
|
||||
headers: { "Content-Type": "application/json" },
|
||||
})));
|
||||
|
||||
const result = await handleFetchCore({
|
||||
url: "https://example.com",
|
||||
provider: "ollama",
|
||||
providerConfig: CONFIG,
|
||||
credentials: { apiKey: "ollama-test-key" },
|
||||
});
|
||||
|
||||
expect(result).toEqual({
|
||||
success: false,
|
||||
status: 502,
|
||||
error: "Ollama returned an empty or invalid web fetch response",
|
||||
});
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user