Merge branch 'master' into perf/wassim-chegham-issue-1310

Author: manekinekko

.devcontainer/Dockerfile

@@ -1,20 +1,17 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the
 // README at: https://github.com/devcontainers/templates/tree/main/src/debian
 {
-  "name": "Debian",
-  "build": {
-    "dockerfile": "Dockerfile"
+  "name": "Development",
+  "image": "mcr.microsoft.com/devcontainers/typescript-node:latest",
+  "features": {
+    "ghcr.io/devcontainers/features/node:1": {}
+  },
+  "postCreateCommand": "yarn install",
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "esbenp.prettier-vscode"
+      ]
+    }
   }
-
-  // Features to add to the dev container. More info: https://containers.dev/features.
-  // "features": {},
-
-  // Use 'forwardPorts' to make a list of ports inside the container available locally.
-  // "forwardPorts": [],
-
-  // Configure tool-specific properties.
-  // "customizations": {},
-
-  // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
-  // "remoteUser": "root"
 }

.devcontainer/devcontainer.json

@@ -1,3 +1,3 @@
 {
-  ".": "4.85.2"
+  ".": "4.85.4"
 }

.release-please-manifest.json

@@ -1,5 +1,21 @@
 # Changelog
 
+## 4.85.4 (2025-02-22)
+
+Full Changelog: [v4.85.3...v4.85.4](https://github.com/openai/openai-node/compare/v4.85.3...v4.85.4)
+
+### Chores
+
+* **internal:** fix devcontainers setup ([#1343](https://github.com/openai/openai-node/issues/1343)) ([cb1ec90](https://github.com/openai/openai-node/commit/cb1ec907832e325bc29abe94ae325e0477cb87d1))
+
+## 4.85.3 (2025-02-20)
+
+Full Changelog: [v4.85.2...v4.85.3](https://github.com/openai/openai-node/compare/v4.85.2...v4.85.3)
+
+### Bug Fixes
+
+* **parsing:** remove tool_calls default empty array ([#1341](https://github.com/openai/openai-node/issues/1341)) ([2672160](https://github.com/openai/openai-node/commit/26721608e61949daa9592483e89b79230bb9198a))
+
 ## 4.85.2 (2025-02-18)
 
 Full Changelog: [v4.85.1...v4.85.2](https://github.com/openai/openai-node/compare/v4.85.1...v4.85.2)

CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@openai/openai",
-  "version": "4.85.2",
+  "version": "4.85.4",
   "exports": {
     ".": "./index.ts",
     "./helpers/zod": "./helpers/zod.ts",

jsr.json

@@ -1,6 +1,6 @@
 {
   "name": "openai",
-  "version": "4.85.2",
+  "version": "4.85.4",
   "description": "The official TypeScript library for the OpenAI API",
   "author": "OpenAI <[email protected]>",
   "types": "dist/index.d.ts",

package.json

@@ -119,7 +119,15 @@ export function maybeParseChatCompletion<
       ...completion,
       choices: completion.choices.map((choice) => ({
         ...choice,
-        message: { ...choice.message, parsed: null, tool_calls: choice.message.tool_calls ?? [] },
+        message: {
+          ...choice.message,
+          parsed: null,
+          ...(choice.message.tool_calls ?
+            {
+              tool_calls: choice.message.tool_calls,
+            }
+          : undefined),
+        },
       })),
     };
   }
@@ -144,7 +152,12 @@ export function parseChatCompletion<
       ...choice,
       message: {
         ...choice.message,
-        tool_calls: choice.message.tool_calls?.map((toolCall) => parseToolCall(params, toolCall)) ?? [],
+        ...(choice.message.tool_calls ?
+          {
+            tool_calls:
+              choice.message.tool_calls?.map((toolCall) => parseToolCall(params, toolCall)) ?? undefined,
+          }
+        : undefined),
         parsed:
           choice.message.content && !choice.message.refusal ?
             parseResponseFormat(params, choice.message.content)

src/lib/parser.ts

@@ -50,7 +50,7 @@ export interface ParsedFunctionToolCall extends ChatCompletionMessageToolCall {
 
 export interface ParsedChatCompletionMessage<ParsedT> extends ChatCompletionMessage {
   parsed: ParsedT | null;
-  tool_calls: Array<ParsedFunctionToolCall>;
+  tool_calls?: Array<ParsedFunctionToolCall>;
 }
 
 export interface ParsedChoice<ParsedT> extends ChatCompletion.Choice {

src/resources/beta/chat/completions.ts

@@ -1 +1 @@
-export const VERSION = '4.85.2'; // x-release-please-version
+export const VERSION = '4.85.4'; // x-release-please-version

src/version.ts

@@ -628,7 +628,7 @@ describe('resource completions', () => {
           content: "it's raining",
           parsed: null,
           refusal: null,
-          tool_calls: [],
+          tool_calls: undefined,
         },
       ]);
       expect(listener.functionCallResults).toEqual([`it's raining`]);
@@ -876,7 +876,7 @@ describe('resource completions', () => {
           content: 'there are 3 properties in {"a": 1, "b": 2, "c": 3}',
           parsed: null,
           refusal: null,
-          tool_calls: [],
+          tool_calls: undefined,
         },
       ]);
       expect(listener.functionCallResults).toEqual(['3']);
@@ -1125,7 +1125,7 @@ describe('resource completions', () => {
           content: 'there are 3 properties in {"a": 1, "b": 2, "c": 3}',
           parsed: null,
           refusal: null,
-          tool_calls: [],
+          tool_calls: undefined,
         },
       ]);
       expect(listener.functionCallResults).toEqual([`must be an object`, '3']);
@@ -1443,7 +1443,7 @@ describe('resource completions', () => {
           content: "it's raining",
           parsed: null,
           refusal: null,
-          tool_calls: [],
+          tool_calls: undefined,
         },
       ]);
       expect(listener.functionCallResults).toEqual([
@@ -1572,7 +1572,7 @@ describe('resource completions', () => {
           content: "it's raining",
           parsed: null,
           refusal: null,
-          tool_calls: [],
+          tool_calls: undefined,
         },
       ]);
       expect(listener.eventFunctionCallResults).toEqual([`it's raining`]);
@@ -1795,7 +1795,7 @@ describe('resource completions', () => {
           content: 'there are 3 properties in {"a": 1, "b": 2, "c": 3}',
           parsed: null,
           refusal: null,
-          tool_calls: [],
+          tool_calls: undefined,
         },
       ]);
       expect(listener.eventFunctionCallResults).toEqual(['3']);
@@ -1997,7 +1997,7 @@ describe('resource completions', () => {
           content: 'there are 3 properties in {"a": 1, "b": 2, "c": 3}',
           parsed: null,
           refusal: null,
-          tool_calls: [],
+          tool_calls: undefined,
         },
       ]);
       expect(listener.eventFunctionCallResults).toEqual([`must be an object`, '3']);
@@ -2301,7 +2301,7 @@ describe('resource completions', () => {
           content: "it's raining",
           parsed: null,
           refusal: null,
-          tool_calls: [],
+          tool_calls: undefined,
         },
       ]);
       expect(listener.eventFunctionCallResults).toEqual([
@@ -2347,7 +2347,7 @@ describe('resource completions', () => {
         content: 'The weather is great today!',
         parsed: null,
         refusal: null,
-        tool_calls: [],
+        tool_calls: undefined,
       });
       await listener.sanityCheck();
     });
@@ -2386,7 +2386,7 @@ describe('resource completions', () => {
         content: 'The weather is great today!',
         parsed: null,
         refusal: null,
-        tool_calls: [],
+        tool_calls: undefined,
       });
       await listener.sanityCheck();
     });

tests/lib/ChatCompletionRunFunctions.test.ts

@@ -39,7 +39,6 @@ describe('.stream()', () => {
           },
           "refusal": null,
           "role": "assistant",
-          "tool_calls": [],
         },
       }
     `);
@@ -198,7 +197,6 @@ describe('.stream()', () => {
           },
           "refusal": null,
           "role": "assistant",
-          "tool_calls": [],
         },
       }
     `);
