@llumiverse/drivers 1.3.0 → 1.4.0

package/lib/{esm/replicate.js → replicate.js}

@@ -1,47 +1,51 @@
-import { AbstractDriver, TrainingJobStatus, } from "@llumiverse/core";
-import { EventStream } from "@llumiverse/core/async";
-import { EventSource } from "eventsource";
-import Replicate from "replicate";
+import { TrainingJobStatus, } from '@llumiverse/core';
+import { EventStream } from '@llumiverse/core/async';
+import { AbstractDriver } from '@llumiverse/core/driver';
+import { EventSource } from 'eventsource';
+import Replicate from 'replicate';
 let cachedTrainableModels;
 let cachedTrainableModelsTimestamp = 0;
 const supportFineTunning = new Set([
-    "meta/llama-2-70b-chat",
-    "meta/llama-2-13b-chat",
-    "meta/llama-2-7b-chat",
-    "meta/llama-2-7b",
-    "meta/llama-2-70b",
-    "meta/llama-2-13b",
-    "mistralai/mistral-7b-v0.1"
+    'meta/llama-2-70b-chat',
+    'meta/llama-2-13b-chat',
+    'meta/llama-2-7b-chat',
+    'meta/llama-2-7b',
+    'meta/llama-2-70b',
+    'meta/llama-2-13b',
+    'mistralai/mistral-7b-v0.1',
 ]);
 export class ReplicateDriver extends AbstractDriver {
-    static PROVIDER = "replicate";
+    static PROVIDER = 'replicate';
     provider = ReplicateDriver.PROVIDER;
     service;
     static parseModelId(modelId) {
-        const [owner, modelPart] = modelId.split("/");
+        const [owner, modelPart] = modelId.split('/');
         const i = modelPart.indexOf(':');
         if (i === -1) {
-            throw new Error("Invalid model id. Expected format: owner/model:version");
+            throw new Error('Invalid model id. Expected format: owner/model:version');
         }
         return {
-            owner, model: modelPart.slice(0, i), version: modelPart.slice(i + 1)
+            owner,
+            model: modelPart.slice(0, i),
+            version: modelPart.slice(i + 1),
         };
     }
     constructor(options) {
         super(options);
         this.service = new Replicate({
             auth: options.apiKey,
+            fetch: this.getDriverFetch(),
         });
     }
     extractDataFromResponse(response) {
-        const text = response.output.join("");
+        const text = response.output.join('');
         return {
             result: text,
         };
     }
     async requestTextCompletionStream(prompt, options) {
-        if (options.model_options?._option_id !== undefined && options.model_options?._option_id !== "text-fallback") {
-            this.logger.debug({ options: options.model_options }, "Unexpected option id");
+        if (options.model_options?._option_id !== undefined && options.model_options?._option_id !== 'text-fallback') {
+            this.logger.debug({ options: options.model_options }, 'Unexpected option id');
         }
         options.model_options = options.model_options;
         const model = ReplicateDriver.parseModelId(options.model);
@@ -56,23 +60,24 @@ export class ReplicateDriver extends AbstractDriver {
         };
         const prediction = await this.service.predictions.create(predictionData);
         const stream = new EventStream();
+        // biome-ignore lint/style/noNonNullAssertion: intentional non-null assertion; TS can't prove narrowing here
         const source = new EventSource(prediction.urls.stream);
-        source.addEventListener("output", (e) => {
-            stream.push({ result: [{ type: "text", value: e.data }] });
+        source.addEventListener('output', (e) => {
+            stream.push({ result: [{ type: 'text', value: e.data }] });
         });
-        source.addEventListener("error", (e) => {
+        source.addEventListener('error', (e) => {
             let error;
             try {
                 error = JSON.parse(e.data);
             }
-            catch (error) {
+            catch {
                 error = JSON.stringify(e);
             }
-            this.logger.error({ e, error }, "Error in SSE stream");
+            this.logger.error({ e, error }, 'Error in SSE stream');
         });
-        source.addEventListener("done", () => {
+        source.addEventListener('done', () => {
             try {
-                stream.close(""); // not using e.data which is {}
+                stream.close(''); // not using e.data which is {}
             }
             finally {
                 source.close();
@@ -81,8 +86,8 @@ export class ReplicateDriver extends AbstractDriver {
         return stream;
     }
     async requestTextCompletion(prompt, options) {
-        if (options.model_options?._option_id !== undefined && options.model_options?._option_id !== "text-fallback") {
-            this.logger.debug({ options: options.model_options }, "Unexpected option id");
+        if (options.model_options?._option_id !== undefined && options.model_options?._option_id !== 'text-fallback') {
+            this.logger.debug({ options: options.model_options }, 'Unexpected option id');
         }
         options.model_options = options.model_options;
         const model = ReplicateDriver.parseModelId(options.model);
@@ -102,15 +107,15 @@ export class ReplicateDriver extends AbstractDriver {
         //        if (stream) return prediction;
         //not streaming, wait for the result
         const res = await this.service.wait(prediction, {});
-        const text = res.output.join("");
+        const text = res.output.join('');
         return {
-            result: [{ type: "text", value: text }],
+            result: [{ type: 'text', value: text }],
             original_response: options.include_original_response ? res : undefined,
         };
     }
     async startTraining(dataset, options) {
-        if (options.name.indexOf("/") === -1) {
-            throw new Error("Invalid target model name. Expected format: owner/model");
+        if (options.name.indexOf('/') === -1) {
+            throw new Error('Invalid target model name. Expected format: owner/model');
         }
         const { owner, model, version } = ReplicateDriver.parseModelId(options.model);
         const job = await this.service.trainings.create(owner, model, version, {
@@ -147,22 +152,25 @@ export class ReplicateDriver extends AbstractDriver {
             await this.service.predictions.list();
             return true;
         }
-        catch (error) {
+        catch {
             return false;
         }
     }
     async _listTrainableModels() {
-        const promises = Array.from(supportFineTunning).map(id => {
+        const promises = Array.from(supportFineTunning).map((id) => {
             const [owner, model] = id.split('/');
             return this.service.models.get(owner, model);
         });
         const results = await Promise.all(promises);
-        return results.filter(m => !!m.latest_version).map(m => {
-            const fullName = m.owner + '/' + m.name;
+        return results
+            .filter((m) => !!m.latest_version)
+            .map((m) => {
+            const fullName = `${m.owner}/${m.name}`;
+            // biome-ignore lint/style/noNonNullAssertion: intentional non-null assertion; TS can't prove narrowing here
             const v = m.latest_version;
             return {
-                id: fullName + ':' + v.id,
-                name: fullName + "@" + v.cog_version + ":" + v.id.slice(0, 6),
+                id: `${fullName}:${v.id}`,
+                name: `${fullName}@${v.cog_version}:${v.id.slice(0, 6)}`,
                 provider: this.provider,
                 owner: m.owner,
                 description: m.description,
@@ -170,7 +178,8 @@ export class ReplicateDriver extends AbstractDriver {
         });
     }
     async listTrainableModels() {
-        if (!cachedTrainableModels || Date.now() > cachedTrainableModelsTimestamp + 12 * 3600 * 1000) { // 12 hours
+        if (!cachedTrainableModels || Date.now() > cachedTrainableModelsTimestamp + 12 * 3600 * 1000) {
+            // 12 hours
             cachedTrainableModels = await this._listTrainableModels();
             cachedTrainableModelsTimestamp = Date.now();
         }
@@ -180,9 +189,9 @@ export class ReplicateDriver extends AbstractDriver {
         if (!params.text) {
             return this.listTrainableModels();
         }
-        const [owner, model] = params.text.split("/");
+        const [owner, model] = params.text.split('/');
         if (!owner || !model) {
-            throw new Error("Invalid model name. Expected format: owner/model");
+            throw new Error('Invalid model name. Expected format: owner/model');
         }
         return this.listModelVersions(owner, model);
     }
@@ -191,14 +200,15 @@ export class ReplicateDriver extends AbstractDriver {
             this.service.models.get(owner, model),
             this.service.models.versions.list(owner, model),
         ]);
-        if (!rModel || !versions || versions.results?.length === 0) {
-            throw new Error("Model not found or no versions available");
+        const versionResults = versions.results ?? [];
+        if (!rModel || !versions || versionResults.length === 0) {
+            throw new Error('Model not found or no versions available');
         }
-        const models = versions.results.map((v) => {
-            const fullName = rModel.owner + '/' + rModel.name;
+        const models = versionResults.map((v) => {
+            const fullName = `${rModel.owner}/${rModel.name}`;
             return {
-                id: fullName + ':' + v.id,
-                name: fullName + "@" + v.cog_version + ":" + v.id.slice(0, 6),
+                id: `${fullName}:${v.id}`,
+                name: `${fullName}@${v.cog_version}:${v.id.slice(0, 6)}`,
                 provider: this.provider,
                 owner: rModel.owner,
                 description: rModel.description,
@@ -211,7 +221,7 @@ export class ReplicateDriver extends AbstractDriver {
         return models;
     }
     async searchModels(params) {
-        const res = await this.service.request("models/search", {
+        const res = await this.service.request('models/search', {
             params: {
                 query: params.text,
             },
@@ -230,7 +240,7 @@ export class ReplicateDriver extends AbstractDriver {
         return models;
     }
     async generateEmbeddings() {
-        throw new Error("Method not implemented.");
+        throw new Error('Method not implemented.');
     }
 }
 function jobInfo(job, modelName) {
@@ -262,7 +272,7 @@ function jobInfo(job, modelName) {
         id: job.id,
         status,
         details,
-        model: modelName ? modelName + ':' + job.version : job.version
+        model: modelName ? `${modelName}:${job.version}` : job.version,
     };
 }
 //# sourceMappingURL=replicate.js.map

package/lib/replicate.js.map

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

package/lib/{types/shared → shared}/claude-messages.d.ts

@@ -11,10 +11,14 @@ import type { ContentBlock, Message, MessageParam, TextBlockParam } from '@anthr
 import type { MessageCreateParamsBase } from '@anthropic-ai/sdk/resources/messages.js';
 import type AnthropicVertex from '@anthropic-ai/vertex-sdk';
 import { type Completion, type CompletionChunkObject, type ExecutionOptions, type ExecutionTokenUsage, LlumiverseError, type LlumiverseErrorContext, type PromptSegment, type StatelessExecutionOptions, type ToolUse } from '@llumiverse/core';
+interface WarnLogger {
+    warn: (data: Record<string, unknown>, message: string) => void;
+}
 export interface ClaudePrompt {
     messages: MessageParam[];
     system?: TextBlockParam[];
 }
+export declare function formatClaudeDebugPrompt(prompt: ClaudePrompt): ClaudePrompt;
 export interface AnthropicUsageLike {
     input_tokens: number;
     output_tokens: number;
@@ -46,11 +50,31 @@ export declare function claudeFinishReason(reason: string | undefined): string |
 export declare function collectClaudeTools(content: ContentBlock[]): ToolUse[] | undefined;
 export declare function collectAllTextContent(content: ContentBlock[], includeThoughts?: boolean): string;
 export declare function claudeMaxTokens(option: StatelessExecutionOptions): number;
-export declare function formatClaudePrompt(segments: PromptSegment[], options: ExecutionOptions): Promise<ClaudePrompt>;
+export declare function formatClaudePrompt(segments: PromptSegment[], options: ExecutionOptions, logger?: WarnLogger): Promise<ClaudePrompt>;
 export declare function createPromptFromResponse(response: Message): ClaudePrompt;
 export declare function mergeConsecutiveUserMessages(messages: MessageParam[]): MessageParam[];
 export declare function sanitizeMessages(messages: MessageParam[]): MessageParam[];
 export declare function fixOrphanedToolUse(messages: MessageParam[]): MessageParam[];
+/**
+ * Drop tool_result blocks whose tool_use_id has no matching tool_use in the
+ * immediately preceding assistant message. This is the mirror of
+ * {@link fixOrphanedToolUse}: that function synthesizes results for tool_uses
+ * left unanswered (e.g. a cancelled run); this one removes results left dangling
+ * after their tool_use was dropped (e.g. by conversation compaction/trimming, or
+ * a parallel tool batch whose results were split across messages that cannot be
+ * re-paired).
+ *
+ * Without this, the Anthropic / Vertex-Anthropic API rejects the request with a
+ * non-retryable 400: "unexpected `tool_use_id` found in `tool_result` blocks ...
+ * Each `tool_result` block must have a corresponding `tool_use` block in the
+ * previous message." — which terminates the conversation.
+ *
+ * Must run AFTER mergeConsecutiveUserMessages so that parallel tool results which
+ * were split across separate user messages are first combined into the single
+ * user turn that follows the assistant tool_use message (otherwise valid results
+ * whose "previous message" is another user message would be wrongly dropped).
+ */
+export declare function fixOrphanedToolResults(messages: MessageParam[]): MessageParam[];
 export declare function updateClaudeConversation(conversation: ClaudePrompt | undefined | null, prompt: ClaudePrompt): ClaudePrompt;
 export declare function claudeMessagesContainToolBlocks(messages: MessageParam[]): boolean;
 export declare function convertClaudeToolBlocksToText(messages: MessageParam[]): MessageParam[];

package/lib/shared/claude-messages.d.ts.map

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