@rws-framework/ai-tools 3.2.4 → 3.2.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rws-framework/ai-tools",
   "private": false,
-  "version": "3.2.4",
+  "version": "3.2.6",
   "description": "",
   "main": "src/index.ts",
   "scripts": {},

package/src/services/LangChainEmbeddingService.ts

@@ -63,10 +63,7 @@ export class LangChainEmbeddingService {
             const rateLimitingCfg = {...OpenAIRateLimitingService.DEFAULT_CONFIG, ...this.config.rateLimiting};
 
             this.rateLimitingService.initialize(this.config.model || 'text-embedding-3-large', rateLimitingCfg);
-            console.log('Inintialized rate limiting with config:', rateLimitingCfg);
         }     
-
-        console.log(`Initialized ${this.config.provider} embeddings with model ${this.config.model}`);
     }
 
     private initializeTextSplitter(chunkConfig?: IChunkConfig): void {
@@ -126,8 +123,6 @@ export class LangChainEmbeddingService {
         const maxTokens = this.chunkConfig?.chunkSize || 450; // Safe token limit for embedding models
         const overlap = this.chunkConfig?.chunkOverlap || 50; // Character overlap, not token
         
-        console.log('[LCEmbeddingService] Chunking with:', this.chunkConfig);
-
         return TextChunker.chunkText(text, maxTokens, overlap);
     }
 

package/src/services/OpenAIRateLimitingService.ts

@@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common';
 import PQueue from 'p-queue';
 import { IBatchMetadata, IRateLimitConfig } from '../types/rag.types';
 import tiktoken from 'tiktoken';
+import { BlackLogger } from '@rws-framework/server/nest';
 
 let encoding_for_model: any = null;
 encoding_for_model = tiktoken.encoding_for_model
@@ -21,6 +22,8 @@ export class OpenAIRateLimitingService {
     private queue: PQueue;
     private config: Required<IRateLimitConfig>;
 
+    private logger = new BlackLogger(OpenAIRateLimitingService.name);
+
     constructor() {
         this.config = { ...OpenAIRateLimitingService.DEFAULT_CONFIG };
         this.queue = new PQueue({ concurrency: this.config.concurrency });
@@ -42,7 +45,7 @@ export class OpenAIRateLimitingService {
                 this.tokenizer = null;
             }
         } catch (e) {
-            console.warn(`Could not load tokenizer for model ${model}, using character-based estimation`);
+            this.logger.warn(`Could not load tokenizer for model ${model}, using character-based estimation`);
             this.tokenizer = null;
         }
 
@@ -96,7 +99,7 @@ export class OpenAIRateLimitingService {
                             // Shrink batch if >1 and retry quickly (binary shrink)
                             if (attemptBatch.length <= 1) throw err;
                             attemptBatch = attemptBatch.slice(0, Math.ceil(attemptBatch.length / 2));
-                            console.log(`Rate limit hit, shrinking batch to ${attemptBatch.length} items`);
+                            this.logger.debug(`Rate limit hit, shrinking batch to ${attemptBatch.length} items`);
                             // Small sleep to avoid immediate retry stampede
                             await this.sleep(200 + Math.random() * 200);
                             continue;
@@ -179,7 +182,7 @@ export class OpenAIRateLimitingService {
             const delay = Math.min(60_000, this.config.baseBackoffMs * (2 ** attempt));
             const jitter = Math.random() * 300;
 
-            console.log(`Retrying request in ${delay + jitter}ms (attempt ${attempt + 1}/${this.config.maxRetries})`);
+            this.logger.warn(`Retrying request in ${delay + jitter}ms (attempt ${attempt + 1}/${this.config.maxRetries})`);
             await this.sleep(delay + jitter);
 
             return this.callWithRetry(fn, attempt + 1);

package/src/types/IPrompt.ts

@@ -128,15 +128,18 @@ interface IRWSPromptJSON {
 
 type ChainStreamType = AsyncGenerator<IterableReadableStream<ChainValues>>;
 
-interface CompoundInput {
-    type: InputType,
-    text?: string,
+interface CompoundInputContent{
+  text?: string,    
+  type: InputType,
+  source?: {      
+      media_type: string,
+      data: string
+  }
+}
+
+interface CompoundInput {    
     role?: 'user' | 'assistant' | 'system',
-    source?: {
-        type: string,
-        media_type: string,
-        data: string
-    }
+    content: CompoundInputContent | CompoundInputContent[],
 }
 
 export { 
@@ -161,6 +164,7 @@ export {
     IRWSHistoryMessage,
     InputType,
     CompoundInput,
+    CompoundInputContent,
     IToolCall,
     ToolHandler
 };