@llumiverse/drivers 1.0.0 → 1.1.0-dev.20260427.054520Z

package/lib/types/vertexai/index.d.ts

@@ -23,6 +23,8 @@ export declare class VertexAIDriver extends AbstractDriver<VertexAIDriverOptions
     anthropicClient: AnthropicVertex | undefined;
     fetchClient: FetchClient | undefined;
     googleGenAI: GoogleGenAI | undefined;
+    googleGenAIRegion: string | undefined;
+    googleGenAIFlex: boolean | undefined;
     llamaClient: FetchClient & {
         region?: string;
     } | undefined;
@@ -32,7 +34,8 @@ export declare class VertexAIDriver extends AbstractDriver<VertexAIDriverOptions
     private authClientPromise;
     constructor(options: VertexAIDriverOptions);
     private getAuthClient;
-    getGoogleGenAIClient(region?: string): GoogleGenAI;
+    getGoogleGenAIClient(region?: string, flex?: boolean): GoogleGenAI;
+    private buildGoogleGenAIClient;
     getFetchClient(): FetchClient;
     getLLamaClient(region?: string): FetchClient;
     getAnthropicClient(region?: string): Promise<AnthropicVertex>;

package/lib/types/vertexai/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/vertexai/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,uBAAuB,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAC5E,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EACH,OAAO,EACP,cAAc,EACd,UAAU,EACV,qBAAqB,EAErB,aAAa,EACb,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,EACf,sBAAsB,EACtB,kBAAkB,EAClB,aAAa,EAQhB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAc,UAAU,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAKhF,OAAO,EAAyB,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEzE,MAAM,WAAW,qBAAsB,SAAQ,aAAa;IACxD,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACzC;AAED,MAAM,WAAW,qBAAqB;IAClC,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;CACpB;AAGD,MAAM,MAAM,cAAc,GAAG,YAAY,GAAG,qBAAqB,CAAC;AAElE,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,UAG1C;AAED,qBAAa,cAAe,SAAQ,cAAc,CAAC,qBAAqB,EAAE,cAAc,CAAC;IACrF,MAAM,CAAC,QAAQ,SAAc;IAC7B,QAAQ,SAA2B;IAEnC,UAAU,EAAE,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;IACnD,eAAe,EAAE,eAAe,GAAG,SAAS,CAAC;IAC7C,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC,WAAW,EAAE,WAAW,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;IAC3D,WAAW,EAAE,OAAO,CAAC,wBAAwB,GAAG,SAAS,CAAC;IAC1D,YAAY,EAAE,uBAAuB,GAAG,SAAS,CAAC;IAElD,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;IAC5B,OAAO,CAAC,iBAAiB,CAAkC;gBAE/C,OAAO,EAAE,qBAAqB;YAe5B,aAAa;IAOpB,oBAAoB,CAAC,MAAM,GAAE,MAA4B,GAAG,WAAW;IA0BvE,cAAc,IAAI,WAAW;IAc7B,cAAc,CAAC,MAAM,GAAE,MAAsB,GAAG,WAAW;IAiBrD,kBAAkB,CAAC,MAAM,GAAE,MAA4B,GAAG,OAAO,CAAC,eAAe,CAAC;IAkClF,mBAAmB,IAAI,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC;IAa1D,oBAAoB,IAAI,OAAO,CAAC,OAAO,CAAC,wBAAwB,CAAC;IAajE,eAAe,IAAI,OAAO,CAAC,uBAAuB,CAAC;IAchE,cAAc,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,gBAAgB;IAY5D,SAAS,CAAC,SAAS,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAOhE,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAIvC,YAAY,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,cAAc,CAAC;IAO5F,qBAAqB,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,UAAU,CAAC;IAG7F,2BAA2B,CAC7B,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,gBAAgB,GAC1B,OAAO,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IAIhD;;;;OAIG;IACH,0BAA0B,CACtB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,OAAO,EAAE,EACjB,OAAO,EAAE,OAAO,EAAE,GAAG,SAAS,EAC9B,OAAO,EAAE,gBAAgB,GAC1B,OAAO,EAAE,GAAG,OAAO,GAAG,SAAS;IAmGlC;;;OAGG;IACH,OAAO,CAAC,gCAAgC;IA6FlC,sBAAsB,CACxB,OAAO,EAAE,YAAY,EACrB,QAAQ,EAAE,gBAAgB,GAC3B,OAAO,CAAC,UAAU,CAAC;IAMhB,mBAAmB,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAS1D,UAAU,CAAC,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;IAkN1E,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC;IAIhC,kBAAkB,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAc/E;;OAEG;IACH,OAAO,IAAI,IAAI;IAMf;;;;;;;;OAQG;IACI,qBAAqB,CACxB,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,sBAAsB,GAChC,eAAe;CAiBrB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/vertexai/index.ts"],"names":[],"mappings":"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"}

