@modular-prompt/driver 0.14.0 → 0.16.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (218) hide show
  1. package/README.md +90 -5
  2. package/dist/driver-registry/ai-service.d.ts +23 -1
  3. package/dist/driver-registry/ai-service.d.ts.map +1 -1
  4. package/dist/driver-registry/ai-service.js +44 -10
  5. package/dist/driver-registry/ai-service.js.map +1 -1
  6. package/dist/driver-registry/config-based-factory.d.ts.map +1 -1
  7. package/dist/driver-registry/config-based-factory.js +20 -3
  8. package/dist/driver-registry/config-based-factory.js.map +1 -1
  9. package/dist/driver-registry/factory-helper.d.ts +2 -0
  10. package/dist/driver-registry/factory-helper.d.ts.map +1 -1
  11. package/dist/driver-registry/factory-helper.js +22 -3
  12. package/dist/driver-registry/factory-helper.js.map +1 -1
  13. package/dist/driver-registry/index.d.ts +2 -2
  14. package/dist/driver-registry/index.d.ts.map +1 -1
  15. package/dist/driver-registry/index.js +1 -1
  16. package/dist/driver-registry/index.js.map +1 -1
  17. package/dist/driver-registry/registry.d.ts.map +1 -1
  18. package/dist/driver-registry/registry.js +3 -1
  19. package/dist/driver-registry/registry.js.map +1 -1
  20. package/dist/driver-registry/types.d.ts +11 -2
  21. package/dist/driver-registry/types.d.ts.map +1 -1
  22. package/dist/index.d.ts +10 -2
  23. package/dist/index.d.ts.map +1 -1
  24. package/dist/index.js +9 -1
  25. package/dist/index.js.map +1 -1
  26. package/dist/local-inference/adapters.d.ts +66 -0
  27. package/dist/local-inference/adapters.d.ts.map +1 -0
  28. package/dist/local-inference/adapters.js +2 -0
  29. package/dist/local-inference/adapters.js.map +1 -0
  30. package/dist/local-inference/driver.d.ts +51 -0
  31. package/dist/local-inference/driver.d.ts.map +1 -0
  32. package/dist/local-inference/driver.js +309 -0
  33. package/dist/local-inference/driver.js.map +1 -0
  34. package/dist/local-inference/index.d.ts +22 -0
  35. package/dist/local-inference/index.d.ts.map +1 -0
  36. package/dist/local-inference/index.js +17 -0
  37. package/dist/local-inference/index.js.map +1 -0
  38. package/dist/local-inference/process-client.d.ts +50 -0
  39. package/dist/local-inference/process-client.d.ts.map +1 -0
  40. package/dist/local-inference/process-client.js +92 -0
  41. package/dist/local-inference/process-client.js.map +1 -0
  42. package/dist/local-inference/process-communication.d.ts +41 -0
  43. package/dist/local-inference/process-communication.d.ts.map +1 -0
  44. package/dist/{mlx-ml/process → local-inference}/process-communication.js +25 -61
  45. package/dist/local-inference/process-communication.js.map +1 -0
  46. package/dist/local-inference/process-port.d.ts +12 -0
  47. package/dist/local-inference/process-port.d.ts.map +1 -0
  48. package/dist/local-inference/process-port.js +2 -0
  49. package/dist/local-inference/process-port.js.map +1 -0
  50. package/dist/local-inference/prompt-utils.d.ts +6 -0
  51. package/dist/local-inference/prompt-utils.d.ts.map +1 -0
  52. package/dist/local-inference/prompt-utils.js +17 -0
  53. package/dist/local-inference/prompt-utils.js.map +1 -0
  54. package/dist/local-inference/protocol.d.ts +192 -0
  55. package/dist/local-inference/protocol.d.ts.map +1 -0
  56. package/dist/local-inference/protocol.js +2 -0
  57. package/dist/local-inference/protocol.js.map +1 -0
  58. package/dist/local-inference/queue-types.d.ts +54 -0
  59. package/dist/local-inference/queue-types.d.ts.map +1 -0
  60. package/dist/local-inference/queue-types.js +2 -0
  61. package/dist/local-inference/queue-types.js.map +1 -0
  62. package/dist/local-inference/request-queue.d.ts +36 -0
  63. package/dist/local-inference/request-queue.d.ts.map +1 -0
  64. package/dist/{mlx-ml/process/queue.js → local-inference/request-queue.js} +83 -56
  65. package/dist/local-inference/request-queue.js.map +1 -0
  66. package/dist/local-inference/stream-utils.d.ts +19 -0
  67. package/dist/local-inference/stream-utils.d.ts.map +1 -0
  68. package/dist/local-inference/stream-utils.js +76 -0
  69. package/dist/local-inference/stream-utils.js.map +1 -0
  70. package/dist/mlx-ml/mlx-cache-controller.d.ts.map +1 -1
  71. package/dist/mlx-ml/mlx-cache-controller.js +2 -1
  72. package/dist/mlx-ml/mlx-cache-controller.js.map +1 -1
  73. package/dist/mlx-ml/mlx-cache-support.d.ts +23 -0
  74. package/dist/mlx-ml/mlx-cache-support.d.ts.map +1 -0
  75. package/dist/mlx-ml/mlx-cache-support.js +45 -0
  76. package/dist/mlx-ml/mlx-cache-support.js.map +1 -0
  77. package/dist/mlx-ml/mlx-driver.d.ts +20 -59
  78. package/dist/mlx-ml/mlx-driver.d.ts.map +1 -1
  79. package/dist/mlx-ml/mlx-driver.js +86 -460
  80. package/dist/mlx-ml/mlx-driver.js.map +1 -1
  81. package/dist/mlx-ml/mlx-local-inference-adapters.d.ts +3 -0
  82. package/dist/mlx-ml/mlx-local-inference-adapters.d.ts.map +1 -0
  83. package/dist/mlx-ml/mlx-local-inference-adapters.js +19 -0
  84. package/dist/mlx-ml/mlx-local-inference-adapters.js.map +1 -0
  85. package/dist/mlx-ml/mlx-options.d.ts +19 -0
  86. package/dist/mlx-ml/mlx-options.d.ts.map +1 -0
  87. package/dist/mlx-ml/mlx-options.js +30 -0
  88. package/dist/mlx-ml/mlx-options.js.map +1 -0
  89. package/dist/mlx-ml/process/index.d.ts +10 -8
  90. package/dist/mlx-ml/process/index.d.ts.map +1 -1
  91. package/dist/mlx-ml/process/index.js +73 -54
  92. package/dist/mlx-ml/process/index.js.map +1 -1
  93. package/dist/mlx-ml/process/model-specific.d.ts +2 -1
  94. package/dist/mlx-ml/process/model-specific.d.ts.map +1 -1
  95. package/dist/mlx-ml/process/model-specific.js.map +1 -1
  96. package/dist/mlx-ml/process/prompt-builder.d.ts +11 -0
  97. package/dist/mlx-ml/process/prompt-builder.d.ts.map +1 -0
  98. package/dist/mlx-ml/process/prompt-builder.js +51 -0
  99. package/dist/mlx-ml/process/prompt-builder.js.map +1 -0
  100. package/dist/mlx-ml/process/types.d.ts +15 -183
  101. package/dist/mlx-ml/process/types.d.ts.map +1 -1
  102. package/dist/mlx-ml/types.d.ts +2 -45
  103. package/dist/mlx-ml/types.d.ts.map +1 -1
  104. package/dist/models-config/index.d.ts +8 -0
  105. package/dist/models-config/index.d.ts.map +1 -0
  106. package/dist/models-config/index.js +7 -0
  107. package/dist/models-config/index.js.map +1 -0
  108. package/dist/models-config/loader.d.ts +20 -0
  109. package/dist/models-config/loader.d.ts.map +1 -0
  110. package/dist/models-config/loader.js +85 -0
  111. package/dist/models-config/loader.js.map +1 -0
  112. package/dist/models-config/paths.d.ts +15 -0
  113. package/dist/models-config/paths.d.ts.map +1 -0
  114. package/dist/models-config/paths.js +26 -0
  115. package/dist/models-config/paths.js.map +1 -0
  116. package/dist/models-config/resolve.d.ts +57 -0
  117. package/dist/models-config/resolve.d.ts.map +1 -0
  118. package/dist/models-config/resolve.js +208 -0
  119. package/dist/models-config/resolve.js.map +1 -0
  120. package/dist/models-config/types.d.ts +62 -0
  121. package/dist/models-config/types.d.ts.map +1 -0
  122. package/dist/models-config/types.js +5 -0
  123. package/dist/models-config/types.js.map +1 -0
  124. package/dist/pytorch/process/index.d.ts +35 -0
  125. package/dist/pytorch/process/index.d.ts.map +1 -0
  126. package/dist/pytorch/process/index.js +69 -0
  127. package/dist/pytorch/process/index.js.map +1 -0
  128. package/dist/pytorch/pytorch-driver.d.ts +35 -0
  129. package/dist/pytorch/pytorch-driver.d.ts.map +1 -0
  130. package/dist/pytorch/pytorch-driver.js +48 -0
  131. package/dist/pytorch/pytorch-driver.js.map +1 -0
  132. package/dist/pytorch/pytorch-local-inference-adapters.d.ts +3 -0
  133. package/dist/pytorch/pytorch-local-inference-adapters.d.ts.map +1 -0
  134. package/dist/pytorch/pytorch-local-inference-adapters.js +19 -0
  135. package/dist/pytorch/pytorch-local-inference-adapters.js.map +1 -0
  136. package/dist/pytorch/pytorch-options.d.ts +8 -0
  137. package/dist/pytorch/pytorch-options.d.ts.map +1 -0
  138. package/dist/pytorch/pytorch-options.js +21 -0
  139. package/dist/pytorch/pytorch-options.js.map +1 -0
  140. package/dist/query-logger.js +1 -1
  141. package/dist/query-logger.js.map +1 -1
  142. package/dist/runtime/check.d.ts +10 -0
  143. package/dist/runtime/check.d.ts.map +1 -0
  144. package/dist/runtime/check.js +25 -0
  145. package/dist/runtime/check.js.map +1 -0
  146. package/dist/runtime/index.d.ts +5 -0
  147. package/dist/runtime/index.d.ts.map +1 -0
  148. package/dist/runtime/index.js +5 -0
  149. package/dist/runtime/index.js.map +1 -0
  150. package/dist/runtime/manifest-core.d.mts +27 -0
  151. package/dist/runtime/manifest-core.d.mts.map +1 -0
  152. package/dist/runtime/manifest-core.mjs +68 -0
  153. package/dist/runtime/manifest-core.mjs.map +1 -0
  154. package/dist/runtime/manifest.d.ts +18 -0
  155. package/dist/runtime/manifest.d.ts.map +1 -0
  156. package/dist/runtime/manifest.js +9 -0
  157. package/dist/runtime/manifest.js.map +1 -0
  158. package/dist/runtime/paths-core.d.mts +17 -0
  159. package/dist/runtime/paths-core.d.mts.map +1 -0
  160. package/dist/runtime/paths-core.mjs +67 -0
  161. package/dist/runtime/paths-core.mjs.map +1 -0
  162. package/dist/runtime/paths.d.ts +12 -0
  163. package/dist/runtime/paths.d.ts.map +1 -0
  164. package/dist/runtime/paths.js +17 -0
  165. package/dist/runtime/paths.js.map +1 -0
  166. package/dist/runtime/setup-commands-core.d.mts +13 -0
  167. package/dist/runtime/setup-commands-core.d.mts.map +1 -0
  168. package/dist/runtime/setup-commands-core.mjs +14 -0
  169. package/dist/runtime/setup-commands-core.mjs.map +1 -0
  170. package/dist/runtime/setup-commands.d.ts +2 -0
  171. package/dist/runtime/setup-commands.d.ts.map +1 -0
  172. package/dist/runtime/setup-commands.js +2 -0
  173. package/dist/runtime/setup-commands.js.map +1 -0
  174. package/dist/types.d.ts +11 -1
  175. package/dist/types.d.ts.map +1 -1
  176. package/dist/types.js.map +1 -1
  177. package/package.json +13 -7
  178. package/scripts/download-model.js +26 -9
  179. package/scripts/runtime-cli.js +320 -0
  180. package/src/mlx-ml/python/__main__.py +43 -4
  181. package/src/mlx-ml/python/backends/cache_archive.py +41 -0
  182. package/src/mlx-ml/python/backends/mlx_lm.py +17 -1
  183. package/src/mlx-ml/python/handlers/__init__.py +2 -1
  184. package/src/mlx-ml/python/handlers/completion.py +3 -27
  185. package/src/mlx-ml/python/handlers/{chat.py → generate.py} +33 -106
  186. package/src/mlx-ml/python/handlers/render.py +40 -0
  187. package/src/mlx-ml/python/pyproject.toml +11 -4
  188. package/src/mlx-ml/python/server.py +28 -8
  189. package/src/mlx-ml/python/utils/template_render.py +80 -0
  190. package/src/mlx-ml/python/utils/token_utils.py +2 -2
  191. package/src/mlx-ml/python/uv.lock +544 -689
  192. package/src/pytorch/python/__main__.py +19 -0
  193. package/src/pytorch/python/backends/__init__.py +3 -0
  194. package/src/pytorch/python/backends/base.py +84 -0
  195. package/src/pytorch/python/backends/transformers_lm.py +127 -0
  196. package/src/pytorch/python/handlers/__init__.py +6 -0
  197. package/src/pytorch/python/handlers/cancel.py +53 -0
  198. package/src/pytorch/python/handlers/capabilities.py +6 -0
  199. package/src/pytorch/python/handlers/completion.py +15 -0
  200. package/src/pytorch/python/handlers/format_test.py +70 -0
  201. package/src/pytorch/python/handlers/generate.py +68 -0
  202. package/src/pytorch/python/handlers/render.py +40 -0
  203. package/src/pytorch/python/handlers/tokenize.py +63 -0
  204. package/src/pytorch/python/pyproject.toml +36 -0
  205. package/src/pytorch/python/server.py +140 -0
  206. package/src/pytorch/python/utils/__init__.py +0 -0
  207. package/src/pytorch/python/utils/chat_template_constraints.py +164 -0
  208. package/src/pytorch/python/utils/prompt_builder.py +54 -0
  209. package/src/pytorch/python/utils/template_render.py +80 -0
  210. package/src/pytorch/python/utils/token_utils.py +376 -0
  211. package/src/pytorch/python/uv.lock +694 -0
  212. package/dist/mlx-ml/process/process-communication.d.ts +0 -45
  213. package/dist/mlx-ml/process/process-communication.d.ts.map +0 -1
  214. package/dist/mlx-ml/process/process-communication.js.map +0 -1
  215. package/dist/mlx-ml/process/queue.d.ts +0 -35
  216. package/dist/mlx-ml/process/queue.d.ts.map +0 -1
  217. package/dist/mlx-ml/process/queue.js.map +0 -1
  218. package/scripts/setup-mlx.js +0 -53
