fix: merge conflicts

package.json

@@ -1,6 +1,6 @@
 {
   "name": "portkey-ai",
-  "version": "1.4.0-rc.1",
+  "version": "1.4.0",
   "description": "Node client library for the Portkey API",
   "types": "dist/src/index.d.ts",
   "main": "dist/src/index.js",

src/_types/generalTypes.ts

@@ -29,6 +29,7 @@ export interface ApiClientInterface {
     cacheNamespace?: string | null | undefined;
     requestTimeout?: number | null | undefined;
     strictOpenAiCompliance?: boolean | null | undefined;
+    anthropicBeta?: string | null | undefined;
 }
 
 export interface APIResponseType {

src/apis/betaChat.ts

@@ -13,7 +13,7 @@ import {
   ChatCompletionStreamingToolRunnerParams,
 } from "openai/lib/ChatCompletionStreamingRunner";
 import { ChatCompletionParseParams } from "openai/resources/beta/chat/completions";
-import { ExtractParsedContentFromParams } from "openai/lib/parser";
+
 
 export class BetaChat extends ApiResource {
   completions: Completions;
@@ -26,7 +26,7 @@ export class BetaChat extends ApiResource {
 
 export class Completions extends ApiResource {
 
-  async parse<Params extends ChatCompletionParseParams, ParsedT = ExtractParsedContentFromParams<Params>>
+  async parse<Params extends ChatCompletionParseParams>
   (
     _body: Params,
     params?: ApiClientInterface,

src/apis/chatCompletions.ts

@@ -71,12 +71,6 @@ interface Usage {
     [key: string]: any;
 }
 
-interface FunctionType {
-    arguments?: string;
-    name?: string;
-    [key: string]: any;
-  }
-
 interface Message {
     role: string;
     content: string;

src/apis/moderations.ts

@@ -1,10 +1,13 @@
-import { ModerationCreateParams } from "openai/resources";
 import { ApiClientInterface } from "../_types/generalTypes";
 import { ApiResource } from "../apiResource";
 import { RequestOptions } from "../baseClient";
 import { finalResponse, initOpenAIClient, overrideConfig } from "../utils";
 import { createHeaders } from "./createHeaders";
 
+export interface ModerationCreateParams {
+    input: string | Array<string>;
+    model?: any ;
+}
 
 export class Moderations extends ApiResource{
     async create(_body: ModerationCreateParams,

src/apis/uploads.ts

@@ -3,9 +3,12 @@ import { ApiResource } from "../apiResource";
 import { RequestOptions } from "../baseClient";
 import { finalResponse, initOpenAIClient, overrideConfig } from "../utils";
 import { createHeaders } from "./createHeaders";
-import { UploadCompleteParams } from "openai/resources";
 import { Uploadable } from "openai/uploads";
 
+export interface UploadCompleteParams {
+  part_ids: Array<string>;
+ md5?: string;
+}
 export class Uploads extends ApiResource {
   parts: Parts 
 

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, strictOpenAiCompliance }: 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, anthropicBeta }: 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, strictOpenAiCompliance })
+        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, anthropicBeta })
         this.portkeyHeaders = this.defaultHeaders()
         this.fetch = fetch;
         this.responseHeaders = {}

src/client.ts

@@ -35,6 +35,7 @@ export class Portkey extends ApiClient {
 	requestTimeout?: number | null | undefined;
 	cacheNamespace?: string | null | undefined;
 	strictOpenAiCompliance?: boolean | null | undefined;
+	anthropicBeta?: string | null | undefined;
 	constructor({
 		apiKey = readEnv("PORTKEY_API_KEY") ?? null,
 		baseURL = readEnv("PORTKEY_BASE_URL") ?? null,
@@ -64,6 +65,7 @@ export class Portkey extends ApiClient {
 		cacheNamespace,
 		requestTimeout,
 		strictOpenAiCompliance,
+		anthropicBeta,
 	}: ApiClientInterface) {
 
 		super({
@@ -95,6 +97,7 @@ export class Portkey extends ApiClient {
 			forwardHeaders,
 			requestTimeout,
 			strictOpenAiCompliance,
+			anthropicBeta,
 		});
 
 		this.apiKey = apiKey;
@@ -127,6 +130,7 @@ export class Portkey extends ApiClient {
 		this.forwardHeaders = forwardHeaders;
 		this.requestTimeout = requestTimeout;
 		this.strictOpenAiCompliance = strictOpenAiCompliance;
+		this.anthropicBeta = anthropicBeta;
 	}
 
 	completions: API.Completions = new API.Completions(this);

src/version.ts

@@ -1 +1 @@
-export const VERSION = "1.4.0-rc.1";
+export const VERSION = "1.4.0";