package/lib/types/vertexai/models/claude.d.ts

@@ -77,6 +77,22 @@ export declare class ClaudeModelDefinition implements ModelDefinition<ClaudeProm
  * we need to merge them before sending to the API.
  */
 export declare function mergeConsecutiveUserMessages(messages: MessageParam[]): MessageParam[];
+/**
+ * Update the conversation messages
+ * @param prompt
+ * @param response
+ * @returns
+ */
+export declare function updateConversation(conversation: ClaudePrompt | undefined | null, prompt: ClaudePrompt): ClaudePrompt;
+/**
+ * Sanitize messages by removing empty text blocks.
+ * Claude API rejects messages with empty text content blocks ("text content blocks must be non-empty").
+ * This handles cases where streaming was interrupted and left empty text blocks.
+ *
+ * - Filters out empty text blocks from each message's content
+ * - Removes messages entirely if they have no content after filtering
+ */
+export declare function sanitizeMessages(messages: MessageParam[]): MessageParam[];
 /**
  * Fix orphaned tool_use blocks in the conversation.
  * @exported for testing

package/lib/types/vertexai/models/claude.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude.d.ts","sourceRoot":"","sources":["../../../../src/vertexai/models/claude.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,YAAY,EAAmE,YAAY,EAAE,cAAc,EAAwB,MAAM,sCAAsC,CAAC;AAGzL,OAAO,EACH,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,gBAAgB,EAK5D,eAAe,EAAE,sBAAsB,EAE3B,aAAa,EAGzB,OAAO,EAGV,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAIpD,CAAA;AAED,eAAO,MAAM,2BAA2B,UAGvC,CAAC;AAEF,UAAU,YAAY;IAClB,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,MAAM,CAAC,EAAE,cAAc,EAAE,CAAC;CAC7B;AAWD,wBAAgB,YAAY,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,OAAO,EAAE,GAAG,SAAS,CAc3E;AA8FD,qBAAa,qBAAsB,YAAW,eAAe,CAAC,YAAY,CAAC;IAEvE,KAAK,EAAE,OAAO,CAAA;gBAEF,OAAO,EAAE,MAAM;IAUrB,YAAY,CAAC,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,aAAa,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,YAAY,CAAC;IAuGlH,qBAAqB,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,UAAU,CAAC;IA4DnH,2BAA2B,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IAiIzJ;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,qBAAqB,CACjB,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,sBAAsB,GAChC,eAAe;IA8DlB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAQ3B;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,OAAO,CAAC,sBAAsB;CAuCjC;AAYD;;;;;;GAMG;AACH,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,YAAY,EAAE,CA6CrF;AA6DD;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,YAAY,EAAE,CA2E3E;AAgED;;GAEG;AACH,wBAAgB,+BAA+B,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,OAAO,CAUjF;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,YAAY,EAAE,CA8CtF"}
+{"version":3,"file":"claude.d.ts","sourceRoot":"","sources":["../../../../src/vertexai/models/claude.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,YAAY,EAAmE,YAAY,EAAE,cAAc,EAAwB,MAAM,sCAAsC,CAAC;AAGzL,OAAO,EACH,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,gBAAgB,EAK5D,eAAe,EAAE,sBAAsB,EAE3B,aAAa,EAGzB,OAAO,EAGV,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAIpD,CAAA;AAED,eAAO,MAAM,2BAA2B,UAGvC,CAAC;AAEF,UAAU,YAAY;IAClB,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,MAAM,CAAC,EAAE,cAAc,EAAE,CAAC;CAC7B;AA+BD,wBAAgB,YAAY,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,OAAO,EAAE,GAAG,SAAS,CAc3E;AA8FD,qBAAa,qBAAsB,YAAW,eAAe,CAAC,YAAY,CAAC;IAEvE,KAAK,EAAE,OAAO,CAAA;gBAEF,OAAO,EAAE,MAAM;IAUrB,YAAY,CAAC,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,aAAa,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,YAAY,CAAC;IAuGlH,qBAAqB,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,UAAU,CAAC;IAwDnH,2BAA2B,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IA+HzJ;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,qBAAqB,CACjB,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,sBAAsB,GAChC,eAAe;IA8DlB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAQ3B;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,OAAO,CAAC,sBAAsB;CAuCjC;AAYD;;;;;;GAMG;AACH,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,YAAY,EAAE,CA6CrF;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,YAAY,GAAG,SAAS,GAAG,IAAI,EAAE,MAAM,EAAE,YAAY,GAAG,YAAY,CAgBpH;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,YAAY,EAAE,CA+BzE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,YAAY,EAAE,CA2E3E;AAuID;;GAEG;AACH,wBAAgB,+BAA+B,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,OAAO,CAUjF;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,YAAY,EAAE,CA8CtF"}

package/lib/types/vertexai/models/gemini.d.ts

@@ -1,15 +1,11 @@
-import { Content, GenerateContentResponseUsageMetadata } from "@google/genai";
-import { AIModel, Completion, CompletionChunkObject, ExecutionOptions, ExecutionTokenUsage, LlumiverseError, LlumiverseErrorContext, PromptSegment } from "@llumiverse/core";
-import { GenerateContentPrompt, VertexAIDriver } from "../index.js";
-import { ModelDefinition } from "../models.js";
+import { type Content, type GenerateContentResponseUsageMetadata } from "@google/genai";
+import { type AIModel, type Completion, type CompletionChunkObject, type ExecutionOptions, type ExecutionTokenUsage, LlumiverseError, type LlumiverseErrorContext, type PromptSegment } from "@llumiverse/core";
+import type { GenerateContentPrompt, VertexAIDriver } from "../index.js";
+import type { ModelDefinition } from "../models.js";
 export declare function mergeConsecutiveRole(contents: Content[] | undefined): Content[];
 export declare class GeminiModelDefinition implements ModelDefinition<GenerateContentPrompt> {
     model: AIModel;
     constructor(modelId: string);
-    preValidationProcessing(result: Completion, options: ExecutionOptions): {
-        result: Completion;
-        options: ExecutionOptions;
-    };
     createPrompt(_driver: VertexAIDriver, segments: PromptSegment[], options: ExecutionOptions): Promise<GenerateContentPrompt>;
     usageMetadataToTokenUsage(usageMetadata: GenerateContentResponseUsageMetadata | undefined): ExecutionTokenUsage;
     requestTextCompletion(driver: VertexAIDriver, prompt: GenerateContentPrompt, options: ExecutionOptions): Promise<Completion>;

package/lib/types/vertexai/models/gemini.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gemini.d.ts","sourceRoot":"","sources":["../../../../src/vertexai/models/gemini.ts"],"names":[],"mappings":"AACA,OAAO,EACH,OAAO,EACP,oCAAoC,EAMvC,MAAM,eAAe,CAAC;AACvB,OAAO,EACH,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAoB,gBAAgB,EAC9E,mBAAmB,EAKK,eAAe,EAAE,sBAAsB,EAC/D,aAAa,EAOhB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AA4e/C,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,SAAS,GAAG,OAAO,EAAE,CA2B/E;AAgED,qBAAa,qBAAsB,YAAW,eAAe,CAAC,qBAAqB,CAAC;IAEhF,KAAK,EAAE,OAAO,CAAA;gBAEF,OAAO,EAAE,MAAM;IAU3B,uBAAuB,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,gBAAgB,GAAG;QAAE,MAAM,EAAE,UAAU,CAAC;QAAC,OAAO,EAAE,gBAAgB,CAAA;KAAE;IAyBnH,YAAY,CAAC,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,aAAa,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IA+HjI,yBAAyB,CAAC,aAAa,EAAE,oCAAoC,GAAG,SAAS,GAAG,mBAAmB;IA0BzG,qBAAqB,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,UAAU,CAAC;IA8G5H,2BAA2B,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IAiFlK;;;;;;;;;;;;;;;;;;;OAmBG;IACH,qBAAqB,CACjB,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,sBAAsB,GAChC,eAAe;IAwClB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAUxB;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,OAAO,CAAC,sBAAsB;IAgB9B;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;CAkB3B;AAGD;;;;GAIG;AACH,wBAAgB,gCAAgC,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,CAsB/E"}
+{"version":3,"file":"gemini.d.ts","sourceRoot":"","sources":["../../../../src/vertexai/models/gemini.ts"],"names":[],"mappings":"AACA,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,oCAAoC,EAM5C,MAAM,eAAe,CAAC;AACvB,OAAO,EACH,KAAK,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,qBAAqB,EAAyB,KAAK,gBAAgB,EACvG,KAAK,mBAAmB,EAKP,eAAe,EAAE,KAAK,sBAAsB,EAC7D,KAAK,aAAa,EAOrB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AACzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AA2KpD,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,SAAS,GAAG,OAAO,EAAE,CA2B/E;AAuED,qBAAa,qBAAsB,YAAW,eAAe,CAAC,qBAAqB,CAAC;IAEhF,KAAK,EAAE,OAAO,CAAA;gBAEF,OAAO,EAAE,MAAM;IAUrB,YAAY,CAAC,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,aAAa,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IA+HjI,yBAAyB,CAAC,aAAa,EAAE,oCAAoC,GAAG,SAAS,GAAG,mBAAmB;IA+BzG,qBAAqB,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,UAAU,CAAC;IA4G5H,2BAA2B,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IAkFlK;;;;;;;;;;;;;;;;;;;OAmBG;IACH,qBAAqB,CACjB,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,sBAAsB,GAChC,eAAe;IAwClB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAUxB;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,OAAO,CAAC,sBAAsB;IAgB9B;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;CAkB3B;AAGD;;;;GAIG;AACH,wBAAgB,gCAAgC,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,CAsB/E"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@llumiverse/drivers",
-  "version": "1.0.0",
+  "version": "1.1.0-dev.20260427.054520Z",
   "type": "module",
   "description": "LLM driver implementations. Currently supported are: openai, huggingface, bedrock, replicate.",
   "files": [
@@ -44,11 +44,11 @@
     "dotenv": "^16.6.1",
     "rimraf": "^6.1.2",
     "ts-dual-module": "^0.6.3",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.2",
     "vitest": "^4.0.18"
   },
   "dependencies": {
-    "@anthropic-ai/sdk": "^0.78.0",
+    "@anthropic-ai/sdk": "^0.85.0",
     "@anthropic-ai/vertex-sdk": "^0.14.4",
     "@aws-sdk/client-bedrock": "^3.985.0",
     "@aws-sdk/client-bedrock-runtime": "^3.985.0",
@@ -63,18 +63,18 @@
     "@azure/identity": "^4.13.0",
     "@azure/openai": "2.0.0",
     "@google-cloud/aiplatform": "^6.5.0",
-    "@google/genai": "^1.46.0",
+    "@google/genai": "^1.49.0",
     "@huggingface/inference": "4.13.11",
     "@vertesia/api-fetch-client": "^0.82.4",
     "eventsource": "^4.1.0",
-    "google-auth-library": "^10.5.0",
+    "google-auth-library": "^10.6.2",
     "groq-sdk": "^0.37.0",
     "mnemonist": "^0.40.3",
     "node-web-stream-adapters": "^0.2.1",
-    "openai": "^6.22.0",
+    "openai": "^6.33.0",
     "replicate": "^1.4.0",
-    "@llumiverse/common": "1.0.0",
-    "@llumiverse/core": "1.0.0"
+    "@llumiverse/common": "1.1.0-dev.20260427.054520Z",
+    "@llumiverse/core": "1.1.0-dev.20260427.054520Z"
   },
   "ts_dual_module": {
     "outDir": "lib"

package/src/bedrock/index.ts

@@ -86,9 +86,10 @@ export interface BedrockDriverOptions extends DriverOptions {
     training_role_arn?: string;
 
     /**
-     * The credentials to use to access AWS
+     * The credentials to use to access AWS (IAM access key + secret)
      */
     credentials?: AwsCredentialIdentity | Provider<AwsCredentialIdentity>;
