Merge pull request #99 from Portkey-AI/vertex/types

Vertex Changes
Portkey-AI · Sep 5, 2024 · fdea390 · fdea390
2 parents 952ffd1 + ea37289
commit fdea390
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/src/_types/generalTypes.ts b/src/_types/generalTypes.ts
@@ -28,6 +28,7 @@ export interface ApiClientInterface {
     forwardHeaders?: Array<string> | null | undefined;
     cacheNamespace?: string | null | undefined;
     requestTimeout?: number | null | undefined;
+    strictOpenAiCompliance?: boolean | null | undefined;
 }
 
 export interface APIResponseType {

diff --git a/src/apis/chatCompletions.ts b/src/apis/chatCompletions.ts
@@ -66,37 +66,43 @@ interface Usage {
     prompt_tokens?: number;
     completion_tokens?: number;
     total_tokens?: number;
+    [key: string]: any;
 }
 
 interface FunctionType {
     arguments?: string;
     name?: string;
+    [key: string]: any;
   }
 
 interface ToolCall {
     index?: number;
     id?: string;
     function?: FunctionType;
     type?: 'function';
+    [key: string]: any;
   }
 
 interface FunctionCall {
     arguments?: string;
     name?: string;
+    [key: string]: any;
   }
 
 interface Message {
     role: string;
     content: string | null;
     function_call?: FunctionCall;
     tool_calls?: Array<ToolCall>;
+    [key: string]: any;
 }
 
 interface Choices {
     index?: number;
     message?: Message;
     delta?: Message;
     finish_reason?: string;
+    [key: string]: any;
 }
 
 interface ChatCompletion extends APIResponseType {
@@ -106,4 +112,5 @@ interface ChatCompletion extends APIResponseType {
     model: string;
     choices: Array<Choices>;
     usage: Usage;
+    [key: string]: any;
 }
diff --git a/src/baseClient.ts b/src/baseClient.ts
@@ -120,10 +120,10 @@ export abstract class ApiClient {
     portkeyHeaders: Record<string, string>
 
     private fetch: Fetch;
-    constructor({ apiKey, baseURL, config, virtualKey, traceID, metadata, provider, Authorization, cacheForceRefresh, debug, customHost, openaiProject, openaiOrganization, awsSecretAccessKey, awsAccessKeyId, awsSessionToken, awsRegion, vertexProjectId, vertexRegion, workersAiAccountId, azureResourceName, azureDeploymentId, azureApiVersion, huggingfaceBaseUrl, forwardHeaders, cacheNamespace, requestTimeout }: ApiClientInterface) {
+    constructor({ apiKey, baseURL, config, virtualKey, traceID, metadata, provider, Authorization, cacheForceRefresh, debug, customHost, openaiProject, openaiOrganization, awsSecretAccessKey, awsAccessKeyId, awsSessionToken, awsRegion, vertexProjectId, vertexRegion, workersAiAccountId, azureResourceName, azureDeploymentId, azureApiVersion, huggingfaceBaseUrl, forwardHeaders, cacheNamespace, requestTimeout, strictOpenAiCompliance }: ApiClientInterface) {
         this.apiKey = apiKey ?? "";
         this.baseURL = baseURL ?? "";
-        this.customHeaders = createHeaders({ apiKey, config, virtualKey, traceID, metadata, provider, Authorization, cacheForceRefresh, debug, customHost, cacheNamespace, openaiProject, openaiOrganization, awsSecretAccessKey, awsAccessKeyId, awsSessionToken, awsRegion, vertexProjectId, vertexRegion, workersAiAccountId, azureResourceName, azureDeploymentId, azureApiVersion, huggingfaceBaseUrl, forwardHeaders, requestTimeout })
+        this.customHeaders = createHeaders({ apiKey, config, virtualKey, traceID, metadata, provider, Authorization, cacheForceRefresh, debug, customHost, cacheNamespace, openaiProject, openaiOrganization, awsSecretAccessKey, awsAccessKeyId, awsSessionToken, awsRegion, vertexProjectId, vertexRegion, workersAiAccountId, azureResourceName, azureDeploymentId, azureApiVersion, huggingfaceBaseUrl, forwardHeaders, requestTimeout, strictOpenAiCompliance })
         this.portkeyHeaders = this.defaultHeaders()
         this.fetch = fetch;
         this.responseHeaders = {}

diff --git a/src/client.ts b/src/client.ts
@@ -34,6 +34,7 @@ export class Portkey extends ApiClient {
 	forwardHeaders?: Array<string> | null | undefined;
 	requestTimeout?: number | null | undefined;
 	cacheNamespace?: string | null | undefined;
+	strictOpenAiCompliance?: boolean | null | undefined;
 	constructor({
 		apiKey = readEnv("PORTKEY_API_KEY") ?? null,
 		baseURL = readEnv("PORTKEY_BASE_URL") ?? null,
@@ -62,6 +63,7 @@ export class Portkey extends ApiClient {
 		forwardHeaders,
 		cacheNamespace,
 		requestTimeout,
+		strictOpenAiCompliance,
 	}: ApiClientInterface) {
 
 		super({
@@ -92,6 +94,7 @@ export class Portkey extends ApiClient {
 			huggingfaceBaseUrl,
 			forwardHeaders,
 			requestTimeout,
+			strictOpenAiCompliance,
 		});
 
 		this.apiKey = apiKey;
@@ -123,6 +126,7 @@ export class Portkey extends ApiClient {
 		this.huggingfaceBaseUrl = huggingfaceBaseUrl;
 		this.forwardHeaders = forwardHeaders;
 		this.requestTimeout = requestTimeout;
+		this.strictOpenAiCompliance = strictOpenAiCompliance;
 	}
 
 	completions: API.Completions = new API.Completions(this);