langchain 0.0.132 → 0.0.133

package/dist/util/googlevertexai-connection.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GoogleVertexAIConnection = void 0;
+exports.GoogleVertexAILLMConnection = exports.GoogleVertexAIConnection = void 0;
 const google_auth_library_1 = require("google-auth-library");
 class GoogleVertexAIConnection {
     constructor(fields, caller) {
@@ -22,11 +22,11 @@ class GoogleVertexAIConnection {
             writable: true,
             value: "us-central1"
         });
-        Object.defineProperty(this, "model", {
+        Object.defineProperty(this, "apiVersion", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: "v1"
         });
         Object.defineProperty(this, "auth", {
             enumerable: true,
@@ -37,31 +37,65 @@ class GoogleVertexAIConnection {
         this.caller = caller;
         this.endpoint = fields?.endpoint ?? this.endpoint;
         this.location = fields?.location ?? this.location;
-        this.model = fields?.model ?? this.model;
+        this.apiVersion = fields?.apiVersion ?? this.apiVersion;
         this.auth = new google_auth_library_1.GoogleAuth({
             scopes: "https://www.googleapis.com/auth/cloud-platform",
             ...fields?.authOptions,
         });
     }
-    async request(instances, parameters, options) {
+    buildMethod() {
+        return "POST";
+    }
+    async _request(data, options) {
         const client = await this.auth.getClient();
-        const projectId = await this.auth.getProjectId();
-        const url = `https://${this.endpoint}/v1/projects/${projectId}/locations/${this.location}/publishers/google/models/${this.model}:predict`;
-        const method = "POST";
-        const data = {
-            instances,
-            parameters,
-        };
+        const url = await this.buildUrl();
+        const method = this.buildMethod();
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const opts = {
             url,
             method,
-            data,
         };
+        if (data && method === "POST") {
+            opts.data = data;
+        }
         async function _request() {
             return client.request(opts);
         }
-        const response = await this.caller.callWithOptions({ signal: options.signal }, _request.bind(client));
-        return response;
+        try {
+            const callResponse = await this.caller.callWithOptions({ signal: options?.signal }, _request.bind(client));
+            const response = callResponse; // Done for typecast safety, I guess
+            return response;
+        }
+        catch (x) {
+            console.error(JSON.stringify(x, null, 1));
+            throw x;
+        }
     }
 }
 exports.GoogleVertexAIConnection = GoogleVertexAIConnection;
+class GoogleVertexAILLMConnection extends GoogleVertexAIConnection {
+    constructor(fields, caller) {
+        super(fields, caller);
+        Object.defineProperty(this, "model", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.model = fields?.model ?? this.model;
+    }
+    async buildUrl() {
+        const projectId = await this.auth.getProjectId();
+        const url = `https://${this.endpoint}/v1/projects/${projectId}/locations/${this.location}/publishers/google/models/${this.model}:predict`;
+        return url;
+    }
+    async request(instances, parameters, options) {
+        const data = {
+            instances,
+            parameters,
+        };
+        const response = await this._request(data, options);
+        return response;
+    }
+}
+exports.GoogleVertexAILLMConnection = GoogleVertexAILLMConnection;

package/dist/util/googlevertexai-connection.d.ts

@@ -1,13 +1,21 @@
 import { GoogleAuth } from "google-auth-library";
 import { BaseLanguageModelCallOptions } from "../base_language/index.js";
-import { AsyncCaller } from "./async_caller.js";
-import { GoogleVertexAIBasePrediction, GoogleVertexAIConnectionParams, GoogleVertexAILLMResponse, GoogleVertexAIModelParams } from "../types/googlevertexai-types.js";
-export declare class GoogleVertexAIConnection<CallOptions extends BaseLanguageModelCallOptions, InstanceType, PredictionType extends GoogleVertexAIBasePrediction> implements GoogleVertexAIConnectionParams {
+import { AsyncCaller, AsyncCallerCallOptions } from "./async_caller.js";
+import { GoogleVertexAIBaseLLMInput, GoogleVertexAIBasePrediction, GoogleVertexAIConnectionParams, GoogleVertexAILLMResponse, GoogleVertexAIModelParams, GoogleVertexAIResponse } from "../types/googlevertexai-types.js";
+export declare abstract class GoogleVertexAIConnection<CallOptions extends AsyncCallerCallOptions, ResponseType extends GoogleVertexAIResponse> implements GoogleVertexAIConnectionParams {
     caller: AsyncCaller;
     endpoint: string;
     location: string;
-    model: string;
+    apiVersion: string;
     auth: GoogleAuth;
     constructor(fields: GoogleVertexAIConnectionParams | undefined, caller: AsyncCaller);
+    abstract buildUrl(): Promise<string>;
+    buildMethod(): string;
+    _request(data: unknown | undefined, options: CallOptions): Promise<ResponseType>;
+}
+export declare class GoogleVertexAILLMConnection<CallOptions extends BaseLanguageModelCallOptions, InstanceType, PredictionType extends GoogleVertexAIBasePrediction> extends GoogleVertexAIConnection<CallOptions, PredictionType> implements GoogleVertexAIBaseLLMInput {
+    model: string;
+    constructor(fields: GoogleVertexAIBaseLLMInput | undefined, caller: AsyncCaller);
+    buildUrl(): Promise<string>;
     request(instances: InstanceType[], parameters: GoogleVertexAIModelParams, options: CallOptions): Promise<GoogleVertexAILLMResponse<PredictionType>>;
 }

package/dist/util/googlevertexai-connection.js

@@ -19,11 +19,11 @@ export class GoogleVertexAIConnection {
             writable: true,
             value: "us-central1"
         });
-        Object.defineProperty(this, "model", {
+        Object.defineProperty(this, "apiVersion", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: "v1"
         });
         Object.defineProperty(this, "auth", {
             enumerable: true,
@@ -34,30 +34,63 @@ export class GoogleVertexAIConnection {
         this.caller = caller;
         this.endpoint = fields?.endpoint ?? this.endpoint;
         this.location = fields?.location ?? this.location;
-        this.model = fields?.model ?? this.model;
+        this.apiVersion = fields?.apiVersion ?? this.apiVersion;
         this.auth = new GoogleAuth({
             scopes: "https://www.googleapis.com/auth/cloud-platform",
             ...fields?.authOptions,
         });
     }
-    async request(instances, parameters, options) {
+    buildMethod() {
+        return "POST";
+    }
+    async _request(data, options) {
         const client = await this.auth.getClient();
-        const projectId = await this.auth.getProjectId();
-        const url = `https://${this.endpoint}/v1/projects/${projectId}/locations/${this.location}/publishers/google/models/${this.model}:predict`;
-        const method = "POST";
-        const data = {
-            instances,
-            parameters,
-        };
+        const url = await this.buildUrl();
+        const method = this.buildMethod();
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const opts = {
             url,
             method,
-            data,
         };
+        if (data && method === "POST") {
+            opts.data = data;
+        }
         async function _request() {
             return client.request(opts);
         }
-        const response = await this.caller.callWithOptions({ signal: options.signal }, _request.bind(client));
+        try {
+            const callResponse = await this.caller.callWithOptions({ signal: options?.signal }, _request.bind(client));
+            const response = callResponse; // Done for typecast safety, I guess
+            return response;
+        }
+        catch (x) {
+            console.error(JSON.stringify(x, null, 1));
+            throw x;
+        }
+    }
+}
+export class GoogleVertexAILLMConnection extends GoogleVertexAIConnection {
+    constructor(fields, caller) {
+        super(fields, caller);
+        Object.defineProperty(this, "model", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.model = fields?.model ?? this.model;
+    }
+    async buildUrl() {
+        const projectId = await this.auth.getProjectId();
+        const url = `https://${this.endpoint}/v1/projects/${projectId}/locations/${this.location}/publishers/google/models/${this.model}:predict`;
+        return url;
+    }
+    async request(instances, parameters, options) {
+        const data = {
+            instances,
+            parameters,
+        };
+        const response = await this._request(data, options);
         return response;
     }
 }