Merge pull request #693 from transitive-bullshit/feature/update-march-2025

Add support for OpenAI Responses tools format
feature/mastra
Travis Fischer 2025-03-14 21:40:39 +08:00 zatwierdzone przez GitHub
commit 7fbe207048
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B5690EEEBB952194
14 zmienionych plików z 771 dodań i 310 usunięć

Wyświetl plik

@ -11,8 +11,6 @@ jobs:
matrix:
node-version:
- 18
- 20
- 21
- 22
- 23
@ -23,7 +21,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 10.5.2
version: 10.6.3
run_install: false
- name: Install Node.js

Wyświetl plik

@ -0,0 +1,27 @@
import 'dotenv/config'
import { createAISDKTools } from '@agentic/ai-sdk'
import { WeatherClient } from '@agentic/weather'
import { createOpenAI } from '@ai-sdk/openai'
import { generateText } from 'ai'
async function main() {
const weather = new WeatherClient()
const openai = createOpenAI({ compatibility: 'strict' })
const result = await generateText({
model: openai('gpt-4o-mini'),
tools: createAISDKTools(weather),
experimental_activeTools: Array.from(weather.functions).map(
(fn) => fn.spec.name
),
toolChoice: 'required',
temperature: 0,
system: 'You are a helpful assistant. Be as concise as possible.',
prompt: 'What is the weather in San Francisco?'
})
console.log(result.toolResults[0])
}
await main()

Wyświetl plik

@ -10,9 +10,9 @@
"dependencies": {
"@agentic/ai-sdk": "workspace:*",
"@agentic/weather": "workspace:*",
"@ai-sdk/openai": "^1.1.13",
"ai": "^4.1.42",
"openai": "^4.85.2",
"@ai-sdk/openai": "^1.2.5",
"ai": "^4.1.61",
"openai": "^4.87.3",
"zod": "^3.24.2"
},
"devDependencies": {

Wyświetl plik

@ -0,0 +1,62 @@
import 'dotenv/config'
import type { ResponseInput } from 'openai/resources/responses/responses.mjs'
import { assert } from '@agentic/core'
import { WeatherClient } from '@agentic/stdlib'
import OpenAI from 'openai'
async function main() {
const weather = new WeatherClient()
const openai = new OpenAI()
const messages: ResponseInput = [
{
role: 'system',
content: 'You are a helpful assistant. Be as concise as possible.'
},
{ role: 'user', content: 'What is the weather in San Francisco?' }
]
{
// First call to OpenAI to invoke the weather tool
const res = await openai.responses.create({
model: 'gpt-4o-mini',
temperature: 0,
tools: weather.functions.responsesToolSpecs,
tool_choice: 'required',
input: messages
})
const message = res.output[0]
console.log(JSON.stringify(message, null, 2))
assert(message?.type === 'function_call')
assert(message.name === 'get_current_weather')
const fn = weather.functions.get('get_current_weather')!
assert(fn)
const toolResult = await fn(message.arguments)
messages.push(message)
messages.push({
type: 'function_call_output',
call_id: message.call_id,
output: JSON.stringify(toolResult)
})
}
console.log()
{
// Second call to OpenAI to generate a text response
const res = await openai.responses.create({
model: 'gpt-4o-mini',
temperature: 0,
tools: weather.functions.responsesToolSpecs,
input: messages
})
console.log(res.output_text)
}
}
await main()

Wyświetl plik

@ -43,6 +43,8 @@ async function main() {
})
}
console.log()
{
// Second call to OpenAI to generate a text response
const res = await openai.chat.completions.create({
@ -52,7 +54,7 @@ async function main() {
tools: weather.functions.toolSpecs
})
const message = res.choices?.[0]?.message
console.log(JSON.stringify(message, null, 2))
console.log(message?.content)
}
}

Wyświetl plik

