@modular-prompt/driver 0.14.0 → 0.15.0

package/dist/mlx-ml/mlx-driver.d.ts

@@ -1,22 +1,23 @@
-import type { AIDriver, QueryOptions, QueryResult, StreamResult } from '../types.js';
-import type { FormatterOptions } from '../formatter/types.js';
-import type { MlxMlModelOptions, MlxModelCapabilities } from './types.js';
-import type { CompiledPrompt } from '@modular-prompt/core';
+import type { MlxBackendMode } from '../driver-registry/types.js';
+import { LocalInferenceDriver } from '../local-inference/driver.js';
+import { hasMessageElement } from '../local-inference/prompt-utils.js';
 import type { PromptCacheController } from '../cache-controller.js';
-/**
- * Check if the prompt contains MessageElement
- */
-export declare function hasMessageElement(prompt: CompiledPrompt): boolean;
+import type { MlxModelCapabilities } from './types.js';
+import type { MlxQueryOptions } from './mlx-options.js';
+import type { FormatterOptions } from '../formatter/types.js';
+export { hasMessageElement };
 /**
  * MLX ML driver configuration
  */
 export interface MlxDriverConfig {
     model: string;
-    defaultOptions?: Partial<MlxMlModelOptions>;
+    defaultOptions?: Partial<MlxQueryOptions>;
     formatterOptions?: FormatterOptions;
     /** VLM画像の最大辺ピクセル数（デフォルト: 768） */
     maxImageSize?: number;
-    /** VLMモデルをtext-onlyモードで使用する（VLM判定を抑制） */
+    /** MLX Python バックエンド（デフォルト: auto） */
+    backend?: MlxBackendMode;
+    /** VLMモデルをtext-onlyモードで使用する（backend: lm と同等。後方互換） */
     textOnly?: boolean;
     /** Speculative decoding用のdrafter model名 */
     drafterModel?: string;
@@ -26,63 +27,23 @@ export interface MlxDriverConfig {
     cacheController?: PromptCacheController;
 }
 /**
- * MLX ML driver using Python subprocess
+ * MLX ML driver using Python subprocess.
+ * 共通ロジックは LocalInferenceDriver に委譲する。
  */
-export declare class MlxDriver implements AIDriver {
-    private process;
-    private model;
-    private _defaultOptions;
-    private runtimeInfo;
-    private modelProcessor;
-    private formatterOptions;
-    private maxImageSize;
-    private queryLogger;
-    private cacheController?;
-    private cacheControllerBound;
-    get defaultOptions(): Partial<MlxMlModelOptions>;
-    set defaultOptions(value: Partial<MlxMlModelOptions>);
+export declare class MlxDriver extends LocalInferenceDriver {
+    private cacheControllerRaw?;
+    private cacheDisabledForVlm;
+    private readonly cacheBindingState;
     constructor(config: MlxDriverConfig);
-    /**
-     * Initialize process and cache runtime info
-     */
-    private ensureInitialized;
-    /**
-     * VLMモデルかどうかを判定
-     */
-    private isVLM;
-    /**
-     * Determine which API to use (chat or completion)
-     * Simple logic based on runtime info only
-     */
-    private determineApi;
-    /**
-     * モデルがnativeツール対応かを判定
-     * tool_call_format（Python側検出結果）を唯一の判断基準とする
-     */
-    private hasNativeToolSupport;
-    /**
-     * Execute query and return stream
-     * Common logic for query and streamQuery
-     */
-    private executeQuery;
-    /**
-     * Query the AI model with a compiled prompt
-     */
-    query(prompt: CompiledPrompt, options?: QueryOptions): Promise<QueryResult>;
-    /**
-     * Stream query implementation
-     */
-    streamQuery(prompt: CompiledPrompt, options?: QueryOptions): Promise<StreamResult>;
+    get defaultOptions(): Partial<MlxQueryOptions>;
+    set defaultOptions(value: Partial<MlxQueryOptions>);
     /**
      * Get model capabilities (public API)
      *
      * Returns runtime information converted to camelCase
      */
     getCapabilities(): Promise<MlxModelCapabilities>;
-    private logCacheStats;
-    /**
-     * Close the process
-     */
     close(): Promise<void>;
+    private logCacheStats;
 }
 //# sourceMappingURL=mlx-driver.d.ts.map

package/dist/mlx-ml/mlx-driver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mlx-driver.d.ts","sourceRoot":"","sources":["../../src/mlx-ml/mlx-driver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAgB,MAAM,aAAa,CAAC;AAEnG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAI9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAI1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAK3D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAcpE;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAYjE;AAMD;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC5C,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,iCAAiC;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,yCAAyC;IACzC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,2CAA2C;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,2DAA2D;IAC3D,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,0BAA0B;IAC1B,eAAe,CAAC,EAAE,qBAAqB,CAAC;CACzC;AAyFD;;GAEG;AACH,qBAAa,SAAU,YAAW,QAAQ;IACxC,OAAO,CAAC,OAAO,CAAa;IAC5B,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,eAAe,CAA6B;IACpD,OAAO,CAAC,WAAW,CAA+B;IAClD,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,eAAe,CAAC,CAAwB;IAChD,OAAO,CAAC,oBAAoB,CAAS;IAErC,IAAI,cAAc,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAE/C;IAED,IAAI,cAAc,CAAC,KAAK,EAAE,OAAO,CAAC,iBAAiB,CAAC,EAEnD;gBAEW,MAAM,EAAE,eAAe;IAiBnC;;OAEG;YACW,iBAAiB;IA2C/B;;OAEG;IACH,OAAO,CAAC,KAAK;IAIb;;;OAGG;IACH,OAAO,CAAC,YAAY;IASpB;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAI5B;;;OAGG;YACW,YAAY;IAuG1B;;OAEG;IACG,KAAK,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC;IAajF;;OAEG;IACG,WAAW,CACf,MAAM,EAAE,cAAc,EACtB,OAAO,CAAC,EAAE,YAAY,GACrB,OAAO,CAAC,YAAY,CAAC;IAuJxB;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAsCtD,OAAO,CAAC,aAAa;IAqBrB;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAK7B"}
+{"version":3,"file":"mlx-driver.d.ts","sourceRoot":"","sources":["../../src/mlx-ml/mlx-driver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAS9D,OAAO,EAAE,iBAAiB,EAAE,CAAC;AAE7B;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAC1C,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,iCAAiC;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qCAAqC;IACrC,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,qDAAqD;IACrD,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,2CAA2C;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,2DAA2D;IAC3D,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,0BAA0B;IAC1B,eAAe,CAAC,EAAE,qBAAqB,CAAC;CACzC;AAED;;;GAGG;AACH,qBAAa,SAAU,SAAQ,oBAAoB;IACjD,OAAO,CAAC,kBAAkB,CAAC,CAAwB;IACnD,OAAO,CAAC,mBAAmB,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;gBAE1C,MAAM,EAAE,eAAe;IA6CnC,IAAI,cAAc,IAAI,OAAO,CAAC,eAAe,CAAC,CAE7C;IAED,IAAI,cAAc,CAAC,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC,EAEjD;IAED;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,oBAAoB,CAAC;IA8CvC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAQrC,OAAO,CAAC,aAAa;CAoBtB"}