Skip to content

Commit

Permalink
fix: baseURL
Browse files Browse the repository at this point in the history
  • Loading branch information
@csgulati09
csgulati09 committed Mar 18, 2024
1 parent 20aeba7 commit ca4b93f
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 49 deletions.
20 changes: 10 additions & 10 deletions src/apis/assistants.ts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ApiClientInterface } from "../_types/generalTypes";
import { ApiResource } from "../apiResource";
import { RequestOptions } from "../baseClient";
import { OPEN_AI_API_KEY, PORTKEY_BASE_URL } from "../constants";
import { OPEN_AI_API_KEY } from "../constants";
import { finalResponse, overrideConfig } from "../utils";
import { createHeaders } from "./createHeaders";
import OpenAI from "openai";
Expand Down Expand Up @@ -71,7 +71,7 @@ export class Assistants extends ApiResource {

const OAIclient = new OpenAI({
apiKey: OPEN_AI_API_KEY,
baseURL: PORTKEY_BASE_URL,
baseURL: this.client.baseURL,
defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
});

Expand All @@ -96,7 +96,7 @@ export class Assistants extends ApiResource {

const OAIclient = new OpenAI({
apiKey: OPEN_AI_API_KEY,
baseURL: PORTKEY_BASE_URL,
baseURL: this.client.baseURL,
defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
});

Expand All @@ -120,7 +120,7 @@ export class Assistants extends ApiResource {

const OAIclient = new OpenAI({
apiKey: OPEN_AI_API_KEY,
baseURL: PORTKEY_BASE_URL,
baseURL: this.client.baseURL,
defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
});

Expand All @@ -146,7 +146,7 @@ export class Assistants extends ApiResource {

const OAIclient = new OpenAI({
apiKey: OPEN_AI_API_KEY,
baseURL: PORTKEY_BASE_URL,
baseURL: this.client.baseURL,
defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
});

Expand All @@ -170,7 +170,7 @@ export class Assistants extends ApiResource {

const OAIclient = new OpenAI({
apiKey: OPEN_AI_API_KEY,
baseURL: PORTKEY_BASE_URL,
baseURL: this.client.baseURL,
defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
});

Expand Down Expand Up @@ -201,7 +201,7 @@ export class Files extends ApiResource{

const OAIclient = new OpenAI({
apiKey: OPEN_AI_API_KEY,
baseURL: PORTKEY_BASE_URL,
baseURL: this.client.baseURL,
defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
});

Expand All @@ -227,7 +227,7 @@ export class Files extends ApiResource{

const OAIclient = new OpenAI({
apiKey: OPEN_AI_API_KEY,
baseURL: PORTKEY_BASE_URL,
baseURL: this.client.baseURL,
defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
});

Expand All @@ -252,7 +252,7 @@ export class Files extends ApiResource{

const OAIclient = new OpenAI({
apiKey: OPEN_AI_API_KEY,
baseURL: PORTKEY_BASE_URL,
baseURL: this.client.baseURL,
defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
});

Expand All @@ -277,7 +277,7 @@ export class Files extends ApiResource{

const OAIclient = new OpenAI({
apiKey: OPEN_AI_API_KEY,
baseURL: PORTKEY_BASE_URL,
baseURL: this.client.baseURL,
defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
});

Expand Down
12 changes: 6 additions & 6 deletions src/apis/files.ts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ApiClientInterface } from "../_types/generalTypes";
import { ApiResource } from "../apiResource";
import { RequestOptions } from "../baseClient";
import { OPEN_AI_API_KEY, PORTKEY_BASE_URL } from "../constants";
import { OPEN_AI_API_KEY } from "../constants";
import { finalResponse, overrideConfig } from "../utils";
import { createHeaders } from "./createHeaders";
import OpenAI from "openai";
Expand All @@ -24,7 +24,7 @@ export class MainFiles extends ApiResource {

const OAIclient = new OpenAI({
apiKey: OPEN_AI_API_KEY,
baseURL: PORTKEY_BASE_URL,
baseURL: this.client.baseURL,
defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
});

Expand All @@ -49,7 +49,7 @@ export class MainFiles extends ApiResource {

const OAIclient = new OpenAI({
apiKey: OPEN_AI_API_KEY,
baseURL: PORTKEY_BASE_URL,
baseURL: this.client.baseURL,
defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
});

Expand All @@ -73,7 +73,7 @@ export class MainFiles extends ApiResource {

const OAIclient = new OpenAI({
apiKey: OPEN_AI_API_KEY,
baseURL: PORTKEY_BASE_URL,
baseURL: this.client.baseURL,
defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
});

Expand All @@ -97,7 +97,7 @@ export class MainFiles extends ApiResource {

const OAIclient = new OpenAI({
apiKey: OPEN_AI_API_KEY,
baseURL: PORTKEY_BASE_URL,
baseURL: this.client.baseURL,
defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
});

Expand All @@ -121,7 +121,7 @@ export class MainFiles extends ApiResource {

const OAIclient = new OpenAI({
apiKey: OPEN_AI_API_KEY,
baseURL: PORTKEY_BASE_URL,
baseURL: this.client.baseURL,
defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
});

Expand Down
8 changes: 4 additions & 4 deletions src/apis/images.ts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ApiClientInterface } from "../_types/generalTypes";
import { ApiResource } from "../apiResource";
import { RequestOptions } from "../baseClient";
import { OPEN_AI_API_KEY, PORTKEY_BASE_URL } from "../constants";
import { OPEN_AI_API_KEY } from "../constants";
import { finalResponse, overrideConfig } from "../utils";
import { createHeaders } from "./createHeaders";
import OpenAI from "openai";
Expand Down Expand Up @@ -65,7 +65,7 @@ export class Images extends ApiResource {

const OAIclient = new OpenAI({
apiKey: OPEN_AI_API_KEY,
baseURL: PORTKEY_BASE_URL,
baseURL: this.client.baseURL,
defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
});

Expand All @@ -90,7 +90,7 @@ export class Images extends ApiResource {

const OAIclient = new OpenAI({
apiKey: OPEN_AI_API_KEY,
baseURL: PORTKEY_BASE_URL,
baseURL: this.client.baseURL,
defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
});

Expand All @@ -115,7 +115,7 @@ export class Images extends ApiResource {

const OAIclient = new OpenAI({
apiKey: OPEN_AI_API_KEY,
baseURL: PORTKEY_BASE_URL,
baseURL: this.client.baseURL,
defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
});

Expand Down
31 changes: 22 additions & 9 deletions src/apis/models.ts
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
import { ApiClientInterface } from "../_types/generalTypes";
import { ApiResource } from "../apiResource";
import { RequestOptions } from "../baseClient";
import { OPEN_AI_API_KEY, PORTKEY_BASE_URL } from "../constants";
import { OPEN_AI_API_KEY } from "../constants";
import { finalResponse, overrideConfig } from "../utils";
import { createHeaders } from "./createHeaders";
import OpenAI from "openai";

export class Models extends ApiResource {
async list(params?: ApiClientInterface, opts?: RequestOptions): Promise<any> {
async list(
_body: any,
params?: ApiClientInterface,
opts?: RequestOptions
): Promise<any> {
if (params) {
const config = overrideConfig(this.client.config, params.config);
this.client.customHeaders = {
Expand All @@ -18,12 +22,15 @@ export class Models extends ApiResource {

const OAIclient = new OpenAI({
apiKey: OPEN_AI_API_KEY,
baseURL: PORTKEY_BASE_URL,
defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
baseURL: this.client.baseURL,
defaultHeaders: {
...this.client.customHeaders,
...this.client.portkeyHeaders,
},
});

const result = await OAIclient.models.list(opts).withResponse();

return finalResponse(result);
}

Expand All @@ -42,8 +49,11 @@ export class Models extends ApiResource {

const OAIclient = new OpenAI({
apiKey: OPEN_AI_API_KEY,
baseURL: PORTKEY_BASE_URL,
defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
baseURL: this.client.baseURL,
defaultHeaders: {
...this.client.customHeaders,
...this.client.portkeyHeaders,
},
});

const result = await OAIclient.models.retrieve(model, opts).withResponse();
Expand All @@ -66,8 +76,11 @@ export class Models extends ApiResource {

const OAIclient = new OpenAI({
apiKey: OPEN_AI_API_KEY,
baseURL: PORTKEY_BASE_URL,
defaultHeaders: {...this.client.customHeaders, ...this.client.portkeyHeaders},
baseURL: this.client.baseURL,
defaultHeaders: {
...this.client.customHeaders,
...this.client.portkeyHeaders,
},
});

const result = await OAIclient.models.del(model, opts).withResponse();
Expand Down
Loading

0 comments on commit ca4b93f

Please sign in to comment.