@ -10,7 +10,7 @@
"dependencies": {
"@agentic/core": "workspace:*",
"@agentic/stdlib": "workspace:*",
"openai": "^4.85.2",
"openai": "^4.87.3",
"zod": "^3.24.2"
},
"devDependencies": {

Wyświetl plik

@ -7,7 +7,7 @@
"type": "git",
"url": "git+https://github.com/transitive-bullshit/agentic.git"
},
"packageManager": "pnpm@10.5.2",
"packageManager": "pnpm@10.6.3",
"engines": {
"node": ">=18"
},
@ -37,21 +37,21 @@
"@changesets/cli": "^2.28.1",
"@fisch0920/eslint-config": "^1.4.0",
"@total-typescript/ts-reset": "^0.6.1",
"@types/node": "^22.13.8",
"@types/node": "^22.13.10",
"del-cli": "^6.0.0",
"dotenv": "^16.4.7",
"eslint": "^8.57.1",
"husky": "^9.1.7",
"lint-staged": "^15.4.3",
"lint-staged": "^15.5.0",
"npm-run-all2": "^7.0.2",
"only-allow": "^1.2.1",
"prettier": "^3.5.2",
"prettier": "^3.5.3",
"syncpack": "14.0.0-alpha.10",
"tsup": "^8.4.0",
"tsx": "^4.19.3",
"turbo": "^2.4.4",
"typescript": "^5.8.2",
"vitest": "3.0.7",
"vitest": "3.0.8",
"zod": "^3.24.2",
"zoominfo-api-auth-client": "^1.0.1"
},

Wyświetl plik

