@qvac/inference 0.23.0 → 0.24.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.
- package/NOTICE +60 -28
- package/README.md +3 -1
- package/dist/api/assess-model-fit.d.ts +14 -14
- package/dist/api/assess-model-fit.js +14 -14
- package/dist/api/audio-gen.d.ts +2 -2
- package/dist/api/audio-gen.js +135 -44
- package/dist/api/batch-completion.js +2 -1
- package/dist/api/calc-tokens.d.ts +30 -0
- package/dist/api/calc-tokens.js +41 -0
- package/dist/api/classify.d.ts +5 -2
- package/dist/api/classify.js +5 -2
- package/dist/api/completion-stream.d.ts +1 -1
- package/dist/api/completion-stream.js +2 -1
- package/dist/api/delete-cache.d.ts +7 -1
- package/dist/api/delete-cache.js +11 -1
- package/dist/api/diffusion.d.ts +14 -1
- package/dist/api/diffusion.js +14 -1
- package/dist/api/embed.d.ts +82 -29
- package/dist/api/embed.js +64 -18
- package/dist/api/get-model-info.d.ts +1 -1
- package/dist/api/index.d.ts +2 -1
- package/dist/api/index.js +2 -1
- package/dist/api/rag.d.ts +1 -1
- package/dist/api/rag.js +1 -1
- package/dist/api/registry.d.ts +16 -6
- package/dist/api/registry.js +32 -9
- package/dist/api/text-to-speech.d.ts +14 -5
- package/dist/api/text-to-speech.js +83 -29
- package/dist/api/transcribe.d.ts +6 -2
- package/dist/api/transcribe.js +7 -1
- package/dist/api/vector-index.d.ts +25 -3
- package/dist/api/vector-index.js +17 -2
- package/dist/api/video-request.d.ts +15 -15
- package/dist/dispatch.d.ts +10 -4
- package/dist/dispatch.js +65 -15
- package/dist/engine.d.ts +1 -1
- package/dist/errors/index.d.ts +70 -0
- package/dist/errors/index.js +128 -0
- package/dist/handlers/assess-model-fit.d.ts +3 -21
- package/dist/handlers/assess-model-fit.js +4 -303
- package/dist/handlers/cancelHandler.d.ts +10 -9
- package/dist/handlers/cancelHandler.js +17 -13
- package/dist/handlers/completion-orchestrate.d.ts +14 -2
- package/dist/handlers/completion-orchestrate.js +164 -22
- package/dist/handlers/delete-cache.d.ts +2 -1
- package/dist/handlers/delete-cache.js +6 -1
- package/dist/handlers/download-asset.js +11 -4
- package/dist/handlers/get-loaded-model-info.js +1 -0
- package/dist/handlers/get-model-info.js +71 -2
- package/dist/handlers/load-model/coreml-sidecars.d.ts +2 -13
- package/dist/handlers/load-model/coreml-sidecars.js +16 -119
- package/dist/handlers/load-model/download-lock.d.ts +20 -0
- package/dist/handlers/load-model/download-lock.js +213 -0
- package/dist/handlers/load-model/download-manager.d.ts +10 -2
- package/dist/handlers/load-model/download-manager.js +62 -11
- package/dist/handlers/load-model/handler.js +88 -35
- package/dist/handlers/load-model/http.js +327 -205
- package/dist/handlers/load-model/hyperdrive.d.ts +15 -0
- package/dist/handlers/load-model/hyperdrive.js +123 -50
- package/dist/handlers/load-model/registry-client-options.d.ts +2 -0
- package/dist/handlers/load-model/registry-client-options.js +4 -2
- package/dist/handlers/load-model/registry-companion-set.d.ts +5 -0
- package/dist/handlers/load-model/registry-companion-set.js +19 -1
- package/dist/handlers/load-model/registry-delete.d.ts +5 -0
- package/dist/handlers/load-model/registry-delete.js +269 -0
- package/dist/handlers/load-model/registry-download-utils.d.ts +4 -2
- package/dist/handlers/load-model/registry-download-utils.js +93 -22
- package/dist/handlers/load-model/registry.d.ts +20 -0
- package/dist/handlers/load-model/registry.js +308 -175
- package/dist/handlers/load-model/resolve.js +4 -1
- package/dist/handlers/load-model/types.d.ts +2 -0
- package/dist/handlers/logging-stream.js +17 -5
- package/dist/handlers/plugin-invoke.js +152 -39
- package/dist/handlers/registry.d.ts +2 -2
- package/dist/handlers/registry.js +105 -28
- package/dist/handlers/rpc-server.js +7 -7
- package/dist/handlers/session.d.ts +11 -0
- package/dist/handlers/session.js +40 -0
- package/dist/handlers/unload-model.js +8 -3
- package/dist/handlers/vector-index.js +118 -19
- package/dist/index.d.ts +1 -1
- package/dist/index.js +1 -1
- package/dist/logging/utils.js +10 -2
- package/dist/model-cache-layout.d.ts +1 -0
- package/dist/model-cache-layout.js +2 -0
- package/dist/model-fit/assess.d.ts +18 -67
- package/dist/model-fit/assess.js +96 -665
- package/dist/model-fit/describe.d.ts +12 -0
- package/dist/model-fit/describe.js +29 -0
- package/dist/model-fit/description/fetch.d.ts +1 -1
- package/dist/model-fit/description/fetch.js +95 -16
- package/dist/model-fit/description/resolve-load.d.ts +5 -3
- package/dist/model-fit/description/resolve-load.js +14 -14
- package/dist/model-fit/fit-load.d.ts +23 -0
- package/dist/model-fit/fit-load.js +29 -0
- package/dist/model-fit/load-check.d.ts +15 -33
- package/dist/model-fit/load-check.js +50 -195
- package/dist/model-fit/run/engine.d.ts +12 -72
- package/dist/model-fit/run/engine.js +4 -8
- package/dist/model-fit/run/run.d.ts +10 -7
- package/dist/model-fit/run/run.js +22 -18
- package/dist/model-fit/sum.d.ts +32 -0
- package/dist/model-fit/sum.js +60 -0
- package/dist/models/registry/models.d.ts +865 -128
- package/dist/models/registry/models.js +3737 -2963
- package/dist/plugins/builtin/asr-ggml/config.d.ts +19 -4
- package/dist/plugins/builtin/asr-ggml/config.js +39 -3
- package/dist/plugins/builtin/asr-ggml/fit.d.ts +18 -0
- package/dist/{model-fit/request/engines/asr.js → plugins/builtin/asr-ggml/fit.js} +55 -71
- package/dist/plugins/builtin/audiogen-ggml/config.d.ts +6 -0
- package/dist/plugins/builtin/audiogen-ggml/config.js +9 -0
- package/dist/plugins/builtin/audiogen-ggml/fit.d.ts +3 -0
- package/dist/{model-fit/request/engines/audiogen.js → plugins/builtin/audiogen-ggml/fit.js} +28 -18
- package/dist/plugins/builtin/audiogen-ggml/ops/audio-edit-stream.d.ts +3 -1
- package/dist/plugins/builtin/audiogen-ggml/ops/audio-edit-stream.js +2 -1
- package/dist/plugins/builtin/audiogen-ggml/ops/audio-gen-encode.d.ts +17 -0
- package/dist/plugins/builtin/audiogen-ggml/ops/audio-gen-encode.js +68 -0
- package/dist/plugins/builtin/audiogen-ggml/ops/audio-gen-run.d.ts +11 -3
- package/dist/plugins/builtin/audiogen-ggml/ops/audio-gen-run.js +47 -11
- package/dist/plugins/builtin/audiogen-ggml/ops/audio-gen-stream.d.ts +3 -1
- package/dist/plugins/builtin/audiogen-ggml/ops/audio-gen-stream.js +2 -1
- package/dist/plugins/builtin/audiogen-ggml/ops/audio-understand.d.ts +3 -1
- package/dist/plugins/builtin/audiogen-ggml/ops/audio-understand.js +2 -1
- package/dist/plugins/builtin/audiogen-ggml/plugin.d.ts +143 -18
- package/dist/plugins/builtin/audiogen-ggml/plugin.js +13 -1
- package/dist/plugins/builtin/bci-whispercpp-transcription/fit.d.ts +3 -0
- package/dist/plugins/builtin/bci-whispercpp-transcription/fit.js +22 -0
- package/dist/plugins/builtin/bci-whispercpp-transcription/plugin.d.ts +45 -4
- package/dist/plugins/builtin/bci-whispercpp-transcription/plugin.js +8 -6
- package/dist/plugins/builtin/ggml-classification/plugin.d.ts +4 -1
- package/dist/plugins/builtin/ggml-classification/plugin.js +88 -8
- package/dist/plugins/builtin/ggml-image-embedding/ops/embed.d.ts +24 -0
- package/dist/plugins/builtin/ggml-image-embedding/ops/embed.js +184 -0
- package/dist/plugins/builtin/ggml-image-embedding/plugin.d.ts +120 -0
- package/dist/plugins/builtin/ggml-image-embedding/plugin.js +39 -0
- package/dist/plugins/builtin/ggml-ocr/fit.d.ts +6 -0
- package/dist/plugins/builtin/ggml-ocr/fit.js +19 -0
- package/dist/plugins/builtin/ggml-ocr/params.d.ts +1 -1
- package/dist/plugins/builtin/ggml-ocr/plugin.d.ts +9 -3
- package/dist/plugins/builtin/ggml-ocr/plugin.js +107 -21
- package/dist/plugins/builtin/ggml-vla/ops/vla-run.d.ts +2 -2
- package/dist/plugins/builtin/ggml-vla/ops/vla-run.js +18 -2
- package/dist/plugins/builtin/ggml-vla/plugin.d.ts +3 -3
- package/dist/plugins/builtin/index.d.ts +1 -0
- package/dist/plugins/builtin/index.js +1 -0
- package/dist/plugins/builtin/llamacpp-completion/fit.d.ts +3 -0
- package/dist/plugins/builtin/llamacpp-completion/fit.js +28 -0
- package/dist/plugins/builtin/llamacpp-completion/ops/batch-completion-stream.js +1 -1
- package/dist/plugins/builtin/llamacpp-completion/ops/cache-logger.js +15 -4
- package/dist/plugins/builtin/llamacpp-completion/ops/calc-tokens.d.ts +2 -0
- package/dist/plugins/builtin/llamacpp-completion/ops/calc-tokens.js +32 -0
- package/dist/plugins/builtin/llamacpp-completion/ops/completion-stats.d.ts +1 -1
- package/dist/plugins/builtin/llamacpp-completion/ops/completion-stream.d.ts +17 -3
- package/dist/plugins/builtin/llamacpp-completion/ops/completion-stream.js +61 -5
- package/dist/plugins/builtin/llamacpp-completion/ops/finetune.d.ts +5 -4
- package/dist/plugins/builtin/llamacpp-completion/ops/finetune.js +54 -19
- package/dist/plugins/builtin/llamacpp-completion/plugin.d.ts +148 -19
- package/dist/plugins/builtin/llamacpp-completion/plugin.js +26 -9
- package/dist/plugins/builtin/llamacpp-decision/ops/decide.d.ts +3 -1
- package/dist/plugins/builtin/llamacpp-decision/ops/decide.js +5 -2
- package/dist/plugins/builtin/llamacpp-decision/plugin.d.ts +4 -2
- package/dist/plugins/builtin/llamacpp-decision/plugin.js +2 -2
- package/dist/plugins/builtin/llamacpp-embedding/fit.d.ts +3 -0
- package/dist/plugins/builtin/llamacpp-embedding/fit.js +23 -0
- package/dist/plugins/builtin/llamacpp-embedding/plugin.d.ts +194 -4
- package/dist/plugins/builtin/llamacpp-embedding/plugin.js +37 -11
- package/dist/plugins/builtin/llamacpp-embedding/transform.d.ts +2 -2
- package/dist/plugins/builtin/llamacpp-embedding/transform.js +23 -2
- package/dist/plugins/builtin/llamacpp-rerank/ops/rerank.d.ts +3 -1
- package/dist/plugins/builtin/llamacpp-rerank/ops/rerank.js +5 -2
- package/dist/plugins/builtin/llamacpp-rerank/plugin.d.ts +6 -5
- package/dist/plugins/builtin/llamacpp-rerank/plugin.js +2 -3
- package/dist/plugins/builtin/moss-transcribe/plugin.d.ts +30 -3
- package/dist/plugins/builtin/moss-transcribe/plugin.js +5 -3
- package/dist/plugins/builtin/nmtcpp-translation/fit.d.ts +3 -0
- package/dist/plugins/builtin/nmtcpp-translation/fit.js +11 -0
- package/dist/plugins/builtin/nmtcpp-translation/plugin.d.ts +14 -5
- package/dist/plugins/builtin/nmtcpp-translation/plugin.js +4 -2
- package/dist/plugins/builtin/parakeet-transcription/plugin.d.ts +205 -9
- package/dist/plugins/builtin/parakeet-transcription/plugin.js +39 -13
- package/dist/plugins/builtin/sdcpp-generation/fit.d.ts +3 -0
- package/dist/plugins/builtin/sdcpp-generation/fit.js +68 -0
- package/dist/plugins/builtin/sdcpp-generation/load-files.d.ts +30 -0
- package/dist/plugins/builtin/sdcpp-generation/load-files.js +121 -0
- package/dist/plugins/builtin/sdcpp-generation/ops/diffusion.d.ts +4 -1
- package/dist/plugins/builtin/sdcpp-generation/ops/diffusion.js +8 -3
- package/dist/plugins/builtin/sdcpp-generation/ops/upscale.d.ts +4 -1
- package/dist/plugins/builtin/sdcpp-generation/ops/upscale.js +107 -22
- package/dist/plugins/builtin/sdcpp-generation/ops/video.d.ts +3 -1
- package/dist/plugins/builtin/sdcpp-generation/ops/video.js +4 -1
- package/dist/plugins/builtin/sdcpp-generation/ops/world.d.ts +4 -2
- package/dist/plugins/builtin/sdcpp-generation/ops/world.js +7 -2
- package/dist/plugins/builtin/sdcpp-generation/plugin.d.ts +79 -16
- package/dist/plugins/builtin/sdcpp-generation/plugin.js +29 -117
- package/dist/plugins/builtin/tts-ggml/fit.d.ts +3 -0
- package/dist/plugins/builtin/tts-ggml/fit.js +162 -0
- package/dist/plugins/builtin/tts-ggml/ops/cancel-binding.d.ts +2 -1
- package/dist/plugins/builtin/tts-ggml/ops/cancel-binding.js +4 -1
- package/dist/plugins/builtin/tts-ggml/ops/moss-options.d.ts +1 -1
- package/dist/plugins/builtin/tts-ggml/ops/text-to-speech-stream.d.ts +2 -1
- package/dist/plugins/builtin/tts-ggml/ops/text-to-speech-stream.js +22 -9
- package/dist/plugins/builtin/tts-ggml/ops/text-to-speech.d.ts +2 -1
- package/dist/plugins/builtin/tts-ggml/ops/text-to-speech.js +51 -16
- package/dist/plugins/builtin/tts-ggml/ops/voice-options.d.ts +50 -0
- package/dist/plugins/builtin/tts-ggml/ops/voice-options.js +74 -0
- package/dist/plugins/builtin/tts-ggml/plugin.d.ts +368 -25
- package/dist/plugins/builtin/tts-ggml/plugin.js +180 -31
- package/dist/plugins/builtin/whispercpp-transcription/plugin.d.ts +70 -7
- package/dist/plugins/builtin/whispercpp-transcription/plugin.js +8 -6
- package/dist/plugins/ops/bci-transcribe.d.ts +5 -4
- package/dist/plugins/ops/bci-transcribe.js +18 -4
- package/dist/plugins/ops/cancel.d.ts +1 -0
- package/dist/plugins/ops/cancel.js +11 -2
- package/dist/plugins/ops/embed.d.ts +5 -3
- package/dist/plugins/ops/embed.js +89 -34
- package/dist/plugins/ops/kv-cache-utils.d.ts +1 -0
- package/dist/plugins/ops/kv-cache-utils.js +6 -2
- package/dist/plugins/ops/load-model.d.ts +2 -0
- package/dist/plugins/ops/load-model.js +33 -16
- package/dist/plugins/ops/transcribe.d.ts +5 -4
- package/dist/plugins/ops/transcribe.js +62 -27
- package/dist/plugins/ops/translate.d.ts +2 -1
- package/dist/plugins/ops/translate.js +4 -1
- package/dist/plugins/ops/unload-model.d.ts +17 -1
- package/dist/plugins/ops/unload-model.js +31 -2
- package/dist/plugins/turbovec-backend.d.ts +1 -1
- package/dist/plugins/turbovec-backend.js +16 -1
- package/dist/profiling/operation-metrics.js +22 -19
- package/dist/rag/embedding-scope.d.ts +16 -0
- package/dist/rag/embedding-scope.js +81 -0
- package/dist/rag/handler.d.ts +25 -0
- package/dist/rag/handler.js +50 -16
- package/dist/rag/handlers/ingest.js +2 -6
- package/dist/rag/handlers/search.d.ts +10 -1
- package/dist/rag/handlers/search.js +16 -7
- package/dist/rag/rag-operation-manager.d.ts +27 -3
- package/dist/rag/rag-operation-manager.js +10 -27
- package/dist/registry.js +5 -0
- package/dist/resources/collector.d.ts +70 -36
- package/dist/resources/collector.js +8 -1
- package/dist/resources/types.d.ts +2 -0
- package/dist/rpc/inventory.js +1 -12
- package/dist/runtime/env.d.ts +5 -1
- package/dist/runtime/env.js +6 -21
- package/dist/runtime/index.d.ts +4 -1
- package/dist/runtime/index.js +2 -0
- package/dist/runtime/lifecycle.d.ts +6 -4
- package/dist/runtime/lifecycle.js +9 -5
- package/dist/runtime/model-config-utils.js +5 -1
- package/dist/runtime/model-registry.d.ts +28 -4
- package/dist/runtime/model-registry.js +46 -1
- package/dist/runtime/model-work-lock.d.ts +13 -0
- package/dist/runtime/model-work-lock.js +48 -0
- package/dist/runtime/registry-client.d.ts +47 -1
- package/dist/runtime/registry-client.js +446 -88
- package/dist/runtime/request-context.d.ts +9 -1
- package/dist/runtime/request-context.js +25 -1
- package/dist/runtime/request-registry.d.ts +55 -7
- package/dist/runtime/request-registry.js +189 -71
- package/dist/runtime/runtime-lifecycle.js +10 -1
- package/dist/runtime/session-id.d.ts +18 -0
- package/dist/runtime/session-id.js +20 -0
- package/dist/runtime/session-registry.d.ts +39 -0
- package/dist/runtime/session-registry.js +114 -0
- package/dist/runtime/vector-index-backend.d.ts +4 -0
- package/dist/runtime/vector-index-registry.d.ts +21 -0
- package/dist/runtime/vector-index-registry.js +56 -18
- package/dist/schemas/abort-signal.d.ts +8 -0
- package/dist/schemas/abort-signal.js +1 -0
- package/dist/schemas/assess-model-fit.d.ts +132 -282
- package/dist/schemas/assess-model-fit.js +82 -216
- package/dist/schemas/audio-gen.d.ts +278 -24
- package/dist/schemas/audio-gen.js +127 -23
- package/dist/schemas/batch-completion-stream.d.ts +105 -13
- package/dist/schemas/batch-completion-stream.js +8 -4
- package/dist/schemas/bci-config.d.ts +2 -1
- package/dist/schemas/bci.d.ts +54 -3
- package/dist/schemas/bci.js +11 -16
- package/dist/schemas/calc-tokens.d.ts +141 -0
- package/dist/schemas/calc-tokens.js +53 -0
- package/dist/schemas/cancel.d.ts +26 -0
- package/dist/schemas/cancel.js +10 -2
- package/dist/schemas/classification.d.ts +3 -0
- package/dist/schemas/classification.js +6 -2
- package/dist/schemas/common.d.ts +1831 -348
- package/dist/schemas/common.js +18 -2
- package/dist/schemas/completion-event.d.ts +3 -0
- package/dist/schemas/completion-event.js +1 -1
- package/dist/schemas/completion-stream.d.ts +162 -17
- package/dist/schemas/completion-stream.js +83 -13
- package/dist/schemas/config.d.ts +1212 -169
- package/dist/schemas/config.js +9 -13
- package/dist/schemas/decision.d.ts +4 -2
- package/dist/schemas/decision.js +2 -1
- package/dist/schemas/download-asset.d.ts +10 -5
- package/dist/schemas/download-asset.js +3 -6
- package/dist/schemas/embed.d.ts +286 -3
- package/dist/schemas/embed.js +162 -16
- package/dist/schemas/engine-addon-map.d.ts +1 -0
- package/dist/schemas/engine-addon-map.js +1 -0
- package/dist/schemas/errors.d.ts +12 -0
- package/dist/schemas/errors.js +66 -1
- package/dist/schemas/finetune.d.ts +14 -4
- package/dist/schemas/finetune.js +5 -6
- package/dist/schemas/heartbeat.d.ts +1 -0
- package/dist/schemas/heartbeat.js +5 -2
- package/dist/schemas/image-embedding.d.ts +27 -0
- package/dist/schemas/image-embedding.js +107 -0
- package/dist/schemas/index.d.ts +7 -3
- package/dist/schemas/index.js +7 -3
- package/dist/schemas/lifecycle.d.ts +3 -0
- package/dist/schemas/lifecycle.js +13 -6
- package/dist/schemas/llamacpp-config.d.ts +269 -22
- package/dist/schemas/llamacpp-config.js +86 -7
- package/dist/schemas/load-model.d.ts +6418 -1960
- package/dist/schemas/load-model.js +39 -8
- package/dist/schemas/logging-stream.d.ts +1 -0
- package/dist/schemas/logging-stream.js +5 -2
- package/dist/schemas/model-config-schemas.d.ts +542 -116
- package/dist/schemas/model-config-schemas.js +2 -0
- package/dist/schemas/model-fit-policy.d.ts +2 -2
- package/dist/schemas/model-info.d.ts +54 -56
- package/dist/schemas/model-info.js +17 -6
- package/dist/schemas/model-ops.d.ts +12 -0
- package/dist/schemas/model-ops.js +33 -5
- package/dist/schemas/model-src-utils.d.ts +10 -6
- package/dist/schemas/model-types.d.ts +8 -4
- package/dist/schemas/model-types.js +1 -0
- package/dist/schemas/ocr.d.ts +9 -4
- package/dist/schemas/ocr.js +6 -2
- package/dist/schemas/plugin.d.ts +62 -6
- package/dist/schemas/plugin.js +26 -4
- package/dist/schemas/profiling.d.ts +32 -32
- package/dist/schemas/rag.d.ts +9 -0
- package/dist/schemas/rag.js +10 -16
- package/dist/schemas/registry.d.ts +30 -10
- package/dist/schemas/registry.js +14 -6
- package/dist/schemas/reload-config.d.ts +41 -6
- package/dist/schemas/reload-config.js +11 -4
- package/dist/schemas/request-base.d.ts +39 -0
- package/dist/schemas/request-base.js +64 -0
- package/dist/schemas/rerank.d.ts +8 -7
- package/dist/schemas/rerank.js +6 -4
- package/dist/schemas/rpc-server.d.ts +3 -0
- package/dist/schemas/rpc-server.js +15 -15
- package/dist/schemas/sdcpp-config.d.ts +90 -20
- package/dist/schemas/sdcpp-config.js +96 -19
- package/dist/schemas/session.d.ts +37 -0
- package/dist/schemas/session.js +53 -0
- package/dist/schemas/system-resources.d.ts +364 -179
- package/dist/schemas/system-resources.js +8 -3
- package/dist/schemas/text-to-speech.d.ts +1343 -271
- package/dist/schemas/text-to-speech.js +547 -33
- package/dist/schemas/tools.d.ts +7 -0
- package/dist/schemas/tools.js +29 -0
- package/dist/schemas/transcription-config.d.ts +262 -2
- package/dist/schemas/transcription-config.js +122 -6
- package/dist/schemas/transcription.d.ts +93 -6
- package/dist/schemas/transcription.js +98 -21
- package/dist/schemas/translate.d.ts +2 -0
- package/dist/schemas/translate.js +5 -9
- package/dist/schemas/translation-config.d.ts +30 -20
- package/dist/schemas/tts-pcm.d.ts +35 -0
- package/dist/schemas/tts-pcm.js +69 -0
- package/dist/schemas/vector-index.d.ts +47 -1
- package/dist/schemas/vector-index.js +37 -10
- package/dist/schemas/vla.d.ts +3 -3
- package/dist/surface.d.ts +3 -3
- package/dist/surface.js +3 -3
- package/dist/utils/addon-responses.d.ts +69 -2
- package/dist/utils/archive.d.ts +7 -0
- package/dist/utils/archive.js +88 -29
- package/dist/utils/asr-events.d.ts +5 -0
- package/dist/utils/asr-events.js +10 -1
- package/dist/utils/cache/auto-history.js +3 -1
- package/dist/utils/cache/layout.d.ts +48 -0
- package/dist/utils/cache/layout.js +190 -0
- package/dist/utils/cache/paths.js +2 -4
- package/dist/utils/cache/types.d.ts +2 -1
- package/dist/utils/checksum.d.ts +5 -0
- package/dist/utils/checksum.js +18 -0
- package/dist/utils/completion-normalizer.js +286 -87
- package/dist/utils/gguf-tensor-extractor.d.ts +0 -6
- package/dist/utils/gguf-tensor-extractor.js +1 -50
- package/dist/utils/shard-utils.d.ts +0 -21
- package/dist/utils/shard-utils.js +12 -62
- package/dist/utils/tool-integration.d.ts +2 -2
- package/dist/utils/tools/defer.d.ts +39 -10
- package/dist/utils/tools/defer.js +72 -17
- package/dist/utils/tools/index.d.ts +1 -1
- package/dist/utils/tools/index.js +1 -1
- package/dist/utils/transcribe-metadata.d.ts +28 -2
- package/dist/utils/transcribe-metadata.js +16 -0
- package/dist/utils/tts-stats.d.ts +42 -0
- package/dist/utils/tts-stats.js +120 -22
- package/package.json +43 -39
- package/dist/model-fit/classify.d.ts +0 -6
- package/dist/model-fit/classify.js +0 -166
- package/dist/model-fit/description/project.d.ts +0 -27
- package/dist/model-fit/description/project.js +0 -33
- package/dist/model-fit/floor.d.ts +0 -31
- package/dist/model-fit/floor.js +0 -65
- package/dist/model-fit/kv-cache.d.ts +0 -23
- package/dist/model-fit/kv-cache.js +0 -85
- package/dist/model-fit/platform.d.ts +0 -14
- package/dist/model-fit/platform.js +0 -26
- package/dist/model-fit/request/create.d.ts +0 -31
- package/dist/model-fit/request/create.js +0 -61
- package/dist/model-fit/request/engines/asr.d.ts +0 -14
- package/dist/model-fit/request/engines/audiogen.d.ts +0 -8
- package/dist/model-fit/request/engines/diffusion.d.ts +0 -7
- package/dist/model-fit/request/engines/diffusion.js +0 -93
- package/dist/model-fit/request/engines/llama.d.ts +0 -12
- package/dist/model-fit/request/engines/llama.js +0 -44
- package/dist/model-fit/request/engines/nmt.d.ts +0 -8
- package/dist/model-fit/request/engines/nmt.js +0 -11
- package/dist/model-fit/request/engines/ocr.d.ts +0 -9
- package/dist/model-fit/request/engines/ocr.js +0 -13
- package/dist/model-fit/request/engines/tts.d.ts +0 -10
- package/dist/model-fit/request/engines/tts.js +0 -152
- package/dist/models/registry/resource-profiles.d.ts +0 -17
- package/dist/models/registry/resource-profiles.js +0 -5859
- package/dist/schemas/model-resource-profile.d.ts +0 -109
- package/dist/schemas/model-resource-profile.js +0 -80
- /package/dist/model-fit/{request/gpu.d.ts → gpu.d.ts} +0 -0
- /package/dist/model-fit/{request/gpu.js → gpu.js} +0 -0
|
@@ -1,4 +1,19 @@
|
|
|
1
1
|
import type { ModelProgressUpdate } from '../../schemas/index.js';
|
|
2
|
+
import Hyperdrive from 'hyperdrive';
|
|
3
|
+
import type { AbortSignal } from 'bare-abort-controller';
|
|
2
4
|
import type { DownloadHooks } from '../../handlers/load-model/types.js';
|
|
5
|
+
interface ProgressContext {
|
|
6
|
+
downloadKey: string;
|
|
7
|
+
callback: (progress: ModelProgressUpdate) => void;
|
|
8
|
+
shardInfo?: {
|
|
9
|
+
currentShard: number;
|
|
10
|
+
totalShards: number;
|
|
11
|
+
shardName: string;
|
|
12
|
+
overallDownloaded: number;
|
|
13
|
+
overallTotal: number;
|
|
14
|
+
};
|
|
15
|
+
}
|
|
3
16
|
export declare function deleteCorestoreDirectory(corestoreDir: string): Promise<void>;
|
|
17
|
+
export declare function downloadAndValidateFile(drive: Hyperdrive, sourceFileName: string, targetFilePath: string, expectedSize: number, expectedChecksum: string, progressContext?: ProgressContext, signal?: AbortSignal, hooks?: DownloadHooks): Promise<void>;
|
|
4
18
|
export declare function downloadModelFromHyperdrive(hyperdriveKey: string, modelFileName: string, seed?: boolean, progressCallback?: (progress: ModelProgressUpdate) => void, hooks?: DownloadHooks, expectedChecksum?: string): Promise<string>;
|
|
19
|
+
export {};
|
|
@@ -1,12 +1,65 @@
|
|
|
1
|
+
var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
|
|
2
|
+
if (value !== null && value !== void 0) {
|
|
3
|
+
if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
|
|
4
|
+
var dispose, inner;
|
|
5
|
+
if (async) {
|
|
6
|
+
if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
|
|
7
|
+
dispose = value[Symbol.asyncDispose];
|
|
8
|
+
}
|
|
9
|
+
if (dispose === void 0) {
|
|
10
|
+
if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
|
|
11
|
+
dispose = value[Symbol.dispose];
|
|
12
|
+
if (async) inner = dispose;
|
|
13
|
+
}
|
|
14
|
+
if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
|
|
15
|
+
if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } };
|
|
16
|
+
env.stack.push({ value: value, dispose: dispose, async: async });
|
|
17
|
+
}
|
|
18
|
+
else if (async) {
|
|
19
|
+
env.stack.push({ async: true });
|
|
20
|
+
}
|
|
21
|
+
return value;
|
|
22
|
+
};
|
|
23
|
+
var __disposeResources = (this && this.__disposeResources) || (function (SuppressedError) {
|
|
24
|
+
return function (env) {
|
|
25
|
+
function fail(e) {
|
|
26
|
+
env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
|
|
27
|
+
env.hasError = true;
|
|
28
|
+
}
|
|
29
|
+
var r, s = 0;
|
|
30
|
+
function next() {
|
|
31
|
+
while (r = env.stack.pop()) {
|
|
32
|
+
try {
|
|
33
|
+
if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next);
|
|
34
|
+
if (r.dispose) {
|
|
35
|
+
var result = r.dispose.call(r.value);
|
|
36
|
+
if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
|
|
37
|
+
}
|
|
38
|
+
else s |= 1;
|
|
39
|
+
}
|
|
40
|
+
catch (e) {
|
|
41
|
+
fail(e);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();
|
|
45
|
+
if (env.hasError) throw env.error;
|
|
46
|
+
}
|
|
47
|
+
return next();
|
|
48
|
+
};
|
|
49
|
+
})(typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
|
|
50
|
+
var e = new Error(message);
|
|
51
|
+
return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
|
|
52
|
+
});
|
|
1
53
|
import fs, { promises as fsPromises } from 'bare-fs';
|
|
2
54
|
import path from 'bare-path';
|
|
3
55
|
import Corestore from 'corestore';
|
|
4
56
|
import Hyperswarm from 'hyperswarm';
|
|
5
57
|
import Hyperdrive from 'hyperdrive';
|
|
6
58
|
import { getQvacPath } from '../../utils/qvac-paths.js';
|
|
7
|
-
import { getModelsCacheDir, generateShortHash, detectShardedModel, getShardedModelCacheDir, getShardPath, checkShardCompleteness, measureChecksum,
|
|
59
|
+
import { getModelsCacheDir, generateShortHash, detectShardedModel, getShardedModelCacheDir, getShardPath, checkShardCompleteness, measureChecksum, calculatePercentage, joinWithinBase } from '../../utils/index.js';
|
|
8
60
|
import { getModelBySrc } from '../../models/registry/index.js';
|
|
9
61
|
import { createHyperdriveDownloadKey, startOrJoinDownload, applyJoinedDownloadStats } from '../../handlers/load-model/download-manager.js';
|
|
62
|
+
import { acquireDownloadLock, partialDownloadPath, publishDownload } from '../../handlers/load-model/download-lock.js';
|
|
10
63
|
import { getConfig } from '../../runtime/state.js';
|
|
11
64
|
import { FileNotFoundError, ChecksumValidationFailedError, DownloadCancelledError, HyperdriveDownloadFailedError, ModelLoadFailedError, NoBlobFoundError } from '../../errors/index.js';
|
|
12
65
|
import { getEngineLogger } from '../../logging/index.js';
|
|
@@ -246,12 +299,13 @@ async function downloadSingleFileToFilesystem(modelPath, modelFileName, hyperdri
|
|
|
246
299
|
}
|
|
247
300
|
// Only delete corestore and partial file if user explicitly requested clearCache
|
|
248
301
|
if (signal?.aborted && shouldClearCache?.()) {
|
|
302
|
+
const partialPath = partialDownloadPath(modelPath);
|
|
249
303
|
try {
|
|
250
|
-
await fsPromises.unlink(
|
|
304
|
+
await fsPromises.unlink(partialPath);
|
|
251
305
|
}
|
|
252
306
|
catch (cleanupError) {
|
|
253
307
|
logger.debug('Failed to delete partial model file during cleanup', {
|
|
254
|
-
path:
|
|
308
|
+
path: partialPath,
|
|
255
309
|
error: cleanupError
|
|
256
310
|
});
|
|
257
311
|
}
|
|
@@ -259,7 +313,8 @@ async function downloadSingleFileToFilesystem(modelPath, modelFileName, hyperdri
|
|
|
259
313
|
}
|
|
260
314
|
}
|
|
261
315
|
}
|
|
262
|
-
|
|
316
|
+
// Exported for tests.
|
|
317
|
+
export async function downloadAndValidateFile(drive, sourceFileName, targetFilePath, expectedSize, expectedChecksum, progressContext, signal, hooks) {
|
|
263
318
|
const { entry, blobs, targetPath, blocksDownloaded, totalBlocks, totalBytes } = await validateFileExistence(drive, sourceFileName);
|
|
264
319
|
const blob = entry?.value?.blob;
|
|
265
320
|
if (!blob) {
|
|
@@ -307,13 +362,17 @@ async function downloadAndValidateFile(drive, sourceFileName, targetFilePath, ex
|
|
|
307
362
|
}
|
|
308
363
|
};
|
|
309
364
|
blobs.core.on('download', progressHandler);
|
|
365
|
+
const partialPath = partialDownloadPath(targetFilePath);
|
|
310
366
|
let readStream;
|
|
311
367
|
let writeStream;
|
|
368
|
+
let writeStreamClosed;
|
|
312
369
|
try {
|
|
313
|
-
//
|
|
370
|
+
// Stream to the partial file; it is published after the checks below.
|
|
314
371
|
drive.download(targetPath);
|
|
315
372
|
readStream = drive.createReadStream(targetPath);
|
|
316
|
-
|
|
373
|
+
const partialStream = fs.createWriteStream(partialPath);
|
|
374
|
+
writeStreamClosed = new Promise((resolve) => partialStream.once('close', resolve));
|
|
375
|
+
writeStream = partialStream;
|
|
317
376
|
readStream.pipe(writeStream);
|
|
318
377
|
await new Promise((resolve, reject) => {
|
|
319
378
|
writeStream.on('finish', resolve);
|
|
@@ -323,28 +382,31 @@ async function downloadAndValidateFile(drive, sourceFileName, targetFilePath, ex
|
|
|
323
382
|
});
|
|
324
383
|
blobs.core.off('download', progressHandler);
|
|
325
384
|
// Validate file size
|
|
326
|
-
const stats = await fsPromises.stat(
|
|
385
|
+
const stats = await fsPromises.stat(partialPath);
|
|
327
386
|
if (stats.size !== fileSizeToValidate) {
|
|
328
387
|
throw new ChecksumValidationFailedError(`${path.basename(targetFilePath)}. File size mismatch: expected ${fileSizeToValidate}, got ${stats.size}`);
|
|
329
388
|
}
|
|
330
389
|
// Validate checksum
|
|
331
390
|
if (expectedChecksum && expectedChecksum.length === 64) {
|
|
332
|
-
const checksum = await measureChecksum(
|
|
391
|
+
const checksum = await measureChecksum(partialPath, hooks);
|
|
333
392
|
if (checksum !== expectedChecksum) {
|
|
334
|
-
await fsPromises.unlink(
|
|
393
|
+
await fsPromises.unlink(partialPath);
|
|
335
394
|
throw new ChecksumValidationFailedError(`${path.basename(targetFilePath)}. Expected: ${expectedChecksum}. Actual: ${checksum}`);
|
|
336
395
|
}
|
|
337
396
|
}
|
|
338
397
|
else if (!expectedChecksum) {
|
|
339
398
|
logger.warn(`⚠️ No checksum available for validation`);
|
|
340
399
|
}
|
|
400
|
+
await publishDownload(targetFilePath);
|
|
341
401
|
}
|
|
342
402
|
catch (error) {
|
|
343
403
|
if (readStream) {
|
|
344
404
|
readStream.destroy();
|
|
345
405
|
}
|
|
346
406
|
if (writeStream) {
|
|
407
|
+
// Let an in-flight write land before the caller can release its lock.
|
|
347
408
|
writeStream.destroy();
|
|
409
|
+
await writeStreamClosed;
|
|
348
410
|
}
|
|
349
411
|
blobs.core.off('download', progressHandler);
|
|
350
412
|
throw error;
|
|
@@ -386,7 +448,6 @@ async function downloadShardedFilesToFilesystem(hyperdriveKey, firstShardFileNam
|
|
|
386
448
|
}
|
|
387
449
|
});
|
|
388
450
|
}
|
|
389
|
-
await extractTensorsFromShards(shardDir, firstShardFileName);
|
|
390
451
|
return getShardPath(hyperdriveKey, allFiles[0]);
|
|
391
452
|
}
|
|
392
453
|
logger.info(`📥 Need to download ${invalidIndices.length} of ${allFiles.length} files`);
|
|
@@ -478,7 +539,6 @@ async function downloadShardedFilesToFilesystem(hyperdriveKey, firstShardFileNam
|
|
|
478
539
|
}
|
|
479
540
|
});
|
|
480
541
|
}
|
|
481
|
-
await extractTensorsFromShards(shardDir, firstShardFileName);
|
|
482
542
|
downloadSucceeded = true;
|
|
483
543
|
}
|
|
484
544
|
catch (error) {
|
|
@@ -511,50 +571,63 @@ export async function downloadModelFromHyperdrive(hyperdriveKey, modelFileName,
|
|
|
511
571
|
const shardInfo = detectShardedModel(modelFileName);
|
|
512
572
|
const model = getModelBySrc(modelFileName, hyperdriveKey);
|
|
513
573
|
const result = startOrJoinDownload(downloadKey, async (ctx) => {
|
|
514
|
-
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
|
|
574
|
+
const env_1 = { stack: [], error: void 0, hasError: false };
|
|
575
|
+
try {
|
|
576
|
+
const _downloadLock = __addDisposableResource(env_1, await acquireDownloadLock(downloadKey, ctx.signal), true);
|
|
577
|
+
if (shardInfo.isSharded && model?.shardMetadata) {
|
|
578
|
+
const hooksWithCacheHit = {
|
|
579
|
+
...hooks,
|
|
580
|
+
markCacheHit: () => {
|
|
581
|
+
hooks?.markCacheHit?.();
|
|
582
|
+
ctx.setCacheHit(true);
|
|
583
|
+
},
|
|
584
|
+
markCacheMiss: () => {
|
|
585
|
+
hooks?.markCacheMiss?.();
|
|
586
|
+
ctx.setCacheHit(false);
|
|
587
|
+
}
|
|
588
|
+
};
|
|
589
|
+
return await downloadShardedFilesToFilesystem(hyperdriveKey, modelFileName, model.shardMetadata, ctx.broadcastProgress, seed, ctx.signal, hooksWithCacheHit, ctx.shouldClearCache);
|
|
590
|
+
}
|
|
591
|
+
// Non-sharded model download
|
|
592
|
+
const corestoreDir = getCorestoreDir(hyperdriveKey);
|
|
593
|
+
const cacheDir = getModelsCacheDir();
|
|
594
|
+
const sourceHash = generateShortHash(`${hyperdriveKey}/${modelFileName}`);
|
|
595
|
+
const modelPath = joinWithinBase(cacheDir, `${sourceHash}_${modelFileName}`);
|
|
596
|
+
// First, check if we already have a valid cached file (only if we have model metadata)
|
|
597
|
+
if (model) {
|
|
598
|
+
const cachedPath = await validateCachedFile(modelPath, modelFileName, model.expectedSize, expectedChecksum || model.sha256Checksum, hooks);
|
|
599
|
+
if (cachedPath) {
|
|
518
600
|
hooks?.markCacheHit?.();
|
|
519
601
|
ctx.setCacheHit(true);
|
|
520
|
-
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
const modelPath = joinWithinBase(cacheDir, `${sourceHash}_${modelFileName}`);
|
|
533
|
-
// First, check if we already have a valid cached file (only if we have model metadata)
|
|
534
|
-
if (model) {
|
|
535
|
-
const cachedPath = await validateCachedFile(modelPath, modelFileName, model.expectedSize, expectedChecksum || model.sha256Checksum, hooks);
|
|
536
|
-
if (cachedPath) {
|
|
537
|
-
hooks?.markCacheHit?.();
|
|
538
|
-
ctx.setCacheHit(true);
|
|
539
|
-
ctx.broadcastProgress({
|
|
540
|
-
type: 'modelProgress',
|
|
541
|
-
downloaded: model.expectedSize,
|
|
542
|
-
total: model.expectedSize,
|
|
543
|
-
percentage: 100,
|
|
544
|
-
downloadKey
|
|
545
|
-
});
|
|
546
|
-
// Delete any leftover corestore directory from previous runs (only when not seeding)
|
|
547
|
-
if (!seed) {
|
|
548
|
-
await deleteCorestoreDirectory(corestoreDir);
|
|
602
|
+
ctx.broadcastProgress({
|
|
603
|
+
type: 'modelProgress',
|
|
604
|
+
downloaded: model.expectedSize,
|
|
605
|
+
total: model.expectedSize,
|
|
606
|
+
percentage: 100,
|
|
607
|
+
downloadKey
|
|
608
|
+
});
|
|
609
|
+
// Delete any leftover corestore directory from previous runs (only when not seeding)
|
|
610
|
+
if (!seed) {
|
|
611
|
+
await deleteCorestoreDirectory(corestoreDir);
|
|
612
|
+
}
|
|
613
|
+
return cachedPath;
|
|
549
614
|
}
|
|
550
|
-
return cachedPath;
|
|
551
615
|
}
|
|
616
|
+
hooks?.markCacheMiss?.();
|
|
617
|
+
ctx.setCacheHit(false);
|
|
618
|
+
const checksumToValidate = expectedChecksum || model?.sha256Checksum || '';
|
|
619
|
+
await downloadSingleFileToFilesystem(modelPath, modelFileName, hyperdriveKey, corestoreDir, downloadKey, checksumToValidate, ctx.broadcastProgress, seed, ctx.signal, hooks, ctx.shouldClearCache);
|
|
620
|
+
return modelPath;
|
|
621
|
+
}
|
|
622
|
+
catch (e_1) {
|
|
623
|
+
env_1.error = e_1;
|
|
624
|
+
env_1.hasError = true;
|
|
625
|
+
}
|
|
626
|
+
finally {
|
|
627
|
+
const result_1 = __disposeResources(env_1);
|
|
628
|
+
if (result_1)
|
|
629
|
+
await result_1;
|
|
552
630
|
}
|
|
553
|
-
hooks?.markCacheMiss?.();
|
|
554
|
-
ctx.setCacheHit(false);
|
|
555
|
-
const checksumToValidate = expectedChecksum || model?.sha256Checksum || '';
|
|
556
|
-
await downloadSingleFileToFilesystem(modelPath, modelFileName, hyperdriveKey, corestoreDir, downloadKey, checksumToValidate, ctx.broadcastProgress, seed, ctx.signal, hooks, ctx.shouldClearCache);
|
|
557
|
-
return modelPath;
|
|
558
631
|
}, progressCallback, hooks?.requestBinding);
|
|
559
632
|
return applyJoinedDownloadStats(result, hooks);
|
|
560
633
|
}
|
|
@@ -10,6 +10,7 @@ export interface RegistryClientDownloadOptions {
|
|
|
10
10
|
total: number;
|
|
11
11
|
}) => void;
|
|
12
12
|
signal?: AbortSignal;
|
|
13
|
+
clearBlocksOnCancel?: () => boolean;
|
|
13
14
|
}
|
|
14
15
|
/**
|
|
15
16
|
* Build the options passed to @qvac/registry-client download methods from the
|
|
@@ -24,4 +25,5 @@ export declare function buildRegistryClientOptions(params: {
|
|
|
24
25
|
total: number;
|
|
25
26
|
}) => void) | undefined;
|
|
26
27
|
signal?: AbortSignal | undefined;
|
|
28
|
+
shouldClearCache?: (() => boolean) | undefined;
|
|
27
29
|
}): RegistryClientDownloadOptions;
|
|
@@ -5,7 +5,7 @@ export const DEFAULT_REGISTRY_STREAM_TIMEOUT_MS = 60_000;
|
|
|
5
5
|
* unit-tested without standing up a real registry client.
|
|
6
6
|
*/
|
|
7
7
|
export function buildRegistryClientOptions(params) {
|
|
8
|
-
const { config, outputFile, onProgress, signal } = params;
|
|
8
|
+
const { config, outputFile, onProgress, signal, shouldClearCache } = params;
|
|
9
9
|
const timeout = config.registryStreamTimeoutMs ?? DEFAULT_REGISTRY_STREAM_TIMEOUT_MS;
|
|
10
10
|
const maxRetries = config.registryDownloadMaxRetries;
|
|
11
11
|
return {
|
|
@@ -13,6 +13,8 @@ export function buildRegistryClientOptions(params) {
|
|
|
13
13
|
outputFile,
|
|
14
14
|
...(maxRetries !== undefined && { maxRetries }),
|
|
15
15
|
...(onProgress && { onProgress }),
|
|
16
|
-
...(signal && { signal: signal })
|
|
16
|
+
...(signal && { signal: signal }),
|
|
17
|
+
// Without it the client clears a cancelled download's blocks, so a pause could not resume.
|
|
18
|
+
...(shouldClearCache && { clearBlocksOnCancel: shouldClearCache })
|
|
17
19
|
};
|
|
18
20
|
}
|
|
@@ -19,4 +19,9 @@ export interface DownloadCompanionSetOptions {
|
|
|
19
19
|
* Returns the path to the primary file.
|
|
20
20
|
*/
|
|
21
21
|
export declare function downloadCompanionSetFromRegistry(options: DownloadCompanionSetOptions): Promise<string>;
|
|
22
|
+
/**
|
|
23
|
+
* Legacy cache locations the loader still accepts for a companion set, so a
|
|
24
|
+
* cache deletion removes them too.
|
|
25
|
+
*/
|
|
26
|
+
export declare function getLegacyCompanionSetPaths(companionSet: CompanionSetMetadata, allowLegacyFlatCache: boolean): string[];
|
|
22
27
|
export {};
|
|
@@ -85,7 +85,7 @@ export async function downloadCompanionSetFromRegistry(options) {
|
|
|
85
85
|
}
|
|
86
86
|
: undefined;
|
|
87
87
|
const blobBinding = file.blobCoreKey ? buildBlobBinding(file) : undefined;
|
|
88
|
-
await downloadSingleFileFromRegistry(file.registryPath, file.registrySource, filePath, file.targetName, downloadKey, file.expectedSize, file.sha256Checksum, fileProgressCallback, signal, blobBinding, hooks);
|
|
88
|
+
await downloadSingleFileFromRegistry(file.registryPath, file.registrySource, filePath, file.targetName, downloadKey, file.expectedSize, file.sha256Checksum, fileProgressCallback, signal, blobBinding, hooks, shouldClearCache);
|
|
89
89
|
overallDownloaded += file.expectedSize;
|
|
90
90
|
}
|
|
91
91
|
}
|
|
@@ -174,6 +174,24 @@ async function checkLegacyOnnxCache(primaryRegistryPath, files, hooks) {
|
|
|
174
174
|
}
|
|
175
175
|
return primaryPath;
|
|
176
176
|
}
|
|
177
|
+
/**
|
|
178
|
+
* Legacy cache locations the loader still accepts for a companion set, so a
|
|
179
|
+
* cache deletion removes them too.
|
|
180
|
+
*/
|
|
181
|
+
export function getLegacyCompanionSetPaths(companionSet, allowLegacyFlatCache) {
|
|
182
|
+
const { files, primaryKey } = companionSet;
|
|
183
|
+
if (isLegacyOnnxSet(files)) {
|
|
184
|
+
const primary = files.find((f) => f.key === primaryKey);
|
|
185
|
+
if (!primary)
|
|
186
|
+
return [];
|
|
187
|
+
return [
|
|
188
|
+
validateAndJoinPath(getModelsCacheDir(), 'onnx', generateShortHash(primary.registryPath))
|
|
189
|
+
];
|
|
190
|
+
}
|
|
191
|
+
if (!allowLegacyFlatCache)
|
|
192
|
+
return [];
|
|
193
|
+
return files.map((file) => getSingleFileCachePath(file.registryPath));
|
|
194
|
+
}
|
|
177
195
|
function getLegacyOnnxPath(cacheKey, filename) {
|
|
178
196
|
const baseCache = getModelsCacheDir();
|
|
179
197
|
return validateAndJoinPath(baseCache, 'onnx', cacheKey, filename);
|
|
@@ -0,0 +1,269 @@
|
|
|
1
|
+
var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
|
|
2
|
+
if (value !== null && value !== void 0) {
|
|
3
|
+
if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
|
|
4
|
+
var dispose, inner;
|
|
5
|
+
if (async) {
|
|
6
|
+
if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
|
|
7
|
+
dispose = value[Symbol.asyncDispose];
|
|
8
|
+
}
|
|
9
|
+
if (dispose === void 0) {
|
|
10
|
+
if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
|
|
11
|
+
dispose = value[Symbol.dispose];
|
|
12
|
+
if (async) inner = dispose;
|
|
13
|
+
}
|
|
14
|
+
if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
|
|
15
|
+
if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } };
|
|
16
|
+
env.stack.push({ value: value, dispose: dispose, async: async });
|
|
17
|
+
}
|
|
18
|
+
else if (async) {
|
|
19
|
+
env.stack.push({ async: true });
|
|
20
|
+
}
|
|
21
|
+
return value;
|
|
22
|
+
};
|
|
23
|
+
var __disposeResources = (this && this.__disposeResources) || (function (SuppressedError) {
|
|
24
|
+
return function (env) {
|
|
25
|
+
function fail(e) {
|
|
26
|
+
env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
|
|
27
|
+
env.hasError = true;
|
|
28
|
+
}
|
|
29
|
+
var r, s = 0;
|
|
30
|
+
function next() {
|
|
31
|
+
while (r = env.stack.pop()) {
|
|
32
|
+
try {
|
|
33
|
+
if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next);
|
|
34
|
+
if (r.dispose) {
|
|
35
|
+
var result = r.dispose.call(r.value);
|
|
36
|
+
if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
|
|
37
|
+
}
|
|
38
|
+
else s |= 1;
|
|
39
|
+
}
|
|
40
|
+
catch (e) {
|
|
41
|
+
fail(e);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();
|
|
45
|
+
if (env.hasError) throw env.error;
|
|
46
|
+
}
|
|
47
|
+
return next();
|
|
48
|
+
};
|
|
49
|
+
})(typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
|
|
50
|
+
var e = new Error(message);
|
|
51
|
+
return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
|
|
52
|
+
});
|
|
53
|
+
import { promises as fsPromises } from 'bare-fs';
|
|
54
|
+
import { getModelByPath, models } from '../../models/registry/index.js';
|
|
55
|
+
import { registryUrlSchema } from '../../schemas/load-model.js';
|
|
56
|
+
import { acquireRegistryClient } from '../../runtime/registry-client.js';
|
|
57
|
+
import { getAllModelIds, getModelEntry } from '../../runtime/model-registry.js';
|
|
58
|
+
import { getRuntimeContext } from '../../runtime/state.js';
|
|
59
|
+
import { detectShardedModel, generateShortHash } from '../../utils/index.js';
|
|
60
|
+
import { validateAndJoinPath } from '../../utils/path-security.js';
|
|
61
|
+
import { getClearStorageTarget, getCompanionSetCacheDir, getModelsCacheDir, getShardedModelCacheDir, getSingleFileCachePath } from '../../utils/cache/paths.js';
|
|
62
|
+
import { buildBlobBinding } from '../../handlers/load-model/registry-download-utils.js';
|
|
63
|
+
import { holdsDownloadLockHere, partialDownloadPath, tryAcquireDownloadLocks, waitForDownloadLocksHere } from '../../handlers/load-model/download-lock.js';
|
|
64
|
+
import { getLegacyCompanionSetPaths } from '../../handlers/load-model/registry-companion-set.js';
|
|
65
|
+
import { findLocallyCachedCoremlCompanionSet, getCoremlSetKey, getCoremlSidecarSpec } from '../../handlers/load-model/coreml-sidecars.js';
|
|
66
|
+
import { findModelShards } from '../../handlers/load-model/registry.js';
|
|
67
|
+
import { createRegistryCacheKey, hasActiveTransfer, withDownloadBlocked } from '../../handlers/load-model/download-manager.js';
|
|
68
|
+
import { DeleteCacheFailedError, InvalidDeleteCacheParamsError } from '../../errors/index.js';
|
|
69
|
+
import { getEngineLogger } from '../../logging/index.js';
|
|
70
|
+
const logger = getEngineLogger();
|
|
71
|
+
// How long a deletion waits for a download this process cancelled to finish its cleanup.
|
|
72
|
+
const CANCELLED_DOWNLOAD_STOP_MS = 10_000;
|
|
73
|
+
/**
|
|
74
|
+
* Deletes a registry model's cached files and the corestore blocks a cancelled
|
|
75
|
+
* or failed download kept for resume.
|
|
76
|
+
*/
|
|
77
|
+
export async function deleteRegistryModelCache(modelSrc) {
|
|
78
|
+
const parsed = registryUrlSchema.safeParse(modelSrc);
|
|
79
|
+
if (!parsed.success)
|
|
80
|
+
throw new InvalidDeleteCacheParamsError();
|
|
81
|
+
const { registryPath, registrySource } = parsed.data;
|
|
82
|
+
const cacheKey = createRegistryCacheKey(registryPath);
|
|
83
|
+
assertNotDownloading(modelSrc, [cacheKey]);
|
|
84
|
+
// Downloads and loads of this path, from any source, are refused until the files are gone.
|
|
85
|
+
await withDownloadBlocked([cacheKey], async () => {
|
|
86
|
+
const env_1 = { stack: [], error: void 0, hasError: false };
|
|
87
|
+
try {
|
|
88
|
+
const _lock = __addDisposableResource(env_1, await lockOutOtherProcesses(modelSrc, [cacheKey]), true);
|
|
89
|
+
const entry = getModelByPath(registryPath);
|
|
90
|
+
const catalogued = entry?.registrySource === registrySource ? entry : undefined;
|
|
91
|
+
const plan = catalogued
|
|
92
|
+
? await planCatalogued(catalogued)
|
|
93
|
+
: await planUncatalogued(registryPath, registrySource);
|
|
94
|
+
// Companion files are shared: clearing one would erase another model's download.
|
|
95
|
+
const sharedKeys = getModelsSharingFiles(plan.registryPaths)
|
|
96
|
+
.map(createRegistryCacheKey)
|
|
97
|
+
.filter((key) => key !== cacheKey);
|
|
98
|
+
assertNotDownloading(modelSrc, sharedKeys);
|
|
99
|
+
await withDownloadBlocked(sharedKeys, async () => {
|
|
100
|
+
const env_2 = { stack: [], error: void 0, hasError: false };
|
|
101
|
+
try {
|
|
102
|
+
const _sharedLock = __addDisposableResource(env_2, await lockOutOtherProcesses(modelSrc, sharedKeys), true);
|
|
103
|
+
assertNotLoaded(modelSrc, plan.targets);
|
|
104
|
+
if (plan.bindings.length > 0) {
|
|
105
|
+
const env_3 = { stack: [], error: void 0, hasError: false };
|
|
106
|
+
try {
|
|
107
|
+
const lease = __addDisposableResource(env_3, await acquireRegistryClient({ wait: 'query' }), true);
|
|
108
|
+
for (const binding of plan.bindings)
|
|
109
|
+
await lease.client.clearBlob(binding);
|
|
110
|
+
}
|
|
111
|
+
catch (e_2) {
|
|
112
|
+
env_3.error = e_2;
|
|
113
|
+
env_3.hasError = true;
|
|
114
|
+
}
|
|
115
|
+
finally {
|
|
116
|
+
const result_2 = __disposeResources(env_3);
|
|
117
|
+
if (result_2)
|
|
118
|
+
await result_2;
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
assertNotLoaded(modelSrc, plan.targets);
|
|
122
|
+
for (const target of plan.targets) {
|
|
123
|
+
await fsPromises.rm(target, { recursive: true, force: true });
|
|
124
|
+
// A paused download's partial file.
|
|
125
|
+
await fsPromises.rm(partialDownloadPath(target), { force: true });
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
catch (e_3) {
|
|
129
|
+
env_2.error = e_3;
|
|
130
|
+
env_2.hasError = true;
|
|
131
|
+
}
|
|
132
|
+
finally {
|
|
133
|
+
const result_3 = __disposeResources(env_2);
|
|
134
|
+
if (result_3)
|
|
135
|
+
await result_3;
|
|
136
|
+
}
|
|
137
|
+
});
|
|
138
|
+
}
|
|
139
|
+
catch (e_1) {
|
|
140
|
+
env_1.error = e_1;
|
|
141
|
+
env_1.hasError = true;
|
|
142
|
+
}
|
|
143
|
+
finally {
|
|
144
|
+
const result_1 = __disposeResources(env_1);
|
|
145
|
+
if (result_1)
|
|
146
|
+
await result_1;
|
|
147
|
+
}
|
|
148
|
+
});
|
|
149
|
+
logger.info(`🗑️ Deleted registry model cache: ${modelSrc}`);
|
|
150
|
+
}
|
|
151
|
+
function assertNotDownloading(modelSrc, cacheKeys) {
|
|
152
|
+
if (cacheKeys.some(hasActiveTransfer)) {
|
|
153
|
+
throw new DeleteCacheFailedError(`${modelSrc} is downloading; cancel it first`);
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
// Other processes' downloads hold their locks; holding them blocks new ones mid-delete.
|
|
157
|
+
// A download this process cancelled keeps its lock until its cleanup ends, so wait for it.
|
|
158
|
+
async function lockOutOtherProcesses(modelSrc, cacheKeys) {
|
|
159
|
+
const deadline = Date.now() + CANCELLED_DOWNLOAD_STOP_MS;
|
|
160
|
+
for (;;) {
|
|
161
|
+
if (!(await waitForDownloadLocksHere(cacheKeys, deadline - Date.now()))) {
|
|
162
|
+
throw new DeleteCacheFailedError(`A cancelled download of ${modelSrc} is still stopping; try again shortly`);
|
|
163
|
+
}
|
|
164
|
+
const lock = await tryAcquireDownloadLocks(cacheKeys);
|
|
165
|
+
if (lock)
|
|
166
|
+
return lock;
|
|
167
|
+
if (!holdsDownloadLockHere(cacheKeys)) {
|
|
168
|
+
throw new DeleteCacheFailedError(`${modelSrc} is downloading in another process; try again once it finishes`);
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
// Every catalogued model whose own download writes one of these registry paths.
|
|
173
|
+
function getModelsSharingFiles(registryPaths) {
|
|
174
|
+
const paths = new Set(registryPaths);
|
|
175
|
+
const sharing = new Set(registryPaths);
|
|
176
|
+
for (const model of models) {
|
|
177
|
+
const files = [
|
|
178
|
+
model.registryPath,
|
|
179
|
+
...(model.companionSet?.files ?? []).map((f) => f.registryPath)
|
|
180
|
+
];
|
|
181
|
+
if (files.some((file) => paths.has(file)))
|
|
182
|
+
sharing.add(model.registryPath);
|
|
183
|
+
}
|
|
184
|
+
return [...sharing];
|
|
185
|
+
}
|
|
186
|
+
function assertNotLoaded(modelSrc, targets) {
|
|
187
|
+
for (const id of getAllModelIds()) {
|
|
188
|
+
const loadedPath = getModelEntry(id)?.local.path;
|
|
189
|
+
if (loadedPath && targets.some((target) => loadedPath.startsWith(target))) {
|
|
190
|
+
throw new DeleteCacheFailedError(`${modelSrc} is loaded; unload it with clearStorage instead`);
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
// Mirrors the layouts downloadModelFromRegistry reads, including legacy ones.
|
|
195
|
+
async function planCatalogued(entry) {
|
|
196
|
+
if (entry.shardMetadata?.length) {
|
|
197
|
+
return {
|
|
198
|
+
targets: [getShardedModelCacheDir(generateShortHash(entry.registryPath))],
|
|
199
|
+
bindings: entry.shardMetadata.map(buildBlobBinding),
|
|
200
|
+
registryPaths: [entry.registryPath]
|
|
201
|
+
};
|
|
202
|
+
}
|
|
203
|
+
if (entry.companionSet) {
|
|
204
|
+
return {
|
|
205
|
+
targets: [
|
|
206
|
+
getCompanionSetCacheDir(entry.companionSet.setKey),
|
|
207
|
+
...getLegacyCompanionSetPaths(entry.companionSet, entry.addon === 'nmt')
|
|
208
|
+
],
|
|
209
|
+
bindings: entry.companionSet.files.map(buildBlobBinding),
|
|
210
|
+
registryPaths: entry.companionSet.files.map((file) => file.registryPath)
|
|
211
|
+
};
|
|
212
|
+
}
|
|
213
|
+
const plan = {
|
|
214
|
+
targets: [getClearStorageTarget(getSingleFileCachePath(entry.registryPath)).path],
|
|
215
|
+
bindings: [buildBlobBinding(entry)],
|
|
216
|
+
registryPaths: [entry.registryPath]
|
|
217
|
+
};
|
|
218
|
+
const platform = getRuntimeContext().platform;
|
|
219
|
+
const spec = getCoremlSidecarSpec(entry.registryPath, entry.registrySource, platform);
|
|
220
|
+
if (spec) {
|
|
221
|
+
plan.targets.push(validateAndJoinPath(getModelsCacheDir(), 'sets', getCoremlSetKey(entry, spec)));
|
|
222
|
+
const coremlSet = await findLocallyCachedCoremlCompanionSet(entry, platform);
|
|
223
|
+
for (const file of coremlSet?.files ?? []) {
|
|
224
|
+
if (file.registryPath === entry.registryPath)
|
|
225
|
+
continue;
|
|
226
|
+
plan.bindings.push(buildBlobBinding(file));
|
|
227
|
+
plan.registryPaths.push(file.registryPath);
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
return plan;
|
|
231
|
+
}
|
|
232
|
+
async function planUncatalogued(registryPath, registrySource) {
|
|
233
|
+
const filename = registryPath.split('/').pop() || registryPath;
|
|
234
|
+
if (detectShardedModel(filename).isSharded) {
|
|
235
|
+
// The lookup matches by prefix, so it can return other models' shards.
|
|
236
|
+
const family = shardFamily(registryPath);
|
|
237
|
+
const shards = (await findModelShards(registryPath, undefined, 'query')).filter((shard) => shard.source === registrySource && shardFamily(shard.path) === family);
|
|
238
|
+
return {
|
|
239
|
+
targets: [getShardedModelCacheDir(generateShortHash(registryPath))],
|
|
240
|
+
bindings: shards.flatMap((shard) => (shard.blobBinding ? [shard.blobBinding] : [])),
|
|
241
|
+
registryPaths: [registryPath]
|
|
242
|
+
};
|
|
243
|
+
}
|
|
244
|
+
let model;
|
|
245
|
+
{
|
|
246
|
+
const env_4 = { stack: [], error: void 0, hasError: false };
|
|
247
|
+
try {
|
|
248
|
+
const lease = __addDisposableResource(env_4, await acquireRegistryClient({ wait: 'query' }), true);
|
|
249
|
+
model = await lease.client.getModel(registryPath, registrySource);
|
|
250
|
+
}
|
|
251
|
+
catch (e_4) {
|
|
252
|
+
env_4.error = e_4;
|
|
253
|
+
env_4.hasError = true;
|
|
254
|
+
}
|
|
255
|
+
finally {
|
|
256
|
+
const result_4 = __disposeResources(env_4);
|
|
257
|
+
if (result_4)
|
|
258
|
+
await result_4;
|
|
259
|
+
}
|
|
260
|
+
}
|
|
261
|
+
return {
|
|
262
|
+
targets: [getClearStorageTarget(getSingleFileCachePath(registryPath)).path],
|
|
263
|
+
bindings: model?.blobBinding ? [model.blobBinding] : [],
|
|
264
|
+
registryPaths: [registryPath]
|
|
265
|
+
};
|
|
266
|
+
}
|
|
267
|
+
function shardFamily(registryPath) {
|
|
268
|
+
return registryPath.replace(/-\d{5}-of-\d{5}\./, '.');
|
|
269
|
+
}
|
|
@@ -13,12 +13,14 @@ export declare function buildBlobBinding(meta: {
|
|
|
13
13
|
sha256Checksum: string;
|
|
14
14
|
}): QVACBlobBinding;
|
|
15
15
|
/**
|
|
16
|
-
* Validate a cached file against expected size and checksum.
|
|
16
|
+
* Validate a cached file against expected size and checksum. Never deletes: a
|
|
17
|
+
* mismatched file may be an older SDK's download in progress.
|
|
17
18
|
*/
|
|
18
19
|
export declare function validateCachedFile(modelPath: string, modelFileName: string, expectedSize: number, expectedChecksum?: string, hooks?: DownloadHooks): Promise<string | null>;
|
|
19
20
|
/**
|
|
20
21
|
* Download a single file from the registry to filesystem.
|
|
21
22
|
* When blobBinding is provided, uses direct blob download (skips metadata sync).
|
|
22
23
|
* Otherwise falls back to metadata-based downloadModel.
|
|
24
|
+
* Publishes to `modelPath` only after the checks pass. Callers hold the lock.
|
|
23
25
|
*/
|
|
24
|
-
export declare function downloadSingleFileFromRegistry(registryPath: string, registrySource: string, modelPath: string, modelFileName: string, downloadKey: string, expectedSize: number, expectedChecksum: string, progressCallback?: (progress: ModelProgressUpdate) => void, signal?: AbortSignal, blobBinding?: QVACBlobBinding, hooks?: DownloadHooks): Promise<void>;
|
|
26
|
+
export declare function downloadSingleFileFromRegistry(registryPath: string, registrySource: string, modelPath: string, modelFileName: string, downloadKey: string, expectedSize: number, expectedChecksum: string, progressCallback?: (progress: ModelProgressUpdate) => void, signal?: AbortSignal, blobBinding?: QVACBlobBinding, hooks?: DownloadHooks, shouldClearCache?: () => boolean): Promise<void>;
|