feat: common default header builder function

Portkey-AI · Mar 18, 2024 · c3f49ca · c3f49ca
1 parent c3a181f
commit c3f49ca
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 53 deletions.
diff --git a/src/apis/assistants.ts b/src/apis/assistants.ts
@@ -2,7 +2,7 @@ import { ApiClientInterface } from "../_types/generalTypes";
 import { ApiResource } from "../apiResource";
 import { RequestOptions } from "../baseClient";
 import { OPEN_AI_API_KEY } from "../constants";
-import { finalResponse, overrideConfig } from "../utils";
+import { defaultHeadersBuilder, finalResponse, overrideConfig } from "../utils";
 import { createHeaders } from "./createHeaders";
 import OpenAI from "openai";
 
@@ -72,7 +72,7 @@ export class Assistants extends ApiResource {
         const OAIclient = new OpenAI({
           apiKey: OPEN_AI_API_KEY,
           baseURL: this.client.baseURL,
-          defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
+          defaultHeaders: defaultHeadersBuilder(this.client),
         });
 
         const result = await OAIclient.beta.assistants.create(body, opts).withResponse();
@@ -97,7 +97,7 @@ export class Assistants extends ApiResource {
         const OAIclient = new OpenAI({
           apiKey: OPEN_AI_API_KEY,
           baseURL: this.client.baseURL,
-          defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
+          defaultHeaders: defaultHeadersBuilder(this.client),
         });
          // @ts-ignore
         const result = await OAIclient.beta.assistants.list(query, opts).withResponse();
@@ -121,7 +121,7 @@ export class Assistants extends ApiResource {
         const OAIclient = new OpenAI({
           apiKey: OPEN_AI_API_KEY,
           baseURL: this.client.baseURL,
-          defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
+          defaultHeaders: defaultHeadersBuilder(this.client),
         });
 
         const result = await OAIclient.beta.assistants.retrieve(assistantId, opts).withResponse();
@@ -147,7 +147,7 @@ export class Assistants extends ApiResource {
         const OAIclient = new OpenAI({
           apiKey: OPEN_AI_API_KEY,
           baseURL: this.client.baseURL,
-          defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
+          defaultHeaders: defaultHeadersBuilder(this.client),
         });
 
         const result = await OAIclient.beta.assistants.update(assistantId, body, opts).withResponse();
@@ -171,7 +171,7 @@ export class Assistants extends ApiResource {
         const OAIclient = new OpenAI({
           apiKey: OPEN_AI_API_KEY,
           baseURL: this.client.baseURL,
-          defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
+          defaultHeaders: defaultHeadersBuilder(this.client),
         });
 
         const result = await OAIclient.beta.assistants.del(assistantId, opts).withResponse();
@@ -202,7 +202,7 @@ export class Files extends ApiResource{
         const OAIclient = new OpenAI({
           apiKey: OPEN_AI_API_KEY,
           baseURL: this.client.baseURL,
-          defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
+          defaultHeaders: defaultHeadersBuilder(this.client),
         });
 
         const result = await OAIclient.beta.assistants.files.create(assistantId, body, opts).withResponse();
@@ -228,7 +228,7 @@ export class Files extends ApiResource{
         const OAIclient = new OpenAI({
           apiKey: OPEN_AI_API_KEY,
           baseURL: this.client.baseURL,
-          defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
+          defaultHeaders: defaultHeadersBuilder(this.client),
         });
         // @ts-ignore
         const result = await OAIclient.beta.assistants.files.list(assistantId, query, opts).withResponse();
@@ -253,7 +253,7 @@ export class Files extends ApiResource{
         const OAIclient = new OpenAI({
           apiKey: OPEN_AI_API_KEY,
           baseURL: this.client.baseURL,
-          defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
+          defaultHeaders: defaultHeadersBuilder(this.client),
         });
 
         const result = await OAIclient.beta.assistants.files.retrieve(assistantId, fileId, opts).withResponse();
@@ -278,7 +278,7 @@ export class Files extends ApiResource{
         const OAIclient = new OpenAI({
           apiKey: OPEN_AI_API_KEY,
           baseURL: this.client.baseURL,
-          defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
+          defaultHeaders: defaultHeadersBuilder(this.client),
         });
 
         const result = await OAIclient.beta.assistants.files.del(assistantId, fileId, opts).withResponse();

diff --git a/src/apis/files.ts b/src/apis/files.ts
@@ -2,7 +2,7 @@ import { ApiClientInterface } from "../_types/generalTypes";
 import { ApiResource } from "../apiResource";
 import { RequestOptions } from "../baseClient";
 import { OPEN_AI_API_KEY } from "../constants";
-import { finalResponse, overrideConfig } from "../utils";
+import { defaultHeadersBuilder, finalResponse, overrideConfig } from "../utils";
 import { createHeaders } from "./createHeaders";
 import OpenAI from "openai";
 
@@ -25,7 +25,7 @@ export class MainFiles extends ApiResource {
     const OAIclient = new OpenAI({
       apiKey: OPEN_AI_API_KEY,
       baseURL: this.client.baseURL,
-      defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
+      defaultHeaders: defaultHeadersBuilder(this.client),
     });
 
     // @ts-ignore
@@ -51,7 +51,7 @@ export class MainFiles extends ApiResource {
     const OAIclient = new OpenAI({
       apiKey: OPEN_AI_API_KEY,
       baseURL: this.client.baseURL,
-      defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
+      defaultHeaders: defaultHeadersBuilder(this.client),
     });
 
     const result = await OAIclient.files.list(query, opts).withResponse();
@@ -75,7 +75,7 @@ export class MainFiles extends ApiResource {
     const OAIclient = new OpenAI({
       apiKey: OPEN_AI_API_KEY,
       baseURL: this.client.baseURL,
-      defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
+      defaultHeaders: defaultHeadersBuilder(this.client),
     });
 
     const result = await OAIclient.files.retrieve(fileId, opts).withResponse();
@@ -99,7 +99,7 @@ export class MainFiles extends ApiResource {
     const OAIclient = new OpenAI({
       apiKey: OPEN_AI_API_KEY,
       baseURL: this.client.baseURL,
-      defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
+      defaultHeaders: defaultHeadersBuilder(this.client),
     });
 
     const result = await OAIclient.files.del(fileId, opts).withResponse();
@@ -123,7 +123,7 @@ export class MainFiles extends ApiResource {
     const OAIclient = new OpenAI({
       apiKey: OPEN_AI_API_KEY,
       baseURL: this.client.baseURL,
-      defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
+      defaultHeaders: defaultHeadersBuilder(this.client),
     });
 
     const result = await OAIclient.files.content(fileId, opts).withResponse();

diff --git a/src/apis/images.ts b/src/apis/images.ts
@@ -2,7 +2,7 @@ import { ApiClientInterface } from "../_types/generalTypes";
 import { ApiResource } from "../apiResource";
 import { RequestOptions } from "../baseClient";
 import { OPEN_AI_API_KEY } from "../constants";
-import { finalResponse, overrideConfig } from "../utils";
+import { defaultHeadersBuilder, finalResponse, overrideConfig } from "../utils";
 import { createHeaders } from "./createHeaders";
 import OpenAI from "openai";
 
@@ -66,7 +66,7 @@ export class Images extends ApiResource {
     const OAIclient = new OpenAI({
       apiKey: OPEN_AI_API_KEY,
       baseURL: this.client.baseURL,
-      defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
+      defaultHeaders: defaultHeadersBuilder(this.client),
     });
     // @ts-ignore
     const result = await OAIclient.images.generate(body, opts).withResponse();
@@ -91,7 +91,7 @@ export class Images extends ApiResource {
     const OAIclient = new OpenAI({
       apiKey: OPEN_AI_API_KEY,
       baseURL: this.client.baseURL,
-      defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
+      defaultHeaders: defaultHeadersBuilder(this.client),
     });
 
     // @ts-ignore
@@ -117,7 +117,7 @@ export class Images extends ApiResource {
     const OAIclient = new OpenAI({
       apiKey: OPEN_AI_API_KEY,
       baseURL: this.client.baseURL,
-      defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
+      defaultHeaders: defaultHeadersBuilder(this.client),
     });
     // @ts-ignore
     const result = await OAIclient.images.createVariation(body, opts).withResponse();

diff --git a/src/apis/models.ts b/src/apis/models.ts
@@ -2,7 +2,7 @@ import { ApiClientInterface } from "../_types/generalTypes";
 import { ApiResource } from "../apiResource";
 import { RequestOptions } from "../baseClient";
 import { OPEN_AI_API_KEY } from "../constants";
-import { finalResponse, overrideConfig } from "../utils";
+import { defaultHeadersBuilder, finalResponse, overrideConfig } from "../utils";
 import { createHeaders } from "./createHeaders";
 import OpenAI from "openai";
 
@@ -23,10 +23,7 @@ export class Models extends ApiResource {
     const OAIclient = new OpenAI({
       apiKey: OPEN_AI_API_KEY,
       baseURL: this.client.baseURL,
-      defaultHeaders: {
-        ...this.client.customHeaders,
-        ...this.client.portkeyHeaders,
-      },
+      defaultHeaders: defaultHeadersBuilder(this.client)
     });
 
     const result = await OAIclient.models.list(opts).withResponse();
@@ -50,10 +47,7 @@ export class Models extends ApiResource {
     const OAIclient = new OpenAI({
       apiKey: OPEN_AI_API_KEY,
       baseURL: this.client.baseURL,
-      defaultHeaders: {
-        ...this.client.customHeaders,
-        ...this.client.portkeyHeaders,
-      },
+      defaultHeaders: defaultHeadersBuilder(this.client),
     });
 
     const result = await OAIclient.models.retrieve(model, opts).withResponse();
@@ -77,10 +71,7 @@ export class Models extends ApiResource {
     const OAIclient = new OpenAI({
       apiKey: OPEN_AI_API_KEY,
       baseURL: this.client.baseURL,
-      defaultHeaders: {
-        ...this.client.customHeaders,
-        ...this.client.portkeyHeaders,
-      },
+      defaultHeaders: defaultHeadersBuilder(this.client),
     });
 
     const result = await OAIclient.models.del(model, opts).withResponse();