@bedrockio/ai 0.3.0 → 0.4.4

package/dist/esm/openai.js

@@ -0,0 +1,113 @@
+import OpenAI from 'openai';
+import BaseClient from './BaseClient.js';
+export class OpenAiClient extends BaseClient {
+    static DEFAULT_MODEL = 'gpt-5-nano';
+    constructor(options) {
+        super(options);
+        this.client = new OpenAI(options);
+    }
+    /**
+     * Lists available models.
+     * {@link https://platform.openai.com/docs/models Documentation}
+     */
+    async models() {
+        const { data } = await this.client.models.list();
+        return data.map((o) => o.id);
+    }
+    async runPrompt(options) {
+        const { input, model, tools, verbosity, temperature, instructions, prevResponseId, stream = false, } = options;
+        const params = {
+            model,
+            input,
+            tools,
+            stream,
+            temperature,
+            instructions,
+            previous_response_id: prevResponseId,
+            text: {
+                format: this.getOutputFormat(options),
+                verbosity,
+            },
+        };
+        this.debug('Params:', params);
+        // @ts-ignore
+        return await this.client.responses.create(params);
+    }
+    async runStream(options) {
+        return await this.runPrompt({
+            ...options,
+            stream: true,
+        });
+    }
+    getTextResponse(response) {
+        return response.output_text;
+    }
+    getStructuredResponse(response) {
+        return JSON.parse(response.output_text);
+    }
+    getMessagesResponse(input, response) {
+        return {
+            messages: [
+                ...input,
+                {
+                    role: 'assistant',
+                    content: response.output_text,
+                },
+            ],
+            // Note that this ability currently only
+            // exists for OpenAI compatible providers.
+            prevResponseId: response.id,
+        };
+    }
+    // Private
+    getOutputFormat(options) {
+        let { output, schema } = options;
+        if (output === 'json') {
+            return {
+                type: 'json_object',
+            };
+        }
+        else if (schema) {
+            return {
+                type: 'json_schema',
+                // Name is required but arbitrary.
+                name: 'schema',
+                strict: true,
+                schema,
+            };
+        }
+        else {
+            return {
+                type: 'text',
+            };
+        }
+    }
+    normalizeStreamEvent(event) {
+        const { type } = event;
+        if (type === 'response.created') {
+            return {
+                type: 'start',
+                id: event.response.id,
+            };
+        }
+        else if (type === 'response.completed') {
+            return {
+                type: 'stop',
+                id: event.response.id,
+                usage: event.response.usage,
+            };
+        }
+        else if (type === 'response.output_text.delta') {
+            return {
+                type: 'delta',
+                delta: event.delta,
+            };
+        }
+        else if (type === 'response.output_text.done') {
+            return {
+                type: 'done',
+                text: event.text,
+            };
+        }
+    }
+}

package/dist/esm/utils/code.js

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

package/dist/esm/utils/json.js

@@ -0,0 +1,50 @@
+import { OBJ, STR, parse } from 'partial-json';
+export function createMessageExtractor(keys) {
+    let buffer = '';
+    const extractors = keys.map((key) => {
+        return createExtractor(key);
+    });
+    return (delta) => {
+        buffer += delta;
+        return extractors
+            .map((extractor) => {
+            return extractor(buffer);
+        })
+            .filter((extracted) => {
+            return extracted;
+        });
+    };
+}
+function createExtractor(key) {
+    let lastText = '';
+    let done = false;
+    return (buffer) => {
+        if (done) {
+            return;
+        }
+        const text = extractText(buffer, key);
+        if (!text) {
+            return;
+        }
+        // Don't finish while the buffer has whitespace as it
+        // may be in the middle of trying to extract.
+        if (text === lastText && !buffer.endsWith(' ')) {
+            done = true;
+        }
+        const delta = text.slice(lastText.length);
+        lastText = text;
+        return {
+            key,
+            text,
+            delta,
+            done,
+        };
+    };
+}
+function extractText(input, key) {
+    if (!input) {
+        return;
+    }
+    const parsed = parse(input, STR | OBJ);
+    return parsed?.[key] || '';
+}

package/dist/esm/utils/templates.js

