Skip to content

Commit

Permalink
Revert #1065 (#1080)
Browse files Browse the repository at this point in the history
  • Loading branch information
MaxLeiter authored Mar 4, 2024
1 parent fe55612 commit aab5324
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 32 deletions.
5 changes: 5 additions & 0 deletions .changeset/khaki-starfishes-fold.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'ai': patch
---

Revert "fix(render): parse the args based on the zod schema"
37 changes: 5 additions & 32 deletions packages/core/rsc/streamable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -182,14 +182,14 @@ export function render<
[name in keyof TS]: {
description?: string;
parameters: TS[name];
render: Renderer<z.output<TS[name]>>;
render: Renderer<z.infer<TS[name]>>;
};
};
functions?: {
[name in keyof FS]: {
description?: string;
parameters: FS[name];
render: Renderer<z.output<FS[name]>>;
render: Renderer<z.infer<FS[name]>>;
};
};
initial?: ReactNode;
Expand Down Expand Up @@ -300,27 +300,6 @@ export function render<
let hasFunction = false;
let content = '';

const parseFunctionCallArguments = (fn: {
type: 'functions' | 'tools';
name: string;
arguments: any;
}) => {
const renderer =
fn.type === 'functions'
? options.functions?.[fn.name]
: options.tools?.[fn.name];

const safeParsed = renderer?.parameters.safeParse(fn.arguments);

if (safeParsed && !safeParsed.success) {
throw new Error(
`Invalid function call arguments in message. ${safeParsed.error.message}`,
);
}

return safeParsed?.data;
};

consumeStream(
OpenAIStream(
(await options.provider.chat.completions.create({
Expand All @@ -345,10 +324,7 @@ export function render<
async experimental_onFunctionCall(functionCallPayload) {
hasFunction = true;
handleRender(
parseFunctionCallArguments({
...functionCallPayload,
type: 'functions',
}),
functionCallPayload.arguments,
options.functions?.[functionCallPayload.name as any]
?.render,
ui,
Expand All @@ -358,16 +334,13 @@ export function render<
: {}),
...(tools
? {
async experimental_onToolCall(toolCallPayload) {
async experimental_onToolCall(toolCallPayload: any) {
hasFunction = true;

// TODO: We might need Promise.all here?
for (const tool of toolCallPayload.tools) {
handleRender(
parseFunctionCallArguments({
type: 'tools',
...tool.func,
}),
tool.func.arguments,
options.tools?.[tool.func.name as any]?.render,
ui,
);
Expand Down

0 comments on commit aab5324

Please sign in to comment.