openai 4.20.1 → 4.22.0

package/lib/ChatCompletionRunFunctions.test.mjs

@@ -1,6 +1,6 @@
 import OpenAI from 'openai';
 import { PassThrough } from 'stream';
-import { ParsingFunction, ChatCompletionStreamingRunner, } from 'openai/resources/beta/chat/completions';
+import { ParsingToolFunction, ChatCompletionStreamingRunner, } from 'openai/resources/beta/chat/completions';
 import { Response } from 'node-fetch';
 import { isAssistantMessage } from "./chatCompletionUtils.mjs";
 /**
@@ -47,11 +47,15 @@ function mockFetch() {
         ]);
     }
     function handleRequest(handle) {
-        return new Promise((resolve) => {
+        return new Promise((resolve, reject) => {
             fetchQueue.shift()?.(async (req, init) => {
                 try {
                     return await handle(req, init);
                 }
+                catch (err) {
+                    reject(err);
+                    return err;
+                }
                 finally {
                     resolve();
                 }
@@ -121,7 +125,7 @@ function* contentChoiceDeltas(content, { index = 0, role = 'assistant', } = {})
 }
 // functionCallDeltas returns an async iterator which mocks a delta stream of a functionCall by splitting
 // the argument into chunks separated by whitespace.
-function* functionCallDeltas(args, { index = 0, name, role = 'assistant', }) {
+function* functionCallDeltas(args, { index = 0, id = '123', name, role = 'assistant', }) {
     const deltas = args.split(/\s+/g);
     for (let i = 0; i < deltas.length; i++) {
         yield {
@@ -129,10 +133,17 @@ function* functionCallDeltas(args, { index = 0, name, role = 'assistant', }) {
             finish_reason: i === deltas.length - 1 ? 'function_call' : null,
             delta: {
                 role,
-                function_call: {
-                    arguments: `${deltas[i] || ''}${i === deltas.length - 1 ? '' : ' '}`,
-                    ...(i === deltas.length - 1 ? { name } : null),
-                },
+                tool_calls: [
+                    {
+                        type: 'function',
+                        index: 0,
+                        id,
+                        function: {
+                            arguments: `${deltas[i] || ''}${i === deltas.length - 1 ? '' : ' '}`,
+                            ...(i === deltas.length - 1 ? { name } : null),
+                        },
+                    },
+                ],
             },
         };
     }
@@ -164,7 +175,7 @@ class RunnerListener {
             .on('finalFunctionCallResult', (result) => (this.finalFunctionCallResult = result))
             .on('totalUsage', (usage) => (this.totalUsage = usage))
             .on('error', (error) => (this.error = error))
-            .on('abort', () => (this.gotAbort = true))
+            .on('abort', (error) => ((this.error = error), (this.gotAbort = true)))
             .on('end', () => (this.gotEnd = true))
             .once('message', () => this.onceMessageCallCount++);
     }
@@ -210,7 +221,7 @@ class RunnerListener {
             .map((m) => m.content)
             .filter(Boolean);
         expect(this.contents).toEqual(expectedContents);
-        expect(this.finalMessage).toEqual(this.messages[this.messages.length - 1]);
+        expect(this.finalMessage).toEqual([...this.messages].reverse().find((x) => x.role === 'assistant'));
         expect(await this.runner.finalMessage()).toEqual(this.finalMessage);
         expect(this.finalContent).toEqual(expectedContents[expectedContents.length - 1] ?? null);
         expect(await this.runner.finalContent()).toEqual(this.finalContent);
@@ -267,6 +278,7 @@ class StreamingRunnerListener {
             .on('finalFunctionCall', (functionCall) => (this.finalFunctionCall = functionCall))
             .on('finalFunctionCallResult', (result) => (this.finalFunctionCallResult = result))
             .on('error', (error) => (this.error = error))
+            .on('abort', (abort) => (this.error = abort))
             .on('end', () => (this.gotEnd = true));
     }
     async sanityCheck({ error } = {}) {
@@ -302,7 +314,7 @@ class StreamingRunnerListener {
             return;
         if (this.eventContents.length)
             expect(this.eventChunks.length).toBeGreaterThan(0);
-        expect(this.finalMessage).toEqual(this.eventMessages[this.eventMessages.length - 1]);
+        expect(this.finalMessage).toEqual([...this.eventMessages].reverse().find((x) => x.role === 'assistant'));
         expect(await this.runner.finalMessage()).toEqual(this.finalMessage);
         expect(this.finalContent).toEqual(this.eventContents[this.eventContents.length - 1]?.[1] ?? null);
         expect(await this.runner.finalContent()).toEqual(this.finalContent);
@@ -327,45 +339,54 @@ class StreamingRunnerListener {
 }
 function _typeTests() {
     const openai = new OpenAI();
-    openai.beta.chat.completions.runFunctions({
+    openai.beta.chat.completions.runTools({
         messages: [
             { role: 'user', content: 'can you tell me how many properties are in {"a": 1, "b": 2, "c": 3}' },
         ],
         model: 'gpt-3.5-turbo',
-        functions: [
+        tools: [
             {
-                name: 'numProperties',
-                function: (obj) => String(Object.keys(obj).length),
-                parameters: { type: 'object' },
-                parse: (str) => {
-                    const result = JSON.parse(str);
-                    if (!(result instanceof Object) || Array.isArray(result)) {
-                        throw new Error('must be an object');
-                    }
-                    return result;
+                type: 'function',
+                function: {
+                    name: 'numProperties',
+                    function: (obj) => String(Object.keys(obj).length),
+                    parameters: { type: 'object' },
+                    parse: (str) => {
+                        const result = JSON.parse(str);
+                        if (!(result instanceof Object) || Array.isArray(result)) {
+                            throw new Error('must be an object');
+                        }
+                        return result;
+                    },
+                    description: 'gets the number of properties on an object',
                 },
-                description: 'gets the number of properties on an object',
             },
             {
-                function: (str) => String(str.length),
-                parameters: { type: 'string' },
-                description: 'gets the length of a string',
+                type: 'function',
+                function: {
+                    function: (str) => String(str.length),
+                    parameters: { type: 'string' },
+                    description: 'gets the length of a string',
+                },
             },
-            // @ts-expect-error function must accept string if parse is omitted
             {
-                function: (obj) => String(Object.keys(obj).length),
-                parameters: { type: 'object' },
-                description: 'gets the number of properties on an object',
+                type: 'function',
+                // @ts-expect-error function must accept string if parse is omitted
+                function: {
+                    function: (obj) => String(Object.keys(obj).length),
+                    parameters: { type: 'object' },
+                    description: 'gets the number of properties on an object',
+                },
             },
         ],
     });
-    openai.beta.chat.completions.runFunctions({
+    openai.beta.chat.completions.runTools({
         messages: [
             { role: 'user', content: 'can you tell me how many properties are in {"a": 1, "b": 2, "c": 3}' },
         ],
         model: 'gpt-3.5-turbo',
-        functions: [
-            new ParsingFunction({
+        tools: [
+            new ParsingToolFunction({
                 name: 'numProperties',
                 // @ts-expect-error parse and function don't match
                 parse: (str) => str,
@@ -375,13 +396,13 @@ function _typeTests() {
             }),
         ],
     });
-    openai.beta.chat.completions.runFunctions({
+    openai.beta.chat.completions.runTools({
         messages: [
             { role: 'user', content: 'can you tell me how many properties are in {"a": 1, "b": 2, "c": 3}' },
         ],
         model: 'gpt-3.5-turbo',
-        functions: [
-            new ParsingFunction({
+        tools: [
+            new ParsingToolFunction({
                 name: 'numProperties',
                 parse: (str) => {
                     const result = JSON.parse(str);
@@ -394,7 +415,7 @@ function _typeTests() {
                 parameters: { type: 'object' },
                 description: 'gets the number of properties on an object',
             }),
-            new ParsingFunction({
+            new ParsingToolFunction({
                 name: 'keys',
                 parse: (str) => {
                     const result = JSON.parse(str);
@@ -407,7 +428,7 @@ function _typeTests() {
                 parameters: { type: 'object' },
                 description: 'gets the number of properties on an object',
             }),
-            new ParsingFunction({
+            new ParsingToolFunction({
                 name: 'len2',
                 // @ts-expect-error parse and function don't match
                 parse: (str) => str,
@@ -417,135 +438,169 @@ function _typeTests() {
             }),
         ],
     });
-    openai.beta.chat.completions.runFunctions({
+    openai.beta.chat.completions.runTools({
         messages: [
             { role: 'user', content: 'can you tell me how many properties are in {"a": 1, "b": 2, "c": 3}' },
         ],
         model: 'gpt-3.5-turbo',
         // @ts-ignore error occurs here in TS 4
-        functions: [
+        tools: [
             {
-                name: 'numProperties',
-                parse: (str) => {
-                    const result = JSON.parse(str);
-                    if (!(result instanceof Object) || Array.isArray(result)) {
-                        throw new Error('must be an object');
-                    }
-                    return result;
+                type: 'function',
+                function: {
+                    name: 'numProperties',
+                    parse: (str) => {
+                        const result = JSON.parse(str);
+                        if (!(result instanceof Object) || Array.isArray(result)) {
+                            throw new Error('must be an object');
+                        }
+                        return result;
+                    },
+                    function: (obj) => String(Object.keys(obj).length),
+                    parameters: { type: 'object' },
+                    description: 'gets the number of properties on an object',
                 },
-                function: (obj) => String(Object.keys(obj).length),
-                parameters: { type: 'object' },
-                description: 'gets the number of properties on an object',
             },
             {
-                name: 'keys',
-                parse: (str) => {
-                    const result = JSON.parse(str);
-                    if (!(result instanceof Object)) {
-                        throw new Error('must be an Object');
-                    }
-                    return result;
+                type: 'function',
+                function: {
+                    name: 'keys',
+                    parse: (str) => {
+                        const result = JSON.parse(str);
+                        if (!(result instanceof Object)) {
+                            throw new Error('must be an Object');
+                        }
+                        return result;
+                    },
+                    function: (obj) => Object.keys(obj).join(', '),
+                    parameters: { type: 'object' },
+                    description: 'gets the number of properties on an object',
                 },
-                function: (obj) => Object.keys(obj).join(', '),
-                parameters: { type: 'object' },
-                description: 'gets the number of properties on an object',
             },
             {
-                name: 'len2',
-                parse: (str) => str,
-                // @ts-ignore error occurs here in TS 5
-                // function input doesn't match parse output
-                function: (obj) => String(Object.keys(obj).length),
-                parameters: { type: 'object' },
-                description: 'gets the number of properties on an object',
+                type: 'function',
+                function: {
+                    name: 'len2',
+                    parse: (str) => str,
+                    // @ts-ignore error occurs here in TS 5
+                    // function input doesn't match parse output
+                    function: (obj) => String(Object.keys(obj).length),
+                    parameters: { type: 'object' },
+                    description: 'gets the number of properties on an object',
+                },
             },
         ],
     });
 }
 describe('resource completions', () => {
-    // TODO: re-enable
-    describe.skip('runFunctions with stream: false', () => {
+    describe('runTools with stream: false', () => {
         test('successful flow', async () => {
             const { fetch, handleRequest } = mockChatCompletionFetch();
             const openai = new OpenAI({ apiKey: 'something1234', baseURL: 'http://127.0.0.1:4010', fetch });
-            const runner = openai.beta.chat.completions.runFunctions({
+            const runner = openai.beta.chat.completions.runTools({
                 messages: [{ role: 'user', content: 'tell me what the weather is like' }],
                 model: 'gpt-3.5-turbo',
-                functions: [
+                tools: [
                     {
-                        function: function getWeather() {
-                            return `it's raining`;
+                        type: 'function',
+                        function: {
+                            function: function getWeather() {
+                                return `it's raining`;
+                            },
+                            parameters: {},
+                            description: 'gets the weather',
                         },
-                        parameters: {},
-                        description: 'gets the weather',
                     },
                 ],
             });
             const listener = new RunnerListener(runner);
-            await Promise.all([
-                handleRequest(async (request) => {
-                    expect(request.messages).toEqual([{ role: 'user', content: 'tell me what the weather is like' }]);
-                    return {
-                        id: '1',
-                        choices: [
-                            {
-                                index: 0,
-                                finish_reason: 'function_call',
-                                message: {
-                                    role: 'assistant',
-                                    content: null,
-                                    function_call: {
-                                        arguments: '',
-                                        name: 'getWeather',
-                                    },
-                                },
-                            },
-                        ],
-                        created: Math.floor(Date.now() / 1000),
-                        model: 'gpt-3.5-turbo',
-                        object: 'chat.completion',
-                    };
-                }),
-                handleRequest(async (request) => {
-                    expect(request.messages).toEqual([
-                        { role: 'user', content: 'tell me what the weather is like' },
+            await handleRequest(async (request) => {
+                expect(request.messages).toEqual([{ role: 'user', content: 'tell me what the weather is like' }]);
+                return {
+                    id: '1',
+                    choices: [
                         {
-                            role: 'assistant',
-                            content: null,
-                            function_call: {
-                                arguments: '',
-                                name: 'getWeather',
+                            index: 0,
+                            finish_reason: 'function_call',
+                            message: {
+                                role: 'assistant',
+                                content: null,
+                                tool_calls: [
+                                    {
+                                        type: 'function',
+                                        id: '123',
+                                        function: {
+                                            arguments: '',
+                                            name: 'getWeather',
+                                        },
+                                    },
+                                ],
                             },
                         },
-                        {
-                            role: 'function',
-                            content: `it's raining`,
-                            name: 'getWeather',
-                        },
-                    ]);
-                    return {
-                        id: '2',
-                        choices: [
+                    ],
+                    created: Math.floor(Date.now() / 1000),
+                    model: 'gpt-3.5-turbo',
+                    object: 'chat.completion',
+                };
+            });
+            await handleRequest(async (request) => {
+                expect(request.messages).toEqual([
+                    { role: 'user', content: 'tell me what the weather is like' },
+                    {
+                        role: 'assistant',
+                        content: null,
+                        tool_calls: [
                             {
-                                index: 0,
-                                finish_reason: 'stop',
-                                message: {
-                                    role: 'assistant',
-                                    content: `it's raining`,
+                                type: 'function',
+                                id: '123',
+                                function: {
+                                    arguments: '',
+                                    name: 'getWeather',
                                 },
                             },
                         ],
-                        created: Math.floor(Date.now() / 1000),
-                        model: 'gpt-3.5-turbo',
-                        object: 'chat.completion',
-                    };
-                }),
-                runner.done(),
-            ]);
+                    },
+                    {
+                        role: 'tool',
+                        content: `it's raining`,
+                        tool_call_id: '123',
+                    },
+                ]);
+                return {
+                    id: '2',
+                    choices: [
+                        {
+                            index: 0,
+                            finish_reason: 'stop',
+                            message: {
+                                role: 'assistant',
+                                content: `it's raining`,
+                            },
+                        },
+                    ],
+                    created: Math.floor(Date.now() / 1000),
+                    model: 'gpt-3.5-turbo',
+                    object: 'chat.completion',
+                };
+            });
+            await runner.done();
             expect(listener.messages).toEqual([
                 { role: 'user', content: 'tell me what the weather is like' },
-                { role: 'assistant', content: null, function_call: { name: 'getWeather', arguments: '' } },
-                { role: 'function', content: `it's raining`, name: 'getWeather' },
+                {
+                    role: 'assistant',
+                    content: null,
+                    tool_calls: [
+                        {
+                            type: 'function',
+                            id: '123',
+                            function: {
+                                arguments: '',
+                                name: 'getWeather',
+                            },
+                        },
+                    ],
+                },
+                { role: 'tool', content: `it's raining`, tool_call_id: '123' },
                 { role: 'assistant', content: "it's raining" },
             ]);
             expect(listener.functionCallResults).toEqual([`it's raining`]);
@@ -555,16 +610,19 @@ describe('resource completions', () => {
             const { fetch, handleRequest } = mockChatCompletionFetch();
             const openai = new OpenAI({ apiKey: 'something1234', baseURL: 'http://127.0.0.1:4010', fetch });
             const controller = new AbortController();
-            const runner = openai.beta.chat.completions.runFunctions({
+            const runner = openai.beta.chat.completions.runTools({
                 messages: [{ role: 'user', content: 'tell me what the weather is like' }],
                 model: 'gpt-3.5-turbo',
-                functions: [
+                tools: [
                     {
-                        function: function getWeather() {
-                            return `it's raining`;
+                        type: 'function',
+                        function: {
+                            function: function getWeather() {
+                                return `it's raining`;
+                            },
+                            parameters: {},
+                            description: 'gets the weather',
                         },
-                        parameters: {},
-                        description: 'gets the weather',
                     },
                 ],
             }, { signal: controller.signal });
@@ -580,10 +638,16 @@ describe('resource completions', () => {
                             message: {
                                 role: 'assistant',
                                 content: null,
-                                function_call: {
-                                    arguments: '',
-                                    name: 'getWeather',
-                                },
+                                tool_calls: [
+                                    {
+                                        type: 'function',
+                                        id: '123',
+                                        function: {
+                                            arguments: '',
+                                            name: 'getWeather',
+                                        },
+                                    },
+                                ],
                             },
                         },
                     ],
@@ -596,8 +660,21 @@ describe('resource completions', () => {
             await runner.done().catch(() => { });
             expect(listener.messages).toEqual([
                 { role: 'user', content: 'tell me what the weather is like' },
-                { role: 'assistant', content: null, function_call: { name: 'getWeather', arguments: '' } },
-                { role: 'function', content: `it's raining`, name: 'getWeather' },
+                {
+                    role: 'assistant',
+                    content: null,
+                    tool_calls: [
+                        {
+                            type: 'function',
+                            id: '123',
+                            function: {
+                                arguments: '',
+                                name: 'getWeather',
+                            },
+                        },
+                    ],
+                },
+                { role: 'tool', content: `it's raining`, tool_call_id: '123' },
             ]);
             expect(listener.functionCallResults).toEqual([`it's raining`]);
             await listener.sanityCheck({ error: 'Request was aborted.' });
@@ -606,7 +683,7 @@ describe('resource completions', () => {
         test('successful flow with parse', async () => {
             const { fetch, handleRequest } = mockChatCompletionFetch();
             const openai = new OpenAI({ apiKey: 'something1234', baseURL: 'http://127.0.0.1:4010', fetch });
-            const runner = openai.beta.chat.completions.runFunctions({
+            const runner = openai.beta.chat.completions.runTools({
                 messages: [
                     {
                         role: 'user',
@@ -614,8 +691,8 @@ describe('resource completions', () => {
                     },
                 ],
                 model: 'gpt-3.5-turbo',
-                functions: [
-                    new ParsingFunction({
+                tools: [
+                    new ParsingToolFunction({
                         name: 'numProperties',
                         function: (obj) => String(Object.keys(obj).length),
                         parameters: { type: 'object' },
@@ -631,84 +708,94 @@ describe('resource completions', () => {
                 ],
             });
             const listener = new RunnerListener(runner);
-            await Promise.all([
-                handleRequest(async (request) => {
-                    expect(request.messages).toEqual([
+            await handleRequest(async (request) => {
+                expect(request.messages).toEqual([
+                    {
+                        role: 'user',
+                        content: 'can you tell me how many properties are in {"a": 1, "b": 2, "c": 3}',
+                    },
+                ]);
+                return {
+                    id: '1',
+                    choices: [
                         {
-                            role: 'user',
-                            content: 'can you tell me how many properties are in {"a": 1, "b": 2, "c": 3}',
-                        },
-                    ]);
-                    return {
-                        id: '1',
-                        choices: [
-                            {
-                                index: 0,
-                                finish_reason: 'function_call',
-                                message: {
-                                    role: 'assistant',
-                                    content: null,
-                                    function_call: {
-                                        arguments: '{"a": 1, "b": 2, "c": 3}',
-                                        name: 'numProperties',
+                            index: 0,
+                            finish_reason: 'function_call',
+                            message: {
+                                role: 'assistant',
+                                content: null,
+                                tool_calls: [
+                                    {
+                                        type: 'function',
+                                        id: '123',
+                                        function: {
+                                            arguments: '{"a": 1, "b": 2, "c": 3}',
+                                            name: 'numProperties',
+                                        },
                                     },
-                                },
-                            },
-                        ],
-                        created: Math.floor(Date.now() / 1000),
-                        model: 'gpt-3.5-turbo',
-                        object: 'chat.completion',
-                        usage: {
-                            completion_tokens: 5,
-                            prompt_tokens: 20,
-                            total_tokens: 25,
-                        },
-                    };
-                }),
-                handleRequest(async (request) => {
-                    expect(request.messages).toEqual([
-                        {
-                            role: 'user',
-                            content: 'can you tell me how many properties are in {"a": 1, "b": 2, "c": 3}',
-                        },
-                        {
-                            role: 'assistant',
-                            content: null,
-                            function_call: {
-                                arguments: '{"a": 1, "b": 2, "c": 3}',
-                                name: 'numProperties',
+                                ],
                             },
                         },
-                        {
-                            role: 'function',
-                            content: '3',
-                            name: 'numProperties',
-                        },
-                    ]);
-                    return {
-                        id: '2',
-                        choices: [
+                    ],
+                    created: Math.floor(Date.now() / 1000),
+                    model: 'gpt-3.5-turbo',
+                    object: 'chat.completion',
+                    usage: {
+                        completion_tokens: 5,
+                        prompt_tokens: 20,
+                        total_tokens: 25,
+                    },
+                };
+            });
+            await handleRequest(async (request) => {
+                expect(request.messages).toEqual([
+                    {
+                        role: 'user',
+                        content: 'can you tell me how many properties are in {"a": 1, "b": 2, "c": 3}',
+                    },
+                    {
+                        role: 'assistant',
+                        content: null,
+                        tool_calls: [
                             {
-                                index: 0,
-                                finish_reason: 'stop',
-                                message: {
-                                    role: 'assistant',
-                                    content: `there are 3 properties in {"a": 1, "b": 2, "c": 3}`,
+                                type: 'function',
+                                id: '123',
+                                function: {
+                                    arguments: '{"a": 1, "b": 2, "c": 3}',
+                                    name: 'numProperties',
                                 },
                             },
                         ],
-                        created: Math.floor(Date.now() / 1000),
-                        model: 'gpt-3.5-turbo',
-                        object: 'chat.completion',
-                        usage: {
-                            completion_tokens: 10,
-                            prompt_tokens: 25,
-                            total_tokens: 35,
+                    },
+                    {
+                        role: 'tool',
+                        content: '3',
+                        tool_call_id: '123',
+                    },
+                ]);
+                return {
+                    id: '2',
+                    choices: [
+                        {
+                            index: 0,
+                            finish_reason: 'stop',
+                            message: {
+                                role: 'assistant',
+                                content: `there are 3 properties in {"a": 1, "b": 2, "c": 3}`,
+                            },
                         },
-                    };
-                }),
-                runner.done(),
-            ]);
+                    ],
+                    created: Math.floor(Date.now() / 1000),
+                    model: 'gpt-3.5-turbo',
+                    object: 'chat.completion',
+                    usage: {
+                        completion_tokens: 10,
+                        prompt_tokens: 25,
+                        total_tokens: 35,
+                    },
+                };
+            });
+            await runner.done();
             expect(listener.messages).toEqual([
                 {
                     role: 'user',
@@ -717,9 +804,15 @@ describe('resource completions', () => {
                 {
                     role: 'assistant',
                     content: null,
-                    function_call: { name: 'numProperties', arguments: '{"a": 1, "b": 2, "c": 3}' },
+                    tool_calls: [
+                        {
+                            type: 'function',
+                            id: '123',
+                            function: { name: 'numProperties', arguments: '{"a": 1, "b": 2, "c": 3}' },
+                        },
+                    ],
                 },
-                { role: 'function', content: '3', name: 'numProperties' },
+                { role: 'tool', content: '3', tool_call_id: '123' },
                 { role: 'assistant', content: 'there are 3 properties in {"a": 1, "b": 2, "c": 3}' },
             ]);
             expect(listener.functionCallResults).toEqual(['3']);
@@ -728,7 +821,7 @@ describe('resource completions', () => {
         test('flow with parse error', async () => {
             const { fetch, handleRequest } = mockChatCompletionFetch();
             const openai = new OpenAI({ apiKey: 'something1234', baseURL: 'http://127.0.0.1:4010', fetch });
-            const runner = openai.beta.chat.completions.runFunctions({
+            const runner = openai.beta.chat.completions.runTools({
                 messages: [
                     {
                         role: 'user',
@@ -736,8 +829,8 @@ describe('resource completions', () => {
                     },
                 ],
                 model: 'gpt-3.5-turbo',
-                functions: [
-                    new ParsingFunction({
+                tools: [
+                    new ParsingToolFunction({
                         name: 'numProperties',
                         function: (obj) => String(Object.keys(obj).length),
                         parameters: { type: 'object' },
@@ -770,10 +863,16 @@ describe('resource completions', () => {
                                 message: {
                                     role: 'assistant',
                                     content: null,
-                                    function_call: {
-                                        arguments: '[{"a": 1, "b": 2, "c": 3}]',
-                                        name: 'numProperties',
-                                    },
+                                    tool_calls: [
+                                        {
+                                            type: 'function',
+                                            id: '123',
+                                            function: {
+                                                arguments: '[{"a": 1, "b": 2, "c": 3}]',
+                                                name: 'numProperties',
+                                            },
+                                        },
+                                    ],
                                 },
                             },
                         ],
@@ -791,15 +890,21 @@ describe('resource completions', () => {
                         {
                             role: 'assistant',
                             content: null,
-                            function_call: {
-                                arguments: '[{"a": 1, "b": 2, "c": 3}]',
-                                name: 'numProperties',
-                            },
+                            tool_calls: [
+                                {
+                                    type: 'function',
+                                    id: '123',
+                                    function: {
+                                        arguments: '[{"a": 1, "b": 2, "c": 3}]',
+                                        name: 'numProperties',
+                                    },
+                                },
+                            ],
                         },
                         {
-                            role: 'function',
+                            role: 'tool',
                             content: `must be an object`,
-                            name: 'numProperties',
+                            tool_call_id: '123',
                         },
                     ]);
                     return {
@@ -811,10 +916,16 @@ describe('resource completions', () => {
                                 message: {
                                     role: 'assistant',
                                     content: null,
-                                    function_call: {
-                                        arguments: '{"a": 1, "b": 2, "c": 3}',
-                                        name: 'numProperties',
-                                    },
+                                    tool_calls: [
+                                        {
+                                            type: 'function',
+                                            id: '1234',
+                                            function: {
+                                                arguments: '{"a": 1, "b": 2, "c": 3}',
+                                                name: 'numProperties',
+                                            },
+                                        },
+                                    ],
                                 },
                             },
                         ],
@@ -832,28 +943,40 @@ describe('resource completions', () => {
                         {
                             role: 'assistant',
                             content: null,
-                            function_call: {
-                                arguments: '[{"a": 1, "b": 2, "c": 3}]',
-                                name: 'numProperties',
-                            },
+                            tool_calls: [
+                                {
+                                    type: 'function',
+                                    id: '123',
+                                    function: {
+                                        arguments: '[{"a": 1, "b": 2, "c": 3}]',
+                                        name: 'numProperties',
+                                    },
+                                },
+                            ],
                         },
                         {
-                            role: 'function',
+                            role: 'tool',
                             content: `must be an object`,
-                            name: 'numProperties',
+                            tool_call_id: '123',
                         },
                         {
                             role: 'assistant',
                             content: null,
-                            function_call: {
-                                arguments: '{"a": 1, "b": 2, "c": 3}',
-                                name: 'numProperties',
-                            },
+                            tool_calls: [
+                                {
+                                    type: 'function',
+                                    id: '1234',
+                                    function: {
+                                        arguments: '{"a": 1, "b": 2, "c": 3}',
+                                        name: 'numProperties',
+                                    },
+                                },
+                            ],
                         },
                         {
-                            role: 'function',
+                            role: 'tool',
                             content: '3',
-                            name: 'numProperties',
+                            tool_call_id: '1234',
                         },
                     ]);
                     return {
@@ -883,15 +1006,27 @@ describe('resource completions', () => {
                 {
                     role: 'assistant',
                     content: null,
-                    function_call: { name: 'numProperties', arguments: '[{"a": 1, "b": 2, "c": 3}]' },
+                    tool_calls: [
+                        {
+                            type: 'function',
+                            id: '123',
+                            function: { name: 'numProperties', arguments: '[{"a": 1, "b": 2, "c": 3}]' },
+                        },
+                    ],
                 },
-                { role: 'function', content: `must be an object`, name: 'numProperties' },
+                { role: 'tool', content: `must be an object`, tool_call_id: '123' },
                 {
                     role: 'assistant',
                     content: null,
-                    function_call: { name: 'numProperties', arguments: '{"a": 1, "b": 2, "c": 3}' },
+                    tool_calls: [
+                        {
+                            type: 'function',
+                            id: '1234',
+                            function: { name: 'numProperties', arguments: '{"a": 1, "b": 2, "c": 3}' },
+                        },
+                    ],
                 },
-                { role: 'function', content: '3', name: 'numProperties' },
+                { role: 'tool', content: '3', tool_call_id: '1234' },
                 { role: 'assistant', content: 'there are 3 properties in {"a": 1, "b": 2, "c": 3}' },
             ]);
             expect(listener.functionCallResults).toEqual([`must be an object`, '3']);
@@ -900,19 +1035,25 @@ describe('resource completions', () => {
         test('single function call', async () => {
             const { fetch, handleRequest } = mockChatCompletionFetch();
             const openai = new OpenAI({ apiKey: 'something1234', baseURL: 'http://127.0.0.1:4010', fetch });
-            const runner = openai.beta.chat.completions.runFunctions({
+            const runner = openai.beta.chat.completions.runTools({
                 messages: [{ role: 'user', content: 'tell me what the weather is like' }],
                 model: 'gpt-3.5-turbo',
-                function_call: {
-                    name: 'getWeather',
+                tool_choice: {
+                    type: 'function',
+                    function: {
+                        name: 'getWeather',
+                    },
                 },
-                functions: [
+                tools: [
                     {
-                        function: function getWeather() {
-                            return `it's raining`;
+                        type: 'function',
+                        function: {
+                            function: function getWeather() {
+                                return `it's raining`;
+                            },
+                            parameters: {},
+                            description: 'gets the weather',
                         },
-                        parameters: {},
-                        description: 'gets the weather',
                     },
                 ],
             });
@@ -929,10 +1070,16 @@ describe('resource completions', () => {
                                 message: {
                                     role: 'assistant',
                                     content: null,
-                                    function_call: {
-                                        arguments: '',
-                                        name: 'getWeather',
-                                    },
+                                    tool_calls: [
+                                        {
+                                            type: 'function',
+                                            id: '123',
+                                            function: {
+                                                arguments: '',
+                                                name: 'getWeather',
+                                            },
+                                        },
+                                    ],
                                 },
                             },
                         ],
@@ -945,8 +1092,21 @@ describe('resource completions', () => {
             ]);
             expect(listener.messages).toEqual([
                 { role: 'user', content: 'tell me what the weather is like' },
-                { role: 'assistant', content: null, function_call: { name: 'getWeather', arguments: '' } },
-                { role: 'function', content: `it's raining`, name: 'getWeather' },
+                {
+                    role: 'assistant',
+                    content: null,
+                    tool_calls: [
+                        {
+                            type: 'function',
+                            id: '123',
+                            function: {
+                                arguments: '',
+                                name: 'getWeather',
+                            },
+                        },
+                    ],
+                },
+                { role: 'tool', content: `it's raining`, tool_call_id: '123' },
             ]);
             expect(listener.functionCallResults).toEqual([`it's raining`]);
             await listener.sanityCheck();
@@ -954,16 +1114,19 @@ describe('resource completions', () => {
         test('wrong function name', async () => {
             const { fetch, handleRequest } = mockChatCompletionFetch();
             const openai = new OpenAI({ apiKey: 'something1234', baseURL: 'http://127.0.0.1:4010', fetch });
-            const runner = openai.beta.chat.completions.runFunctions({
+            const runner = openai.beta.chat.completions.runTools({
                 messages: [{ role: 'user', content: 'tell me what the weather is like' }],
                 model: 'gpt-3.5-turbo',
-                functions: [
+                tools: [
                     {
-                        function: function getWeather() {
-                            return `it's raining`;
+                        type: 'function',
+                        function: {
+                            function: function getWeather() {
+                                return `it's raining`;
+                            },
+                            parameters: {},
+                            description: 'gets the weather',
                         },
-                        parameters: {},
-                        description: 'gets the weather',
                     },
                 ],
             });
@@ -980,10 +1143,16 @@ describe('resource completions', () => {
                                 message: {
                                     role: 'assistant',
                                     content: null,
-                                    function_call: {
-                                        arguments: '',
-                                        name: 'get_weather',
-                                    },
+                                    tool_calls: [
+                                        {
+                                            type: 'function',
+                                            id: '123',
+                                            function: {
+                                                arguments: '',
+                                                name: 'get_weather',
+                                            },
+                                        },
+                                    ],
                                 },
                             },
                         ],
@@ -998,15 +1167,21 @@ describe('resource completions', () => {
                         {
                             role: 'assistant',
                             content: null,
-                            function_call: {
-                                arguments: '',
-                                name: 'get_weather',
-                            },
+                            tool_calls: [
+                                {
+                                    type: 'function',
+                                    id: '123',
+                                    function: {
+                                        arguments: '',
+                                        name: 'get_weather',
+                                    },
+                                },
+                            ],
                         },
                         {
-                            role: 'function',
-                            content: `Invalid function_call: "get_weather". Available options are: "getWeather". Please try again`,
-                            name: 'get_weather',
+                            role: 'tool',
+                            content: `Invalid tool_call: "get_weather". Available options are: "getWeather". Please try again`,
+                            tool_call_id: '123',
                         },
                     ]);
                     return {
@@ -1018,10 +1193,16 @@ describe('resource completions', () => {
                                 message: {
                                     role: 'assistant',
                                     content: null,
-                                    function_call: {
-                                        arguments: '',
-                                        name: 'getWeather',
-                                    },
+                                    tool_calls: [
+                                        {
+                                            type: 'function',
+                                            id: '1234',
+                                            function: {
+                                                arguments: '',
+                                                name: 'getWeather',
+                                            },
+                                        },
+                                    ],
                                 },
                             },
                         ],
@@ -1036,28 +1217,40 @@ describe('resource completions', () => {
                         {
                             role: 'assistant',
                             content: null,
-                            function_call: {
-                                arguments: '',
-                                name: 'get_weather',
-                            },
+                            tool_calls: [
+                                {
+                                    type: 'function',
+                                    id: '123',
+                                    function: {
+                                        arguments: '',
+                                        name: 'get_weather',
+                                    },
+                                },
+                            ],
                         },
                         {
-                            role: 'function',
-                            content: `Invalid function_call: "get_weather". Available options are: "getWeather". Please try again`,
-                            name: 'get_weather',
+                            role: 'tool',
+                            content: `Invalid tool_call: "get_weather". Available options are: "getWeather". Please try again`,
+                            tool_call_id: '123',
                         },
                         {
                             role: 'assistant',
                             content: null,
-                            function_call: {
-                                arguments: '',
-                                name: 'getWeather',
-                            },
+                            tool_calls: [
+                                {
+                                    type: 'function',
+                                    id: '1234',
+                                    function: {
+                                        arguments: '',
+                                        name: 'getWeather',
+                                    },
+                                },
+                            ],
                         },
                         {
-                            role: 'function',
+                            role: 'tool',
                             content: `it's raining`,
-                            name: 'getWeather',
+                            tool_call_id: '1234',
                         },
                     ]);
                     return {
@@ -1081,99 +1274,49 @@ describe('resource completions', () => {
             ]);
             expect(listener.messages).toEqual([
                 { role: 'user', content: 'tell me what the weather is like' },
-                { role: 'assistant', content: null, function_call: { name: 'get_weather', arguments: '' } },
                 {
-                    role: 'function',
-                    content: `Invalid function_call: "get_weather". Available options are: "getWeather". Please try again`,
-                    name: 'get_weather',
+                    role: 'assistant',
+                    content: null,
+                    tool_calls: [{ type: 'function', id: '123', function: { name: 'get_weather', arguments: '' } }],
                 },
-                { role: 'assistant', content: null, function_call: { name: 'getWeather', arguments: '' } },
-                { role: 'function', content: `it's raining`, name: 'getWeather' },
-                { role: 'assistant', content: "it's raining" },
-            ]);
-            expect(listener.functionCallResults).toEqual([
-                `Invalid function_call: "get_weather". Available options are: "getWeather". Please try again`,
-                `it's raining`,
-            ]);
-            await listener.sanityCheck();
-        });
-        test('wrong function name with single function call', async () => {
-            const { fetch, handleRequest } = mockChatCompletionFetch();
-            const openai = new OpenAI({ apiKey: 'something1234', baseURL: 'http://127.0.0.1:4010', fetch });
-            const runner = openai.beta.chat.completions.runFunctions({
-                messages: [{ role: 'user', content: 'tell me what the weather is like' }],
-                model: 'gpt-3.5-turbo',
-                function_call: {
-                    name: 'getWeather',
+                {
+                    role: 'tool',
+                    content: `Invalid tool_call: "get_weather". Available options are: "getWeather". Please try again`,
+                    tool_call_id: '123',
                 },
-                functions: [
-                    {
-                        function: function getWeather() {
-                            return `it's raining`;
-                        },
-                        parameters: {},
-                        description: 'gets the weather',
-                    },
-                ],
-            });
-            const listener = new RunnerListener(runner);
-            await Promise.all([
-                handleRequest(async (request) => {
-                    expect(request.messages).toEqual([{ role: 'user', content: 'tell me what the weather is like' }]);
-                    return {
-                        id: '1',
-                        choices: [
-                            {
-                                index: 0,
-                                finish_reason: 'function_call',
-                                message: {
-                                    role: 'assistant',
-                                    content: null,
-                                    function_call: {
-                                        arguments: '',
-                                        name: 'get_weather',
-                                    },
-                                },
-                            },
-                        ],
-                        created: Math.floor(Date.now() / 1000),
-                        model: 'gpt-3.5-turbo',
-                        object: 'chat.completion',
-                    };
-                }),
-                runner.done(),
-            ]);
-            expect(listener.messages).toEqual([
-                { role: 'user', content: 'tell me what the weather is like' },
-                { role: 'assistant', content: null, function_call: { name: 'get_weather', arguments: '' } },
                 {
-                    role: 'function',
-                    content: `Invalid function_call: "get_weather". Available options are: "getWeather". Please try again`,
-                    name: 'get_weather',
+                    role: 'assistant',
+                    content: null,
+                    tool_calls: [{ type: 'function', id: '1234', function: { name: 'getWeather', arguments: '' } }],
                 },
+                { role: 'tool', content: `it's raining`, tool_call_id: '1234' },
+                { role: 'assistant', content: "it's raining" },
             ]);
             expect(listener.functionCallResults).toEqual([
-                `Invalid function_call: "get_weather". Available options are: "getWeather". Please try again`,
+                `Invalid tool_call: "get_weather". Available options are: "getWeather". Please try again`,
+                `it's raining`,
             ]);
             await listener.sanityCheck();
         });
     });
-    // TODO: re-enable
-    describe.skip('runFunctions with stream: true', () => {
+    describe('runTools with stream: true', () => {
         test('successful flow', async () => {
             const { fetch, handleRequest } = mockStreamingChatCompletionFetch();
             const openai = new OpenAI({ apiKey: 'something1234', baseURL: 'http://127.0.0.1:4010', fetch });
-            const runner = openai.beta.chat.completions.runFunctions({
+            const runner = openai.beta.chat.completions.runTools({
                 stream: true,
                 messages: [{ role: 'user', content: 'tell me what the weather is like' }],
                 model: 'gpt-3.5-turbo',
-                functions: [
+                tools: [
                     {
-                        function: function getWeather() {
-                            return `it's raining`;
+                        type: 'function',
+                        function: {
+                            function: function getWeather() {
+                                return `it's raining`;
+                            },
+                            parameters: {},
+                            description: 'gets the weather',
                         },
-                        parameters: {},
-                        description: 'gets the weather',
                     },
                 ],
             });
@@ -1190,10 +1333,17 @@ describe('resource completions', () => {
                                 delta: {
                                     role: 'assistant',
                                     content: null,
-                                    function_call: {
-                                        arguments: '',
-                                        name: 'getWeather',
-                                    },
+                                    tool_calls: [
+                                        {
+                                            type: 'function',
+                                            index: 0,
+                                            id: '123',
+                                            function: {
+                                                arguments: '',
+                                                name: 'getWeather',
+                                            },
+                                        },
+                                    ],
                                 },
                             },
                         ],
@@ -1208,15 +1358,21 @@ describe('resource completions', () => {
                         {
                             role: 'assistant',
                             content: null,
-                            function_call: {
-                                arguments: '',
-                                name: 'getWeather',
-                            },
+                            tool_calls: [
+                                {
+                                    type: 'function',
+                                    id: '123',
+                                    function: {
+                                        arguments: '',
+                                        name: 'getWeather',
+                                    },
+                                },
+                            ],
                         },
                         {
-                            role: 'function',
+                            role: 'tool',
                             content: `it's raining`,
-                            name: 'getWeather',
+                            tool_call_id: '123',
                         },
                     ]);
                     for (const choice of contentChoiceDeltas(`it's raining`)) {
@@ -1232,8 +1388,21 @@ describe('resource completions', () => {
                 runner.done(),
             ]);
             expect(listener.eventMessages).toEqual([
-                { role: 'assistant', content: null, function_call: { name: 'getWeather', arguments: '' } },
-                { role: 'function', content: `it's raining`, name: 'getWeather' },
+                {
+                    role: 'assistant',
+                    content: null,
+                    tool_calls: [
+                        {
+                            type: 'function',
+                            id: '123',
+                            function: {
+                                arguments: '',
+                                name: 'getWeather',
+                            },
+                        },
+                    ],
+                },
+                { role: 'tool', content: `it's raining`, tool_call_id: '123' },
                 { role: 'assistant', content: "it's raining" },
             ]);
             expect(listener.eventFunctionCallResults).toEqual([`it's raining`]);
@@ -1243,17 +1412,20 @@ describe('resource completions', () => {
             const { fetch, handleRequest } = mockStreamingChatCompletionFetch();
             const openai = new OpenAI({ apiKey: 'something1234', baseURL: 'http://127.0.0.1:4010', fetch });
             const controller = new AbortController();
-            const runner = openai.beta.chat.completions.runFunctions({
+            const runner = openai.beta.chat.completions.runTools({
                 stream: true,
                 messages: [{ role: 'user', content: 'tell me what the weather is like' }],
                 model: 'gpt-3.5-turbo',
-                functions: [
+                tools: [
                     {
-                        function: function getWeather() {
-                            return `it's raining`;
+                        type: 'function',
+                        function: {
+                            function: function getWeather() {
+                                return `it's raining`;
+                            },
+                            parameters: {},
+                            description: 'gets the weather',
                         },
-                        parameters: {},
-                        description: 'gets the weather',
                     },
                 ],
             }, { signal: controller.signal });
@@ -1270,10 +1442,17 @@ describe('resource completions', () => {
                             delta: {
                                 role: 'assistant',
                                 content: null,
-                                function_call: {
-                                    arguments: '',
-                                    name: 'getWeather',
-                                },
+                                tool_calls: [
+                                    {
+                                        type: 'function',
+                                        index: 0,
+                                        id: '123',
+                                        function: {
+                                            arguments: '',
+                                            name: 'getWeather',
+                                        },
+                                    },
+                                ],
                             },
                         },
                     ],
@@ -1284,8 +1463,21 @@ describe('resource completions', () => {
             });
             await runner.done().catch(() => { });
             expect(listener.eventMessages).toEqual([
-                { role: 'assistant', content: null, function_call: { name: 'getWeather', arguments: '' } },
-                { role: 'function', content: `it's raining`, name: 'getWeather' },
+                {
+                    role: 'assistant',
+                    content: null,
+                    tool_calls: [
+                        {
+                            type: 'function',
+                            id: '123',
+                            function: {
+                                arguments: '',
+                                name: 'getWeather',
+                            },
+                        },
+                    ],
+                },
+                { role: 'tool', content: `it's raining`, tool_call_id: '123' },
             ]);
             expect(listener.eventFunctionCallResults).toEqual([`it's raining`]);
             await listener.sanityCheck({ error: 'Request was aborted.' });
@@ -1294,7 +1486,7 @@ describe('resource completions', () => {
         test('successful flow with parse', async () => {
             const { fetch, handleRequest } = mockStreamingChatCompletionFetch();
             const openai = new OpenAI({ apiKey: 'something1234', baseURL: 'http://127.0.0.1:4010', fetch });
-            const runner = openai.beta.chat.completions.runFunctions({
+            const runner = openai.beta.chat.completions.runTools({
                 stream: true,
                 messages: [
                     {
@@ -1303,8 +1495,8 @@ describe('resource completions', () => {
                     },
                 ],
                 model: 'gpt-3.5-turbo',
-                functions: [
-                    new ParsingFunction({
+                tools: [
+                    new ParsingToolFunction({
                         name: 'numProperties',
                         function: (obj) => String(Object.keys(obj).length),
                         parameters: { type: 'object' },
@@ -1337,10 +1529,17 @@ describe('resource completions', () => {
                                 delta: {
                                     role: 'assistant',
                                     content: null,
-                                    function_call: {
-                                        arguments: '{"a": 1, "b": 2, "c": 3}',
-                                        name: 'numProperties',
-                                    },
+                                    tool_calls: [
+                                        {
+                                            type: 'function',
+                                            id: '123',
+                                            index: 0,
+                                            function: {
+                                                arguments: '{"a": 1, "b": 2, "c": 3}',
+                                                name: 'numProperties',
+                                            },
+                                        },
+                                    ],
                                 },
                             },
                         ],
@@ -1358,15 +1557,21 @@ describe('resource completions', () => {
                         {
                             role: 'assistant',
                             content: null,
-                            function_call: {
-                                arguments: '{"a": 1, "b": 2, "c": 3}',
-                                name: 'numProperties',
-                            },
+                            tool_calls: [
+                                {
+                                    type: 'function',
+                                    id: '123',
+                                    function: {
+                                        arguments: '{"a": 1, "b": 2, "c": 3}',
+                                        name: 'numProperties',
+                                    },
+                                },
+                            ],
                         },
                         {
-                            role: 'function',
+                            role: 'tool',
                             content: '3',
-                            name: 'numProperties',
+                            tool_call_id: '123',
                         },
                     ]);
                     for (const choice of contentChoiceDeltas(`there are 3 properties in {"a": 1, "b": 2, "c": 3}`)) {
@@ -1385,9 +1590,15 @@ describe('resource completions', () => {
                 {
                     role: 'assistant',
                     content: null,
-                    function_call: { name: 'numProperties', arguments: '{"a": 1, "b": 2, "c": 3}' },
+                    tool_calls: [
+                        {
+                            type: 'function',
+                            id: '123',
+                            function: { name: 'numProperties', arguments: '{"a": 1, "b": 2, "c": 3}' },
+                        },
+                    ],
                 },
-                { role: 'function', content: '3', name: 'numProperties' },
+                { role: 'tool', content: '3', tool_call_id: '123' },
                 { role: 'assistant', content: 'there are 3 properties in {"a": 1, "b": 2, "c": 3}' },
             ]);
             expect(listener.eventFunctionCallResults).toEqual(['3']);
@@ -1396,7 +1607,7 @@ describe('resource completions', () => {
         test('flow with parse error', async () => {
             const { fetch, handleRequest } = mockStreamingChatCompletionFetch();
             const openai = new OpenAI({ apiKey: 'something1234', baseURL: 'http://127.0.0.1:4010', fetch });
-            const runner = openai.beta.chat.completions.runFunctions({
+            const runner = openai.beta.chat.completions.runTools({
                 stream: true,
                 messages: [
                     {
@@ -1405,8 +1616,8 @@ describe('resource completions', () => {
                     },
                 ],
                 model: 'gpt-3.5-turbo',
-                functions: [
-                    new ParsingFunction({
+                tools: [
+                    new ParsingToolFunction({
                         name: 'numProperties',
                         function: (obj) => String(Object.keys(obj).length),
                         parameters: { type: 'object' },
@@ -1430,7 +1641,10 @@ describe('resource completions', () => {
                             content: 'can you tell me how many properties are in {"a": 1, "b": 2, "c": 3}',
                         },
                     ]);
-                    for (const choice of functionCallDeltas('[{"a": 1, "b": 2, "c": 3}]', { name: 'numProperties' })) {
+                    for (const choice of functionCallDeltas('[{"a": 1, "b": 2, "c": 3}]', {
+                        name: 'numProperties',
+                        id: '123',
+                    })) {
                         yield {
                             id: '1',
                             choices: [choice],
@@ -1449,18 +1663,27 @@ describe('resource completions', () => {
                         {
                             role: 'assistant',
                             content: null,
-                            function_call: {
-                                arguments: '[{"a": 1, "b": 2, "c": 3}]',
-                                name: 'numProperties',
-                            },
+                            tool_calls: [
+                                {
+                                    type: 'function',
+                                    id: '123',
+                                    function: {
+                                        arguments: '[{"a": 1, "b": 2, "c": 3}]',
+                                        name: 'numProperties',
+                                    },
+                                },
+                            ],
                         },
                         {
-                            role: 'function',
+                            role: 'tool',
                             content: `must be an object`,
-                            name: 'numProperties',
+                            tool_call_id: '123',
                         },
                     ]);
-                    for (const choice of functionCallDeltas('{"a": 1, "b": 2, "c": 3}', { name: 'numProperties' })) {
+                    for (const choice of functionCallDeltas('{"a": 1, "b": 2, "c": 3}', {
+                        name: 'numProperties',
+                        id: '1234',
+                    })) {
                         yield {
                             id: '2',
                             choices: [choice],
@@ -1479,28 +1702,40 @@ describe('resource completions', () => {
                         {
                             role: 'assistant',
                             content: null,
-                            function_call: {
-                                arguments: '[{"a": 1, "b": 2, "c": 3}]',
-                                name: 'numProperties',
-                            },
+                            tool_calls: [
+                                {
+                                    type: 'function',
+                                    id: '123',
+                                    function: {
+                                        arguments: '[{"a": 1, "b": 2, "c": 3}]',
+                                        name: 'numProperties',
+                                    },
+                                },
+                            ],
                         },
                         {
-                            role: 'function',
+                            role: 'tool',
                             content: `must be an object`,
-                            name: 'numProperties',
+                            tool_call_id: '123',
                         },
                         {
                             role: 'assistant',
                             content: null,
-                            function_call: {
-                                arguments: '{"a": 1, "b": 2, "c": 3}',
-                                name: 'numProperties',
-                            },
+                            tool_calls: [
+                                {
+                                    type: 'function',
+                                    id: '1234',
+                                    function: {
+                                        arguments: '{"a": 1, "b": 2, "c": 3}',
+                                        name: 'numProperties',
+                                    },
+                                },
+                            ],
                         },
                         {
-                            role: 'function',
+                            role: 'tool',
                             content: '3',
-                            name: 'numProperties',
+                            tool_call_id: '1234',
                         },
                     ]);
                     for (const choice of contentChoiceDeltas(`there are 3 properties in {"a": 1, "b": 2, "c": 3}`)) {
@@ -1519,15 +1754,27 @@ describe('resource completions', () => {
                 {
                     role: 'assistant',
                     content: null,
-                    function_call: { name: 'numProperties', arguments: '[{"a": 1, "b": 2, "c": 3}]' },
+                    tool_calls: [
+                        {
+                            type: 'function',
+                            id: '123',
+                            function: { name: 'numProperties', arguments: '[{"a": 1, "b": 2, "c": 3}]' },
+                        },
+                    ],
                 },
-                { role: 'function', content: `must be an object`, name: 'numProperties' },
+                { role: 'tool', content: `must be an object`, tool_call_id: '123' },
                 {
                     role: 'assistant',
                     content: null,
-                    function_call: { name: 'numProperties', arguments: '{"a": 1, "b": 2, "c": 3}' },
+                    tool_calls: [
+                        {
+                            type: 'function',
+                            id: '1234',
+                            function: { name: 'numProperties', arguments: '{"a": 1, "b": 2, "c": 3}' },
+                        },
+                    ],
                 },
-                { role: 'function', content: '3', name: 'numProperties' },
+                { role: 'tool', content: '3', tool_call_id: '1234' },
                 { role: 'assistant', content: 'there are 3 properties in {"a": 1, "b": 2, "c": 3}' },
             ]);
             expect(listener.eventFunctionCallResults).toEqual([`must be an object`, '3']);
@@ -1536,20 +1783,26 @@ describe('resource completions', () => {
         test('single function call', async () => {
             const { fetch, handleRequest } = mockStreamingChatCompletionFetch();
             const openai = new OpenAI({ apiKey: 'something1234', baseURL: 'http://127.0.0.1:4010', fetch });
-            const runner = openai.beta.chat.completions.runFunctions({
+            const runner = openai.beta.chat.completions.runTools({
                 stream: true,
                 messages: [{ role: 'user', content: 'tell me what the weather is like' }],
                 model: 'gpt-3.5-turbo',
-                function_call: {
-                    name: 'getWeather',
+                tool_choice: {
+                    type: 'function',
+                    function: {
+                        name: 'getWeather',
+                    },
                 },
-                functions: [
+                tools: [
                     {
-                        function: function getWeather() {
-                            return `it's raining`;
+                        type: 'function',
+                        function: {
+                            function: function getWeather() {
+                                return `it's raining`;
+                            },
+                            parameters: {},
+                            description: 'gets the weather',
                         },
-                        parameters: {},
-                        description: 'gets the weather',
                     },
                 ],
             });
@@ -1566,10 +1819,17 @@ describe('resource completions', () => {
                                 delta: {
                                     role: 'assistant',
                                     content: null,
-                                    function_call: {
-                                        arguments: '',
-                                        name: 'getWeather',
-                                    },
+                                    tool_calls: [
+                                        {
+                                            type: 'function',
+                                            index: 0,
+                                            id: '123',
+                                            function: {
+                                                arguments: '',
+                                                name: 'getWeather',
+                                            },
+                                        },
+                                    ],
                                 },
                             },
                         ],
@@ -1581,8 +1841,21 @@ describe('resource completions', () => {
                 runner.done(),
             ]);
             expect(listener.eventMessages).toEqual([
-                { role: 'assistant', content: null, function_call: { name: 'getWeather', arguments: '' } },
-                { role: 'function', content: `it's raining`, name: 'getWeather' },
+                {
+                    role: 'assistant',
+                    content: null,
+                    tool_calls: [
+                        {
+                            type: 'function',
+                            id: '123',
+                            function: {
+                                arguments: '',
+                                name: 'getWeather',
+                            },
+                        },
+                    ],
+                },
+                { role: 'tool', tool_call_id: '123', content: `it's raining` },
             ]);
             expect(listener.eventFunctionCallResults).toEqual([`it's raining`]);
             await listener.sanityCheck();
@@ -1590,17 +1863,20 @@ describe('resource completions', () => {
         test('wrong function name', async () => {
             const { fetch, handleRequest } = mockStreamingChatCompletionFetch();
             const openai = new OpenAI({ apiKey: 'something1234', baseURL: 'http://127.0.0.1:4010', fetch });
-            const runner = openai.beta.chat.completions.runFunctions({
+            const runner = openai.beta.chat.completions.runTools({
                 stream: true,
                 messages: [{ role: 'user', content: 'tell me what the weather is like' }],
                 model: 'gpt-3.5-turbo',
-                functions: [
+                tools: [
                     {
-                        function: function getWeather() {
-                            return `it's raining`;
+                        type: 'function',
+                        function: {
+                            function: function getWeather() {
+                                return `it's raining`;
+                            },
+                            parameters: {},
+                            description: 'gets the weather',
                         },
-                        parameters: {},
-                        description: 'gets the weather',
                     },
                 ],
             });
@@ -1617,10 +1893,17 @@ describe('resource completions', () => {
                                 delta: {
                                     role: 'assistant',
                                     content: null,
-                                    function_call: {
-                                        arguments: '',
-                                        name: 'get_weather',
-                                    },
+                                    tool_calls: [
+                                        {
+                                            type: 'function',
+                                            index: 0,
+                                            id: '123',
+                                            function: {
+                                                arguments: '',
+                                                name: 'get_weather',
+                                            },
+                                        },
+                                    ],
                                 },
                             },
                         ],
@@ -1635,15 +1918,21 @@ describe('resource completions', () => {
                         {
                             role: 'assistant',
                             content: null,
-                            function_call: {
-                                arguments: '',
-                                name: 'get_weather',
-                            },
+                            tool_calls: [
+                                {
+                                    type: 'function',
+                                    id: '123',
+                                    function: {
+                                        arguments: '',
+                                        name: 'get_weather',
+                                    },
+                                },
+                            ],
                         },
                         {
-                            role: 'function',
-                            content: `Invalid function_call: "get_weather". Available options are: "getWeather". Please try again`,
-                            name: 'get_weather',
+                            role: 'tool',
+                            content: `Invalid tool_call: "get_weather". Available options are: "getWeather". Please try again`,
+                            tool_call_id: '123',
                         },
                     ]);
                     yield {
@@ -1655,10 +1944,17 @@ describe('resource completions', () => {
                                 delta: {
                                     role: 'assistant',
                                     content: null,
-                                    function_call: {
-                                        arguments: '',
-                                        name: 'getWeather',
-                                    },
+                                    tool_calls: [
+                                        {
+                                            type: 'function',
+                                            index: 0,
+                                            id: '1234',
+                                            function: {
+                                                arguments: '',
+                                                name: 'getWeather',
+                                            },
+                                        },
+                                    ],
                                 },
                             },
                         ],
@@ -1673,28 +1969,40 @@ describe('resource completions', () => {
                         {
                             role: 'assistant',
                             content: null,
-                            function_call: {
-                                arguments: '',
-                                name: 'get_weather',
-                            },
+                            tool_calls: [
+                                {
+                                    type: 'function',
+                                    id: '123',
+                                    function: {
+                                        arguments: '',
+                                        name: 'get_weather',
+                                    },
+                                },
+                            ],
                         },
                         {
-                            role: 'function',
-                            content: `Invalid function_call: "get_weather". Available options are: "getWeather". Please try again`,
-                            name: 'get_weather',
+                            role: 'tool',
+                            content: `Invalid tool_call: "get_weather". Available options are: "getWeather". Please try again`,
+                            tool_call_id: '123',
                         },
                         {
                             role: 'assistant',
                             content: null,
-                            function_call: {
-                                arguments: '',
-                                name: 'getWeather',
-                            },
+                            tool_calls: [
+                                {
+                                    type: 'function',
+                                    id: '1234',
+                                    function: {
+                                        arguments: '',
+                                        name: 'getWeather',
+                                    },
+                                },
+                            ],
                         },
                         {
-                            role: 'function',
+                            role: 'tool',
                             content: `it's raining`,
-                            name: 'getWeather',
+                            tool_call_id: '1234',
                         },
                     ]);
                     for (const choice of contentChoiceDeltas(`it's raining`)) {
@@ -1710,79 +2018,45 @@ describe('resource completions', () => {
                 runner.done(),
             ]);
             expect(listener.eventMessages).toEqual([
-                { role: 'assistant', content: null, function_call: { name: 'get_weather', arguments: '' } },
                 {
-                    role: 'function',
-                    content: `Invalid function_call: "get_weather". Available options are: "getWeather". Please try again`,
-                    name: 'get_weather',
+                    role: 'assistant',
+                    content: null,
+                    tool_calls: [
+                        {
+                            type: 'function',
+                            id: '123',
+                            function: {
+                                arguments: '',
+                                name: 'get_weather',
+                            },
+                        },
+                    ],
                 },
-                { role: 'assistant', content: null, function_call: { name: 'getWeather', arguments: '' } },
-                { role: 'function', content: `it's raining`, name: 'getWeather' },
-                { role: 'assistant', content: "it's raining" },
-            ]);
-            expect(listener.eventFunctionCallResults).toEqual([
-                `Invalid function_call: "get_weather". Available options are: "getWeather". Please try again`,
-                `it's raining`,
-            ]);
-            await listener.sanityCheck();
-        });
-        test('wrong function name with single function call', async () => {
-            const { fetch, handleRequest } = mockStreamingChatCompletionFetch();
-            const openai = new OpenAI({ apiKey: 'something1234', baseURL: 'http://127.0.0.1:4010', fetch });
-            const runner = openai.beta.chat.completions.runFunctions({
-                stream: true,
-                messages: [{ role: 'user', content: 'tell me what the weather is like' }],
-                model: 'gpt-3.5-turbo',
-                function_call: {
-                    name: 'getWeather',
+                {
+                    role: 'tool',
+                    content: `Invalid tool_call: "get_weather". Available options are: "getWeather". Please try again`,
+                    tool_call_id: '123',
                 },
-                functions: [
-                    {
-                        function: function getWeather() {
-                            return `it's raining`;
-                        },
-                        parameters: {},
-                        description: 'gets the weather',
-                    },
-                ],
-            });
-            const listener = new StreamingRunnerListener(runner);
-            await Promise.all([
-                handleRequest(async function* (request) {
-                    expect(request.messages).toEqual([{ role: 'user', content: 'tell me what the weather is like' }]);
-                    yield {
-                        id: '1',
-                        choices: [
-                            {
-                                index: 0,
-                                finish_reason: 'function_call',
-                                delta: {
-                                    role: 'assistant',
-                                    content: null,
-                                    function_call: {
-                                        arguments: '',
-                                        name: 'get_weather',
-                                    },
-                                },
-                            },
-                        ],
-                        created: Math.floor(Date.now() / 1000),
-                        model: 'gpt-3.5-turbo',
-                        object: 'chat.completion.chunk',
-                    };
-                }),
-                runner.done(),
-            ]);
-            expect(listener.eventMessages).toEqual([
-                { role: 'assistant', content: null, function_call: { name: 'get_weather', arguments: '' } },
                 {
-                    role: 'function',
-                    content: `Invalid function_call: "get_weather". Available options are: "getWeather". Please try again`,
-                    name: 'get_weather',
+                    role: 'assistant',
+                    content: null,
+                    tool_calls: [
+                        {
+                            type: 'function',
+                            id: '1234',
+                            function: {
+                                arguments: '',
+                                name: 'getWeather',
+                            },
+                        },
+                    ],
                 },
+                { role: 'tool', content: `it's raining`, tool_call_id: '1234' },
+                { role: 'assistant', content: "it's raining" },
             ]);
             expect(listener.eventFunctionCallResults).toEqual([
-                `Invalid function_call: "get_weather". Available options are: "getWeather". Please try again`,
+                `Invalid tool_call: "get_weather". Available options are: "getWeather". Please try again`,
+                `it's raining`,
             ]);
             await listener.sanityCheck();
         });