@modular-prompt/driver 0.11.15 → 0.13.1
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.
- package/README.md +25 -0
- package/dist/anthropic/anthropic-driver.d.ts +38 -8
- package/dist/anthropic/anthropic-driver.d.ts.map +1 -1
- package/dist/anthropic/anthropic-driver.js +180 -164
- package/dist/anthropic/anthropic-driver.js.map +1 -1
- package/dist/cache-controller.d.ts +28 -0
- package/dist/cache-controller.d.ts.map +1 -0
- package/dist/cache-controller.js +2 -0
- package/dist/cache-controller.js.map +1 -0
- package/dist/cache-utils.d.ts +20 -0
- package/dist/cache-utils.d.ts.map +1 -0
- package/dist/cache-utils.js +71 -0
- package/dist/cache-utils.js.map +1 -0
- package/dist/content-utils.d.ts +9 -0
- package/dist/content-utils.d.ts.map +1 -1
- package/dist/content-utils.js +47 -0
- package/dist/content-utils.js.map +1 -1
- package/dist/driver-registry/config-based-factory.d.ts.map +1 -1
- package/dist/driver-registry/config-based-factory.js +7 -0
- package/dist/driver-registry/config-based-factory.js.map +1 -1
- package/dist/driver-registry/factory-helper.d.ts.map +1 -1
- package/dist/driver-registry/factory-helper.js +7 -4
- package/dist/driver-registry/factory-helper.js.map +1 -1
- package/dist/driver-registry/types.d.ts +6 -0
- package/dist/driver-registry/types.d.ts.map +1 -1
- package/dist/formatter/converter.js +1 -1
- package/dist/formatter/converter.js.map +1 -1
- package/dist/google-genai/element-converter.d.ts +11 -0
- package/dist/google-genai/element-converter.d.ts.map +1 -0
- package/dist/google-genai/element-converter.js +126 -0
- package/dist/google-genai/element-converter.js.map +1 -0
- package/dist/google-genai/google-genai-cache-controller.d.ts +24 -0
- package/dist/google-genai/google-genai-cache-controller.d.ts.map +1 -0
- package/dist/google-genai/google-genai-cache-controller.js +127 -0
- package/dist/google-genai/google-genai-cache-controller.js.map +1 -0
- package/dist/google-genai/google-genai-driver.d.ts +5 -29
- package/dist/google-genai/google-genai-driver.d.ts.map +1 -1
- package/dist/google-genai/google-genai-driver.js +92 -255
- package/dist/google-genai/google-genai-driver.js.map +1 -1
- package/dist/index.d.ts +4 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -0
- package/dist/index.js.map +1 -1
- package/dist/mlx-ml/mlx-cache-controller.d.ts +66 -0
- package/dist/mlx-ml/mlx-cache-controller.d.ts.map +1 -0
- package/dist/mlx-ml/mlx-cache-controller.js +600 -0
- package/dist/mlx-ml/mlx-cache-controller.js.map +1 -0
- package/dist/mlx-ml/mlx-driver.d.ts +13 -8
- package/dist/mlx-ml/mlx-driver.d.ts.map +1 -1
- package/dist/mlx-ml/mlx-driver.js +202 -143
- package/dist/mlx-ml/mlx-driver.js.map +1 -1
- package/dist/mlx-ml/mlx-message-utils.d.ts +9 -0
- package/dist/mlx-ml/mlx-message-utils.d.ts.map +1 -0
- package/dist/mlx-ml/mlx-message-utils.js +71 -0
- package/dist/mlx-ml/mlx-message-utils.js.map +1 -0
- package/dist/mlx-ml/process/harmony-parser.d.ts +3 -0
- package/dist/mlx-ml/process/harmony-parser.d.ts.map +1 -0
- package/dist/mlx-ml/process/harmony-parser.js +175 -0
- package/dist/mlx-ml/process/harmony-parser.js.map +1 -0
- package/dist/mlx-ml/process/index.d.ts +7 -3
- package/dist/mlx-ml/process/index.d.ts.map +1 -1
- package/dist/mlx-ml/process/index.js +22 -7
- package/dist/mlx-ml/process/index.js.map +1 -1
- package/dist/mlx-ml/process/model-handlers.d.ts +11 -58
- package/dist/mlx-ml/process/model-handlers.d.ts.map +1 -1
- package/dist/mlx-ml/process/model-handlers.js +29 -11
- package/dist/mlx-ml/process/model-handlers.js.map +1 -1
- package/dist/mlx-ml/process/model-specific.d.ts +7 -0
- package/dist/mlx-ml/process/model-specific.d.ts.map +1 -1
- package/dist/mlx-ml/process/model-specific.js +3 -0
- package/dist/mlx-ml/process/model-specific.js.map +1 -1
- package/dist/mlx-ml/process/parameter-validator.d.ts.map +1 -1
- package/dist/mlx-ml/process/parameter-validator.js +10 -3
- package/dist/mlx-ml/process/parameter-validator.js.map +1 -1
- package/dist/mlx-ml/process/process-communication.d.ts +3 -0
- package/dist/mlx-ml/process/process-communication.d.ts.map +1 -1
- package/dist/mlx-ml/process/process-communication.js +13 -0
- package/dist/mlx-ml/process/process-communication.js.map +1 -1
- package/dist/mlx-ml/process/queue.d.ts +5 -2
- package/dist/mlx-ml/process/queue.d.ts.map +1 -1
- package/dist/mlx-ml/process/queue.js +103 -15
- package/dist/mlx-ml/process/queue.js.map +1 -1
- package/dist/mlx-ml/process/response-processor.d.ts +18 -0
- package/dist/mlx-ml/process/response-processor.d.ts.map +1 -0
- package/dist/mlx-ml/process/response-processor.js +24 -0
- package/dist/mlx-ml/process/response-processor.js.map +1 -0
- package/dist/mlx-ml/process/types.d.ts +51 -4
- package/dist/mlx-ml/process/types.d.ts.map +1 -1
- package/dist/mlx-ml/tool-call-parser.d.ts.map +1 -1
- package/dist/mlx-ml/tool-call-parser.js +44 -68
- package/dist/mlx-ml/tool-call-parser.js.map +1 -1
- package/dist/mlx-ml/types.d.ts +1 -0
- package/dist/mlx-ml/types.d.ts.map +1 -1
- package/dist/openai/openai-driver.d.ts +0 -2
- package/dist/openai/openai-driver.d.ts.map +1 -1
- package/dist/openai/openai-driver.js.map +1 -1
- package/dist/types.d.ts +9 -0
- package/dist/types.d.ts.map +1 -1
- package/package.json +7 -4
- package/src/mlx-ml/python/__main__.py +41 -425
- package/src/mlx-ml/python/backends/__init__.py +3 -0
- package/src/mlx-ml/python/backends/base.py +84 -0
- package/src/mlx-ml/python/backends/mlx_lm.py +202 -0
- package/src/mlx-ml/python/backends/mlx_vlm.py +99 -0
- package/src/mlx-ml/python/examples/example_basic.py +93 -0
- package/src/mlx-ml/python/examples/example_tool_call.py +165 -0
- package/src/mlx-ml/python/handlers/__init__.py +6 -0
- package/src/mlx-ml/python/handlers/cache.py +81 -0
- package/src/mlx-ml/python/handlers/capabilities.py +6 -0
- package/src/mlx-ml/python/handlers/chat.py +221 -0
- package/src/mlx-ml/python/handlers/completion.py +36 -0
- package/src/mlx-ml/python/handlers/format_test.py +70 -0
- package/src/mlx-ml/python/handlers/tokenize.py +63 -0
- package/src/mlx-ml/python/pyproject.toml +15 -5
- package/src/mlx-ml/python/server.py +126 -0
- package/src/mlx-ml/python/tests/__init__.py +0 -0
- package/src/mlx-ml/python/utils/__init__.py +0 -0
- package/src/mlx-ml/python/utils/prompt_builder.py +54 -0
- package/src/mlx-ml/python/{token_utils.py → utils/token_utils.py} +13 -5
- package/src/mlx-ml/python/uv.lock +299 -57
- /package/src/mlx-ml/python/{chat_template_constraints.py → utils/chat_template_constraints.py} +0 -0
- /package/src/mlx-ml/python/{vlm_utils.py → utils/vlm_utils.py} +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-specific.d.ts","sourceRoot":"","sources":["../../../src/mlx-ml/process/model-specific.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAG7D,KAAK,gBAAgB,GAAG,cAAc,CAAC,mBAAmB,CAAC,CAAC;AAE5D;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CACvB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,eAAe,EAAE,OAAO,EACxB,iBAAiB,EAAE,OAAO,GACzB,MAAM,GAAG,YAAY,CAevB;AAED,MAAM,WAAW,sBAAsB;IACrC;;;OAGG;IACH,2BAA2B,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CAAC;IAElE;;;OAGG;IACH,iCAAiC,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IAE1D;;OAEG;IACH,sBAAsB,IAAI,OAAO,CAAC;IAElC;;OAEG;IACH,iBAAiB,CAAC,OAAO,EAAE;QAAE,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QAAC,SAAS,CAAC,EAAE,IAAI,GAAG,KAAK,CAAA;KAAE,GAAG,IAAI,CAAC;CACrG;AAGD,qBAAa,6BAA8B,YAAW,sBAAsB;IAI9D,OAAO,CAAC,SAAS;IAH7B,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,SAAS,CAA2B;gBAExB,SAAS,EAAE,MAAM;IAGrC,iBAAiB,CAAC,OAAO,EAAE;QAAE,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QAAC,SAAS,CAAC,EAAE,IAAI,GAAG,KAAK,CAAA;KAAE,GAAG,IAAI;IAKnG;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAMxB;;;OAGG;IACH,2BAA2B,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE;IAwBjE;;OAEG;IACH,sBAAsB,IAAI,OAAO;IAIjC;;;OAGG;IACH,iCAAiC,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;CAI1D;AAGD,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,MAAM,GAChB,sBAAsB,CAGxB"}
|
|
1
|
+
{"version":3,"file":"model-specific.d.ts","sourceRoot":"","sources":["../../../src/mlx-ml/process/model-specific.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAG7D,KAAK,gBAAgB,GAAG,cAAc,CAAC,mBAAmB,CAAC,CAAC;AAE5D;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CACvB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,eAAe,EAAE,OAAO,EACxB,iBAAiB,EAAE,OAAO,GACzB,MAAM,GAAG,YAAY,CAevB;AAED,MAAM,WAAW,sBAAsB;IACrC;;;OAGG;IACH,2BAA2B,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CAAC;IAElE;;;OAGG;IACH,iCAAiC,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IAE1D;;OAEG;IACH,sBAAsB,IAAI,OAAO,CAAC;IAElC;;;;OAIG;IACH,gBAAgB,IAAI,OAAO,CAAC;IAE5B;;OAEG;IACH,iBAAiB,CAAC,OAAO,EAAE;QAAE,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QAAC,SAAS,CAAC,EAAE,IAAI,GAAG,KAAK,CAAA;KAAE,GAAG,IAAI,CAAC;CACrG;AAGD,qBAAa,6BAA8B,YAAW,sBAAsB;IAI9D,OAAO,CAAC,SAAS;IAH7B,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,SAAS,CAA2B;gBAExB,SAAS,EAAE,MAAM;IAGrC,iBAAiB,CAAC,OAAO,EAAE;QAAE,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QAAC,SAAS,CAAC,EAAE,IAAI,GAAG,KAAK,CAAA;KAAE,GAAG,IAAI;IAKnG;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAMxB;;;OAGG;IACH,2BAA2B,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE;IAwBjE;;OAEG;IACH,sBAAsB,IAAI,OAAO;IAIjC,gBAAgB,IAAI,OAAO;IAI3B;;;OAGG;IACH,iCAAiC,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;CAI1D;AAGD,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,MAAM,GAChB,sBAAsB,CAGxB"}
|
|
@@ -87,6 +87,9 @@ export class DefaultModelSpecificProcessor {
|
|
|
87
87
|
hasCompletionProcessor() {
|
|
88
88
|
return selectCompletionProcessor(this.modelName) !== null;
|
|
89
89
|
}
|
|
90
|
+
hasChatProcessor() {
|
|
91
|
+
return selectChatProcessor(this.modelName) !== null;
|
|
92
|
+
}
|
|
90
93
|
/**
|
|
91
94
|
* Completion API用のモデル固有処理
|
|
92
95
|
* モデルごとにブロック化トークンやプロンプトフォーマットを適用
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-specific.js","sourceRoot":"","sources":["../../../src/mlx-ml/process/model-specific.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAI1G;;;;;;;;GAQG;AACH,MAAM,UAAU,SAAS,CACvB,QAAgB,EAChB,IAAwB,EACxB,eAAwB,EACxB,iBAA0B;IAE1B,IAAI,QAAQ,KAAK,YAAY;QAAE,OAAO,MAAM,CAAC;IAE7C,IAAI,QAAQ,KAAK,kBAAkB,EAAE,CAAC;QACpC,yBAAyB;QACzB,IAAI,CAAC,iBAAiB,IAAI,eAAe;YAAE,OAAO,MAAM,CAAC;QACzD,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,uCAAuC;IACvC,IAAI,IAAI,KAAK,UAAU;QAAE,OAAO,YAAY,CAAC;IAC7C,IAAI,IAAI,KAAK,MAAM;QAAE,OAAO,MAAM,CAAC;IAEnC,+CAA+C;IAC/C,OAAO,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC;AACjD,CAAC;
|
|
1
|
+
{"version":3,"file":"model-specific.js","sourceRoot":"","sources":["../../../src/mlx-ml/process/model-specific.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAI1G;;;;;;;;GAQG;AACH,MAAM,UAAU,SAAS,CACvB,QAAgB,EAChB,IAAwB,EACxB,eAAwB,EACxB,iBAA0B;IAE1B,IAAI,QAAQ,KAAK,YAAY;QAAE,OAAO,MAAM,CAAC;IAE7C,IAAI,QAAQ,KAAK,kBAAkB,EAAE,CAAC;QACpC,yBAAyB;QACzB,IAAI,CAAC,iBAAiB,IAAI,eAAe;YAAE,OAAO,MAAM,CAAC;QACzD,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,uCAAuC;IACvC,IAAI,IAAI,KAAK,UAAU;QAAE,OAAO,YAAY,CAAC;IAC7C,IAAI,IAAI,KAAK,MAAM;QAAE,OAAO,MAAM,CAAC;IAEnC,+CAA+C;IAC/C,OAAO,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC;AACjD,CAAC;AAkCD,MAAM,OAAO,6BAA6B;IAIpB;IAHZ,gBAAgB,CAAmB;IACnC,SAAS,CAA2B;IAE5C,YAAoB,SAAiB;QAAjB,cAAS,GAAT,SAAS,CAAQ;IACrC,CAAC;IAED,iBAAiB,CAAC,OAA0E;QAC1F,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;QACjD,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;IACrC,CAAC;IAED;;;;OAIG;IACK,gBAAgB;QACtB,IAAI,IAAI,CAAC,gBAAgB,EAAE,sBAAsB;YAAE,OAAO,IAAI,CAAC;QAC/D,IAAI,IAAI,CAAC,SAAS,KAAK,KAAK;YAAE,OAAO,IAAI,CAAC;QAC1C,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;OAGG;IACH,2BAA2B,CAAC,QAAsB;QAChD,MAAM,SAAS,GAAG,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACtD,IAAI,SAAuB,CAAC;QAC5B,IAAI,SAAS,EAAE,CAAC;YACd,sCAAsC;YACtC,SAAS,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC;aAAM,IAAI,IAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC;YACnC,6BAA6B;YAC7B,SAAS,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAC5C,CAAC;aAAM,CAAC;YACN,SAAS,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC;QAC5B,CAAC;QAED,mDAAmD;QACnD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,EAAE,CAAC;YAC5C,SAAS,CAAC,IAAI,CAAC;gBACb,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,qDAAqD;aAC/D,CAAC,CAAC;QACL,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,sBAAsB;QACpB,OAAO,yBAAyB,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,CAAC;IAC5D,CAAC;IAED,gBAAgB;QACd,OAAO,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,CAAC;IACtD,CAAC;IAED;;;OAGG;IACH,iCAAiC,CAAC,MAAc;QAC9C,MAAM,SAAS,GAAG,yBAAyB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC5D,OAAO,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAChD,CAAC;CACF;AAED,WAAW;AACX,MAAM,UAAU,4BAA4B,CAC1C,SAAiB;IAEjB,wBAAwB;IACxB,OAAO,IAAI,6BAA6B,CAAC,SAAS,CAAC,CAAC;AACtD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parameter-validator.d.ts","sourceRoot":"","sources":["../../../src/mlx-ml/process/parameter-validator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,eAAe,EAAE,CAAC;IAC1B,QAAQ,EAAE,iBAAiB,EAAE,CAAC;IAC9B,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC5C;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,GAAG,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,mBAAmB,GAAG,cAAc,GAAG,cAAc,CAAC;CAC7D;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,GAAG,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,GAAG,CAAC;CACtB;
|
|
1
|
+
{"version":3,"file":"parameter-validator.d.ts","sourceRoot":"","sources":["../../../src/mlx-ml/process/parameter-validator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,eAAe,EAAE,CAAC;IAC1B,QAAQ,EAAE,iBAAiB,EAAE,CAAC;IAC9B,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC5C;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,GAAG,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,mBAAmB,GAAG,cAAc,GAAG,cAAc,CAAC;CAC7D;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,GAAG,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,GAAG,CAAC;CACtB;AAqED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,EACxC,MAAM,GAAE,OAAc,GACrB,gBAAgB,CAuGlB;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,CAsBvE;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,CAkBzC"}
|
|
@@ -4,8 +4,10 @@
|
|
|
4
4
|
* オプションパラメータの存在チェックと値の妥当性検証を行う
|
|
5
5
|
*/
|
|
6
6
|
/**
|
|
7
|
-
* MLX
|
|
8
|
-
*
|
|
7
|
+
* MLXパラメータの制約定義(ホワイトリスト)
|
|
8
|
+
*
|
|
9
|
+
* MlxMlModelOptions に新しいフィールドを追加した場合は、ここにも登録が必要。
|
|
10
|
+
* 未登録のパラメータは strict モードで拒否される。
|
|
9
11
|
*/
|
|
10
12
|
const PARAMETER_CONSTRAINTS = {
|
|
11
13
|
maxTokens: {
|
|
@@ -49,6 +51,11 @@ const PARAMETER_CONSTRAINTS = {
|
|
|
49
51
|
max: 10000,
|
|
50
52
|
default: 20,
|
|
51
53
|
description: '繰り返し検出のコンテキストサイズ'
|
|
54
|
+
},
|
|
55
|
+
trustRemoteCode: {
|
|
56
|
+
type: 'boolean',
|
|
57
|
+
default: false,
|
|
58
|
+
description: 'apply_chat_templateでリモートコードの実行を許可する'
|
|
52
59
|
}
|
|
53
60
|
};
|
|
54
61
|
/**
|
|
@@ -71,7 +78,7 @@ export function validateOptions(options, strict = true) {
|
|
|
71
78
|
// 不明なパラメータ
|
|
72
79
|
if (!constraint) {
|
|
73
80
|
// 利用可能なパラメータから重複を除く(camelCaseのみ表示)
|
|
74
|
-
const availableParams =
|
|
81
|
+
const availableParams = Object.keys(PARAMETER_CONSTRAINTS);
|
|
75
82
|
if (strict) {
|
|
76
83
|
errors.push({
|
|
77
84
|
field: key,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parameter-validator.js","sourceRoot":"","sources":["../../../src/mlx-ml/process/parameter-validator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AA6CH
|
|
1
|
+
{"version":3,"file":"parameter-validator.js","sourceRoot":"","sources":["../../../src/mlx-ml/process/parameter-validator.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,9 +7,12 @@ import { Readable } from 'stream';
|
|
|
7
7
|
export interface ProcessCommunicationCallbacks {
|
|
8
8
|
onJsonResponse: (jsonData: string) => void;
|
|
9
9
|
onRequestCompleted: () => void;
|
|
10
|
+
onProcessExit: (code: number | null, signal: string | null) => void;
|
|
10
11
|
}
|
|
11
12
|
export interface ProcessCommunicationOptions {
|
|
12
13
|
textOnly?: boolean;
|
|
14
|
+
drafterModel?: string;
|
|
15
|
+
draftBlockSize?: number;
|
|
13
16
|
}
|
|
14
17
|
export declare class ProcessCommunication {
|
|
15
18
|
private process;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-communication.d.ts","sourceRoot":"","sources":["../../../src/mlx-ml/process/process-communication.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAoBlC,MAAM,WAAW,6BAA6B;IAC5C,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,kBAAkB,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"process-communication.d.ts","sourceRoot":"","sources":["../../../src/mlx-ml/process/process-communication.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAoBlC,MAAM,WAAW,6BAA6B;IAC5C,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,kBAAkB,EAAE,MAAM,IAAI,CAAC;IAC/B,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;CACrE;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,aAAa,CAAyB;IAC9C,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,SAAS,CAAgC;gBAErC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,6BAA6B,EAAE,OAAO,CAAC,EAAE,2BAA2B;IA6B9G,OAAO,CAAC,oBAAoB;IAwB5B;;;;OAIG;IACH,OAAO,CAAC,WAAW;IA2CnB,eAAe,IAAI,QAAQ;IAO3B,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIjC,iBAAiB,IAAI,OAAO;IAI5B,eAAe,IAAI,OAAO;IAIpB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAiB5B"}
|
|
@@ -35,6 +35,12 @@ export class ProcessCommunication {
|
|
|
35
35
|
if (options?.textOnly) {
|
|
36
36
|
args.push('--text-only');
|
|
37
37
|
}
|
|
38
|
+
if (options?.drafterModel) {
|
|
39
|
+
args.push('--drafter', options.drafterModel);
|
|
40
|
+
}
|
|
41
|
+
if (options?.draftBlockSize !== undefined) {
|
|
42
|
+
args.push('--draft-block-size', options.draftBlockSize.toString());
|
|
43
|
+
}
|
|
38
44
|
this.process = spawn('uv', args, {
|
|
39
45
|
cwd: mlxDriverDir
|
|
40
46
|
});
|
|
@@ -50,6 +56,13 @@ export class ProcessCommunication {
|
|
|
50
56
|
this.process.on('error', (err) => {
|
|
51
57
|
logger.error('Child process error:', err);
|
|
52
58
|
});
|
|
59
|
+
this.process.on('exit', (code, signal) => {
|
|
60
|
+
if (this.currentStream) {
|
|
61
|
+
this.currentStream.destroy(new Error(`MLX process exited unexpectedly (code=${code}, signal=${signal})`));
|
|
62
|
+
this.currentStream = null;
|
|
63
|
+
}
|
|
64
|
+
this.callbacks.onProcessExit(code, signal);
|
|
65
|
+
});
|
|
53
66
|
}
|
|
54
67
|
/**
|
|
55
68
|
* stdoutから受信したデータを処理する
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-communication.js","sourceRoot":"","sources":["../../../src/mlx-ml/process/process-communication.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAkC,KAAK,EAAE,MAAM,eAAe,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE/C,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC;AAEjE,kCAAkC;AAClC,yFAAyF;AACzF,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAC9B,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAC5C,IAAI,EAAE,IAAI,EAAE,IAAI,CAAE,6DAA6D;CAChF,CAAC;AAEF,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAC5B,WAAW,EACX,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAC1B,CAAC;
|
|
1
|
+
{"version":3,"file":"process-communication.js","sourceRoot":"","sources":["../../../src/mlx-ml/process/process-communication.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* リクエストキューの管理とプロセッシングロジックを提供
|
|
5
5
|
*/
|
|
6
6
|
import { Readable } from 'stream';
|
|
7
|
-
import type { MlxMessage, MlxMlModelOptions, MlxRuntimeInfo, MlxFormatTestResult, MlxToolDefinition } from './types.js';
|
|
7
|
+
import type { MlxMessage, MlxMlModelOptions, MlxRuntimeInfo, MlxFormatTestResult, MlxTokenizeResult, MlxCachePrefillResult, MlxToolDefinition } from './types.js';
|
|
8
8
|
export interface QueueManagerCallbacks {
|
|
9
9
|
sendToProcess: (data: string) => void;
|
|
10
10
|
createNewStream: () => Readable;
|
|
@@ -18,13 +18,16 @@ export declare class QueueManager {
|
|
|
18
18
|
addFormatTestRequest(messages: MlxMessage[], options?: {
|
|
19
19
|
primer?: string;
|
|
20
20
|
}): Promise<MlxFormatTestResult>;
|
|
21
|
-
|
|
21
|
+
addTokenizeRequest(messages: MlxMessage[], tools?: MlxToolDefinition[], reasoningEffort?: 'low' | 'medium' | 'high'): Promise<MlxTokenizeResult>;
|
|
22
|
+
addChatRequest(messages: MlxMessage[], primer?: string, options?: MlxMlModelOptions, tools?: MlxToolDefinition[], images?: string[], maxImageSize?: number, reasoningEffort?: 'low' | 'medium' | 'high', cachePath?: string, cacheTrimTokens?: number): Promise<Readable>;
|
|
23
|
+
addCachePrefillRequest(cachePath: string, messages: MlxMessage[], baseCachePath?: string, trimToTokens?: number, prefixOffsets?: number[], prefixHashes?: string[], tools?: MlxToolDefinition[], reasoningEffort?: 'low' | 'medium' | 'high'): Promise<MlxCachePrefillResult>;
|
|
22
24
|
addCompletionRequest(prompt: string, options?: MlxMlModelOptions, images?: string[], maxImageSize?: number): Promise<Readable>;
|
|
23
25
|
processNext(): void;
|
|
24
26
|
handleJsonResponse(jsonData: string): void;
|
|
25
27
|
onRequestCompleted(): void;
|
|
26
28
|
get length(): number;
|
|
27
29
|
get isEmpty(): boolean;
|
|
30
|
+
rejectAll(error: Error): void;
|
|
28
31
|
clear(): void;
|
|
29
32
|
}
|
|
30
33
|
//# sourceMappingURL=queue.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../../src/mlx-ml/process/queue.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../../src/mlx-ml/process/queue.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,OAAO,KAAK,EAaV,UAAU,EACV,iBAAiB,EACjB,cAAc,EACd,mBAAmB,EACnB,iBAAiB,EACjB,qBAAqB,EACrB,iBAAiB,EAClB,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,qBAAqB;IACpC,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,eAAe,EAAE,MAAM,QAAQ,CAAC;CACjC;AAED,qBAAa,YAAY;IACvB,OAAO,CAAC,KAAK,CAAmB;IAChC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,SAAS,CAAwB;gBAE7B,SAAS,EAAE,qBAAqB;IAI5C,sBAAsB,IAAI,OAAO,CAAC,cAAc,CAAC;IAajD,oBAAoB,CAAC,QAAQ,EAAE,UAAU,EAAE,EAAE,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAiBzG,kBAAkB,CAAC,QAAQ,EAAE,UAAU,EAAE,EAAE,KAAK,CAAC,EAAE,iBAAiB,EAAE,EAAE,eAAe,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAkBhJ,cAAc,CAAC,QAAQ,EAAE,UAAU,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,iBAAiB,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IA0BzQ,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,aAAa,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,EAAE,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,iBAAiB,EAAE,EAAE,eAAe,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAsB7Q,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAsB9H,WAAW;IAqBX,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAkE1C,kBAAkB,IAAI,IAAI;IAK1B,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,SAAS,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAQ7B,KAAK,IAAI,IAAI;CAId"}
|
|
@@ -12,18 +12,19 @@ export class QueueManager {
|
|
|
12
12
|
this.callbacks = callbacks;
|
|
13
13
|
}
|
|
14
14
|
addCapabilitiesRequest() {
|
|
15
|
-
return new Promise((resolve) => {
|
|
15
|
+
return new Promise((resolve, reject) => {
|
|
16
16
|
const request = { method: 'capabilities' };
|
|
17
17
|
this.queue.push({
|
|
18
18
|
request,
|
|
19
19
|
resolve,
|
|
20
|
+
reject,
|
|
20
21
|
expectJsonResponse: true
|
|
21
22
|
});
|
|
22
23
|
this.processNext();
|
|
23
24
|
});
|
|
24
25
|
}
|
|
25
26
|
addFormatTestRequest(messages, options) {
|
|
26
|
-
return new Promise((resolve) => {
|
|
27
|
+
return new Promise((resolve, reject) => {
|
|
27
28
|
const request = {
|
|
28
29
|
method: 'format_test',
|
|
29
30
|
messages,
|
|
@@ -32,12 +33,30 @@ export class QueueManager {
|
|
|
32
33
|
this.queue.push({
|
|
33
34
|
request,
|
|
34
35
|
resolve,
|
|
36
|
+
reject,
|
|
35
37
|
expectJsonResponse: true
|
|
36
38
|
});
|
|
37
39
|
this.processNext();
|
|
38
40
|
});
|
|
39
41
|
}
|
|
40
|
-
|
|
42
|
+
addTokenizeRequest(messages, tools, reasoningEffort) {
|
|
43
|
+
return new Promise((resolve, reject) => {
|
|
44
|
+
const request = {
|
|
45
|
+
method: 'tokenize',
|
|
46
|
+
messages,
|
|
47
|
+
...(tools && { tools }),
|
|
48
|
+
...(reasoningEffort && { reasoning_effort: reasoningEffort }),
|
|
49
|
+
};
|
|
50
|
+
this.queue.push({
|
|
51
|
+
request,
|
|
52
|
+
resolve,
|
|
53
|
+
reject,
|
|
54
|
+
expectJsonResponse: true
|
|
55
|
+
});
|
|
56
|
+
this.processNext();
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
addChatRequest(messages, primer, options, tools, images, maxImageSize, reasoningEffort, cachePath, cacheTrimTokens) {
|
|
41
60
|
return new Promise((resolve, reject) => {
|
|
42
61
|
try {
|
|
43
62
|
const request = {
|
|
@@ -45,12 +64,16 @@ export class QueueManager {
|
|
|
45
64
|
messages,
|
|
46
65
|
primer,
|
|
47
66
|
tools,
|
|
48
|
-
options: mapOptionsToPython(options, true),
|
|
49
|
-
...(images?.length ? { images, maxImageSize } : {})
|
|
67
|
+
options: mapOptionsToPython(options, true),
|
|
68
|
+
...(images?.length ? { images, maxImageSize } : {}),
|
|
69
|
+
...(reasoningEffort ? { reasoning_effort: reasoningEffort } : {}),
|
|
70
|
+
...(cachePath ? { cache_path: cachePath } : {}),
|
|
71
|
+
...(cacheTrimTokens != null ? { cache_trim_tokens: cacheTrimTokens } : {}),
|
|
50
72
|
};
|
|
51
73
|
this.queue.push({
|
|
52
74
|
request,
|
|
53
|
-
resolve
|
|
75
|
+
resolve,
|
|
76
|
+
reject,
|
|
54
77
|
});
|
|
55
78
|
this.processNext();
|
|
56
79
|
}
|
|
@@ -59,18 +82,40 @@ export class QueueManager {
|
|
|
59
82
|
}
|
|
60
83
|
});
|
|
61
84
|
}
|
|
85
|
+
addCachePrefillRequest(cachePath, messages, baseCachePath, trimToTokens, prefixOffsets, prefixHashes, tools, reasoningEffort) {
|
|
86
|
+
return new Promise((resolve, reject) => {
|
|
87
|
+
const request = {
|
|
88
|
+
method: 'cache_prefill',
|
|
89
|
+
cache_path: cachePath,
|
|
90
|
+
messages,
|
|
91
|
+
...(baseCachePath && { base_cache_path: baseCachePath }),
|
|
92
|
+
...(trimToTokens != null && { trim_to_tokens: trimToTokens }),
|
|
93
|
+
...(prefixOffsets && prefixHashes && { prefix_offsets: prefixOffsets, prefix_hashes: prefixHashes }),
|
|
94
|
+
...(tools && { tools }),
|
|
95
|
+
...(reasoningEffort && { reasoning_effort: reasoningEffort }),
|
|
96
|
+
};
|
|
97
|
+
this.queue.push({
|
|
98
|
+
request,
|
|
99
|
+
resolve,
|
|
100
|
+
reject,
|
|
101
|
+
expectJsonResponse: true,
|
|
102
|
+
});
|
|
103
|
+
this.processNext();
|
|
104
|
+
});
|
|
105
|
+
}
|
|
62
106
|
addCompletionRequest(prompt, options, images, maxImageSize) {
|
|
63
107
|
return new Promise((resolve, reject) => {
|
|
64
108
|
try {
|
|
65
109
|
const request = {
|
|
66
110
|
method: 'completion',
|
|
67
111
|
prompt,
|
|
68
|
-
options: mapOptionsToPython(options, true),
|
|
69
|
-
...(images?.length ? { images, maxImageSize } : {})
|
|
112
|
+
options: mapOptionsToPython(options, true),
|
|
113
|
+
...(images?.length ? { images, maxImageSize } : {}),
|
|
70
114
|
};
|
|
71
115
|
this.queue.push({
|
|
72
116
|
request,
|
|
73
|
-
resolve
|
|
117
|
+
resolve,
|
|
118
|
+
reject,
|
|
74
119
|
});
|
|
75
120
|
this.processNext();
|
|
76
121
|
}
|
|
@@ -102,15 +147,44 @@ export class QueueManager {
|
|
|
102
147
|
if (queueItem?.expectJsonResponse) {
|
|
103
148
|
try {
|
|
104
149
|
const jsonResponse = JSON.parse(jsonData);
|
|
105
|
-
|
|
150
|
+
// format_test has its own error field in MlxFormatTestResult — resolve if well-formed,
|
|
151
|
+
// but reject bare protocol errors (missing template_applied indicates server-side exception)
|
|
152
|
+
if (queueItem.request.method === 'format_test') {
|
|
153
|
+
if ('template_applied' in jsonResponse) {
|
|
154
|
+
queueItem.resolve(jsonResponse);
|
|
155
|
+
}
|
|
156
|
+
else {
|
|
157
|
+
queueItem.resolve({
|
|
158
|
+
formatted_prompt: null,
|
|
159
|
+
template_applied: false,
|
|
160
|
+
model_specific_processing: null,
|
|
161
|
+
error: jsonResponse.error || 'Malformed format_test response'
|
|
162
|
+
});
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
else if (queueItem.request.method === 'tokenize') {
|
|
166
|
+
if ('token_count' in jsonResponse) {
|
|
167
|
+
queueItem.resolve(jsonResponse);
|
|
168
|
+
}
|
|
169
|
+
else {
|
|
170
|
+
queueItem.resolve({
|
|
171
|
+
token_ids: null,
|
|
172
|
+
token_count: 0,
|
|
173
|
+
error: jsonResponse.error || 'Malformed tokenize response'
|
|
174
|
+
});
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
else if (jsonResponse.error) {
|
|
178
|
+
queueItem.reject?.(new Error(jsonResponse.error));
|
|
179
|
+
}
|
|
180
|
+
else if (queueItem.request.method === 'capabilities') {
|
|
106
181
|
queueItem.resolve(jsonResponse);
|
|
107
182
|
}
|
|
108
|
-
else if (queueItem.request.method === '
|
|
183
|
+
else if (queueItem.request.method === 'cache_prefill') {
|
|
109
184
|
queueItem.resolve(jsonResponse);
|
|
110
185
|
}
|
|
111
186
|
}
|
|
112
187
|
catch (e) {
|
|
113
|
-
// エラー時のフォールバック処理
|
|
114
188
|
if (queueItem.request.method === 'capabilities') {
|
|
115
189
|
queueItem.resolve({
|
|
116
190
|
methods: [],
|
|
@@ -126,12 +200,19 @@ export class QueueManager {
|
|
|
126
200
|
error: e instanceof Error ? e.message : 'Unknown error'
|
|
127
201
|
});
|
|
128
202
|
}
|
|
203
|
+
else if (queueItem.request.method === 'tokenize') {
|
|
204
|
+
queueItem.resolve({
|
|
205
|
+
token_ids: null,
|
|
206
|
+
token_count: 0,
|
|
207
|
+
error: e instanceof Error ? e.message : 'Unknown error'
|
|
208
|
+
});
|
|
209
|
+
}
|
|
210
|
+
else if (queueItem.request.method === 'cache_prefill') {
|
|
211
|
+
queueItem.reject(e instanceof Error ? e : new Error(String(e)));
|
|
212
|
+
}
|
|
129
213
|
}
|
|
130
214
|
}
|
|
131
215
|
}
|
|
132
|
-
// 注: isProcessing/processNext は onRequestCompleted() に一元化
|
|
133
|
-
// handleJsonResponse と onRequestCompleted の二重呼び出しによる
|
|
134
|
-
// isProcessing フラグの不整合を防止
|
|
135
216
|
}
|
|
136
217
|
onRequestCompleted() {
|
|
137
218
|
this.isProcessing = false;
|
|
@@ -143,6 +224,13 @@ export class QueueManager {
|
|
|
143
224
|
get isEmpty() {
|
|
144
225
|
return this.queue.length === 0;
|
|
145
226
|
}
|
|
227
|
+
rejectAll(error) {
|
|
228
|
+
const pending = this.queue.splice(0);
|
|
229
|
+
for (const item of pending) {
|
|
230
|
+
item.reject?.(error);
|
|
231
|
+
}
|
|
232
|
+
this.isProcessing = false;
|
|
233
|
+
}
|
|
146
234
|
clear() {
|
|
147
235
|
this.queue = [];
|
|
148
236
|
this.isProcessing = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../../src/mlx-ml/process/queue.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../../src/mlx-ml/process/queue.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type { ToolCall } from '../../types.js';
|
|
2
|
+
import type { MlxRuntimeInfo } from './types.js';
|
|
3
|
+
export interface ResponseParseResult {
|
|
4
|
+
content: string;
|
|
5
|
+
thinkingContent?: string;
|
|
6
|
+
toolCalls?: ToolCall[];
|
|
7
|
+
}
|
|
8
|
+
export type ResponseProcessor = (rawText: string) => ResponseParseResult;
|
|
9
|
+
/**
|
|
10
|
+
* デフォルトResponseProcessorファクトリ
|
|
11
|
+
*
|
|
12
|
+
* thinking抽出(<think>, <|channel>thought等)とツールコール解析を合成する。
|
|
13
|
+
* 専用パーサ(harmony等)を持たないモデル向けの汎用プロセッサ。
|
|
14
|
+
*/
|
|
15
|
+
export declare function createDefaultProcessor(runtimeInfo: MlxRuntimeInfo | null, options?: {
|
|
16
|
+
enableToolParsing?: boolean;
|
|
17
|
+
}): ResponseProcessor;
|
|
18
|
+
//# sourceMappingURL=response-processor.d.ts.map
|
|
@@ -0,0 +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;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"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { extractThinkingContent } from '../../content-utils.js';
|
|
2
|
+
import { parseToolCalls } from '../tool-call-parser.js';
|
|
3
|
+
/**
|
|
4
|
+
* デフォルトResponseProcessorファクトリ
|
|
5
|
+
*
|
|
6
|
+
* thinking抽出(<think>, <|channel>thought等)とツールコール解析を合成する。
|
|
7
|
+
* 専用パーサ(harmony等)を持たないモデル向けの汎用プロセッサ。
|
|
8
|
+
*/
|
|
9
|
+
export function createDefaultProcessor(runtimeInfo, options) {
|
|
10
|
+
const enableToolParsing = options?.enableToolParsing ?? false;
|
|
11
|
+
return (rawText) => {
|
|
12
|
+
const { content: afterThinking, thinkingContent } = extractThinkingContent(rawText);
|
|
13
|
+
if (enableToolParsing) {
|
|
14
|
+
const { content, toolCalls } = parseToolCalls(afterThinking, runtimeInfo);
|
|
15
|
+
return {
|
|
16
|
+
content,
|
|
17
|
+
thinkingContent,
|
|
18
|
+
toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
return { content: afterThinking, thinkingContent };
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=response-processor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"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,wBAAwB,CAAC;AAUxD;;;;;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"}
|
|
@@ -38,7 +38,7 @@ export interface MlxToolResultMessage {
|
|
|
38
38
|
}
|
|
39
39
|
export type MlxMessage = MlxStandardMessage | MlxAssistantToolCallMessage | MlxToolResultMessage;
|
|
40
40
|
export interface MlxBaseRequest {
|
|
41
|
-
method: 'capabilities' | 'format_test' | 'chat' | 'completion';
|
|
41
|
+
method: 'capabilities' | 'format_test' | 'chat' | 'completion' | 'cache_prefill' | 'tokenize';
|
|
42
42
|
}
|
|
43
43
|
export interface MlxCapabilitiesRequest extends MlxBaseRequest {
|
|
44
44
|
method: 'capabilities';
|
|
@@ -50,6 +50,12 @@ export interface MlxFormatTestRequest extends MlxBaseRequest {
|
|
|
50
50
|
primer?: string;
|
|
51
51
|
};
|
|
52
52
|
}
|
|
53
|
+
export interface MlxTokenizeRequest extends MlxBaseRequest {
|
|
54
|
+
method: 'tokenize';
|
|
55
|
+
messages: MlxMessage[];
|
|
56
|
+
tools?: MlxToolDefinition[];
|
|
57
|
+
reasoning_effort?: 'low' | 'medium' | 'high';
|
|
58
|
+
}
|
|
53
59
|
/** HuggingFace apply_chat_template 互換のtool定義 */
|
|
54
60
|
export interface MlxToolDefinition {
|
|
55
61
|
type: 'function';
|
|
@@ -67,6 +73,9 @@ export interface MlxChatRequest extends MlxBaseRequest {
|
|
|
67
73
|
options?: MlxMlModelOptions;
|
|
68
74
|
images?: string[];
|
|
69
75
|
maxImageSize?: number;
|
|
76
|
+
reasoning_effort?: 'low' | 'medium' | 'high';
|
|
77
|
+
cache_path?: string;
|
|
78
|
+
cache_trim_tokens?: number;
|
|
70
79
|
}
|
|
71
80
|
export interface MlxCompletionRequest extends MlxBaseRequest {
|
|
72
81
|
method: 'completion';
|
|
@@ -75,9 +84,26 @@ export interface MlxCompletionRequest extends MlxBaseRequest {
|
|
|
75
84
|
images?: string[];
|
|
76
85
|
maxImageSize?: number;
|
|
77
86
|
}
|
|
78
|
-
export
|
|
87
|
+
export interface MlxCachePrefillRequest extends MlxBaseRequest {
|
|
88
|
+
method: 'cache_prefill';
|
|
89
|
+
cache_path: string;
|
|
90
|
+
messages: MlxMessage[];
|
|
91
|
+
base_cache_path?: string;
|
|
92
|
+
trim_to_tokens?: number;
|
|
93
|
+
prefix_offsets?: number[];
|
|
94
|
+
prefix_hashes?: string[];
|
|
95
|
+
tools?: MlxToolDefinition[];
|
|
96
|
+
reasoning_effort?: 'low' | 'medium' | 'high';
|
|
97
|
+
}
|
|
98
|
+
export interface MlxCachePrefillResult {
|
|
99
|
+
cache_path: string;
|
|
100
|
+
token_count?: number;
|
|
101
|
+
prefix_offsets?: number[];
|
|
102
|
+
prefix_hashes?: string[];
|
|
103
|
+
}
|
|
104
|
+
export type MlxRequest = MlxCapabilitiesRequest | MlxFormatTestRequest | MlxTokenizeRequest | MlxChatRequest | MlxCompletionRequest | MlxCachePrefillRequest;
|
|
79
105
|
/** MLX-LMが認識するtool_parser_type */
|
|
80
|
-
export type KnownToolParserType = 'json_tools' | 'pythonic' | 'function_gemma' | 'mistral' | 'kimi_k2' | 'longcat' | 'glm47' | 'qwen3_coder' | 'minimax_m2';
|
|
106
|
+
export type KnownToolParserType = 'json_tools' | 'pythonic' | 'function_gemma' | 'mistral' | 'kimi_k2' | 'longcat' | 'glm47' | 'qwen3_coder' | 'minimax_m2' | 'gemma4' | 'harmony';
|
|
81
107
|
export interface ToolCallFormat {
|
|
82
108
|
tool_parser_type?: string;
|
|
83
109
|
call_start?: string;
|
|
@@ -120,6 +146,11 @@ export interface MlxFormatTestResult {
|
|
|
120
146
|
model_specific_processing: MlxMessage[] | null;
|
|
121
147
|
error: string | null;
|
|
122
148
|
}
|
|
149
|
+
export interface MlxTokenizeResult {
|
|
150
|
+
token_ids: number[] | null;
|
|
151
|
+
token_count: number;
|
|
152
|
+
error: string | null;
|
|
153
|
+
}
|
|
123
154
|
export interface LegacyMlxRequest {
|
|
124
155
|
messages: MlxMessage[];
|
|
125
156
|
prompt?: string;
|
|
@@ -129,22 +160,38 @@ export interface LegacyMlxRequest {
|
|
|
129
160
|
export interface BaseQueueItem {
|
|
130
161
|
request: MlxRequest | LegacyMlxRequest;
|
|
131
162
|
expectJsonResponse?: boolean;
|
|
163
|
+
reject?: (reason: Error) => void;
|
|
132
164
|
}
|
|
133
165
|
export interface CapabilitiesQueueItem extends BaseQueueItem {
|
|
134
166
|
request: MlxCapabilitiesRequest;
|
|
135
167
|
resolve: (value: MlxRuntimeInfo) => void;
|
|
168
|
+
reject: (reason: Error) => void;
|
|
136
169
|
expectJsonResponse: true;
|
|
137
170
|
}
|
|
138
171
|
export interface FormatTestQueueItem extends BaseQueueItem {
|
|
139
172
|
request: MlxFormatTestRequest;
|
|
140
173
|
resolve: (value: MlxFormatTestResult) => void;
|
|
174
|
+
reject: (reason: Error) => void;
|
|
175
|
+
expectJsonResponse: true;
|
|
176
|
+
}
|
|
177
|
+
export interface TokenizeQueueItem extends BaseQueueItem {
|
|
178
|
+
request: MlxTokenizeRequest;
|
|
179
|
+
resolve: (value: MlxTokenizeResult) => void;
|
|
180
|
+
reject: (reason: Error) => void;
|
|
181
|
+
expectJsonResponse: true;
|
|
182
|
+
}
|
|
183
|
+
export interface CachePrefillQueueItem extends BaseQueueItem {
|
|
184
|
+
request: MlxCachePrefillRequest;
|
|
185
|
+
resolve: (value: MlxCachePrefillResult) => void;
|
|
186
|
+
reject: (reason: Error) => void;
|
|
141
187
|
expectJsonResponse: true;
|
|
142
188
|
}
|
|
143
189
|
export interface StreamingQueueItem extends BaseQueueItem {
|
|
144
190
|
request: MlxChatRequest | MlxCompletionRequest | LegacyMlxRequest;
|
|
145
191
|
resolve: (value: Readable) => void;
|
|
192
|
+
reject: (reason: Error) => void;
|
|
146
193
|
expectJsonResponse?: false;
|
|
147
194
|
}
|
|
148
|
-
export type QueueItem = CapabilitiesQueueItem | FormatTestQueueItem | StreamingQueueItem;
|
|
195
|
+
export type QueueItem = CapabilitiesQueueItem | FormatTestQueueItem | TokenizeQueueItem | CachePrefillQueueItem | StreamingQueueItem;
|
|
149
196
|
import { Readable } from 'stream';
|
|
150
197
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +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;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/mlx-ml/process/types.ts"],"names":[],"mappings":"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"}
|