@zvec/zvec-grep 0.2.1 → 0.3.0-rc.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +87 -238
- package/bin/zg.exe +3 -0
- package/install.cjs +510 -0
- package/package.json +22 -72
- package/platforms.json +92 -0
- package/plugins.cjs +183 -0
- package/README_CN.md +0 -230
- package/dist/authorization/index.d.ts +0 -7
- package/dist/authorization/index.js +0 -7
- package/dist/authorization/index.js.map +0 -1
- package/dist/authorization/manager.d.ts +0 -8
- package/dist/authorization/manager.js +0 -19
- package/dist/authorization/manager.js.map +0 -1
- package/dist/authorization/operation.d.ts +0 -7
- package/dist/authorization/operation.js +0 -50
- package/dist/authorization/operation.js.map +0 -1
- package/dist/authorization/planner.d.ts +0 -21
- package/dist/authorization/planner.js +0 -97
- package/dist/authorization/planner.js.map +0 -1
- package/dist/authorization/prompt.d.ts +0 -12
- package/dist/authorization/prompt.js +0 -63
- package/dist/authorization/prompt.js.map +0 -1
- package/dist/authorization/store.d.ts +0 -20
- package/dist/authorization/store.js +0 -251
- package/dist/authorization/store.js.map +0 -1
- package/dist/authorization/target.d.ts +0 -15
- package/dist/authorization/target.js +0 -49
- package/dist/authorization/target.js.map +0 -1
- package/dist/authorization/types.d.ts +0 -61
- package/dist/authorization/types.js +0 -2
- package/dist/authorization/types.js.map +0 -1
- package/dist/cli/args.d.ts +0 -5
- package/dist/cli/args.js +0 -1207
- package/dist/cli/args.js.map +0 -1
- package/dist/cli/auth.d.ts +0 -21
- package/dist/cli/auth.js +0 -209
- package/dist/cli/auth.js.map +0 -1
- package/dist/cli/commands.d.ts +0 -4
- package/dist/cli/commands.js +0 -697
- package/dist/cli/commands.js.map +0 -1
- package/dist/cli/errors.d.ts +0 -6
- package/dist/cli/errors.js +0 -98
- package/dist/cli/errors.js.map +0 -1
- package/dist/cli/format/context.d.ts +0 -9
- package/dist/cli/format/context.js +0 -786
- package/dist/cli/format/context.js.map +0 -1
- package/dist/cli/format/debug.d.ts +0 -4
- package/dist/cli/format/debug.js +0 -60
- package/dist/cli/format/debug.js.map +0 -1
- package/dist/cli/format/highlight.d.ts +0 -3
- package/dist/cli/format/highlight.js +0 -106
- package/dist/cli/format/highlight.js.map +0 -1
- package/dist/cli/format/progress.d.ts +0 -13
- package/dist/cli/format/progress.js +0 -290
- package/dist/cli/format/progress.js.map +0 -1
- package/dist/cli/format/range.d.ts +0 -3
- package/dist/cli/format/range.js +0 -24
- package/dist/cli/format/range.js.map +0 -1
- package/dist/cli/format/status.d.ts +0 -81
- package/dist/cli/format/status.js +0 -512
- package/dist/cli/format/status.js.map +0 -1
- package/dist/cli/help.d.ts +0 -1
- package/dist/cli/help.js +0 -524
- package/dist/cli/help.js.map +0 -1
- package/dist/cli/index.d.ts +0 -2
- package/dist/cli/index.js +0 -32
- package/dist/cli/index.js.map +0 -1
- package/dist/cli/install.d.ts +0 -4
- package/dist/cli/install.js +0 -1661
- package/dist/cli/install.js.map +0 -1
- package/dist/cli/managed-rg.d.ts +0 -10
- package/dist/cli/managed-rg.js +0 -329
- package/dist/cli/managed-rg.js.map +0 -1
- package/dist/cli/server-search.d.ts +0 -3
- package/dist/cli/server-search.js +0 -12
- package/dist/cli/server-search.js.map +0 -1
- package/dist/cli/types.d.ts +0 -87
- package/dist/cli/types.js +0 -10
- package/dist/cli/types.js.map +0 -1
- package/dist/cli/version.d.ts +0 -1
- package/dist/cli/version.js +0 -13
- package/dist/cli/version.js.map +0 -1
- package/dist/client/daemon-client.d.ts +0 -31
- package/dist/client/daemon-client.js +0 -203
- package/dist/client/daemon-client.js.map +0 -1
- package/dist/client/mode-router.d.ts +0 -9
- package/dist/client/mode-router.js +0 -28
- package/dist/client/mode-router.js.map +0 -1
- package/dist/client/search-policy.d.ts +0 -11
- package/dist/client/search-policy.js +0 -15
- package/dist/client/search-policy.js.map +0 -1
- package/dist/daemon/backend.d.ts +0 -78
- package/dist/daemon/backend.js +0 -1085
- package/dist/daemon/backend.js.map +0 -1
- package/dist/daemon/change-set.d.ts +0 -30
- package/dist/daemon/change-set.js +0 -163
- package/dist/daemon/change-set.js.map +0 -1
- package/dist/daemon/config.d.ts +0 -24
- package/dist/daemon/config.js +0 -88
- package/dist/daemon/config.js.map +0 -1
- package/dist/daemon/errors.d.ts +0 -5
- package/dist/daemon/errors.js +0 -11
- package/dist/daemon/errors.js.map +0 -1
- package/dist/daemon/http-server.d.ts +0 -30
- package/dist/daemon/http-server.js +0 -288
- package/dist/daemon/http-server.js.map +0 -1
- package/dist/daemon/index-coordinator.d.ts +0 -22
- package/dist/daemon/index-coordinator.js +0 -55
- package/dist/daemon/index-coordinator.js.map +0 -1
- package/dist/daemon/job-scheduler.d.ts +0 -70
- package/dist/daemon/job-scheduler.js +0 -366
- package/dist/daemon/job-scheduler.js.map +0 -1
- package/dist/daemon/logger.d.ts +0 -9
- package/dist/daemon/logger.js +0 -53
- package/dist/daemon/logger.js.map +0 -1
- package/dist/daemon/model-pool.d.ts +0 -45
- package/dist/daemon/model-pool.js +0 -187
- package/dist/daemon/model-pool.js.map +0 -1
- package/dist/daemon/root-lease.d.ts +0 -14
- package/dist/daemon/root-lease.js +0 -188
- package/dist/daemon/root-lease.js.map +0 -1
- package/dist/daemon/root-runtime.d.ts +0 -79
- package/dist/daemon/root-runtime.js +0 -337
- package/dist/daemon/root-runtime.js.map +0 -1
- package/dist/daemon/runtime-manager.d.ts +0 -46
- package/dist/daemon/runtime-manager.js +0 -246
- package/dist/daemon/runtime-manager.js.map +0 -1
- package/dist/daemon/runtime.d.ts +0 -12
- package/dist/daemon/runtime.js +0 -102
- package/dist/daemon/runtime.js.map +0 -1
- package/dist/daemon/server-controller.d.ts +0 -39
- package/dist/daemon/server-controller.js +0 -327
- package/dist/daemon/server-controller.js.map +0 -1
- package/dist/daemon/watch-manager.d.ts +0 -55
- package/dist/daemon/watch-manager.js +0 -340
- package/dist/daemon/watch-manager.js.map +0 -1
- package/dist/daemon/workspace-read-session-cache.d.ts +0 -31
- package/dist/daemon/workspace-read-session-cache.js +0 -115
- package/dist/daemon/workspace-read-session-cache.js.map +0 -1
- package/dist/engine/code-formats.d.ts +0 -3
- package/dist/engine/code-formats.js +0 -14
- package/dist/engine/code-formats.js.map +0 -1
- package/dist/engine/config.d.ts +0 -50
- package/dist/engine/config.js +0 -321
- package/dist/engine/config.js.map +0 -1
- package/dist/engine/errors.d.ts +0 -19
- package/dist/engine/errors.js +0 -40
- package/dist/engine/errors.js.map +0 -1
- package/dist/engine/extraction/code/adapter.d.ts +0 -19
- package/dist/engine/extraction/code/adapter.js +0 -24
- package/dist/engine/extraction/code/adapter.js.map +0 -1
- package/dist/engine/extraction/code/extractor.d.ts +0 -13
- package/dist/engine/extraction/code/extractor.js +0 -696
- package/dist/engine/extraction/code/extractor.js.map +0 -1
- package/dist/engine/extraction/code/families/c-family.d.ts +0 -2
- package/dist/engine/extraction/code/families/c-family.js +0 -122
- package/dist/engine/extraction/code/families/c-family.js.map +0 -1
- package/dist/engine/extraction/code/families/js-ts.d.ts +0 -12
- package/dist/engine/extraction/code/families/js-ts.js +0 -118
- package/dist/engine/extraction/code/families/js-ts.js.map +0 -1
- package/dist/engine/extraction/code/families/metadata.d.ts +0 -8
- package/dist/engine/extraction/code/families/metadata.js +0 -86
- package/dist/engine/extraction/code/families/metadata.js.map +0 -1
- package/dist/engine/extraction/code/families/name-field.d.ts +0 -3
- package/dist/engine/extraction/code/families/name-field.js +0 -22
- package/dist/engine/extraction/code/families/name-field.js.map +0 -1
- package/dist/engine/extraction/code/languages/c.d.ts +0 -1
- package/dist/engine/extraction/code/languages/c.js +0 -12
- package/dist/engine/extraction/code/languages/c.js.map +0 -1
- package/dist/engine/extraction/code/languages/cpp.d.ts +0 -1
- package/dist/engine/extraction/code/languages/cpp.js +0 -18
- package/dist/engine/extraction/code/languages/cpp.js.map +0 -1
- package/dist/engine/extraction/code/languages/go.d.ts +0 -2
- package/dist/engine/extraction/code/languages/go.js +0 -70
- package/dist/engine/extraction/code/languages/go.js.map +0 -1
- package/dist/engine/extraction/code/languages/java.d.ts +0 -1
- package/dist/engine/extraction/code/languages/java.js +0 -17
- package/dist/engine/extraction/code/languages/java.js.map +0 -1
- package/dist/engine/extraction/code/languages/javascript.d.ts +0 -2
- package/dist/engine/extraction/code/languages/javascript.js +0 -23
- package/dist/engine/extraction/code/languages/javascript.js.map +0 -1
- package/dist/engine/extraction/code/languages/python.d.ts +0 -2
- package/dist/engine/extraction/code/languages/python.js +0 -52
- package/dist/engine/extraction/code/languages/python.js.map +0 -1
- package/dist/engine/extraction/code/languages/rust.d.ts +0 -2
- package/dist/engine/extraction/code/languages/rust.js +0 -25
- package/dist/engine/extraction/code/languages/rust.js.map +0 -1
- package/dist/engine/extraction/code/languages/typescript.d.ts +0 -2
- package/dist/engine/extraction/code/languages/typescript.js +0 -37
- package/dist/engine/extraction/code/languages/typescript.js.map +0 -1
- package/dist/engine/extraction/code/tree-sitter/grammar.d.ts +0 -4
- package/dist/engine/extraction/code/tree-sitter/grammar.js +0 -49
- package/dist/engine/extraction/code/tree-sitter/grammar.js.map +0 -1
- package/dist/engine/extraction/code/tree-sitter/nodes.d.ts +0 -3
- package/dist/engine/extraction/code/tree-sitter/nodes.js +0 -27
- package/dist/engine/extraction/code/tree-sitter/nodes.js.map +0 -1
- package/dist/engine/extraction/code/tree-sitter/parser.d.ts +0 -2
- package/dist/engine/extraction/code/tree-sitter/parser.js +0 -31
- package/dist/engine/extraction/code/tree-sitter/parser.js.map +0 -1
- package/dist/engine/extraction/ids.d.ts +0 -1
- package/dist/engine/extraction/ids.js +0 -5
- package/dist/engine/extraction/ids.js.map +0 -1
- package/dist/engine/extraction/image/extractor.d.ts +0 -5
- package/dist/engine/extraction/image/extractor.js +0 -35
- package/dist/engine/extraction/image/extractor.js.map +0 -1
- package/dist/engine/extraction/index.d.ts +0 -4
- package/dist/engine/extraction/index.js +0 -3
- package/dist/engine/extraction/index.js.map +0 -1
- package/dist/engine/extraction/markdown/extractor.d.ts +0 -7
- package/dist/engine/extraction/markdown/extractor.js +0 -362
- package/dist/engine/extraction/markdown/extractor.js.map +0 -1
- package/dist/engine/extraction/runtime.d.ts +0 -9
- package/dist/engine/extraction/runtime.js +0 -37
- package/dist/engine/extraction/runtime.js.map +0 -1
- package/dist/engine/extraction/source.d.ts +0 -18
- package/dist/engine/extraction/source.js +0 -22
- package/dist/engine/extraction/source.js.map +0 -1
- package/dist/engine/extraction/text/extractor.d.ts +0 -7
- package/dist/engine/extraction/text/extractor.js +0 -168
- package/dist/engine/extraction/text/extractor.js.map +0 -1
- package/dist/engine/extraction/types.d.ts +0 -4
- package/dist/engine/extraction/types.js +0 -2
- package/dist/engine/extraction/types.js.map +0 -1
- package/dist/engine/extraction/vector-content.d.ts +0 -5
- package/dist/engine/extraction/vector-content.js +0 -83
- package/dist/engine/extraction/vector-content.js.map +0 -1
- package/dist/engine/file-size-policy.d.ts +0 -6
- package/dist/engine/file-size-policy.js +0 -20
- package/dist/engine/file-size-policy.js.map +0 -1
- package/dist/engine/file-type.d.ts +0 -15
- package/dist/engine/file-type.js +0 -152
- package/dist/engine/file-type.js.map +0 -1
- package/dist/engine/index-status.d.ts +0 -9
- package/dist/engine/index-status.js +0 -38
- package/dist/engine/index-status.js.map +0 -1
- package/dist/engine/manifest.d.ts +0 -13
- package/dist/engine/manifest.js +0 -124
- package/dist/engine/manifest.js.map +0 -1
- package/dist/engine/models/backends/llama-cpp.d.ts +0 -99
- package/dist/engine/models/backends/llama-cpp.js +0 -511
- package/dist/engine/models/backends/llama-cpp.js.map +0 -1
- package/dist/engine/models/backends/model2vec-runtime.d.ts +0 -63
- package/dist/engine/models/backends/model2vec-runtime.js +0 -112
- package/dist/engine/models/backends/model2vec-runtime.js.map +0 -1
- package/dist/engine/models/backends/model2vec-tokenizer.d.ts +0 -2
- package/dist/engine/models/backends/model2vec-tokenizer.js +0 -42
- package/dist/engine/models/backends/model2vec-tokenizer.js.map +0 -1
- package/dist/engine/models/backends/model2vec-worker-pool.d.ts +0 -25
- package/dist/engine/models/backends/model2vec-worker-pool.js +0 -264
- package/dist/engine/models/backends/model2vec-worker-pool.js.map +0 -1
- package/dist/engine/models/backends/model2vec-worker.d.ts +0 -1
- package/dist/engine/models/backends/model2vec-worker.js +0 -41
- package/dist/engine/models/backends/model2vec-worker.js.map +0 -1
- package/dist/engine/models/backends/model2vec.d.ts +0 -40
- package/dist/engine/models/backends/model2vec.js +0 -311
- package/dist/engine/models/backends/model2vec.js.map +0 -1
- package/dist/engine/models/backends/qwen.d.ts +0 -44
- package/dist/engine/models/backends/qwen.js +0 -411
- package/dist/engine/models/backends/qwen.js.map +0 -1
- package/dist/engine/models/backends/transformers-js.d.ts +0 -87
- package/dist/engine/models/backends/transformers-js.js +0 -316
- package/dist/engine/models/backends/transformers-js.js.map +0 -1
- package/dist/engine/models/catalog.d.ts +0 -231
- package/dist/engine/models/catalog.js +0 -218
- package/dist/engine/models/catalog.js.map +0 -1
- package/dist/engine/models/download-progress.d.ts +0 -15
- package/dist/engine/models/download-progress.js +0 -48
- package/dist/engine/models/download-progress.js.map +0 -1
- package/dist/engine/models/embeddings.d.ts +0 -67
- package/dist/engine/models/embeddings.js +0 -125
- package/dist/engine/models/embeddings.js.map +0 -1
- package/dist/engine/models/factory.d.ts +0 -2
- package/dist/engine/models/factory.js +0 -51
- package/dist/engine/models/factory.js.map +0 -1
- package/dist/engine/models/index.d.ts +0 -4
- package/dist/engine/models/index.js +0 -5
- package/dist/engine/models/index.js.map +0 -1
- package/dist/engine/models/ranking.d.ts +0 -19
- package/dist/engine/models/ranking.js +0 -2
- package/dist/engine/models/ranking.js.map +0 -1
- package/dist/engine/models/resolution.d.ts +0 -8
- package/dist/engine/models/resolution.js +0 -22
- package/dist/engine/models/resolution.js.map +0 -1
- package/dist/engine/pipeline/indexing/index.d.ts +0 -14
- package/dist/engine/pipeline/indexing/index.js +0 -1061
- package/dist/engine/pipeline/indexing/index.js.map +0 -1
- package/dist/engine/pipeline/indexing/input-budget.d.ts +0 -2
- package/dist/engine/pipeline/indexing/input-budget.js +0 -51
- package/dist/engine/pipeline/indexing/input-budget.js.map +0 -1
- package/dist/engine/pipeline/indexing/root-paths.d.ts +0 -7
- package/dist/engine/pipeline/indexing/root-paths.js +0 -148
- package/dist/engine/pipeline/indexing/root-paths.js.map +0 -1
- package/dist/engine/pipeline/indexing/scanner/index.d.ts +0 -14
- package/dist/engine/pipeline/indexing/scanner/index.js +0 -776
- package/dist/engine/pipeline/indexing/scanner/index.js.map +0 -1
- package/dist/engine/pipeline/search/index.d.ts +0 -12
- package/dist/engine/pipeline/search/index.js +0 -811
- package/dist/engine/pipeline/search/index.js.map +0 -1
- package/dist/engine/service/index.d.ts +0 -3
- package/dist/engine/service/index.js +0 -2
- package/dist/engine/service/index.js.map +0 -1
- package/dist/engine/service/lexical.d.ts +0 -28
- package/dist/engine/service/lexical.js +0 -446
- package/dist/engine/service/lexical.js.map +0 -1
- package/dist/engine/service/root.d.ts +0 -15
- package/dist/engine/service/root.js +0 -57
- package/dist/engine/service/root.js.map +0 -1
- package/dist/engine/service/structure-enrichment.d.ts +0 -8
- package/dist/engine/service/structure-enrichment.js +0 -178
- package/dist/engine/service/structure-enrichment.js.map +0 -1
- package/dist/engine/service/types.d.ts +0 -210
- package/dist/engine/service/types.js +0 -2
- package/dist/engine/service/types.js.map +0 -1
- package/dist/engine/service/workspace-index.d.ts +0 -26
- package/dist/engine/service/workspace-index.js +0 -157
- package/dist/engine/service/workspace-index.js.map +0 -1
- package/dist/engine/service/zvec-grep.d.ts +0 -13
- package/dist/engine/service/zvec-grep.js +0 -1393
- package/dist/engine/service/zvec-grep.js.map +0 -1
- package/dist/engine/storage/index.d.ts +0 -53
- package/dist/engine/storage/index.js +0 -3
- package/dist/engine/storage/index.js.map +0 -1
- package/dist/engine/storage/layout.d.ts +0 -10
- package/dist/engine/storage/layout.js +0 -29
- package/dist/engine/storage/layout.js.map +0 -1
- package/dist/engine/storage/zvec.d.ts +0 -4
- package/dist/engine/storage/zvec.js +0 -976
- package/dist/engine/storage/zvec.js.map +0 -1
- package/dist/engine/types.d.ts +0 -303
- package/dist/engine/types.js +0 -14
- package/dist/engine/types.js.map +0 -1
- package/dist/engine/utils/daemon-lease.d.ts +0 -17
- package/dist/engine/utils/daemon-lease.js +0 -175
- package/dist/engine/utils/daemon-lease.js.map +0 -1
- package/dist/engine/utils/file-selection.d.ts +0 -10
- package/dist/engine/utils/file-selection.js +0 -157
- package/dist/engine/utils/file-selection.js.map +0 -1
- package/dist/engine/utils/glob.d.ts +0 -9
- package/dist/engine/utils/glob.js +0 -208
- package/dist/engine/utils/glob.js.map +0 -1
- package/dist/engine/utils/hash.d.ts +0 -2
- package/dist/engine/utils/hash.js +0 -8
- package/dist/engine/utils/hash.js.map +0 -1
- package/dist/engine/utils/json.d.ts +0 -8
- package/dist/engine/utils/json.js +0 -83
- package/dist/engine/utils/json.js.map +0 -1
- package/dist/engine/utils/lock.d.ts +0 -19
- package/dist/engine/utils/lock.js +0 -254
- package/dist/engine/utils/lock.js.map +0 -1
- package/dist/engine/utils/path.d.ts +0 -4
- package/dist/engine/utils/path.js +0 -18
- package/dist/engine/utils/path.js.map +0 -1
- package/dist/engine/utils/timing.d.ts +0 -19
- package/dist/engine/utils/timing.js +0 -87
- package/dist/engine/utils/timing.js.map +0 -1
- package/dist/index-progress.d.ts +0 -10
- package/dist/index-progress.js +0 -159
- package/dist/index-progress.js.map +0 -1
- package/dist/index.d.ts +0 -6
- package/dist/index.js +0 -4
- package/dist/index.js.map +0 -1
- package/dist/mcp/http-transport.d.ts +0 -27
- package/dist/mcp/http-transport.js +0 -182
- package/dist/mcp/http-transport.js.map +0 -1
- package/dist/mcp/input-normalization.d.ts +0 -38
- package/dist/mcp/input-normalization.js +0 -104
- package/dist/mcp/input-normalization.js.map +0 -1
- package/dist/mcp/progress-heartbeat.d.ts +0 -17
- package/dist/mcp/progress-heartbeat.js +0 -46
- package/dist/mcp/progress-heartbeat.js.map +0 -1
- package/dist/mcp/request-metadata.d.ts +0 -2
- package/dist/mcp/request-metadata.js +0 -11
- package/dist/mcp/request-metadata.js.map +0 -1
- package/dist/mcp/request-state.d.ts +0 -40
- package/dist/mcp/request-state.js +0 -210
- package/dist/mcp/request-state.js.map +0 -1
- package/dist/mcp/result-format.d.ts +0 -13
- package/dist/mcp/result-format.js +0 -75
- package/dist/mcp/result-format.js.map +0 -1
- package/dist/mcp/schemas.d.ts +0 -664
- package/dist/mcp/schemas.js +0 -510
- package/dist/mcp/schemas.js.map +0 -1
- package/dist/mcp/stdio-bridge.d.ts +0 -14
- package/dist/mcp/stdio-bridge.js +0 -178
- package/dist/mcp/stdio-bridge.js.map +0 -1
- package/dist/mcp/tools.d.ts +0 -153
- package/dist/mcp/tools.js +0 -482
- package/dist/mcp/tools.js.map +0 -1
- package/dist/mcp/toolset.d.ts +0 -5
- package/dist/mcp/toolset.js +0 -12
- package/dist/mcp/toolset.js.map +0 -1
- package/dist/observability/trace-context.d.ts +0 -11
- package/dist/observability/trace-context.js +0 -138
- package/dist/observability/trace-context.js.map +0 -1
- package/dist/prompts/zvec-grep-guidance.d.ts +0 -2
- package/dist/prompts/zvec-grep-guidance.js +0 -9
- package/dist/prompts/zvec-grep-guidance.js.map +0 -1
- package/docs/01-agents.md +0 -209
- package/docs/02-cli.md +0 -246
- package/docs/03-mcp.md +0 -185
- package/docs/04-pipeline.md +0 -226
- package/docs/05-architecture.md +0 -86
- package/docs/06-server.md +0 -220
- package/docs/07-embedding.md +0 -203
- package/docs/08-roadmap.md +0 -85
- package/docs/README.md +0 -53
|
@@ -1,366 +0,0 @@
|
|
|
1
|
-
import { randomUUID } from "node:crypto";
|
|
2
|
-
import { DaemonError } from "./errors.js";
|
|
3
|
-
import { rootIdentity } from "./logger.js";
|
|
4
|
-
export class JobScheduler {
|
|
5
|
-
jobs = new Map();
|
|
6
|
-
activeByRoot = new Map();
|
|
7
|
-
latestByRoot = new Map();
|
|
8
|
-
queue = [];
|
|
9
|
-
concurrency;
|
|
10
|
-
maxAttempts;
|
|
11
|
-
retryBaseDelayMs;
|
|
12
|
-
running = 0;
|
|
13
|
-
closed = false;
|
|
14
|
-
closePromise;
|
|
15
|
-
closeResolve;
|
|
16
|
-
logger;
|
|
17
|
-
constructor(options = {}) {
|
|
18
|
-
this.concurrency = options.concurrency ?? 1;
|
|
19
|
-
this.maxAttempts = options.maxAttempts ?? 3;
|
|
20
|
-
this.retryBaseDelayMs = options.retryBaseDelayMs ?? 250;
|
|
21
|
-
this.logger = options.logger;
|
|
22
|
-
}
|
|
23
|
-
submit(input) {
|
|
24
|
-
if (this.closed) {
|
|
25
|
-
throw new DaemonError("DAEMON_SHUTTING_DOWN", "The daemon is shutting down.", true);
|
|
26
|
-
}
|
|
27
|
-
const active = this.activeByRoot.get(input.canonicalRoot);
|
|
28
|
-
if (active) {
|
|
29
|
-
if (active.state === "queued" && !active.retryTimer) {
|
|
30
|
-
if (input.reason === "watch" || input.followupIfRunning) {
|
|
31
|
-
active.run = combineRuns(active.run, input.run);
|
|
32
|
-
}
|
|
33
|
-
if (priority(input.reason) > priority(active.reason)) {
|
|
34
|
-
active.reason = input.reason;
|
|
35
|
-
this.sortQueue();
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
else if (input.reason === "watch" || input.followupIfRunning) {
|
|
39
|
-
if (active.followup) {
|
|
40
|
-
mergeQueuedJob(active.followup, input);
|
|
41
|
-
}
|
|
42
|
-
else {
|
|
43
|
-
active.followup = this.createJob(input);
|
|
44
|
-
}
|
|
45
|
-
return { job: snapshot(active.followup), reused: true };
|
|
46
|
-
}
|
|
47
|
-
return { job: snapshot(active), reused: true };
|
|
48
|
-
}
|
|
49
|
-
const job = this.enqueue(input);
|
|
50
|
-
return { job: snapshot(job), reused: false };
|
|
51
|
-
}
|
|
52
|
-
getByRoot(canonicalRoot) {
|
|
53
|
-
const job = this.latestByRoot.get(canonicalRoot);
|
|
54
|
-
return job ? snapshot(job) : undefined;
|
|
55
|
-
}
|
|
56
|
-
hasActiveRoot(canonicalRoot) {
|
|
57
|
-
return this.activeByRoot.has(canonicalRoot);
|
|
58
|
-
}
|
|
59
|
-
get(jobId) {
|
|
60
|
-
const job = this.jobs.get(jobId);
|
|
61
|
-
return job ? snapshot(job) : undefined;
|
|
62
|
-
}
|
|
63
|
-
async wait(jobId, onProgress) {
|
|
64
|
-
const job = this.jobs.get(jobId);
|
|
65
|
-
if (!job) {
|
|
66
|
-
throw new Error(`Unknown job: ${jobId}`);
|
|
67
|
-
}
|
|
68
|
-
if (!onProgress) {
|
|
69
|
-
return job.completion;
|
|
70
|
-
}
|
|
71
|
-
job.progressListeners.add(onProgress);
|
|
72
|
-
if (job.progress) {
|
|
73
|
-
try {
|
|
74
|
-
onProgress({ ...job.progress });
|
|
75
|
-
}
|
|
76
|
-
catch {
|
|
77
|
-
// Progress observers must never change the indexing outcome.
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
try {
|
|
81
|
-
return await job.completion;
|
|
82
|
-
}
|
|
83
|
-
finally {
|
|
84
|
-
job.progressListeners.delete(onProgress);
|
|
85
|
-
}
|
|
86
|
-
}
|
|
87
|
-
async waitForRootIdle(canonicalRoot) {
|
|
88
|
-
while (true) {
|
|
89
|
-
const active = this.activeByRoot.get(canonicalRoot);
|
|
90
|
-
if (!active) {
|
|
91
|
-
return;
|
|
92
|
-
}
|
|
93
|
-
await active.completion;
|
|
94
|
-
}
|
|
95
|
-
}
|
|
96
|
-
cancelRoot(canonicalRoot) {
|
|
97
|
-
const active = this.activeByRoot.get(canonicalRoot);
|
|
98
|
-
if (!active) {
|
|
99
|
-
return false;
|
|
100
|
-
}
|
|
101
|
-
this.cancelJob(active, "Indexing was cancelled.");
|
|
102
|
-
return true;
|
|
103
|
-
}
|
|
104
|
-
snapshot() {
|
|
105
|
-
return {
|
|
106
|
-
queued: [...this.jobs.values()].filter((job) => job.state === "queued")
|
|
107
|
-
.length,
|
|
108
|
-
running: this.running,
|
|
109
|
-
};
|
|
110
|
-
}
|
|
111
|
-
async close() {
|
|
112
|
-
if (this.closed) {
|
|
113
|
-
return this.closePromise;
|
|
114
|
-
}
|
|
115
|
-
this.closed = true;
|
|
116
|
-
for (const job of this.jobs.values()) {
|
|
117
|
-
this.cancelJob(job, "Indexing was cancelled because the daemon is shutting down.");
|
|
118
|
-
}
|
|
119
|
-
this.queue.length = 0;
|
|
120
|
-
if (this.running === 0) {
|
|
121
|
-
return;
|
|
122
|
-
}
|
|
123
|
-
this.closePromise = new Promise((resolve) => {
|
|
124
|
-
this.closeResolve = resolve;
|
|
125
|
-
});
|
|
126
|
-
return this.closePromise;
|
|
127
|
-
}
|
|
128
|
-
pump() {
|
|
129
|
-
while (!this.closed &&
|
|
130
|
-
this.running < this.concurrency &&
|
|
131
|
-
this.queue.length > 0) {
|
|
132
|
-
const job = this.queue.shift();
|
|
133
|
-
if (job.state !== "queued" || job.retryTimer) {
|
|
134
|
-
continue;
|
|
135
|
-
}
|
|
136
|
-
this.running += 1;
|
|
137
|
-
job.state = "running";
|
|
138
|
-
job.attempt += 1;
|
|
139
|
-
job.error = undefined;
|
|
140
|
-
job.startedAt ??= Date.now();
|
|
141
|
-
this.logger?.event("job.started", {
|
|
142
|
-
root_id: rootIdentity(job.canonicalRoot),
|
|
143
|
-
job_id: job.id,
|
|
144
|
-
reason: job.reason,
|
|
145
|
-
attempt: job.attempt,
|
|
146
|
-
});
|
|
147
|
-
void this.runJob(job);
|
|
148
|
-
}
|
|
149
|
-
}
|
|
150
|
-
async runJob(job) {
|
|
151
|
-
try {
|
|
152
|
-
await job.run((progress) => {
|
|
153
|
-
job.progress = { ...progress };
|
|
154
|
-
for (const listener of job.progressListeners) {
|
|
155
|
-
try {
|
|
156
|
-
listener({ ...progress });
|
|
157
|
-
}
|
|
158
|
-
catch {
|
|
159
|
-
// Progress observers must never change the indexing outcome.
|
|
160
|
-
}
|
|
161
|
-
}
|
|
162
|
-
}, job.abortController.signal);
|
|
163
|
-
if (job.abortController.signal.aborted) {
|
|
164
|
-
job.error ??= errorInfo(job.abortController.signal.reason);
|
|
165
|
-
this.finish(job, "cancelled");
|
|
166
|
-
}
|
|
167
|
-
else {
|
|
168
|
-
this.finish(job, "succeeded");
|
|
169
|
-
}
|
|
170
|
-
}
|
|
171
|
-
catch (error) {
|
|
172
|
-
if (job.abortController.signal.aborted) {
|
|
173
|
-
job.error = errorInfo(error);
|
|
174
|
-
this.finish(job, "cancelled");
|
|
175
|
-
return;
|
|
176
|
-
}
|
|
177
|
-
if (!this.closed &&
|
|
178
|
-
isRetryable(error) &&
|
|
179
|
-
job.attempt < this.maxAttempts) {
|
|
180
|
-
job.state = "queued";
|
|
181
|
-
job.error = errorInfo(error);
|
|
182
|
-
const delay = this.retryBaseDelayMs * 2 ** (job.attempt - 1);
|
|
183
|
-
this.logger?.event("job.retry", {
|
|
184
|
-
root_id: rootIdentity(job.canonicalRoot),
|
|
185
|
-
job_id: job.id,
|
|
186
|
-
error_code: job.error.code,
|
|
187
|
-
retry_after_ms: delay,
|
|
188
|
-
});
|
|
189
|
-
job.retryTimer = setTimeout(() => {
|
|
190
|
-
job.retryTimer = undefined;
|
|
191
|
-
this.queue.push(job);
|
|
192
|
-
this.sortQueue();
|
|
193
|
-
this.pump();
|
|
194
|
-
}, delay);
|
|
195
|
-
}
|
|
196
|
-
else {
|
|
197
|
-
job.error = errorInfo(error);
|
|
198
|
-
this.finish(job, this.closed ? "cancelled" : "failed");
|
|
199
|
-
}
|
|
200
|
-
}
|
|
201
|
-
finally {
|
|
202
|
-
this.running -= 1;
|
|
203
|
-
if (this.closed && this.running === 0) {
|
|
204
|
-
this.closeResolve?.();
|
|
205
|
-
}
|
|
206
|
-
this.pump();
|
|
207
|
-
}
|
|
208
|
-
}
|
|
209
|
-
finish(job, state) {
|
|
210
|
-
job.state = state;
|
|
211
|
-
job.finishedAt = Date.now();
|
|
212
|
-
this.logger?.event("job.finished", {
|
|
213
|
-
root_id: rootIdentity(job.canonicalRoot),
|
|
214
|
-
job_id: job.id,
|
|
215
|
-
state,
|
|
216
|
-
attempt: job.attempt,
|
|
217
|
-
error_code: job.error?.code,
|
|
218
|
-
duration_ms: job.startedAt ? job.finishedAt - job.startedAt : 0,
|
|
219
|
-
});
|
|
220
|
-
if (this.activeByRoot.get(job.canonicalRoot) === job) {
|
|
221
|
-
this.activeByRoot.delete(job.canonicalRoot);
|
|
222
|
-
}
|
|
223
|
-
const followup = !this.closed && state !== "cancelled" && job.followup?.state === "queued"
|
|
224
|
-
? job.followup
|
|
225
|
-
: undefined;
|
|
226
|
-
job.followup = undefined;
|
|
227
|
-
if (followup) {
|
|
228
|
-
this.activate(followup);
|
|
229
|
-
}
|
|
230
|
-
job.resolveCompletion(snapshot(job));
|
|
231
|
-
}
|
|
232
|
-
enqueue(input) {
|
|
233
|
-
const job = this.createJob(input);
|
|
234
|
-
this.activate(job);
|
|
235
|
-
return job;
|
|
236
|
-
}
|
|
237
|
-
createJob(input) {
|
|
238
|
-
let resolveCompletion;
|
|
239
|
-
const completion = new Promise((resolve) => {
|
|
240
|
-
resolveCompletion = resolve;
|
|
241
|
-
});
|
|
242
|
-
const job = {
|
|
243
|
-
id: randomUUID(),
|
|
244
|
-
canonicalRoot: input.canonicalRoot,
|
|
245
|
-
reason: input.reason,
|
|
246
|
-
state: "queued",
|
|
247
|
-
attempt: 0,
|
|
248
|
-
createdAt: Date.now(),
|
|
249
|
-
run: input.run,
|
|
250
|
-
completion,
|
|
251
|
-
resolveCompletion,
|
|
252
|
-
progressListeners: new Set(),
|
|
253
|
-
abortController: new AbortController(),
|
|
254
|
-
};
|
|
255
|
-
this.jobs.set(job.id, job);
|
|
256
|
-
return job;
|
|
257
|
-
}
|
|
258
|
-
activate(job) {
|
|
259
|
-
this.activeByRoot.set(job.canonicalRoot, job);
|
|
260
|
-
this.latestByRoot.set(job.canonicalRoot, job);
|
|
261
|
-
this.queue.push(job);
|
|
262
|
-
this.sortQueue();
|
|
263
|
-
this.pump();
|
|
264
|
-
}
|
|
265
|
-
cancelJob(job, message) {
|
|
266
|
-
if (job.state === "succeeded" ||
|
|
267
|
-
job.state === "failed" ||
|
|
268
|
-
job.state === "cancelled") {
|
|
269
|
-
return;
|
|
270
|
-
}
|
|
271
|
-
if (!job.abortController.signal.aborted) {
|
|
272
|
-
job.abortController.abort(new DaemonError("INDEX_CANCELLED", message));
|
|
273
|
-
}
|
|
274
|
-
if (job.retryTimer) {
|
|
275
|
-
clearTimeout(job.retryTimer);
|
|
276
|
-
job.retryTimer = undefined;
|
|
277
|
-
}
|
|
278
|
-
const followup = job.followup;
|
|
279
|
-
job.followup = undefined;
|
|
280
|
-
if (followup) {
|
|
281
|
-
this.cancelJob(followup, message);
|
|
282
|
-
}
|
|
283
|
-
if (job.state === "queued") {
|
|
284
|
-
job.error = { code: "INDEX_CANCELLED", message };
|
|
285
|
-
this.finish(job, "cancelled");
|
|
286
|
-
}
|
|
287
|
-
}
|
|
288
|
-
sortQueue() {
|
|
289
|
-
this.queue.sort((left, right) => priority(right.reason) - priority(left.reason) ||
|
|
290
|
-
left.createdAt - right.createdAt);
|
|
291
|
-
}
|
|
292
|
-
}
|
|
293
|
-
function priority(reason) {
|
|
294
|
-
switch (reason) {
|
|
295
|
-
case "manual":
|
|
296
|
-
return 4;
|
|
297
|
-
case "fresh_query":
|
|
298
|
-
return 3;
|
|
299
|
-
case "watch":
|
|
300
|
-
return 2;
|
|
301
|
-
case "background_reconcile":
|
|
302
|
-
return 1;
|
|
303
|
-
case "reconcile":
|
|
304
|
-
return 1;
|
|
305
|
-
}
|
|
306
|
-
}
|
|
307
|
-
function mergeQueuedJob(current, incoming) {
|
|
308
|
-
current.run = combineRuns(current.run, incoming.run);
|
|
309
|
-
if (priority(incoming.reason) > priority(current.reason)) {
|
|
310
|
-
current.reason = incoming.reason;
|
|
311
|
-
}
|
|
312
|
-
}
|
|
313
|
-
function combineRuns(first, second) {
|
|
314
|
-
return async (report, signal) => {
|
|
315
|
-
await first(report, signal);
|
|
316
|
-
await second(report, signal);
|
|
317
|
-
};
|
|
318
|
-
}
|
|
319
|
-
function snapshot(job) {
|
|
320
|
-
return {
|
|
321
|
-
id: job.id,
|
|
322
|
-
canonicalRoot: job.canonicalRoot,
|
|
323
|
-
reason: job.reason,
|
|
324
|
-
state: job.state,
|
|
325
|
-
attempt: job.attempt,
|
|
326
|
-
createdAt: job.createdAt,
|
|
327
|
-
startedAt: job.startedAt,
|
|
328
|
-
finishedAt: job.finishedAt,
|
|
329
|
-
progress: job.progress ? { ...job.progress } : undefined,
|
|
330
|
-
error: job.error ? { ...job.error } : undefined,
|
|
331
|
-
};
|
|
332
|
-
}
|
|
333
|
-
function isRetryable(error) {
|
|
334
|
-
if (error instanceof DaemonError) {
|
|
335
|
-
return error.retryable;
|
|
336
|
-
}
|
|
337
|
-
return Boolean(error &&
|
|
338
|
-
typeof error === "object" &&
|
|
339
|
-
"code" in error &&
|
|
340
|
-
error.code === "ZVEC_GREP.ENGINE.LOCK.BUSY");
|
|
341
|
-
}
|
|
342
|
-
function errorInfo(error) {
|
|
343
|
-
if (error instanceof DaemonError) {
|
|
344
|
-
return { code: error.code, message: redactMessage(error.message) };
|
|
345
|
-
}
|
|
346
|
-
if (error &&
|
|
347
|
-
typeof error === "object" &&
|
|
348
|
-
"code" in error &&
|
|
349
|
-
typeof error.code === "string") {
|
|
350
|
-
return {
|
|
351
|
-
code: error.code,
|
|
352
|
-
message: redactMessage(error instanceof Error ? error.message : String(error)),
|
|
353
|
-
};
|
|
354
|
-
}
|
|
355
|
-
return {
|
|
356
|
-
code: "INDEX_FAILED",
|
|
357
|
-
message: redactMessage(error instanceof Error ? error.message : String(error)),
|
|
358
|
-
};
|
|
359
|
-
}
|
|
360
|
-
function redactMessage(message) {
|
|
361
|
-
return message
|
|
362
|
-
.replace(/Bearer\s+\S+/gi, "Bearer [redacted]")
|
|
363
|
-
.replace(/(api[_ -]?key|token|authorization)\s*[:=]\s*\S+/gi, "$1=[redacted]")
|
|
364
|
-
.slice(0, 512);
|
|
365
|
-
}
|
|
366
|
-
//# sourceMappingURL=job-scheduler.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"job-scheduler.js","sourceRoot":"","sources":["../../src/daemon/job-scheduler.ts"],"names":[],"mappings":"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"}
|
package/dist/daemon/logger.d.ts
DELETED
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
export type LogFields = Record<string, string | number | boolean | undefined>;
|
|
2
|
-
export type DaemonLogger = {
|
|
3
|
-
event(name: string, fields?: LogFields): void;
|
|
4
|
-
flush(): Promise<void>;
|
|
5
|
-
};
|
|
6
|
-
export declare function createDaemonLogger(home?: string): DaemonLogger;
|
|
7
|
-
export declare function rootIdentity(root: string): string;
|
|
8
|
-
export declare function opaqueIdentity(value: string): string;
|
|
9
|
-
export declare function requestId(): string;
|
package/dist/daemon/logger.js
DELETED
|
@@ -1,53 +0,0 @@
|
|
|
1
|
-
import { createHash, randomUUID } from "node:crypto";
|
|
2
|
-
import { appendFile, chmod, mkdir } from "node:fs/promises";
|
|
3
|
-
import { dirname, join } from "node:path";
|
|
4
|
-
import { daemonHome } from "./config.js";
|
|
5
|
-
import { currentTraceContext } from "../observability/trace-context.js";
|
|
6
|
-
export function createDaemonLogger(home) {
|
|
7
|
-
const path = join(daemonHome(home), "logs", "server.log");
|
|
8
|
-
let tail = Promise.resolve();
|
|
9
|
-
return {
|
|
10
|
-
event(name, fields = {}) {
|
|
11
|
-
const trace = currentTraceContext();
|
|
12
|
-
const record = JSON.stringify({
|
|
13
|
-
timestamp: new Date().toISOString(),
|
|
14
|
-
event: name,
|
|
15
|
-
...(trace ? { trace_id: trace.traceId } : {}),
|
|
16
|
-
...sanitizeFields(fields),
|
|
17
|
-
});
|
|
18
|
-
tail = tail
|
|
19
|
-
.then(async () => {
|
|
20
|
-
await mkdir(dirname(path), { recursive: true, mode: 0o700 });
|
|
21
|
-
await appendFile(path, `${record}\n`, {
|
|
22
|
-
encoding: "utf8",
|
|
23
|
-
mode: 0o600,
|
|
24
|
-
});
|
|
25
|
-
await chmod(path, 0o600);
|
|
26
|
-
})
|
|
27
|
-
.catch(() => undefined);
|
|
28
|
-
},
|
|
29
|
-
flush: () => tail,
|
|
30
|
-
};
|
|
31
|
-
}
|
|
32
|
-
export function rootIdentity(root) {
|
|
33
|
-
return createHash("sha256").update(root).digest("hex").slice(0, 16);
|
|
34
|
-
}
|
|
35
|
-
export function opaqueIdentity(value) {
|
|
36
|
-
return createHash("sha256").update(value).digest("hex").slice(0, 16);
|
|
37
|
-
}
|
|
38
|
-
export function requestId() {
|
|
39
|
-
return randomUUID();
|
|
40
|
-
}
|
|
41
|
-
function sanitizeFields(fields) {
|
|
42
|
-
const safe = {};
|
|
43
|
-
for (const [key, value] of Object.entries(fields)) {
|
|
44
|
-
if (value === undefined || /token|api.?key|authorization|query/i.test(key))
|
|
45
|
-
continue;
|
|
46
|
-
safe[key] =
|
|
47
|
-
typeof value === "string" && value.length > 512
|
|
48
|
-
? `${value.slice(0, 512)}…`
|
|
49
|
-
: value;
|
|
50
|
-
}
|
|
51
|
-
return safe;
|
|
52
|
-
}
|
|
53
|
-
//# sourceMappingURL=logger.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/daemon/logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,45 +0,0 @@
|
|
|
1
|
-
import type { CreateZvecGrepOptions } from "../engine/service/types.js";
|
|
2
|
-
import { type EmbeddingModelIdentity } from "../engine/service/zvec-grep.js";
|
|
3
|
-
import type { EmbeddingModel } from "../engine/models/index.js";
|
|
4
|
-
import type { EmbeddingRuntimeConfig } from "../engine/config.js";
|
|
5
|
-
import type { DaemonLogger } from "./logger.js";
|
|
6
|
-
export type EmbeddingModelLoadRequest = {
|
|
7
|
-
model: EmbeddingModelIdentity;
|
|
8
|
-
runtime?: EmbeddingRuntimeConfig;
|
|
9
|
-
};
|
|
10
|
-
export type ModelLease = {
|
|
11
|
-
readonly model: EmbeddingModel;
|
|
12
|
-
readonly key: string;
|
|
13
|
-
release(): void;
|
|
14
|
-
};
|
|
15
|
-
export type ModelPoolSnapshot = {
|
|
16
|
-
loaded: number;
|
|
17
|
-
activeLeases: number;
|
|
18
|
-
};
|
|
19
|
-
export type EmbeddingModelPoolOptions = {
|
|
20
|
-
idleTtlMs?: number;
|
|
21
|
-
maxLoadedModels?: number;
|
|
22
|
-
serviceOptions?: CreateZvecGrepOptions;
|
|
23
|
-
createModel?: (request: EmbeddingModelLoadRequest) => EmbeddingModel | Promise<EmbeddingModel>;
|
|
24
|
-
keyForRequest?: (request: EmbeddingModelLoadRequest) => string;
|
|
25
|
-
logger?: DaemonLogger;
|
|
26
|
-
};
|
|
27
|
-
export declare class EmbeddingModelPool {
|
|
28
|
-
private readonly entries;
|
|
29
|
-
private readonly idleTtlMs;
|
|
30
|
-
private readonly maxLoadedModels;
|
|
31
|
-
private readonly createModel;
|
|
32
|
-
private readonly keyForRequest;
|
|
33
|
-
private closed;
|
|
34
|
-
private closePromise?;
|
|
35
|
-
private readonly logger?;
|
|
36
|
-
constructor(options?: EmbeddingModelPoolOptions);
|
|
37
|
-
acquire(request: EmbeddingModelLoadRequest): Promise<ModelLease>;
|
|
38
|
-
keyFor(request: EmbeddingModelLoadRequest): string;
|
|
39
|
-
snapshot(): ModelPoolSnapshot;
|
|
40
|
-
close(): Promise<void>;
|
|
41
|
-
private closeEntries;
|
|
42
|
-
private release;
|
|
43
|
-
private trimIdleEntries;
|
|
44
|
-
private disposeEntry;
|
|
45
|
-
}
|
|
@@ -1,187 +0,0 @@
|
|
|
1
|
-
import { randomUUID } from "node:crypto";
|
|
2
|
-
import { createEmbeddingModelForIdentity, embeddingModelPoolKeyForIdentity, } from "../engine/service/zvec-grep.js";
|
|
3
|
-
export class EmbeddingModelPool {
|
|
4
|
-
entries = new Map();
|
|
5
|
-
idleTtlMs;
|
|
6
|
-
maxLoadedModels;
|
|
7
|
-
createModel;
|
|
8
|
-
keyForRequest;
|
|
9
|
-
closed = false;
|
|
10
|
-
closePromise;
|
|
11
|
-
logger;
|
|
12
|
-
constructor(options = {}) {
|
|
13
|
-
this.idleTtlMs = options.idleTtlMs ?? 15 * 60_000;
|
|
14
|
-
this.maxLoadedModels = options.maxLoadedModels ?? 1;
|
|
15
|
-
this.createModel =
|
|
16
|
-
options.createModel ??
|
|
17
|
-
((request) => createEmbeddingModelForIdentity(request.model, {
|
|
18
|
-
...options.serviceOptions,
|
|
19
|
-
...request.runtime,
|
|
20
|
-
}));
|
|
21
|
-
this.keyForRequest =
|
|
22
|
-
options.keyForRequest ??
|
|
23
|
-
((request) => embeddingModelPoolKeyForIdentity(request.model, {
|
|
24
|
-
...options.serviceOptions,
|
|
25
|
-
...request.runtime,
|
|
26
|
-
}));
|
|
27
|
-
this.logger = options.logger;
|
|
28
|
-
}
|
|
29
|
-
async acquire(request) {
|
|
30
|
-
if (this.closed) {
|
|
31
|
-
throw new Error("Embedding model pool is closed.");
|
|
32
|
-
}
|
|
33
|
-
const key = this.keyFor(request);
|
|
34
|
-
let entry = this.entries.get(key);
|
|
35
|
-
if (!entry) {
|
|
36
|
-
entry = {
|
|
37
|
-
key,
|
|
38
|
-
logIdentity: randomUUID(),
|
|
39
|
-
leases: 0,
|
|
40
|
-
lastUsedAt: Date.now(),
|
|
41
|
-
retired: false,
|
|
42
|
-
};
|
|
43
|
-
this.entries.set(key, entry);
|
|
44
|
-
}
|
|
45
|
-
if (entry.idleTimer) {
|
|
46
|
-
clearTimeout(entry.idleTimer);
|
|
47
|
-
entry.idleTimer = undefined;
|
|
48
|
-
}
|
|
49
|
-
if (!entry.model) {
|
|
50
|
-
if (!entry.loading) {
|
|
51
|
-
this.logger?.event("model.load", { model_id: entry.logIdentity });
|
|
52
|
-
entry.loading = Promise.resolve(this.createModel(request));
|
|
53
|
-
}
|
|
54
|
-
try {
|
|
55
|
-
entry.model = await entry.loading;
|
|
56
|
-
}
|
|
57
|
-
catch (error) {
|
|
58
|
-
this.entries.delete(key);
|
|
59
|
-
throw error;
|
|
60
|
-
}
|
|
61
|
-
finally {
|
|
62
|
-
entry.loading = undefined;
|
|
63
|
-
}
|
|
64
|
-
}
|
|
65
|
-
else {
|
|
66
|
-
this.logger?.event("model.cache_hit", { model_id: entry.logIdentity });
|
|
67
|
-
}
|
|
68
|
-
if (this.closed) {
|
|
69
|
-
entry.retired = true;
|
|
70
|
-
throw new Error("Embedding model pool is closed.");
|
|
71
|
-
}
|
|
72
|
-
entry.leases += 1;
|
|
73
|
-
entry.lastUsedAt = Date.now();
|
|
74
|
-
try {
|
|
75
|
-
await this.trimIdleEntries(key);
|
|
76
|
-
}
|
|
77
|
-
catch (error) {
|
|
78
|
-
this.release(entry);
|
|
79
|
-
throw error;
|
|
80
|
-
}
|
|
81
|
-
if (this.closed) {
|
|
82
|
-
this.release(entry);
|
|
83
|
-
throw new Error("Embedding model pool is closed.");
|
|
84
|
-
}
|
|
85
|
-
let released = false;
|
|
86
|
-
return {
|
|
87
|
-
model: entry.model,
|
|
88
|
-
key,
|
|
89
|
-
release: () => {
|
|
90
|
-
if (released) {
|
|
91
|
-
return;
|
|
92
|
-
}
|
|
93
|
-
released = true;
|
|
94
|
-
this.release(entry);
|
|
95
|
-
},
|
|
96
|
-
};
|
|
97
|
-
}
|
|
98
|
-
keyFor(request) {
|
|
99
|
-
return this.keyForRequest(request);
|
|
100
|
-
}
|
|
101
|
-
snapshot() {
|
|
102
|
-
let activeLeases = 0;
|
|
103
|
-
let loaded = 0;
|
|
104
|
-
for (const entry of this.entries.values()) {
|
|
105
|
-
activeLeases += entry.leases;
|
|
106
|
-
if (entry.model) {
|
|
107
|
-
loaded += 1;
|
|
108
|
-
}
|
|
109
|
-
}
|
|
110
|
-
return { loaded, activeLeases };
|
|
111
|
-
}
|
|
112
|
-
close() {
|
|
113
|
-
if (!this.closePromise) {
|
|
114
|
-
this.closed = true;
|
|
115
|
-
this.closePromise = this.closeEntries();
|
|
116
|
-
}
|
|
117
|
-
return this.closePromise;
|
|
118
|
-
}
|
|
119
|
-
async closeEntries() {
|
|
120
|
-
const loadings = [...this.entries.values()].flatMap((entry) => entry.loading ? [entry.loading] : []);
|
|
121
|
-
await Promise.allSettled(loadings);
|
|
122
|
-
const disposals = [];
|
|
123
|
-
for (const entry of this.entries.values()) {
|
|
124
|
-
if (entry.idleTimer) {
|
|
125
|
-
clearTimeout(entry.idleTimer);
|
|
126
|
-
}
|
|
127
|
-
entry.retired = true;
|
|
128
|
-
if (entry.leases === 0 && entry.model) {
|
|
129
|
-
disposals.push(entry.model.dispose());
|
|
130
|
-
}
|
|
131
|
-
}
|
|
132
|
-
await Promise.all(disposals);
|
|
133
|
-
for (const [key, entry] of this.entries) {
|
|
134
|
-
if (entry.leases === 0) {
|
|
135
|
-
this.entries.delete(key);
|
|
136
|
-
}
|
|
137
|
-
}
|
|
138
|
-
}
|
|
139
|
-
release(entry) {
|
|
140
|
-
entry.leases = Math.max(0, entry.leases - 1);
|
|
141
|
-
entry.lastUsedAt = Date.now();
|
|
142
|
-
if (entry.leases > 0) {
|
|
143
|
-
return;
|
|
144
|
-
}
|
|
145
|
-
if (entry.retired || this.closed || this.idleTtlMs === 0) {
|
|
146
|
-
void this.disposeEntry(entry);
|
|
147
|
-
return;
|
|
148
|
-
}
|
|
149
|
-
const usedAt = entry.lastUsedAt;
|
|
150
|
-
entry.idleTimer = setTimeout(() => {
|
|
151
|
-
if (entry.leases === 0 && entry.lastUsedAt === usedAt) {
|
|
152
|
-
void this.disposeEntry(entry);
|
|
153
|
-
}
|
|
154
|
-
}, this.idleTtlMs);
|
|
155
|
-
entry.idleTimer.unref?.();
|
|
156
|
-
}
|
|
157
|
-
async trimIdleEntries(exceptKey) {
|
|
158
|
-
const loaded = [...this.entries.values()].filter((entry) => entry.model);
|
|
159
|
-
if (loaded.length <= this.maxLoadedModels) {
|
|
160
|
-
return;
|
|
161
|
-
}
|
|
162
|
-
const candidates = loaded
|
|
163
|
-
.filter((entry) => entry.key !== exceptKey && entry.leases === 0)
|
|
164
|
-
.sort((left, right) => left.lastUsedAt - right.lastUsedAt);
|
|
165
|
-
while (this.snapshot().loaded > this.maxLoadedModels &&
|
|
166
|
-
candidates.length > 0) {
|
|
167
|
-
await this.disposeEntry(candidates.shift());
|
|
168
|
-
}
|
|
169
|
-
}
|
|
170
|
-
async disposeEntry(entry) {
|
|
171
|
-
if (entry.leases > 0 || !entry.model) {
|
|
172
|
-
return;
|
|
173
|
-
}
|
|
174
|
-
if (entry.idleTimer) {
|
|
175
|
-
clearTimeout(entry.idleTimer);
|
|
176
|
-
entry.idleTimer = undefined;
|
|
177
|
-
}
|
|
178
|
-
const model = entry.model;
|
|
179
|
-
entry.model = undefined;
|
|
180
|
-
this.entries.delete(entry.key);
|
|
181
|
-
await model.dispose();
|
|
182
|
-
this.logger?.event("model.evicted", {
|
|
183
|
-
model_id: entry.logIdentity,
|
|
184
|
-
});
|
|
185
|
-
}
|
|
186
|
-
}
|
|
187
|
-
//# sourceMappingURL=model-pool.js.map
|