@fgv/ts-extras-ollama 5.1.0-34

package/lib/test/unit/ollamaClient.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ollamaClient.test.d.ts","sourceRoot":"","sources":["../../../src/test/unit/ollamaClient.test.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,CAAC"}

package/lib/test/unit/ollamaClient.test.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("@fgv/ts-utils-jest");
+const ollama_1 = require("ollama");
+const index_1 = require("../../index");
+/**
+ * Reads the upstream client's (protected) resolved host for assertion. The `Ollama` instance
+ * keeps its config on a protected field; tests reach it through a narrow cast rather than widening
+ * the production surface.
+ */
+function resolvedHost(client) {
+    return client.config.host;
+}
+describe('createOllamaClient', () => {
+    test('succeeds with default host when no params are supplied', () => {
+        expect((0, index_1.createOllamaClient)()).toSucceedAndSatisfy((client) => {
+            expect(client).toBeInstanceOf(ollama_1.Ollama);
+            expect(resolvedHost(client)).toBe('http://127.0.0.1:11434');
+        });
+    });
+    test('applies a custom host', () => {
+        expect((0, index_1.createOllamaClient)({ host: 'http://10.0.0.5:11434' })).toSucceedAndSatisfy((client) => {
+            expect(resolvedHost(client)).toBe('http://10.0.0.5:11434');
+        });
+    });
+    test('accepts a custom fetch and headers', () => {
+        const customFetch = jest.fn();
+        expect((0, index_1.createOllamaClient)({
+            host: 'http://localhost:11434',
+            fetch: customFetch,
+            headers: { Authorization: 'Bearer token' }
+        })).toSucceedAndSatisfy((client) => {
+            expect(client).toBeInstanceOf(ollama_1.Ollama);
+        });
+    });
+    test('fails when the host is malformed (upstream constructor throws)', () => {
+        expect((0, index_1.createOllamaClient)({ host: 'not a url' })).toFailWith(/invalid url/i);
+    });
+});
+//# sourceMappingURL=ollamaClient.test.js.map

package/lib/test/unit/ollamaClient.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ollamaClient.test.js","sourceRoot":"","sources":["../../../src/test/unit/ollamaClient.test.ts"],"names":[],"mappings":";;AAAA,8BAA4B;AAC5B,mCAAgC;AAChC,uCAAiD;AAEjD;;;;GAIG;AACH,SAAS,YAAY,CAAC,MAAe;IACnC,OAAQ,MAAuC,CAAC,MAAM,CAAC,IAAI,CAAC;AAC9D,CAAC;AAED,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,IAAI,CAAC,wDAAwD,EAAE,GAAG,EAAE;QAClE,MAAM,CAAC,IAAA,0BAAkB,GAAE,CAAC,CAAC,mBAAmB,CAAC,CAAC,MAAM,EAAE,EAAE;YAC1D,MAAM,CAAC,MAAM,CAAC,CAAC,cAAc,CAAC,eAAM,CAAC,CAAC;YACtC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,uBAAuB,EAAE,GAAG,EAAE;QACjC,MAAM,CAAC,IAAA,0BAAkB,EAAC,EAAE,IAAI,EAAE,uBAAuB,EAAE,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,MAAM,EAAE,EAAE;YAC3F,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC9C,MAAM,WAAW,GAAG,IAAI,CAAC,EAAE,EAA6B,CAAC;QACzD,MAAM,CACJ,IAAA,0BAAkB,EAAC;YACjB,IAAI,EAAE,wBAAwB;YAC9B,KAAK,EAAE,WAAW;YAClB,OAAO,EAAE,EAAE,aAAa,EAAE,cAAc,EAAE;SAC3C,CAAC,CACH,CAAC,mBAAmB,CAAC,CAAC,MAAM,EAAE,EAAE;YAC/B,MAAM,CAAC,MAAM,CAAC,CAAC,cAAc,CAAC,eAAM,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,gEAAgE,EAAE,GAAG,EAAE;QAC1E,MAAM,CAAC,IAAA,0BAAkB,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["import '@fgv/ts-utils-jest';\nimport { Ollama } from 'ollama';\nimport { createOllamaClient } from '../../index';\n\n/**\n * Reads the upstream client's (protected) resolved host for assertion. The `Ollama` instance\n * keeps its config on a protected field; tests reach it through a narrow cast rather than widening\n * the production surface.\n */\nfunction resolvedHost(client: unknown): string {\n  return (client as { config: { host: string } }).config.host;\n}\n\ndescribe('createOllamaClient', () => {\n  test('succeeds with default host when no params are supplied', () => {\n    expect(createOllamaClient()).toSucceedAndSatisfy((client) => {\n      expect(client).toBeInstanceOf(Ollama);\n      expect(resolvedHost(client)).toBe('http://127.0.0.1:11434');\n    });\n  });\n\n  test('applies a custom host', () => {\n    expect(createOllamaClient({ host: 'http://10.0.0.5:11434' })).toSucceedAndSatisfy((client) => {\n      expect(resolvedHost(client)).toBe('http://10.0.0.5:11434');\n    });\n  });\n\n  test('accepts a custom fetch and headers', () => {\n    const customFetch = jest.fn() as unknown as typeof fetch;\n    expect(\n      createOllamaClient({\n        host: 'http://localhost:11434',\n        fetch: customFetch,\n        headers: { Authorization: 'Bearer token' }\n      })\n    ).toSucceedAndSatisfy((client) => {\n      expect(client).toBeInstanceOf(Ollama);\n    });\n  });\n\n  test('fails when the host is malformed (upstream constructor throws)', () => {\n    expect(createOllamaClient({ host: 'not a url' })).toFailWith(/invalid url/i);\n  });\n});\n"]}

