@qvac/inference 0.22.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 +111 -60
- package/README.md +4 -2
- 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 +136 -45
- 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 +2 -1
- package/dist/api/completion-stream.js +4 -1
- package/dist/api/decide.js +1 -1
- package/dist/api/delete-cache.d.ts +7 -1
- package/dist/api/delete-cache.js +11 -1
- package/dist/api/diffusion.d.ts +32 -2
- package/dist/api/diffusion.js +32 -2
- package/dist/api/download-asset.js +1 -1
- package/dist/api/embed.d.ts +82 -29
- package/dist/api/embed.js +64 -18
- package/dist/api/finetune.js +1 -1
- package/dist/api/get-model-info.d.ts +1 -1
- package/dist/api/index.d.ts +40 -38
- package/dist/api/index.js +39 -37
- package/dist/api/load-model.js +2 -2
- package/dist/api/logging-stream-registry.js +11 -7
- package/dist/api/logging-stream.d.ts +11 -1
- package/dist/api/logging-stream.js +11 -2
- package/dist/api/rag.d.ts +1 -1
- package/dist/api/rag.js +1 -1
- package/dist/api/registry.d.ts +18 -7
- package/dist/api/registry.js +37 -13
- package/dist/api/rerank.d.ts +17 -0
- package/dist/api/rerank.js +36 -0
- package/dist/api/subscribe-logs.js +5 -3
- 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/unload-model.js +1 -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/api/video.js +1 -1
- package/dist/api/vla.js +1 -1
- package/dist/api/world-result.js +1 -1
- package/dist/api/world.d.ts +1 -1
- package/dist/api/world.js +1 -1
- package/dist/config/resolve-config.d.ts +1 -1
- package/dist/config/resolve-config.js +1 -1
- package/dist/constants/index.d.ts +2 -2
- package/dist/constants/index.js +2 -2
- package/dist/dispatch.d.ts +11 -4
- package/dist/dispatch.js +80 -18
- package/dist/engine.d.ts +1 -1
- package/dist/errors/index.d.ts +76 -0
- package/dist/errors/index.js +141 -1
- 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 +18 -14
- package/dist/handlers/completion-orchestrate.d.ts +14 -2
- package/dist/handlers/completion-orchestrate.js +166 -24
- package/dist/handlers/delete-cache.d.ts +2 -1
- package/dist/handlers/delete-cache.js +6 -1
- package/dist/handlers/download-asset.js +13 -6
- package/dist/handlers/finetune.js +1 -1
- package/dist/handlers/get-loaded-model-info.js +3 -3
- package/dist/handlers/get-model-info.js +72 -3
- package/dist/handlers/load-model/coreml-sidecars.d.ts +15 -11
- package/dist/handlers/load-model/coreml-sidecars.js +51 -91
- 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 +11 -3
- package/dist/handlers/load-model/download-manager.js +62 -11
- package/dist/handlers/load-model/download-stats.d.ts +2 -2
- package/dist/handlers/load-model/download-stats.js +3 -3
- package/dist/handlers/load-model/handler.js +97 -41
- package/dist/handlers/load-model/http-verify.d.ts +1 -1
- package/dist/handlers/load-model/http.d.ts +1 -1
- package/dist/handlers/load-model/http.js +330 -208
- package/dist/handlers/load-model/hyperdrive.d.ts +16 -1
- package/dist/handlers/load-model/hyperdrive.js +125 -52
- package/dist/handlers/load-model/index.d.ts +2 -2
- package/dist/handlers/load-model/index.js +2 -2
- 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 +6 -1
- package/dist/handlers/load-model/registry-companion-set.js +20 -2
- 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 +7 -5
- package/dist/handlers/load-model/registry-download-utils.js +95 -24
- package/dist/handlers/load-model/registry.d.ts +22 -2
- package/dist/handlers/load-model/registry.js +312 -179
- package/dist/handlers/load-model/resolve-session.d.ts +1 -1
- package/dist/handlers/load-model/resolve-session.js +11 -3
- package/dist/handlers/load-model/resolve.d.ts +1 -1
- package/dist/handlers/load-model/resolve.js +9 -6
- package/dist/handlers/load-model/types.d.ts +2 -0
- package/dist/handlers/logging-stream.d.ts +2 -1
- package/dist/handlers/logging-stream.js +35 -7
- package/dist/handlers/plugin-invoke.js +152 -39
- package/dist/handlers/registry.d.ts +2 -2
- package/dist/handlers/registry.js +108 -29
- 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/types.d.ts +7 -1
- 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/addon.d.ts +1 -1
- package/dist/logging/addon.js +1 -1
- package/dist/logging/index.d.ts +5 -5
- package/dist/logging/index.js +4 -4
- package/dist/logging/logger.d.ts +1 -1
- package/dist/logging/logger.js +3 -3
- package/dist/logging/utils.js +11 -3
- package/dist/model-cache-layout.d.ts +1 -0
- package/dist/model-cache-layout.js +2 -0
- package/dist/model-fit/assess.d.ts +23 -0
- package/dist/model-fit/assess.js +110 -0
- package/dist/model-fit/describe.d.ts +12 -0
- package/dist/model-fit/describe.js +29 -0
- package/dist/{resources/model-fit/fit-stub/fetch-fit-stub.d.ts → model-fit/description/fetch.d.ts} +2 -2
- package/dist/{resources/model-fit/fit-stub/fetch-fit-stub.js → model-fit/description/fetch.js} +98 -19
- package/dist/{resources/model-fit/fit-stub/resolve-load-from-stubs.d.ts → model-fit/description/resolve-load.d.ts} +8 -6
- package/dist/{resources/model-fit/fit-stub/resolve-load-from-stubs.js → model-fit/description/resolve-load.js} +20 -20
- 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 +34 -0
- package/dist/model-fit/load-check.js +77 -0
- package/dist/model-fit/run/engine.d.ts +12 -0
- package/dist/model-fit/run/engine.js +9 -0
- package/dist/model-fit/run/run.d.ts +46 -0
- package/dist/model-fit/run/run.js +208 -0
- package/dist/model-fit/sum.d.ts +32 -0
- package/dist/model-fit/sum.js +60 -0
- package/dist/models/registry/index.d.ts +1 -1
- package/dist/models/registry/index.js +2 -2
- package/dist/models/registry/models.d.ts +1377 -130
- package/dist/models/registry/models.js +3622 -2312
- 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/plugins/builtin/asr-ggml/fit.js +118 -0
- 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/{resources/model-fit/native-probe/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 +4 -3
- 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 +4 -3
- package/dist/plugins/builtin/audiogen-ggml/ops/audio-understand.d.ts +3 -1
- package/dist/plugins/builtin/audiogen-ggml/ops/audio-understand.js +4 -3
- package/dist/plugins/builtin/audiogen-ggml/plugin.d.ts +203 -72
- package/dist/plugins/builtin/audiogen-ggml/plugin.js +17 -5
- 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 +71 -29
- package/dist/plugins/builtin/bci-whispercpp-transcription/plugin.js +12 -10
- package/dist/plugins/builtin/ggml-classification/plugin.d.ts +8 -5
- package/dist/plugins/builtin/ggml-classification/plugin.js +89 -9
- 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 +20 -13
- package/dist/plugins/builtin/ggml-ocr/plugin.js +111 -25
- 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 +15 -15
- package/dist/plugins/builtin/ggml-vla/plugin.js +3 -3
- package/dist/plugins/builtin/index.d.ts +16 -14
- package/dist/plugins/builtin/index.js +16 -14
- 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 +6 -8
- 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 +3 -1
- package/dist/plugins/builtin/llamacpp-completion/ops/completion-stats.js +6 -0
- package/dist/plugins/builtin/llamacpp-completion/ops/completion-stream.d.ts +18 -3
- package/dist/plugins/builtin/llamacpp-completion/ops/completion-stream.js +94 -21
- 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/ops/kv-cache-session.d.ts +5 -3
- package/dist/plugins/builtin/llamacpp-completion/ops/kv-cache-session.js +9 -7
- package/dist/plugins/builtin/llamacpp-completion/plugin.d.ts +315 -95
- package/dist/plugins/builtin/llamacpp-completion/plugin.js +51 -25
- package/dist/plugins/builtin/llamacpp-completion/transform.js +4 -0
- package/dist/plugins/builtin/llamacpp-decision/helpers.d.ts +0 -1
- package/dist/plugins/builtin/llamacpp-decision/helpers.js +7 -15
- package/dist/plugins/builtin/llamacpp-decision/ops/decide.d.ts +3 -1
- package/dist/plugins/builtin/llamacpp-decision/ops/decide.js +6 -3
- package/dist/plugins/builtin/llamacpp-decision/plugin.d.ts +43 -35
- package/dist/plugins/builtin/llamacpp-decision/plugin.js +4 -3
- 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 +201 -10
- package/dist/plugins/builtin/llamacpp-embedding/plugin.js +52 -16
- package/dist/plugins/builtin/llamacpp-embedding/transform.d.ts +2 -2
- package/dist/plugins/builtin/llamacpp-embedding/transform.js +29 -2
- package/dist/plugins/builtin/llamacpp-rerank/helpers.d.ts +3 -0
- package/dist/plugins/builtin/llamacpp-rerank/helpers.js +16 -0
- package/dist/plugins/builtin/llamacpp-rerank/ops/rerank.d.ts +7 -0
- package/dist/plugins/builtin/llamacpp-rerank/ops/rerank.js +120 -0
- package/dist/plugins/builtin/llamacpp-rerank/plugin.d.ts +92 -0
- package/dist/plugins/builtin/llamacpp-rerank/plugin.js +44 -0
- package/dist/plugins/builtin/moss-transcribe/plugin.d.ts +46 -19
- package/dist/plugins/builtin/moss-transcribe/plugin.js +9 -7
- 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 +32 -18
- package/dist/plugins/builtin/nmtcpp-translation/plugin.js +8 -6
- package/dist/plugins/builtin/parakeet-transcription/plugin.d.ts +234 -38
- package/dist/plugins/builtin/parakeet-transcription/plugin.js +42 -16
- 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 +8 -2
- package/dist/plugins/builtin/sdcpp-generation/ops/diffusion.js +174 -53
- 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 +7 -2
- package/dist/plugins/builtin/sdcpp-generation/ops/video.js +23 -9
- package/dist/plugins/builtin/sdcpp-generation/ops/world.d.ts +6 -4
- package/dist/plugins/builtin/sdcpp-generation/ops/world.js +8 -3
- package/dist/plugins/builtin/sdcpp-generation/plugin.d.ts +166 -47
- package/dist/plugins/builtin/sdcpp-generation/plugin.js +67 -155
- package/dist/plugins/builtin/sdcpp-generation/upscaler-config.d.ts +15 -0
- package/dist/plugins/builtin/sdcpp-generation/upscaler-config.js +19 -0
- package/dist/plugins/builtin/sdcpp-generation/world-config.d.ts +8 -0
- package/dist/plugins/builtin/sdcpp-generation/world-config.js +9 -0
- 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 +3 -2
- package/dist/plugins/builtin/tts-ggml/ops/text-to-speech-stream.js +24 -11
- 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 +53 -18
- 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 +415 -57
- package/dist/plugins/builtin/tts-ggml/plugin.js +183 -34
- package/dist/plugins/builtin/whispercpp-transcription/plugin.d.ts +104 -40
- package/dist/plugins/builtin/whispercpp-transcription/plugin.js +12 -10
- package/dist/plugins/index.d.ts +1 -1
- package/dist/plugins/index.js +2 -2
- 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 +5 -3
- package/dist/plugins/ops/kv-cache-utils.js +21 -10
- package/dist/plugins/ops/load-model.d.ts +10 -2
- package/dist/plugins/ops/load-model.js +45 -19
- package/dist/plugins/ops/transcribe.d.ts +5 -4
- package/dist/plugins/ops/transcribe.js +63 -28
- package/dist/plugins/ops/translate.d.ts +2 -1
- package/dist/plugins/ops/translate.js +7 -4
- package/dist/plugins/ops/unload-model.d.ts +17 -1
- package/dist/plugins/ops/unload-model.js +32 -3
- package/dist/plugins/turbovec-backend.d.ts +1 -1
- package/dist/plugins/turbovec-backend.js +21 -6
- package/dist/profiling/aggregator.d.ts +1 -1
- package/dist/profiling/aggregator.js +1 -1
- package/dist/profiling/controller.d.ts +1 -1
- package/dist/profiling/controller.js +2 -2
- package/dist/profiling/events.d.ts +1 -1
- package/dist/profiling/events.js +2 -2
- package/dist/profiling/exporters.d.ts +1 -1
- package/dist/profiling/exporters.js +3 -3
- package/dist/profiling/index.d.ts +13 -13
- package/dist/profiling/index.js +12 -12
- package/dist/profiling/operation-metrics.d.ts +1 -1
- package/dist/profiling/operation-metrics.js +24 -21
- package/dist/profiling/operation-wrappers.js +3 -3
- package/dist/profiling/profiler.js +1 -1
- 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 +51 -17
- package/dist/rag/handlers/close-workspace.js +1 -1
- package/dist/rag/handlers/delete-embeddings.js +1 -1
- package/dist/rag/handlers/delete-workspace.js +1 -1
- package/dist/rag/handlers/ingest.js +3 -7
- package/dist/rag/handlers/list-workspaces.d.ts +1 -1
- package/dist/rag/handlers/list-workspaces.js +1 -1
- package/dist/rag/handlers/reindex.js +1 -1
- package/dist/rag/handlers/save-embeddings.js +1 -1
- package/dist/rag/handlers/search.d.ts +10 -1
- package/dist/rag/handlers/search.js +17 -8
- package/dist/rag/index.d.ts +11 -11
- package/dist/rag/index.js +11 -11
- package/dist/rag/rag-operation-manager.d.ts +27 -3
- package/dist/rag/rag-operation-manager.js +10 -27
- package/dist/rag/rag-workspace-manager.js +1 -1
- package/dist/registry.js +7 -1
- package/dist/resources/collector.d.ts +71 -37
- package/dist/resources/collector.js +9 -2
- package/dist/resources/instance.d.ts +1 -1
- package/dist/resources/instance.js +1 -1
- package/dist/resources/native.d.ts +1 -1
- package/dist/resources/normalize.d.ts +1 -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 +8 -5
- package/dist/runtime/index.js +4 -2
- package/dist/runtime/lifecycle.d.ts +6 -4
- package/dist/runtime/lifecycle.js +16 -12
- package/dist/runtime/model-config-utils.js +8 -1
- package/dist/runtime/model-registry.d.ts +30 -4
- package/dist/runtime/model-registry.js +48 -2
- 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 +11 -3
- package/dist/runtime/request-context.js +39 -2
- package/dist/runtime/request-registry.d.ts +56 -8
- package/dist/runtime/request-registry.js +190 -72
- 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/state.d.ts +1 -1
- package/dist/runtime/state.js +2 -2
- package/dist/runtime/vector-index-backend.d.ts +6 -2
- package/dist/runtime/vector-index-registry.d.ts +26 -5
- package/dist/runtime/vector-index-registry.js +88 -27
- package/dist/schemas/abort-signal.d.ts +8 -0
- package/dist/schemas/assess-model-fit.d.ts +138 -282
- package/dist/schemas/assess-model-fit.js +85 -219
- package/dist/schemas/audio-gen.d.ts +291 -25
- package/dist/schemas/audio-gen.js +130 -26
- package/dist/schemas/batch-completion-stream.d.ts +113 -15
- package/dist/schemas/batch-completion-stream.js +10 -6
- package/dist/schemas/bci-config.d.ts +3 -1
- package/dist/schemas/bci-config.js +2 -2
- package/dist/schemas/bci.d.ts +55 -4
- package/dist/schemas/bci.js +13 -18
- package/dist/schemas/calc-tokens.d.ts +141 -0
- package/dist/schemas/calc-tokens.js +53 -0
- package/dist/schemas/cancel.d.ts +31 -0
- package/dist/schemas/cancel.js +11 -2
- package/dist/schemas/classification.d.ts +3 -0
- package/dist/schemas/classification.js +6 -2
- package/dist/schemas/common.d.ts +2209 -348
- package/dist/schemas/common.js +52 -33
- package/dist/schemas/completion-event.d.ts +11 -2
- package/dist/schemas/completion-event.js +5 -2
- package/dist/schemas/completion-stream.d.ts +173 -19
- package/dist/schemas/completion-stream.js +117 -20
- package/dist/schemas/config.d.ts +2064 -178
- package/dist/schemas/config.js +21 -23
- package/dist/schemas/decision.d.ts +12 -2
- package/dist/schemas/decision.js +16 -1
- package/dist/schemas/download-asset.d.ts +13 -6
- package/dist/schemas/download-asset.js +4 -7
- package/dist/schemas/embed.d.ts +286 -3
- package/dist/schemas/embed.js +162 -16
- package/dist/schemas/engine-addon-map.d.ts +3 -1
- package/dist/schemas/engine-addon-map.js +5 -3
- package/dist/schemas/errors.d.ts +13 -0
- package/dist/schemas/errors.js +71 -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 +55 -50
- package/dist/schemas/index.js +54 -49
- package/dist/schemas/lifecycle.d.ts +3 -0
- package/dist/schemas/lifecycle.js +13 -6
- package/dist/schemas/llamacpp-config.d.ts +443 -20
- package/dist/schemas/llamacpp-config.js +188 -14
- package/dist/schemas/load-model.d.ts +8940 -1952
- package/dist/schemas/load-model.js +73 -9
- package/dist/schemas/logging-stream.d.ts +1 -0
- package/dist/schemas/logging-stream.js +5 -2
- package/dist/schemas/mcp-adapter.d.ts +1 -1
- package/dist/schemas/model-config-schemas.d.ts +731 -111
- package/dist/schemas/model-config-schemas.js +16 -12
- 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 +18 -7
- 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 +14 -6
- package/dist/schemas/model-src-utils.js +2 -2
- package/dist/schemas/model-types.d.ts +12 -4
- package/dist/schemas/model-types.js +2 -0
- package/dist/schemas/ocr.d.ts +11 -4
- package/dist/schemas/ocr.js +7 -3
- package/dist/schemas/plugin.d.ts +70 -8
- package/dist/schemas/plugin.js +32 -4
- package/dist/schemas/profiling.d.ts +32 -32
- package/dist/schemas/profiling.js +1 -1
- package/dist/schemas/rag.d.ts +9 -0
- package/dist/schemas/rag.js +11 -17
- package/dist/schemas/registry.d.ts +38 -10
- package/dist/schemas/registry.js +16 -7
- package/dist/schemas/reload-config.d.ts +45 -6
- package/dist/schemas/reload-config.js +13 -6
- package/dist/schemas/request-base.d.ts +39 -0
- package/dist/schemas/request-base.js +64 -0
- package/dist/schemas/rerank.d.ts +132 -0
- package/dist/schemas/rerank.js +104 -0
- package/dist/schemas/rpc-server.d.ts +3 -0
- package/dist/schemas/rpc-server.js +15 -15
- package/dist/schemas/sdcpp-config.d.ts +144 -18
- package/dist/schemas/sdcpp-config.js +123 -28
- 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 +1408 -275
- 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 +267 -2
- package/dist/schemas/transcription-config.js +138 -7
- package/dist/schemas/transcription.d.ts +94 -7
- package/dist/schemas/transcription.js +99 -22
- package/dist/schemas/translate.d.ts +4 -2
- package/dist/schemas/translate.js +6 -10
- package/dist/schemas/translation-config.d.ts +40 -20
- package/dist/schemas/translation-config.js +1 -1
- 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 +4 -3
- package/dist/surface.js +4 -3
- package/dist/utils/addon-responses.d.ts +71 -2
- package/dist/utils/aggregate-events.d.ts +1 -1
- package/dist/utils/aggregate-events.js +2 -2
- package/dist/utils/archive.d.ts +7 -0
- package/dist/utils/archive.js +89 -30
- package/dist/utils/asr-events.d.ts +5 -0
- package/dist/utils/asr-events.js +10 -1
- package/dist/utils/audio/decoder.js +3 -1
- package/dist/utils/audio-input.js +1 -1
- package/dist/utils/cache/auto-history.d.ts +2 -1
- package/dist/utils/cache/auto-history.js +5 -3
- package/dist/utils/cache/layout.d.ts +48 -0
- package/dist/utils/cache/layout.js +190 -0
- package/dist/utils/cache/paths.js +8 -10
- package/dist/utils/cache/types.d.ts +2 -1
- package/dist/utils/checksum.d.ts +7 -0
- package/dist/utils/checksum.js +59 -2
- package/dist/utils/completion-normalizer.js +287 -88
- package/dist/utils/gguf-architecture.d.ts +7 -0
- package/dist/utils/gguf-architecture.js +142 -0
- package/dist/utils/gguf-tensor-extractor.d.ts +0 -6
- package/dist/utils/gguf-tensor-extractor.js +1 -50
- package/dist/utils/index.d.ts +13 -13
- package/dist/utils/index.js +13 -13
- package/dist/utils/mcp-adapter.d.ts +1 -1
- package/dist/utils/mcp-adapter.js +1 -1
- package/dist/utils/path-security.js +1 -1
- package/dist/utils/shard-utils.d.ts +0 -16
- package/dist/utils/shard-utils.js +14 -48
- package/dist/utils/tool-integration.d.ts +3 -2
- package/dist/utils/tool-integration.js +3 -6
- package/dist/utils/tools/defer.d.ts +50 -31
- package/dist/utils/tools/defer.js +115 -51
- package/dist/utils/tools/dialect.d.ts +15 -4
- package/dist/utils/tools/dialect.js +34 -5
- package/dist/utils/tools/index.d.ts +3 -3
- package/dist/utils/tools/index.js +3 -3
- package/dist/utils/tools/parser.js +8 -8
- package/dist/utils/tools/parsers/dsml.d.ts +1 -1
- package/dist/utils/tools/parsers/dsml.js +1 -1
- package/dist/utils/tools/parsers/gemma4native.d.ts +1 -1
- package/dist/utils/tools/parsers/gemma4native.js +1 -1
- package/dist/utils/tools/parsers/harmony.d.ts +1 -1
- package/dist/utils/tools/parsers/harmony.js +1 -1
- package/dist/utils/tools/parsers/hermes.d.ts +1 -1
- package/dist/utils/tools/parsers/hermes.js +1 -1
- package/dist/utils/tools/parsers/json.d.ts +1 -1
- package/dist/utils/tools/parsers/json.js +1 -1
- package/dist/utils/tools/parsers/pythonic.d.ts +1 -1
- package/dist/utils/tools/parsers/pythonic.js +1 -1
- package/dist/utils/tools/parsers/qwen35.d.ts +1 -1
- package/dist/utils/tools/parsers/qwen35.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 +43 -1
- package/dist/utils/tts-stats.js +120 -22
- package/dist/utils/until-aborted.d.ts +7 -0
- package/dist/utils/until-aborted.js +34 -0
- package/package.json +67 -55
- package/dist/models/registry/resource-profiles.d.ts +0 -17
- package/dist/models/registry/resource-profiles.js +0 -5657
- package/dist/resources/model-fit/assess.d.ts +0 -72
- package/dist/resources/model-fit/assess.js +0 -679
- package/dist/resources/model-fit/fit-stub/project-fit-from-load.d.ts +0 -27
- package/dist/resources/model-fit/fit-stub/project-fit-from-load.js +0 -33
- package/dist/resources/model-fit/floor.d.ts +0 -31
- package/dist/resources/model-fit/floor.js +0 -65
- package/dist/resources/model-fit/kv-cache.d.ts +0 -23
- package/dist/resources/model-fit/kv-cache.js +0 -85
- package/dist/resources/model-fit/native-probe/advisory-fit.d.ts +0 -54
- package/dist/resources/model-fit/native-probe/advisory-fit.js +0 -248
- package/dist/resources/model-fit/native-probe/child-engine-fit.d.ts +0 -2
- package/dist/resources/model-fit/native-probe/child-engine-fit.js +0 -49
- package/dist/resources/model-fit/native-probe/classify-fit.d.ts +0 -6
- package/dist/resources/model-fit/native-probe/classify-fit.js +0 -166
- package/dist/resources/model-fit/native-probe/create-fit-request.d.ts +0 -31
- package/dist/resources/model-fit/native-probe/create-fit-request.js +0 -61
- package/dist/resources/model-fit/native-probe/engine-fit.d.ts +0 -73
- package/dist/resources/model-fit/native-probe/engine-fit.js +0 -13
- package/dist/resources/model-fit/native-probe/engines/asr.d.ts +0 -14
- package/dist/resources/model-fit/native-probe/engines/asr.js +0 -126
- package/dist/resources/model-fit/native-probe/engines/audiogen.d.ts +0 -8
- package/dist/resources/model-fit/native-probe/engines/diffusion.d.ts +0 -7
- package/dist/resources/model-fit/native-probe/engines/diffusion.js +0 -65
- package/dist/resources/model-fit/native-probe/engines/llama.d.ts +0 -12
- package/dist/resources/model-fit/native-probe/engines/llama.js +0 -41
- package/dist/resources/model-fit/native-probe/engines/nmt.d.ts +0 -8
- package/dist/resources/model-fit/native-probe/engines/nmt.js +0 -11
- package/dist/resources/model-fit/native-probe/engines/ocr.d.ts +0 -9
- package/dist/resources/model-fit/native-probe/engines/ocr.js +0 -13
- package/dist/resources/model-fit/native-probe/engines/tts.d.ts +0 -10
- package/dist/resources/model-fit/native-probe/engines/tts.js +0 -152
- package/dist/resources/model-fit/native-probe/fit-outcome.d.ts +0 -16
- package/dist/resources/model-fit/native-probe/fit-process.d.ts +0 -27
- package/dist/resources/model-fit/native-probe/fit-process.js +0 -55
- package/dist/resources/model-fit/native-probe/fit-runner.d.ts +0 -1
- package/dist/resources/model-fit/native-probe/fit-runner.js +0 -58
- package/dist/resources/model-fit/native-probe/run-fit.d.ts +0 -24
- package/dist/resources/model-fit/native-probe/run-fit.js +0 -20
- package/dist/resources/model-fit/native-probe/run-in-process-fit.d.ts +0 -24
- package/dist/resources/model-fit/native-probe/run-in-process-fit.js +0 -123
- package/dist/resources/model-fit/native-probe/run-isolated-fit.d.ts +0 -63
- package/dist/resources/model-fit/native-probe/run-isolated-fit.js +0 -377
- package/dist/resources/model-fit/platform.d.ts +0 -9
- package/dist/resources/model-fit/platform.js +0 -26
- package/dist/resources/model-fit/types.d.ts +0 -6
- package/dist/resources/model-fit/types.js +0 -1
- package/dist/schemas/model-resource-profile.d.ts +0 -108
- package/dist/schemas/model-resource-profile.js +0 -80
- /package/dist/{resources/model-fit/native-probe/engines → model-fit}/gpu.d.ts +0 -0
- /package/dist/{resources/model-fit/native-probe/engines → model-fit}/gpu.js +0 -0
- /package/dist/{resources/model-fit/native-probe/fit-outcome.js → schemas/abort-signal.js} +0 -0
|
@@ -1,66 +1,18 @@
|
|
|
1
|
-
import { models } from '../../models/registry/models.js';
|
|
2
1
|
import { generateShortHash } from '../../utils/formatting.js';
|
|
2
|
+
import { COREML_COMPONENTS, getCatalogCoremlSidecars, getCoremlSetKeySource, getCoremlSidecarSpec } from '../../utils/cache/layout.js';
|
|
3
3
|
import { getModelsCacheDir } from '../../utils/cache/paths.js';
|
|
4
4
|
import { validateAndJoinPath } from '../../utils/path-security.js';
|
|
5
|
+
import { modelInputToSrcSchema, registryUrlSchema } from '../../schemas/index.js';
|
|
5
6
|
import { promises as fsPromises } from 'bare-fs';
|
|
6
7
|
import { z } from 'zod';
|
|
7
|
-
//
|
|
8
|
-
|
|
9
|
-
// ggml otherwise, so on macOS and iOS the bundle is downloaded with its GGUF
|
|
10
|
-
// into one companion-set directory. The registry publishes a bundle as its
|
|
11
|
-
// individual component files, none of which is a model constant of its own.
|
|
12
|
-
const COREML_COMPONENTS = [
|
|
13
|
-
'analytics/coremldata.bin',
|
|
14
|
-
'coremldata.bin',
|
|
15
|
-
'metadata.json',
|
|
16
|
-
'model.mil',
|
|
17
|
-
'weights/weight.bin'
|
|
18
|
-
];
|
|
19
|
-
const SIDECAR_FAMILIES = [
|
|
20
|
-
{
|
|
21
|
-
// The pinned ASR addon supports these encoder sidecars. The other bundles
|
|
22
|
-
// in the registry (CTC, Indic CTC, Nemotron, and TDT 1.1B) must not be
|
|
23
|
-
// downloaded until the addon can actually use them.
|
|
24
|
-
root: 'qvac_models_compiled/ggml/parakeet/2026-09-28/',
|
|
25
|
-
pathPattern: /\/ggml\/parakeet\//,
|
|
26
|
-
stemPattern: /^(.+)\.(?:f16|q4_0|q8_0)\.gguf$/,
|
|
27
|
-
bundlesByStem: {
|
|
28
|
-
'parakeet-tdt-0.6b-v3': [
|
|
29
|
-
{ sourceName: 'parakeet-tdt-0.6b-v3-encoder', targetSuffix: '-encoder' }
|
|
30
|
-
],
|
|
31
|
-
'parakeet-unified-en-0.6b': [
|
|
32
|
-
{ sourceName: 'parakeet-unified-en-0.6b-encoder', targetSuffix: '-encoder' }
|
|
33
|
-
],
|
|
34
|
-
'parakeet-eou-120m-v1': [
|
|
35
|
-
{ sourceName: 'parakeet_realtime_eou_120m-v1-encoder', targetSuffix: '-encoder' }
|
|
36
|
-
],
|
|
37
|
-
'diar_streaming_sortformer_4spk-v2.1': [
|
|
38
|
-
{ sourceName: 'diar_streaming_sortformer_4spk-v2.1-encoder', targetSuffix: '-encoder' },
|
|
39
|
-
{
|
|
40
|
-
sourceName: 'diar_streaming_sortformer_4spk-v2.1-encoder-bypass-pre-encode',
|
|
41
|
-
targetSuffix: '-encoder-bypass-pre-encode'
|
|
42
|
-
}
|
|
43
|
-
]
|
|
44
|
-
}
|
|
45
|
-
},
|
|
46
|
-
{
|
|
47
|
-
// The TTS addon runs the Audio8 codec's synthesis stack on this bundle when
|
|
48
|
-
// it sits beside the codec decoder GGUF. Every quantization tier shares the
|
|
49
|
-
// one bundle, which is why its name drops the tier.
|
|
50
|
-
root: 'qvac_models_compiled/ggml/audio8/2026-09-30/',
|
|
51
|
-
pathPattern: /\/ggml\/audio-?8\//,
|
|
52
|
-
stemPattern: /^(.+)-(?:f16|f32|q8_0)\.gguf$/,
|
|
53
|
-
bundlesByStem: {
|
|
54
|
-
'audio8-codec-decoder': [{ sourceName: 'audio8-codec-decoder', targetSuffix: '' }]
|
|
55
|
-
}
|
|
56
|
-
}
|
|
57
|
-
];
|
|
8
|
+
// Family table and catalog lookups: utils/cache/layout.ts.
|
|
9
|
+
export { getCoremlSidecarSpec };
|
|
58
10
|
const CACHE_METADATA_NAME = '.coreml-companions.json';
|
|
59
11
|
const checksumSchema = z.string().regex(/^[a-f0-9]{64}$/i);
|
|
60
12
|
const cachedFileSchema = z.object({
|
|
61
13
|
key: z.string(),
|
|
62
14
|
registryPath: z.string(),
|
|
63
|
-
registrySource: z.
|
|
15
|
+
registrySource: z.string(),
|
|
64
16
|
targetName: z.string(),
|
|
65
17
|
expectedSize: z.number().int().nonnegative(),
|
|
66
18
|
sha256Checksum: checksumSchema,
|
|
@@ -75,22 +27,40 @@ const cachedSetSchema = z.object({
|
|
|
75
27
|
primaryKey: z.literal('modelPath'),
|
|
76
28
|
files: z.array(cachedFileSchema)
|
|
77
29
|
});
|
|
78
|
-
|
|
79
|
-
|
|
30
|
+
/**
|
|
31
|
+
* For the encoder-less GGUF of a Core ML distribution, the model constant to
|
|
32
|
+
* load instead where its bundles cannot be staged. The loader stages bundles
|
|
33
|
+
* on macOS and iOS alone, so anywhere else such a load is refused up front
|
|
34
|
+
* rather than failing inside the addon after the download.
|
|
35
|
+
*/
|
|
36
|
+
export function getCoremlOnlyAlternative(registryPath, registrySource) {
|
|
37
|
+
return getCoremlSidecarSpec(registryPath, registrySource, 'darwin')?.withoutBundlesUse;
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* Why a `registry://` model source cannot load on `platform`, or `undefined`
|
|
41
|
+
* when it can. Only the encoder-less GGUF of a Core ML distribution is refused,
|
|
42
|
+
* and only off Apple platforms; every other source is the loader's business.
|
|
43
|
+
*/
|
|
44
|
+
export function getRegistryModelPlatformRefusal(modelSrc, platform) {
|
|
45
|
+
if (platform === 'darwin' || platform === 'ios')
|
|
80
46
|
return undefined;
|
|
81
|
-
const
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
47
|
+
const src = modelInputToSrcSchema.safeParse(modelSrc);
|
|
48
|
+
if (!src.success || !src.data.startsWith('registry://'))
|
|
49
|
+
return undefined;
|
|
50
|
+
const url = registryUrlSchema.safeParse(src.data);
|
|
51
|
+
if (!url.success)
|
|
52
|
+
return undefined;
|
|
53
|
+
const { registryPath, registrySource } = url.data;
|
|
54
|
+
const alternative = getCoremlOnlyAlternative(registryPath, registrySource);
|
|
55
|
+
if (alternative === undefined)
|
|
56
|
+
return undefined;
|
|
57
|
+
const filename = registryPath.split('/').pop() || registryPath;
|
|
58
|
+
return (`${filename} is the encoder-less GGUF of a Core ML distribution: it loads on macOS and iOS, ` +
|
|
59
|
+
`where its Core ML encoder and decoder are staged beside it. On ${platform ?? 'this platform'}, ` +
|
|
60
|
+
`load ${alternative} instead.`);
|
|
91
61
|
}
|
|
92
62
|
export function getCoremlSetKey(model, spec) {
|
|
93
|
-
return generateShortHash(
|
|
63
|
+
return generateShortHash(getCoremlSetKeySource(model, spec));
|
|
94
64
|
}
|
|
95
65
|
function getCachedSetMetadataPath(model, spec, cacheDir) {
|
|
96
66
|
return validateAndJoinPath(cacheDir, 'sets', getCoremlSetKey(model, spec), CACHE_METADATA_NAME);
|
|
@@ -123,8 +93,9 @@ function isValidCachedSet(set, model, spec) {
|
|
|
123
93
|
new Set(set.files.map((file) => file.targetName)).size !== set.files.length) {
|
|
124
94
|
return false;
|
|
125
95
|
}
|
|
126
|
-
if (actual.some((file) => expected.get(file.targetName) !== file.registryPath))
|
|
96
|
+
if (actual.some((file) => file.registrySource !== spec.source || expected.get(file.targetName) !== file.registryPath)) {
|
|
127
97
|
return false;
|
|
98
|
+
}
|
|
128
99
|
for (const bundle of spec.bundles) {
|
|
129
100
|
const prefix = `${spec.modelStem}${bundle.targetSuffix}.mlmodelc/`;
|
|
130
101
|
const count = actual.filter((file) => file.targetName.startsWith(prefix)).length;
|
|
@@ -157,29 +128,18 @@ export function findCatalogCoremlCompanionSet(model, platform) {
|
|
|
157
128
|
const spec = getCoremlSidecarSpec(model.registryPath, model.registrySource, platform);
|
|
158
129
|
if (!spec)
|
|
159
130
|
return undefined;
|
|
160
|
-
const sidecarFiles =
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
registrySource: entry.registrySource,
|
|
173
|
-
targetName: targetPrefix + COREML_COMPONENTS[index],
|
|
174
|
-
expectedSize: entry.expectedSize,
|
|
175
|
-
sha256Checksum: entry.sha256Checksum,
|
|
176
|
-
blobCoreKey: entry.blobCoreKey,
|
|
177
|
-
blobBlockOffset: entry.blobBlockOffset,
|
|
178
|
-
blobBlockLength: entry.blobBlockLength,
|
|
179
|
-
blobByteOffset: entry.blobByteOffset
|
|
180
|
-
});
|
|
181
|
-
}
|
|
182
|
-
}
|
|
131
|
+
const sidecarFiles = getCatalogCoremlSidecars(spec).map(({ key, targetName, entry }) => ({
|
|
132
|
+
key,
|
|
133
|
+
registryPath: entry.registryPath,
|
|
134
|
+
registrySource: entry.registrySource,
|
|
135
|
+
targetName,
|
|
136
|
+
expectedSize: entry.expectedSize,
|
|
137
|
+
sha256Checksum: entry.sha256Checksum,
|
|
138
|
+
blobCoreKey: entry.blobCoreKey,
|
|
139
|
+
blobBlockOffset: entry.blobBlockOffset,
|
|
140
|
+
blobBlockLength: entry.blobBlockLength,
|
|
141
|
+
blobByteOffset: entry.blobByteOffset
|
|
142
|
+
}));
|
|
183
143
|
return createCompanionSet(model, spec, sidecarFiles);
|
|
184
144
|
}
|
|
185
145
|
export async function findLocallyCachedCoremlCompanionSet(model, platform, cacheDir = getModelsCacheDir()) {
|
|
@@ -243,7 +203,7 @@ export async function findCoremlCompanionSet(client, model, platform) {
|
|
|
243
203
|
});
|
|
244
204
|
const byPath = new Map();
|
|
245
205
|
for (const entry of registryEntries) {
|
|
246
|
-
if (entry.source ===
|
|
206
|
+
if (entry.source === spec.source && entry.path.startsWith(sourcePrefix)) {
|
|
247
207
|
byPath.set(entry.path, entry);
|
|
248
208
|
}
|
|
249
209
|
}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import type { AbortSignal } from 'bare-abort-controller';
|
|
2
|
+
/** Whether this process holds the lock of any of these keys. */
|
|
3
|
+
export declare function holdsDownloadLockHere(resourceKeys: string[]): boolean;
|
|
4
|
+
/**
|
|
5
|
+
* Wait until this process holds none of these keys' locks, such as a cancelled
|
|
6
|
+
* download still cleaning up. False if one is still held after `timeoutMs`.
|
|
7
|
+
*/
|
|
8
|
+
export declare function waitForDownloadLocksHere(resourceKeys: string[], timeoutMs: number): Promise<boolean>;
|
|
9
|
+
/**
|
|
10
|
+
* Hold the cross-process lock for one cached resource until disposed, waiting
|
|
11
|
+
* while another holder has it. The OS releases it if the holder exits.
|
|
12
|
+
* Cancelling while waiting rejects with `DownloadCancelledError`.
|
|
13
|
+
*/
|
|
14
|
+
export declare function acquireDownloadLock(resourceKey: string, signal: AbortSignal): Promise<AsyncDisposable>;
|
|
15
|
+
/** Take every key's lock without waiting, or none; `null` while any is held. */
|
|
16
|
+
export declare function tryAcquireDownloadLocks(resourceKeys: string[]): Promise<AsyncDisposable | null>;
|
|
17
|
+
/** Where a download is written until it is complete and verified. */
|
|
18
|
+
export declare function partialDownloadPath(finalPath: string): string;
|
|
19
|
+
/** Atomically move a verified download into place. */
|
|
20
|
+
export declare function publishDownload(finalPath: string): Promise<void>;
|
|
@@ -0,0 +1,213 @@
|
|
|
1
|
+
import fs, { promises as fsPromises } from 'bare-fs';
|
|
2
|
+
import path from 'bare-path';
|
|
3
|
+
import fsx from 'fs-native-extensions';
|
|
4
|
+
import { generateShortHash, getModelsCacheDir, renameWithCachedChecksum } from '../../utils/index.js';
|
|
5
|
+
import { DownloadCancelledError } from '../../errors/index.js';
|
|
6
|
+
import { getEngineLogger } from '../../logging/index.js';
|
|
7
|
+
const logger = getEngineLogger();
|
|
8
|
+
const LOCK_DIR_NAME = '.locks';
|
|
9
|
+
const LOCK_POLL_MS = 250;
|
|
10
|
+
const NO_WRITE_ACCESS = new Set(['EACCES', 'EPERM', 'EROFS']);
|
|
11
|
+
// The OS grants a lock per open handle, so this process's own holders also make
|
|
12
|
+
// `tryAcquireDownloadLocks` fail. Tracking them tells them apart from other
|
|
13
|
+
// processes. Each entry settles once its lock is released.
|
|
14
|
+
const heldHere = new Map();
|
|
15
|
+
function trackHeldHere(resourceKey, lock) {
|
|
16
|
+
let markReleased;
|
|
17
|
+
const released = new Promise((resolve) => {
|
|
18
|
+
markReleased = resolve;
|
|
19
|
+
});
|
|
20
|
+
const holders = heldHere.get(resourceKey) ?? new Set();
|
|
21
|
+
holders.add(released);
|
|
22
|
+
heldHere.set(resourceKey, holders);
|
|
23
|
+
return {
|
|
24
|
+
fd: lock.fd,
|
|
25
|
+
[Symbol.asyncDispose]: async () => {
|
|
26
|
+
await lock[Symbol.asyncDispose]();
|
|
27
|
+
holders.delete(released);
|
|
28
|
+
if (holders.size === 0 && heldHere.get(resourceKey) === holders)
|
|
29
|
+
heldHere.delete(resourceKey);
|
|
30
|
+
markReleased();
|
|
31
|
+
}
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
/** Whether this process holds the lock of any of these keys. */
|
|
35
|
+
export function holdsDownloadLockHere(resourceKeys) {
|
|
36
|
+
return resourceKeys.some((key) => heldHere.has(key));
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* Wait until this process holds none of these keys' locks, such as a cancelled
|
|
40
|
+
* download still cleaning up. False if one is still held after `timeoutMs`.
|
|
41
|
+
*/
|
|
42
|
+
export async function waitForDownloadLocksHere(resourceKeys, timeoutMs) {
|
|
43
|
+
const deadline = Date.now() + timeoutMs;
|
|
44
|
+
for (;;) {
|
|
45
|
+
const pending = resourceKeys.flatMap((key) => [...(heldHere.get(key) ?? [])]);
|
|
46
|
+
if (pending.length === 0)
|
|
47
|
+
return true;
|
|
48
|
+
const remaining = deadline - Date.now();
|
|
49
|
+
if (remaining <= 0)
|
|
50
|
+
return false;
|
|
51
|
+
let timer;
|
|
52
|
+
const timedOut = await Promise.race([
|
|
53
|
+
Promise.all(pending).then(() => false),
|
|
54
|
+
new Promise((resolve) => {
|
|
55
|
+
timer = setTimeout(() => resolve(true), remaining);
|
|
56
|
+
})
|
|
57
|
+
]);
|
|
58
|
+
clearTimeout(timer);
|
|
59
|
+
if (timedOut)
|
|
60
|
+
return false;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
// `null` when this process can change nothing in the models directory, such as
|
|
64
|
+
// a prefilled read-only cache: it can then only load cached models. Anywhere it
|
|
65
|
+
// could write, a lock that cannot be created fails instead of running unlocked.
|
|
66
|
+
async function openLockFile(resourceKey) {
|
|
67
|
+
const modelsDir = getModelsCacheDir();
|
|
68
|
+
const lockDir = path.join(modelsDir, LOCK_DIR_NAME);
|
|
69
|
+
let handle;
|
|
70
|
+
try {
|
|
71
|
+
await fsPromises.mkdir(lockDir, { recursive: true });
|
|
72
|
+
// Not 'a': Windows refuses to lock a handle opened for append only.
|
|
73
|
+
handle = await fsPromises.open(path.join(lockDir, `${generateShortHash(resourceKey)}.lock`), 'a+');
|
|
74
|
+
}
|
|
75
|
+
catch (error) {
|
|
76
|
+
if (!NO_WRITE_ACCESS.has(error.code ?? ''))
|
|
77
|
+
throw error;
|
|
78
|
+
if (await canChangeModels(modelsDir)) {
|
|
79
|
+
logger.error(`❌ Cannot lock ${resourceKey}: its lock file in ${lockDir} is not writable`, {
|
|
80
|
+
error
|
|
81
|
+
});
|
|
82
|
+
throw error;
|
|
83
|
+
}
|
|
84
|
+
logger.warn(`⚠️ The models directory is read-only; reading ${resourceKey} without a lock`, {
|
|
85
|
+
error
|
|
86
|
+
});
|
|
87
|
+
return null;
|
|
88
|
+
}
|
|
89
|
+
return {
|
|
90
|
+
fd: handle.fd,
|
|
91
|
+
// Closing the descriptor releases its lock.
|
|
92
|
+
[Symbol.asyncDispose]: () => handle.close().catch((error) => {
|
|
93
|
+
logger.debug('Failed to close download lock', { resourceKey, error });
|
|
94
|
+
})
|
|
95
|
+
};
|
|
96
|
+
}
|
|
97
|
+
// Downloads and deletes only add, rename or remove directory entries and write
|
|
98
|
+
// `.part` files, so a process can change a model only through a writable folder
|
|
99
|
+
// or `.part` file anywhere under `dir`. Lock files cannot change a model. A link
|
|
100
|
+
// counts if its target is writable; it is not entered, so cycles cannot loop.
|
|
101
|
+
async function canChangeModels(dir, isRoot = true) {
|
|
102
|
+
if (await hasAccess(dir, fs.constants.W_OK))
|
|
103
|
+
return true;
|
|
104
|
+
let entries;
|
|
105
|
+
try {
|
|
106
|
+
entries = (await fsPromises.readdir(dir, { withFileTypes: true }));
|
|
107
|
+
}
|
|
108
|
+
catch {
|
|
109
|
+
// An unlistable folder's entries are out of reach only if it cannot be searched.
|
|
110
|
+
return hasAccess(dir, fs.constants.X_OK);
|
|
111
|
+
}
|
|
112
|
+
for (const entry of entries) {
|
|
113
|
+
if (isRoot && entry.name === LOCK_DIR_NAME)
|
|
114
|
+
continue;
|
|
115
|
+
const entryPath = path.join(dir, entry.name);
|
|
116
|
+
if (entry.isDirectory()) {
|
|
117
|
+
if (await canChangeModels(entryPath, false))
|
|
118
|
+
return true;
|
|
119
|
+
}
|
|
120
|
+
else if (entry.isSymbolicLink() || entry.name.endsWith('.part')) {
|
|
121
|
+
if (await hasAccess(entryPath, fs.constants.W_OK))
|
|
122
|
+
return true;
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
return false;
|
|
126
|
+
}
|
|
127
|
+
function hasAccess(target, mode) {
|
|
128
|
+
return fsPromises.access(target, mode).then(() => true, () => false);
|
|
129
|
+
}
|
|
130
|
+
// False while another holder has the lock. A filesystem without lock support
|
|
131
|
+
// counts as granted.
|
|
132
|
+
function tryLock(lock, resourceKey) {
|
|
133
|
+
try {
|
|
134
|
+
return fsx.tryLock(lock.fd);
|
|
135
|
+
}
|
|
136
|
+
catch (error) {
|
|
137
|
+
logger.warn(`⚠️ Cannot lock ${resourceKey} in the models directory; continuing without cross-process coordination`, { error });
|
|
138
|
+
return true;
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
/**
|
|
142
|
+
* Hold the cross-process lock for one cached resource until disposed, waiting
|
|
143
|
+
* while another holder has it. The OS releases it if the holder exits.
|
|
144
|
+
* Cancelling while waiting rejects with `DownloadCancelledError`.
|
|
145
|
+
*/
|
|
146
|
+
export async function acquireDownloadLock(resourceKey, signal) {
|
|
147
|
+
if (signal.aborted)
|
|
148
|
+
throw new DownloadCancelledError();
|
|
149
|
+
const lock = await openLockFile(resourceKey);
|
|
150
|
+
if (!lock)
|
|
151
|
+
return { [Symbol.asyncDispose]: async () => { } };
|
|
152
|
+
try {
|
|
153
|
+
if (!tryLock(lock, resourceKey)) {
|
|
154
|
+
logger.info(`⏳ ${resourceKey} is being downloaded elsewhere; waiting for it to finish`);
|
|
155
|
+
do {
|
|
156
|
+
await delay(LOCK_POLL_MS, signal);
|
|
157
|
+
if (signal.aborted)
|
|
158
|
+
throw new DownloadCancelledError();
|
|
159
|
+
} while (!tryLock(lock, resourceKey));
|
|
160
|
+
logger.info(`📥 The other download of ${resourceKey} finished; continuing`);
|
|
161
|
+
}
|
|
162
|
+
return trackHeldHere(resourceKey, lock);
|
|
163
|
+
}
|
|
164
|
+
catch (error) {
|
|
165
|
+
await lock[Symbol.asyncDispose]();
|
|
166
|
+
throw error;
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
/** Take every key's lock without waiting, or none; `null` while any is held. */
|
|
170
|
+
export async function tryAcquireDownloadLocks(resourceKeys) {
|
|
171
|
+
const held = [];
|
|
172
|
+
const releaseAll = async () => {
|
|
173
|
+
for (const lock of held)
|
|
174
|
+
await lock[Symbol.asyncDispose]();
|
|
175
|
+
};
|
|
176
|
+
try {
|
|
177
|
+
for (const resourceKey of resourceKeys) {
|
|
178
|
+
const lock = await openLockFile(resourceKey);
|
|
179
|
+
if (!lock)
|
|
180
|
+
continue;
|
|
181
|
+
if (!tryLock(lock, resourceKey)) {
|
|
182
|
+
await lock[Symbol.asyncDispose]();
|
|
183
|
+
await releaseAll();
|
|
184
|
+
return null;
|
|
185
|
+
}
|
|
186
|
+
held.push(trackHeldHere(resourceKey, lock));
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
catch (error) {
|
|
190
|
+
await releaseAll();
|
|
191
|
+
throw error;
|
|
192
|
+
}
|
|
193
|
+
return { [Symbol.asyncDispose]: releaseAll };
|
|
194
|
+
}
|
|
195
|
+
function delay(ms, signal) {
|
|
196
|
+
return new Promise((resolve) => {
|
|
197
|
+
const done = () => {
|
|
198
|
+
clearTimeout(timer);
|
|
199
|
+
signal.removeEventListener('abort', done);
|
|
200
|
+
resolve();
|
|
201
|
+
};
|
|
202
|
+
const timer = setTimeout(done, ms);
|
|
203
|
+
signal.addEventListener('abort', done, { once: true });
|
|
204
|
+
});
|
|
205
|
+
}
|
|
206
|
+
/** Where a download is written until it is complete and verified. */
|
|
207
|
+
export function partialDownloadPath(finalPath) {
|
|
208
|
+
return `${finalPath}.part`;
|
|
209
|
+
}
|
|
210
|
+
/** Atomically move a verified download into place. */
|
|
211
|
+
export async function publishDownload(finalPath) {
|
|
212
|
+
await renameWithCachedChecksum(partialDownloadPath(finalPath), finalPath);
|
|
213
|
+
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { ModelProgressUpdate } from '../../schemas/index.js';
|
|
2
2
|
import { AbortController, type AbortSignal } from 'bare-abort-controller';
|
|
3
3
|
import type { DisposableScope } from '../../runtime/disposable-scope.js';
|
|
4
|
-
import type { DownloadHooks } from '
|
|
4
|
+
import type { DownloadHooks } from '../../handlers/load-model/types.js';
|
|
5
5
|
/**
|
|
6
6
|
* Per-subscriber binding to a registry-tracked request.
|
|
7
7
|
* `startOrJoinDownload` is request-aware: each caller (the
|
|
@@ -23,6 +23,7 @@ export interface SubscriberRequestBinding {
|
|
|
23
23
|
signal: AbortSignal;
|
|
24
24
|
scope: DisposableScope;
|
|
25
25
|
requestId: string;
|
|
26
|
+
sessionId: string;
|
|
26
27
|
}
|
|
27
28
|
export interface Subscriber {
|
|
28
29
|
id: string;
|
|
@@ -33,13 +34,13 @@ export interface Subscriber {
|
|
|
33
34
|
promise: Promise<string>;
|
|
34
35
|
/** Identity of the registry request this subscriber belongs to, if any. */
|
|
35
36
|
requestId?: string | undefined;
|
|
37
|
+
sessionId?: string | undefined;
|
|
36
38
|
}
|
|
37
39
|
export interface Transfer {
|
|
38
40
|
downloadKey: string;
|
|
39
41
|
abortController: AbortController;
|
|
40
42
|
subscribers: Map<string, Subscriber>;
|
|
41
43
|
lastProgress?: ModelProgressUpdate | undefined;
|
|
42
|
-
downloadPromise?: Promise<string> | undefined;
|
|
43
44
|
clearCache: boolean;
|
|
44
45
|
cacheHit?: boolean;
|
|
45
46
|
}
|
|
@@ -85,7 +86,14 @@ export declare function startOrJoinDownload(downloadKey: string, startDownload:
|
|
|
85
86
|
* asks for clearCache, the partial file is deleted when the last
|
|
86
87
|
* subscriber leaves.
|
|
87
88
|
*/
|
|
88
|
-
export declare function markClearCacheForRequest(requestId: string): boolean;
|
|
89
|
+
export declare function markClearCacheForRequest(requestId: string, sessionId: string): boolean;
|
|
90
|
+
/**
|
|
91
|
+
* Runs `fn` while new downloads and loads writing `resourceKey` are refused, so
|
|
92
|
+
* a cache deletion cannot remove files another call is writing or loading.
|
|
93
|
+
*/
|
|
94
|
+
export declare function withDownloadBlocked<T>(resourceKeys: string[], fn: () => Promise<T>): Promise<T>;
|
|
95
|
+
export declare function hasActiveTransfer(resourceKey: string): boolean;
|
|
96
|
+
export declare function createRegistryCacheKey(registryPath: string): string;
|
|
89
97
|
export declare function cancelTransfer(downloadKey: string, clearCache?: boolean): void;
|
|
90
98
|
export declare function createHyperdriveDownloadKey(hyperdriveKey: string, modelFileName: string): string;
|
|
91
99
|
export declare function createHttpDownloadKey(url: string): string;
|
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
import { AbortController } from 'bare-abort-controller';
|
|
2
|
-
import { DownloadCancelledError, InferenceCancelledError } from '../../errors/index.js';
|
|
2
|
+
import { DeleteCacheFailedError, DownloadCancelledError, InferenceCancelledError, ModelLoadFailedError } from '../../errors/index.js';
|
|
3
3
|
import { getEngineLogger } from '../../logging/index.js';
|
|
4
4
|
import { getRequestRegistry } from '../../runtime/index.js';
|
|
5
5
|
const logger = getEngineLogger();
|
|
6
6
|
const activeTransfers = new Map();
|
|
7
|
+
// Every download until it settles, including a cancelled one a retry replaced.
|
|
8
|
+
const runningDownloads = new Set();
|
|
9
|
+
const deletingKeys = new Set();
|
|
7
10
|
let nextSubscriberId = 0;
|
|
8
|
-
function createSubscriber(onProgress,
|
|
11
|
+
function createSubscriber(onProgress, request) {
|
|
9
12
|
let resolve;
|
|
10
13
|
let reject;
|
|
11
14
|
const promise = new Promise((res, rej) => {
|
|
@@ -19,7 +22,8 @@ function createSubscriber(onProgress, requestId) {
|
|
|
19
22
|
resolve,
|
|
20
23
|
reject,
|
|
21
24
|
promise,
|
|
22
|
-
requestId
|
|
25
|
+
requestId: request?.requestId,
|
|
26
|
+
sessionId: request?.sessionId
|
|
23
27
|
};
|
|
24
28
|
}
|
|
25
29
|
function settleSubscriber(subscriber, result) {
|
|
@@ -118,10 +122,17 @@ function attachRequestBinding(transfer, subscriber, request) {
|
|
|
118
122
|
});
|
|
119
123
|
}
|
|
120
124
|
export function startOrJoinDownload(downloadKey, startDownload, onProgress, request) {
|
|
125
|
+
if (deletingKeys.has(getCacheResourceKey(downloadKey))) {
|
|
126
|
+
return {
|
|
127
|
+
promise: Promise.reject(new ModelLoadFailedError(`The cache for ${downloadKey} is being deleted`)),
|
|
128
|
+
joined: false,
|
|
129
|
+
getCacheHit: () => undefined
|
|
130
|
+
};
|
|
131
|
+
}
|
|
121
132
|
const existing = activeTransfers.get(downloadKey);
|
|
122
133
|
if (existing && !existing.abortController.signal.aborted) {
|
|
123
134
|
logger.info(`📥 Reusing existing download for: ${downloadKey}`);
|
|
124
|
-
const subscriber = createSubscriber(onProgress, request
|
|
135
|
+
const subscriber = createSubscriber(onProgress, request);
|
|
125
136
|
existing.subscribers.set(subscriber.id, subscriber);
|
|
126
137
|
if (request) {
|
|
127
138
|
attachRequestBinding(existing, subscriber, request);
|
|
@@ -142,7 +153,7 @@ export function startOrJoinDownload(downloadKey, startDownload, onProgress, requ
|
|
|
142
153
|
subscribers: new Map(),
|
|
143
154
|
clearCache: false
|
|
144
155
|
};
|
|
145
|
-
const initialSubscriber = createSubscriber(onProgress, request
|
|
156
|
+
const initialSubscriber = createSubscriber(onProgress, request);
|
|
146
157
|
transfer.subscribers.set(initialSubscriber.id, initialSubscriber);
|
|
147
158
|
activeTransfers.set(downloadKey, transfer);
|
|
148
159
|
if (request) {
|
|
@@ -158,7 +169,7 @@ export function startOrJoinDownload(downloadKey, startDownload, onProgress, requ
|
|
|
158
169
|
transfer.cacheHit = cacheHit;
|
|
159
170
|
}
|
|
160
171
|
});
|
|
161
|
-
|
|
172
|
+
runningDownloads.add(downloadPromise);
|
|
162
173
|
downloadPromise
|
|
163
174
|
.then((path) => {
|
|
164
175
|
for (const sub of transfer.subscribers.values()) {
|
|
@@ -171,6 +182,7 @@ export function startOrJoinDownload(downloadKey, startDownload, onProgress, requ
|
|
|
171
182
|
}
|
|
172
183
|
})
|
|
173
184
|
.finally(() => {
|
|
185
|
+
runningDownloads.delete(downloadPromise);
|
|
174
186
|
if (activeTransfers.get(downloadKey) === transfer) {
|
|
175
187
|
activeTransfers.delete(downloadKey);
|
|
176
188
|
}
|
|
@@ -211,10 +223,10 @@ export function startOrJoinDownload(downloadKey, startDownload, onProgress, requ
|
|
|
211
223
|
* asks for clearCache, the partial file is deleted when the last
|
|
212
224
|
* subscriber leaves.
|
|
213
225
|
*/
|
|
214
|
-
export function markClearCacheForRequest(requestId) {
|
|
226
|
+
export function markClearCacheForRequest(requestId, sessionId) {
|
|
215
227
|
for (const transfer of activeTransfers.values()) {
|
|
216
228
|
for (const sub of transfer.subscribers.values()) {
|
|
217
|
-
if (sub.requestId === requestId) {
|
|
229
|
+
if (sub.requestId === requestId && sub.sessionId === sessionId) {
|
|
218
230
|
transfer.clearCache = true;
|
|
219
231
|
return true;
|
|
220
232
|
}
|
|
@@ -222,6 +234,43 @@ export function markClearCacheForRequest(requestId) {
|
|
|
222
234
|
}
|
|
223
235
|
return false;
|
|
224
236
|
}
|
|
237
|
+
/**
|
|
238
|
+
* Runs `fn` while new downloads and loads writing `resourceKey` are refused, so
|
|
239
|
+
* a cache deletion cannot remove files another call is writing or loading.
|
|
240
|
+
*/
|
|
241
|
+
export async function withDownloadBlocked(resourceKeys, fn) {
|
|
242
|
+
const busy = resourceKeys.find((key) => deletingKeys.has(key));
|
|
243
|
+
if (busy) {
|
|
244
|
+
throw new DeleteCacheFailedError(`The cache for ${busy} is already being deleted`);
|
|
245
|
+
}
|
|
246
|
+
for (const key of resourceKeys)
|
|
247
|
+
deletingKeys.add(key);
|
|
248
|
+
try {
|
|
249
|
+
return await fn();
|
|
250
|
+
}
|
|
251
|
+
finally {
|
|
252
|
+
for (const key of resourceKeys)
|
|
253
|
+
deletingKeys.delete(key);
|
|
254
|
+
}
|
|
255
|
+
}
|
|
256
|
+
export function hasActiveTransfer(resourceKey) {
|
|
257
|
+
for (const [downloadKey, transfer] of activeTransfers) {
|
|
258
|
+
if (getCacheResourceKey(downloadKey) !== resourceKey)
|
|
259
|
+
continue;
|
|
260
|
+
if (!transfer.abortController.signal.aborted)
|
|
261
|
+
return true;
|
|
262
|
+
}
|
|
263
|
+
return false;
|
|
264
|
+
}
|
|
265
|
+
// The registry cache is laid out by path alone, so every source of a path
|
|
266
|
+
// writes the same files.
|
|
267
|
+
export function createRegistryCacheKey(registryPath) {
|
|
268
|
+
return `registry-cache:${registryPath}`;
|
|
269
|
+
}
|
|
270
|
+
function getCacheResourceKey(downloadKey) {
|
|
271
|
+
const registry = /^registry:[^:]*:(.*)$/.exec(downloadKey);
|
|
272
|
+
return registry ? createRegistryCacheKey(registry[1]) : downloadKey;
|
|
273
|
+
}
|
|
225
274
|
export function cancelTransfer(downloadKey, clearCache = false) {
|
|
226
275
|
const transfer = activeTransfers.get(downloadKey);
|
|
227
276
|
if (!transfer)
|
|
@@ -233,6 +282,7 @@ export function cancelTransfer(downloadKey, clearCache = false) {
|
|
|
233
282
|
if (sub.requestId !== undefined) {
|
|
234
283
|
registry.cancel({
|
|
235
284
|
requestId: sub.requestId,
|
|
285
|
+
sessionId: sub.sessionId,
|
|
236
286
|
reason: 'download-transfer-cancel'
|
|
237
287
|
});
|
|
238
288
|
}
|
|
@@ -292,9 +342,7 @@ export async function cleanupDownloads() {
|
|
|
292
342
|
return;
|
|
293
343
|
isCleaningUp = true;
|
|
294
344
|
try {
|
|
295
|
-
const downloadPromises = Array.from(
|
|
296
|
-
.filter((t) => t.downloadPromise !== undefined)
|
|
297
|
-
.map((t) => t.downloadPromise.catch(() => { }));
|
|
345
|
+
const downloadPromises = Array.from(runningDownloads, (download) => download.catch(() => { }));
|
|
298
346
|
cancelAllDownloads();
|
|
299
347
|
if (downloadPromises.length > 0) {
|
|
300
348
|
await Promise.allSettled(downloadPromises);
|
|
@@ -303,4 +351,7 @@ export async function cleanupDownloads() {
|
|
|
303
351
|
catch (error) {
|
|
304
352
|
logger.error('❌ Error during download cleanup:', error);
|
|
305
353
|
}
|
|
354
|
+
finally {
|
|
355
|
+
isCleaningUp = false;
|
|
356
|
+
}
|
|
306
357
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { ModelProgressUpdate } from '../../schemas/index.js';
|
|
2
|
-
import type { DownloadStats, DownloadResult, DownloadHooks, DownloadSecurityOptions, ResolveResult } from '
|
|
3
|
-
import type { ExplicitRegistryMetadata } from '
|
|
2
|
+
import type { DownloadStats, DownloadResult, DownloadHooks, DownloadSecurityOptions, ResolveResult } from '../../handlers/load-model/types.js';
|
|
3
|
+
import type { ExplicitRegistryMetadata } from '../../handlers/load-model/registry-metadata.js';
|
|
4
4
|
export declare function downloadModelFromHttpWithStats(url: string, progressCallback?: (progress: ModelProgressUpdate) => void, downloadHooks?: DownloadHooks, security?: DownloadSecurityOptions): Promise<DownloadResult>;
|
|
5
5
|
export declare function downloadModelFromRegistryWithStats(registryPath: string, registrySource: string, progressCallback?: (progress: ModelProgressUpdate) => void, expectedChecksum?: string, downloadHooks?: DownloadHooks, explicitMetadata?: ExplicitRegistryMetadata): Promise<DownloadResult>;
|
|
6
6
|
export declare function downloadModelFromHyperdriveWithStats(hyperdriveKey: string, modelFileName: string, seed?: boolean, progressCallback?: (progress: ModelProgressUpdate) => void, downloadHooks?: DownloadHooks): Promise<DownloadResult>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { downloadModelFromHttp } from '
|
|
2
|
-
import { downloadModelFromRegistry } from '
|
|
3
|
-
import { downloadModelFromHyperdrive } from '
|
|
1
|
+
import { downloadModelFromHttp } from '../../handlers/load-model/http.js';
|
|
2
|
+
import { downloadModelFromRegistry } from '../../handlers/load-model/registry.js';
|
|
3
|
+
import { downloadModelFromHyperdrive } from '../../handlers/load-model/hyperdrive.js';
|
|
4
4
|
import { nowMs } from '../../profiling/index.js';
|
|
5
5
|
function createStatsCollector() {
|
|
6
6
|
return {
|