@llumiverse/core 0.20.0 → 0.22.0-dev.1

package/src/CompletionStream.ts

@@ -1,76 +1,140 @@
-import { AbstractDriver } from "./Driver.js";
 import { CompletionStream, DriverOptions, ExecutionOptions, ExecutionResponse, ExecutionTokenUsage } from "@llumiverse/common";
+import { AbstractDriver } from "./Driver.js";
 
 export class DefaultCompletionStream<PromptT = any> implements CompletionStream<PromptT> {
 
-    chunks: string[];
+    chunks: number; // Counter for number of chunks instead of storing strings
     completion: ExecutionResponse<PromptT> | undefined;
 
     constructor(public driver: AbstractDriver<DriverOptions, PromptT>,
         public prompt: PromptT,
         public options: ExecutionOptions) {
-        this.chunks = [];
+        this.chunks = 0;
     }
 
     async *[Symbol.asyncIterator]() {
         // reset state
         this.completion = undefined;
-        if (this.chunks.length > 0) {
-            this.chunks = [];
-        }
-        const chunks = this.chunks;
+        this.chunks = 0;
+        const accumulatedResults: any[] = []; // Accumulate CompletionResult[] from chunks
 
         this.driver.logger.debug(
-            `[${this.driver.provider}] Streaming Execution of ${this.options.model} with prompt`, this.prompt,
+            `[${this.driver.provider}] Streaming Execution of ${this.options.model} with prompt`,
         );
 
         const start = Date.now();
-        const stream = await this.driver.requestTextCompletionStream(this.prompt, this.options);
-
         let finish_reason: string | undefined = undefined;
         let promptTokens: number = 0;
         let resultTokens: number | undefined = undefined;
-        for await (const chunk of stream) {
-            if (chunk) {
-                if (typeof chunk === 'string') {
-                    chunks.push(chunk);
-                    yield chunk;
-                } else {
-                    if (chunk.finish_reason) {                           //Do not replace non-null values with null values
-                        finish_reason = chunk.finish_reason;             //Used to skip empty finish_reason chunks coming after "stop" or "length"
-                    }
-                    if (chunk.token_usage) {
-                        //Tokens returned include prior parts of stream,
-                        //so overwrite rather than accumulate
-                        //Math.max used as some models report final token count at beginning of stream
-                        promptTokens = Math.max(promptTokens, chunk.token_usage.prompt ?? 0);
-                        resultTokens = Math.max(resultTokens ?? 0, chunk.token_usage.result ?? 0);
-                    }
-                    if (chunk.result) {
-                        chunks.push(chunk.result);
-                        yield chunk.result;
+
+        try {
+            const stream = await this.driver.requestTextCompletionStream(this.prompt, this.options);
+            for await (const chunk of stream) {
+                if (chunk) {
+                    if (typeof chunk === 'string') {
+                        this.chunks++;
+                        yield chunk;
+                    } else {
+                        if (chunk.finish_reason) {                           //Do not replace non-null values with null values
+                            finish_reason = chunk.finish_reason;             //Used to skip empty finish_reason chunks coming after "stop" or "length"
+                        }
+                        if (chunk.token_usage) {
+                            //Tokens returned include prior parts of stream,
+                            //so overwrite rather than accumulate
+                            //Math.max used as some models report final token count at beginning of stream
+                            promptTokens = Math.max(promptTokens, chunk.token_usage.prompt ?? 0);
+                            resultTokens = Math.max(resultTokens ?? 0, chunk.token_usage.result ?? 0);
+                        }
+                        if (Array.isArray(chunk.result) && chunk.result.length > 0) {
+                            // Process each result in the chunk, combining consecutive text/JSON
+                            for (const result of chunk.result) {
+                                // Check if we can combine with the last accumulated result
+                                const lastResult = accumulatedResults[accumulatedResults.length - 1];
+
+                                if (lastResult &&
+                                    ((lastResult.type === 'text' && result.type === 'text') ||
+                                        (lastResult.type === 'json' && result.type === 'json'))) {
+                                    // Combine consecutive text or JSON results
+                                    if (result.type === 'text') {
+                                        lastResult.value += result.value;
+                                    } else if (result.type === 'json') {
+                                        // For JSON, combine the parsed objects directly
+                                        try {
+                                            const lastParsed = lastResult.value;
+                                            const currentParsed = result.value;
+                                            if (lastParsed !== null && typeof lastParsed === 'object' &&
+                                                currentParsed !== null && typeof currentParsed === 'object') {
+                                                const combined = { ...lastParsed, ...currentParsed };
+                                                lastResult.value = combined;
+                                            } else {
+                                                // If not objects, convert to string and concatenate
+                                                const lastStr = typeof lastParsed === 'string' ? lastParsed : JSON.stringify(lastParsed);
+                                                const currentStr = typeof currentParsed === 'string' ? currentParsed : JSON.stringify(currentParsed);
+                                                lastResult.value = lastStr + currentStr;
+                                            }
+                                        } catch {
+                                            // If anything fails, just concatenate string representations
+                                            lastResult.value = String(lastResult.value) + String(result.value);
+                                        }
+                                    }
+                                } else {
+                                    // Add as new result
+                                    accumulatedResults.push(result);
+                                }
+                            }
+
+                            // Convert CompletionResult[] to string for streaming
+                            // Only yield if we have results to show
+                            const resultText = chunk.result.map(r => {
+                                switch (r.type) {
+                                    case 'text':
+                                        return r.value;
+                                    case 'json':
+                                        return JSON.stringify(r.value);
+                                    case 'image':
+                                        // Show truncated image placeholder for streaming
+                                        const truncatedValue = typeof r.value === 'string' ? r.value.slice(0, 10) : String(r.value).slice(0, 10);
+                                        return `\n[Image: ${truncatedValue}...]\n`;
+                                    default:
+                                        return String((r as any).value || '');
+                                }
+                            }).join('');
+
+                            if (resultText) {
+                                this.chunks++;
+                                yield resultText;
+                            }
+                        }
                     }
                 }
             }
+        } catch (error: any) {
+            error.prompt = this.prompt;
+            throw error;
         }
 
-        const content = chunks.join('');
-
         // Return undefined for the ExecutionTokenUsage object if there is nothing to fill it with.
-        // Allows for checking for truthyness on token_usage, rather than it's internals. For testing and downstream usage.
-        let tokens: ExecutionTokenUsage | undefined = resultTokens ?
+        // Allows for checking for truthy-ness on token_usage, rather than it's internals. For testing and downstream usage.
+        const tokens: ExecutionTokenUsage | undefined = resultTokens ?
             { prompt: promptTokens, result: resultTokens, total: resultTokens + promptTokens, } : undefined
 
         this.completion = {
-            result: content,
+            result: accumulatedResults, // Return the accumulated CompletionResult[] instead of text
             prompt: this.prompt,
             execution_time: Date.now() - start,
             token_usage: tokens,
             finish_reason: finish_reason,
-            chunks: chunks.length,
+            chunks: this.chunks,
         }
 
-        this.driver.validateResult(this.completion, this.options);
+        try {
+            if (this.completion) {
+                this.driver.validateResult(this.completion, this.options);
+            }
+        } catch (error: any) {
+            error.prompt = this.prompt;
+            throw error;
+        }
     }
 
 }
@@ -90,10 +154,28 @@ export class FallbackCompletionStream<PromptT = any> implements CompletionStream
         this.driver.logger.debug(
             `[${this.driver.provider}] Streaming is not supported, falling back to blocking execution`
         );
-        const completion = await this.driver._execute(this.prompt, this.options);
-        const content = typeof completion.result === 'string' ? completion.result : JSON.stringify(completion.result);
-        yield content;
-
-        this.completion = completion;
+        try {
+            const completion = await this.driver._execute(this.prompt, this.options);
+            // For fallback streaming, yield the text content but keep the original completion
+            const content = completion.result.map(r => {
+                switch (r.type) {
+                    case 'text':
+                        return r.value;
+                    case 'json':
+                        return JSON.stringify(r.value);
+                    case 'image':
+                        // Show truncated image placeholder for streaming
+                        const truncatedValue = typeof r.value === 'string' ? r.value.slice(0, 10) : String(r.value).slice(0, 10);
+                        return `[Image: ${truncatedValue}...]`;
+                    default:
+                        return String((r as any).value || '');
+                }
+            }).join('');
+            yield content;
+            this.completion = completion; // Return the original completion with untouched CompletionResult[]
+        } catch (error: any) {
+            error.prompt = this.prompt;
+            throw error;
+        }
     }
 }

package/src/Driver.ts

@@ -9,7 +9,7 @@ import { formatTextPrompt } from "./formatters/index.js";
 import {
     AIModel,
     Completion,
-    CompletionChunk,
+    CompletionChunkObject,
     CompletionStream,
     DataSource,
     DriverOptions,
@@ -17,7 +17,6 @@ import {
     EmbeddingsResult,
     ExecutionOptions,
     ExecutionResponse,
-    ImageGeneration,
     Logger,
     Modalities,
     ModelSearchPayload,
@@ -143,7 +142,10 @@ export abstract class AbstractDriver<OptionsT extends DriverOptions = DriverOpti
 
     async execute(segments: PromptSegment[], options: ExecutionOptions): Promise<ExecutionResponse<PromptT>> {
         const prompt = await this.createPrompt(segments, options);
-        return this._execute(prompt, options);
+        return this._execute(prompt, options).catch((error: any) => {
+            (error as any).prompt = prompt;
+            throw error;
+        });
     }
 
     async _execute(prompt: PromptT, options: ExecutionOptions): Promise<ExecutionResponse<PromptT>> {
@@ -222,9 +224,9 @@ export abstract class AbstractDriver<OptionsT extends DriverOptions = DriverOpti
 
     abstract requestTextCompletion(prompt: PromptT, options: ExecutionOptions): Promise<Completion>;
 
-    abstract requestTextCompletionStream(prompt: PromptT, options: ExecutionOptions): Promise<AsyncIterable<CompletionChunk>>;
+    abstract requestTextCompletionStream(prompt: PromptT, options: ExecutionOptions): Promise<AsyncIterable<CompletionChunkObject>>;
 
-    async requestImageGeneration(_prompt: PromptT, _options: ExecutionOptions): Promise<Completion<ImageGeneration>> {
+    async requestImageGeneration(_prompt: PromptT, _options: ExecutionOptions): Promise<Completion> {
         throw new Error("Image generation not implemented.");
         //Cannot be made abstract, as abstract methods are required in the derived class
     }

package/src/async.ts

@@ -1,5 +1,5 @@
 import type { ServerSentEvent } from "@vertesia/api-fetch-client"
-import { CompletionChunk } from "@llumiverse/common";
+import { CompletionChunkObject } from "@llumiverse/common";
 
 export async function* asyncMap<T, R>(asyncIterable: AsyncIterable<T>, callback: (value: T, index: number) => R) {
     let i = 0;
@@ -18,9 +18,9 @@ export function oneAsyncIterator<T>(value: T): AsyncIterable<T> {
 /**
  * Given a ReadableStream of server sent events, tran
  */
-export function transformSSEStream(stream: ReadableStream<ServerSentEvent>, transform: (data: string) => CompletionChunk): ReadableStream<CompletionChunk> & AsyncIterable<CompletionChunk> {
+export function transformSSEStream(stream: ReadableStream<ServerSentEvent>, transform: (data: string) => CompletionChunkObject): ReadableStream<CompletionChunkObject> & AsyncIterable<CompletionChunkObject> {
     // on node and bun the ReadableStream is an async iterable
-    return stream.pipeThrough(new TransformStream<ServerSentEvent, CompletionChunk>({
+    return stream.pipeThrough(new TransformStream<ServerSentEvent, CompletionChunkObject>({
         transform(event: ServerSentEvent, controller) {
             if (event.type === 'event' && event.data && event.data !== '[DONE]') {
                 try {
@@ -32,7 +32,7 @@ export function transformSSEStream(stream: ReadableStream<ServerSentEvent>, tran
                 }
             }
         }
-    })) as ReadableStream<CompletionChunk> & AsyncIterable<CompletionChunk>;
+    })) satisfies ReadableStream<CompletionChunkObject> & AsyncIterable<CompletionChunkObject>;
 }
 
 export class EventStream<T, ReturnT = any> implements AsyncIterable<T> {

package/src/formatters/index.ts

@@ -1,4 +1,3 @@
 export * from "./commons.js";
 export * from "./generic.js";
-export * from "./openai.js";
 export * from "./nova.js";

package/src/stream.ts

@@ -1,20 +1,30 @@
 
 export async function readStreamAsBase64(stream: ReadableStream): Promise<string> {
-    return (await _readStreamAsBuffer(stream)).toString('base64');
+    const uint8Array = await readStreamAsUint8Array(stream);
+    return Buffer.from(uint8Array).toString('base64');
 }
 
 export async function readStreamAsString(stream: ReadableStream): Promise<string> {
-    return (await _readStreamAsBuffer(stream)).toString();
+    const uint8Array = await readStreamAsUint8Array(stream);
+    return Buffer.from(uint8Array).toString();
 }
 
 export async function readStreamAsUint8Array(stream: ReadableStream): Promise<Uint8Array> {
-    return _readStreamAsBuffer(stream);
-}
-
-async function _readStreamAsBuffer(stream: ReadableStream): Promise<Buffer> {
-    const out: Buffer[] = [];
+    const chunks: Uint8Array[] = [];
+    let totalLength = 0;
+    
     for await (const chunk of stream) {
-        out.push(Buffer.from(chunk));
+        const uint8Chunk = chunk instanceof Uint8Array ? chunk : new Uint8Array(chunk);
+        chunks.push(uint8Chunk);
+        totalLength += uint8Chunk.length;
+    }
+    
+    const combined = new Uint8Array(totalLength);
+    let offset = 0;
+    for (const chunk of chunks) {
+        combined.set(chunk, offset);
+        offset += chunk.length;
     }
-    return Buffer.concat(out);
+    
+    return combined;
 }

package/src/validation.ts

@@ -2,7 +2,7 @@ import { Ajv } from 'ajv';
 import addFormats from 'ajv-formats';
 import { extractAndParseJSON } from "./json.js";
 import { resolveField } from './resolver.js';
-import { ResultValidationError } from "@llumiverse/common";
+import { CompletionResult, completionResultToString, ResultValidationError } from "@llumiverse/common";
 
 
 const ajv = new Ajv({
@@ -28,17 +28,22 @@ export class ValidationError extends Error implements ResultValidationError {
     }
 }
 
-export function validateResult(data: any, schema: Object) {
+export function validateResult(data: CompletionResult[], schema: Object): CompletionResult[] {
     let json;
-
-    if (typeof data === "string") {
-        try {
-            json = extractAndParseJSON(data);
-        } catch (error: any) {
-            throw new ValidationError("json_error", error.message)
+    if (Array.isArray(data)) {
+        const jsonResults = data.filter(r => r.type === "json");
+        if (jsonResults.length > 0) {
+            json = jsonResults[0].value;
+        } else {
+            const stringResult = data.map(completionResultToString).join("");
+            try {
+                json = extractAndParseJSON(stringResult);
+            } catch (error: any) {
+                throw new ValidationError("json_error", error.message)
+            }
         }
     } else {
-        json = data;
+        throw new Error("Data to validate must be an array")
     }
 
     const validate = ajv.compile(schema);
@@ -71,5 +76,5 @@ export function validateResult(data: any, schema: Object) {
         }
     }
 
-    return json;
+    return [{ type: "json", value: json }];
 }

package/lib/cjs/formatters/openai.js

@@ -1,113 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatOpenAILikeTextPrompt = formatOpenAILikeTextPrompt;
-exports.formatOpenAILikeMultimodalPrompt = formatOpenAILikeMultimodalPrompt;
-const common_1 = require("@llumiverse/common");
-const stream_js_1 = require("../stream.js");
-/**
- * OpenAI text only prompts
- * @param segments
- * @returns
- */
-function formatOpenAILikeTextPrompt(segments) {
-    const system = [];
-    const safety = [];
-    const user = [];
-    for (const msg of segments) {
-        if (msg.role === common_1.PromptRole.system) {
-            system.push({ content: msg.content, role: "system" });
-        }
-        else if (msg.role === common_1.PromptRole.safety) {
-            safety.push({ content: "IMPORTANT: " + msg.content, role: "system" });
-        }
-        else if (msg.role !== common_1.PromptRole.negative && msg.role !== common_1.PromptRole.mask && msg.role !== common_1.PromptRole.tool) {
-            user.push({
-                content: msg.content,
-                role: msg.role || 'user',
-            });
-        }
-    }
-    // put system messages first and safety last
-    return system.concat(user).concat(safety);
-}
-async function formatOpenAILikeMultimodalPrompt(segments, opts) {
-    const system = [];
-    const safety = [];
-    const others = [];
-    for (const msg of segments) {
-        const parts = [];
-        //generate the parts based on PromptSegment
-        if (msg.files) {
-            for (const file of msg.files) {
-                const stream = await file.getStream();
-                const data = await (0, stream_js_1.readStreamAsBase64)(stream);
-                parts.push({
-                    type: "image_url",
-                    image_url: {
-                        url: `data:${file.mime_type || "image/jpeg"};base64,${data}`,
-                        //detail: "auto"  //This is modified just before execution to "low" | "high" | "auto"
-                    },
-                });
-            }
-        }
-        if (msg.content) {
-            parts.push({
-                text: msg.content,
-                type: "text"
-            });
-        }
-        if (msg.role === common_1.PromptRole.system) {
-            system.push({
-                role: "system",
-                content: parts
-            });
-            if (opts.useToolForFormatting && opts.schema) {
-                system.forEach(s => {
-                    s.content.forEach(c => {
-                        if (c.type === "text")
-                            c.text = "TOOL: " + c.text;
-                    });
-                });
-            }
-        }
-        else if (msg.role === common_1.PromptRole.safety) {
-            const safetyMsg = {
-                role: "system",
-                content: parts
-            };
-            safetyMsg.content.forEach(c => {
-                if (c.type === "text")
-                    c.text = "DO NOT IGNORE - IMPORTANT: " + c.text;
-            });
-            system.push(safetyMsg);
-        }
-        else if (msg.role === common_1.PromptRole.tool) {
-            if (!msg.tool_use_id) {
-                throw new Error("Tool use id is required for tool messages");
-            }
-            others.push({
-                role: "tool",
-                tool_call_id: msg.tool_use_id,
-                content: msg.content
-            });
-        }
-        else if (msg.role !== common_1.PromptRole.negative && msg.role !== common_1.PromptRole.mask) {
-            others.push({
-                role: msg.role ?? 'user',
-                content: parts
-            });
-        }
-    }
-    if (opts.result_schema && !opts.useToolForFormatting) {
-        system.push({
-            role: "system",
-            content: [{
-                    type: "text",
-                    text: "IMPORTANT: only answer using JSON, and respecting the schema included below, between the <response_schema> tags. " + `<response_schema>${JSON.stringify(opts.result_schema)}</response_schema>`
-                }]
-        });
-    }
-    // put system messages first and safety last
-    return [].concat(system).concat(others).concat(safety);
-}
-//# sourceMappingURL=openai.js.map

package/lib/cjs/formatters/openai.js.map

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

package/lib/esm/formatters/openai.js

@@ -1,109 +0,0 @@
-import { PromptRole } from "@llumiverse/common";
-import { readStreamAsBase64 } from "../stream.js";
-/**
- * OpenAI text only prompts
- * @param segments
- * @returns
- */
-export function formatOpenAILikeTextPrompt(segments) {
-    const system = [];
-    const safety = [];
-    const user = [];
-    for (const msg of segments) {
-        if (msg.role === PromptRole.system) {
-            system.push({ content: msg.content, role: "system" });
-        }
-        else if (msg.role === PromptRole.safety) {
-            safety.push({ content: "IMPORTANT: " + msg.content, role: "system" });
-        }
-        else if (msg.role !== PromptRole.negative && msg.role !== PromptRole.mask && msg.role !== PromptRole.tool) {
-            user.push({
-                content: msg.content,
-                role: msg.role || 'user',
-            });
-        }
-    }
-    // put system messages first and safety last
-    return system.concat(user).concat(safety);
-}
-export async function formatOpenAILikeMultimodalPrompt(segments, opts) {
-    const system = [];
-    const safety = [];
-    const others = [];
-    for (const msg of segments) {
-        const parts = [];
-        //generate the parts based on PromptSegment
-        if (msg.files) {
-            for (const file of msg.files) {
-                const stream = await file.getStream();
-                const data = await readStreamAsBase64(stream);
-                parts.push({
-                    type: "image_url",
-                    image_url: {
-                        url: `data:${file.mime_type || "image/jpeg"};base64,${data}`,
-                        //detail: "auto"  //This is modified just before execution to "low" | "high" | "auto"
-                    },
-                });
-            }
-        }
-        if (msg.content) {
-            parts.push({
-                text: msg.content,
-                type: "text"
-            });
-        }
-        if (msg.role === PromptRole.system) {
-            system.push({
-                role: "system",
-                content: parts
-            });
-            if (opts.useToolForFormatting && opts.schema) {
-                system.forEach(s => {
-                    s.content.forEach(c => {
-                        if (c.type === "text")
-                            c.text = "TOOL: " + c.text;
-                    });
-                });
-            }
-        }
-        else if (msg.role === PromptRole.safety) {
-            const safetyMsg = {
-                role: "system",
-                content: parts
-            };
-            safetyMsg.content.forEach(c => {
-                if (c.type === "text")
-                    c.text = "DO NOT IGNORE - IMPORTANT: " + c.text;
-            });
-            system.push(safetyMsg);
-        }
-        else if (msg.role === PromptRole.tool) {
-            if (!msg.tool_use_id) {
-                throw new Error("Tool use id is required for tool messages");
-            }
-            others.push({
-                role: "tool",
-                tool_call_id: msg.tool_use_id,
-                content: msg.content
-            });
-        }
-        else if (msg.role !== PromptRole.negative && msg.role !== PromptRole.mask) {
-            others.push({
-                role: msg.role ?? 'user',
-                content: parts
-            });
-        }
-    }
-    if (opts.result_schema && !opts.useToolForFormatting) {
-        system.push({
-            role: "system",
-            content: [{
-                    type: "text",
-                    text: "IMPORTANT: only answer using JSON, and respecting the schema included below, between the <response_schema> tags. " + `<response_schema>${JSON.stringify(opts.result_schema)}</response_schema>`
-                }]
-        });
-    }
-    // put system messages first and safety last
-    return [].concat(system).concat(others).concat(safety);
-}
-//# sourceMappingURL=openai.js.map

package/lib/esm/formatters/openai.js.map

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

package/lib/types/formatters/openai.d.ts

@@ -1,41 +0,0 @@
-import { PromptOptions } from "@llumiverse/common";
-import { PromptSegment } from "@llumiverse/common";
-export interface OpenAITextMessage {
-    content: string;
-    role: "system" | "user" | "assistant";
-}
-export interface OpenAIMessage {
-    content: (OpenAIContentPartText | OpenAIContentPartImage)[];
-    role: "system" | "user" | "assistant";
-    name?: string;
-}
-export interface OpenAIToolMessage {
-    role: "tool";
-    tool_call_id: string;
-    content: string;
-}
-export type OpenAIInputMessage = OpenAIMessage | OpenAIToolMessage;
-export interface OpenAIContentPartText {
-    type: "text";
-    text: string;
-}
-export interface OpenAIContentPartImage {
-    type: "image_url";
-    image_url: {
-        detail?: 'auto' | 'low' | 'high';
-        url: string;
-    };
-}
-/**
- * OpenAI text only prompts
- * @param segments
- * @returns
- */
-export declare function formatOpenAILikeTextPrompt(segments: PromptSegment[]): OpenAITextMessage[];
-export declare function formatOpenAILikeMultimodalPrompt(segments: PromptSegment[], opts: PromptOptions & OpenAIPromptFormatterOptions): Promise<OpenAIInputMessage[]>;
-export interface OpenAIPromptFormatterOptions {
-    multimodal?: boolean;
-    useToolForFormatting?: boolean;
-    schema?: Object;
-}
-//# sourceMappingURL=openai.d.ts.map