fix(api): correct types for message attachment tools (#787)

stainless-bot · web-flow · commit 8626884abd24 · 2024-04-19T13:42:26.000-04:00
diff --git a/src/resources/beta/threads/messages.ts b/src/resources/beta/threads/messages.ts
@@ -4,6 +4,7 @@ import * as Core from 'openai/core';
 import { APIResource } from 'openai/resource';
 import { isRequestOptions } from 'openai/core';
 import * as MessagesAPI from 'openai/resources/beta/threads/messages';
+import * as AssistantsAPI from 'openai/resources/beta/assistants';
 import { CursorPage, type CursorPageParams } from 'openai/pagination';
 
 export class Messages extends APIResource {
@@ -374,7 +375,10 @@ export namespace Message {
      */
     file_id?: string;
 
-    tools?: Array<'file_search' | 'code_interpreter'>;
+    /**
+     * The tools to add this file to.
+     */
+    tools?: Array<AssistantsAPI.CodeInterpreterTool | AssistantsAPI.FileSearchTool>;
   }
 
   /**
@@ -528,7 +532,10 @@ export namespace MessageCreateParams {
      */
     file_id?: string;
 
-    tools?: Array<'file_search' | 'code_interpreter'>;
+    /**
+     * The tools to add this file to.
+     */
+    tools?: Array<AssistantsAPI.CodeInterpreterTool | AssistantsAPI.FileSearchTool>;
   }
 }
 
diff --git a/src/resources/beta/threads/runs/runs.ts b/src/resources/beta/threads/runs/runs.ts
@@ -780,7 +780,10 @@ export namespace RunCreateParams {
        */
       file_id?: string;
 
-      tools?: Array<'file_search' | 'code_interpreter'>;
+      /**
+       * The tools to add this file to.
+       */
+      tools?: Array<AssistantsAPI.CodeInterpreterTool | AssistantsAPI.FileSearchTool>;
     }
   }
 
@@ -1028,7 +1031,10 @@ export namespace RunCreateAndPollParams {
        */
       file_id?: string;
 
-      tools?: Array<'file_search' | 'code_interpreter'>;
+      /**
+       * The tools to add this file to.
+       */
+      tools?: Array<AssistantsAPI.CodeInterpreterTool | AssistantsAPI.FileSearchTool>;
     }
   }
 
@@ -1229,7 +1235,10 @@ export namespace RunCreateAndStreamParams {
        */
       file_id?: string;
 
-      tools?: Array<'file_search' | 'code_interpreter'>;
+      /**
+       * The tools to add this file to.
+       */
+      tools?: Array<AssistantsAPI.CodeInterpreterTool | AssistantsAPI.FileSearchTool>;
     }
   }
 
@@ -1430,7 +1439,10 @@ export namespace RunStreamParams {
        */
       file_id?: string;
 
-      tools?: Array<'file_search' | 'code_interpreter'>;
+      /**
+       * The tools to add this file to.
+       */
+      tools?: Array<AssistantsAPI.CodeInterpreterTool | AssistantsAPI.FileSearchTool>;
     }
   }
 
diff --git a/src/resources/beta/threads/threads.ts b/src/resources/beta/threads/threads.ts
@@ -318,7 +318,10 @@ export namespace ThreadCreateParams {
        */
       file_id?: string;
 
-      tools?: Array<'file_search' | 'code_interpreter'>;
+      /**
+       * The tools to add this file to.
+       */
+      tools?: Array<AssistantsAPI.CodeInterpreterTool | AssistantsAPI.FileSearchTool>;
     }
   }
 
@@ -653,7 +656,10 @@ export namespace ThreadCreateAndRunParams {
          */
         file_id?: string;
 
-        tools?: Array<'file_search' | 'code_interpreter'>;
+        /**
+         * The tools to add this file to.
+         */
+        tools?: Array<AssistantsAPI.CodeInterpreterTool | AssistantsAPI.FileSearchTool>;
       }
     }
 
@@ -999,7 +1005,10 @@ export namespace ThreadCreateAndRunPollParams {
          */
         file_id?: string;
 
-        tools?: Array<'file_search' | 'code_interpreter'>;
+        /**
+         * The tools to add this file to.
+         */
+        tools?: Array<AssistantsAPI.CodeInterpreterTool | AssistantsAPI.FileSearchTool>;
       }
     }
 
@@ -1324,7 +1333,10 @@ export namespace ThreadCreateAndRunStreamParams {
          */
         file_id?: string;
 
-        tools?: Array<'file_search' | 'code_interpreter'>;
+        /**
+         * The tools to add this file to.
+         */
+        tools?: Array<AssistantsAPI.CodeInterpreterTool | AssistantsAPI.FileSearchTool>;
       }
     }
 
