@modular-prompt/driver 0.12.0 → 0.13.2

package/dist/mlx-ml/process/queue.js

@@ -12,18 +12,19 @@ export class QueueManager {
         this.callbacks = callbacks;
     }
     addCapabilitiesRequest() {
-        return new Promise((resolve) => {
+        return new Promise((resolve, reject) => {
             const request = { method: 'capabilities' };
             this.queue.push({
                 request,
                 resolve,
+                reject,
                 expectJsonResponse: true
             });
             this.processNext();
         });
     }
     addFormatTestRequest(messages, options) {
-        return new Promise((resolve) => {
+        return new Promise((resolve, reject) => {
             const request = {
                 method: 'format_test',
                 messages,
@@ -32,12 +33,30 @@ export class QueueManager {
             this.queue.push({
                 request,
                 resolve,
+                reject,
+                expectJsonResponse: true
+            });
+            this.processNext();
+        });
+    }
+    addTokenizeRequest(messages, tools, reasoningEffort) {
+        return new Promise((resolve, reject) => {
+            const request = {
+                method: 'tokenize',
+                messages,
+                ...(tools && { tools }),
+                ...(reasoningEffort && { reasoning_effort: reasoningEffort }),
+            };
+            this.queue.push({
+                request,
+                resolve,
+                reject,
                 expectJsonResponse: true
             });
             this.processNext();
         });
     }
-    addChatRequest(messages, primer, options, tools, images, maxImageSize, reasoningEffort) {
+    addChatRequest(messages, primer, options, tools, images, maxImageSize, reasoningEffort, cachePath, cacheTrimTokens) {
         return new Promise((resolve, reject) => {
             try {
                 const request = {
@@ -45,13 +64,16 @@ export class QueueManager {
                     messages,
                     primer,
                     tools,
-                    options: mapOptionsToPython(options, true), // strict mode: true
+                    options: mapOptionsToPython(options, true),
                     ...(images?.length ? { images, maxImageSize } : {}),
                     ...(reasoningEffort ? { reasoning_effort: reasoningEffort } : {}),
+                    ...(cachePath ? { cache_path: cachePath } : {}),
+                    ...(cacheTrimTokens != null ? { cache_trim_tokens: cacheTrimTokens } : {}),
                 };
                 this.queue.push({
                     request,
-                    resolve
+                    resolve,
+                    reject,
                 });
                 this.processNext();
             }
@@ -60,18 +82,40 @@ export class QueueManager {
             }
         });
     }
+    addCachePrefillRequest(cachePath, messages, baseCachePath, trimToTokens, prefixOffsets, prefixHashes, tools, reasoningEffort) {
+        return new Promise((resolve, reject) => {
+            const request = {
+                method: 'cache_prefill',
+                cache_path: cachePath,
+                messages,
+                ...(baseCachePath && { base_cache_path: baseCachePath }),
+                ...(trimToTokens != null && { trim_to_tokens: trimToTokens }),
+                ...(prefixOffsets && prefixHashes && { prefix_offsets: prefixOffsets, prefix_hashes: prefixHashes }),
+                ...(tools && { tools }),
+                ...(reasoningEffort && { reasoning_effort: reasoningEffort }),
+            };
+            this.queue.push({
+                request,
+                resolve,
+                reject,
+                expectJsonResponse: true,
+            });
+            this.processNext();
+        });
+    }
     addCompletionRequest(prompt, options, images, maxImageSize) {
         return new Promise((resolve, reject) => {
             try {
                 const request = {
                     method: 'completion',
                     prompt,
-                    options: mapOptionsToPython(options, true), // strict mode: true
-                    ...(images?.length ? { images, maxImageSize } : {})
+                    options: mapOptionsToPython(options, true),
+                    ...(images?.length ? { images, maxImageSize } : {}),
                 };
                 this.queue.push({
                     request,
-                    resolve
+                    resolve,
+                    reject,
                 });
                 this.processNext();
             }
@@ -103,15 +147,44 @@ export class QueueManager {
             if (queueItem?.expectJsonResponse) {
                 try {
                     const jsonResponse = JSON.parse(jsonData);
-                    if (queueItem.request.method === 'capabilities') {
+                    // format_test has its own error field in MlxFormatTestResult — resolve if well-formed,
+                    // but reject bare protocol errors (missing template_applied indicates server-side exception)
+                    if (queueItem.request.method === 'format_test') {
+                        if ('template_applied' in jsonResponse) {
+                            queueItem.resolve(jsonResponse);
+                        }
+                        else {
+                            queueItem.resolve({
+                                formatted_prompt: null,
+                                template_applied: false,
+                                model_specific_processing: null,
+                                error: jsonResponse.error || 'Malformed format_test response'
+                            });
+                        }
+                    }
+                    else if (queueItem.request.method === 'tokenize') {
+                        if ('token_count' in jsonResponse) {
+                            queueItem.resolve(jsonResponse);
+                        }
+                        else {
+                            queueItem.resolve({
+                                token_ids: null,
+                                token_count: 0,
+                                error: jsonResponse.error || 'Malformed tokenize response'
+                            });
+                        }
+                    }
+                    else if (jsonResponse.error) {
+                        queueItem.reject?.(new Error(jsonResponse.error));
+                    }
+                    else if (queueItem.request.method === 'capabilities') {
                         queueItem.resolve(jsonResponse);
                     }
-                    else if (queueItem.request.method === 'format_test') {
+                    else if (queueItem.request.method === 'cache_prefill') {
                         queueItem.resolve(jsonResponse);
                     }
                 }
                 catch (e) {
-                    // エラー時のフォールバック処理
                     if (queueItem.request.method === 'capabilities') {
                         queueItem.resolve({
                             methods: [],
@@ -127,12 +200,19 @@ export class QueueManager {
                             error: e instanceof Error ? e.message : 'Unknown error'
                         });
                     }
+                    else if (queueItem.request.method === 'tokenize') {
+                        queueItem.resolve({
+                            token_ids: null,
+                            token_count: 0,
+                            error: e instanceof Error ? e.message : 'Unknown error'
+                        });
+                    }
+                    else if (queueItem.request.method === 'cache_prefill') {
+                        queueItem.reject(e instanceof Error ? e : new Error(String(e)));
+                    }
                 }
             }
         }
-        // 注: isProcessing/processNext は onRequestCompleted() に一元化
-        // handleJsonResponse と onRequestCompleted の二重呼び出しによる
-        // isProcessing フラグの不整合を防止
     }
     onRequestCompleted() {
         this.isProcessing = false;
@@ -144,6 +224,13 @@ export class QueueManager {
     get isEmpty() {
         return this.queue.length === 0;
     }
+    rejectAll(error) {
+        const pending = this.queue.splice(0);
+        for (const item of pending) {
+            item.reject?.(error);
+        }
+        this.isProcessing = false;
+    }
     clear() {
         this.queue = [];
         this.isProcessing = false;

package/dist/mlx-ml/process/queue.js.map

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

package/dist/mlx-ml/process/response-processor.d.ts

@@ -1,8 +1,18 @@
 import type { ToolCall } from '../../types.js';
+import type { MlxRuntimeInfo } from './types.js';
 export interface ResponseParseResult {
     content: string;
     thinkingContent?: string;
     toolCalls?: ToolCall[];
 }
 export type ResponseProcessor = (rawText: string) => ResponseParseResult;
+/**
+ * デフォルトResponseProcessorファクトリ
+ *
+ * thinking抽出（<think>, <|channel>thought等）とツールコール解析を合成する。
+ * 専用パーサ（harmony等）を持たないモデル向けの汎用プロセッサ。
+ */
+export declare function createDefaultProcessor(runtimeInfo: MlxRuntimeInfo | null, options?: {
+    enableToolParsing?: boolean;
+}): ResponseProcessor;
 //# sourceMappingURL=response-processor.d.ts.map

package/dist/mlx-ml/process/response-processor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"response-processor.d.ts","sourceRoot":"","sources":["../../../src/mlx-ml/process/response-processor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE/C,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;CACxB;AAED,MAAM,MAAM,iBAAiB,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,mBAAmB,CAAC"}
+{"version":3,"file":"response-processor.d.ts","sourceRoot":"","sources":["../../../src/mlx-ml/process/response-processor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAIjD,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;CACxB;AAED,MAAM,MAAM,iBAAiB,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,mBAAmB,CAAC;AAEzE;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,cAAc,GAAG,IAAI,EAClC,OAAO,CAAC,EAAE;IAAE,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAAE,GACxC,iBAAiB,CAcnB"}

package/dist/mlx-ml/process/response-processor.js

@@ -1,2 +1,24 @@
-export {};
+import { extractThinkingContent } from '../../content-utils.js';
+import { parseToolCalls } from '../tool-call-parser/index.js';
+/**
+ * デフォルトResponseProcessorファクトリ
+ *
+ * thinking抽出（<think>, <|channel>thought等）とツールコール解析を合成する。
+ * 専用パーサ（harmony等）を持たないモデル向けの汎用プロセッサ。
+ */
+export function createDefaultProcessor(runtimeInfo, options) {
+    const enableToolParsing = options?.enableToolParsing ?? false;
+    return (rawText) => {
+        const { content: afterThinking, thinkingContent } = extractThinkingContent(rawText);
+        if (enableToolParsing) {
+            const { content, toolCalls } = parseToolCalls(afterThinking, runtimeInfo);
+            return {
+                content,
+                thinkingContent,
+                toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
+            };
+        }
+        return { content: afterThinking, thinkingContent };
+    };
+}
 //# sourceMappingURL=response-processor.js.map

package/dist/mlx-ml/process/response-processor.js.map

@@ -1 +1 @@
-{"version":3,"file":"response-processor.js","sourceRoot":"","sources":["../../../src/mlx-ml/process/response-processor.ts"],"names":[],"mappings":""}
+{"version":3,"file":"response-processor.js","sourceRoot":"","sources":["../../../src/mlx-ml/process/response-processor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAU9D;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB,CACpC,WAAkC,EAClC,OAAyC;IAEzC,MAAM,iBAAiB,GAAG,OAAO,EAAE,iBAAiB,IAAI,KAAK,CAAC;IAC9D,OAAO,CAAC,OAAe,EAAuB,EAAE;QAC9C,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;QACpF,IAAI,iBAAiB,EAAE,CAAC;YACtB,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,cAAc,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;YAC1E,OAAO;gBACL,OAAO;gBACP,eAAe;gBACf,SAAS,EAAE,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;aACxD,CAAC;QACJ,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,CAAC;IACrD,CAAC,CAAC;AACJ,CAAC"}

package/dist/mlx-ml/process/types.d.ts

@@ -38,7 +38,7 @@ export interface MlxToolResultMessage {
 }
 export type MlxMessage = MlxStandardMessage | MlxAssistantToolCallMessage | MlxToolResultMessage;
 export interface MlxBaseRequest {
-    method: 'capabilities' | 'format_test' | 'chat' | 'completion';
+    method: 'capabilities' | 'format_test' | 'chat' | 'completion' | 'cache_prefill' | 'tokenize';
 }
 export interface MlxCapabilitiesRequest extends MlxBaseRequest {
     method: 'capabilities';
@@ -50,6 +50,12 @@ export interface MlxFormatTestRequest extends MlxBaseRequest {
         primer?: string;
     };
 }
+export interface MlxTokenizeRequest extends MlxBaseRequest {
+    method: 'tokenize';
+    messages: MlxMessage[];
+    tools?: MlxToolDefinition[];
+    reasoning_effort?: 'low' | 'medium' | 'high';
+}
 /** HuggingFace apply_chat_template 互換のtool定義 */
 export interface MlxToolDefinition {
     type: 'function';
@@ -68,6 +74,8 @@ export interface MlxChatRequest extends MlxBaseRequest {
     images?: string[];
     maxImageSize?: number;
     reasoning_effort?: 'low' | 'medium' | 'high';
+    cache_path?: string;
+    cache_trim_tokens?: number;
 }
 export interface MlxCompletionRequest extends MlxBaseRequest {
     method: 'completion';
@@ -76,9 +84,26 @@ export interface MlxCompletionRequest extends MlxBaseRequest {
     images?: string[];
     maxImageSize?: number;
 }
-export type MlxRequest = MlxCapabilitiesRequest | MlxFormatTestRequest | MlxChatRequest | MlxCompletionRequest;
+export interface MlxCachePrefillRequest extends MlxBaseRequest {
+    method: 'cache_prefill';
+    cache_path: string;
+    messages: MlxMessage[];
+    base_cache_path?: string;
+    trim_to_tokens?: number;
+    prefix_offsets?: number[];
+    prefix_hashes?: string[];
+    tools?: MlxToolDefinition[];
+    reasoning_effort?: 'low' | 'medium' | 'high';
+}
+export interface MlxCachePrefillResult {
+    cache_path: string;
+    token_count?: number;
+    prefix_offsets?: number[];
+    prefix_hashes?: string[];
+}
+export type MlxRequest = MlxCapabilitiesRequest | MlxFormatTestRequest | MlxTokenizeRequest | MlxChatRequest | MlxCompletionRequest | MlxCachePrefillRequest;
 /** MLX-LMが認識するtool_parser_type */
-export type KnownToolParserType = 'json_tools' | 'pythonic' | 'function_gemma' | 'mistral' | 'kimi_k2' | 'longcat' | 'glm47' | 'qwen3_coder' | 'minimax_m2';
+export type KnownToolParserType = 'json_tools' | 'pythonic' | 'function_gemma' | 'mistral' | 'kimi_k2' | 'longcat' | 'glm47' | 'qwen3_coder' | 'minimax_m2' | 'gemma4' | 'harmony';
 export interface ToolCallFormat {
     tool_parser_type?: string;
     call_start?: string;
@@ -121,6 +146,11 @@ export interface MlxFormatTestResult {
     model_specific_processing: MlxMessage[] | null;
     error: string | null;
 }
+export interface MlxTokenizeResult {
+    token_ids: number[] | null;
+    token_count: number;
+    error: string | null;
+}
 export interface LegacyMlxRequest {
     messages: MlxMessage[];
     prompt?: string;
@@ -130,22 +160,38 @@ export interface LegacyMlxRequest {
 export interface BaseQueueItem {
     request: MlxRequest | LegacyMlxRequest;
     expectJsonResponse?: boolean;
+    reject?: (reason: Error) => void;
 }
 export interface CapabilitiesQueueItem extends BaseQueueItem {
     request: MlxCapabilitiesRequest;
     resolve: (value: MlxRuntimeInfo) => void;
+    reject: (reason: Error) => void;
     expectJsonResponse: true;
 }
 export interface FormatTestQueueItem extends BaseQueueItem {
     request: MlxFormatTestRequest;
     resolve: (value: MlxFormatTestResult) => void;
+    reject: (reason: Error) => void;
+    expectJsonResponse: true;
+}
+export interface TokenizeQueueItem extends BaseQueueItem {
+    request: MlxTokenizeRequest;
+    resolve: (value: MlxTokenizeResult) => void;
+    reject: (reason: Error) => void;
+    expectJsonResponse: true;
+}
+export interface CachePrefillQueueItem extends BaseQueueItem {
+    request: MlxCachePrefillRequest;
+    resolve: (value: MlxCachePrefillResult) => void;
+    reject: (reason: Error) => void;
     expectJsonResponse: true;
 }
 export interface StreamingQueueItem extends BaseQueueItem {
     request: MlxChatRequest | MlxCompletionRequest | LegacyMlxRequest;
     resolve: (value: Readable) => void;
+    reject: (reason: Error) => void;
     expectJsonResponse?: false;
 }
-export type QueueItem = CapabilitiesQueueItem | FormatTestQueueItem | StreamingQueueItem;
+export type QueueItem = CapabilitiesQueueItem | FormatTestQueueItem | TokenizeQueueItem | CachePrefillQueueItem | StreamingQueueItem;
 import { Readable } from 'stream';
 //# sourceMappingURL=types.d.ts.map

package/dist/mlx-ml/process/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/mlx-ml/process/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE/E,YAAY,EAAE,iBAAiB,EAAE,CAAC;AAElC,sDAAsD;AACtD,MAAM,MAAM,cAAc,GACtB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC9B;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAEtB,yCAAyC;AACzC,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,QAAQ,CAAC;IACtC,OAAO,EAAE,MAAM,GAAG,cAAc,EAAE,CAAC;CACpC;AAED,kDAAkD;AAClD,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,KAAK,CAAC;QAChB,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,UAAU,CAAC;QACjB,QAAQ,EAAE;YACR,IAAI,EAAE,MAAM,CAAC;YACb,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;KACH,CAAC,CAAC;CACJ;AAED,wCAAwC;AACxC,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,MAAM,UAAU,GAAG,kBAAkB,GAAG,2BAA2B,GAAG,oBAAoB,CAAC;AAGjG,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,cAAc,GAAG,aAAa,GAAG,MAAM,GAAG,YAAY,CAAC;CAChE;AAED,MAAM,WAAW,sBAAuB,SAAQ,cAAc;IAC5D,MAAM,EAAE,cAAc,CAAC;CACxB;AAED,MAAM,WAAW,oBAAqB,SAAQ,cAAc;IAC1D,MAAM,EAAE,aAAa,CAAC;IACtB,QAAQ,EAAE,UAAU,EAAE,CAAC;IACvB,OAAO,CAAC,EAAE;QACR,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;CACH;AAED,gDAAgD;AAChD,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACtC,CAAC;CACH;AAED,MAAM,WAAW,cAAe,SAAQ,cAAc;IACpD,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,UAAU,EAAE,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAC5B,OAAO,CAAC,EAAE,iBAAiB,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;CAC9C;AAED,MAAM,WAAW,oBAAqB,SAAQ,cAAc;IAC1D,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,iBAAiB,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,MAAM,UAAU,GAAG,sBAAsB,GAAG,oBAAoB,GAAG,cAAc,GAAG,oBAAoB,CAAC;AAE/G,kCAAkC;AAClC,MAAM,MAAM,mBAAmB,GAC3B,YAAY,GACZ,UAAU,GACV,gBAAgB,GAChB,SAAS,GACT,SAAS,GACT,SAAS,GACT,OAAO,GACP,aAAa,GACb,YAAY,CAAC;AAEjB,MAAM,WAAW,cAAc;IAC7B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,gBAAgB;IAC/B,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,gBAAgB,CAAC,EAAE,cAAc,CAAC;CACnC;AAED;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,gBAAgB,CAAC,CAAC;IAChE,QAAQ,EAAE;QACR,mBAAmB,EAAE,OAAO,CAAC;QAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,aAAa,CAAC,EAAE,gBAAgB,CAAC;KAClC,CAAC;IACF,iBAAiB,CAAC,EAAE;QAClB,sBAAsB,CAAC,EAAE,OAAO,CAAC;QACjC,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAC;QAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC;QAC7B,oBAAoB,CAAC,EAAE,OAAO,CAAC;KAChC,CAAC;IACF,UAAU,CAAC,EAAE,IAAI,GAAG,KAAK,CAAC;CAC3B;AAED,MAAM,WAAW,mBAAmB;IAClC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,yBAAyB,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;IAC/C,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAGD,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,UAAU,EAAE,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,iBAAiB,CAAC;CAC7B;AAGD,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,UAAU,GAAG,gBAAgB,CAAC;IACvC,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,MAAM,WAAW,qBAAsB,SAAQ,aAAa;IAC1D,OAAO,EAAE,sBAAsB,CAAC;IAChC,OAAO,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;IACzC,kBAAkB,EAAE,IAAI,CAAC;CAC1B;AAED,MAAM,WAAW,mBAAoB,SAAQ,aAAa;IACxD,OAAO,EAAE,oBAAoB,CAAC;IAC9B,OAAO,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAC;IAC9C,kBAAkB,EAAE,IAAI,CAAC;CAC1B;AAED,MAAM,WAAW,kBAAmB,SAAQ,aAAa;IACvD,OAAO,EAAE,cAAc,GAAG,oBAAoB,GAAG,gBAAgB,CAAC;IAClE,OAAO,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAC;IACnC,kBAAkB,CAAC,EAAE,KAAK,CAAC;CAC5B;AAED,MAAM,MAAM,SAAS,GAAG,qBAAqB,GAAG,mBAAmB,GAAG,kBAAkB,CAAC;AAGzF,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/mlx-ml/process/types.ts"],"names":[],"mappings":"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"}

package/dist/mlx-ml/tool-call-parser/content-parsers.d.ts

@@ -0,0 +1,9 @@
+import type { ContentParser, ParsedToolCall } from './types.js';
+export declare function normalizeJsonToolCall(obj: unknown): ParsedToolCall | null;
+export declare const jsonParser: ContentParser;
+export declare const gemma4Parser: ContentParser;
+export declare const pythonicParser: ContentParser;
+export declare const xmlParser: ContentParser;
+export declare const defaultContentParsers: ContentParser[];
+export declare function tryParsers(content: string, parsers?: ContentParser[]): ParsedToolCall | ParsedToolCall[] | null;
+//# sourceMappingURL=content-parsers.d.ts.map

package/dist/mlx-ml/tool-call-parser/content-parsers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"content-parsers.d.ts","sourceRoot":"","sources":["../../../src/mlx-ml/tool-call-parser/content-parsers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAGhE,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,cAAc,GAAG,IAAI,CAuCzE;AAED,eAAO,MAAM,UAAU,EAAE,aAgBxB,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,aAkD1B,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,aAkD5B,CAAC;AAcF,eAAO,MAAM,SAAS,EAAE,aAgCvB,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,aAAa,EAKhD,CAAC;AAEF,wBAAgB,UAAU,CACxB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,aAAa,EAA0B,GAC/C,cAAc,GAAG,cAAc,EAAE,GAAG,IAAI,CAM1C"}

package/dist/mlx-ml/tool-call-parser/content-parsers.js

@@ -0,0 +1,223 @@
+import { coerceValue, extractBracketedValue } from './utils.js';
+export function normalizeJsonToolCall(obj) {
+    if (typeof obj !== 'object' || obj === null)
+        return null;
+    const rec = obj;
+    // {"name": "...", "arguments"|"parameters": {...}}
+    if (rec.name && typeof rec.name === 'string') {
+        let args = rec.arguments || rec.parameters || {};
+        if (typeof args === 'string') {
+            try {
+                args = JSON.parse(args);
+            }
+            catch {
+                args = {};
+            }
+        }
+        if (typeof args !== 'object' || args === null)
+            args = {};
+        return { name: rec.name, arguments: args };
+    }
+    // {"function": {"name": "...", "arguments": {...}}}
+    if (rec.function && typeof rec.function === 'object' && rec.function !== null) {
+        const func = rec.function;
+        if (func.name && typeof func.name === 'string') {
+            let args = func.arguments || func.parameters || {};
+            if (typeof args === 'string') {
+                try {
+                    args = JSON.parse(args);
+                }
+                catch {
+                    args = {};
+                }
+            }
+            if (typeof args !== 'object' || args === null)
+                args = {};
+            return { name: func.name, arguments: args };
+        }
+    }
+    // {"tool": {"name": "...", ...}}
+    if (rec.tool && typeof rec.tool === 'object' && rec.tool !== null) {
+        const tool = rec.tool;
+        if (tool.name && typeof tool.name === 'string') {
+            let args = tool.arguments || tool.parameters || {};
+            if (typeof args !== 'object' || args === null)
+                args = {};
+            return { name: tool.name, arguments: args };
+        }
+    }
+    return null;
+}
+export const jsonParser = {
+    name: 'json',
+    parse(content) {
+        try {
+            const parsed = JSON.parse(content);
+            if (Array.isArray(parsed)) {
+                const results = parsed
+                    .map(item => normalizeJsonToolCall(item))
+                    .filter((item) => item !== null);
+                return results.length > 0 ? results : null;
+            }
+            return normalizeJsonToolCall(parsed);
+        }
+        catch {
+            return null;
+        }
+    },
+};
+export const gemma4Parser = {
+    name: 'gemma4',
+    parse(content) {
+        const match = content.match(/^call:([\w.-]+)\{([\s\S]*)\}$/);
+        if (!match)
+            return null;
+        const name = match[1];
+        const argsStr = match[2].trim();
+        const args = {};
+        if (argsStr) {
+            const normalized = argsStr.replace(/<\|"\|>/g, '"');
+            let pos = 0;
+            while (pos < normalized.length) {
+                const keyMatch = normalized.slice(pos).match(/^(\w+):/);
+                if (!keyMatch)
+                    break;
+                const key = keyMatch[1];
+                pos += keyMatch[0].length;
+                const ch = normalized[pos];
+                let value;
+                if (ch === '"') {
+                    let end = pos + 1;
+                    while (end < normalized.length && normalized[end] !== '"') {
+                        if (normalized[end] === '\\')
+                            end++;
+                        end++;
+                    }
+                    value = normalized.slice(pos + 1, end);
+                    pos = end + 1;
+                }
+                else if (ch === '[' || ch === '{') {
+                    const extracted = extractBracketedValue(normalized, pos);
+                    if (!extracted)
+                        break;
+                    value = extracted;
+                    pos += value.length;
+                }
+                else {
+                    const endMatch = normalized.slice(pos).match(/^([^,}]*)/);
+                    value = endMatch ? endMatch[1].trim() : '';
+                    pos += endMatch ? endMatch[0].length : 0;
+                }
+                args[key] = coerceValue(value);
+                const sep = normalized.slice(pos).match(/^\s*,\s*/);
+                if (sep)
+                    pos += sep[0].length;
+            }
+        }
+        return { name, arguments: args };
+    },
+};
+export const pythonicParser = {
+    name: 'pythonic',
+    parse(content) {
+        const match = content.match(/^\[(\w+)\((.*)\)\]$/s);
+        if (!match)
+            return null;
+        const name = match[1];
+        const argsStr = match[2].trim();
+        const args = {};
+        if (argsStr) {
+            let pos = 0;
+            while (pos < argsStr.length) {
+                const keyMatch = argsStr.slice(pos).match(/^(\w+)\s*=\s*/);
+                if (!keyMatch)
+                    break;
+                const key = keyMatch[1];
+                pos += keyMatch[0].length;
+                const ch = argsStr[pos];
+                let value;
+                if (ch === '[' || ch === '{') {
+                    const extracted = extractBracketedValue(argsStr, pos);
+                    if (!extracted)
+                        break;
+                    value = extracted;
+                    pos += value.length;
+                }
+                else if (ch === '"' || ch === "'") {
+                    const quote = ch;
+                    let end = pos + 1;
+                    while (end < argsStr.length && argsStr[end] !== quote) {
+                        if (argsStr[end] === '\\')
+                            end++;
+                        end++;
+                    }
+                    value = argsStr.slice(pos + 1, end);
+                    pos = end + 1;
+                }
+                else {
+                    const endMatch = argsStr.slice(pos).match(/^([^,)]*)/);
+                    value = endMatch ? endMatch[1].trim() : '';
+                    pos += endMatch ? endMatch[0].length : 0;
+                }
+                args[key] = coerceValue(value);
+                const sep = argsStr.slice(pos).match(/^\s*,\s*/);
+                if (sep)
+                    pos += sep[0].length;
+            }
+        }
+        return { name, arguments: args };
+    },
+};
+function parseXmlParams(paramsStr, paramRegex) {
+    const args = {};
+    let paramMatch;
+    while ((paramMatch = paramRegex.exec(paramsStr)) !== null) {
+        args[paramMatch[1]] = coerceValue(paramMatch[2].trim());
+    }
+    return args;
+}
+export const xmlParser = {
+    name: 'xml',
+    parse(content) {
+        // qwen3_coder: <function=name><parameter=key>value</parameter></function>
+        const qwenMatch = content.match(/<function=([\w.-]+)>([\s\S]*?)<\/function>/);
+        if (qwenMatch) {
+            return {
+                name: qwenMatch[1],
+                arguments: parseXmlParams(qwenMatch[2], /<parameter=(\w+)>([\s\S]*?)<\/parameter>/g),
+            };
+        }
+        // minimax: <invoke name="name"><parameter name="key">value</parameter></invoke>
+        const minimaxMatch = content.match(/<invoke\s+name="([\w.]+)">([\s\S]*?)<\/invoke>/);
+        if (minimaxMatch) {
+            return {
+                name: minimaxMatch[1],
+                arguments: parseXmlParams(minimaxMatch[2], /<parameter\s+name="(\w+)">([\s\S]*?)<\/parameter>/g),
+            };
+        }
+        // minicpm5: <function name="name"><param name="key">value</param></function>
+        const minicpmMatch = content.match(/<function\s+name="([\w.-]+)">([\s\S]*?)<\/function>/);
+        if (minicpmMatch) {
+            return {
+                name: minicpmMatch[1],
+                arguments: parseXmlParams(minicpmMatch[2], /<param\s+name="(\w+)">([\s\S]*?)<\/param>/g),
+            };
+        }
+        return null;
+    },
+};
+export const defaultContentParsers = [
+    jsonParser,
+    gemma4Parser,
+    pythonicParser,
+    xmlParser,
+];
+export function tryParsers(content, parsers = defaultContentParsers) {
+    for (const parser of parsers) {
+        const result = parser.parse(content);
+        if (result)
+            return result;
+    }
+    return null;
+}
+//# sourceMappingURL=content-parsers.js.map