@llumiverse/drivers 0.22.0 → 0.22.2

package/lib/cjs/vertexai/models/gemini.js

@@ -39,37 +39,55 @@ function getGeminiPayload(options, prompt) {
     const model_options = options.model_options;
     const tools = getToolDefinitions(options.tools);
     const useStructuredOutput = supportsStructuredOutput(options) && !tools;
+    const thinkingConfigNeeded = model_options?.include_thoughts
+        || model_options?.thinking_budget_tokens
+        || options.model.includes("gemini-2.5");
+    const configNanoBanana = {
+        systemInstruction: prompt.system,
+        safetySettings: geminiSafetySettings,
+        responseModalities: [genai_1.Modality.TEXT, genai_1.Modality.IMAGE], // This is an error if only Text, and Only Image just gets blank responses.
+        candidateCount: 1,
+        //Model options
+        temperature: model_options?.temperature,
+        topP: model_options?.top_p,
+        maxOutputTokens: geminiMaxTokens(options),
+        stopSequences: model_options?.stop_sequence,
+        imageConfig: {
+            aspectRatio: model_options?.image_aspect_ratio,
+        }
+    };
+    const config = {
+        systemInstruction: prompt.system,
+        safetySettings: geminiSafetySettings,
+        tools: tools ? [tools] : undefined,
+        toolConfig: tools ? {
+            functionCallingConfig: {
+                mode: genai_1.FunctionCallingConfigMode.AUTO,
+            }
+        } : undefined,
+        candidateCount: 1,
+        //JSON/Structured output
+        responseMimeType: useStructuredOutput ? "application/json" : undefined,
+        responseSchema: useStructuredOutput ? parseJSONtoSchema(options.result_schema, true) : undefined,
+        //Model options
+        temperature: model_options?.temperature,
+        topP: model_options?.top_p,
+        topK: model_options?.top_k,
+        maxOutputTokens: geminiMaxTokens(options),
+        stopSequences: model_options?.stop_sequence,
+        presencePenalty: model_options?.presence_penalty,
+        frequencyPenalty: model_options?.frequency_penalty,
+        seed: model_options?.seed,
+        thinkingConfig: thinkingConfigNeeded ?
+            {
+                includeThoughts: model_options?.include_thoughts ?? false,
+                thinkingBudget: geminiThinkingBudget(options),
+            } : undefined,
+    };
     return {
         model: options.model,
         contents: prompt.contents,
-        config: {
-            systemInstruction: prompt.system,
-            safetySettings: geminiSafetySettings,
-            tools: tools ? [tools] : undefined,
-            toolConfig: tools ? {
-                functionCallingConfig: {
-                    mode: genai_1.FunctionCallingConfigMode.AUTO,
-                }
-            } : undefined,
-            candidateCount: 1,
-            //JSON/Structured output
-            responseMimeType: useStructuredOutput ? "application/json" : undefined,
-            responseSchema: useStructuredOutput ? parseJSONtoSchema(options.result_schema, true) : undefined,
-            //Model options
-            temperature: model_options?.temperature,
-            topP: model_options?.top_p,
-            topK: model_options?.top_k,
-            maxOutputTokens: model_options?.max_tokens,
-            stopSequences: model_options?.stop_sequence,
-            presencePenalty: model_options?.presence_penalty,
-            frequencyPenalty: model_options?.frequency_penalty,
-            seed: model_options?.seed,
-            thinkingConfig: model_options?.include_thoughts || model_options?.thinking_budget_tokens ?
-                {
-                    includeThoughts: model_options?.include_thoughts,
-                    thinkingBudget: model_options?.thinking_budget_tokens,
-                } : undefined,
-        }
+        config: options.model.toLowerCase().includes("image") ? configNanoBanana : config,
     };
 }
 /**
@@ -359,16 +377,37 @@ function removeEmptyJSONArray(array, schema) {
     return cleanedArray.filter(item => !isEmpty(item));
 }
 function collectTextParts(content) {
-    const out = [];
+    const results = [];
     const parts = content.parts;
     if (parts) {
         for (const part of parts) {
             if (part.text) {
-                out.push(part.text);
+                results.push({
+                    type: "text",
+                    value: part.text
+                });
             }
         }
     }
-    return out.join('\n');
+    return results;
+}
+function collectInlineDataParts(content) {
+    const results = [];
+    const parts = content.parts;
+    if (parts) {
+        for (const part of parts) {
+            if (part.inlineData) {
+                const base64ImageBytes = part.inlineData.data ?? "";
+                const mimeType = part.inlineData.mimeType ?? "image/png";
+                const imageUrl = `data:${mimeType};base64,${base64ImageBytes}`;
+                results.push({
+                    type: "image",
+                    value: imageUrl
+                });
+            }
+        }
+    }
+    return results;
 }
 function collectToolUseParts(content) {
     const out = [];
@@ -411,8 +450,35 @@ function mergeConsecutiveRole(contents) {
 const supportedFinishReasons = [
     genai_1.FinishReason.MAX_TOKENS,
     genai_1.FinishReason.STOP,
-    genai_1.FinishReason.FINISH_REASON_UNSPECIFIED
+    genai_1.FinishReason.FINISH_REASON_UNSPECIFIED,
 ];
+function geminiMaxTokens(option) {
+    const model_options = option.model_options;
+    if (model_options?.max_tokens) {
+        return model_options.max_tokens;
+    }
+    if (option.model.includes("gemini-2.5")) {
+        const maxSupportedTokens = (0, core_1.getMaxTokensLimitVertexAi)(option.model);
+        const thinkingBudget = geminiThinkingBudget(option) ?? 0;
+        return Math.min(maxSupportedTokens, 16000 + thinkingBudget);
+    }
+    return undefined;
+}
+function geminiThinkingBudget(option) {
+    const model_options = option.model_options;
+    if (model_options?.thinking_budget_tokens) {
+        return model_options.thinking_budget_tokens;
+    }
+    // Set minimum thinking level by default.
+    // Docs: https://ai.google.dev/gemini-api/docs/thinking#set-budget
+    if (option.model.includes("gemini-2.5")) {
+        if (option.model.includes("pro")) {
+            return 128;
+        }
+        return 0;
+    }
+    return undefined;
+}
 class GeminiModelDefinition {
     model;
     constructor(modelId) {
@@ -430,8 +496,14 @@ class GeminiModelDefinition {
             return { result, options };
         }
         try {
-            const jsonResult = JSON.parse(result.result);
-            result.result = JSON.stringify(removeEmptyFields(jsonResult, options.result_schema));
+            // Extract text content for JSON processing - only process first text result
+            const textResult = result.result.find(r => r.type === 'text')?.value;
+            if (textResult) {
+                const jsonResult = JSON.parse(textResult);
+                const cleanedJson = JSON.stringify(removeEmptyFields(jsonResult, options.result_schema));
+                // Replace the text result with cleaned version
+                result.result = result.result.map(r => r.type === 'text' ? { ...r, value: cleanedJson } : r);
+            }
             return { result, options };
         }
         catch (error) {
@@ -569,11 +641,18 @@ class GeminiModelDefinition {
     }
     async requestTextCompletion(driver, prompt, options) {
         const splits = options.model.split("/");
+        let region = undefined;
+        if (splits[0] === "locations" && splits.length >= 2) {
+            region = splits[1];
+        }
         const modelName = splits[splits.length - 1];
         options = { ...options, model: modelName };
         let conversation = updateConversation(options.conversation, prompt.contents);
         prompt.contents = conversation;
-        const client = driver.getGoogleGenAIClient();
+        if (options.model.includes("gemini-2.5-flash-image")) {
+            region = "global"; // Gemini Flash Image only available in global region, this is for nano-banana model
+        }
+        const client = driver.getGoogleGenAIClient(region);
         const payload = getGeminiPayload(options, prompt);
         const response = await client.models.generateContent(payload);
         const token_usage = this.usageMetadataToTokenUsage(response.usageMetadata);
@@ -600,7 +679,9 @@ class GeminiModelDefinition {
                 tool_use = collectToolUseParts(content);
                 // We clean the content before validation, so we can update the conversation.
                 const cleanedContent = cleanEmptyFieldsContent(content, options.result_schema);
-                result = collectTextParts(cleanedContent);
+                const textResults = collectTextParts(cleanedContent);
+                const imageResults = collectInlineDataParts(cleanedContent);
+                result = [...textResults, ...imageResults];
                 conversation = updateConversation(conversation, [cleanedContent]);
             }
         }
@@ -608,7 +689,7 @@ class GeminiModelDefinition {
             finish_reason = "tool_use";
         }
         return {
-            result: result ?? '',
+            result: result && result.length > 0 ? result : [{ type: "text", value: '' }],
             token_usage: token_usage,
             finish_reason: finish_reason,
             original_response: options.include_original_response ? response : undefined,
@@ -618,9 +699,16 @@ class GeminiModelDefinition {
     }
     async requestTextCompletionStream(driver, prompt, options) {
         const splits = options.model.split("/");
+        let region = undefined;
+        if (splits[0] === "locations" && splits.length >= 2) {
+            region = splits[1];
+        }
         const modelName = splits[splits.length - 1];
         options = { ...options, model: modelName };
-        const client = driver.getGoogleGenAIClient();
+        if (options.model.includes("gemini-2.5-flash-image")) {
+            region = "global"; // Gemini Flash Image only available in global region, this is for nano-banana model
+        }
+        const client = driver.getGoogleGenAIClient(region);
         const payload = getGeminiPayload(options, prompt);
         const response = await client.models.generateContentStream(payload);
         const stream = (0, async_1.asyncMap)(response, async (item) => {
@@ -644,13 +732,15 @@ class GeminiModelDefinition {
                             + `content: ${JSON.stringify(candidate.content, null, 2)}, safety: ${JSON.stringify(candidate.safetyRatings, null, 2)}`);
                     }
                     if (candidate.content?.role === 'model') {
-                        const text = collectTextParts(candidate.content);
+                        const textResults = collectTextParts(candidate.content);
+                        const imageResults = collectInlineDataParts(candidate.content);
+                        const combinedResults = [...textResults, ...imageResults];
                         tool_use = collectToolUseParts(candidate.content);
                         if (tool_use) {
                             finish_reason = "tool_use";
                         }
                         return {
-                            result: text,
+                            result: combinedResults.length > 0 ? combinedResults : [],
                             token_usage: token_usage,
                             finish_reason: finish_reason,
                             tool_use,
@@ -660,7 +750,7 @@ class GeminiModelDefinition {
             }
             //No normal output, returning block reason if it exists.
             return {
-                result: item.promptFeedback?.blockReasonMessage ?? "",
+                result: item.promptFeedback?.blockReasonMessage ? [{ type: "text", value: item.promptFeedback.blockReasonMessage }] : [],
                 finish_reason: item.promptFeedback?.blockReason ?? "",
                 token_usage: token_usage,
             };

package/lib/cjs/vertexai/models/gemini.js.map

@@ -1 +1 @@
-{"version":3,"file":"gemini.js","sourceRoot":"","sources":["../../../../src/vertexai/models/gemini.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"gemini.js","sourceRoot":"","sources":["../../../../src/vertexai/models/gemini.ts"],"names":[],"mappings":"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"}

package/lib/cjs/vertexai/models/imagen.js

@@ -1,17 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ImagenModelDefinition = exports.ImagenMaskMode = exports.ImagenTaskType = void 0;
 const core_1 = require("@llumiverse/core");
-const projectId = process.env.GOOGLE_PROJECT_ID;
-const location = 'us-central1';
-const aiplatform_1 = __importDefault(require("@google-cloud/aiplatform"));
-// Imports the Google Cloud Prediction Service Client library
-const { PredictionServiceClient } = aiplatform_1.default.v1;
 // Import the helper module for converting arbitrary protobuf.Value objects
-const aiplatform_2 = require("@google-cloud/aiplatform");
+const aiplatform_1 = require("@google-cloud/aiplatform");
 var ImagenTaskType;
 (function (ImagenTaskType) {
     ImagenTaskType["TEXT_IMAGE"] = "TEXT_IMAGE";
@@ -31,12 +23,6 @@ var ImagenMaskMode;
     ImagenMaskMode["MASK_MODE_FOREGROUND"] = "MASK_MODE_FOREGROUND";
     ImagenMaskMode["MASK_MODE_SEMANTIC"] = "MASK_MODE_SEMANTIC";
 })(ImagenMaskMode || (exports.ImagenMaskMode = ImagenMaskMode = {}));
-// Specifies the location of the api endpoint
-const clientOptions = {
-    apiEndpoint: `${location}-aiplatform.googleapis.com`,
-};
-// Instantiates a client
-const predictionServiceClient = new PredictionServiceClient(clientOptions);
 function getImagenParameters(taskType, options) {
     const commonParameters = {
         sampleCount: options?.number_of_images,
@@ -271,7 +257,7 @@ class ImagenModelDefinition {
     }
     async requestImageGeneration(driver, prompt, options) {
         if (options.model_options?._option_id !== "vertexai-imagen") {
-            driver.logger.warn("Invalid model options", { options: options.model_options });
+            driver.logger.warn({ options: options.model_options }, "Invalid model options");
         }
         options.model_options = options.model_options;
         if (options.output_modality !== core_1.Modalities.image) {
@@ -281,8 +267,9 @@ class ImagenModelDefinition {
         driver.logger.info("Task type: " + taskType);
         const modelName = options.model.split("/").pop() ?? '';
         // Configure the parent resource
-        const endpoint = `projects/${projectId}/locations/${location}/publishers/google/models/${modelName}`;
-        const instanceValue = aiplatform_2.helpers.toValue(prompt);
+        // TODO: make location configurable, fixed to us-central1 for now
+        const endpoint = `projects/${driver.options.project}/locations/us-central1/publishers/google/models/${modelName}`;
+        const instanceValue = aiplatform_1.helpers.toValue(prompt);
         if (!instanceValue) {
             throw new Error('No instance value found');
         }
@@ -292,14 +279,15 @@ class ImagenModelDefinition {
         const numberOfImages = options.model_options?.number_of_images ?? 1;
         // Remove all undefined values
         parameter = Object.fromEntries(Object.entries(parameter).filter(([_, v]) => v !== undefined));
-        const parameters = aiplatform_2.helpers.toValue(parameter);
+        const parameters = aiplatform_1.helpers.toValue(parameter);
         const request = {
             endpoint,
             instances,
             parameters,
         };
+        const client = await driver.getImagenClient();
         // Predict request
-        const [response] = await predictionServiceClient.predict(request, { timeout: 120000 * numberOfImages }); //Extended timeout for image generation
+        const [response] = await client.predict(request, { timeout: 120000 * numberOfImages }); //Extended timeout for image generation
         const predictions = response.predictions;
         if (!predictions) {
             throw new Error('No predictions found');
@@ -307,9 +295,10 @@ class ImagenModelDefinition {
         // Extract base64 encoded images from predictions
         const images = predictions.map(prediction => prediction.structValue?.fields?.bytesBase64Encoded?.stringValue ?? '');
         return {
-            result: {
-                images
-            },
+            result: images.map(image => ({
+                type: "image",
+                value: image
+            })),
         };
     }
 }

package/lib/cjs/vertexai/models/imagen.js.map

@@ -1 +1 @@
-{"version":3,"file":"imagen.js","sourceRoot":"","sources":["../../../../src/vertexai/models/imagen.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"imagen.js","sourceRoot":"","sources":["../../../../src/vertexai/models/imagen.ts"],"names":[],"mappings":"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"}

package/lib/cjs/vertexai/models/llama.js

@@ -120,7 +120,7 @@ class LLamaModelDefinition {
                 }],
         });
         return {
-            result: text,
+            result: [{ type: "text", value: text }],
             token_usage: {
                 prompt: result.usage.prompt_tokens,
                 result: result.usage.completion_tokens,
@@ -133,7 +133,7 @@ class LLamaModelDefinition {
     async requestTextCompletionStream(driver, prompt, options) {
         const splits = options.model.split("/");
         const modelName = splits[splits.length - 1];
-        let conversation = updateConversation(options.conversation, prompt);
+        const conversation = updateConversation(options.conversation, prompt);
         const modelOptions = options.model_options;
         const payload = {
             model: `meta/${modelName}`,
@@ -166,8 +166,9 @@ class LLamaModelDefinition {
         return (0, async_1.transformSSEStream)(stream, (data) => {
             const json = JSON.parse(data);
             const choice = json.choices?.[0];
+            const content = choice?.delta?.content ?? '';
             return {
-                result: choice?.delta?.content ?? '',
+                result: content ? [{ type: "text", value: content }] : [],
                 finish_reason: choice?.finish_reason,
                 token_usage: json.usage ? {
                     prompt: json.usage.prompt_tokens,

package/lib/cjs/vertexai/models/llama.js.map

@@ -1 +1 @@
-{"version":3,"file":"llama.js","sourceRoot":"","sources":["../../../../src/vertexai/models/llama.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"llama.js","sourceRoot":"","sources":["../../../../src/vertexai/models/llama.ts"],"names":[],"mappings":"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"}

package/lib/cjs/vertexai/models.js

@@ -7,8 +7,19 @@ const claude_js_1 = require("./models/claude.js");
 const llama_js_1 = require("./models/llama.js");
 function getModelDefinition(model) {
     const splits = model.split("/");
-    const publisher = splits[1];
-    const modelName = (0, index_js_1.trimModelName)(splits[splits.length - 1]);
+    // Handle both formats: "publishers/anthropic/models/..." and "locations/.../publishers/anthropic/models/..."
+    let publisher;
+    let modelName;
+    const publisherIndex = splits.indexOf("publishers");
+    if (publisherIndex !== -1 && publisherIndex + 1 < splits.length) {
+        publisher = splits[publisherIndex + 1];
+        modelName = (0, index_js_1.trimModelName)(splits[splits.length - 1]);
+    }
+    else {
+        // Fallback to old logic for backward compatibility
+        publisher = splits[1];
+        modelName = (0, index_js_1.trimModelName)(splits[splits.length - 1]);
+    }
     if (publisher?.includes("anthropic")) {
         return new claude_js_1.ClaudeModelDefinition(modelName);
     }

package/lib/cjs/vertexai/models.js.map

@@ -1 +1 @@
-{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../src/vertexai/models.ts"],"names":[],"mappings":";;AAeA,gDAeC;AA7BD,yCAA2D;AAC3D,kDAA2D;AAC3D,kDAA2D;AAC3D,gDAAyD;AAWzD,SAAgB,kBAAkB,CAAC,KAAa;IAC5C,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAChC,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IAC5B,MAAM,SAAS,GAAG,IAAA,wBAAa,EAAC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IAE3D,IAAI,SAAS,EAAE,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QACnC,OAAO,IAAI,iCAAqB,CAAC,SAAS,CAAC,CAAC;IAChD,CAAC;SAAM,IAAI,SAAS,EAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvC,OAAO,IAAI,iCAAqB,CAAC,SAAS,CAAC,CAAC;IAChD,CAAC;SAAM,IAAI,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QACrC,OAAO,IAAI,+BAAoB,CAAC,SAAS,CAAC,CAAC;IAC/C,CAAC;IAED,gCAAgC;IAChC,OAAO,IAAI,iCAAqB,CAAC,SAAS,CAAC,CAAC;AAChD,CAAC"}
+{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../src/vertexai/models.ts"],"names":[],"mappings":";;AAeA,gDA2BC;AAzCD,yCAA2D;AAC3D,kDAA2D;AAC3D,kDAA2D;AAC3D,gDAAyD;AAWzD,SAAgB,kBAAkB,CAAC,KAAa;IAC5C,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEhC,6GAA6G;IAC7G,IAAI,SAA6B,CAAC;IAClC,IAAI,SAAiB,CAAC;IAEtB,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACpD,IAAI,cAAc,KAAK,CAAC,CAAC,IAAI,cAAc,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;QAC9D,SAAS,GAAG,MAAM,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC;QACvC,SAAS,GAAG,IAAA,wBAAa,EAAC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IACzD,CAAC;SAAM,CAAC;QACJ,mDAAmD;QACnD,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACtB,SAAS,GAAG,IAAA,wBAAa,EAAC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,IAAI,SAAS,EAAE,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QACnC,OAAO,IAAI,iCAAqB,CAAC,SAAS,CAAC,CAAC;IAChD,CAAC;SAAM,IAAI,SAAS,EAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvC,OAAO,IAAI,iCAAqB,CAAC,SAAS,CAAC,CAAC;IAChD,CAAC;SAAM,IAAI,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QACrC,OAAO,IAAI,+BAAoB,CAAC,SAAS,CAAC,CAAC;IAC/C,CAAC;IAED,gCAAgC;IAChC,OAAO,IAAI,iCAAqB,CAAC,SAAS,CAAC,CAAC;AAChD,CAAC"}

package/lib/cjs/watsonx/index.js

@@ -23,7 +23,7 @@ class WatsonxDriver extends core_1.AbstractDriver {
     }
     async requestTextCompletion(prompt, options) {
         if (options.model_options?._option_id !== "text-fallback") {
-            this.logger.warn("Invalid model options", { options: options.model_options });
+            this.logger.warn({ options: options.model_options }, "Invalid model options");
         }
         options.model_options = options.model_options;
         const payload = {
@@ -41,7 +41,7 @@ class WatsonxDriver extends core_1.AbstractDriver {
         const res = await this.fetchClient.post(`/ml/v1/text/generation?version=${API_VERSION}`, { payload });
         const result = res.results[0];
         return {
-            result: result.generated_text,
+            result: [{ type: "text", value: result.generated_text }],
             token_usage: {
                 prompt: result.input_token_count,
                 result: result.generated_token_count,
@@ -53,7 +53,7 @@ class WatsonxDriver extends core_1.AbstractDriver {
     }
     async requestTextCompletionStream(prompt, options) {
         if (options.model_options?._option_id !== "text-fallback") {
-            this.logger.warn("Invalid model options", { options: options.model_options });
+            this.logger.warn({ options: options.model_options }, "Invalid model options");
         }
         options.model_options = options.model_options;
         const payload = {
@@ -75,7 +75,7 @@ class WatsonxDriver extends core_1.AbstractDriver {
         return (0, async_1.transformSSEStream)(stream, (data) => {
             const json = JSON.parse(data);
             return {
-                result: json.results[0]?.generated_text ?? '',
+                result: json.results[0]?.generated_text ? [{ type: "text", value: json.results[0].generated_text }] : [],
                 finish_reason: watsonFinishReason(json.results[0]?.stop_reason),
                 token_usage: {
                     prompt: json.results[0].input_token_count,
@@ -122,7 +122,7 @@ class WatsonxDriver extends core_1.AbstractDriver {
         return this.listModels()
             .then(() => true)
             .catch((err) => {
-            this.logger.warn("Failed to connect to WatsonX", { error: err });
+            this.logger.warn({ error: err }, "Failed to connect to WatsonX");
             return false;
         });
     }