@@ -0,0 +1,76 @@
+import fs from 'fs/promises';
+import path from 'path';
+import { glob } from 'glob';
+import Mustache from 'mustache';
+export async function loadTemplates(dir) {
+    const result = {};
+    const files = await glob(path.join(dir, '*.md'));
+    if (!files.length) {
+        throw new Error(`No templates found in: ${dir}.`);
+    }
+    for (let file of files) {
+        const base = path.basename(file, '.md');
+        result[base] = await loadTemplate(file);
+    }
+    return result;
+}
+export function renderTemplate(template, options) {
+    let params = {
+        ...options,
+        ...options.params,
+    };
+    params = mapObjects(params);
+    params = wrapProxy(params);
+    return Mustache.render(template, params);
+}
+// Utils
+async function loadTemplate(file) {
+    return await fs.readFile(file, 'utf-8');
+}
+// Transform arrays and object to versions
+// that are more understandable in the context
+// of a template that may have meaningful whitespace.
+function mapObjects(params) {
+    const result = {};
+    for (let [key, value] of Object.entries(params)) {
+        if (Array.isArray(value)) {
+            value = mapArray(value);
+        }
+        else if (typeof value === 'object') {
+            value = JSON.stringify(value, null, 2);
+        }
+        result[key] = value;
+    }
+    return result;
+}
+function mapArray(arr) {
+    // Only map simple arrays of primitives.
+    if (typeof arr[0] === 'string') {
+        arr = arr
+            .map((el) => {
+            return `- ${el}`;
+        })
+            .join('\n');
+    }
+    return arr;
+}
+// Wrap params with a proxy object that reports
+// as having all properties. If one is accessed
+// that does not exist then return the original
+// token. This way templates can be partially
+// interpolated and re-interpolated later.
+function wrapProxy(params) {
+    return new Proxy(params, {
+        has() {
+            return true;
+        },
+        get(target, prop) {
+            if (prop in target) {
+                return target[prop];
+            }
+            else {
+                return `{{{${prop.toString()}}}}`;
+            }
+        },
+    });
+}

package/dist/esm/xai.js

@@ -0,0 +1,10 @@
+import { OpenAiClient } from './openai.js';
+export class XAiClient extends OpenAiClient {
+    static DEFAULT_MODEL = 'grok-4-fast';
+    constructor(options) {
+        super({
+            ...options,
+            baseURL: 'https://api.x.ai/v1',
+        });
+    }
+}

package/package.json

@@ -1,21 +1,25 @@
 {
   "name": "@bedrockio/ai",
-  "version": "0.3.0",
+  "version": "0.4.4",
   "description": "Bedrock wrapper for common AI chatbots.",
   "type": "module",
   "scripts": {
-    "test": "node --no-warnings node_modules/.bin/jest",
-    "types": "tsc",
+    "test": "vitest run",
+    "test:live": "node --env-file=.env.live ./node_modules/.bin/vitest run",
     "lint": "eslint",
     "build": "scripts/build",
     "eject": "scripts/eject",
-    "prepublish": "yarn build && yarn types"
+    "build:cjs": "tsc -p tsconfig.cjs.json",
+    "build:esm": "tsc -p tsconfig.esm.json && tsc-alias -f -p tsconfig.esm.json",
+    "build:types": "tsc -p tsconfig.types.json",
+    "prepublish": "yarn build"
   },
   "types": "types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "exports": {
     ".": {
-      "import": "./src/index.js",
+      "types": "./types/index.d.ts",
+      "import": "./dist/esm/index.js",
       "require": "./dist/cjs/index.js"
     }
   },
@@ -31,27 +35,30 @@
     "url": "https://github.com/bedrockio/router"
   },
   "dependencies": {
-    "@anthropic-ai/sdk": "^0.36.3",
+    "@anthropic-ai/sdk": "^0.65.0",
     "@google/generative-ai": "^0.21.0",
     "glob": "^11.0.1",
     "mustache": "^4.2.0",
-    "openai": "^4.83.0"
+    "openai": "^6.1.0",
+    "partial-json": "^0.1.7"
   },
   "devDependencies": {
-    "@babel/cli": "^7.26.4",
-    "@babel/core": "^7.26.0",
-    "@babel/eslint-parser": "^7.26.5",
-    "@babel/preset-env": "^7.26.0",
+    "@bedrockio/eslint-plugin": "^1.2.2",
     "@bedrockio/prettier-config": "^1.0.2",
-    "eslint": "^8.33.0",
-    "eslint-plugin-bedrock": "^1.0.27",
-    "eslint-plugin-import": "^2.31.0",
-    "jest": "^29.7.0",
-    "prettier-eslint": "^16.3.0",
-    "typescript": "^5.7.3"
+    "@bedrockio/yada": "^1.8.0",
+    "eslint": "^9.36.0",
+    "tsc-alias": "^1.8.16",
+    "typescript": "^5.9.3",
+    "vitest": "^3.2.4"
   },
