@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,13 +1,66 @@
|
|
|
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 { Readable } from 'bare-stream';
|
|
4
56
|
import { AbortController } from 'bare-abort-controller';
|
|
5
|
-
import { getModelsCacheDir, getShardedModelCacheDir, generateShortHash, detectShardedModel, parsePatternBasedShardUrl,
|
|
6
|
-
import { safeFetch } from '
|
|
7
|
-
import { shouldEnforceSecureTransport, verifyHttpModelFile } from '
|
|
57
|
+
import { getModelsCacheDir, getShardedModelCacheDir, generateShortHash, detectShardedModel, parsePatternBasedShardUrl, calculatePercentage, isArchiveUrl, sanitizePathComponent, extractAndValidateShardedArchive, isShardedExtractionComplete, generateShardFilenames, hasValidGGUFHeader } from '../../utils/index.js';
|
|
58
|
+
import { safeFetch } from '../../handlers/load-model/safe-fetch.js';
|
|
59
|
+
import { shouldEnforceSecureTransport, verifyHttpModelFile } from '../../handlers/load-model/http-verify.js';
|
|
8
60
|
import { getConfig } from '../../runtime/state.js';
|
|
9
61
|
import { getLifecycleState, onResume } from '../../runtime/runtime-lifecycle.js';
|
|
10
|
-
import { createHttpDownloadKey, startOrJoinDownload, applyJoinedDownloadStats } from '
|
|
62
|
+
import { createHttpDownloadKey, startOrJoinDownload, applyJoinedDownloadStats } from '../../handlers/load-model/download-manager.js';
|
|
63
|
+
import { acquireDownloadLock, partialDownloadPath, publishDownload } from '../../handlers/load-model/download-lock.js';
|
|
11
64
|
import { ChecksumUnavailableError, ChecksumValidationFailedError, DownloadCancelledError, HTTPError, InsecureModelSourceError, NoResponseBodyError, PartialDownloadOfflineError, ResponseBodyNotReadableError } from '../../errors/index.js';
|
|
12
65
|
import { getEngineLogger } from '../../logging/index.js';
|
|
13
66
|
const logger = getEngineLogger();
|
|
@@ -41,9 +94,18 @@ function extractFilenameFromUrl(url) {
|
|
|
41
94
|
// cache entry from before this shipped, or one written down the warn-and-proceed
|
|
42
95
|
// path, is served as-is: tightening requireHttpChecksum does not retroactively
|
|
43
96
|
// verify the cache — clear it to force a fresh, verified download.
|
|
97
|
+
//
|
|
98
|
+
// Downloads land here only once verified (see `publishDownload`), but a partial
|
|
99
|
+
// an older SDK wrote in place can still pass the offline header check.
|
|
44
100
|
async function validateCachedFile(modelPath, url, requireSecureTransport, signal) {
|
|
45
101
|
try {
|
|
46
102
|
await fsPromises.access(modelPath);
|
|
103
|
+
}
|
|
104
|
+
catch {
|
|
105
|
+
await assertPartialCanResume(modelPath, url, requireSecureTransport, signal);
|
|
106
|
+
return null;
|
|
107
|
+
}
|
|
108
|
+
try {
|
|
47
109
|
const localStats = await fsPromises.stat(modelPath);
|
|
48
110
|
const localSize = localStats.size;
|
|
49
111
|
const config = getConfig();
|
|
@@ -93,6 +155,28 @@ async function validateCachedFile(modelPath, url, requireSecureTransport, signal
|
|
|
93
155
|
return null;
|
|
94
156
|
}
|
|
95
157
|
}
|
|
158
|
+
// Only the `.part` of an interrupted download is on disk. Resuming it needs the
|
|
159
|
+
// network, so offline this fails as an offline partial instead of retrying.
|
|
160
|
+
async function assertPartialCanResume(modelPath, url, requireSecureTransport, signal) {
|
|
161
|
+
const partialSize = await fsPromises.stat(partialDownloadPath(modelPath)).then((stats) => stats.size, () => 0);
|
|
162
|
+
if (partialSize === 0)
|
|
163
|
+
return;
|
|
164
|
+
try {
|
|
165
|
+
const response = await safeFetch(url, {
|
|
166
|
+
method: 'HEAD',
|
|
167
|
+
timeoutMs: getConfig().httpConnectionTimeoutMs ?? DEFAULT_HTTP_CONNECTION_TIMEOUT_MS,
|
|
168
|
+
enforceSecureTransport: shouldEnforceSecureTransport(url, requireSecureTransport),
|
|
169
|
+
...(signal && { signal })
|
|
170
|
+
});
|
|
171
|
+
response.body.resume();
|
|
172
|
+
}
|
|
173
|
+
catch (error) {
|
|
174
|
+
if (signal?.aborted || error instanceof InsecureModelSourceError)
|
|
175
|
+
throw error;
|
|
176
|
+
logger.error(`❌ Offline with partial download (${partialSize} bytes). Cannot resume without network.`);
|
|
177
|
+
throw new PartialDownloadOfflineError(url, partialSize);
|
|
178
|
+
}
|
|
179
|
+
}
|
|
96
180
|
async function performHttpDownload(url, modelPath, downloadKey, requireSecureTransport, progressCallback, signal) {
|
|
97
181
|
if (signal?.aborted) {
|
|
98
182
|
throw new DownloadCancelledError();
|
|
@@ -199,6 +283,7 @@ async function performHttpDownload(url, modelPath, downloadKey, requireSecureTra
|
|
|
199
283
|
// Create write stream (append if resuming)
|
|
200
284
|
const writeStreamOptions = startOffset > 0 && response.status === 206 ? { flags: 'a' } : {};
|
|
201
285
|
const writeStream = fs.createWriteStream(modelPath, writeStreamOptions);
|
|
286
|
+
const writeStreamClosed = new Promise((resolve) => writeStream.once('close', resolve));
|
|
202
287
|
// Get the response body
|
|
203
288
|
const body = response.body;
|
|
204
289
|
if (!body) {
|
|
@@ -283,7 +368,9 @@ async function performHttpDownload(url, modelPath, downloadKey, requireSecureTra
|
|
|
283
368
|
}
|
|
284
369
|
}
|
|
285
370
|
catch (error) {
|
|
371
|
+
// Let an in-flight write land before the caller can release its lock.
|
|
286
372
|
writeStream.destroy();
|
|
373
|
+
await writeStreamClosed;
|
|
287
374
|
logger.error('Error during download:', error instanceof Error ? error.message : String(error));
|
|
288
375
|
throw error instanceof Error ? error : new Error(String(error));
|
|
289
376
|
}
|
|
@@ -384,6 +471,13 @@ async function performHttpDownloadWithResume(url, modelPath, downloadKey, requir
|
|
|
384
471
|
}
|
|
385
472
|
}
|
|
386
473
|
}
|
|
474
|
+
/** Download to the partial path, resuming it, then verify and publish. Callers hold the lock. */
|
|
475
|
+
async function downloadVerifyAndPublish(url, finalPath, downloadKey, requireSecureTransport, requireChecksum, progressCallback, signal, hooks) {
|
|
476
|
+
const partialPath = partialDownloadPath(finalPath);
|
|
477
|
+
const meta = await performHttpDownloadWithResume(url, partialPath, downloadKey, requireSecureTransport, progressCallback, signal);
|
|
478
|
+
await verifyHttpModelFile(url, partialPath, meta.hubSha256, requireChecksum, hooks);
|
|
479
|
+
await publishDownload(finalPath);
|
|
480
|
+
}
|
|
387
481
|
export async function downloadModelFromHttp(url, progressCallback, hooks, security) {
|
|
388
482
|
const filename = extractFilenameFromUrl(url);
|
|
389
483
|
if (isArchiveUrl(url)) {
|
|
@@ -400,14 +494,39 @@ export async function downloadModelFromHttp(url, progressCallback, hooks, securi
|
|
|
400
494
|
const modelPath = `${cacheDir}/${sourceHash}_${filename}`;
|
|
401
495
|
const { requireChecksum, requireSecureTransport } = resolveDownloadSecurity(security);
|
|
402
496
|
const result = startOrJoinDownload(downloadKey, async (ctx) => {
|
|
497
|
+
const env_1 = { stack: [], error: void 0, hasError: false };
|
|
403
498
|
try {
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
499
|
+
const _downloadLock = __addDisposableResource(env_1, await acquireDownloadLock(downloadKey, ctx.signal), true);
|
|
500
|
+
try {
|
|
501
|
+
// Check if already cached
|
|
502
|
+
const cached = await validateCachedFile(modelPath, url, requireSecureTransport, ctx.signal);
|
|
503
|
+
if (cached) {
|
|
504
|
+
hooks?.markCacheHit?.();
|
|
505
|
+
ctx.setCacheHit(true);
|
|
506
|
+
try {
|
|
507
|
+
const stats = await fsPromises.stat(cached);
|
|
508
|
+
ctx.broadcastProgress({
|
|
509
|
+
type: 'modelProgress',
|
|
510
|
+
downloaded: stats.size,
|
|
511
|
+
total: stats.size,
|
|
512
|
+
percentage: 100,
|
|
513
|
+
downloadKey
|
|
514
|
+
});
|
|
515
|
+
}
|
|
516
|
+
catch (error) {
|
|
517
|
+
logger.debug('Failed to get file stats for progress callback', {
|
|
518
|
+
path: cached,
|
|
519
|
+
error
|
|
520
|
+
});
|
|
521
|
+
}
|
|
522
|
+
return cached;
|
|
523
|
+
}
|
|
524
|
+
// Download the file
|
|
525
|
+
hooks?.markCacheMiss?.();
|
|
526
|
+
ctx.setCacheHit(false);
|
|
527
|
+
await downloadVerifyAndPublish(url, modelPath, downloadKey, requireSecureTransport, requireChecksum, ctx.broadcastProgress, ctx.signal, hooks);
|
|
409
528
|
try {
|
|
410
|
-
const stats = await fsPromises.stat(
|
|
529
|
+
const stats = await fsPromises.stat(modelPath);
|
|
411
530
|
ctx.broadcastProgress({
|
|
412
531
|
type: 'modelProgress',
|
|
413
532
|
downloaded: stats.size,
|
|
@@ -417,59 +536,47 @@ export async function downloadModelFromHttp(url, progressCallback, hooks, securi
|
|
|
417
536
|
});
|
|
418
537
|
}
|
|
419
538
|
catch (error) {
|
|
420
|
-
logger.debug('Failed to get file stats for progress
|
|
421
|
-
path:
|
|
539
|
+
logger.debug('Failed to get file stats for final progress update', {
|
|
540
|
+
path: modelPath,
|
|
422
541
|
error
|
|
423
542
|
});
|
|
424
543
|
}
|
|
425
|
-
return
|
|
426
|
-
}
|
|
427
|
-
// Download the file
|
|
428
|
-
hooks?.markCacheMiss?.();
|
|
429
|
-
ctx.setCacheHit(false);
|
|
430
|
-
const meta = await performHttpDownloadWithResume(url, modelPath, downloadKey, requireSecureTransport, ctx.broadcastProgress, ctx.signal);
|
|
431
|
-
await verifyHttpModelFile(url, modelPath, meta.hubSha256, requireChecksum, hooks);
|
|
432
|
-
try {
|
|
433
|
-
const stats = await fsPromises.stat(modelPath);
|
|
434
|
-
ctx.broadcastProgress({
|
|
435
|
-
type: 'modelProgress',
|
|
436
|
-
downloaded: stats.size,
|
|
437
|
-
total: stats.size,
|
|
438
|
-
percentage: 100,
|
|
439
|
-
downloadKey
|
|
440
|
-
});
|
|
544
|
+
return modelPath;
|
|
441
545
|
}
|
|
442
546
|
catch (error) {
|
|
443
|
-
logger.
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
547
|
+
logger.error('❌ Error downloading model:', error instanceof Error ? error.message : String(error));
|
|
548
|
+
// Check if we should delete the partial file (clearCache was requested)
|
|
549
|
+
if (error instanceof DownloadCancelledError) {
|
|
550
|
+
if (ctx.shouldClearCache()) {
|
|
551
|
+
logger.info('🗑️ Clearing cache - deleting partial file');
|
|
552
|
+
const partialPath = partialDownloadPath(modelPath);
|
|
553
|
+
try {
|
|
554
|
+
await fsPromises.unlink(partialPath);
|
|
555
|
+
logger.info(`✅ Deleted partial file: ${partialPath}`);
|
|
556
|
+
}
|
|
557
|
+
catch (error) {
|
|
558
|
+
logger.debug('Failed to delete partial file during cleanup', {
|
|
559
|
+
path: partialPath,
|
|
560
|
+
error
|
|
561
|
+
});
|
|
562
|
+
}
|
|
459
563
|
}
|
|
460
|
-
|
|
461
|
-
logger.
|
|
462
|
-
path: modelPath,
|
|
463
|
-
error
|
|
464
|
-
});
|
|
564
|
+
else {
|
|
565
|
+
logger.info('📥 Download paused - partial file preserved for resume');
|
|
465
566
|
}
|
|
466
567
|
}
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
}
|
|
568
|
+
const errorToThrow = error instanceof Error ? error : new Error(String(error));
|
|
569
|
+
throw errorToThrow;
|
|
470
570
|
}
|
|
471
|
-
|
|
472
|
-
|
|
571
|
+
}
|
|
572
|
+
catch (e_1) {
|
|
573
|
+
env_1.error = e_1;
|
|
574
|
+
env_1.hasError = true;
|
|
575
|
+
}
|
|
576
|
+
finally {
|
|
577
|
+
const result_1 = __disposeResources(env_1);
|
|
578
|
+
if (result_1)
|
|
579
|
+
await result_1;
|
|
473
580
|
}
|
|
474
581
|
}, progressCallback, hooks?.requestBinding);
|
|
475
582
|
return applyJoinedDownloadStats(result, hooks);
|
|
@@ -485,84 +592,98 @@ async function downloadShardedModelFromHttp(shardUrl, progressCallback, hooks, s
|
|
|
485
592
|
logger.info(`📥 HTTP sharded download: ${shardInfos.length} shards detected from ${shardUrl}`);
|
|
486
593
|
const shardDir = getShardedModelCacheDir(cacheKey);
|
|
487
594
|
const result = startOrJoinDownload(downloadKey, async (ctx) => {
|
|
595
|
+
const env_2 = { stack: [], error: void 0, hasError: false };
|
|
488
596
|
try {
|
|
489
|
-
const
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
|
|
597
|
+
const _downloadLock = __addDisposableResource(env_2, await acquireDownloadLock(downloadKey, ctx.signal), true);
|
|
598
|
+
try {
|
|
599
|
+
// The previous holder may have cleared the cache while this one waited.
|
|
600
|
+
await fsPromises.mkdir(shardDir, { recursive: true });
|
|
601
|
+
const shardStates = await Promise.all(shardInfos.map(async (shard, index) => {
|
|
602
|
+
const shardPath = path.join(shardDir, shard.filename);
|
|
603
|
+
let expectedSize = 0;
|
|
604
|
+
try {
|
|
605
|
+
const response = await safeFetch(shard.url, {
|
|
606
|
+
method: 'HEAD',
|
|
607
|
+
timeoutMs: connectionTimeout,
|
|
608
|
+
enforceSecureTransport: shouldEnforceSecureTransport(shard.url, requireSecureTransport),
|
|
609
|
+
signal: ctx.signal
|
|
610
|
+
});
|
|
611
|
+
response.body.resume();
|
|
612
|
+
expectedSize = parseInt(String(response.headers['content-length'] ?? '0') || '0');
|
|
613
|
+
}
|
|
614
|
+
catch (error) {
|
|
615
|
+
// A refused insecure hop is terminal; fail fast instead of logging a
|
|
616
|
+
// misleading "failed to get shard size" and hitting it again on GET.
|
|
617
|
+
if (error instanceof InsecureModelSourceError)
|
|
618
|
+
throw error;
|
|
619
|
+
logger.warn('Failed to get shard size via HEAD request', {
|
|
620
|
+
url: shard.url,
|
|
621
|
+
error
|
|
622
|
+
});
|
|
623
|
+
}
|
|
624
|
+
return {
|
|
625
|
+
index,
|
|
626
|
+
shard,
|
|
627
|
+
shardPath,
|
|
628
|
+
expectedSize,
|
|
629
|
+
downloadedBytes: 0,
|
|
630
|
+
isComplete: false
|
|
631
|
+
};
|
|
632
|
+
}));
|
|
633
|
+
const overallTotal = shardStates.reduce((sum, s) => sum + s.expectedSize, 0);
|
|
634
|
+
logger.info(`📏 Total size: ${overallTotal} bytes (${(overallTotal / 1024 / 1024).toFixed(2)} MB)`);
|
|
635
|
+
const cacheChecks = await Promise.all(shardStates.map(async (state) => {
|
|
636
|
+
const cached = await validateCachedFile(state.shardPath, state.shard.url, requireSecureTransport, ctx.signal);
|
|
637
|
+
return { state, isCached: cached !== null };
|
|
638
|
+
}));
|
|
639
|
+
const shardsToDownload = cacheChecks.filter((c) => !c.isCached).map((c) => c.state);
|
|
640
|
+
for (const check of cacheChecks) {
|
|
641
|
+
if (check.isCached) {
|
|
642
|
+
check.state.isComplete = true;
|
|
643
|
+
check.state.downloadedBytes = check.state.expectedSize;
|
|
644
|
+
}
|
|
501
645
|
}
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
throw error;
|
|
507
|
-
logger.warn('Failed to get shard size via HEAD request', {
|
|
508
|
-
url: shard.url,
|
|
509
|
-
error
|
|
510
|
-
});
|
|
646
|
+
logger.info(`📥 ${shardsToDownload.length} of ${shardInfos.length} shards need downloading`);
|
|
647
|
+
if (shardsToDownload.length === 0) {
|
|
648
|
+
hooks?.markCacheHit?.();
|
|
649
|
+
ctx.setCacheHit(true);
|
|
511
650
|
}
|
|
512
|
-
|
|
513
|
-
|
|
514
|
-
|
|
515
|
-
shardPath,
|
|
516
|
-
expectedSize,
|
|
517
|
-
downloadedBytes: 0,
|
|
518
|
-
isComplete: false
|
|
519
|
-
};
|
|
520
|
-
}));
|
|
521
|
-
const overallTotal = shardStates.reduce((sum, s) => sum + s.expectedSize, 0);
|
|
522
|
-
logger.info(`📏 Total size: ${overallTotal} bytes (${(overallTotal / 1024 / 1024).toFixed(2)} MB)`);
|
|
523
|
-
const cacheChecks = await Promise.all(shardStates.map(async (state) => {
|
|
524
|
-
const cached = await validateCachedFile(state.shardPath, state.shard.url, requireSecureTransport, ctx.signal);
|
|
525
|
-
return { state, isCached: cached !== null };
|
|
526
|
-
}));
|
|
527
|
-
const shardsToDownload = cacheChecks.filter((c) => !c.isCached).map((c) => c.state);
|
|
528
|
-
for (const check of cacheChecks) {
|
|
529
|
-
if (check.isCached) {
|
|
530
|
-
check.state.isComplete = true;
|
|
531
|
-
check.state.downloadedBytes = check.state.expectedSize;
|
|
651
|
+
else {
|
|
652
|
+
hooks?.markCacheMiss?.();
|
|
653
|
+
ctx.setCacheHit(false);
|
|
532
654
|
}
|
|
655
|
+
await downloadShardsWithConcurrency(shardsToDownload, shardStates, concurrency, ctx.signal, downloadKey, overallTotal, requireSecureTransport, ctx.broadcastProgress, requireChecksum, hooks);
|
|
656
|
+
logger.info(`✅ All ${shardInfos.length} shards downloaded successfully`);
|
|
657
|
+
return path.join(shardDir, shardInfos[0].filename);
|
|
533
658
|
}
|
|
534
|
-
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
logger.error('❌ Error during sharded download:', error instanceof Error ? error.message : String(error));
|
|
550
|
-
if (error instanceof DownloadCancelledError) {
|
|
551
|
-
if (ctx.shouldClearCache()) {
|
|
552
|
-
logger.info('🗑️ Clearing cache - deleting partial shard files');
|
|
553
|
-
try {
|
|
554
|
-
await fsPromises.rm(shardDir, { recursive: true, force: true });
|
|
555
|
-
logger.info(`✅ Deleted shard directory: ${shardDir}`);
|
|
556
|
-
}
|
|
557
|
-
catch (cleanupError) {
|
|
558
|
-
logger.debug('Failed to delete shard directory during cleanup', {
|
|
559
|
-
path: shardDir,
|
|
560
|
-
error: cleanupError
|
|
561
|
-
});
|
|
659
|
+
catch (error) {
|
|
660
|
+
logger.error('❌ Error during sharded download:', error instanceof Error ? error.message : String(error));
|
|
661
|
+
if (error instanceof DownloadCancelledError) {
|
|
662
|
+
if (ctx.shouldClearCache()) {
|
|
663
|
+
logger.info('🗑️ Clearing cache - deleting partial shard files');
|
|
664
|
+
try {
|
|
665
|
+
await fsPromises.rm(shardDir, { recursive: true, force: true });
|
|
666
|
+
logger.info(`✅ Deleted shard directory: ${shardDir}`);
|
|
667
|
+
}
|
|
668
|
+
catch (cleanupError) {
|
|
669
|
+
logger.debug('Failed to delete shard directory during cleanup', {
|
|
670
|
+
path: shardDir,
|
|
671
|
+
error: cleanupError
|
|
672
|
+
});
|
|
673
|
+
}
|
|
562
674
|
}
|
|
563
675
|
}
|
|
676
|
+
throw error;
|
|
564
677
|
}
|
|
565
|
-
|
|
678
|
+
}
|
|
679
|
+
catch (e_2) {
|
|
680
|
+
env_2.error = e_2;
|
|
681
|
+
env_2.hasError = true;
|
|
682
|
+
}
|
|
683
|
+
finally {
|
|
684
|
+
const result_2 = __disposeResources(env_2);
|
|
685
|
+
if (result_2)
|
|
686
|
+
await result_2;
|
|
566
687
|
}
|
|
567
688
|
}, progressCallback, hooks?.requestBinding);
|
|
568
689
|
return applyJoinedDownloadStats(result, hooks);
|
|
@@ -577,43 +698,27 @@ async function downloadShardedModelFromArchive(archiveUrl, progressCallback, hoo
|
|
|
577
698
|
const extractDir = getShardedModelCacheDir(sourceHash);
|
|
578
699
|
const archivePath = path.join(extractDir, `${sourceHash}_${filename}`);
|
|
579
700
|
const result = startOrJoinDownload(downloadKey, async (ctx) => {
|
|
701
|
+
const env_3 = { stack: [], error: void 0, hasError: false };
|
|
580
702
|
try {
|
|
581
|
-
await
|
|
582
|
-
const files = await fsPromises.readdir(extractDir);
|
|
583
|
-
const shardedFile = files.find((f) => detectShardedModel(String(f)).isSharded);
|
|
584
|
-
if (!shardedFile) {
|
|
585
|
-
hooks?.markCacheMiss?.();
|
|
586
|
-
ctx.setCacheHit(false);
|
|
587
|
-
return downloadAndExtractArchive();
|
|
588
|
-
}
|
|
589
|
-
const shardFilename = String(shardedFile);
|
|
590
|
-
const allShardsExist = await checkAllShardsExist(extractDir, shardFilename);
|
|
591
|
-
if (!allShardsExist) {
|
|
592
|
-
logger.warn(`⚠️ Incomplete shards found, re-downloading archive`);
|
|
593
|
-
hooks?.markCacheMiss?.();
|
|
594
|
-
ctx.setCacheHit(false);
|
|
595
|
-
return downloadAndExtractArchive();
|
|
596
|
-
}
|
|
597
|
-
const shardFilenames = generateShardFilenames(shardFilename);
|
|
598
|
-
const firstShard = path.join(extractDir, shardFilenames[0]);
|
|
599
|
-
const isComplete = await validateShardedModelCache(extractDir, shardFilename);
|
|
600
|
-
if (isComplete) {
|
|
601
|
-
logger.info(`✅ Archive already extracted: ${extractDir}`);
|
|
602
|
-
hooks?.markCacheHit?.();
|
|
603
|
-
ctx.setCacheHit(true);
|
|
604
|
-
ctx.broadcastProgress({
|
|
605
|
-
type: 'modelProgress',
|
|
606
|
-
downloaded: 1,
|
|
607
|
-
total: 1,
|
|
608
|
-
percentage: 100,
|
|
609
|
-
downloadKey
|
|
610
|
-
});
|
|
611
|
-
return firstShard;
|
|
612
|
-
}
|
|
613
|
-
logger.info(`📝 All shards present but tensors.txt missing, extracting tensors...`);
|
|
703
|
+
const _downloadLock = __addDisposableResource(env_3, await acquireDownloadLock(downloadKey, ctx.signal), true);
|
|
614
704
|
try {
|
|
615
|
-
await
|
|
616
|
-
|
|
705
|
+
await fsPromises.mkdir(extractDir, { recursive: true });
|
|
706
|
+
const files = await fsPromises.readdir(extractDir);
|
|
707
|
+
const shardedFile = files.find((f) => detectShardedModel(String(f)).isSharded);
|
|
708
|
+
if (!shardedFile) {
|
|
709
|
+
hooks?.markCacheMiss?.();
|
|
710
|
+
ctx.setCacheHit(false);
|
|
711
|
+
return await downloadAndExtractArchive();
|
|
712
|
+
}
|
|
713
|
+
const shardFilename = String(shardedFile);
|
|
714
|
+
if (!(await isShardedExtractionComplete(extractDir, shardFilename))) {
|
|
715
|
+
logger.warn(`⚠️ Incomplete extraction found, re-downloading archive`);
|
|
716
|
+
hooks?.markCacheMiss?.();
|
|
717
|
+
ctx.setCacheHit(false);
|
|
718
|
+
return await downloadAndExtractArchive();
|
|
719
|
+
}
|
|
720
|
+
const shardFilenames = generateShardFilenames(shardFilename);
|
|
721
|
+
logger.info(`✅ Archive already extracted: ${extractDir}`);
|
|
617
722
|
hooks?.markCacheHit?.();
|
|
618
723
|
ctx.setCacheHit(true);
|
|
619
724
|
ctx.broadcastProgress({
|
|
@@ -623,57 +728,57 @@ async function downloadShardedModelFromArchive(archiveUrl, progressCallback, hoo
|
|
|
623
728
|
percentage: 100,
|
|
624
729
|
downloadKey
|
|
625
730
|
});
|
|
626
|
-
return
|
|
731
|
+
return path.join(extractDir, shardFilenames[0]);
|
|
627
732
|
}
|
|
628
733
|
catch (error) {
|
|
629
|
-
logger.
|
|
630
|
-
|
|
631
|
-
|
|
632
|
-
|
|
633
|
-
|
|
634
|
-
|
|
635
|
-
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
|
|
639
|
-
|
|
640
|
-
|
|
641
|
-
|
|
642
|
-
|
|
643
|
-
|
|
644
|
-
|
|
645
|
-
|
|
646
|
-
});
|
|
647
|
-
logger.info(`✅ Deleted extract directory: ${extractDir}`);
|
|
648
|
-
}
|
|
649
|
-
catch (cleanupError) {
|
|
650
|
-
logger.debug('Failed to delete extract directory during cleanup', {
|
|
651
|
-
path: extractDir,
|
|
652
|
-
error: cleanupError
|
|
653
|
-
});
|
|
734
|
+
logger.error('❌ Error downloading/extracting archive:', error);
|
|
735
|
+
if (error instanceof DownloadCancelledError) {
|
|
736
|
+
if (ctx.shouldClearCache()) {
|
|
737
|
+
logger.info('🗑️ Clearing cache - deleting archive extract directory');
|
|
738
|
+
try {
|
|
739
|
+
await fsPromises.rm(extractDir, {
|
|
740
|
+
recursive: true,
|
|
741
|
+
force: true
|
|
742
|
+
});
|
|
743
|
+
logger.info(`✅ Deleted extract directory: ${extractDir}`);
|
|
744
|
+
}
|
|
745
|
+
catch (cleanupError) {
|
|
746
|
+
logger.debug('Failed to delete extract directory during cleanup', {
|
|
747
|
+
path: extractDir,
|
|
748
|
+
error: cleanupError
|
|
749
|
+
});
|
|
750
|
+
}
|
|
654
751
|
}
|
|
655
752
|
}
|
|
753
|
+
throw error;
|
|
656
754
|
}
|
|
657
|
-
|
|
658
|
-
|
|
659
|
-
|
|
660
|
-
|
|
661
|
-
|
|
662
|
-
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
|
|
673
|
-
|
|
674
|
-
});
|
|
755
|
+
async function downloadAndExtractArchive() {
|
|
756
|
+
// Verify the downloaded archive before extraction so tampered bytes
|
|
757
|
+
// never reach the extractor.
|
|
758
|
+
await downloadVerifyAndPublish(archiveUrl, archivePath, downloadKey, requireSecureTransport, requireChecksum, ctx.broadcastProgress, ctx.signal, hooks);
|
|
759
|
+
logger.info(`✅ Archive downloaded, extracting to: ${extractDir}`);
|
|
760
|
+
const firstShardPath = await extractAndValidateShardedArchive(archivePath, extractDir, ctx.signal);
|
|
761
|
+
try {
|
|
762
|
+
await fsPromises.unlink(archivePath);
|
|
763
|
+
logger.info(`🗑️ Cleaned up archive file: ${archivePath}`);
|
|
764
|
+
}
|
|
765
|
+
catch (cleanupError) {
|
|
766
|
+
logger.debug('Failed to delete archive file during cleanup', {
|
|
767
|
+
path: archivePath,
|
|
768
|
+
error: cleanupError
|
|
769
|
+
});
|
|
770
|
+
}
|
|
771
|
+
return firstShardPath;
|
|
675
772
|
}
|
|
676
|
-
|
|
773
|
+
}
|
|
774
|
+
catch (e_3) {
|
|
775
|
+
env_3.error = e_3;
|
|
776
|
+
env_3.hasError = true;
|
|
777
|
+
}
|
|
778
|
+
finally {
|
|
779
|
+
const result_3 = __disposeResources(env_3);
|
|
780
|
+
if (result_3)
|
|
781
|
+
await result_3;
|
|
677
782
|
}
|
|
678
783
|
}, progressCallback, hooks?.requestBinding);
|
|
679
784
|
return applyJoinedDownloadStats(result, hooks);
|
|
@@ -681,15 +786,26 @@ async function downloadShardedModelFromArchive(archiveUrl, progressCallback, hoo
|
|
|
681
786
|
async function downloadShardsWithConcurrency(shardsToDownload, allShards, concurrency, signal, downloadKey, overallTotal, requireSecureTransport, progressCallback, requireChecksum = false, hooks) {
|
|
682
787
|
const queue = [...shardsToDownload];
|
|
683
788
|
const inFlight = new Set();
|
|
789
|
+
// A failed or cancelled shard stops the rest, and all settle before this
|
|
790
|
+
// returns, so nothing writes after the caller releases its lock.
|
|
791
|
+
const shardsController = new AbortController();
|
|
792
|
+
const stopShards = () => shardsController.abort(undefined);
|
|
793
|
+
signal.addEventListener('abort', stopShards, { once: true });
|
|
794
|
+
const stopAndSettle = async () => {
|
|
795
|
+
stopShards();
|
|
796
|
+
signal.removeEventListener('abort', stopShards);
|
|
797
|
+
await Promise.allSettled([...inFlight]);
|
|
798
|
+
};
|
|
684
799
|
while (queue.length > 0 || inFlight.size > 0) {
|
|
685
800
|
if (signal.aborted) {
|
|
801
|
+
await stopAndSettle();
|
|
686
802
|
throw new DownloadCancelledError();
|
|
687
803
|
}
|
|
688
804
|
while (queue.length > 0 && inFlight.size < concurrency) {
|
|
689
805
|
const state = queue.shift();
|
|
690
806
|
const downloadPromise = (async () => {
|
|
691
807
|
logger.info(`📥 Downloading shard ${state.index + 1}: ${state.shard.filename}`);
|
|
692
|
-
|
|
808
|
+
await downloadVerifyAndPublish(state.shard.url, state.shardPath, downloadKey, requireSecureTransport, requireChecksum, (progress) => {
|
|
693
809
|
state.downloadedBytes = progress.downloaded;
|
|
694
810
|
if (progressCallback) {
|
|
695
811
|
const overallDownloaded = allShards.reduce((sum, s) => sum + s.downloadedBytes, 0);
|
|
@@ -709,8 +825,7 @@ async function downloadShardsWithConcurrency(shardsToDownload, allShards, concur
|
|
|
709
825
|
}
|
|
710
826
|
});
|
|
711
827
|
}
|
|
712
|
-
}, signal);
|
|
713
|
-
await verifyHttpModelFile(state.shard.url, state.shardPath, meta.hubSha256, requireChecksum, hooks);
|
|
828
|
+
}, shardsController.signal, hooks);
|
|
714
829
|
logger.info(`✅ Shard ${state.index + 1} complete: ${state.shard.filename}`);
|
|
715
830
|
})().finally(() => {
|
|
716
831
|
inFlight.delete(downloadPromise);
|
|
@@ -718,9 +833,16 @@ async function downloadShardsWithConcurrency(shardsToDownload, allShards, concur
|
|
|
718
833
|
inFlight.add(downloadPromise);
|
|
719
834
|
}
|
|
720
835
|
if (inFlight.size > 0) {
|
|
721
|
-
|
|
836
|
+
try {
|
|
837
|
+
await Promise.race(inFlight);
|
|
838
|
+
}
|
|
839
|
+
catch (error) {
|
|
840
|
+
await stopAndSettle();
|
|
841
|
+
throw error;
|
|
842
|
+
}
|
|
722
843
|
}
|
|
723
844
|
}
|
|
845
|
+
signal.removeEventListener('abort', stopShards);
|
|
724
846
|
// Mark all downloaded shards as complete
|
|
725
847
|
for (const state of shardsToDownload) {
|
|
726
848
|
state.isComplete = true;
|