@@ -386,7 +384,6 @@ describe('.stream()', () => {
           "parsed": null,
           "refusal": "I'm very sorry, but I can't assist with that request.",
           "role": "assistant",
-          "tool_calls": [],
         },
       }
     `);

tests/lib/ChatCompletionStream.test.ts

@@ -39,7 +39,6 @@ describe('.parse()', () => {
             },
             "refusal": null,
             "role": "assistant",
-            "tool_calls": [],
           },
         }
       `);
@@ -154,7 +153,6 @@ describe('.parse()', () => {
           },
           "refusal": null,
           "role": "assistant",
-          "tool_calls": [],
         }
       `);
 
@@ -488,7 +486,6 @@ describe('.parse()', () => {
           },
           "refusal": null,
           "role": "assistant",
-          "tool_calls": [],
         }
       `);
     });
@@ -787,7 +784,6 @@ describe('.parse()', () => {
           },
           "refusal": null,
           "role": "assistant",
-          "tool_calls": [],
         }
       `);
     });
@@ -947,7 +943,6 @@ describe('.parse()', () => {
           },
           "refusal": null,
           "role": "assistant",
-          "tool_calls": [],
         }
       `);
     });
@@ -1061,7 +1056,6 @@ describe('.parse()', () => {
           },
           "refusal": null,
           "role": "assistant",
-          "tool_calls": [],
         }
       `);
     });