Merge pull request #193 from llm-tools/confluence_updates

Updates

Author: adhityan

core/embedjs-interfaces/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@llm-tools/embedjs-interfaces",
-    "version": "0.1.26",
+    "version": "0.1.27",
     "description": "Interfaces for extending the embedjs ecosystem",
     "dependencies": {
         "@langchain/core": "^0.3.26",

core/embedjs-interfaces/src/interfaces/base-loader.ts

@@ -4,6 +4,7 @@ import { EventEmitter } from 'node:events';
 
 import { BaseStore } from './base-store.js';
 import { LoaderChunk, UnfilteredLoaderChunk } from '../types.js';
+import { BaseModel } from './base-model.js';
 
 export abstract class BaseLoader<
     MetadataTemplate extends Record<string, string | number | boolean> = Record<string, string | number | boolean>,
@@ -39,13 +40,16 @@ export abstract class BaseLoader<
         createDebugMessages('embedjs:loader:BaseLoader')(`New loader class initalized with key ${uniqueId}`);
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-empty-function
-    public async init(): Promise<void> {}
-
     public getUniqueId(): string {
         return this.uniqueId;
     }
 
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    public async init(): Promise<void> {}
+
+    // eslint-disable-next-line @typescript-eslint/no-empty-function, @typescript-eslint/no-unused-vars
+    public injectModel(_model: BaseModel) {}
+
     private async recordLoaderInCache(chunksProcessed: number) {
         if (!BaseLoader.store) return;
 

core/embedjs-interfaces/src/interfaces/base-model.ts

@@ -135,5 +135,17 @@ export abstract class BaseModel {
         };
     }
 
+    public async simpleQuery(messages: (AIMessage | SystemMessage | HumanMessage)[]) {
+        const response = await this.runQuery(messages);
+
+        return {
+            result: response.result,
+            tokenUse: {
+                inputTokens: response.tokenUse?.inputTokens ?? 'UNKNOWN',
+                outputTokens: response.tokenUse?.outputTokens ?? 'UNKNOWN',
+            },
+        };
+    }
+
     protected abstract runQuery(messages: (AIMessage | SystemMessage | HumanMessage)[]): Promise<ModelResponse>;
 }

core/embedjs-utils/package.json

@@ -1,9 +1,9 @@
 {
     "name": "@llm-tools/embedjs-utils",
-    "version": "0.1.26",
+    "version": "0.1.27",
     "description": "Useful util functions when extending the embedjs ecosystem",
     "dependencies": {
-        "@llm-tools/embedjs-interfaces": "0.1.26"
+        "@llm-tools/embedjs-interfaces": "0.1.27"
     },
     "type": "module",
     "main": "./src/index.js",

core/embedjs-utils/src/util/stream.ts

@@ -1,6 +1,6 @@
 import { Stream } from 'stream';
 
-export async function stream2buffer(stream: Stream): Promise<Buffer> {
+export async function streamToBuffer(stream: Stream): Promise<Buffer> {
     return new Promise<Buffer>((resolve, reject) => {
         const _buf = Array<Uint8Array>();
 
@@ -10,6 +10,16 @@ export async function stream2buffer(stream: Stream): Promise<Buffer> {
     });
 }
 
+export async function streamToString(stream: Stream): Promise<string> {
+    return new Promise((resolve, reject) => {
+        const chunks = [];
+
+        stream.on('data', (chunk) => chunks.push(Buffer.from(chunk)));
+        stream.on('end', () => resolve(Buffer.concat(chunks).toString('utf8')));
+        stream.on('error', (err) => reject(`error converting stream - ${err}`));
+    });
+}
+
 export function contentTypeToMimeType(contentType: string) {
     if (!contentType) return contentType;
     if (contentType.includes(';')) return contentType.split(';')[0];

core/embedjs/package.json

@@ -1,12 +1,12 @@
 {
     "type": "module",
     "name": "@llm-tools/embedjs",
-    "version": "0.1.26",
+    "version": "0.1.27",
     "description": "A NodeJS RAG framework to easily work with LLMs and custom datasets",
     "dependencies": {
         "@langchain/textsplitters": "^0.1.0",
-        "@llm-tools/embedjs-interfaces": "0.1.26",
-        "@llm-tools/embedjs-utils": "0.1.26",
+        "@llm-tools/embedjs-interfaces": "0.1.27",
+        "@llm-tools/embedjs-utils": "0.1.27",
         "debug": "^4.4.0",
         "langchain": "^0.3.8",
         "md5": "^2.3.0",

core/embedjs/src/core/rag-application.ts

@@ -164,6 +164,7 @@ export class RAGApplication {
     private async _addLoader(loader: BaseLoader, forceReload: boolean): Promise<AddLoaderReturn> {
         const uniqueId = loader.getUniqueId();
         this.debug('Exploring loader', uniqueId);
+        if (this.model) loader.injectModel(this.model);
 
         if (this.store && (await this.store.hasLoaderMetadata(uniqueId))) {
             if (forceReload) {

core/embedjs/src/util/mime.ts

@@ -99,6 +99,15 @@ export async function createLoaderFromMimeType(loaderData: string, mimeType: str
             createDebugMessages('embedjs:util:createLoaderFromMimeType')('Dynamically imported MarkdownLoader');
             return new MarkdownLoader({ filePathOrUrl: loaderData });
         }
+        case 'image/png':
+        case 'image/jpeg': {
+            const { ImageLoader } = await import('@llm-tools/embedjs-loader-image').catch(() => {
+                throw new Error('Package `@llm-tools/embedjs-loader-image` needs to be installed to load images');
+            });
+            createDebugMessages('embedjs:util:createLoaderFromMimeType')('Dynamically imported ImageLoader');
+            return new ImageLoader({ filePathOrUrl: loaderData, mime: mimeType });
+        }
+
         case undefined:
             throw new Error(`MIME type could not be detected. Please file an issue if you think this is a bug.`);
         default:

databases/embedjs-astra/package.json

@@ -1,10 +1,10 @@
 {
     "name": "@llm-tools/embedjs-astradb",
-    "version": "0.1.26",
+    "version": "0.1.27",
     "description": "Add AstraDB support to embedjs",
     "dependencies": {
         "@datastax/astra-db-ts": "^1.5.0",
-        "@llm-tools/embedjs-interfaces": "0.1.26",
+        "@llm-tools/embedjs-interfaces": "0.1.27",
         "debug": "^4.4.0"
     },
     "type": "module",

databases/embedjs-cosmos/package.json

@@ -1,10 +1,10 @@
 {
     "name": "@llm-tools/embedjs-cosmos",
-    "version": "0.1.26",
+    "version": "0.1.27",
     "description": "Add CosmosDB support to embedjs",
     "dependencies": {
         "@azure/cosmos": "^4.2.0",
-        "@llm-tools/embedjs-interfaces": "0.1.26",
+        "@llm-tools/embedjs-interfaces": "0.1.27",
         "debug": "^4.4.0"
     },
     "type": "module",