+
 }
 
 //Used to get a max_token value when not specified in the model options. Claude requires it to be set.
@@ -144,6 +145,9 @@ function isClaudeVersionGTE(modelString: string, targetMajor: number, targetMino
 
 export type BedrockPrompt = NovaMessagesPrompt | ConverseRequest | TwelvelabsPegasusRequest;
 
+type BedrockSystemBlock = NonNullable<ConverseRequest['system']>[number];
+type BedrockToolEntry = NonNullable<NonNullable<ConverseRequest['toolConfig']>['tools']>[number];
+
 export class BedrockDriver extends AbstractDriver<BedrockDriverOptions, BedrockPrompt> {
 
     static PROVIDER = "bedrock";
@@ -372,9 +376,16 @@ export class BedrockDriver extends AbstractDriver<BedrockDriverOptions, BedrockP
         const completionResult: CompletionChunkObject = {
             result: reasoning + resultText ? [{ type: "text", value: reasoning + resultText }] : [],
             token_usage: {
-                prompt: result.usage?.inputTokens,
+                // Bedrock's inputTokens already excludes cache-read tokens,
+                // so prompt_new is inputTokens directly (no subtraction needed).
+                // prompt is the total including cached + cache_write for consistency
+                // with the Vertex Claude driver.
+                prompt_new: result.usage?.inputTokens,
+                prompt: result.usage ? (result.usage.inputTokens ?? 0) + (result.usage.cacheReadInputTokens ?? 0) + (result.usage.cacheWriteInputTokens ?? 0) : undefined,
                 result: result.usage?.outputTokens,
                 total: result.usage?.totalTokens,
+                prompt_cached: result.usage?.cacheReadInputTokens ?? undefined,
+                prompt_cache_write: result.usage?.cacheWriteInputTokens ?? undefined,
             },
             finish_reason: converseFinishReason(result.stopReason),
         };
@@ -382,20 +393,29 @@ export class BedrockDriver extends AbstractDriver<BedrockDriverOptions, BedrockP
         return completionResult;
     };
 
-    getExtractedStream(result: ConverseStreamOutput, _prompt?: BedrockPrompt, options?: ExecutionOptions): CompletionChunkObject {
+    getExtractedStream(result: ConverseStreamOutput, _prompt?: BedrockPrompt, options?: ExecutionOptions, streamingToolBlocks?: Map<number, { id: string; name: string }>): CompletionChunkObject {
         let output: string = "";
         let reasoning: string = "";
         let stop_reason = "";
         let token_usage: ExecutionTokenUsage | undefined;
+        let tool_use: ToolUse[] | undefined;
 
         // Check if we should include thoughts (always true for reasoning-only models like DeepSeek R1)
         const isReasoningModel = options?.model?.includes('deepseek') && options?.model?.includes('r1');
         const shouldIncludeThoughts = isReasoningModel || (options && (options.model_options as BedrockClaudeOptions)?.include_thoughts);
 
-        // Handle content block start events (for reasoning blocks)
+        // Handle content block start events (for reasoning blocks and tool use)
         if (result.contentBlockStart) {
-            // Handle redacted content at block start
-            if (result.contentBlockStart.start && 'reasoningContent' in result.contentBlockStart.start && shouldIncludeThoughts) {
+            if (result.contentBlockStart.start && 'toolUse' in result.contentBlockStart.start && result.contentBlockStart.start.toolUse) {
+                // Register new tool call block and emit an initial chunk so the accumulator can track it by id
+                const toolUseStart = result.contentBlockStart.start.toolUse;
+                const blockIndex = result.contentBlockStart.contentBlockIndex ?? -1;
+                const id = toolUseStart.toolUseId ?? '';
+                const name = toolUseStart.name ?? '';
+                streamingToolBlocks?.set(blockIndex, { id, name });
+                tool_use = [{ id, tool_name: name, tool_input: '' as any }];
+            } else if (result.contentBlockStart.start && 'reasoningContent' in result.contentBlockStart.start && shouldIncludeThoughts) {
+                // Handle redacted content at block start
                 const reasoningStart = result.contentBlockStart.start as any;
                 if (reasoningStart.reasoningContent?.redactedContent) {
                     const redactedData = new TextDecoder().decode(reasoningStart.reasoningContent.redactedContent);
@@ -404,10 +424,17 @@ export class BedrockDriver extends AbstractDriver<BedrockDriverOptions, BedrockP
             }
         }
 
-        // Handle content block deltas (text and reasoning)
+        // Handle content block deltas (text, reasoning, and tool use)
         if (result.contentBlockDelta) {
             const delta = result.contentBlockDelta.delta;
-            if (delta?.text) {
+            if (delta?.toolUse) {
+                // Emit tool input chunk; the accumulator in DefaultCompletionStream concatenates these strings
+                const blockIndex = result.contentBlockDelta.contentBlockIndex ?? -1;
+                const toolBlock = streamingToolBlocks?.get(blockIndex);
+                if (toolBlock && delta.toolUse.input !== undefined) {
+                    tool_use = [{ id: toolBlock.id, tool_name: '', tool_input: delta.toolUse.input as any }];
+                }
+            } else if (delta?.text) {
                 output = delta.text;
             } else if (delta?.reasoningContent && shouldIncludeThoughts) {
                 if (delta.reasoningContent.text) {
@@ -432,7 +459,9 @@ export class BedrockDriver extends AbstractDriver<BedrockDriverOptions, BedrockP
 
         // Handle content block stop events
         if (result.contentBlockStop) {
-            // Content block ended - could be end of reasoning or text block
+            // Clean up tool block tracking entry
+            const blockIndex = result.contentBlockStop.contentBlockIndex ?? -1;
+            streamingToolBlocks?.delete(blockIndex);
             // Add minimal spacing for reasoning blocks if not already present
             if (reasoning && !reasoning.endsWith('\n\n') && shouldIncludeThoughts) {
                 reasoning += '\n\n';
@@ -445,9 +474,12 @@ export class BedrockDriver extends AbstractDriver<BedrockDriverOptions, BedrockP
 
         if (result.metadata) {
             token_usage = {
-                prompt: result.metadata.usage?.inputTokens,
+                prompt_new: result.metadata.usage?.inputTokens,
+                prompt: result.metadata.usage ? (result.metadata.usage.inputTokens ?? 0) + (result.metadata.usage.cacheReadInputTokens ?? 0) + (result.metadata.usage.cacheWriteInputTokens ?? 0) : undefined,
                 result: result.metadata.usage?.outputTokens,
                 total: result.metadata.usage?.totalTokens,
+                prompt_cached: result.metadata.usage?.cacheReadInputTokens ?? undefined,
+                prompt_cache_write: result.metadata.usage?.cacheWriteInputTokens ?? undefined,
             }
         }
 
@@ -455,6 +487,7 @@ export class BedrockDriver extends AbstractDriver<BedrockDriverOptions, BedrockP
             result: reasoning + output ? [{ type: "text", value: reasoning + output }] : [],
             token_usage: token_usage,
             finish_reason: converseFinishReason(stop_reason),
+            tool_use,
         };
 
         return completionResult;
@@ -824,8 +857,9 @@ export class BedrockDriver extends AbstractDriver<BedrockDriverOptions, BedrockP
                 throw new Error("[Bedrock] Stream not found in response");
             }
 
+            const streamingToolBlocks = new Map<number, { id: string; name: string }>();
             return transformAsyncIterator(stream, (streamSegment: ConverseStreamOutput) => {
-                return this.getExtractedStream(streamSegment, conversePrompt, options);
+                return this.getExtractedStream(streamSegment, conversePrompt, options, streamingToolBlocks);
             });
 
         }).catch((err) => {
@@ -1009,6 +1043,47 @@ export class BedrockDriver extends AbstractDriver<BedrockDriverOptions, BedrockP
             request.messages = convertToolBlocksToText(request.messages);
         }
 
+        // Prompt caching: use three breakpoints so stable system blocks, tool definitions,
+        // and the conversation history prefix can all be reused across Claude turns.
+        if (options.model.includes('claude')) {
+            // Always strip stale markers from prior turns
+            if (request.messages) {
+                request.messages = stripClaudeCachePoints(request.messages);
+            }
+            request.system = stripClaudeCachePointsFromSystem(request.system);
+            if (request.toolConfig?.tools) {
+                request.toolConfig = {
+                    ...request.toolConfig,
+                    tools: stripClaudeCachePointsFromTools(request.toolConfig.tools),
+                };
+            }
+
+            const claudeOptions = model_options as unknown as BedrockClaudeOptions;
+            const cacheEnabled = claudeOptions?.cache_enabled === true;
+            if (cacheEnabled) {
+                const cacheTtl = claudeOptions?.cache_ttl;
+                const cachePointBlock = { type: 'default' as const, ...(cacheTtl && { ttl: cacheTtl }) };
+
+                if (request.system && request.system.length > 0) {
+                    request.system = [...request.system, { cachePoint: cachePointBlock } satisfies BedrockSystemBlock];
+                }
+
+                if (request.toolConfig?.tools && request.toolConfig.tools.length > 0) {
+                    request.toolConfig.tools = [
+                        ...request.toolConfig.tools,
+                        { cachePoint: cachePointBlock } satisfies BedrockToolEntry,
+                    ];
+                }
+
+                if (request.messages && request.messages.length >= 4) {
+                    const pivotMsg = request.messages[request.messages.length - 2];
+                    if (pivotMsg.content && Array.isArray(pivotMsg.content) && pivotMsg.content.length > 0) {
+                        pivotMsg.content = [...pivotMsg.content, { cachePoint: cachePointBlock }];
+                    }
+                }
+            }
+        }
+
         return request;
     }
 
@@ -1556,6 +1631,23 @@ function updateConversation(conversation: ConverseRequest, prompt: ConverseReque
     };
 }
 
+function stripClaudeCachePoints(messages: Message[]): Message[] {
+    return messages.map(message => ({
+        ...message,
+        content: message.content?.filter(block => !('cachePoint' in block)),
+    }));
+}
+
+function stripClaudeCachePointsFromSystem(system?: ConverseRequest['system']): ConverseRequest['system'] | undefined {
+    return (system?.filter(block => !('cachePoint' in (block as object))) ?? undefined) as ConverseRequest['system'] | undefined;
+}
+
+function stripClaudeCachePointsFromTools(
+    tools?: NonNullable<NonNullable<ConverseRequest['toolConfig']>['tools']>
+): NonNullable<NonNullable<ConverseRequest['toolConfig']>['tools']> | undefined {
+    return (tools?.filter(tool => !('cachePoint' in (tool as object))) ?? undefined) as NonNullable<NonNullable<ConverseRequest['toolConfig']>['tools']> | undefined;
+}
+
 /**
  * Fix orphaned toolUse blocks in the conversation.
  *
@@ -1671,4 +1763,4 @@ function formatAmazonModalities(modalities: ModelModality[]): string[] {
         }
     }
     return standardizedModalities;
-}
+}

package/src/bedrock/streaming-tool-use.test.ts

@@ -0,0 +1,250 @@
+import {
+    AIModel,
+    Completion,
+    CompletionChunkObject,
+    DriverOptions,
+    EmbeddingsOptions,
+    EmbeddingsResult,
+    ExecutionOptions,
+    ModelSearchPayload,
+    PromptRole,
+    PromptSegment,
+} from '@llumiverse/common';
+import { AbstractDriver } from '@llumiverse/core';
+import { beforeEach, describe, expect, it } from 'vitest';
+import { BedrockDriver } from './index.js';
+
+// ---------------------------------------------------------------------------
+// Unit tests: getExtractedStream tool use handling
+// ---------------------------------------------------------------------------
+
+describe('BedrockDriver getExtractedStream — tool use', () => {
+    let driver: BedrockDriver;
+    let toolBlocks: Map<number, { id: string; name: string }>;
+
+    beforeEach(() => {
+        driver = new BedrockDriver({ region: 'us-east-1' });
+        toolBlocks = new Map();
+    });
+
+    it('emits an initial tool_use chunk on contentBlockStart', () => {
+        const chunk = driver['getExtractedStream'](
+            {
+                contentBlockStart: {
+                    contentBlockIndex: 1,
+                    start: { toolUse: { toolUseId: 'tool-abc', name: 'my_tool' } },
+                },
+            },
+            undefined,
+            undefined,
+            toolBlocks
+        );
+
+        expect(chunk.tool_use).toHaveLength(1);
+        expect(chunk.tool_use![0]).toMatchObject({ id: 'tool-abc', tool_name: 'my_tool', tool_input: '' });
+        expect(toolBlocks.get(1)).toEqual({ id: 'tool-abc', name: 'my_tool' });
+    });
+
+    it('emits a delta tool_use chunk on contentBlockDelta', () => {
+        toolBlocks.set(1, { id: 'tool-abc', name: 'my_tool' });
+
+        const chunk = driver['getExtractedStream'](
+            {
+                contentBlockDelta: {
+                    contentBlockIndex: 1,
+                    delta: { toolUse: { input: '{"key":' } },
+                },
+            },
+            undefined,
+            undefined,
+            toolBlocks
+        );
+
+        expect(chunk.tool_use).toHaveLength(1);
+        expect(chunk.tool_use![0]).toMatchObject({ id: 'tool-abc', tool_name: '', tool_input: '{"key":' });
+    });
+
+    it('removes the block from the map on contentBlockStop', () => {
+        toolBlocks.set(1, { id: 'tool-abc', name: 'my_tool' });
+
+        driver['getExtractedStream'](
+            { contentBlockStop: { contentBlockIndex: 1 } },
+            undefined,
+            undefined,
+            toolBlocks
+        );
+
+        expect(toolBlocks.has(1)).toBe(false);
+    });
+
+    it('tracks two interleaved tool calls by independent contentBlockIndex', () => {
+        driver['getExtractedStream'](
+            { contentBlockStart: { contentBlockIndex: 1, start: { toolUse: { toolUseId: 'id-1', name: 'tool_a' } } } },
+            undefined, undefined, toolBlocks
+        );
+        driver['getExtractedStream'](
+            { contentBlockStart: { contentBlockIndex: 3, start: { toolUse: { toolUseId: 'id-2', name: 'tool_b' } } } },
+            undefined, undefined, toolBlocks
+        );
+
+        expect(toolBlocks.get(1)).toEqual({ id: 'id-1', name: 'tool_a' });
+        expect(toolBlocks.get(3)).toEqual({ id: 'id-2', name: 'tool_b' });
+
+        const chunk = driver['getExtractedStream'](
+            { contentBlockDelta: { contentBlockIndex: 3, delta: { toolUse: { input: '"val"' } } } },
+            undefined, undefined, toolBlocks
+        );
+        expect(chunk.tool_use![0].id).toBe('id-2');
+    });
+
+    it('still extracts text deltas when no tool use is present', () => {
+        const chunk = driver['getExtractedStream'](
+            { contentBlockDelta: { contentBlockIndex: 0, delta: { text: 'hello' } } },
+            undefined,
+            undefined,
+            toolBlocks
+        );
+
+        expect(chunk.result).toEqual([{ type: 'text', value: 'hello' }]);
+        expect(chunk.tool_use).toBeUndefined();
+    });
+
+    it('emits finish_reason "tool_use" from messageStop', () => {
+        const chunk = driver['getExtractedStream'](
+            { messageStop: { stopReason: 'tool_use' } },
+            undefined,
+            undefined,
+            toolBlocks
+        );
+
+        expect(chunk.finish_reason).toBe('tool_use');
+    });
+});
+
+// ---------------------------------------------------------------------------
+// Integration tests: full accumulation via driver.stream()
+// ---------------------------------------------------------------------------
+
+class FakeDriver extends AbstractDriver<DriverOptions, string> {
+    provider = 'fake';
+    chunks: CompletionChunkObject[] = [];
+
+    async requestTextCompletion(_prompt: string, _options: ExecutionOptions): Promise<Completion> {
+        throw new Error('not implemented');
+    }
+
+    async requestTextCompletionStream(_prompt: string, _options: ExecutionOptions): Promise<AsyncIterable<CompletionChunkObject>> {
+        const chunks = this.chunks;
+        return (async function* () { for (const c of chunks) yield c; })();
+    }
+
+    async listModels(_params?: ModelSearchPayload): Promise<AIModel[]> { return []; }
+    async validateConnection(): Promise<boolean> { return true; }
+    async generateEmbeddings(_options: EmbeddingsOptions): Promise<EmbeddingsResult> {
+        throw new Error('not implemented');
+    }
+}
+
+const FAKE_SEGMENTS: PromptSegment[] = [{ role: PromptRole.user, content: 'test' }];
+
+describe('driver.stream() — Bedrock tool use accumulation', () => {
+    it('assembles and JSON-parses tool_input from streamed chunks', async () => {
+        const driver = new FakeDriver({});
+        const options: ExecutionOptions = { model: 'test-model' };
+
+        // Simulate what the fixed getExtractedStream emits for one tool call
+        driver.chunks = [
+            { result: [], tool_use: [{ id: 'tool-1', tool_name: 'do_thing', tool_input: '' as any }] },
+            { result: [], tool_use: [{ id: 'tool-1', tool_name: '', tool_input: '{"param"' as any }] },
+            { result: [], tool_use: [{ id: 'tool-1', tool_name: '', tool_input: ':"hello"}' as any }] },
+            { result: [], finish_reason: 'tool_use' },
+        ];
+
+        const stream = await driver.stream(FAKE_SEGMENTS, options);
+        for await (const _ of stream) { /* drain */ }
+
+        expect(stream.completion!.finish_reason).toBe('tool_use');
+        expect(stream.completion!.tool_use).toHaveLength(1);
+        expect(stream.completion!.tool_use![0]).toMatchObject({
+            id: 'tool-1',
+            tool_name: 'do_thing',
+            tool_input: { param: 'hello' },
+        });
+    });
+
+    it('handles two simultaneous tool calls', async () => {
+        const driver = new FakeDriver({});
+        const options: ExecutionOptions = { model: 'test-model' };
+
+        driver.chunks = [
+            { result: [], tool_use: [{ id: 'id-a', tool_name: 'tool_a', tool_input: '' as any }] },
+            { result: [], tool_use: [{ id: 'id-b', tool_name: 'tool_b', tool_input: '' as any }] },
+            { result: [], tool_use: [{ id: 'id-a', tool_name: '', tool_input: '{"x":1}' as any }] },
+            { result: [], tool_use: [{ id: 'id-b', tool_name: '', tool_input: '{"y":2}' as any }] },
+            { result: [], finish_reason: 'tool_use' },
+        ];
+
+        const stream = await driver.stream(FAKE_SEGMENTS, options);
+        for await (const _ of stream) { /* drain */ }
+
+        const toolUse = stream.completion!.tool_use!;
+        expect(toolUse).toHaveLength(2);
+        expect(toolUse.find(t => t.id === 'id-a')!.tool_input).toEqual({ x: 1 });
+        expect(toolUse.find(t => t.id === 'id-b')!.tool_input).toEqual({ y: 2 });
+    });
+
+    it('drops truncated tool calls when finish_reason is length', async () => {
+        const driver = new FakeDriver({});
+        const options: ExecutionOptions = { model: 'test-model' };
+
+        driver.chunks = [
+            { result: [], tool_use: [{ id: 'trunc', tool_name: 'tool_c', tool_input: '' as any }] },
+            { result: [], tool_use: [{ id: 'trunc', tool_name: '', tool_input: '{"incomplete' as any }] },
+            { result: [], finish_reason: 'length' },
+        ];
+
+        const stream = await driver.stream(FAKE_SEGMENTS, options);
+        for await (const _ of stream) { /* drain */ }
+
+        expect(stream.completion!.tool_use).toBeUndefined();
+    });
+});
+
+describe('BedrockDriver buildStreamingConversation', () => {
+    it('writes streamed text and tool use blocks back into the assistant message', () => {
+        const driver = new BedrockDriver({ region: 'us-east-1' });
+        const prompt = {
+            modelId: 'anthropic.claude-sonnet',
+            messages: [
+                { role: 'user', content: [{ text: 'What is the weather in Paris?' }] },
+            ],
+        };
+
+        const conversation = driver.buildStreamingConversation(
+            prompt as any,
+            [{ type: 'text', value: 'Let me check.' }] as any,
+            [{
+                id: 'tool-1',
+                tool_name: 'get_weather',
+                tool_input: { location: 'Paris' },
+            }],
+            { model: 'anthropic.claude-sonnet' } as ExecutionOptions
+        ) as any;
+
+        expect(conversation.messages).toHaveLength(2);
+        expect(conversation.messages[0]).toEqual(prompt.messages[0]);
+        expect(conversation.messages[1]).toEqual({
+            role: 'assistant',
+            content: [
+                { text: 'Let me check.' },
+                {
+                    toolUse: {
+                        toolUseId: 'tool-1',
+                        name: 'get_weather',
+                        input: { location: 'Paris' },
+                    },
+                },
+            ],
+        });
+    });
+});

package/src/openai/index.ts

@@ -793,6 +793,8 @@ function mapUsage(usage?: OpenAI.Responses.ResponseUsage | null): ExecutionToken
         prompt: usage.input_tokens,
         result: usage.output_tokens,
         total: usage.total_tokens,
+        prompt_cached: usage.input_tokens_details?.cached_tokens ?? undefined,
+        prompt_new: usage.input_tokens - (usage.input_tokens_details?.cached_tokens ?? 0),
     };
 }