+  "files": [
+    "dist/**",
+    "types/**",
+    "README.md",
+    "CHANGELOG.md"
+  ],
   "volta": {
-    "node": "22.12.0",
+    "node": "22.20.0",
     "yarn": "1.22.22"
   }
 }

package/types/BaseClient.d.ts

@@ -3,38 +3,79 @@ export default class BaseClient {
     options: any;
     templates: any;
     /**
-     * Interpolates vars into the provided template and
-     * runs the chat completion. The "output" option may
-     * be omitted and will default to `"text"`.
-     * {@link https://github.com/bedrockio/ai?tab=readme-ov-file#bedrockioai Documentation}
+     * Interpolates vars into the provided template as instructions and runs the
+     * prompt.
      *
-     * @param {object} options
-     * @param {string} options.model - The model to use.
-     * @param {"raw" | "text" | "json" | "messages"} [options.output] - The output to use.
-     * @param {Object.<string, any>} [options.other] - Additional props
-     *             will be interpolated in the template.
-     */
-    prompt(options: {
-        model: string;
-        output?: "raw" | "text" | "json" | "messages";
-        other?: {
-            [x: string]: any;
-        };
-    }): Promise<void>;
+     * @param {PromptOptions} options
+     */
+    prompt(options: PromptOptions): Promise<any>;
     /**
      * Streams the prompt response.
+     *
+     * @param {PromptOptions & StreamOptions} options
      * @returns {AsyncIterator}
      */
-    stream(options: any): AsyncIterator<any, any, any>;
-    getMessages(options: any): Promise<{
-        role: any;
-        content: any;
-    }[]>;
+    stream(options: PromptOptions & StreamOptions): AsyncIterator<any, any, any>;
     buildTemplate(options: any): Promise<any>;
-    loadTemplates(): Promise<void>;
+    runPrompt(options: any): void;
+    runStream(options: any): void;
+    getTextResponse(response: any): void;
+    /**
+     * @returns {Object}
+     */
+    getStructuredResponse(response: any): any;
+    /**
+     * @returns {Object}
+     */
+    getMessagesResponse(input: any, response: any): any;
+    /**
+     * @returns {Object}
+     */
+    normalizeStreamEvent(event: any): any;
+    normalizeOptions(options: any): Promise<any>;
+    normalizeInput(options: any): any;
+    normalizeSchema(options: any): any;
+    getMessageExtractor(options: any): (event: any) => any;
+    debug(message: any, arg: any): void;
+    resolveInstructions(options: any): Promise<any>;
     resolveTemplate(options: any): Promise<any>;
-    getStream(options: any): Promise<void>;
-    getCompletion(options: any): void;
-    getStreamedChunk(chunk: any, started: any): void;
+    loadTemplates(): Promise<void>;
 }
+export type PromptOptions = {
+    /**
+     * - Input to use.
+     */
+    input: string | PromptMessage[];
+    /**
+     * - The model to use.
+     */
+    model?: string;
+    /**
+     * - Stream response.
+     */
+    stream: boolean;
+    /**
+     * - A JSON schema compatible object that defines the output shape.
+     */
+    schema?: any;
+    /**
+     * - The return value type.
+     */
+    output?: "raw" | "text" | "json" | "messages";
+    /**
+     * - Params to be interpolated into the template.
+     *    May also be passed as additional props to options.
+     */
+    params?: any;
+};
+export type StreamOptions = {
+    /**
+     * - Key in JSON response to extract a message stream from.
+     */
+    extractMessages?: string;
+};
+export type PromptMessage = {
+    role: "system" | "user" | "assistant";
+    content: string;
+};
 //# sourceMappingURL=BaseClient.d.ts.map

