@cellaware/utils 6.2.0 → 7.0.1

package/dist/llm/chain-store.d.ts

@@ -5,7 +5,7 @@ import { ModelName, ModelOptions } from './model.js';
  * output key is allowed. Output key is defaulted to `answer`.
  */
 export declare class SingleActionChain extends BaseChain {
-    private name;
+    private _name;
     private llm;
     private _inputKeys;
     private _outputKey;
@@ -43,7 +43,7 @@ export declare class ChainStore {
      */
     addChain(name: string, template: string | null, options: ModelOptions, verbose?: boolean): void;
     addExistingChain(chain: SingleActionChain): void;
-    callChain(name: string, args: any, tokenUsages: any[]): Promise<import("langchain/dist/schema/index.js").ChainValues>;
+    callChain(name: string, args: any, tokenUsages: any[]): Promise<import("@langchain/core/utils/types.js").ChainValues>;
     translate(statement: string, language: string, tokenUsages?: any[]): Promise<string>;
     getPrompts(): string;
 }

package/dist/llm/chain-store.js

@@ -1,7 +1,8 @@
 import fs from 'fs';
-import { ChatOpenAI } from 'langchain/chat_models/openai';
-import { PromptTemplate } from 'langchain/prompts';
-import { LLMChain, BaseChain } from 'langchain/chains';
+import { BaseChain } from 'langchain/chains';
+import { ChatPromptTemplate } from "@langchain/core/prompts";
+import { ChatOpenAI } from "@langchain/openai";
+import { StringOutputParser } from "@langchain/core/output_parsers";
 import { getLLMTransactionCost } from './cost.js';
 const CHAIN_TIMEOUT_MS = 150_000;
 const TRANSLATION_CHAIN_NAME = 'translation_chain';
@@ -12,7 +13,7 @@ const TRANSLATION_CHAIN_NAME = 'translation_chain';
 export class SingleActionChain extends BaseChain {
     constructor(fields, name, inputKeys) {
         super(fields);
-        Object.defineProperty(this, "name", {
+        Object.defineProperty(this, "_name", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -51,36 +52,32 @@ export class SingleActionChain extends BaseChain {
         if (inputKeys.length == 0) {
             throw new Error(`SINGLE_ACTION_CHAIN: Chain '${name}' needs at least one input key!`);
         }
-        this.name = name;
+        this._name = name;
         this.llm = fields.llm;
         this._inputKeys = inputKeys;
         this._outputKey = 'answer';
         this.prompt = fields.prompt;
-        this.promptTemplate = new PromptTemplate({
-            template: fields.prompt,
-            inputVariables: this.inputKeys
-        });
+        this.promptTemplate = ChatPromptTemplate.fromTemplate(this.prompt);
     }
     async _call(values, runManager) {
         let output = {
             [this._outputKey]: ''
         };
-        const llmChain = new LLMChain({
-            prompt: this.promptTemplate,
-            llm: this.llm,
-            outputKey: this._outputKey,
-            memory: this.memory,
-        });
+        const llmChain = this.promptTemplate
+            .pipe(this.llm)
+            .pipe(new StringOutputParser());
         let llmInputs = {};
         for (const inputKey of this._inputKeys) {
             llmInputs[inputKey] = values[inputKey];
         }
-        const llmAnswer = await llmChain.predict(llmInputs, runManager?.getChild());
+        const llmAnswer = await llmChain.invoke(llmInputs, {
+            callbacks: runManager ? [runManager.getChild()] : undefined,
+        });
         output[this._outputKey] = llmAnswer;
         return output;
     }
     _chainType() {
-        return this.name;
+        return this._name;
     }
     get inputKeys() {
         return this._inputKeys;
@@ -233,13 +230,17 @@ Your translation here:
                 throw new Error(`CHAIN_STORE: Input key '${inputKey}' not present for chain '${chain._chainType()}'`);
             }
         }
-        return chain.call(args, [
-            {
-                handleLLMEnd: async (cbOutput) => {
-                    tokenUsages.push(ChainStore.getTokenUsage(chain._chainType(), chain.getModelName(), cbOutput.llmOutput?.tokenUsage));
-                },
-            }
-        ]);
+        return chain.invoke(args, {
+            callbacks: [
+                {
+                    handleLLMEnd: async (output) => {
+                        console.log(output);
+                        const usage = output?.llmOutput?.tokenUsage;
+                        tokenUsages.push(ChainStore.getTokenUsage(chain._chainType(), chain.getModelName(), usage));
+                    },
+                }
+            ]
+        });
     }
     async translate(statement, language, tokenUsages) {
         // No need to translate if requested language is in default language.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cellaware/utils",
-    "version": "6.2.0",
+    "version": "7.0.1",
     "description": "Cellaware Utilities for Node.js",
     "author": "Cellaware Technologies",
     "type": "module",
@@ -21,7 +21,7 @@
         "@azure/functions": "^4.5.1",
         "@azure/storage-blob": "^12.16.0",
         "dotenv": "^16.3.1",
-        "langchain": "^0.0.170"
+        "langchain": "^0.2.19"
     },
     "devDependencies": {
         "typescript": "^5.3.2"