diff --git a/tests/api-resources/beta/threads/messages.test.ts b/tests/api-resources/beta/threads/messages.test.ts
@@ -25,9 +25,18 @@ describe('resource messages', () => {
       content: 'x',
       role: 'user',
       attachments: [
-        { file_id: 'string', tools: ['file_search', 'code_interpreter'] },
-        { file_id: 'string', tools: ['file_search', 'code_interpreter'] },
-        { file_id: 'string', tools: ['file_search', 'code_interpreter'] },
+        {
+          file_id: 'string',
+          tools: [{ type: 'code_interpreter' }, { type: 'code_interpreter' }, { type: 'code_interpreter' }],
+        },
+        {
+          file_id: 'string',
+          tools: [{ type: 'code_interpreter' }, { type: 'code_interpreter' }, { type: 'code_interpreter' }],
+        },
+        {
+          file_id: 'string',
+          tools: [{ type: 'code_interpreter' }, { type: 'code_interpreter' }, { type: 'code_interpreter' }],
+        },
       ],
       metadata: {},
     });
diff --git a/tests/api-resources/beta/threads/runs/runs.test.ts b/tests/api-resources/beta/threads/runs/runs.test.ts
@@ -29,29 +29,92 @@ describe('resource runs', () => {
           role: 'user',
           content: 'x',
           attachments: [
-            { file_id: 'string', tools: ['file_search', 'code_interpreter'] },
-            { file_id: 'string', tools: ['file_search', 'code_interpreter'] },
-            { file_id: 'string', tools: ['file_search', 'code_interpreter'] },
+            {
+              file_id: 'string',
+              tools: [
+                { type: 'code_interpreter' },
+                { type: 'code_interpreter' },
+                { type: 'code_interpreter' },
+              ],
+            },
+            {
+              file_id: 'string',
+              tools: [
+                { type: 'code_interpreter' },
+                { type: 'code_interpreter' },
+                { type: 'code_interpreter' },
+              ],
+            },
+            {
+              file_id: 'string',
+              tools: [
+                { type: 'code_interpreter' },
+                { type: 'code_interpreter' },
+                { type: 'code_interpreter' },
+              ],
+            },
           ],
           metadata: {},
         },
         {
           role: 'user',
           content: 'x',
           attachments: [
-            { file_id: 'string', tools: ['file_search', 'code_interpreter'] },
-            { file_id: 'string', tools: ['file_search', 'code_interpreter'] },
-            { file_id: 'string', tools: ['file_search', 'code_interpreter'] },
+            {
+              file_id: 'string',
+              tools: [
+                { type: 'code_interpreter' },
+                { type: 'code_interpreter' },
+                { type: 'code_interpreter' },
+              ],
+            },
+            {
+              file_id: 'string',
+              tools: [
+                { type: 'code_interpreter' },
+                { type: 'code_interpreter' },
+                { type: 'code_interpreter' },
+              ],
+            },
+            {
+              file_id: 'string',
+              tools: [
+                { type: 'code_interpreter' },
+                { type: 'code_interpreter' },
+                { type: 'code_interpreter' },
+              ],
+            },
           ],
           metadata: {},
         },
         {
           role: 'user',
           content: 'x',
           attachments: [
-            { file_id: 'string', tools: ['file_search', 'code_interpreter'] },
-            { file_id: 'string', tools: ['file_search', 'code_interpreter'] },
-            { file_id: 'string', tools: ['file_search', 'code_interpreter'] },
+            {
+              file_id: 'string',
+              tools: [
+                { type: 'code_interpreter' },
+                { type: 'code_interpreter' },
+                { type: 'code_interpreter' },
+              ],
+            },
+            {
+              file_id: 'string',
+              tools: [
+                { type: 'code_interpreter' },
+                { type: 'code_interpreter' },
+                { type: 'code_interpreter' },
+              ],
+            },
+            {
+              file_id: 'string',
+              tools: [
+                { type: 'code_interpreter' },
+                { type: 'code_interpreter' },
+                { type: 'code_interpreter' },
+              ],
+            },
           ],
           metadata: {},
         },
diff --git a/tests/api-resources/beta/threads/threads.test.ts b/tests/api-resources/beta/threads/threads.test.ts

Original file line number	Diff line number	Diff line change
`@@ -780,7 +780,10 @@ export namespace RunCreateParams {`
`780`	`780`	`*/`
`781`	`781`	`file_id?: string;`
`782`	`782`
`783`		`- tools?: Array<'file_search' \| 'code_interpreter'>;`
	`783`	`+ /**`
	`784`	`+ * The tools to add this file to.`
	`785`	`+ */`
	`786`	`+ tools?: Array<AssistantsAPI.CodeInterpreterTool \| AssistantsAPI.FileSearchTool>;`
`784`	`787`	`}`
`785`	`788`	`}`
`786`	`789`
`@@ -1028,7 +1031,10 @@ export namespace RunCreateAndPollParams {`
`1028`	`1031`	`*/`
`1029`	`1032`	`file_id?: string;`
`1030`	`1033`
`1031`		`- tools?: Array<'file_search' \| 'code_interpreter'>;`
	`1034`	`+ /**`
	`1035`	`+ * The tools to add this file to.`
	`1036`	`+ */`
	`1037`	`+ tools?: Array<AssistantsAPI.CodeInterpreterTool \| AssistantsAPI.FileSearchTool>;`
`1032`	`1038`	`}`
`1033`	`1039`	`}`
`1034`	`1040`
`@@ -1229,7 +1235,10 @@ export namespace RunCreateAndStreamParams {`
`1229`	`1235`	`*/`
`1230`	`1236`	`file_id?: string;`
`1231`	`1237`
`1232`		`- tools?: Array<'file_search' \| 'code_interpreter'>;`
	`1238`	`+ /**`
	`1239`	`+ * The tools to add this file to.`
	`1240`	`+ */`
	`1241`	`+ tools?: Array<AssistantsAPI.CodeInterpreterTool \| AssistantsAPI.FileSearchTool>;`
`1233`	`1242`	`}`
`1234`	`1243`	`}`
`1235`	`1244`
`@@ -1430,7 +1439,10 @@ export namespace RunStreamParams {`
`1430`	`1439`	`*/`
`1431`	`1440`	`file_id?: string;`
`1432`	`1441`
`1433`		`- tools?: Array<'file_search' \| 'code_interpreter'>;`
	`1442`	`+ /**`
	`1443`	`+ * The tools to add this file to.`
	`1444`	`+ */`
	`1445`	`+ tools?: Array<AssistantsAPI.CodeInterpreterTool \| AssistantsAPI.FileSearchTool>;`
`1434`	`1446`	`}`
`1435`	`1447`	`}`
`1436`	`1448`
Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,10 @@ export namespace ThreadCreateParams {`
`318`	`318`	`*/`
`319`	`319`	`file_id?: string;`
`320`	`320`
`321`		`- tools?: Array<'file_search' \| 'code_interpreter'>;`
	`321`	`+ /**`
	`322`	`+ * The tools to add this file to.`
	`323`	`+ */`
	`324`	`+ tools?: Array<AssistantsAPI.CodeInterpreterTool \| AssistantsAPI.FileSearchTool>;`
`322`	`325`	`}`
`323`	`326`	`}`
`324`	`327`
`@@ -653,7 +656,10 @@ export namespace ThreadCreateAndRunParams {`
`653`	`656`	`*/`
`654`	`657`	`file_id?: string;`
`655`	`658`
`656`		`- tools?: Array<'file_search' \| 'code_interpreter'>;`
	`659`	`+ /**`
	`660`	`+ * The tools to add this file to.`
	`661`	`+ */`
	`662`	`+ tools?: Array<AssistantsAPI.CodeInterpreterTool \| AssistantsAPI.FileSearchTool>;`
`657`	`663`	`}`
`658`	`664`	`}`
`659`	`665`
`@@ -999,7 +1005,10 @@ export namespace ThreadCreateAndRunPollParams {`
`999`	`1005`	`*/`
`1000`	`1006`	`file_id?: string;`
`1001`	`1007`
`1002`		`- tools?: Array<'file_search' \| 'code_interpreter'>;`
	`1008`	`+ /**`
	`1009`	`+ * The tools to add this file to.`
	`1010`	`+ */`
	`1011`	`+ tools?: Array<AssistantsAPI.CodeInterpreterTool \| AssistantsAPI.FileSearchTool>;`
`1003`	`1012`	`}`
`1004`	`1013`	`}`
`1005`	`1014`
`@@ -1324,7 +1333,10 @@ export namespace ThreadCreateAndRunStreamParams {`
`1324`	`1333`	`*/`
`1325`	`1334`	`file_id?: string;`
`1326`	`1335`
`1327`		`- tools?: Array<'file_search' \| 'code_interpreter'>;`
	`1336`	`+ /**`
	`1337`	`+ * The tools to add this file to.`
	`1338`	`+ */`
	`1339`	`+ tools?: Array<AssistantsAPI.CodeInterpreterTool \| AssistantsAPI.FileSearchTool>;`
`1328`	`1340`	`}`
`1329`	`1341`	`}`
`1330`	`1342`