package/lib/test/unit/pullModel.test.d.ts

@@ -0,0 +1,2 @@
+import '@fgv/ts-utils-jest';
+//# sourceMappingURL=pullModel.test.d.ts.map

package/lib/test/unit/pullModel.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pullModel.test.d.ts","sourceRoot":"","sources":["../../../src/test/unit/pullModel.test.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,CAAC"}

package/lib/test/unit/pullModel.test.js

@@ -0,0 +1,204 @@
+"use strict";
+var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }
+var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var g = generator.apply(thisArg, _arguments || []), i, q = [];
+    return i = Object.create((typeof AsyncIterator === "function" ? AsyncIterator : Object).prototype), verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
+    function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }
+    function verb(n, f) { if (g[n]) { i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; if (f) i[n] = f(i[n]); } }
+    function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
+    function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
+    function fulfill(value) { resume("next", value); }
+    function reject(value) { resume("throw", value); }
+    function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+require("@fgv/ts-utils-jest");
+const index_1 = require("../../index");
+/**
+ * Builds a structural mock of the upstream `AbortableAsyncIterator` returned by `client.pull`.
+ * `abort()` flips an internal flag that the generator checks before each chunk — so an abort
+ * triggered mid-stream surfaces as a throw on the next iteration, matching the real lib.
+ */
+function makePullIterator(chunks, opts) {
+    let aborted = false;
+    return {
+        abort: jest.fn(() => {
+            aborted = true;
+        }),
+        [Symbol.asyncIterator]() {
+            return __asyncGenerator(this, arguments, function* _a() {
+                for (const chunk of chunks) {
+                    if (aborted) {
+                        throw new Error('The operation was aborted');
+                    }
+                    yield yield __await(chunk);
+                    if (opts === null || opts === void 0 ? void 0 : opts.throwMidStream) {
+                        throw new Error('stream broke mid-pull');
+                    }
+                }
+            });
+        }
+    };
+}
+function mockPullClient(pull) {
+    return { pull };
+}
+const happyChunks = [
+    { status: 'pulling manifest' },
+    { status: 'pulling sha256:abc', digest: 'sha256:abc', total: 1000, completed: 1000 },
+    { status: 'success' }
+];
+describe('pullModel (layer 1 — structural client mock)', () => {
+    test('drives the stream, maps each chunk, and resolves with finalStatus + chunkCount', async () => {
+        const pull = jest.fn().mockResolvedValue(makePullIterator(happyChunks));
+        const client = mockPullClient(pull);
+        const seen = [];
+        expect(await (0, index_1.pullModel)(client, { model: 'llama3.1:8b', onProgress: (p) => seen.push(p) })).toSucceedWith({
+            model: 'llama3.1:8b',
+            finalStatus: 'success',
+            chunkCount: 3
+        });
+        expect(pull).toHaveBeenCalledWith({ model: 'llama3.1:8b', stream: true });
+        expect(seen).toHaveLength(3);
+        // Manifest phase: no layer fields.
+        expect(seen[0]).toEqual({
+            status: 'pulling manifest',
+            digest: undefined,
+            total: undefined,
+            completed: undefined
+        });
+        // Transfer phase: layer fields present and mapped 1:1.
+        expect(seen[1]).toEqual({
+            status: 'pulling sha256:abc',
+            digest: 'sha256:abc',
+            total: 1000,
+            completed: 1000
+        });
+        expect(seen[2].status).toBe('success');
+    });
+    test('forwards insecure and works without an onProgress callback', async () => {
+        const pull = jest.fn().mockResolvedValue(makePullIterator(happyChunks));
+        const client = mockPullClient(pull);
+        expect(await (0, index_1.pullModel)(client, { model: 'llama3.1:8b', insecure: true })).toSucceedWith({
+            model: 'llama3.1:8b',
+            finalStatus: 'success',
+            chunkCount: 3
+        });
+        expect(pull).toHaveBeenCalledWith({ model: 'llama3.1:8b', stream: true, insecure: true });
+    });
+    test('fails when the stream errors mid-pull', async () => {
+        const pull = jest.fn().mockResolvedValue(makePullIterator(happyChunks, { throwMidStream: true }));
+        const client = mockPullClient(pull);
+        expect(await (0, index_1.pullModel)(client, { model: 'llama3.1:8b' })).toFailWith(/stream broke mid-pull/);
+    });
+    test('fails when onProgress throws', async () => {
+        const pull = jest.fn().mockResolvedValue(makePullIterator(happyChunks));
+        const client = mockPullClient(pull);
+        expect(await (0, index_1.pullModel)(client, {
+            model: 'llama3.1:8b',
+            onProgress: () => {
+                throw new Error('consumer blew up');
+            }
+        })).toFailWith(/consumer blew up/);
+    });
+    test('an already-aborted signal cancels the pull on the first iteration', async () => {
+        // The signal is aborted before the loop begins, so the iterator's abort fires up front; the
+        // throw surfaces on the first iteration attempt (the mock checks the flag before the first yield).
+        const iterator = makePullIterator(happyChunks);
+        const pull = jest.fn().mockResolvedValue(iterator);
+        const client = mockPullClient(pull);
+        const controller = new AbortController();
+        controller.abort();
+        expect(await (0, index_1.pullModel)(client, { model: 'llama3.1:8b', signal: controller.signal })).toFailWith(/abort/i);
+        expect(iterator.abort).toHaveBeenCalledTimes(1);
+    });
+    test('a mid-stream abort cancels the pull, removes the listener, and surfaces as failure', async () => {
+        const iterator = makePullIterator(happyChunks);
+        const pull = jest.fn().mockResolvedValue(iterator);
+        const client = mockPullClient(pull);
+        const controller = new AbortController();
+        const removeSpy = jest.spyOn(controller.signal, 'removeEventListener');
+        const seen = [];
+        const result = await (0, index_1.pullModel)(client, {
+            model: 'llama3.1:8b',
+            signal: controller.signal,
+            onProgress: (p) => {
+                seen.push(p);
+                if (seen.length === 1) {
+                    controller.abort();
+                }
+            }
+        });
+        expect(result).toFailWith(/abort/i);
+        expect(iterator.abort).toHaveBeenCalled();
+        expect(seen).toHaveLength(1);
+        // The `finally` cleanup runs on the failure path too — no listener leak after an abort.
+        expect(removeSpy).toHaveBeenCalledWith('abort', expect.any(Function));
+    });
+    test('removes the abort listener after a normal completion', async () => {
+        const pull = jest.fn().mockResolvedValue(makePullIterator(happyChunks));
+        const client = mockPullClient(pull);
+        const controller = new AbortController();
+        const removeSpy = jest.spyOn(controller.signal, 'removeEventListener');
+        expect(await (0, index_1.pullModel)(client, { model: 'llama3.1:8b', signal: controller.signal })).toSucceed();
+        expect(removeSpy).toHaveBeenCalledWith('abort', expect.any(Function));
+    });
+});
+/**
+ * Layer 2 — a real client built with a mock `fetch` whose body is a `ReadableStream` of
+ * newline-delimited JSON. This exercises the `ollama` lib's actual JSON-lines stream parsing
+ * flowing through `pullModel`'s loop — the framing that layer 1 stubs over.
+ */
+function ndjsonResponse(lines) {
+    const bytes = new TextEncoder().encode(lines.join('\n') + '\n');
+    // Split the payload mid-stream (likely mid-line) into two reads to exercise buffer reassembly.
+    const mid = Math.floor(bytes.length / 2);
+    const parts = [bytes.slice(0, mid), bytes.slice(mid)];
+    let i = 0;
+    const stream = new ReadableStream({
+        pull(controller) {
+            if (i < parts.length) {
+                controller.enqueue(parts[i++]);
+            }
+            else {
+                controller.close();
+            }
+        }
+    });
+    return new Response(stream, { status: 200 });
+}
+describe('pullModel (layer 2 — fetch-level JSON-lines integration)', () => {
+    test('parses a real newline-delimited /api/pull stream through the ollama lib', async () => {
+        const lines = [
+            JSON.stringify({ status: 'pulling manifest' }),
+            JSON.stringify({ status: 'pulling sha256:abc', digest: 'sha256:abc', total: 1000, completed: 1000 }),
+            JSON.stringify({ status: 'verifying sha256 digest' }),
+            JSON.stringify({ status: 'writing manifest' }),
+            JSON.stringify({ status: 'success' })
+        ];
+        const fetchMock = jest.fn().mockResolvedValue(ndjsonResponse(lines));
+        const client = (0, index_1.createOllamaClient)({ fetch: fetchMock }).orThrow();
+        const seen = [];
+        expect(await (0, index_1.pullModel)(client, { model: 'llama3.1:8b', onProgress: (p) => seen.push(p) })).toSucceedAndSatisfy((r) => {
+            expect(r.finalStatus).toBe('success');
+            expect(r.chunkCount).toBe(5);
+        });
+        expect(seen.map((s) => s.status)).toEqual([
+            'pulling manifest',
+            'pulling sha256:abc',
+            'verifying sha256 digest',
+            'writing manifest',
+            'success'
+        ]);
+        expect(seen[1]).toEqual({
+            status: 'pulling sha256:abc',
+            digest: 'sha256:abc',
+            total: 1000,
+            completed: 1000
+        });
+        expect(seen[0].digest).toBeUndefined();
+        expect(fetchMock.mock.calls[0][0]).toEqual(expect.stringContaining('/api/pull'));
+    });
+});
+//# sourceMappingURL=pullModel.test.js.map

