apunkt/trustgraph
1
0
Fork 0
mirror of https://github.com/trustgraph-ai/trustgraph.git synced 2026-07-01 09:29:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Make Ollama embeddings layer effectful

Browse source
This commit is contained in:
elpresidank 2026-06-02 04:24:14 -05:00
parent 32788ec0e4
commit 9d3f745fb0
3 changed files with 112 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

31
ts/packages/flow/src/__tests__/ollama-embeddings.test.ts
View file

@ -1,6 +1,7 @@
import { describe, expect, it } from "@effect/vitest";
import { Effect } from "effect";
import { makeOllamaEmbeddings } from "../embeddings/ollama.js";
import { Embeddings } from "@trustgraph/base";
import { makeOllamaEmbeddings, OllamaEmbeddingsLive } from "../embeddings/ollama.js";
describe("Ollama embeddings provider", () => {
it.effect(
@ -79,4 +80,32 @@ describe("Ollama embeddings provider", () => {
expect(error.message).toContain("Ollama embeddings request failed (404): not found");
}),
);
it.effect(
"provides embeddings through the effectful layer",
Effect.fnUntraced(function* () {
const fetchImpl = (() =>
Promise.resolve(
new Response(JSON.stringify({ embeddings: [[4, 5, 6]] }), {
status: 200,
headers: { "Content-Type": "application/json" },
}),
)) as typeof fetch;
const vectors = yield* Effect.gen(function* () {
const embeddings = yield* Embeddings;
return yield* embeddings.embed(["beta"]);
}).pipe(
Effect.provide(
OllamaEmbeddingsLive({
id: "embeddings",
ollamaHost: "http://ollama.local",
fetch: fetchImpl,
}),
),
);
expect(vectors).toEqual([[4, 5, 6]]);
}),
);
});

47
ts/packages/flow/src/embeddings/ollama.ts
View file

@ -71,14 +71,14 @@ const loadOllamaEmbeddingsConfig = Effect.fn("OllamaEmbeddings.loadConfig")(func
} satisfies ResolvedOllamaEmbeddingsConfig;
});
export function makeOllamaEmbeddings(config: OllamaEmbeddingsConfig): EmbeddingsServiceShape {
const {
defaultModel,
ollamaHost,
fetchImpl,
} = Effect.runSync(loadOllamaEmbeddingsConfig(config)) satisfies ResolvedOllamaEmbeddingsConfig;
const responseJson = (response: Response): Promise<unknown> =>
response.json();
return {
const makeOllamaEmbeddingsFromConfig = ({
defaultModel,
ollamaHost,
fetchImpl,
}: ResolvedOllamaEmbeddingsConfig): EmbeddingsServiceShape => ({
embed: Effect.fn("OllamaEmbeddings.embed")((texts: ReadonlyArray<string>, model?: string) => {
if (texts.length === 0) {
return Effect.succeed([]);
@ -117,7 +117,7 @@ export function makeOllamaEmbeddings(config: OllamaEmbeddingsConfig): Embeddings
}
const data = yield* Effect.tryPromise({
try: () => response.json() as Promise<unknown>,
try: () => responseJson(response),
catch: (error) => ollamaEmbeddingsError("ollama.response-json", error),
});
const decoded = yield* S.decodeUnknownEffect(OllamaEmbedResponse)(data).pipe(
@ -126,13 +126,30 @@ export function makeOllamaEmbeddings(config: OllamaEmbeddingsConfig): Embeddings
return Array.from(decoded.embeddings, (vector) => Array.from(vector));
});
}),
};
});
export const makeOllamaEmbeddingsEffect = Effect.fn("makeOllamaEmbeddingsEffect")(function* (
config: OllamaEmbeddingsConfig,
) {
const resolved = yield* loadOllamaEmbeddingsConfig(config).pipe(
Effect.mapError((cause) => ollamaEmbeddingsError("ollama.load-config", cause)),
);
yield* Effect.log(
`[OllamaEmbeddings] Initialized (host=${resolved.ollamaHost}, model=${resolved.defaultModel})`,
);
return makeOllamaEmbeddingsFromConfig(resolved);
});
export function makeOllamaEmbeddings(config: OllamaEmbeddingsConfig): EmbeddingsServiceShape {
return Effect.runSync(makeOllamaEmbeddingsEffect(config));
}
export function OllamaEmbeddingsLive(config: OllamaEmbeddingsConfig): Layer.Layer<Embeddings> {
return Layer.succeed(
export function OllamaEmbeddingsLive(config: OllamaEmbeddingsConfig): Layer.Layer<Embeddings, EmbeddingsError> {
return Layer.effect(
Embeddings,
Embeddings.of(makeOllamaEmbeddings(config)),
makeOllamaEmbeddingsEffect(config).pipe(
Effect.map((embeddings) => Embeddings.of(embeddings)),
),
);
}
@ -140,16 +157,12 @@ export type OllamaEmbeddingsProcessor = ReturnType<typeof makeOllamaEmbeddingsPr
export function makeOllamaEmbeddingsProcessor(config: OllamaEmbeddingsConfig) {
const embeddings = makeOllamaEmbeddings(config);
const resolved = Effect.runSync(loadOllamaEmbeddingsConfig(config)) satisfies ResolvedOllamaEmbeddingsConfig;
Effect.runSync(Effect.log(
`[OllamaEmbeddings] Initialized (host=${resolved.ollamaHost}, model=${resolved.defaultModel})`,
));
return makeEmbeddingsService(config, embeddings);
}
export const OllamaEmbeddingsProcessor = makeOllamaEmbeddingsProcessor;
export const program = makeFlowProcessorProgram<OllamaEmbeddingsConfig, never, Embeddings>({
export const program = makeFlowProcessorProgram<OllamaEmbeddingsConfig, EmbeddingsError, Embeddings>({
id: "embeddings",
specs: () => makeEmbeddingsSpecs(),
layer: (config) => OllamaEmbeddingsLive(config),