openai 4.36.0 → 4.37.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 4.37.0 (2024-04-17)
+
+Full Changelog: [v4.36.0...v4.37.0](https://github.com/openai/openai-node/compare/v4.36.0...v4.37.0)
+
+### Features
+
+* **api:** add vector stores ([#776](https://github.com/openai/openai-node/issues/776)) ([8bb929b](https://github.com/openai/openai-node/commit/8bb929b2ee91c1bec0a00347bf4f7628652d1be3))
+
 ## 4.36.0 (2024-04-16)
 
 Full Changelog: [v4.35.0...v4.36.0](https://github.com/openai/openai-node/compare/v4.35.0...v4.36.0)

package/README.md

@@ -19,7 +19,7 @@ You can import in Deno via:
 <!-- x-release-please-start-version -->
 
 ```ts
-import OpenAI from 'https://deno.land/x/openai@v4.36.0/mod.ts';
+import OpenAI from 'https://deno.land/x/openai@v4.37.0/mod.ts';
 ```
 
 <!-- x-release-please-end -->
@@ -102,7 +102,7 @@ Documentation for each method, request param, and response field are available i
 
 ### Polling Helpers
 
-When interacting with the API some actions such as starting a Run may take time to complete. The SDK includes
+When interacting with the API some actions such as starting a Run and adding files to vector stores are asynchronous and take time to complete. The SDK includes
 helper functions which will poll the status until it reaches a terminal state and then return the resulting object.
 If an API method results in an action which could benefit from polling there will be a corresponding version of the
 method ending in 'AndPoll'.
@@ -117,6 +117,20 @@ const run = await openai.beta.threads.runs.createAndPoll(thread.id, {
 
 More information on the lifecycle of a Run can be found in the [Run Lifecycle Documentation](https://platform.openai.com/docs/assistants/how-it-works/run-lifecycle)
 
+### Bulk Upload Helpers
+
+When creating an interacting with vector stores, you can use the polling helpers to monitor the status of operations.
+For convenience, we also provide a bulk upload helper to allow you to simultaneously upload several files at once.
+
+```ts
+const fileList = [
+  createReadStream('/home/data/example.pdf'),
+  ...
+];
+
+const batch = await openai.vectorStores.fileBatches.uploadAndPoll(vectorStore.id, fileList);
+```
+
 ### Streaming Helpers
 
 The SDK also includes helpers to process streams and handle the incoming events.

package/lib/AssistantStream.d.ts

@@ -1,10 +1,10 @@
-import { Message, Text, ImageFile, TextDelta, Messages } from 'openai/resources/beta/threads/messages/messages';
+import { Message, Text, ImageFile, TextDelta, Messages } from 'openai/resources/beta/threads/messages';
 import * as Core from 'openai/core';
 import { RequestOptions } from 'openai/core';
 import { Run, RunCreateParamsBase, Runs, RunSubmitToolOutputsParamsBase } from 'openai/resources/beta/threads/runs/runs';
 import { AbstractAssistantRunnerEvents, AbstractAssistantStreamRunner } from "./AbstractAssistantStreamRunner.js";
 import { type ReadableStream } from 'openai/_shims/index';
-import { AssistantStreamEvent } from 'openai/resources/beta/assistants/assistants';
+import { AssistantStreamEvent } from 'openai/resources/beta/assistants';
 import { RunStep, RunStepDelta, ToolCall, ToolCallDelta } from 'openai/resources/beta/threads/runs/steps';
 import { ThreadCreateAndRunParamsBase, Threads } from 'openai/resources/beta/threads/threads';
 import MessageDelta = Messages.MessageDelta;

package/lib/AssistantStream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AssistantStream.d.ts","sourceRoot":"","sources":["../src/lib/AssistantStream.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AssistantStream.d.ts","sourceRoot":"","sources":["../src/lib/AssistantStream.ts"],"names":[],"mappings":"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"}

package/lib/Util.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Like `Promise.allSettled()` but throws an error if any promises are rejected.
+ */
+export declare const allSettledWithThrow: <R>(promises: Promise<R>[]) => Promise<R[]>;
+//# sourceMappingURL=Util.d.ts.map

package/lib/Util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Util.d.ts","sourceRoot":"","sources":["../src/lib/Util.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,eAAO,MAAM,mBAAmB,6CAmB/B,CAAC"}

package/lib/Util.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.allSettledWithThrow = void 0;
+/**
+ * Like `Promise.allSettled()` but throws an error if any promises are rejected.
+ */
+const allSettledWithThrow = async (promises) => {
+    const results = await Promise.allSettled(promises);
+    const rejected = results.filter((result) => result.status === 'rejected');
+    if (rejected.length) {
+        for (const result of rejected) {
+            console.error(result.reason);
+        }
+        throw new Error(`${rejected.length} promise(s) failed - see the above errors`);
+    }
+    // Note: TS was complaining about using `.filter().map()` here for some reason
+    const values = [];
+    for (const result of results) {
+        if (result.status === 'fulfilled') {
+            values.push(result.value);
+        }
+    }
+    return values;
+};
+exports.allSettledWithThrow = allSettledWithThrow;
+//# sourceMappingURL=Util.js.map

package/lib/Util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Util.js","sourceRoot":"","sources":["../src/lib/Util.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACI,MAAM,mBAAmB,GAAG,KAAK,EAAK,QAAsB,EAAgB,EAAE;IACnF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACnD,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAmC,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC;IAC3G,IAAI,QAAQ,CAAC,MAAM,EAAE;QACnB,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE;YAC7B,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SAC9B;QAED,MAAM,IAAI,KAAK,CAAC,GAAG,QAAQ,CAAC,MAAM,2CAA2C,CAAC,CAAC;KAChF;IAED,8EAA8E;IAC9E,MAAM,MAAM,GAAQ,EAAE,CAAC;IACvB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,EAAE;YACjC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAC3B;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAnBW,QAAA,mBAAmB,uBAmB9B"}

package/lib/Util.mjs

@@ -0,0 +1,22 @@
+/**
+ * Like `Promise.allSettled()` but throws an error if any promises are rejected.
+ */
+export const allSettledWithThrow = async (promises) => {
+    const results = await Promise.allSettled(promises);
+    const rejected = results.filter((result) => result.status === 'rejected');
+    if (rejected.length) {
+        for (const result of rejected) {
+            console.error(result.reason);
+        }
+        throw new Error(`${rejected.length} promise(s) failed - see the above errors`);
+    }
+    // Note: TS was complaining about using `.filter().map()` here for some reason
+    const values = [];
+    for (const result of results) {
+        if (result.status === 'fulfilled') {
+            values.push(result.value);
+        }
+    }
+    return values;
+};
+//# sourceMappingURL=Util.mjs.map

package/lib/Util.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"Util.mjs","sourceRoot":"","sources":["../src/lib/Util.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAK,QAAsB,EAAgB,EAAE;IACnF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACnD,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAmC,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC;IAC3G,IAAI,QAAQ,CAAC,MAAM,EAAE;QACnB,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE;YAC7B,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SAC9B;QAED,MAAM,IAAI,KAAK,CAAC,GAAG,QAAQ,CAAC,MAAM,2CAA2C,CAAC,CAAC;KAChF;IAED,8EAA8E;IAC9E,MAAM,MAAM,GAAQ,EAAE,CAAC;IACvB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,EAAE;YACjC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAC3B;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openai",
-  "version": "4.36.0",
+  "version": "4.37.0",
   "description": "The official TypeScript library for the OpenAI API",
   "author": "OpenAI <support@openai.com>",
   "types": "./index.d.ts",

package/resources/beta/{assistants/assistants.d.ts → assistants.d.ts}

@@ -1,15 +1,13 @@
 import * as Core from 'openai/core';
 import { APIResource } from 'openai/resource';
-import * as AssistantsAPI from 'openai/resources/beta/assistants/assistants';
+import * as AssistantsAPI from 'openai/resources/beta/assistants';
 import * as Shared from 'openai/resources/shared';
-import * as FilesAPI from 'openai/resources/beta/assistants/files';
+import * as MessagesAPI from 'openai/resources/beta/threads/messages';
 import * as ThreadsAPI from 'openai/resources/beta/threads/threads';
-import * as MessagesAPI from 'openai/resources/beta/threads/messages/messages';
 import * as RunsAPI from 'openai/resources/beta/threads/runs/runs';
 import * as StepsAPI from 'openai/resources/beta/threads/runs/steps';
 import { CursorPage, type CursorPageParams } from 'openai/pagination';
 export declare class Assistants extends APIResource {
-    files: FilesAPI.Files;
     /**
      * Create an assistant with a model and instructions.
      */
@@ -50,12 +48,6 @@ export interface Assistant {
      * The description of the assistant. The maximum length is 512 characters.
      */
     description: string | null;
-    /**
-     * A list of [file](https://platform.openai.com/docs/api-reference/files) IDs
-     * attached to this assistant. There can be a maximum of 20 files attached to the
-     * assistant. Files are ordered by their creation date in ascending order.
-     */
-    file_ids: Array<string>;
     /**
      * The system instructions that the assistant uses. The maximum length is 256,000
      * characters.
@@ -86,9 +78,48 @@ export interface Assistant {
     object: 'assistant';
     /**
      * A list of tool enabled on the assistant. There can be a maximum of 128 tools per
-     * assistant. Tools can be of types `code_interpreter`, `retrieval`, or `function`.
+     * assistant. Tools can be of types `code_interpreter`, `file_search`, or
+     * `function`.
      */
     tools: Array<AssistantTool>;
+    /**
+     * A set of resources that are used by the assistant's tools. The resources are
+     * specific to the type of tool. For example, the `code_interpreter` tool requires
+     * a list of file IDs, while the `file_search` tool requires a list of vector store
+     * IDs.
+     */
+    tool_resources?: Assistant.ToolResources | null;
+}
+export declare namespace Assistant {
+    /**
+     * A set of resources that are used by the assistant's tools. The resources are
+     * specific to the type of tool. For example, the `code_interpreter` tool requires
+     * a list of file IDs, while the `file_search` tool requires a list of vector store
+     * IDs.
+     */
+    interface ToolResources {
+        code_interpreter?: ToolResources.CodeInterpreter;
+        file_search?: ToolResources.FileSearch;
+    }
+    namespace ToolResources {
+        interface CodeInterpreter {
+            /**
+             * A list of [file](https://platform.openai.com/docs/api-reference/files) IDs made
+             * available to the `code_interpreter`` tool. There can be a maximum of 20 files
+             * associated with the tool.
+             */
+            file_ids?: Array<string>;
+        }
+        interface FileSearch {
+            /**
+             * The ID of the
+             * [vector store](https://platform.openai.com/docs/api-reference/vector-stores/object)
+             * attached to this assistant. There can be a maximum of 1 vector store attached to
+             * the assistant.
+             */
+            vector_store_ids?: Array<string>;
+        }
+    }
 }
 export interface AssistantDeleted {
     id: string;
@@ -400,13 +431,19 @@ export declare namespace AssistantStreamEvent {
         event: 'error';
     }
 }
-export type AssistantTool = CodeInterpreterTool | RetrievalTool | FunctionTool;
+export type AssistantTool = CodeInterpreterTool | FileSearchTool | FunctionTool;
 export interface CodeInterpreterTool {
     /**
      * The type of tool being defined: `code_interpreter`
      */
     type: 'code_interpreter';
 }
+export interface FileSearchTool {
+    /**
+     * The type of tool being defined: `file_search`
+     */
+    type: 'file_search';
+}
 export interface FunctionTool {
     function: Shared.FunctionDefinition;
     /**
@@ -487,12 +524,6 @@ export declare namespace MessageStreamEvent {
         event: 'thread.message.incomplete';
     }
 }
-export interface RetrievalTool {
-    /**
-     * The type of tool being defined: `retrieval`
-     */
-    type: 'retrieval';
-}
 /**
  * Occurs when a
  * [run step](https://platform.openai.com/docs/api-reference/runs/step-object) is
@@ -727,12 +758,6 @@ export interface AssistantCreateParams {
      * The description of the assistant. The maximum length is 512 characters.
      */
     description?: string | null;
-    /**
-     * A list of [file](https://platform.openai.com/docs/api-reference/files) IDs
-     * attached to this assistant. There can be a maximum of 20 files attached to the
-     * assistant. Files are ordered by their creation date in ascending order.
-     */
-    file_ids?: Array<string>;
     /**
      * The system instructions that the assistant uses. The maximum length is 256,000
      * characters.
@@ -749,25 +774,111 @@ export interface AssistantCreateParams {
      * The name of the assistant. The maximum length is 256 characters.
      */
     name?: string | null;
+    /**
+     * Specifies the format that the model must output. Compatible with
+     * [GPT-4 Turbo](https://platform.openai.com/docs/models/gpt-4-and-gpt-4-turbo) and
+     * all GPT-3.5 Turbo models newer than `gpt-3.5-turbo-1106`.
+     *
+     * Setting to `{ "type": "json_object" }` enables JSON mode, which guarantees the
+     * message the model generates is valid JSON.
+     *
+     * **Important:** when using JSON mode, you **must** also instruct the model to
+     * produce JSON yourself via a system or user message. Without this, the model may
+     * generate an unending stream of whitespace until the generation reaches the token
+     * limit, resulting in a long-running and seemingly "stuck" request. Also note that
+     * the message content may be partially cut off if `finish_reason="length"`, which
+     * indicates the generation exceeded `max_tokens` or the conversation exceeded the
+     * max context length.
+     */
+    response_format?: ThreadsAPI.AssistantResponseFormatOption | null;
+    /**
+     * What sampling temperature to use, between 0 and 2. Higher values like 0.8 will
+     * make the output more random, while lower values like 0.2 will make it more
+     * focused and deterministic.
+     */
+    temperature?: number | null;
+    /**
+     * A set of resources that are used by the assistant's tools. The resources are
+     * specific to the type of tool. For example, the `code_interpreter` tool requires
+     * a list of file IDs, while the `file_search` tool requires a list of vector store
+     * IDs.
+     */
+    tool_resources?: AssistantCreateParams.ToolResources | null;
     /**
      * A list of tool enabled on the assistant. There can be a maximum of 128 tools per
-     * assistant. Tools can be of types `code_interpreter`, `retrieval`, or `function`.
+     * assistant. Tools can be of types `code_interpreter`, `file_search`, or
+     * `function`.
      */
     tools?: Array<AssistantTool>;
+    /**
+     * An alternative to sampling with temperature, called nucleus sampling, where the
+     * model considers the results of the tokens with top_p probability mass. So 0.1
+     * means only the tokens comprising the top 10% probability mass are considered.
+     *
+     * We generally recommend altering this or temperature but not both.
+     */
+    top_p?: number | null;
+}
+export declare namespace AssistantCreateParams {
+    /**
+     * A set of resources that are used by the assistant's tools. The resources are
+     * specific to the type of tool. For example, the `code_interpreter` tool requires
+     * a list of file IDs, while the `file_search` tool requires a list of vector store
+     * IDs.
+     */
+    interface ToolResources {
+        code_interpreter?: ToolResources.CodeInterpreter;
+        file_search?: ToolResources.FileSearch;
+    }
+    namespace ToolResources {
+        interface CodeInterpreter {
+            /**
+             * A list of [file](https://platform.openai.com/docs/api-reference/files) IDs made
+             * available to the `code_interpreter` tool. There can be a maximum of 20 files
+             * associated with the tool.
+             */
+            file_ids?: Array<string>;
+        }
+        interface FileSearch {
+            /**
+             * The
+             * [vector store](https://platform.openai.com/docs/api-reference/vector-stores/object)
+             * attached to this assistant. There can be a maximum of 1 vector store attached to
+             * the assistant.
+             */
+            vector_store_ids?: Array<string>;
+            /**
+             * A helper to create a
+             * [vector store](https://platform.openai.com/docs/api-reference/vector-stores/object)
+             * with file_ids and attach it to this assistant. There can be a maximum of 1
+             * vector store attached to the assistant.
+             */
+            vector_stores?: Array<FileSearch.VectorStore>;
+        }
+        namespace FileSearch {
+            interface VectorStore {
+                /**
+                 * A list of [file](https://platform.openai.com/docs/api-reference/files) IDs to
+                 * add to the vector store. There can be a maximum of 10000 files in a vector
+                 * store.
+                 */
+                file_ids?: Array<string>;
+                /**
+                 * Set of 16 key-value pairs that can be attached to a vector store. This can be
+                 * useful for storing additional information about the vector store in a structured
+                 * format. Keys can be a maximum of 64 characters long and values can be a maxium
+                 * of 512 characters long.
+                 */
+                metadata?: unknown;
+            }
+        }
+    }
 }
 export interface AssistantUpdateParams {
     /**
      * The description of the assistant. The maximum length is 512 characters.
      */
     description?: string | null;
-    /**
-     * A list of [File](https://platform.openai.com/docs/api-reference/files) IDs
-     * attached to this assistant. There can be a maximum of 20 files attached to the
-     * assistant. Files are ordered by their creation date in ascending order. If a
-     * file was previously attached to the list but does not show up in the list, it
-     * will be deleted from the assistant.
-     */
-    file_ids?: Array<string>;
     /**
      * The system instructions that the assistant uses. The maximum length is 256,000
      * characters.
@@ -792,11 +903,82 @@ export interface AssistantUpdateParams {
      * The name of the assistant. The maximum length is 256 characters.
      */
     name?: string | null;
+    /**
+     * Specifies the format that the model must output. Compatible with
+     * [GPT-4 Turbo](https://platform.openai.com/docs/models/gpt-4-and-gpt-4-turbo) and
+     * all GPT-3.5 Turbo models newer than `gpt-3.5-turbo-1106`.
+     *
+     * Setting to `{ "type": "json_object" }` enables JSON mode, which guarantees the
+     * message the model generates is valid JSON.
+     *
+     * **Important:** when using JSON mode, you **must** also instruct the model to
+     * produce JSON yourself via a system or user message. Without this, the model may
+     * generate an unending stream of whitespace until the generation reaches the token
+     * limit, resulting in a long-running and seemingly "stuck" request. Also note that
+     * the message content may be partially cut off if `finish_reason="length"`, which
+     * indicates the generation exceeded `max_tokens` or the conversation exceeded the
+     * max context length.
+     */
+    response_format?: ThreadsAPI.AssistantResponseFormatOption | null;
+    /**
+     * What sampling temperature to use, between 0 and 2. Higher values like 0.8 will
+     * make the output more random, while lower values like 0.2 will make it more
+     * focused and deterministic.
+     */
+    temperature?: number | null;
+    /**
+     * A set of resources that are used by the assistant's tools. The resources are
+     * specific to the type of tool. For example, the `code_interpreter` tool requires
+     * a list of file IDs, while the `file_search` tool requires a list of vector store
+     * IDs.
+     */
+    tool_resources?: AssistantUpdateParams.ToolResources | null;
     /**
      * A list of tool enabled on the assistant. There can be a maximum of 128 tools per
-     * assistant. Tools can be of types `code_interpreter`, `retrieval`, or `function`.
+     * assistant. Tools can be of types `code_interpreter`, `file_search`, or
+     * `function`.
      */
     tools?: Array<AssistantTool>;
+    /**
+     * An alternative to sampling with temperature, called nucleus sampling, where the
+     * model considers the results of the tokens with top_p probability mass. So 0.1
+     * means only the tokens comprising the top 10% probability mass are considered.
+     *
+     * We generally recommend altering this or temperature but not both.
+     */
+    top_p?: number | null;
+}
+export declare namespace AssistantUpdateParams {
+    /**
+     * A set of resources that are used by the assistant's tools. The resources are
+     * specific to the type of tool. For example, the `code_interpreter` tool requires
+     * a list of file IDs, while the `file_search` tool requires a list of vector store
+     * IDs.
+     */
+    interface ToolResources {
+        code_interpreter?: ToolResources.CodeInterpreter;
+        file_search?: ToolResources.FileSearch;
+    }
+    namespace ToolResources {
+        interface CodeInterpreter {
+            /**
+             * Overrides the list of
+             * [file](https://platform.openai.com/docs/api-reference/files) IDs made available
+             * to the `code_interpreter` tool. There can be a maximum of 20 files associated
+             * with the tool.
+             */
+            file_ids?: Array<string>;
+        }
+        interface FileSearch {
+            /**
+             * Overrides the
+             * [vector store](https://platform.openai.com/docs/api-reference/vector-stores/object)
+             * attached to this assistant. There can be a maximum of 1 vector store attached to
+             * the assistant.
+             */
+            vector_store_ids?: Array<string>;
+        }
+    }
 }
 export interface AssistantListParams extends CursorPageParams {
     /**
@@ -818,9 +1000,9 @@ export declare namespace Assistants {
     export import AssistantStreamEvent = AssistantsAPI.AssistantStreamEvent;
     export import AssistantTool = AssistantsAPI.AssistantTool;
     export import CodeInterpreterTool = AssistantsAPI.CodeInterpreterTool;
+    export import FileSearchTool = AssistantsAPI.FileSearchTool;
     export import FunctionTool = AssistantsAPI.FunctionTool;
     export import MessageStreamEvent = AssistantsAPI.MessageStreamEvent;
-    export import RetrievalTool = AssistantsAPI.RetrievalTool;
     export import RunStepStreamEvent = AssistantsAPI.RunStepStreamEvent;
     export import RunStreamEvent = AssistantsAPI.RunStreamEvent;
     export import ThreadStreamEvent = AssistantsAPI.ThreadStreamEvent;
@@ -828,11 +1010,5 @@ export declare namespace Assistants {
     export import AssistantCreateParams = AssistantsAPI.AssistantCreateParams;
     export import AssistantUpdateParams = AssistantsAPI.AssistantUpdateParams;
     export import AssistantListParams = AssistantsAPI.AssistantListParams;
-    export import Files = FilesAPI.Files;
-    export import AssistantFile = FilesAPI.AssistantFile;
-    export import FileDeleteResponse = FilesAPI.FileDeleteResponse;
-    export import AssistantFilesPage = FilesAPI.AssistantFilesPage;
-    export import FileCreateParams = FilesAPI.FileCreateParams;
-    export import FileListParams = FilesAPI.FileListParams;
 }
 //# sourceMappingURL=assistants.d.ts.map

package/resources/beta/assistants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"assistants.d.ts","sourceRoot":"","sources":["../../src/resources/beta/assistants.ts"],"names":[],"mappings":"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"}

package/resources/beta/{assistants/assistants.js → assistants.js}

@@ -27,14 +27,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssistantsPage = exports.Assistants = void 0;
 const resource_1 = require("openai/resource");
 const core_1 = require("openai/core");
-const AssistantsAPI = __importStar(require("openai/resources/beta/assistants/assistants"));
-const FilesAPI = __importStar(require("openai/resources/beta/assistants/files"));
+const AssistantsAPI = __importStar(require("openai/resources/beta/assistants"));
 const pagination_1 = require("openai/pagination");
 class Assistants extends resource_1.APIResource {
-    constructor() {
-        super(...arguments);
-        this.files = new FilesAPI.Files(this._client);
-    }
     /**
      * Create an assistant with a model and instructions.
      */
@@ -42,7 +37,7 @@ class Assistants extends resource_1.APIResource {
         return this._client.post('/assistants', {
             body,
             ...options,
-            headers: { 'OpenAI-Beta': 'assistants=v1', ...options?.headers },
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
         });
     }
     /**
@@ -51,7 +46,7 @@ class Assistants extends resource_1.APIResource {
     retrieve(assistantId, options) {
         return this._client.get(`/assistants/${assistantId}`, {
             ...options,
-            headers: { 'OpenAI-Beta': 'assistants=v1', ...options?.headers },
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
         });
     }
     /**
@@ -61,7 +56,7 @@ class Assistants extends resource_1.APIResource {
         return this._client.post(`/assistants/${assistantId}`, {
             body,
             ...options,
-            headers: { 'OpenAI-Beta': 'assistants=v1', ...options?.headers },
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
         });
     }
     list(query = {}, options) {
@@ -71,7 +66,7 @@ class Assistants extends resource_1.APIResource {
         return this._client.getAPIList('/assistants', AssistantsPage, {
             query,
             ...options,
-            headers: { 'OpenAI-Beta': 'assistants=v1', ...options?.headers },
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
         });
     }
     /**
@@ -80,7 +75,7 @@ class Assistants extends resource_1.APIResource {
     del(assistantId, options) {
         return this._client.delete(`/assistants/${assistantId}`, {
             ...options,
-            headers: { 'OpenAI-Beta': 'assistants=v1', ...options?.headers },
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
         });
     }
 }
@@ -90,7 +85,5 @@ class AssistantsPage extends pagination_1.CursorPage {
 exports.AssistantsPage = AssistantsPage;
 (function (Assistants) {
     Assistants.AssistantsPage = AssistantsAPI.AssistantsPage;
-    Assistants.Files = FilesAPI.Files;
-    Assistants.AssistantFilesPage = FilesAPI.AssistantFilesPage;
 })(Assistants = exports.Assistants || (exports.Assistants = {}));
 //# sourceMappingURL=assistants.js.map

package/resources/beta/assistants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"assistants.js","sourceRoot":"","sources":["../../src/resources/beta/assistants.ts"],"names":[],"mappings":";AAAA,sFAAsF;;;;;;;;;;;;;;;;;;;;;;;;;;AAGtF,8CAA8C;AAC9C,sCAA+C;AAC/C,gFAAkE;AAMlE,kDAAsE;AAEtE,MAAa,UAAW,SAAQ,sBAAW;IACzC;;OAEG;IACH,MAAM,CAAC,IAA2B,EAAE,OAA6B;QAC/D,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE;YACtC,IAAI;YACJ,GAAG,OAAO;YACV,OAAO,EAAE,EAAE,aAAa,EAAE,eAAe,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE;SACjE,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,QAAQ,CAAC,WAAmB,EAAE,OAA6B;QACzD,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,WAAW,EAAE,EAAE;YACpD,GAAG,OAAO;YACV,OAAO,EAAE,EAAE,aAAa,EAAE,eAAe,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE;SACjE,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,MAAM,CACJ,WAAmB,EACnB,IAA2B,EAC3B,OAA6B;QAE7B,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,WAAW,EAAE,EAAE;YACrD,IAAI;YACJ,GAAG,OAAO;YACV,OAAO,EAAE,EAAE,aAAa,EAAE,eAAe,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE;SACjE,CAAC,CAAC;IACL,CAAC;IAUD,IAAI,CACF,QAAmD,EAAE,EACrD,OAA6B;QAE7B,IAAI,IAAA,uBAAgB,EAAC,KAAK,CAAC,EAAE;YAC3B,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;SAC7B;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,aAAa,EAAE,cAAc,EAAE;YAC5D,KAAK;YACL,GAAG,OAAO;YACV,OAAO,EAAE,EAAE,aAAa,EAAE,eAAe,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE;SACjE,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,GAAG,CAAC,WAAmB,EAAE,OAA6B;QACpD,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,WAAW,EAAE,EAAE;YACvD,GAAG,OAAO;YACV,OAAO,EAAE,EAAE,aAAa,EAAE,eAAe,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE;SACjE,CAAC,CAAC;IACL,CAAC;CACF;AApED,gCAoEC;AAED,MAAa,cAAe,SAAQ,uBAAqB;CAAG;AAA5D,wCAA4D;AAwpC5D,WAAiB,UAAU;IAYX,yBAAc,GAAG,aAAa,CAAC,cAAc,CAAC;AAI9D,CAAC,EAhBgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAgB1B"}