@ -39,7 +39,7 @@
},
"devDependencies": {
"@agentic/tsconfig": "workspace:*",
"ai": "^4.1.47"
"ai": "^4.1.61"
},
"publishConfig": {
"access": "public"

Wyświetl plik

@ -2,6 +2,10 @@ import type * as types from './types.ts'
import { AIFunctionsProvider } from './fns'
import { isAIFunction } from './utils'
export type AIFunctionSetOptions = {
transformNameKeysFn?: (name: string) => string
}
/**
* A set of AI functions intended to make it easier to work with large sets of
* AI functions across different clients.
@ -14,8 +18,14 @@ import { isAIFunction } from './utils'
*/
export class AIFunctionSet implements Iterable<types.AIFunction> {
protected readonly _map: Map<string, types.AIFunction>
protected readonly _transformNameKeysFn: (name: string) => string
constructor(
aiFunctionLikeObjects?: types.AIFunctionLike[],
{ transformNameKeysFn = transformName }: AIFunctionSetOptions = {}
) {
this._transformNameKeysFn = transformNameKeysFn
constructor(aiFunctionLikeObjects?: types.AIFunctionLike[]) {
// TODO: these `instanceof` checks seem to be failing on some platforms,
// so for now we're using an uglier, but more reliable approach to parsing
// the AIFunctionLike objects.
@ -64,7 +74,9 @@ export class AIFunctionSet implements Iterable<types.AIFunction> {
}
this._map = new Map(
fns ? fns.map((fn) => [transformName(fn.spec.name), fn]) : null
fns
? fns.map((fn) => [this._transformNameKeysFn(fn.spec.name), fn])
: null
)
}
@ -73,21 +85,21 @@ export class AIFunctionSet implements Iterable<types.AIFunction> {
}
add(fn: types.AIFunction): this {
this._map.set(transformName(fn.spec.name), fn)
this._map.set(this._transformNameKeysFn(fn.spec.name), fn)
return this
}
get(name: string): types.AIFunction | undefined {
return this._map.get(transformName(name))
return this._map.get(this._transformNameKeysFn(name))
}
set(name: string, fn: types.AIFunction): this {
this._map.set(transformName(name), fn)
this._map.set(this._transformNameKeysFn(name), fn)
return this
}
has(name: string): boolean {
return this._map.has(transformName(name))
return this._map.has(this._transformNameKeysFn(name))
}
clear(): void {
@ -95,23 +107,23 @@ export class AIFunctionSet implements Iterable<types.AIFunction> {
}
delete(name: string): boolean {
return this._map.delete(transformName(name))
return this._map.delete(this._transformNameKeysFn(name))
}
pick(...keys: string[]): AIFunctionSet {
const keysToIncludeSet = new Set(keys.map(transformName))
const keysToIncludeSet = new Set(keys.map(this._transformNameKeysFn))
return new AIFunctionSet(
Array.from(this).filter((fn) =>
keysToIncludeSet.has(transformName(fn.spec.name))
keysToIncludeSet.has(this._transformNameKeysFn(fn.spec.name))
)
)
}
omit(...keys: string[]): AIFunctionSet {
const keysToExcludeSet = new Set(keys.map(transformName))
const keysToExcludeSet = new Set(keys.map(this._transformNameKeysFn))
return new AIFunctionSet(
Array.from(this).filter(
(fn) => !keysToExcludeSet.has(transformName(fn.spec.name))
(fn) => !keysToExcludeSet.has(this._transformNameKeysFn(fn.spec.name))
)
)
}
@ -120,10 +132,18 @@ export class AIFunctionSet implements Iterable<types.AIFunction> {
return [...this.entries].map(fn)
}
/**
* Returns the functions in this set as an array compatible with OpenAI's
* chat completions `functions`.
*/
get specs(): types.AIFunctionSpec[] {
return this.map((fn) => fn.spec)
}
/**
* Returns the functions in this set as an array compatible with OpenAI's
* chat completions `tools`.
*/
get toolSpecs(): types.AIToolSpec[] {
return this.map((fn) => ({
type: 'function' as const,
@ -131,6 +151,17 @@ export class AIFunctionSet implements Iterable<types.AIFunction> {
}))
}
/**
* Returns the tools in this set compatible with OpenAI's `responses` API.
*
* Note that this is currently the same type as `AIFunctionSet.specs`, but
* they are separate APIs which may diverge over time, so if you're using the
* OpenAI `responses` API, you should reference this property.
*/
get responsesToolSpecs(): types.AIFunctionSpec[] {
return this.specs
}
get entries(): IterableIterator<types.AIFunction> {
return this._map.values()
}

Wyświetl plik

@ -64,6 +64,12 @@ export function createAIFunction<InputSchema extends z.ZodObject<any>, Output>(
return implementation(parsedInput)
}
// Override the default function name with the intended name.
Object.defineProperty(aiFunction, 'name', {
value: spec.name,
writable: false
})
const strict = !!spec.strict
aiFunction.inputSchema = spec.inputSchema
@ -72,6 +78,7 @@ export function createAIFunction<InputSchema extends z.ZodObject<any>, Output>(
name: spec.name,
description: spec.description?.trim() ?? '',
parameters: zodToJsonSchema(spec.inputSchema, { strict }),
type: 'function',
strict
}
aiFunction.impl = implementation

Wyświetl plik

@ -34,12 +34,17 @@ export interface AIFunctionSpec {
/** JSON schema spec of the function's input parameters */
parameters: JSONSchema
/**
* The type of the function tool. Always `function`.
*/
type: 'function'
/**
* Whether to enable strict schema adherence when generating the function
* parameters. Currently only supported by OpenAI's
* [Structured Outputs](https://platform.openai.com/docs/guides/structured-outputs).
*/
strict?: boolean
strict: boolean
}
export interface AIToolSpec {
@ -91,6 +96,7 @@ export interface AIFunction<
// TODO: this `any` shouldn't be necessary, but it is for `createAIFunction` results to be assignable to `AIFunctionLike`
impl: (params: z.infer<InputSchema> | any) => MaybePromise<Output>
}
export type SafeParseResult<TData> =
| {
success: true

Wyświetl plik

@ -37,8 +37,8 @@
"devDependencies": {
"@agentic/core": "workspace:*",
"@agentic/tsconfig": "workspace:*",
"@ai-sdk/openai": "^1.1.13",
"ai": "^4.1.42"
"@ai-sdk/openai": "^1.2.5",
"ai": "^4.1.61"
},
"publishConfig": {
"access": "public"

Wyświetl plik

@ -55,6 +55,7 @@ export namespace jina {
withGeneratedAlt: z.boolean().optional(),
withLinksSummary: z.boolean().optional(),
withImagesSummary: z.boolean().optional(),
withFavicon: z.boolean().optional(),
setCookie: z.string().optional(),
proxyUrl: z.string().optional(),
noCache: z.boolean().optional(),
@ -95,6 +96,7 @@ export namespace jina {
content: string
description?: string
publishedTime?: string
favicon?: string
}
}
@ -249,6 +251,7 @@ export class JinaClient extends AIFunctionsProvider {
withGeneratedAlt: 'x-with-generated-alt',
withLinksSummary: 'x-with-links-summary',
withImagesSummary: 'x-with-images-summary',
withFavicon: 'x-with-favicon',
setCookie: 'x-set-cookie',
proxyUrl: 'x-proxy-url',
noCache: 'x-no-cache',

Plik diff jest za duży Load Diff