package/lib/test/unit/pullModel.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pullModel.test.js","sourceRoot":"","sources":["../../../src/test/unit/pullModel.test.ts"],"names":[],"mappings":"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","sourcesContent":["import '@fgv/ts-utils-jest';\nimport { type IOllamaClient, type IOllamaPullProgress, createOllamaClient, pullModel } from '../../index';\n\n/** The actual `/api/pull` wire chunk shape — layer fields absent on non-transfer phases. */\ninterface IPullChunk {\n  status: string;\n  digest?: string;\n  total?: number;\n  completed?: number;\n}\n\n/**\n * Builds a structural mock of the upstream `AbortableAsyncIterator` returned by `client.pull`.\n * `abort()` flips an internal flag that the generator checks before each chunk — so an abort\n * triggered mid-stream surfaces as a throw on the next iteration, matching the real lib.\n */\nfunction makePullIterator(\n  chunks: ReadonlyArray<IPullChunk>,\n  opts?: { readonly throwMidStream?: boolean }\n): { abort: jest.Mock } & AsyncIterable<IPullChunk> {\n  let aborted = false;\n  return {\n    abort: jest.fn(() => {\n      aborted = true;\n    }),\n    async *[Symbol.asyncIterator](): AsyncGenerator<IPullChunk> {\n      for (const chunk of chunks) {\n        if (aborted) {\n          throw new Error('The operation was aborted');\n        }\n        yield chunk;\n        if (opts?.throwMidStream) {\n          throw new Error('stream broke mid-pull');\n        }\n      }\n    }\n  };\n}\n\nfunction mockPullClient(pull: unknown): IOllamaClient {\n  return { pull } as unknown as IOllamaClient;\n}\n\nconst happyChunks: ReadonlyArray<IPullChunk> = [\n  { status: 'pulling manifest' },\n  { status: 'pulling sha256:abc', digest: 'sha256:abc', total: 1000, completed: 1000 },\n  { status: 'success' }\n];\n\ndescribe('pullModel (layer 1 — structural client mock)', () => {\n  test('drives the stream, maps each chunk, and resolves with finalStatus + chunkCount', async () => {\n    const pull = jest.fn().mockResolvedValue(makePullIterator(happyChunks));\n    const client = mockPullClient(pull);\n    const seen: IOllamaPullProgress[] = [];\n\n    expect(await pullModel(client, { model: 'llama3.1:8b', onProgress: (p) => seen.push(p) })).toSucceedWith({\n      model: 'llama3.1:8b',\n      finalStatus: 'success',\n      chunkCount: 3\n    });\n    expect(pull).toHaveBeenCalledWith({ model: 'llama3.1:8b', stream: true });\n    expect(seen).toHaveLength(3);\n    // Manifest phase: no layer fields.\n    expect(seen[0]).toEqual({\n      status: 'pulling manifest',\n      digest: undefined,\n      total: undefined,\n      completed: undefined\n    });\n    // Transfer phase: layer fields present and mapped 1:1.\n    expect(seen[1]).toEqual({\n      status: 'pulling sha256:abc',\n      digest: 'sha256:abc',\n      total: 1000,\n      completed: 1000\n    });\n    expect(seen[2].status).toBe('success');\n  });\n\n  test('forwards insecure and works without an onProgress callback', async () => {\n    const pull = jest.fn().mockResolvedValue(makePullIterator(happyChunks));\n    const client = mockPullClient(pull);\n\n    expect(await pullModel(client, { model: 'llama3.1:8b', insecure: true })).toSucceedWith({\n      model: 'llama3.1:8b',\n      finalStatus: 'success',\n      chunkCount: 3\n    });\n    expect(pull).toHaveBeenCalledWith({ model: 'llama3.1:8b', stream: true, insecure: true });\n  });\n\n  test('fails when the stream errors mid-pull', async () => {\n    const pull = jest.fn().mockResolvedValue(makePullIterator(happyChunks, { throwMidStream: true }));\n    const client = mockPullClient(pull);\n\n    expect(await pullModel(client, { model: 'llama3.1:8b' })).toFailWith(/stream broke mid-pull/);\n  });\n\n  test('fails when onProgress throws', async () => {\n    const pull = jest.fn().mockResolvedValue(makePullIterator(happyChunks));\n    const client = mockPullClient(pull);\n\n    expect(\n      await pullModel(client, {\n        model: 'llama3.1:8b',\n        onProgress: () => {\n          throw new Error('consumer blew up');\n        }\n      })\n    ).toFailWith(/consumer blew up/);\n  });\n\n  test('an already-aborted signal cancels the pull on the first iteration', async () => {\n    // The signal is aborted before the loop begins, so the iterator's abort fires up front; the\n    // throw surfaces on the first iteration attempt (the mock checks the flag before the first yield).\n    const iterator = makePullIterator(happyChunks);\n    const pull = jest.fn().mockResolvedValue(iterator);\n    const client = mockPullClient(pull);\n    const controller = new AbortController();\n    controller.abort();\n\n    expect(await pullModel(client, { model: 'llama3.1:8b', signal: controller.signal })).toFailWith(/abort/i);\n    expect(iterator.abort).toHaveBeenCalledTimes(1);\n  });\n\n  test('a mid-stream abort cancels the pull, removes the listener, and surfaces as failure', async () => {\n    const iterator = makePullIterator(happyChunks);\n    const pull = jest.fn().mockResolvedValue(iterator);\n    const client = mockPullClient(pull);\n    const controller = new AbortController();\n    const removeSpy = jest.spyOn(controller.signal, 'removeEventListener');\n    const seen: IOllamaPullProgress[] = [];\n\n    const result = await pullModel(client, {\n      model: 'llama3.1:8b',\n      signal: controller.signal,\n      onProgress: (p) => {\n        seen.push(p);\n        if (seen.length === 1) {\n          controller.abort();\n        }\n      }\n    });\n    expect(result).toFailWith(/abort/i);\n    expect(iterator.abort).toHaveBeenCalled();\n    expect(seen).toHaveLength(1);\n    // The `finally` cleanup runs on the failure path too — no listener leak after an abort.\n    expect(removeSpy).toHaveBeenCalledWith('abort', expect.any(Function));\n  });\n\n  test('removes the abort listener after a normal completion', async () => {\n    const pull = jest.fn().mockResolvedValue(makePullIterator(happyChunks));\n    const client = mockPullClient(pull);\n    const controller = new AbortController();\n    const removeSpy = jest.spyOn(controller.signal, 'removeEventListener');\n\n    expect(await pullModel(client, { model: 'llama3.1:8b', signal: controller.signal })).toSucceed();\n    expect(removeSpy).toHaveBeenCalledWith('abort', expect.any(Function));\n  });\n});\n\n/**\n * Layer 2 — a real client built with a mock `fetch` whose body is a `ReadableStream` of\n * newline-delimited JSON. This exercises the `ollama` lib's actual JSON-lines stream parsing\n * flowing through `pullModel`'s loop — the framing that layer 1 stubs over.\n */\nfunction ndjsonResponse(lines: ReadonlyArray<string>): Response {\n  const bytes = new TextEncoder().encode(lines.join('\\n') + '\\n');\n  // Split the payload mid-stream (likely mid-line) into two reads to exercise buffer reassembly.\n  const mid = Math.floor(bytes.length / 2);\n  const parts = [bytes.slice(0, mid), bytes.slice(mid)];\n  let i = 0;\n  const stream = new ReadableStream<Uint8Array>({\n    pull(controller: ReadableStreamDefaultController<Uint8Array>): void {\n      if (i < parts.length) {\n        controller.enqueue(parts[i++]);\n      } else {\n        controller.close();\n      }\n    }\n  });\n  return new Response(stream, { status: 200 });\n}\n\ndescribe('pullModel (layer 2 — fetch-level JSON-lines integration)', () => {\n  test('parses a real newline-delimited /api/pull stream through the ollama lib', async () => {\n    const lines = [\n      JSON.stringify({ status: 'pulling manifest' }),\n      JSON.stringify({ status: 'pulling sha256:abc', digest: 'sha256:abc', total: 1000, completed: 1000 }),\n      JSON.stringify({ status: 'verifying sha256 digest' }),\n      JSON.stringify({ status: 'writing manifest' }),\n      JSON.stringify({ status: 'success' })\n    ];\n    const fetchMock = jest.fn().mockResolvedValue(ndjsonResponse(lines));\n    const client = createOllamaClient({ fetch: fetchMock as unknown as typeof fetch }).orThrow();\n    const seen: IOllamaPullProgress[] = [];\n\n    expect(\n      await pullModel(client, { model: 'llama3.1:8b', onProgress: (p) => seen.push(p) })\n    ).toSucceedAndSatisfy((r) => {\n      expect(r.finalStatus).toBe('success');\n      expect(r.chunkCount).toBe(5);\n    });\n    expect(seen.map((s) => s.status)).toEqual([\n      'pulling manifest',\n      'pulling sha256:abc',\n      'verifying sha256 digest',\n      'writing manifest',\n      'success'\n    ]);\n    expect(seen[1]).toEqual({\n      status: 'pulling sha256:abc',\n      digest: 'sha256:abc',\n      total: 1000,\n      completed: 1000\n    });\n    expect(seen[0].digest).toBeUndefined();\n    expect(fetchMock.mock.calls[0][0]).toEqual(expect.stringContaining('/api/pull'));\n  });\n});\n"]}

package/package.json

@@ -0,0 +1,83 @@
+{
+  "name": "@fgv/ts-extras-ollama",
+  "version": "5.1.0-34",
+  "description": "Result-integration boundary over the ollama JS library for Node consumers (model management, streamed pull progress, grammar-constrained structured output)",
+  "main": "lib/index.js",
+  "types": "dist/ts-extras-ollama.d.ts",
+  "exports": {
+    ".": {
+      "node": {
+        "import": "./lib/index.js",
+        "require": "./lib/index.js"
+      },
+      "default": {
+        "import": "./lib/index.js",
+        "require": "./lib/index.js"
+      },
+      "types": "./dist/ts-extras-ollama.d.ts"
+    }
+  },
+  "scripts": {
+    "build": "heft build --clean",
+    "clean": "heft clean",
+    "test": "heft test --clean",
+    "test-handles": "jest --runInBand --detectOpenHandles",
+    "clean-jest": "jest --clear-cache",
+    "update-snapshot": "jest --updateSnapshot",
+    "coverage": "jest --coverage",
+    "lint": "eslint src --ext .ts",
+    "fixlint": "eslint src --ext .ts --fix"
+  },
+  "keywords": [
+    "typescript",
+    "ollama",
+    "result",
+    "local-ai",
+    "llm"
+  ],
+  "author": "Erik Fortune",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/ErikFortune/fgv/issues"
+  },
+  "homepage": "https://github.com/ErikFortune/fgv/tree/main/libraries/ts-extras-ollama#readme",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ErikFortune/fgv.git"
+  },
+  "sideEffects": false,
+  "dependencies": {
+    "@fgv/ts-json-base": "workspace:*"
+  },
+  "devDependencies": {
+    "@fgv/heft-dual-rig": "workspace:*",
+    "@fgv/ts-utils": "workspace:*",
+    "ollama": "^0.6.0",
+    "@fgv/ts-utils-jest": "workspace:*",
+    "@microsoft/api-extractor": "^7.55.2",
+    "@rushstack/eslint-config": "4.6.4",
+    "@rushstack/heft": "1.2.7",
+    "@rushstack/heft-jest-plugin": "1.2.6",
+    "@rushstack/heft-node-rig": "2.11.27",
+    "@types/heft-jest": "1.0.6",
+    "@types/jest": "^29.5.14",
+    "@types/node": "^20.14.9",
+    "@typescript-eslint/eslint-plugin": "^8.52.0",
+    "@typescript-eslint/parser": "^8.52.0",
+    "eslint": "^9.39.2",
+    "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-n": "^17.23.1",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-promise": "^7.2.1",
+    "eslint-plugin-tsdoc": "~0.5.2",
+    "jest": "^29.7.0",
+    "rimraf": "^6.1.2",
+    "ts-jest": "^29.4.6",
+    "ts-node": "^10.9.2",
+    "typescript": "5.9.3"
+  },
+  "peerDependencies": {
+    "@fgv/ts-utils": "workspace:*",
+    "ollama": "^0.6.0"
+  }
+}

package/rush-logs/ts-extras-ollama.build.cache.log

@@ -0,0 +1,3 @@
+Caching build output folders: dist, lib, temp, .rush/temp/operation/build
+Successfully set cache entry.
+Cache key: b70e5f6b6ada97ea70c5583027ea2b58b27bef46

package/rush-logs/ts-extras-ollama.build.log

@@ -0,0 +1,9 @@
+Invoking: heft build --clean 
+ ---- build started ---- 
+[build:typescript] The TypeScript compiler version 5.9.3 is newer than the latest version that was tested with Heft (5.8); it may not work correctly.
+[build:typescript] Using TypeScript version 5.9.3
+[build:lint] Using ESLint version 9.39.4
+[build:api-extractor] Using API Extractor version 7.58.7
+[build:api-extractor] Analysis will use the bundled TypeScript version 5.9.3
+ ---- build finished (1.887s) ---- 
+-------------------- Finished (1.889s) --------------------