@smythos/sre 1.5.37 → 1.5.40

package/src/subsystems/LLMManager/LLM.service/connectors/Bedrock.class.ts

@@ -11,7 +11,6 @@ import EventEmitter from 'events';
 
 import { BUILT_IN_MODEL_PREFIX } from '@sre/constants';
 import {
-    TLLMParams,
     ToolData,
     TLLMMessageBlock,
     TLLMToolResultMessageBlock,
@@ -21,9 +20,9 @@ import {
     BedrockCredentials,
     ILLMRequestFuncParams,
     TLLMChatResponse,
-    TLLMConnectorParams,
     ILLMRequestContext,
     TCustomLLMModel,
+    TLLMPreparedParams,
 } from '@sre/types/LLM.types';
 import { LLMHelper } from '@sre/LLMManager/LLM.helper';
 import { isJSONString } from '@sre/utils/general.utils';
@@ -195,11 +194,7 @@ export class BedrockConnector extends LLMConnector {
         }
     }
 
-    protected async webSearchRequest({ acRequest, body, context }: ILLMRequestFuncParams): Promise<EventEmitter> {
-        throw new Error('Web search is not supported for Bedrock');
-    }
-
-    protected async reqBodyAdapter(params: TLLMParams): Promise<ConverseCommandInput> {
+    protected async reqBodyAdapter(params: TLLMPreparedParams): Promise<ConverseCommandInput> {
         const customModelInfo = params.modelInfo;
 
         let systemPrompt;

package/src/subsystems/LLMManager/LLM.service/connectors/Echo.class.ts

@@ -1,7 +1,7 @@
 import { JSONContent } from '@sre/helpers/JsonContent.helper';
 import { LLMConnector } from '../LLMConnector';
 import EventEmitter from 'events';
-import { APIKeySource, ILLMRequestFuncParams, TLLMChatResponse, TLLMConnectorParams, TLLMParams } from '@sre/types/LLM.types';
+import { APIKeySource, ILLMRequestFuncParams, TLLMChatResponse, TLLMPreparedParams } from '@sre/types/LLM.types';
 
 export class EchoConnector extends LLMConnector {
     public name = 'LLM:Echo';
@@ -52,11 +52,7 @@ export class EchoConnector extends LLMConnector {
         return emitter;
     }
 
-    protected async webSearchRequest({ acRequest, body, context }: ILLMRequestFuncParams): Promise<EventEmitter> {
-        throw new Error('Web search is not supported for Echo');
-    }
-
-    protected async reqBodyAdapter(params: TLLMParams): Promise<any> {
+    protected async reqBodyAdapter(params: TLLMPreparedParams): Promise<any> {
         return params;
     }
 

package/src/subsystems/LLMManager/LLM.service/connectors/GoogleAI.class.ts

@@ -3,7 +3,7 @@ import path from 'path';
 import EventEmitter from 'events';
 import fs from 'fs';
 
-import { GoogleGenerativeAI, ModelParams, GenerationConfig, GenerateContentRequest, UsageMetadata } from '@google/generative-ai';
+import { GoogleGenerativeAI, ModelParams, GenerationConfig, GenerateContentRequest, UsageMetadata, FunctionCallingMode } from '@google/generative-ai';
 import { GoogleAIFileManager, FileState } from '@google/generative-ai/server';
 import { GoogleGenAI } from '@google/genai';
 
@@ -21,13 +21,12 @@ import {
     TLLMToolResultMessageBlock,
     APIKeySource,
     TLLMEvent,
-    TLLMParams,
     BasicCredentials,
     ILLMRequestFuncParams,
     TLLMChatResponse,
     TGoogleAIRequestBody,
-    TLLMConnectorParams,
     ILLMRequestContext,
+    TLLMPreparedParams,
 } from '@sre/types/LLM.types';
 import { LLMHelper } from '@sre/LLMManager/LLM.helper';
 
@@ -115,7 +114,7 @@ export class GoogleAIConnector extends LLMConnector {
 
             return {
                 content,
-                finishReason,
+                finishReason: finishReason.toLowerCase(),
                 useTool,
                 toolsData,
                 message: { content, role: 'assistant' },
@@ -193,11 +192,6 @@ export class GoogleAIConnector extends LLMConnector {
             throw error;
         }
     }
-
-    protected async webSearchRequest({ acRequest, body, context }: ILLMRequestFuncParams): Promise<any> {
-        throw new Error('Web search is not supported for Google AI');
-    }
-
     // #region Image Generation, will be moved to a different subsystem/service
     protected async imageGenRequest({ body, context }: ILLMRequestFuncParams): Promise<any> {
         try {
@@ -242,7 +236,7 @@ export class GoogleAIConnector extends LLMConnector {
         throw new Error('Image editing is not supported for Google AI. Imagen models only support image generation.');
     }
 
-    protected async reqBodyAdapter(params: TLLMParams): Promise<TGoogleAIRequestBody> {
+    protected async reqBodyAdapter(params: TLLMPreparedParams): Promise<TGoogleAIRequestBody> {
         const model = params?.model;
 
         // Check if this is an image generation request based on capabilities
@@ -403,7 +397,7 @@ export class GoogleAIConnector extends LLMConnector {
 
         const transformedToolsData = toolsData.map(
             (toolData): TLLMToolResultMessageBlock => ({
-                role: TLLMMessageRole.Function,
+                role: TLLMMessageRole.User,
                 parts: [
                     {
                         functionResponse: {
@@ -459,7 +453,7 @@ export class GoogleAIConnector extends LLMConnector {
         });
     }
 
-    private async prepareMessages(params: TLLMParams): Promise<string | TLLMMessageBlock[] | GenerateContentRequest> {
+    private async prepareMessages(params: TLLMPreparedParams): Promise<string | TLLMMessageBlock[] | GenerateContentRequest> {
         let messages: string | TLLMMessageBlock[] | GenerateContentRequest = params?.messages || '';
 
         const files: BinaryInput[] = params?.files || [];
@@ -475,7 +469,7 @@ export class GoogleAIConnector extends LLMConnector {
         return messages;
     }
 
-    private async prepareMessagesWithFiles(params: TLLMParams): Promise<string> {
+    private async prepareMessagesWithFiles(params: TLLMPreparedParams): Promise<string> {
         const model = params.model;
 
         let messages: string | TLLMMessageBlock[] = params?.messages || '';
@@ -544,7 +538,7 @@ export class GoogleAIConnector extends LLMConnector {
         return messages as string;
     }
 
-    private async prepareMessagesWithTools(params: TLLMParams): Promise<GenerateContentRequest> {
+    private async prepareMessagesWithTools(params: TLLMPreparedParams): Promise<GenerateContentRequest> {
         let formattedMessages: TLLMMessageBlock[];
         let systemInstruction = '';
 
@@ -571,15 +565,30 @@ export class GoogleAIConnector extends LLMConnector {
 
         if (params?.toolsConfig?.tools) toolsPrompt.tools = params?.toolsConfig?.tools as any;
         if (params?.toolsConfig?.tool_choice) {
+            // Map tool choice to valid Google AI function calling modes
+            let mode: FunctionCallingMode = FunctionCallingMode.AUTO; // default
+            const toolChoice = params?.toolsConfig?.tool_choice;
+
+            if (toolChoice === 'auto') {
+                mode = FunctionCallingMode.AUTO;
+            } else if (toolChoice === 'required') {
+                mode = FunctionCallingMode.ANY;
+            } else if (toolChoice === 'none') {
+                mode = FunctionCallingMode.NONE;
+            } else if (typeof toolChoice === 'object' && toolChoice.type === 'function') {
+                // Handle OpenAI-style named tool choice - force any function call
+                mode = FunctionCallingMode.ANY;
+            }
+
             toolsPrompt.toolConfig = {
-                functionCallingConfig: { mode: (params?.toolsConfig?.tool_choice as any) || 'auto' },
+                functionCallingConfig: { mode },
             };
         }
 
         return toolsPrompt;
     }
 
-    private async prepareMessagesWithTextQuery(params: TLLMParams): Promise<string> {
+    private async prepareMessagesWithTextQuery(params: TLLMPreparedParams): Promise<string> {
         const model = params.model;
         let systemInstruction = '';
         let prompt = '';
@@ -615,7 +624,7 @@ export class GoogleAIConnector extends LLMConnector {
         return prompt;
     }
 
-    private async prepareBodyForImageGenRequest(params: TLLMParams): Promise<any> {
+    private async prepareBodyForImageGenRequest(params: TLLMPreparedParams): Promise<any> {
         return {
             prompt: params.prompt,
             model: params.model,

package/src/subsystems/LLMManager/LLM.service/connectors/Groq.class.ts

@@ -11,9 +11,8 @@ import {
     BasicCredentials,
     ILLMRequestFuncParams,
     TLLMChatResponse,
-    TLLMParams,
-    TLLMConnectorParams,
     ILLMRequestContext,
+    TLLMPreparedParams,
     TLLMToolResultMessageBlock,
 } from '@sre/types/LLM.types';
 import { LLMHelper } from '@sre/LLMManager/LLM.helper';
@@ -154,11 +153,7 @@ export class GroqConnector extends LLMConnector {
         }
     }
 
-    protected async webSearchRequest({ acRequest, body, context }: ILLMRequestFuncParams): Promise<EventEmitter> {
-        throw new Error('Web search is not supported for Groq');
-    }
-
-    protected async reqBodyAdapter(params: TLLMParams): Promise<ChatCompletionCreateParams> {
+    protected async reqBodyAdapter(params: TLLMPreparedParams): Promise<ChatCompletionCreateParams> {
         const messages = params?.messages || [];
 
         const body: ChatCompletionCreateParams = {

package/src/subsystems/LLMManager/LLM.service/connectors/Perplexity.class.ts

@@ -4,7 +4,6 @@ import axios, { AxiosInstance } from 'axios';
 import { JSON_RESPONSE_INSTRUCTION, BUILT_IN_MODEL_PREFIX } from '@sre/constants';
 
 import {
-    TLLMParams,
     ToolData,
     TLLMMessageBlock,
     TLLMToolResultMessageBlock,
@@ -13,8 +12,8 @@ import {
     BasicCredentials,
     ILLMRequestFuncParams,
     TLLMChatResponse,
-    TLLMConnectorParams,
     ILLMRequestContext,
+    TLLMPreparedParams,
 } from '@sre/types/LLM.types';
 import { LLMHelper } from '@sre/LLMManager/LLM.helper';
 
@@ -113,11 +112,7 @@ export class PerplexityConnector extends LLMConnector {
         return emitter;
     }
 
-    protected async webSearchRequest({ acRequest, body, context }: ILLMRequestFuncParams): Promise<EventEmitter> {
-        throw new Error('Web search is not supported for Perplexity');
-    }
-
-    protected async reqBodyAdapter(params: TLLMParams): Promise<ChatCompletionParams> {
+    protected async reqBodyAdapter(params: TLLMPreparedParams): Promise<ChatCompletionParams> {
         const messages = params?.messages || [];
 
         //#region Handle JSON response format