fetch, ESM & streamCompletion util

.gitignore

@@ -1 +1,4 @@
 /node_modules
+
+# build artifacts
+dist

.openapi-generator/FILES

@@ -4,3 +4,7 @@ base.ts
 common.ts
 configuration.ts
 index.ts
+stream.ts
+tsc-multi.json
+tsconfig.esm.json
+tsconfig.json

README.md

@@ -76,6 +76,21 @@ try {
 
 Streaming completions (`stream=true`) are not natively supported in this package yet, but [a workaround exists](https://github.com/openai/openai-node/issues/18#issuecomment-1369996933) if needed.
 
+### Fetch support
+
+Usage with Vercel Edge Functions or Cloudflare Workers where fetch is required could be supported with proper axios adapter :
+
+```javascript
+import fetchAdapter from "@haverstack/axios-fetch-adapter";
+
+const configuration = new Configuration({
+  apiKey: process.env.OPENAI_API_KEY,
+  baseOptions: { 
+    adapter: fetchAdapter
+  }
+});
+```
+
 ## Upgrade guide
 
 All breaking changes for major version releases are listed below.

api.ts

@@ -2149,7 +2149,7 @@ export const OpenAIApiAxiosParamCreator = function (configuration?: Configuratio
 
             setSearchParams(localVarUrlObj, localVarQueryParameter);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...localVarFormParams.getHeaders(), ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...(localVarFormParams as any).getHeaders?.(), ...options.headers};
             localVarRequestOptions.data = localVarFormParams;
 
             return {
@@ -2294,7 +2294,7 @@ export const OpenAIApiAxiosParamCreator = function (configuration?: Configuratio
 
             setSearchParams(localVarUrlObj, localVarQueryParameter);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...localVarFormParams.getHeaders(), ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...(localVarFormParams as any).getHeaders?.(), ...options.headers};
             localVarRequestOptions.data = localVarFormParams;
 
             return {
@@ -2355,7 +2355,7 @@ export const OpenAIApiAxiosParamCreator = function (configuration?: Configuratio
 
             setSearchParams(localVarUrlObj, localVarQueryParameter);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...localVarFormParams.getHeaders(), ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...(localVarFormParams as any).getHeaders?.(), ...options.headers};
             localVarRequestOptions.data = localVarFormParams;
 
             return {
@@ -2500,7 +2500,7 @@ export const OpenAIApiAxiosParamCreator = function (configuration?: Configuratio
 
             setSearchParams(localVarUrlObj, localVarQueryParameter);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...localVarFormParams.getHeaders(), ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...(localVarFormParams as any).getHeaders?.(), ...options.headers};
             localVarRequestOptions.data = localVarFormParams;
 
             return {
@@ -2563,7 +2563,7 @@ export const OpenAIApiAxiosParamCreator = function (configuration?: Configuratio
 
             setSearchParams(localVarUrlObj, localVarQueryParameter);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...localVarFormParams.getHeaders(), ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...(localVarFormParams as any).getHeaders?.(), ...options.headers};
             localVarRequestOptions.data = localVarFormParams;
 
             return {

configuration.ts

@@ -13,7 +13,8 @@
  */
 
 
-const packageJson = require("../package.json");
+import FormData from "form-data";
+import { LIB_VERSION } from "./version";
 
 export interface ConfigurationParameters {
     apiKey?: string | Promise<string> | ((name: string) => string) | ((name: string) => Promise<string>);
@@ -98,15 +99,15 @@ export class Configuration {
             this.baseOptions = {};
         }
         this.baseOptions.headers = {
-            'User-Agent': `OpenAI/NodeJS/${packageJson.version}`,
+            'User-Agent': `OpenAI/NodeJS/${LIB_VERSION}`,
             'Authorization': `Bearer ${this.apiKey}`,
             ...this.baseOptions.headers,
         }
         if (this.organization) {
             this.baseOptions.headers['OpenAI-Organization'] = this.organization;
         }
         if (!this.formDataCtor) {
-            this.formDataCtor = require("form-data");
+            this.formDataCtor = FormData;
         }
     }