package/types/BaseClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseClient.d.ts","sourceRoot":"","sources":["../src/BaseClient.js"],"names":[],"mappings":"AAMA;IACE,0BAGC;IAFC,aAAsB;IACtB,eAAqB;IAGvB;;;;;;;;;;;OAWG;IACH,gBALG;QAAwB,KAAK,EAArB,MAAM;QACyC,MAAM,GAArD,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU;QACL,KAAK,GAApC;gBAAQ,MAAM,GAAE,GAAG;SAAC;KAE9B,iBAYA;IAED;;;OAGG;IACH,mDAeC;IAED;;;SAkCC;IAED,0CAGC;IAED,+BAGC;IAED,4CAUC;IAED,uCAMC;IAED,kCAGC;IAED,iDAIC;CACF"}
+{"version":3,"file":"BaseClient.d.ts","sourceRoot":"","sources":["../src/BaseClient.js"],"names":[],"mappings":"AAIA;IACE,0BAOC;IANC,aAIC;IACD,eAAqB;IAKvB;;;;;OAKG;IACH,gBAFW,aAAa,gBAuCvB;IAED;;;;;OAKG;IACH,gBAHW,aAAa,GAAG,aAAa,gCAsDvC;IAED,0CAGC;IAID,8BAGC;IAED,8BAGC;IAED,qCAGC;IAED;;OAEG;IACH,0CAGC;IAED;;OAEG;IACH,oDAGC;IAED;;OAEG;IACH,sCAGC;IAID,6CAaC;IAED,kCAiBC;IAED,mCAuBC;IAED,uDAWC;IAED,oCAMC;IAED,gDAKC;IAED,4CAIC;IAED,+BAGC;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"}

package/types/anthropic.d.ts

@@ -1,15 +1,39 @@
 export class AnthropicClient extends BaseClient {
+    static DEFAULT_MODEL: string;
     client: Anthropic;
     /**
      * Lists available models.
      * {@link https://docs.anthropic.com/en/docs/about-claude/models Documentation}
      */
     models(): Promise<string[]>;
-    getCompletion(options: any): Promise<any>;
-    getStreamedChunk(chunk: any): {
+    runPrompt(options: any): Promise<Anthropic.Messages.Message & {
+        _request_id?: string | null;
+    } & import("@anthropic-ai/sdk/core/streaming.js").Stream<Anthropic.Messages.RawMessageStreamEvent>>;
+    runStream(options: any): Promise<Anthropic.Messages.Message & {
+        _request_id?: string | null;
+    } & import("@anthropic-ai/sdk/core/streaming.js").Stream<Anthropic.Messages.RawMessageStreamEvent>>;
+    getTextResponse(response: any): any;
+    getMessagesResponse(input: any, response: any): {
+        messages: any[];
+    };
+    normalizeStreamEvent(event: any): {
+        type: string;
+        text?: undefined;
+    } | {
         type: string;
         text: any;
     };
+    getSchemaOptions(options: any): {
+        tools: {
+            name: string;
+            description: string;
+            input_schema: any;
+        }[];
+        tool_choice: {
+            type: string;
+            name: string;
+        };
+    };
 }
 import BaseClient from './BaseClient.js';
 import Anthropic from '@anthropic-ai/sdk';

package/types/anthropic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"anthropic.d.ts","sourceRoot":"","sources":["../src/anthropic.js"],"names":[],"mappings":"AAQA;IAGI,kBAEE;IAGJ;;;OAGG;IACH,4BAGC;IAED,0CAsCC;IAED;;;MAiBC;CACF;uBAjFsB,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;;wGAoBC;IAED;;wGAMC;IAED,oCAKC;IASD;;MAgBC;IAED;;;;;;MAgBC;IAID;;;;;;;;;;MA8BC;CACF;uBAtIsB,iBAAiB;sBAFlB,mBAAmB"}

package/types/google.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"google.d.ts","sourceRoot":"","sources":["../src/google.js"],"names":[],"mappings":"AAOA;IAII,2BAA4C;IAG9C;;;OAGG;IACH,4BAOC;IAED,0CAqCC;IACD,sCAIC;IAED;;;MAkBC;CACF;uBAxFsB,iBAAiB;mCAFL,uBAAuB"}
+{"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"}

package/types/index.d.ts

@@ -1,12 +1,5 @@
-export class Client {
-    constructor(options?: {});
-}
-export class MultiClient {
-    constructor(options: any);
-    clients: {};
-    prompt(options: any): any;
-    stream(options: any): any;
-    buildTemplate(options: any): any;
-    getClient(options: any): any;
-}
+export function createClient(options?: {}): AnthropicClient | GoogleClient | OpenAiClient;
+import { AnthropicClient } from './anthropic.js';
+import { GoogleClient } from './google.js';
+import { OpenAiClient } from './openai.js';
 //# sourceMappingURL=index.d.ts.map

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":"AAKA;IACE,0BASC;CACF;AAED;IACE,0BAeC;IAZC,YAAiB;IAcnB,0BAEC;IAED,0BAEC;IAED,iCAEC;IAED,6BAOC;CACF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":"AAKA,0FAkBC;gCAvB+B,gBAAgB;6BACnB,aAAa;6BACb,aAAa"}