package/README.md CHANGED
@@ -64,6 +64,7 @@ if (result.logEntries) {
64
64
  | `GoogleGenAIDriver` | Google | APIキーのみで利用可能 |
65
65
  | `OllamaDriver` | Ollama | ローカルLLM |
66
66
  | `MlxDriver` | MLX | Apple Silicon専用(VLM対応) |
67
+ | `PyTorchDriver` | PyTorch | Transformers + PyTorch(LIP、cpu-minimal 自動セットアップ) |
67
68
  | `VllmDriver` | vLLM | CUDA GPU推論(Linux) |
68
69
  | `TestDriver` | - | モックレスポンス |
69
70
  | `EchoDriver` | - | プロンプトをそのまま返す |
@@ -79,7 +80,86 @@ if (result.logEntries) {
79
80
  - **構造化出力**: JSONスキーマによる出力制御
80
81
  - **AIService**: 能力ベースのモデル自動選択
81
82
 
82
- ## 推論キャンセル(AbortSignal)
83
+ ## ユーザーモデル設定(`~/.modular-prompt/models.yaml`)
84
+
85
+ マシン共通のモデル定義を `~/.modular-prompt/models.yaml` に置けます(`MODULAR_PROMPT_HOME` で上書き可)。**プロジェクト配下の暗黙探索は行いません。** 利用側アプリが base / overlay を明示投入し、**overlay > user > base** の優先順位で解決します。
86
+
87
+ ```yaml
88
+ models:
89
+ default:
90
+ provider: mlx
91
+ model: mlx-community/gemma-3-270m-it-4bit
92
+ local-chat:
93
+ provider: mlx
94
+ model: mlx-community/gemma-3-270m-it-4bit
95
+ capabilities: [local, chat, tools]
96
+ ```
97
+
98
+ ```typescript
99
+ import {
100
+ resolveModelName,
101
+ resolveDefaultModelFromConfig,
102
+ AIService,
103
+ } from '@modular-prompt/driver';
104
+
105
+ const bundled = {
106
+ models: {
107
+ default: { provider: 'mlx', model: 'app/default' },
108
+ },
109
+ } as const;
110
+
111
+ const profileOverlay = {
112
+ models: {
113
+ 'local-chat': { provider: 'mlx', model: 'my-app/local' },
114
+ },
115
+ };
116
+
117
+ const ai = AIService.fromMergedConfig(bundled, profileOverlay);
118
+ const models = ai.modelsConfig;
119
+
120
+ const spec = resolveModelName('local-chat', models, () => 'mlx');
121
+ const fallback = resolveDefaultModelFromConfig(models);
122
+ const driver = await ai.createDriver(spec);
123
+ ```
124
+
125
+ - `AIService.fromMergedConfig(base, overlay)` — base + overlay をマージし、デフォルトで user yaml も取り込む
126
+ - `AIService.fromModelsConfig({ source })` — `source: 'merge'`(デフォルト)で user yaml を読み込み、`source: 'overlay'` で無視
127
+ - `mode: 'merge' | 'override'` — models セクションの浅いマージ / 置換
128
+ - デフォルト model は `models.default` alias、なければ models の先頭エントリから導出
129
+ - `defaults` / `runtime` による暗黙解決は廃止(YAML に残っていても警告のみ)
130
+
131
+ simple-chat では profile の `modelsConfig` に inline の `models` / `drivers` を載せ、`workflow.models.default.ref` で alias 参照できます。`ref` に未知の alias を指定した場合は **エラーで停止**します。
132
+
133
+ 不正な YAML は `loadModelsConfigFile()` が **例外を throw** します(js-yaml のパースエラーをそのまま伝播)。
134
+
135
+ ### テスト用モデル設定(`models.testing.yaml`)
136
+
137
+ ローカル統合テストや手元試行で使うモデルは、通常設定と分けて
138
+ `~/.modular-prompt/models.testing.yaml` に置けます。`MODULAR_PROMPT_HOME` を設定している場合は、そのディレクトリ配下を使用します。プロジェクト配下の設定ファイルは暗黙探索しません。
139
+
140
+ `models.default` には cache 対応の text-only LM を指定してください。MLX VLM は prompt caching が無効になるため、cache 統合テストには使用できません。
141
+
142
+ ```yaml
143
+ models:
144
+ default:
145
+ provider: mlx
146
+ model: prism-ml/Ternary-Bonsai-1.7B-mlx-2bit
147
+ driverOptions:
148
+ backend: lm # qwen3 is otherwise detected through mlx_vlm; keep cache on
149
+ mlx-native-tool:
150
+ provider: mlx
151
+ model: mlx-community/Josiefied-LFM2.5-1.2B-Instruct-abliterated-4bit
152
+ capabilities: [tools]
153
+ ```
154
+
155
+ マージ順は **base → `models.yaml` → `models.testing.yaml` → overlay** です。Vitest 実行中または `NODE_ENV=test` では testing 設定が自動で追加されます。CLI などで明示的に使う場合は次の環境変数を指定します。
156
+
157
+ ```bash
158
+ MODULAR_PROMPT_MODELS_PROFILE=testing modular-extract create meeting -m default docs/notes.txt
159
+ ```
160
+
161
+ ライブラリからは `resolveModelsConfig({ profile: 'testing' })` または `AIService.fromModelsConfig({ profile: 'testing' })` を使用できます。統合テストはこの設定から MLX/API ドライバーを導出し、設定が無い場合は従来の `test-drivers.yaml` にフォールバックします。サンプルは [`models.testing.yaml.example`](./test/integration/models.testing.yaml.example) を参照してください。
162
+
83
163
 
84
164
  ```typescript
85
165
  import { MlxDriver } from '@modular-prompt/driver';
@@ -163,14 +243,19 @@ export class CustomDriver implements AIDriver {
163
243
 
164
244
  ### MLX(Apple Silicon)
165
245
 
166
- MLXドライバーはインストール時に自動でPython環境をセットアップします。手動で実行する場合:
246
+ MLX ドライバーを使う前に Python ランタイムのセットアップが必要です(macOS のみ):
167
247
 
168
248
  ```bash
169
- cd node_modules/@modular-prompt/driver
170
- npm run setup-mlx
249
+ # monorepo ルートから
250
+ pnpm run setup-mlx
251
+
252
+ # @modular-prompt/driver を npm インストールした場合
253
+ modular-prompt-runtime setup mlx
171
254
  ```
172
255
 
173
- 前提条件: Python 3.11以上、Apple Silicon Mac、uv。
256
+ ランタイムは `~/.modular-prompt/runtimes/mlx/` に作成されます。状態確認は `pnpm --filter @modular-prompt/driver run runtime:status`(monorepo)または `modular-prompt-runtime setup --status`。
257
+
258
+ 前提条件: Python 3.13、Apple Silicon Mac、uv。
174
259
 
175
260
  #### VLMモデルのtext-only使用
176
261
 
@@ -4,6 +4,7 @@
4
4
  import type { ModelSpec, DriverCapability, DriverProvider } from './types.js';
5
5
  import type { AIDriver } from '../types.js';
6
6
  import type { ApplicationConfig } from './config-based-factory.js';
7
+ import { type ModelsConfig, type ModelsConfigOptions } from '../models-config/index.js';
7
8
  /**
8
9
  * モデル選択オプション
9
10
  */
@@ -19,6 +20,10 @@ export interface SelectionOptions {
19
20
  /** 条件緩和モード(条件を満たさない場合は条件を減らして再試行) */
20
21
  lenient?: boolean;
21
22
  }
23
+ export interface AIServiceModelsOptions extends ModelsConfigOptions {
24
+ /** ApplicationConfig.defaultOptions にマージする追加オプション */
25
+ defaultOptions?: ApplicationConfig['defaultOptions'];
26
+ }
22
27
  /**
23
28
  * AIサービスクラス
24
29
  * レジストリを管理し、capabilityベースでドライバを作成
@@ -26,7 +31,24 @@ export interface SelectionOptions {
26
31
  export declare class AIService {
27
32
  private registry;
28
33
  private config;
29
- constructor(config: ApplicationConfig);
34
+ readonly modelsConfig: ModelsConfig;
35
+ constructor(config: ApplicationConfig, modelsConfig?: ModelsConfig);
36
+ /**
37
+ * ApplicationConfig から直接作成(experiment 等)
38
+ */
39
+ static fromApplicationConfig(config: ApplicationConfig): AIService;
40
+ /**
41
+ * models.yaml 解決経由で作成
42
+ */
43
+ static fromModelsConfig(options?: AIServiceModelsOptions): AIService;
44
+ /**
45
+ * user models.yaml を無視し、渡した config のみで作成
46
+ */
47
+ static fromOverlay(overlay: ModelsConfig, options?: Omit<AIServiceModelsOptions, 'overlay' | 'source'>): AIService;
48
+ /**
49
+ * base + overlay をマージし、必要なら user yaml も取り込む
50
+ */
51
+ static fromMergedConfig(base: ModelsConfig, overlay?: ModelsConfig, options?: Omit<AIServiceModelsOptions, 'base' | 'overlay'>): AIService;
30
52
  /**
31
53
  * capabilityからドライバを作成
32
54
  */
@@ -1 +1 @@
1
- {"version":3,"file":"ai-service.d.ts","sourceRoot":"","sources":["../../src/driver-registry/ai-service.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAInE;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,mBAAmB;IACnB,cAAc,CAAC,EAAE,cAAc,CAAC;IAEhC,iBAAiB;IACjB,gBAAgB,CAAC,EAAE,cAAc,EAAE,CAAC;IAEpC,cAAc;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,qCAAqC;IACrC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;GAGG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,MAAM,CAAoB;gBAEtB,MAAM,EAAE,iBAAiB;IAMrC;;OAEG;IACG,4BAA4B,CAChC,YAAY,EAAE,gBAAgB,EAAE,EAChC,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAQ3B;;OAEG;IACG,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC;IAItD;;OAEG;IACH,YAAY,CACV,YAAY,EAAE,gBAAgB,EAAE,EAChC,OAAO,CAAC,EAAE,gBAAgB,GACzB,SAAS,EAAE;CA8Cf"}
1
+ {"version":3,"file":"ai-service.d.ts","sourceRoot":"","sources":["../../src/driver-registry/ai-service.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAGnE,OAAO,EAGL,KAAK,YAAY,EACjB,KAAK,mBAAmB,EACzB,MAAM,2BAA2B,CAAC;AAEnC;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,mBAAmB;IACnB,cAAc,CAAC,EAAE,cAAc,CAAC;IAEhC,iBAAiB;IACjB,gBAAgB,CAAC,EAAE,cAAc,EAAE,CAAC;IAEpC,cAAc;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,qCAAqC;IACrC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,sBAAuB,SAAQ,mBAAmB;IACjE,qDAAqD;IACrD,cAAc,CAAC,EAAE,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;CACtD;AAED;;;GAGG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,MAAM,CAAoB;IAClC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;gBAExB,MAAM,EAAE,iBAAiB,EAAE,YAAY,GAAE,YAAiB;IAOtE;;OAEG;IACH,MAAM,CAAC,qBAAqB,CAAC,MAAM,EAAE,iBAAiB,GAAG,SAAS;IAIlE;;OAEG;IACH,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,sBAAsB,GAAG,SAAS;IAcpE;;OAEG;IACH,MAAM,CAAC,WAAW,CAChB,OAAO,EAAE,YAAY,EACrB,OAAO,CAAC,EAAE,IAAI,CAAC,sBAAsB,EAAE,SAAS,GAAG,QAAQ,CAAC,GAC3D,SAAS;IAQZ;;OAEG;IACH,MAAM,CAAC,gBAAgB,CACrB,IAAI,EAAE,YAAY,EAClB,OAAO,CAAC,EAAE,YAAY,EACtB,OAAO,CAAC,EAAE,IAAI,CAAC,sBAAsB,EAAE,MAAM,GAAG,SAAS,CAAC,GACzD,SAAS;IAQZ;;OAEG;IACG,4BAA4B,CAChC,YAAY,EAAE,gBAAgB,EAAE,EAChC,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAO3B;;OAEG;IACG,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC;IAItD;;OAEG;IACH,YAAY,CACV,YAAY,EAAE,gBAAgB,EAAE,EAChC,OAAO,CAAC,EAAE,gBAAgB,GACzB,SAAS,EAAE;CAsCf"}
@@ -3,6 +3,7 @@
3
3
  */
4
4
  import { registerFactories } from './config-based-factory.js';
5
5
  import { DriverRegistry as DriverRegistryImpl } from './registry.js';
6
+ import { resolveModelsConfig, toApplicationConfig, } from '../models-config/index.js';
6
7
  /**
7
8
  * AIサービスクラス
8
9
  * レジストリを管理し、capabilityベースでドライバを作成
@@ -10,11 +11,53 @@ import { DriverRegistry as DriverRegistryImpl } from './registry.js';
10
11
  export class AIService {
11
12
  registry;
12
13
  config;
13
- constructor(config) {
14
+ modelsConfig;
15
+ constructor(config, modelsConfig = {}) {
14
16
  this.config = config;
17
+ this.modelsConfig = modelsConfig;
15
18
  this.registry = new DriverRegistryImpl();
16
19
  registerFactories(this.registry, config);
17
20
  }
21
+ /**
22
+ * ApplicationConfig から直接作成(experiment 等)
23
+ */
24
+ static fromApplicationConfig(config) {
25
+ return new AIService(config);
26
+ }
27
+ /**
28
+ * models.yaml 解決経由で作成
29
+ */
30
+ static fromModelsConfig(options) {
31
+ const resolved = resolveModelsConfig(options);
32
+ const appConfig = toApplicationConfig(resolved);
33
+ if (options?.defaultOptions) {
34
+ appConfig.defaultOptions = {
35
+ ...appConfig.defaultOptions,
36
+ ...options.defaultOptions,
37
+ };
38
+ }
39
+ return new AIService(appConfig, resolved);
40
+ }
41
+ /**
42
+ * user models.yaml を無視し、渡した config のみで作成
43
+ */
44
+ static fromOverlay(overlay, options) {
45
+ return AIService.fromModelsConfig({
46
+ ...options,
47
+ source: 'overlay',
48
+ overlay,
49
+ });
50
+ }
51
+ /**
52
+ * base + overlay をマージし、必要なら user yaml も取り込む
53
+ */
54
+ static fromMergedConfig(base, overlay, options) {
55
+ return AIService.fromModelsConfig({
56
+ ...options,
57
+ base,
58
+ overlay,
59
+ });
60
+ }
18
61
  /**
19
62
  * capabilityからドライバを作成
20
63
  */
@@ -22,7 +65,6 @@ export class AIService {
22
65
  const models = this.selectModels(capabilities, options);
23
66
  if (!models.length)
24
67
  return null;
25
- // 最適なモデルを選択してドライバを作成
26
68
  return this.registry.createDriver(models[0]);
27
69
  }
28
70
  /**
@@ -35,40 +77,32 @@ export class AIService {
35
77
  * モデル選択
36
78
  */
37
79
  selectModels(capabilities, options) {
38
- // disabled + capability フィルタ
39
80
  let models = this.config.models?.filter(m => !m.disabled && capabilities.every(cap => m.capabilities.includes(cap))) || [];
40
- // プロバイダー除外
41
81
  if (options?.excludeProviders) {
42
82
  models = models.filter(m => !options.excludeProviders.includes(m.provider));
43
83
  }
44
- // lenient モード:条件を満たすモデルがない場合は条件を緩和
45
84
  if (options?.lenient && models.length === 0 && capabilities.length > 0) {
46
85
  return this.selectModels(capabilities.slice(0, -1), options);
47
86
  }
48
- // ソート
49
87
  models.sort((a, b) => {
50
- // 特定プロバイダー優先
51
88
  if (options?.preferProvider) {
52
89
  if (a.provider === options.preferProvider)
53
90
  return -1;
54
91
  if (b.provider === options.preferProvider)
55
92
  return 1;
56
93
  }
57
- // ローカル優先
58
94
  if (options?.preferLocal) {
59
95
  const aLocal = a.capabilities.includes('local');
60
96
  const bLocal = b.capabilities.includes('local');
61
97
  if (aLocal !== bLocal)
62
98
  return aLocal ? -1 : 1;
63
99
  }
64
- // 高速優先
65
100
  if (options?.preferFast) {
66
101
  const aFast = a.capabilities.includes('fast');
67
102
  const bFast = b.capabilities.includes('fast');
68
103
  if (aFast !== bFast)
69
104
  return aFast ? -1 : 1;
70
105
  }
71
- // 優先度
72
106
  return (b.priority || 0) - (a.priority || 0);
73
107
  });
74
108
  return models;
@@ -1 +1 @@
1
- {"version":3,"file":"ai-service.js","sourceRoot":"","sources":["../../src/driver-registry/ai-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ai-service.js","sourceRoot":"","sources":["../../src/driver-registry/ai-service.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"config-based-factory.d.ts","sourceRoot":"","sources":["../../src/driver-registry/config-based-factory.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAyB,MAAM,YAAY,CAAC;AAcnE;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,cAAc;IACd,OAAO,CAAC,EAAE;QACR,mBAAmB;QACnB,MAAM,CAAC,EAAE;YACP,MAAM,CAAC,EAAE,MAAM,CAAC;YAChB,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,YAAY,CAAC,EAAE,MAAM,CAAC;SACvB,CAAC;QACF,sBAAsB;QACtB,SAAS,CAAC,EAAE;YACV,MAAM,CAAC,EAAE,MAAM,CAAC;YAChB,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,2BAA2B;YAC3B,MAAM,CAAC,EAAE;gBACP,OAAO,EAAE,MAAM,CAAC;gBAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;gBAClB,WAAW,CAAC,EAAE,MAAM,CAAC;aACtB,CAAC;SACH,CAAC;QACF,iBAAiB;QACjB,QAAQ,CAAC,EAAE;YACT,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;YAClB,MAAM,CAAC,EAAE,MAAM,CAAC;SACjB,CAAC;QACF,oBAAoB;QACpB,WAAW,CAAC,EAAE;YACZ,MAAM,CAAC,EAAE,MAAM,CAAC;SACjB,CAAC;QACF,YAAY;QACZ,GAAG,CAAC,EAAE;YACJ,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,UAAU,CAAC,EAAE,MAAM,CAAC;SACrB,CAAC;QACF,eAAe;QACf,MAAM,CAAC,EAAE;YACP,OAAO,CAAC,EAAE,MAAM,CAAC;SAClB,CAAC;QACF,aAAa;QACb,IAAI,CAAC,EAAE;YACL,gDAAgD;YAChD,UAAU,CAAC,EAAE,MAAM,CAAC;SACrB,CAAC;KACH,CAAC;IAEF,iBAAiB;IACjB,cAAc,CAAC,EAAE;QACf,IAAI,CAAC,EAAE,OAAO,aAAa,EAAE,SAAS,CAAC;QACvC,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;IAEF,YAAY;IACZ,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC;CACtB;AAGD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,iBAAiB,GACxB,IAAI,CAoGN"}
1
+ {"version":3,"file":"config-based-factory.d.ts","sourceRoot":"","sources":["../../src/driver-registry/config-based-factory.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAyC,MAAM,YAAY,CAAC;AAoBnF;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,cAAc;IACd,OAAO,CAAC,EAAE;QACR,mBAAmB;QACnB,MAAM,CAAC,EAAE;YACP,MAAM,CAAC,EAAE,MAAM,CAAC;YAChB,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,YAAY,CAAC,EAAE,MAAM,CAAC;SACvB,CAAC;QACF,sBAAsB;QACtB,SAAS,CAAC,EAAE;YACV,MAAM,CAAC,EAAE,MAAM,CAAC;YAChB,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,2BAA2B;YAC3B,MAAM,CAAC,EAAE;gBACP,OAAO,EAAE,MAAM,CAAC;gBAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;gBAClB,WAAW,CAAC,EAAE,MAAM,CAAC;aACtB,CAAC;SACH,CAAC;QACF,iBAAiB;QACjB,QAAQ,CAAC,EAAE;YACT,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;YAClB,MAAM,CAAC,EAAE,MAAM,CAAC;SACjB,CAAC;QACF,oBAAoB;QACpB,WAAW,CAAC,EAAE;YACZ,MAAM,CAAC,EAAE,MAAM,CAAC;SACjB,CAAC;QACF,YAAY;QACZ,GAAG,CAAC,EAAE;YACJ,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,UAAU,CAAC,EAAE,MAAM,CAAC;SACrB,CAAC;QACF,eAAe;QACf,MAAM,CAAC,EAAE;YACP,OAAO,CAAC,EAAE,MAAM,CAAC;SAClB,CAAC;QACF,aAAa;QACb,IAAI,CAAC,EAAE;YACL,gDAAgD;YAChD,UAAU,CAAC,EAAE,MAAM,CAAC;SACrB,CAAC;KACH,CAAC;IAEF,iBAAiB;IACjB,cAAc,CAAC,EAAE;QACf,IAAI,CAAC,EAAE,OAAO,aAAa,EAAE,SAAS,CAAC;QACvC,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;IAEF,YAAY;IACZ,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC;CACtB;AAGD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,iBAAiB,GACxB,IAAI,CAiHN"}
@@ -8,6 +8,7 @@
8
8
  // 個別ドライバーのインポート
9
9
  import { MlxDriver } from '../mlx-ml/mlx-driver.js';
10
10
  import { MlxCacheController } from '../mlx-ml/mlx-cache-controller.js';
11
+ import { PyTorchDriver } from '../pytorch/pytorch-driver.js';
11
12
  import { OpenAIDriver } from '../openai/openai-driver.js';
12
13
  import { AnthropicDriver } from '../anthropic/anthropic-driver.js';
13
14
  import { VertexAIDriver } from '../vertexai/vertexai-driver.js';
@@ -16,6 +17,10 @@ import { OllamaDriver } from '../ollama/ollama-driver.js';
16
17
  import { VllmDriver } from '../vllm/vllm-driver.js';
17
18
  import { EchoDriver } from '../echo-driver.js';
18
19
  import { TestDriver } from '../test-driver.js';
20
+ function resolveMlxBackend(spec) {
21
+ const driverOpts = spec.driverOptions;
22
+ return spec.backend ?? driverOpts?.backend;
23
+ }
19
24
  /**
20
25
  * ApplicationConfigベースのファクトリーをregistryに登録
21
26
  *
@@ -29,12 +34,14 @@ export function registerFactories(registry, config) {
29
34
  // MLX Driver Factory
30
35
  registry.registerFactory('mlx', (spec) => {
31
36
  const driverOpts = spec.driverOptions;
32
- const cacheController = driverOpts?.cacheDir
33
- ? new MlxCacheController({ cacheDir: driverOpts.cacheDir })
34
- : undefined;
37
+ const cacheController = driverOpts?.cacheController
38
+ ?? (driverOpts?.cacheDir
39
+ ? new MlxCacheController({ cacheDir: driverOpts.cacheDir })
40
+ : undefined);
35
41
  return new MlxDriver({
36
42
  model: spec.model,
37
43
  defaultOptions: mergeDefaults(spec),
44
+ backend: resolveMlxBackend(spec),
38
45
  textOnly: driverOpts?.textOnly,
39
46
  maxImageSize: driverOpts?.maxImageSize,
40
47
  drafterModel: driverOpts?.drafterModel,
@@ -42,6 +49,16 @@ export function registerFactories(registry, config) {
42
49
  cacheController,
43
50
  });
44
51
  });
52
+ // PyTorch Driver Factory
53
+ registry.registerFactory('pytorch', (spec) => {
54
+ const driverOpts = spec.driverOptions;
55
+ return new PyTorchDriver({
56
+ model: spec.model,
57
+ defaultOptions: mergeDefaults(spec),
58
+ venvPath: driverOpts?.venvPath ?? spec.metadata?.venvPath,
59
+ device: driverOpts?.device ?? spec.metadata?.device,
60
+ });
61
+ });
45
62
  // OpenAI Driver Factory
46
63
  registry.registerFactory('openai', (spec) => {
47
64
  const openaiConfig = config.drivers?.openai;
@@ -1 +1 @@
1
- {"version":3,"file":"config-based-factory.js","sourceRoot":"","sources":["../../src/driver-registry/config-based-factory.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,gBAAgB;AAChB,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAkE/C;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAC/B,QAAwB,EACxB,MAAyB;IAEzB,iFAAiF;IACjF,MAAM,aAAa,GAAG,CAAC,IAAe,EAAE,EAAE,CACxC,IAAI,CAAC,cAAc;QACjB,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,cAAc,EAAE,GAAG,IAAI,CAAC,cAAc,EAAE;QACtD,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC;IAE5B,qBAAqB;IACrB,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE;QACvC,MAAM,UAAU,GAAG,IAAI,CAAC,aAAkD,CAAC;QAC3E,MAAM,eAAe,GAAG,UAAU,EAAE,QAAQ;YAC1C,CAAC,CAAC,IAAI,kBAAkB,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC;YAC3D,CAAC,CAAC,SAAS,CAAC;QACd,OAAO,IAAI,SAAS,CAAC;YACnB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC;YACnC,QAAQ,EAAE,UAAU,EAAE,QAAQ;YAC9B,YAAY,EAAE,UAAU,EAAE,YAAY;YACtC,YAAY,EAAE,UAAU,EAAE,YAAY;YACtC,cAAc,EAAE,UAAU,EAAE,cAAc;YAC1C,eAAe;SAChB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,wBAAwB;IACxB,QAAQ,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE;QAC1C,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC;QAC5C,OAAO,IAAI,YAAY,CAAC;YACtB,MAAM,EAAE,YAAY,EAAE,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc;YAC1D,OAAO,EAAE,YAAY,EAAE,OAAO;YAC9B,YAAY,EAAE,YAAY,EAAE,YAAY;YACxC,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC;SACpC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,2BAA2B;IAC3B,QAAQ,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE;QAC7C,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC;QAClD,OAAO,IAAI,eAAe,CAAC;YACzB,MAAM,EAAE,eAAe,EAAE,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB;YAChE,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC;YACnC,MAAM,EAAE,eAAe,EAAE,MAAM;SAChC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,0BAA0B;IAC1B,QAAQ,CAAC,eAAe,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE;QAC5C,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC;QAC9C,OAAO,IAAI,cAAc,CAAC;YACxB,OAAO,EAAE,YAAY,EAAE,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB;YAC/D,QAAQ,EAAE,YAAY,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,IAAI,aAAa;YACzE,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC;SACpC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,6BAA6B;IAC7B,QAAQ,CAAC,eAAe,CAAC,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;QAC/C,MAAM,iBAAiB,GAAG,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC;QACtD,OAAO,IAAI,iBAAiB,CAAC;YAC3B,MAAM,EAAE,iBAAiB,EAAE,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,oBAAoB;YACrE,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC;SACpC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,wBAAwB;IACxB,QAAQ,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE;QAC1C,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC;QAC5C,OAAO,IAAI,YAAY,CAAC;YACtB,OAAO,EAAE,YAAY,EAAE,OAAO,IAAI,wBAAwB;YAC1D,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC;SACpC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,sBAAsB;IACtB,QAAQ,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;QACxC,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC;QACxC,MAAM,UAAU,GAAG,UAAU,EAAE,UAAU,IAAI,aAAa,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC;QAChG,OAAO,IAAI,UAAU,CAAC;YACpB,UAAU;YACV,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC;SACpC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,oCAAoC;IACpC,QAAQ,CAAC,eAAe,CAAC,MAAM,EAAE,GAAG,EAAE;QACpC,OAAO,IAAI,UAAU,CAAC;YACpB,MAAM,EAAE,MAAM;SACf,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,yCAAyC;IACzC,8DAA8D;IAC9D,QAAQ,CAAC,eAAe,CAAC,MAAa,EAAE,GAAG,EAAE;QAC3C,OAAO,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"config-based-factory.js","sourceRoot":"","sources":["../../src/driver-registry/config-based-factory.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,gBAAgB;AAChB,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,SAAS,iBAAiB,CAAC,IAAe;IACxC,MAAM,UAAU,GAAG,IAAI,CAAC,aAAkD,CAAC;IAC3E,OAAO,IAAI,CAAC,OAAO,IAAI,UAAU,EAAE,OAAO,CAAC;AAC7C,CAAC;AAkED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAC/B,QAAwB,EACxB,MAAyB;IAEzB,iFAAiF;IACjF,MAAM,aAAa,GAAG,CAAC,IAAe,EAAE,EAAE,CACxC,IAAI,CAAC,cAAc;QACjB,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,cAAc,EAAE,GAAG,IAAI,CAAC,cAAc,EAAE;QACtD,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC;IAE5B,qBAAqB;IACrB,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE;QACvC,MAAM,UAAU,GAAG,IAAI,CAAC,aAAkD,CAAC;QAC3E,MAAM,eAAe,GAAG,UAAU,EAAE,eAAe;eAC9C,CAAC,UAAU,EAAE,QAAQ;gBACtB,CAAC,CAAC,IAAI,kBAAkB,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC;gBAC3D,CAAC,CAAC,SAAS,CAAC,CAAC;QACjB,OAAO,IAAI,SAAS,CAAC;YACnB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC;YACnC,OAAO,EAAE,iBAAiB,CAAC,IAAI,CAAC;YAChC,QAAQ,EAAE,UAAU,EAAE,QAAQ;YAC9B,YAAY,EAAE,UAAU,EAAE,YAAY;YACtC,YAAY,EAAE,UAAU,EAAE,YAAY;YACtC,cAAc,EAAE,UAAU,EAAE,cAAc;YAC1C,eAAe;SAChB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,yBAAyB;IACzB,QAAQ,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;QAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAmE,CAAC;QAC5F,OAAO,IAAI,aAAa,CAAC;YACvB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC;YACnC,QAAQ,EAAE,UAAU,EAAE,QAAQ,IAAK,IAAI,CAAC,QAAQ,EAAE,QAA+B;YACjF,MAAM,EAAE,UAAU,EAAE,MAAM,IAAK,IAAI,CAAC,QAAQ,EAAE,MAA6B;SAC5E,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,wBAAwB;IACxB,QAAQ,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE;QAC1C,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC;QAC5C,OAAO,IAAI,YAAY,CAAC;YACtB,MAAM,EAAE,YAAY,EAAE,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc;YAC1D,OAAO,EAAE,YAAY,EAAE,OAAO;YAC9B,YAAY,EAAE,YAAY,EAAE,YAAY;YACxC,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC;SACpC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,2BAA2B;IAC3B,QAAQ,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE;QAC7C,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC;QAClD,OAAO,IAAI,eAAe,CAAC;YACzB,MAAM,EAAE,eAAe,EAAE,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB;YAChE,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC;YACnC,MAAM,EAAE,eAAe,EAAE,MAAM;SAChC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,0BAA0B;IAC1B,QAAQ,CAAC,eAAe,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE;QAC5C,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC;QAC9C,OAAO,IAAI,cAAc,CAAC;YACxB,OAAO,EAAE,YAAY,EAAE,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB;YAC/D,QAAQ,EAAE,YAAY,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,IAAI,aAAa;YACzE,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC;SACpC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,6BAA6B;IAC7B,QAAQ,CAAC,eAAe,CAAC,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;QAC/C,MAAM,iBAAiB,GAAG,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC;QACtD,OAAO,IAAI,iBAAiB,CAAC;YAC3B,MAAM,EAAE,iBAAiB,EAAE,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,oBAAoB;YACrE,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC;SACpC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,wBAAwB;IACxB,QAAQ,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE;QAC1C,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC;QAC5C,OAAO,IAAI,YAAY,CAAC;YACtB,OAAO,EAAE,YAAY,EAAE,OAAO,IAAI,wBAAwB;YAC1D,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC;SACpC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,sBAAsB;IACtB,QAAQ,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;QACxC,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC;QACxC,MAAM,UAAU,GAAG,UAAU,EAAE,UAAU,IAAI,aAAa,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC;QAChG,OAAO,IAAI,UAAU,CAAC;YACpB,UAAU;YACV,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC;SACpC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,oCAAoC;IACpC,QAAQ,CAAC,eAAe,CAAC,MAAM,EAAE,GAAG,EAAE;QACpC,OAAO,IAAI,UAAU,CAAC;YACpB,MAAM,EAAE,MAAM;SACf,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,yCAAyC;IACzC,8DAA8D;IAC9D,QAAQ,CAAC,eAAe,CAAC,MAAa,EAAE,GAAG,EAAE;QAC3C,OAAO,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AACL,CAAC"}
@@ -5,6 +5,7 @@
5
5
  import type { DriverRegistry } from './registry.js';
6
6
  import type { ModelSpec } from './types.js';
7
7
  import type { AIDriver } from '../types.js';
8
+ import type { PyTorchDriver } from '../pytorch/pytorch-driver.js';
8
9
  import type { MlxDriver } from '../mlx-ml/mlx-driver.js';
9
10
  import type { OpenAIDriver } from '../openai/openai-driver.js';
10
11
  import type { AnthropicDriver } from '../anthropic/anthropic-driver.js';
@@ -20,6 +21,7 @@ import type { TestDriver } from '../test-driver.js';
20
21
  */
21
22
  export declare function registerStandardDriverFactories(registry: DriverRegistry, drivers: {
22
23
  MlxDriver?: typeof MlxDriver;
24
+ PyTorchDriver?: typeof PyTorchDriver;
23
25
  OpenAIDriver?: typeof OpenAIDriver;
24
26
  AnthropicDriver?: typeof AnthropicDriver;
25
27
  VertexAIDriver?: typeof VertexAIDriver;
@@ -1 +1 @@
1
- {"version":3,"file":"factory-helper.d.ts","sourceRoot":"","sources":["../../src/driver-registry/factory-helper.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAkB,MAAM,YAAY,CAAC;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAI5C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAiCpD;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE;IACP,SAAS,CAAC,EAAE,OAAO,SAAS,CAAC;IAC7B,YAAY,CAAC,EAAE,OAAO,YAAY,CAAC;IACnC,eAAe,CAAC,EAAE,OAAO,eAAe,CAAC;IACzC,cAAc,CAAC,EAAE,OAAO,cAAc,CAAC;IACvC,YAAY,CAAC,EAAE,OAAO,YAAY,CAAC;IACnC,UAAU,CAAC,EAAE,OAAO,UAAU,CAAC;IAC/B,UAAU,CAAC,EAAE,OAAO,UAAU,CAAC;CAChC,GACA,IAAI,CAiGN;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,IAAI,CAGN;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,cAAc,EACxB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,QAAQ,GACrC,IAAI,CAGN"}
1
+ {"version":3,"file":"factory-helper.d.ts","sourceRoot":"","sources":["../../src/driver-registry/factory-helper.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAyD,MAAM,YAAY,CAAC;AACnG,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAI5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAsCpD;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE;IACP,SAAS,CAAC,EAAE,OAAO,SAAS,CAAC;IAC7B,aAAa,CAAC,EAAE,OAAO,aAAa,CAAC;IACrC,YAAY,CAAC,EAAE,OAAO,YAAY,CAAC;IACnC,eAAe,CAAC,EAAE,OAAO,eAAe,CAAC;IACzC,cAAc,CAAC,EAAE,OAAO,cAAc,CAAC;IACvC,YAAY,CAAC,EAAE,OAAO,YAAY,CAAC;IACnC,UAAU,CAAC,EAAE,OAAO,UAAU,CAAC;IAC/B,UAAU,CAAC,EAAE,OAAO,UAAU,CAAC;CAChC,GACA,IAAI,CAiHN;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,IAAI,CAGN;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,cAAc,EACxB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,QAAQ,GACrC,IAAI,CAGN"}
@@ -26,6 +26,10 @@ function validateAndClampMaxTokens(spec, defaultOptions) {
26
26
  }
27
27
  return defaultOptions;
28
28
  }
29
+ function resolveMlxBackend(spec) {
30
+ const driverOpts = spec.driverOptions;
31
+ return spec.backend ?? driverOpts?.backend;
32
+ }
29
33
  /**
30
34
  * 標準ドライバーのファクトリー関数を登録
31
35
  *
@@ -38,12 +42,27 @@ export function registerStandardDriverFactories(registry, drivers) {
38
42
  const Driver = drivers.MlxDriver;
39
43
  // TODO: metadata経由でドライバー固有オプションを渡す仕組みを整理したい
40
44
  registry.registerFactory('mlx', (spec) => {
45
+ const driverOpts = spec.driverOptions;
46
+ return new Driver({
47
+ model: spec.model,
48
+ defaultOptions: validateAndClampMaxTokens(spec, spec.defaultOptions),
49
+ backend: resolveMlxBackend(spec),
50
+ textOnly: driverOpts?.textOnly ?? spec.metadata?.textOnly,
51
+ drafterModel: driverOpts?.drafterModel ?? spec.metadata?.drafterModel,
52
+ draftBlockSize: driverOpts?.draftBlockSize ?? spec.metadata?.draftBlockSize,
53
+ cacheController: driverOpts?.cacheController,
54
+ });
55
+ });
56
+ }
57
+ // PyTorch Driver
58
+ if (drivers.PyTorchDriver) {
59
+ const Driver = drivers.PyTorchDriver;
60
+ registry.registerFactory('pytorch', (spec) => {
41
61
  return new Driver({
42
62
  model: spec.model,
43
63
  defaultOptions: validateAndClampMaxTokens(spec, spec.defaultOptions),
44
- textOnly: spec.metadata?.textOnly,
45
- drafterModel: spec.metadata?.drafterModel,
46
- draftBlockSize: spec.metadata?.draftBlockSize
64
+ venvPath: spec.metadata?.venvPath,
65
+ device: spec.metadata?.device,
47
66
  });
48
67
  });
49
68
  }
@@ -1 +1 @@
1
- {"version":3,"file":"factory-helper.js","sourceRoot":"","sources":["../../src/driver-registry/factory-helper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"factory-helper.js","sourceRoot":"","sources":["../../src/driver-registry/factory-helper.ts"],"names":[],"mappings":"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"}
@@ -4,6 +4,6 @@
4
4
  */
5
5
  export { DriverRegistry } from './registry.js';
6
6
  export { registerFactories, type ApplicationConfig } from './config-based-factory.js';
7
- export { AIService, type SelectionOptions } from './ai-service.js';
8
- export type { DriverProvider, DriverCapability, ModelSpec, DriverFactory } from './types.js';
7
+ export { AIService, type SelectionOptions, type AIServiceModelsOptions, } from './ai-service.js';
8
+ export type { DriverProvider, DriverCapability, ModelSpec, DriverFactory, MlxBackendMode, MlxModelDriverOptions, } from './types.js';
9
9
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/driver-registry/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,iBAAiB,EACjB,KAAK,iBAAiB,EACvB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,SAAS,EACT,KAAK,gBAAgB,EACtB,MAAM,iBAAiB,CAAC;AACzB,YAAY,EACV,cAAc,EACd,gBAAgB,EAChB,SAAS,EACT,aAAa,EACd,MAAM,YAAY,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/driver-registry/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,iBAAiB,EACjB,KAAK,iBAAiB,EACvB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,SAAS,EACT,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,GAC5B,MAAM,iBAAiB,CAAC;AACzB,YAAY,EACV,cAAc,EACd,gBAAgB,EAChB,SAAS,EACT,aAAa,EACb,cAAc,EACd,qBAAqB,GACtB,MAAM,YAAY,CAAC"}
@@ -4,5 +4,5 @@
4
4
  */
5
5
  export { DriverRegistry } from './registry.js';
6
6
  export { registerFactories } from './config-based-factory.js';
7
- export { AIService } from './ai-service.js';
7
+ export { AIService, } from './ai-service.js';
8
8
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/driver-registry/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,iBAAiB,EAElB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,SAAS,EAEV,MAAM,iBAAiB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/driver-registry/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,iBAAiB,EAElB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,SAAS,GAGV,MAAM,iBAAiB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/driver-registry/registry.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAY5C,OAAO,KAAK,EACV,cAAc,EACd,gBAAgB,EAChB,SAAS,EACT,uBAAuB,EACvB,qBAAqB,EACrB,eAAe,EACf,aAAa,EACd,MAAM,YAAY,CAAC;AAGpB;;GAEG;AACH,qBAAa,cAAe,YAAW,eAAe;IACpD,OAAO,CAAC,MAAM,CAAqC;IACnD,OAAO,CAAC,SAAS,CAAiD;IAClE,OAAO,CAAC,MAAM,CAAS;;IAUvB;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAahC;;OAEG;IACH,eAAe,CAAC,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa,GAAG,IAAI;IAIvE;;OAEG;IACH,UAAU,CAAC,QAAQ,EAAE,cAAc,GAAG,aAAa,GAAG,SAAS;IAK/D;;OAEG;IACH,aAAa,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IAWpC;;OAEG;IACH,WAAW,CAAC,QAAQ,EAAE,uBAAuB,GAAG,qBAAqB,GAAG,IAAI;IAwH5E;;OAEG;IACG,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC;IAStD;;OAEG;IACG,qBAAqB,CACzB,YAAY,EAAE,gBAAgB,EAAE,EAChC,OAAO,CAAC,EAAE;QACR,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,cAAc,EAAE,CAAC;QAC7B,gBAAgB,CAAC,EAAE,cAAc,EAAE,CAAC;KACrC,GACA,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;CA0B5B"}
1
+ {"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/driver-registry/registry.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAa5C,OAAO,KAAK,EACV,cAAc,EACd,gBAAgB,EAChB,SAAS,EACT,uBAAuB,EACvB,qBAAqB,EACrB,eAAe,EACf,aAAa,EACd,MAAM,YAAY,CAAC;AAGpB;;GAEG;AACH,qBAAa,cAAe,YAAW,eAAe;IACpD,OAAO,CAAC,MAAM,CAAqC;IACnD,OAAO,CAAC,SAAS,CAAiD;IAClE,OAAO,CAAC,MAAM,CAAS;;IAUvB;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAchC;;OAEG;IACH,eAAe,CAAC,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa,GAAG,IAAI;IAIvE;;OAEG;IACH,UAAU,CAAC,QAAQ,EAAE,cAAc,GAAG,aAAa,GAAG,SAAS;IAK/D;;OAEG;IACH,aAAa,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IAWpC;;OAEG;IACH,WAAW,CAAC,QAAQ,EAAE,uBAAuB,GAAG,qBAAqB,GAAG,IAAI;IAwH5E;;OAEG;IACG,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC;IAStD;;OAEG;IACG,qBAAqB,CACzB,YAAY,EAAE,gBAAgB,EAAE,EAChC,OAAO,CAAC,EAAE;QACR,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,cAAc,EAAE,CAAC;QAC7B,gBAAgB,CAAC,EAAE,cAAc,EAAE,CAAC;KACrC,GACA,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;CA0B5B"}
@@ -5,6 +5,7 @@
5
5
  import { Logger } from '@modular-prompt/utils';
6
6
  // 標準ドライバーを個別インポート
7
7
  import { MlxDriver } from '../mlx-ml/mlx-driver.js';
8
+ import { PyTorchDriver } from '../pytorch/pytorch-driver.js';
8
9
  import { OpenAIDriver } from '../openai/openai-driver.js';
9
10
  import { AnthropicDriver } from '../anthropic/anthropic-driver.js';
10
11
  import { VertexAIDriver } from '../vertexai/vertexai-driver.js';
@@ -33,6 +34,7 @@ export class DriverRegistry {
33
34
  // 標準ドライバーを登録
34
35
  registerStandardDriverFactories(this, {
35
36
  MlxDriver,
37
+ PyTorchDriver,
36
38
  OpenAIDriver,
37
39
  AnthropicDriver,
38
40
  VertexAIDriver,
@@ -141,7 +143,7 @@ export class DriverRegistry {
141
143
  }
142
144
  // 選択理由を生成
143
145
  const reasons = [];
144
- if (spec.provider === 'mlx' && criteria.preferLocal) {
146
+ if ((spec.provider === 'mlx' || spec.provider === 'pytorch') && criteria.preferLocal) {
145
147
  reasons.push('Local execution preferred');
146
148
  }
147
149
  if (capabilities.includes('fast') && criteria.preferFast) {
@@ -1 +1 @@
1
- {"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/driver-registry/registry.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/driver-registry/registry.ts"],"names":[],"mappings":"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"}
@@ -3,20 +3,25 @@
3
3
  * ドライバレジストリシステムの型定義
4
4
  */
5
5
  import type { AIDriver } from '../types.js';
6
+ import type { PromptCacheController } from '../cache-controller.js';
6
7
  /**
7
8
  * ドライバプロバイダータイプ
8
9
  */
9
- export type DriverProvider = 'openai' | 'anthropic' | 'vertexai' | 'googlegenai' | 'mlx' | 'ollama' | 'vllm' | 'echo' | 'test';
10
+ export type DriverProvider = 'openai' | 'anthropic' | 'vertexai' | 'googlegenai' | 'mlx' | 'pytorch' | 'ollama' | 'vllm' | 'echo' | 'test';
10
11
  /**
11
12
  * ドライバ能力フラグ
12
13
  * 各ドライバが持つ機能や特性を表す
13
14
  */
14
15
  export type DriverCapability = 'streaming' | 'local' | 'fast' | 'large-context' | 'multilingual' | 'japanese' | 'coding' | 'reasoning' | 'chat' | 'tools' | 'vision' | 'audio' | 'structured' | 'json' | 'function-calling';
16
+ /** MLX Python バックエンド選択 */
17
+ export type MlxBackendMode = 'auto' | 'lm' | 'vlm' | 'optiq';
15
18
  /**
16
19
  * MLXドライバー固有オプション
17
20
  */
18
21
  export interface MlxModelDriverOptions {
19
- /** VLMモデルをtext-onlyモードで使用する */
22
+ /** MLX Python バックエンド(デフォルト: auto) */
23
+ backend?: MlxBackendMode;
24
+ /** VLMモデルをtext-onlyモードで使用する(backend: lm と同等。後方互換) */
20
25
  textOnly?: boolean;
21
26
  /** VLM画像の最大辺ピクセル数 */
22
27
  maxImageSize?: number;
@@ -26,6 +31,8 @@ export interface MlxModelDriverOptions {
26
31
  draftBlockSize?: number;
27
32
  /** KVキャッシュディレクトリ。指定するとプロンプトキャッシュが有効になる */
28
33
  cacheDir?: string;
34
+ /** 外部で生成した KV cache controller(runtime から driver と共有する場合。runtime-only) */
35
+ cacheController?: PromptCacheController;
29
36
  }
30
37
  /** ドライバー固有オプションのunion(将来拡張) */
31
38
  export type ModelDriverOptions = MlxModelDriverOptions;
@@ -37,6 +44,8 @@ export interface ModelSpec {
37
44
  model: string;
38
45
  /** プロバイダー名 */
39
46
  provider: DriverProvider;
47
+ /** MLX 内の実行モード(provider が mlx のとき。driverOptions.backend より優先) */
48
+ backend?: MlxBackendMode;
40
49
  /** モデルの能力フラグ */
41
50
  capabilities: DriverCapability[];
42
51
  /** 最大入力トークン数 */