@bedrockio/ai 0.7.2 → 0.8.0

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.8.0
+
+- Simplified return values.
+- Restored basic Gemini functionality.
+- Normalize options inputs.
+- Normalize stream event outputs.
+
+## 0.7.3
+
+- Allow debug on individual calls.
+
 ## 0.7.2
 
 - Handling long filenames.

package/dist/cjs/BaseClient.js

@@ -26,10 +26,7 @@ class BaseClient {
         const { output, stream, schema } = options;
         const response = await this.runPrompt(options);
         if (!stream) {
-            this.debug('Response:', response);
-        }
-        if (output === 'raw') {
-            return response;
+            this.debug('Response:', response, options);
         }
         let result;
         if (schema) {
@@ -45,15 +42,11 @@ class BaseClient {
         else {
             result = (0, code_js_1.parseCode)(this.getTextResponse(response));
         }
-        if (output === 'messages') {
-            return {
-                result,
-                ...this.getMessagesResponse(response, options),
-            };
-        }
-        else {
-            return result;
-        }
+        return {
+            result,
+            response,
+            ...this.normalizeResponse(response, options),
+        };
     }
     /**
      * Streams the prompt response.
@@ -68,8 +61,8 @@ class BaseClient {
             const stream = await this.runStream(options);
             // @ts-ignore
             for await (let event of stream) {
-                this.debug('Event:', event);
-                event = this.normalizeStreamEvent(event);
+                this.debug('Event:', event, options);
+                event = this.normalizeStreamEvent(event, options);
                 if (event) {
                     yield event;
                 }
@@ -91,7 +84,7 @@ class BaseClient {
                             key,
                         };
                     }
-                    this.debug('Extract:', extractEvent);
+                    this.debug('Extract:', extractEvent, options);
                     yield extractEvent;
                 }
             }
@@ -136,15 +129,17 @@ class BaseClient {
     /**
      * @returns {Object}
      */
-    getMessagesResponse(input, response) {
+    normalizeResponse(response, options) {
         void response;
+        void options;
         throw new Error('Method not implemented.');
     }
     /**
      * @returns {Object}
      */
-    normalizeStreamEvent(event) {
+    normalizeStreamEvent(event, options) {
         void event;
+        void options;
         throw new Error('Method not implemented.');
     }
     // Private
@@ -160,7 +155,18 @@ class BaseClient {
         };
     }
     normalizeInputs(options) {
-        const { template, params, output = 'text' } = options;
+        const { output = 'text' } = options;
+        let { system, messages } = this.normalizeTemplateMessages(options);
+        if (output === 'json') {
+            system = [system, 'Output only valid JSON.'].join('\n\n');
+        }
+        return {
+            system,
+            messages: [...messages, ...this.normalizeOptionsMessages(options)],
+        };
+    }
+    normalizeTemplateMessages(options) {
+        const { template, params } = options;
         const { sections } = this.renderer.run({
             params,
             template,
@@ -183,23 +189,25 @@ class BaseClient {
                 ];
             }
         }
-        messages = [...messages, ...this.normalizeInput(options)];
-        if (output === 'json') {
-            system = [system, 'Output only valid JSON.'].join('\n\n');
-        }
+        system = system.trim();
         return {
             system,
             messages,
         };
     }
-    normalizeInput(options) {
-        const { input = '' } = options;
-        return [
-            {
-                role: 'user',
-                content: input,
-            },
-        ];
+    normalizeOptionsMessages(options) {
+        const input = options.input || options.messages;
+        if (Array.isArray(input)) {
+            return input;
+        }
+        else {
+            return [
+                {
+                    role: 'user',
+                    content: input || '',
+                },
+            ];
+        }
     }
     normalizeSchema(options) {
         let { schema } = options;
@@ -237,8 +245,8 @@ class BaseClient {
             }
         };
     }
-    debug(message, arg) {
-        if (this.options.debug) {
+    debug(message, arg, options) {
+        if (options.debug) {
             // TODO: replace with logger when opentelemetry is removed
             // eslint-disable-next-line
             console.debug(`${message}\n${JSON.stringify(arg, null, 2)}\n`);
@@ -252,7 +260,7 @@ exports.default = BaseClient;
  * @property {string} [model] - The model to use.
  * @property {boolean} stream - Stream response.
  * @property {Object} [schema] - A JSON schema compatible object that defines the output shape.
- * @property {"raw" | "text" | "json" | "messages"} [output] - The return value type.
+ * @property {"text" | "json"} [output] - The result output type.
  * @property {Object} [params] - Params to be interpolated into the template.
  *                               May also be passed as additional props to options.
  */

package/dist/cjs/anthropic.js

@@ -22,31 +22,30 @@ class AnthropicClient extends BaseClient_js_1.default {
         return data.map((o) => o.id);
     }
     async runPrompt(options) {
-        const { input, model, temperature, instructions, stream = false, tokens = DEFAULT_TOKENS, } = options;
+        const { model, system, messages, temperature, stream = false, tokens = DEFAULT_TOKENS, } = options;
         const params = {
             model,
             stream,
+            system,
+            messages,
             temperature,
             max_tokens: tokens,
-            system: instructions,
-            messages: input,
             ...this.getToolOptions(options),
         };
         const clientOptions = this.getClientOptions(params);
-        this.debug('Params:', params);
-        this.debug('Options:', options);
+        this.debug('Params:', params, options);
+        this.debug('Options:', options, options);
         // @ts-ignore
         return await this.client.messages.create(params, clientOptions);
     }
     async runStream(options) {
         return await this.runPrompt({
             ...options,
-            output: 'raw',
             stream: true,
         });
     }
     getTextResponse(response) {
-        const textBlock = response.content.find((block) => {
+        const textBlock = response?.content.find((block) => {
             return block.type === 'text';
         });
         return textBlock?.text || null;
@@ -57,7 +56,7 @@ class AnthropicClient extends BaseClient_js_1.default {
         });
         return toolBlock?.input || null;
     }
-    getMessagesResponse(response, options) {
+    normalizeResponse(response, options) {
         const { messages } = options;
         return {
             messages: [
@@ -73,24 +72,41 @@ class AnthropicClient extends BaseClient_js_1.default {
                     };
                 }),
             ],
+            usage: this.normalizeUsage(response),
         };
     }
-    normalizeStreamEvent(event) {
+    normalizeUsage(response) {
+        return {
+            input_tokens: response.usage.input_tokens,
+            output_tokens: response.usage.output_tokens,
+        };
+    }
+    normalizeStreamEvent(event, options) {
         let { type } = event;
+        options.buffer ||= '';
         if (type === 'content_block_start') {
             return {
                 type: 'start',
             };
         }
-        else if (type === 'content_block_stop') {
+        else if (type === 'content_block_delta') {
+            options.buffer += event.delta.text;
             return {
-                type: 'stop',
+                type: 'delta',
+                delta: event.delta.text,
             };
         }
-        else if (type === 'content_block_delta') {
+        else if (type === 'message_delta') {
             return {
-                type: 'delta',
-                text: event.delta.text,
+                type: 'stop',
+                messages: [
+                    ...options.messages,
+                    {
+                        role: 'assistant',
+                        content: options.buffer,
+                    },
+                ],
+                usage: this.normalizeUsage(event),
             };
         }
     }

package/dist/cjs/google.js

@@ -4,14 +4,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GoogleClient = void 0;
-const generative_ai_1 = require("@google/generative-ai");
+const genai_1 = require("@google/genai");
 const BaseClient_js_1 = __importDefault(require("./BaseClient.js"));
-const DEFAULT_MODEL = 'models/gemini-2.0-flash-exp';
+const DEFAULT_MODEL = 'gemini-2.5-flash';
 class GoogleClient extends BaseClient_js_1.default {
     constructor(options) {
         super(options);
         const { apiKey } = options;
-        this.client = new generative_ai_1.GoogleGenerativeAI(apiKey);
+        this.client = new genai_1.GoogleGenAI({
+            apiKey,
+        });
     }
     /**
      * Lists available models.
@@ -19,64 +21,97 @@ class GoogleClient extends BaseClient_js_1.default {
      */
     async models() {
         return [
-            'gemini-2.0-flash-exp',
-            'gemini-1.5-flash',
-            'gemini-1.5-flash-8b',
+            // Gemini 3 (Nov 2025)
+            'gemini-3-pro-preview',
+            // Gemini 2.5
+            'gemini-2.5-pro',
+            'gemini-2.5-flash',
+            // Gemini 2.0
+            'gemini-2.0-flash',
+            // Gemini 1.5 (legacy but still available)
             'gemini-1.5-pro',
+            'gemini-1.5-flash',
         ];
     }
-    async getCompletion(options) {
-        const { model = DEFAULT_MODEL, output = 'text', stream = false } = options;
-        const { client } = this;
-        const generator = client.getGenerativeModel({
-            model,
-        });
-        // @ts-ignore
-        const messages = await this.getMessages(options);
-        const prompts = messages.map((message) => {
-            return message.content;
-        });
-        let response;
-        if (stream) {
-            response = await generator.generateContentStream(prompts);
-        }
-        else {
-            response = await generator.generateContent(prompts);
-        }
-        if (output === 'raw') {
-            return response;
-        }
-        // @ts-ignore
-        const parts = response.response.candidates.flatMap((candidate) => {
-            return candidate.content.parts;
+    async runPrompt(options) {
+        const { model = DEFAULT_MODEL, messages, system } = options;
+        const contents = messages.map((message) => {
+            const { role, content } = message;
+            return {
+                role,
+                parts: [
+                    {
+                        text: content,
+                    },
+                ],
+            };
         });
-        const [message] = parts;
-        return message;
+        const params = {
+            model,
+            contents,
+            ...(system && {
+                config: {
+                    systemInstruction: system,
+                },
+            }),
+        };
+        return await this.client.models.generateContent(params);
+    }
+    runStream(options) {
+        const params = this.getParams(options);
+        return this.client.models.generateContentStream(params);
+    }
+    getTextResponse(response) {
+        return response.text;
+    }
+    normalizeResponse(response, options) {
+        const { messages } = options;
+        return {
+            messages: [
+                ...messages,
+                {
+                    role: 'assistant',
+                    content: response.text,
+                },
+            ],
+            usage: this.normalizeUsage(response),
+        };
     }
-    async getStream(options) {
-        // @ts-ignore
-        const response = await super.getStream(options);
-        // @ts-ignore
-        return response.stream;
+    normalizeUsage(response) {
+        return {
+            input_tokens: response.usageMetadata.promptTokenCount,
+            output_tokens: response.usageMetadata.candidatesTokenCount,
+        };
     }
-    getStreamedChunk(chunk, started) {
-        const [candidate] = chunk.candidates;
-        let type;
-        if (!started) {
-            type = 'start';
-        }
-        else if (candidate.finishReason === 'STOP') {
-            type = 'stop';
-        }
-        else {
-            type = 'chunk';
-        }
-        if (type) {
+    getParams(options) {
+        const { model = DEFAULT_MODEL, messages, system } = options;
+        const contents = messages.map((message) => {
+            const { role, content } = message;
             return {
-                type,
-                text: candidate.content.parts[0].text || '',
+                role,
+                parts: [
+                    {
+                        text: content,
+                    },
+                ],
             };
-        }
+        });
+        return {
+            model,
+            contents,
+            ...(system && {
+                config: {
+                    systemInstruction: system,
+                },
+            }),
+        };
+    }
+    normalizeStreamEvent(event) {
+        // Note Gemini doesn't provide different events, only a single GenerateContentResponse.
+        return {
+            type: 'delta',
+            delta: event.text,
+        };
     }
 }
 exports.GoogleClient = GoogleClient;

package/dist/cjs/openai.js

@@ -58,7 +58,7 @@ class OpenAiClient extends BaseClient_js_1.default {
                 verbosity,
             },
         };
-        this.debug('Params:', params);
+        this.debug('Params:', params, options);
         // @ts-ignore
         return await this.client.responses.create(params);
     }
@@ -69,7 +69,7 @@ class OpenAiClient extends BaseClient_js_1.default {
         });
     }
     getTextResponse(response) {
-        return response.output_text;
+        return response?.output_text;
     }
     getStructuredResponse(response) {
         // Note here that certain cases (tool usage etc)
@@ -90,7 +90,7 @@ class OpenAiClient extends BaseClient_js_1.default {
         const last = outputs[outputs.length - 1];
         return JSON.parse(last.text);
     }
-    getMessagesResponse(response, options) {
+    normalizeResponse(response, options) {
         const { messages } = options;
         return {
             messages: [
@@ -103,6 +103,13 @@ class OpenAiClient extends BaseClient_js_1.default {
             // Note that this ability currently only
             // exists for OpenAI compatible providers.
             prevResponseId: response.id,
+            usage: this.normalizeUsage(response),
+        };
+    }
+    normalizeUsage(response) {
+        return {
+            input_tokens: response.usage.input_tokens,
+            output_tokens: response.usage.output_tokens,
         };
     }
     // Private
@@ -128,7 +135,7 @@ class OpenAiClient extends BaseClient_js_1.default {
             };
         }
     }
-    normalizeStreamEvent(event) {
+    normalizeStreamEvent(event, options) {
         const { type } = event;
         if (type === 'response.created') {
             return {
@@ -137,10 +144,20 @@ class OpenAiClient extends BaseClient_js_1.default {
             };
         }
         else if (type === 'response.completed') {
+            const output = event.response.output.find((item) => {
+                return item.type === 'message';
+            });
             return {
                 type: 'stop',
                 id: event.response.id,
-                usage: event.response.usage,
+                messages: [
+                    ...options.messages,
+                    {
+                        role: 'assistant',
+                        content: output?.content[0].text,
+                    },
+                ],
+                usage: this.normalizeUsage(event.response),
             };
         }
         else if (type === 'response.output_text.delta') {
@@ -149,12 +166,6 @@ class OpenAiClient extends BaseClient_js_1.default {
                 delta: event.delta,
             };
         }
-        else if (type === 'response.output_text.done') {
-            return {
-                type: 'done',
-                text: event.text,
-            };
-        }
     }
 }
 exports.OpenAiClient = OpenAiClient;

package/dist/cjs/utils/code.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseCode = parseCode;
 const CODE_REG = /^```\w*(.+)```/s;
 function parseCode(content) {
+    if (!content) {
+        return '';
+    }
     const match = content.trim().match(CODE_REG);
     if (match) {
         content = match[1].trim();

package/dist/esm/BaseClient.js

@@ -24,10 +24,7 @@ export default class BaseClient {
         const { output, stream, schema } = options;
         const response = await this.runPrompt(options);
         if (!stream) {
-            this.debug('Response:', response);
-        }
-        if (output === 'raw') {
-            return response;
+            this.debug('Response:', response, options);
         }
         let result;
         if (schema) {
@@ -43,15 +40,11 @@ export default class BaseClient {
         else {
             result = parseCode(this.getTextResponse(response));
         }
-        if (output === 'messages') {
-            return {
-                result,
-                ...this.getMessagesResponse(response, options),
-            };
-        }
-        else {
-            return result;
-        }
+        return {
+            result,
+            response,
+            ...this.normalizeResponse(response, options),
+        };
     }
     /**
      * Streams the prompt response.
@@ -66,8 +59,8 @@ export default class BaseClient {
             const stream = await this.runStream(options);
             // @ts-ignore
             for await (let event of stream) {
-                this.debug('Event:', event);
-                event = this.normalizeStreamEvent(event);
+                this.debug('Event:', event, options);
+                event = this.normalizeStreamEvent(event, options);
                 if (event) {
                     yield event;
                 }
@@ -89,7 +82,7 @@ export default class BaseClient {
                             key,
                         };
                     }
-                    this.debug('Extract:', extractEvent);
+                    this.debug('Extract:', extractEvent, options);
                     yield extractEvent;
                 }
             }
@@ -134,15 +127,17 @@ export default class BaseClient {
     /**
      * @returns {Object}
      */
-    getMessagesResponse(input, response) {
+    normalizeResponse(response, options) {
         void response;
+        void options;
         throw new Error('Method not implemented.');
     }
     /**
      * @returns {Object}
      */
-    normalizeStreamEvent(event) {
+    normalizeStreamEvent(event, options) {
         void event;
+        void options;
         throw new Error('Method not implemented.');
     }
     // Private
@@ -158,7 +153,18 @@ export default class BaseClient {
         };
     }
     normalizeInputs(options) {
-        const { template, params, output = 'text' } = options;
+        const { output = 'text' } = options;
+        let { system, messages } = this.normalizeTemplateMessages(options);
+        if (output === 'json') {
+            system = [system, 'Output only valid JSON.'].join('\n\n');
+        }
+        return {
+            system,
+            messages: [...messages, ...this.normalizeOptionsMessages(options)],
+        };
+    }
+    normalizeTemplateMessages(options) {
+        const { template, params } = options;
         const { sections } = this.renderer.run({
             params,
             template,
@@ -181,23 +187,25 @@ export default class BaseClient {
                 ];
             }
         }
-        messages = [...messages, ...this.normalizeInput(options)];
-        if (output === 'json') {
-            system = [system, 'Output only valid JSON.'].join('\n\n');
-        }
+        system = system.trim();
         return {
             system,
             messages,
         };
     }
-    normalizeInput(options) {
-        const { input = '' } = options;
-        return [
-            {
-                role: 'user',
-                content: input,
-            },
-        ];
+    normalizeOptionsMessages(options) {
+        const input = options.input || options.messages;
+        if (Array.isArray(input)) {
+            return input;
+        }
+        else {
+            return [
+                {
+                    role: 'user',
+                    content: input || '',
+                },
+            ];
+        }
     }
     normalizeSchema(options) {
         let { schema } = options;
@@ -235,8 +243,8 @@ export default class BaseClient {
             }
         };
     }
-    debug(message, arg) {
-        if (this.options.debug) {
+    debug(message, arg, options) {
+        if (options.debug) {
             // TODO: replace with logger when opentelemetry is removed
             // eslint-disable-next-line
             console.debug(`${message}\n${JSON.stringify(arg, null, 2)}\n`);
@@ -249,7 +257,7 @@ export default class BaseClient {
  * @property {string} [model] - The model to use.
  * @property {boolean} stream - Stream response.
  * @property {Object} [schema] - A JSON schema compatible object that defines the output shape.
- * @property {"raw" | "text" | "json" | "messages"} [output] - The return value type.
+ * @property {"text" | "json"} [output] - The result output type.
  * @property {Object} [params] - Params to be interpolated into the template.
  *                               May also be passed as additional props to options.
  */

package/dist/esm/anthropic.js

@@ -16,31 +16,30 @@ export class AnthropicClient extends BaseClient {
         return data.map((o) => o.id);
     }
     async runPrompt(options) {
-        const { input, model, temperature, instructions, stream = false, tokens = DEFAULT_TOKENS, } = options;
+        const { model, system, messages, temperature, stream = false, tokens = DEFAULT_TOKENS, } = options;
         const params = {
             model,
             stream,
+            system,
+            messages,
             temperature,
             max_tokens: tokens,
-            system: instructions,
-            messages: input,
             ...this.getToolOptions(options),
         };
         const clientOptions = this.getClientOptions(params);
-        this.debug('Params:', params);
-        this.debug('Options:', options);
+        this.debug('Params:', params, options);
+        this.debug('Options:', options, options);
         // @ts-ignore
         return await this.client.messages.create(params, clientOptions);
     }
     async runStream(options) {
         return await this.runPrompt({
             ...options,
-            output: 'raw',
             stream: true,
         });
     }
     getTextResponse(response) {
-        const textBlock = response.content.find((block) => {
+        const textBlock = response?.content.find((block) => {
             return block.type === 'text';
         });
         return textBlock?.text || null;
@@ -51,7 +50,7 @@ export class AnthropicClient extends BaseClient {
         });
         return toolBlock?.input || null;
     }
-    getMessagesResponse(response, options) {
+    normalizeResponse(response, options) {
         const { messages } = options;
         return {
             messages: [
@@ -67,24 +66,41 @@ export class AnthropicClient extends BaseClient {
                     };
                 }),
             ],
+            usage: this.normalizeUsage(response),
         };
     }
-    normalizeStreamEvent(event) {
+    normalizeUsage(response) {
+        return {
+            input_tokens: response.usage.input_tokens,
+            output_tokens: response.usage.output_tokens,
+        };
+    }
+    normalizeStreamEvent(event, options) {
         let { type } = event;
+        options.buffer ||= '';
         if (type === 'content_block_start') {
             return {
                 type: 'start',
             };
         }
-        else if (type === 'content_block_stop') {
+        else if (type === 'content_block_delta') {
+            options.buffer += event.delta.text;
             return {
-                type: 'stop',
+                type: 'delta',
+                delta: event.delta.text,
             };
         }
-        else if (type === 'content_block_delta') {
+        else if (type === 'message_delta') {
             return {
-                type: 'delta',
-                text: event.delta.text,
+                type: 'stop',
+                messages: [
+                    ...options.messages,
+                    {
+                        role: 'assistant',
+                        content: options.buffer,
+                    },
+                ],
+                usage: this.normalizeUsage(event),
             };
         }
     }

package/dist/esm/google.js

@@ -1,11 +1,13 @@
-import { GoogleGenerativeAI } from '@google/generative-ai';
+import { GoogleGenAI } from '@google/genai';
 import BaseClient from './BaseClient.js';
-const DEFAULT_MODEL = 'models/gemini-2.0-flash-exp';
+const DEFAULT_MODEL = 'gemini-2.5-flash';
 export class GoogleClient extends BaseClient {
     constructor(options) {
         super(options);
         const { apiKey } = options;
-        this.client = new GoogleGenerativeAI(apiKey);
+        this.client = new GoogleGenAI({
+            apiKey,
+        });
     }
     /**
      * Lists available models.
@@ -13,63 +15,96 @@ export class GoogleClient extends BaseClient {
      */
     async models() {
         return [
-            'gemini-2.0-flash-exp',
-            'gemini-1.5-flash',
-            'gemini-1.5-flash-8b',
+            // Gemini 3 (Nov 2025)
+            'gemini-3-pro-preview',
+            // Gemini 2.5
+            'gemini-2.5-pro',
+            'gemini-2.5-flash',
+            // Gemini 2.0
+            'gemini-2.0-flash',
+            // Gemini 1.5 (legacy but still available)
             'gemini-1.5-pro',
+            'gemini-1.5-flash',
         ];
     }
-    async getCompletion(options) {
-        const { model = DEFAULT_MODEL, output = 'text', stream = false } = options;
-        const { client } = this;
-        const generator = client.getGenerativeModel({
-            model,
-        });
-        // @ts-ignore
-        const messages = await this.getMessages(options);
-        const prompts = messages.map((message) => {
-            return message.content;
-        });
-        let response;
-        if (stream) {
-            response = await generator.generateContentStream(prompts);
-        }
-        else {
-            response = await generator.generateContent(prompts);
-        }
-        if (output === 'raw') {
-            return response;
-        }
-        // @ts-ignore
-        const parts = response.response.candidates.flatMap((candidate) => {
-            return candidate.content.parts;
+    async runPrompt(options) {
+        const { model = DEFAULT_MODEL, messages, system } = options;
+        const contents = messages.map((message) => {
+            const { role, content } = message;
+            return {
+                role,
+                parts: [
+                    {
+                        text: content,
+                    },
+                ],
+            };
         });
-        const [message] = parts;
-        return message;
+        const params = {
+            model,
+            contents,
+            ...(system && {
+                config: {
+                    systemInstruction: system,
+                },
+            }),
+        };
+        return await this.client.models.generateContent(params);
+    }
+    runStream(options) {
+        const params = this.getParams(options);
+        return this.client.models.generateContentStream(params);
+    }
+    getTextResponse(response) {
+        return response.text;
+    }
+    normalizeResponse(response, options) {
+        const { messages } = options;
+        return {
+            messages: [
+                ...messages,
+                {
+                    role: 'assistant',
+                    content: response.text,
+                },
+            ],
+            usage: this.normalizeUsage(response),
+        };
     }
-    async getStream(options) {
-        // @ts-ignore
-        const response = await super.getStream(options);
-        // @ts-ignore
-        return response.stream;
+    normalizeUsage(response) {
+        return {
+            input_tokens: response.usageMetadata.promptTokenCount,
+            output_tokens: response.usageMetadata.candidatesTokenCount,
+        };
     }
-    getStreamedChunk(chunk, started) {
-        const [candidate] = chunk.candidates;
-        let type;
-        if (!started) {
-            type = 'start';
-        }
-        else if (candidate.finishReason === 'STOP') {
-            type = 'stop';
-        }
-        else {
-            type = 'chunk';
-        }
-        if (type) {
+    getParams(options) {
+        const { model = DEFAULT_MODEL, messages, system } = options;
+        const contents = messages.map((message) => {
+            const { role, content } = message;
             return {
-                type,
-                text: candidate.content.parts[0].text || '',
+                role,
+                parts: [
+                    {
+                        text: content,
+                    },
+                ],
             };
-        }
+        });
+        return {
+            model,
+            contents,
+            ...(system && {
+                config: {
+                    systemInstruction: system,
+                },
+            }),
+        };
+    }
+    normalizeStreamEvent(event) {
+        // Note Gemini doesn't provide different events, only a single GenerateContentResponse.
+        return {
+            type: 'delta',
+            delta: event.text,
+        };
     }
 }

package/dist/esm/openai.js

@@ -52,7 +52,7 @@ export class OpenAiClient extends BaseClient {
                 verbosity,
             },
         };
-        this.debug('Params:', params);
+        this.debug('Params:', params, options);
         // @ts-ignore
         return await this.client.responses.create(params);
     }
@@ -63,7 +63,7 @@ export class OpenAiClient extends BaseClient {
         });
     }
     getTextResponse(response) {
-        return response.output_text;
+        return response?.output_text;
     }
     getStructuredResponse(response) {
         // Note here that certain cases (tool usage etc)
@@ -84,7 +84,7 @@ export class OpenAiClient extends BaseClient {
         const last = outputs[outputs.length - 1];
         return JSON.parse(last.text);
     }
-    getMessagesResponse(response, options) {
+    normalizeResponse(response, options) {
         const { messages } = options;
         return {
             messages: [
@@ -97,6 +97,13 @@ export class OpenAiClient extends BaseClient {
             // Note that this ability currently only
             // exists for OpenAI compatible providers.
             prevResponseId: response.id,
+            usage: this.normalizeUsage(response),
+        };
+    }
+    normalizeUsage(response) {
+        return {
+            input_tokens: response.usage.input_tokens,
+            output_tokens: response.usage.output_tokens,
         };
     }
     // Private
@@ -122,7 +129,7 @@ export class OpenAiClient extends BaseClient {
             };
         }
     }
-    normalizeStreamEvent(event) {
+    normalizeStreamEvent(event, options) {
         const { type } = event;
         if (type === 'response.created') {
             return {
@@ -131,10 +138,20 @@ export class OpenAiClient extends BaseClient {
             };
         }
         else if (type === 'response.completed') {
+            const output = event.response.output.find((item) => {
+                return item.type === 'message';
+            });
             return {
                 type: 'stop',
                 id: event.response.id,
-                usage: event.response.usage,
+                messages: [
+                    ...options.messages,
+                    {
+                        role: 'assistant',
+                        content: output?.content[0].text,
+                    },
+                ],
+                usage: this.normalizeUsage(event.response),
             };
         }
         else if (type === 'response.output_text.delta') {
@@ -143,12 +160,6 @@ export class OpenAiClient extends BaseClient {
                 delta: event.delta,
             };
         }
-        else if (type === 'response.output_text.done') {
-            return {
-                type: 'done',
-                text: event.text,
-            };
-        }
     }
 }
 // Categories

package/dist/esm/utils/code.js

@@ -1,5 +1,8 @@
 const CODE_REG = /^```\w*(.+)```/s;
 export function parseCode(content) {
+    if (!content) {
+        return '';
+    }
     const match = content.trim().match(CODE_REG);
     if (match) {
         content = match[1].trim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrockio/ai",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "description": "Bedrock wrapper for common AI chatbots.",
   "type": "module",
   "scripts": {
@@ -35,9 +35,9 @@
     "url": "https://github.com/bedrockio/router"
   },
   "dependencies": {
-    "@anthropic-ai/sdk": "^0.66.0",
+    "@anthropic-ai/sdk": "^0.71.2",
     "@bedrockio/templates": "^0.3.1",
-    "@google/generative-ai": "^0.21.0",
+    "@google/genai": "^1.34.0",
     "openai": "^6.3.0",
     "partial-json": "^0.1.7"
   },

package/types/BaseClient.d.ts

@@ -32,11 +32,11 @@ export default class BaseClient {
     /**
      * @returns {Object}
      */
-    getMessagesResponse(input: any, response: any): any;
+    normalizeResponse(response: any, options: any): any;
     /**
      * @returns {Object}
      */
-    normalizeStreamEvent(event: any): any;
+    normalizeStreamEvent(event: any, options: any): any;
     /**
      * @returns {Object}
      */
@@ -45,16 +45,17 @@ export default class BaseClient {
         system: string;
         messages: any[];
     };
-    normalizeInput(options: any): {
-        role: string;
-        content: any;
-    }[];
+    normalizeTemplateMessages(options: any): {
+        system: string;
+        messages: any[];
+    };
+    normalizeOptionsMessages(options: any): any[];
     normalizeSchema(options: any): {
         schema: any;
         hasWrappedSchema: boolean;
     };
     getMessageExtractor(options: any): (event: any) => any;
-    debug(message: any, arg: any): void;
+    debug(message: any, arg: any, options: any): void;
 }
 export type PromptOptions = {
     /**
@@ -74,9 +75,9 @@ export type PromptOptions = {
      */
     schema?: any;
     /**
-     * - The return value type.
+     * - The result output type.
      */
-    output?: "raw" | "text" | "json" | "messages";
+    output?: "text" | "json";
     /**
      * - Params to be interpolated into the template.
      *    May also be passed as additional props to options.

package/types/BaseClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseClient.d.ts","sourceRoot":"","sources":["../src/BaseClient.js"],"names":[],"mappings":"AAKA;IACE,0BASC;IARC,aAIC;IACD,2BAEE;IAKJ;;;;;OAKG;IACH,gBAFW,aAAa,gBAuCvB;IAED;;;;;OAKG;IACH,gBAHW,aAAa,GAAG,aAAa,gCAsDvC;IAED;;;;OAIG;IACH,wBAFW,MAAM,OAIhB;IAID,8BAGC;IAED,8BAGC;IAED,qCAGC;IAED;;OAEG;IACH,0CAGC;IAED;;OAEG;IACH,oDAGC;IAED;;OAEG;IACH,sCAGC;IAID;;OAEG;IACH,oCAOC;IAED;;;MAuCC;IAED;;;QAQC;IAED;;;MA4BC;IAED,uDAWC;IAED,oCAMC;CACF;;;;;WAIa,MAAM,GAAC,aAAa,EAAE;;;;YACtB,MAAM;;;;YACN,OAAO;;;;;;;;aAEP,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU;;;;;;;;;;;sBAOpC,MAAM;;;UAKN,QAAQ,GAAG,MAAM,GAAG,WAAW;aAC/B,MAAM;;iCArTa,sBAAsB"}
+{"version":3,"file":"BaseClient.d.ts","sourceRoot":"","sources":["../src/BaseClient.js"],"names":[],"mappings":"AAKA;IACE,0BASC;IARC,aAIC;IACD,2BAEE;IAKJ;;;;;OAKG;IACH,gBAFW,aAAa,gBAgCvB;IAED;;;;;OAKG;IACH,gBAHW,aAAa,GAAG,aAAa,gCAsDvC;IAED;;;;OAIG;IACH,wBAFW,MAAM,OAIhB;IAID,8BAGC;IAED,8BAGC;IAED,qCAGC;IAED;;OAEG;IACH,0CAGC;IAED;;OAEG;IACH,oDAIC;IAED;;OAEG;IACH,oDAIC;IAID;;OAEG;IACH,oCAOC;IAED;;;MAaC;IAED;;;MAmCC;IAED,8CAaC;IAED;;;MA4BC;IAED,uDAWC;IAED,kDAMC;CACF;;;;;WAIa,MAAM,GAAC,aAAa,EAAE;;;;YACtB,MAAM;;;;YACN,OAAO;;;;;;;;aAEP,MAAM,GAAG,MAAM;;;;;;;;;;;sBAOf,MAAM;;;UAKN,QAAQ,GAAG,MAAM,GAAG,WAAW;aAC/B,MAAM;;iCAhUa,sBAAsB"}

package/types/anthropic.d.ts

@@ -13,15 +13,35 @@ export class AnthropicClient extends BaseClient {
         _request_id?: string | null;
     } & import("@anthropic-ai/sdk/core/streaming.js").Stream<Anthropic.Messages.RawMessageStreamEvent>>;
     getTextResponse(response: any): any;
-    getMessagesResponse(response: any, options: any): {
+    normalizeResponse(response: any, options: any): {
         messages: any[];
+        usage: {
+            input_tokens: any;
+            output_tokens: any;
+        };
+    };
+    normalizeUsage(response: any): {
+        input_tokens: any;
+        output_tokens: any;
     };
-    normalizeStreamEvent(event: any): {
+    normalizeStreamEvent(event: any, options: any): {
+        type: string;
+        delta?: undefined;
+        messages?: undefined;
+        usage?: undefined;
+    } | {
         type: string;
-        text?: undefined;
+        delta: any;
+        messages?: undefined;
+        usage?: undefined;
     } | {
         type: string;
-        text: any;
+        messages: any[];
+        usage: {
+            input_tokens: any;
+            output_tokens: any;
+        };
+        delta?: undefined;
     };
     getToolOptions(options: any): {
         tools: any;

package/types/anthropic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"anthropic.d.ts","sourceRoot":"","sources":["../src/anthropic.js"],"names":[],"mappings":"AAMA;IACE,6BAA2C;IAIzC,kBAAoC;IAGtC;;;OAGG;IACH,4BAGC;IAED;;wGA2BC;IAED;;wGAMC;IAED,oCAKC;IASD;;MAiBC;IAED;;;;;;MAgBC;IAID;;;;;;;;;;MAsCC;IAID;;;;MAOC;IAED;;;;MAQC;CACF;uBA3KsB,iBAAiB;sBAFlB,mBAAmB"}
+{"version":3,"file":"anthropic.d.ts","sourceRoot":"","sources":["../src/anthropic.js"],"names":[],"mappings":"AAMA;IACE,6BAA2C;IAIzC,kBAAoC;IAGtC;;;OAGG;IACH,4BAGC;IAED;;wGA2BC;IAED;;wGAKC;IAED,oCAKC;IASD;;;;;;MAkBC;IAED;;;MAKC;IAED;;;;;;;;;;;;;;;;;;MA0BC;IAID;;;;;;;;;;MAsCC;IAID;;;;MAOC;IAED;;;;MAQC;CACF;uBA5LsB,iBAAiB;sBAFlB,mBAAmB"}

package/types/google.d.ts

@@ -1,17 +1,36 @@
 export class GoogleClient extends BaseClient {
-    client: GoogleGenerativeAI;
+    client: GoogleGenAI;
     /**
      * Lists available models.
      * {@link https://ai.google.dev/gemini-api/docs/models/gemini#gemini-2.0-flashl Documentation}
      */
     models(): Promise<string[]>;
-    getCompletion(options: any): Promise<any>;
-    getStream(options: any): Promise<any>;
-    getStreamedChunk(chunk: any, started: any): {
+    runPrompt(options: any): Promise<import("@google/genai").GenerateContentResponse>;
+    runStream(options: any): Promise<AsyncGenerator<import("@google/genai").GenerateContentResponse, any, any>>;
+    getTextResponse(response: any): any;
+    normalizeResponse(response: any, options: any): {
+        messages: any[];
+        usage: {
+            input_tokens: any;
+            output_tokens: any;
+        };
+    };
+    normalizeUsage(response: any): {
+        input_tokens: any;
+        output_tokens: any;
+    };
+    getParams(options: any): {
+        config: {
+            systemInstruction: any;
+        };
+        model: any;
+        contents: any;
+    };
+    normalizeStreamEvent(event: any): {
         type: string;
-        text: any;
+        delta: any;
     };
 }
 import BaseClient from './BaseClient.js';
-import { GoogleGenerativeAI } from '@google/generative-ai';
+import { GoogleGenAI } from '@google/genai';
 //# sourceMappingURL=google.d.ts.map

package/types/google.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"google.d.ts","sourceRoot":"","sources":["../src/google.js"],"names":[],"mappings":"AAMA;IAII,2BAA4C;IAG9C;;;OAGG;IACH,4BAOC;IAED,0CAkCC;IACD,sCAKC;IAED;;;MAkBC;CACF;uBArFsB,iBAAiB;mCAFL,uBAAuB"}
+{"version":3,"file":"google.d.ts","sourceRoot":"","sources":["../src/google.js"],"names":[],"mappings":"AAMA;IAII,oBAEE;IAGJ;;;OAGG;IACH,4BAgBC;IAED,kFA0BC;IAED,4GAGC;IAED,oCAEC;IAED;;;;;;MAYC;IAED;;;MAKC;IAED;;;;;;MAwBC;IAED;;;MAMC;CACF;uBA9HsB,iBAAiB;4BAFZ,eAAe"}

package/types/openai.d.ts

@@ -14,9 +14,17 @@ export class OpenAiClient extends BaseClient {
         _request_id?: string | null;
     } & import("openai/core/streaming.js").Stream<OpenAI.Responses.ResponseStreamEvent>>;
     getTextResponse(response: any): any;
-    getMessagesResponse(response: any, options: any): {
+    normalizeResponse(response: any, options: any): {
         messages: any[];
         prevResponseId: any;
+        usage: {
+            input_tokens: any;
+            output_tokens: any;
+        };
+    };
+    normalizeUsage(response: any): {
+        input_tokens: any;
+        output_tokens: any;
     };
     getOutputFormat(options: any): {
         type: string;
@@ -29,30 +37,27 @@ export class OpenAiClient extends BaseClient {
         strict: boolean;
         schema: any;
     };
-    normalizeStreamEvent(event: any): {
+    normalizeStreamEvent(event: any, options: any): {
         type: string;
         id: any;
+        messages?: undefined;
         usage?: undefined;
         delta?: undefined;
-        text?: undefined;
     } | {
         type: string;
         id: any;
-        usage: any;
+        messages: any[];
+        usage: {
+            input_tokens: any;
+            output_tokens: any;
+        };
         delta?: undefined;
-        text?: undefined;
     } | {
         type: string;
         delta: any;
         id?: undefined;
+        messages?: undefined;
         usage?: undefined;
-        text?: undefined;
-    } | {
-        type: string;
-        text: any;
-        id?: undefined;
-        usage?: undefined;
-        delta?: undefined;
     };
 }
 export type OpenAICategory = any | "all" | "general" | "reasoning" | "lightweight" | "moderation" | "embedding" | "speech" | "audio" | "image" | "code" | "legacy";

package/types/openai.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../src/openai.js"],"names":[],"mappings":"AAIA;IACE,6BAAoC;IAIlC,eAAiC;IAGnC;;;;OAIG;IACH,kBAHW,cAAc,qBAgCxB;IAED;;yFAiCC;IAED;;yFAKC;IAED,oCAEC;IAwBD;;;MAcC;IAID;;;;;;;;;;MAmBC;IAED;;;;;;;;;;;;;;;;;;;;;;;;MAyBC;CACF;6BAQA,GAAC,GAAK,KAAK,GACL,SAAS,GACT,WAAW,GACX,aAAa,GACb,YAAY,GACZ,WAAW,GACX,QAAQ,GACR,OAAO,GACP,OAAO,GACP,MAAM,GACN,QAAQ;uBArMQ,iBAAiB;mBAFrB,QAAQ"}
+{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../src/openai.js"],"names":[],"mappings":"AAIA;IACE,6BAAoC;IAIlC,eAAiC;IAGnC;;;;OAIG;IACH,kBAHW,cAAc,qBAgCxB;IAED;;yFAiCC;IAED;;yFAKC;IAED,oCAEC;IAwBD;;;;;;;MAeC;IAED;;;MAKC;IAID;;;;;;;;;;MAmBC;IAED;;;;;;;;;;;;;;;;;;;;;MA8BC;CACF;6BAQA,GAAC,GAAK,KAAK,GACL,SAAS,GACT,WAAW,GACX,aAAa,GACb,YAAY,GACZ,WAAW,GACX,QAAQ,GACR,OAAO,GACP,OAAO,GACP,MAAM,GACN,QAAQ;uBAlNQ,iBAAiB;mBAFrB,QAAQ"}

package/types/utils/code.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"code.d.ts","sourceRoot":"","sources":["../../src/utils/code.js"],"names":[],"mappings":"AAEA,6CAMC"}
+{"version":3,"file":"code.d.ts","sourceRoot":"","sources":["../../src/utils/code.js"],"names":[],"mappings":"AAEA,6CAUC"}