-
-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #25 from sgomez/upgrade
Upgrade dependencies
- Loading branch information
Showing
21 changed files
with
731 additions
and
200 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
examples/ai-core/src/generate-object/ollama-full-result.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| #! /usr/bin/env -S pnpm tsx | ||
|
|
||
| import { generateObject } from 'ai' | ||
| import { ollama } from 'ollama-ai-provider' | ||
| import { z } from 'zod' | ||
|
|
||
| import { buildProgram } from '../tools/command' | ||
|
|
||
| async function main(model: Parameters<typeof ollama>[0]) { | ||
| const result = await generateObject({ | ||
| model: ollama(model), | ||
| prompt: 'Generate a lasagna recipe.', | ||
| schema: z.object({ | ||
| recipe: z.object({ | ||
| ingredients: z.array( | ||
| z.object({ amount: z.string(), name: z.string() }), | ||
| ), | ||
| name: z.string(), | ||
| steps: z.array(z.string()), | ||
| }), | ||
| }), | ||
| }) | ||
|
|
||
| console.log(JSON.stringify(result, null, 2)) | ||
| } | ||
|
|
||
| buildProgram('llama3.1', main).catch(console.error) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| #! /usr/bin/env -S pnpm tsx | ||
|
|
||
| import { generateText } from 'ai' | ||
| import { ollama } from 'ollama-ai-provider' | ||
|
|
||
| import { buildProgram } from '../tools/command' | ||
|
|
||
| async function main(model: Parameters<typeof ollama>[0]) { | ||
| const result = await generateText({ | ||
| model: ollama(model), | ||
| prompt: 'Invent a new holiday and describe its traditions.', | ||
| }) | ||
|
|
||
| console.log(JSON.stringify(result, null, 2)) | ||
| } | ||
|
|
||
| buildProgram('llama3.1', main).catch(console.error) |
28 changes: 28 additions & 0 deletions
28
examples/ai-core/src/middleware/add-to-last-user-message.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| import { LanguageModelV1CallOptions } from 'ai' | ||
|
|
||
| export function addToLastUserMessage({ | ||
| params, | ||
| text, | ||
| }: { | ||
| params: LanguageModelV1CallOptions | ||
| text: string | ||
| }): LanguageModelV1CallOptions { | ||
| const { prompt, ...rest } = params | ||
|
|
||
| const lastMessage = prompt.at(-1) | ||
|
|
||
| if (lastMessage?.role !== 'user') { | ||
| return params | ||
| } | ||
|
|
||
| return { | ||
| ...rest, | ||
| prompt: [ | ||
| ...prompt.slice(0, -1), | ||
| { | ||
| ...lastMessage, | ||
| content: [{ text, type: 'text' }, ...lastMessage.content], | ||
| }, | ||
| ], | ||
| } | ||
| } |
39 changes: 39 additions & 0 deletions
39
examples/ai-core/src/middleware/generate-text-cache-middleware.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| #! /usr/bin/env -S pnpm tsx | ||
|
|
||
| import { | ||
| experimental_wrapLanguageModel as wrapLanguageModel, | ||
| generateText, | ||
| } from 'ai' | ||
| import { ollama } from 'ollama-ai-provider' | ||
|
|
||
| import { buildProgram } from '../tools/command' | ||
| import { yourCacheMiddleware } from './your-cache-middleware' | ||
|
|
||
| async function main(model: Parameters<typeof ollama>[0]) { | ||
| const modelWithCaching = wrapLanguageModel({ | ||
| middleware: yourCacheMiddleware, | ||
| model: ollama(model), | ||
| }) | ||
|
|
||
| const start1 = Date.now() | ||
| const result1 = await generateText({ | ||
| model: modelWithCaching, | ||
| prompt: 'What cities are in the United States?', | ||
| }) | ||
|
|
||
| const end1 = Date.now() | ||
|
|
||
| const start2 = Date.now() | ||
| const result2 = await generateText({ | ||
| model: modelWithCaching, | ||
| prompt: 'What cities are in the United States?', | ||
| }) | ||
| const end2 = Date.now() | ||
|
|
||
| console.log(`Time taken for result1: ${end1 - start1}ms`) | ||
| console.log(`Time taken for result2: ${end2 - start2}ms`) | ||
|
|
||
| console.log(result1.text === result2.text) | ||
| } | ||
|
|
||
| buildProgram('llama3.1', main).catch(console.error) |
22 changes: 22 additions & 0 deletions
22
examples/ai-core/src/middleware/generate-text-log-middleware.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| #! /usr/bin/env -S pnpm tsx | ||
|
|
||
| import { | ||
| experimental_wrapLanguageModel as wrapLanguageModel, | ||
| generateText, | ||
| } from 'ai' | ||
| import { ollama } from 'ollama-ai-provider' | ||
|
|
||
| import { buildProgram } from '../tools/command' | ||
| import { yourLogMiddleware } from './your-log-middleware' | ||
|
|
||
| async function main(model: Parameters<typeof ollama>[0]) { | ||
| const result = await generateText({ | ||
| model: wrapLanguageModel({ | ||
| middleware: yourLogMiddleware, | ||
| model: ollama(model), | ||
| }), | ||
| prompt: 'What cities are in the United States?', | ||
| }) | ||
| } | ||
|
|
||
| buildProgram('llama3.1', main).catch(console.error) |
17 changes: 17 additions & 0 deletions
17
examples/ai-core/src/middleware/get-last-user-message-text.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| import { LanguageModelV1Prompt } from 'ai' | ||
|
|
||
| export function getLastUserMessageText({ | ||
| prompt, | ||
| }: { | ||
| prompt: LanguageModelV1Prompt | ||
| }): string | undefined { | ||
| const lastMessage = prompt.at(-1) | ||
|
|
||
| if (lastMessage?.role !== 'user') { | ||
| return undefined | ||
| } | ||
|
|
||
| return lastMessage.content.length === 0 | ||
| ? undefined | ||
| : lastMessage.content.filter((c) => c.type === 'text').join('\n') | ||
| } |
26 changes: 26 additions & 0 deletions
26
examples/ai-core/src/middleware/stream-text-log-middleware.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| #! /usr/bin/env -S pnpm tsx | ||
|
|
||
| import { | ||
| experimental_wrapLanguageModel as wrapLanguageModel, | ||
| streamText, | ||
| } from 'ai' | ||
| import { ollama } from 'ollama-ai-provider' | ||
|
|
||
| import { buildProgram } from '../tools/command' | ||
| import { yourLogMiddleware } from './your-log-middleware' | ||
|
|
||
| async function main(model: Parameters<typeof ollama>[0]) { | ||
| const result = await streamText({ | ||
| model: wrapLanguageModel({ | ||
| middleware: yourLogMiddleware, | ||
| model: ollama(model), | ||
| }), | ||
| prompt: 'What cities are in the United States?', | ||
| }) | ||
|
|
||
| for await (const textPart of result.textStream) { | ||
| // consume the stream | ||
| } | ||
| } | ||
|
|
||
| buildProgram('llama3.1', main).catch(console.error) |
26 changes: 26 additions & 0 deletions
26
examples/ai-core/src/middleware/stream-text-rag-middleware.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| #! /usr/bin/env -S pnpm tsx | ||
|
|
||
| import { | ||
| experimental_wrapLanguageModel as wrapLanguageModel, | ||
| streamText, | ||
| } from 'ai' | ||
| import { ollama } from 'ollama-ai-provider' | ||
|
|
||
| import { buildProgram } from '../tools/command' | ||
| import { yourRagMiddleware } from './your-rag-middleware' | ||
|
|
||
| async function main(model: Parameters<typeof ollama>[0]) { | ||
| const result = await streamText({ | ||
| model: wrapLanguageModel({ | ||
| middleware: yourRagMiddleware, | ||
| model: ollama(model), | ||
| }), | ||
| prompt: 'What cities are in the United States?', | ||
| }) | ||
|
|
||
| for await (const textPart of result.textStream) { | ||
| process.stdout.write(textPart) | ||
| } | ||
| } | ||
|
|
||
| buildProgram('llama3.1', main).catch(console.error) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| import type { Experimental_LanguageModelV1Middleware as LanguageModelV1Middleware } from 'ai' | ||
|
|
||
| // eslint-disable-next-line @typescript-eslint/no-explicit-any | ||
| const cache = new Map<string, any>() | ||
|
|
||
| export const yourCacheMiddleware: LanguageModelV1Middleware = { | ||
| wrapGenerate: async ({ doGenerate, params }) => { | ||
| const cacheKey = JSON.stringify(params) | ||
|
|
||
| if (cache.has(cacheKey)) { | ||
| return cache.get(cacheKey) | ||
| } | ||
|
|
||
| const result = await doGenerate() | ||
|
|
||
| cache.set(cacheKey, result) | ||
|
|
||
| return result | ||
| }, | ||
|
|
||
| // here you would implement the caching logic for streaming | ||
| } |
Oops, something went wrong.