package/types/openai.d.ts

@@ -1,14 +1,57 @@
 export class OpenAiClient extends BaseClient {
+    static DEFAULT_MODEL: string;
     client: OpenAI;
     /**
      * Lists available models.
      * {@link https://platform.openai.com/docs/models Documentation}
      */
     models(): Promise<string[]>;
-    getCompletion(options: any): Promise<any>;
-    getStreamedChunk(chunk: any, started: any): {
+    runPrompt(options: any): Promise<OpenAI.Responses.Response & {
+        _request_id?: string | null;
+    } & import("openai/core/streaming.js").Stream<OpenAI.Responses.ResponseStreamEvent>>;
+    runStream(options: any): Promise<OpenAI.Responses.Response & {
+        _request_id?: string | null;
+    } & import("openai/core/streaming.js").Stream<OpenAI.Responses.ResponseStreamEvent>>;
+    getTextResponse(response: any): any;
+    getMessagesResponse(input: any, response: any): {
+        messages: any[];
+        prevResponseId: any;
+    };
+    getOutputFormat(options: any): {
+        type: string;
+        name?: undefined;
+        strict?: undefined;
+        schema?: undefined;
+    } | {
+        type: string;
+        name: string;
+        strict: boolean;
+        schema: any;
+    };
+    normalizeStreamEvent(event: any): {
+        type: string;
+        id: any;
+        usage?: undefined;
+        delta?: undefined;
+        text?: undefined;
+    } | {
+        type: string;
+        id: any;
+        usage: any;
+        delta?: undefined;
+        text?: undefined;
+    } | {
+        type: string;
+        delta: any;
+        id?: undefined;
+        usage?: undefined;
+        text?: undefined;
+    } | {
         type: string;
         text: any;
+        id?: undefined;
+        usage?: undefined;
+        delta?: undefined;
     };
 }
 import BaseClient from './BaseClient.js';

package/types/openai.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../src/openai.js"],"names":[],"mappings":"AAOA;IAGI,eAEE;IAGJ;;;OAGG;IACH,4BAGC;IAED,0CAyBC;IAED;;;MAkBC;CACF;uBApEsB,iBAAiB;mBAFrB,QAAQ"}
+{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../src/openai.js"],"names":[],"mappings":"AAIA;IACE,6BAAoC;IAIlC,eAAiC;IAGnC;;;OAGG;IACH,4BAGC;IAED;;yFA+BC;IAED;;yFAKC;IAED,oCAEC;IAMD;;;MAaC;IAID;;;;;;;;;;MAmBC;IAED;;;;;;;;;;;;;;;;;;;;;;;;MAyBC;CACF;uBAnIsB,iBAAiB;mBAFrB,QAAQ"}

package/types/utils/code.d.ts

@@ -0,0 +1,2 @@
+export function parseCode(content: any): any;
+//# sourceMappingURL=code.d.ts.map

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

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

package/types/utils/json.d.ts

@@ -0,0 +1,2 @@
+export function createMessageExtractor(keys: any): (delta: any) => any;
+//# sourceMappingURL=json.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["../../src/utils/json.js"],"names":[],"mappings":"AAEA,oDAKU,UAAK,SAUd"}

package/types/utils/templates.d.ts

@@ -0,0 +1,3 @@
+export function loadTemplates(dir: any): Promise<{}>;
+export function renderTemplate(template: any, options: any): any;
+//# sourceMappingURL=templates.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../src/utils/templates.js"],"names":[],"mappings":"AAMA,qDAcC;AAED,iEASC"}

package/types/utils.d.ts

@@ -0,0 +1,4 @@
+export function loadTemplates(dir: any): Promise<{}>;
+export function parseCode(content: any): any;
+export function renderTemplate(template: any, options: any): any;
+//# sourceMappingURL=utils.d.ts.map

package/types/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.js"],"names":[],"mappings":"AAQA,qDAcC;AAED,6CAMC;AAED,iEASC"}

package/types/xai.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"xai.d.ts","sourceRoot":"","sources":["../src/xai.js"],"names":[],"mappings":"AAIA;CAcC;6BAlB4B,aAAa"}
+{"version":3,"file":"xai.d.ts","sourceRoot":"","sources":["../src/xai.js"],"names":[],"mappings":"AAEA;CASC;6BAX4B,aAAa"}

package/.prettierignore

@@ -1 +0,0 @@
-test/templates

package/.prettierrc.cjs

@@ -1 +0,0 @@
-module.exports = require('@bedrockio/prettier-config');