@atomic-chat/core 0.13.2 → 0.17.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/README.md +1 -1
- package/dist/backend/advisor/advisor.d.ts +8 -7
- package/dist/backend/advisor/advisor.js +17 -25
- package/dist/backend/advisor/advisor.js.map +1 -1
- package/dist/backend/catalog/index.d.ts +4 -2
- package/dist/backend/catalog/index.js +4 -2
- package/dist/backend/catalog/index.js.map +1 -1
- package/dist/backend/catalog/manifest.d.ts +5 -51
- package/dist/backend/catalog/manifest.js +5 -93
- package/dist/backend/catalog/manifest.js.map +1 -1
- package/dist/backend/catalog/upstream-releases-baseline.d.ts +2 -0
- package/dist/backend/catalog/upstream-releases-baseline.js +12 -0
- package/dist/backend/catalog/upstream-releases-baseline.js.map +1 -0
- package/dist/backend/catalog/upstream-releases-baseline.json +101 -0
- package/dist/backend/catalog/upstream-releases-catalog.d.ts +54 -0
- package/dist/backend/catalog/upstream-releases-catalog.js +148 -0
- package/dist/backend/catalog/upstream-releases-catalog.js.map +1 -0
- package/dist/backend/catalog/upstream-releases.d.ts +75 -0
- package/dist/backend/catalog/upstream-releases.js +155 -0
- package/dist/backend/catalog/upstream-releases.js.map +1 -0
- package/dist/backend/install/service.d.ts +7 -4
- package/dist/backend/install/service.js +4 -4
- package/dist/backend/install/service.js.map +1 -1
- package/dist/cli/commands/serve.js +10 -28
- package/dist/cli/commands/serve.js.map +1 -1
- package/dist/cli/main.d.ts +1 -1
- package/dist/cli/main.js +0 -1
- package/dist/cli/main.js.map +1 -1
- package/dist/client/control-client.d.ts +7 -19
- package/dist/client/control-client.js +9 -29
- package/dist/client/control-client.js.map +1 -1
- package/dist/cloud/registry.d.ts +14 -1
- package/dist/cloud/registry.js +73 -2
- package/dist/cloud/registry.js.map +1 -1
- package/dist/config/paths.d.ts +4 -3
- package/dist/config/paths.js +15 -14
- package/dist/config/paths.js.map +1 -1
- package/dist/contracts/diffusion.d.ts +45 -18
- package/dist/contracts/diffusion.js +1 -1
- package/dist/contracts/diffusion.js.map +1 -1
- package/dist/contracts/engines.d.ts +1 -1
- package/dist/contracts/engines.js +2 -0
- package/dist/contracts/engines.js.map +1 -1
- package/dist/contracts/errors.d.ts +1 -3
- package/dist/contracts/errors.js +16 -0
- package/dist/contracts/errors.js.map +1 -1
- package/dist/contracts/events.d.ts +11 -6
- package/dist/contracts/index.d.ts +1 -1
- package/dist/contracts/index.js +1 -1
- package/dist/contracts/index.js.map +1 -1
- package/dist/contracts/media.d.ts +186 -0
- package/dist/contracts/media.js +55 -0
- package/dist/contracts/media.js.map +1 -0
- package/dist/contracts/session.d.ts +10 -1
- package/dist/contracts/session.js +10 -0
- package/dist/contracts/session.js.map +1 -1
- package/dist/contracts/settings.d.ts +36 -1
- package/dist/contracts/settings.js.map +1 -1
- package/dist/core/atomic-core.d.ts +7 -5
- package/dist/core/atomic-core.js +1 -0
- package/dist/core/atomic-core.js.map +1 -1
- package/dist/core/create.js +48 -58
- package/dist/core/create.js.map +1 -1
- package/dist/core/managed-engines.js +2 -0
- package/dist/core/managed-engines.js.map +1 -1
- package/dist/core/prism.d.ts +23 -6
- package/dist/core/prism.js +45 -0
- package/dist/core/prism.js.map +1 -1
- package/dist/core/public-server.js +3 -2
- package/dist/core/public-server.js.map +1 -1
- package/dist/core/types.d.ts +11 -0
- package/dist/core/types.js.map +1 -1
- package/dist/decision/process.d.ts +4 -0
- package/dist/decision/process.js +10 -1
- package/dist/decision/process.js.map +1 -1
- package/dist/diffusion/args.d.ts +3 -2
- package/dist/diffusion/args.js +21 -4
- package/dist/diffusion/args.js.map +1 -1
- package/dist/diffusion/compat.d.ts +1 -1
- package/dist/diffusion/compat.js +6 -2
- package/dist/diffusion/compat.js.map +1 -1
- package/dist/diffusion/gallery.d.ts +24 -3
- package/dist/diffusion/gallery.js +151 -21
- package/dist/diffusion/gallery.js.map +1 -1
- package/dist/diffusion/index.d.ts +3 -0
- package/dist/diffusion/index.js +3 -0
- package/dist/diffusion/index.js.map +1 -1
- package/dist/diffusion/jobs.d.ts +6 -1
- package/dist/diffusion/jobs.js +10 -1
- package/dist/diffusion/jobs.js.map +1 -1
- package/dist/diffusion/media-header.d.ts +22 -0
- package/dist/diffusion/media-header.js +149 -0
- package/dist/diffusion/media-header.js.map +1 -0
- package/dist/diffusion/parse.d.ts +3 -1
- package/dist/diffusion/parse.js +36 -0
- package/dist/diffusion/parse.js.map +1 -1
- package/dist/diffusion/recipe.d.ts +10 -1
- package/dist/diffusion/recipe.js +85 -21
- package/dist/diffusion/recipe.js.map +1 -1
- package/dist/diffusion/remote-job.d.ts +76 -0
- package/dist/diffusion/remote-job.js +643 -0
- package/dist/diffusion/remote-job.js.map +1 -0
- package/dist/diffusion/remote-store.d.ts +38 -0
- package/dist/diffusion/remote-store.js +91 -0
- package/dist/diffusion/remote-store.js.map +1 -0
- package/dist/diffusion/service.d.ts +9 -1
- package/dist/diffusion/service.js +49 -9
- package/dist/diffusion/service.js.map +1 -1
- package/dist/diffusion/state.d.ts +13 -1
- package/dist/diffusion/state.js +8 -0
- package/dist/diffusion/state.js.map +1 -1
- package/dist/diffusion/tracker.d.ts +6 -0
- package/dist/diffusion/tracker.js +11 -0
- package/dist/diffusion/tracker.js.map +1 -1
- package/dist/diffusion/validate.js +2 -2
- package/dist/diffusion/validate.js.map +1 -1
- package/dist/diffusion/video-gallery.d.ts +11 -4
- package/dist/diffusion/video-gallery.js +62 -25
- package/dist/diffusion/video-gallery.js.map +1 -1
- package/dist/diffusion/video-history.js +4 -1
- package/dist/diffusion/video-history.js.map +1 -1
- package/dist/diffusion/video-recipe.js +58 -25
- package/dist/diffusion/video-recipe.js.map +1 -1
- package/dist/diffusion/wiring.d.ts +3 -0
- package/dist/diffusion/wiring.js +1 -0
- package/dist/diffusion/wiring.js.map +1 -1
- package/dist/diffusion/workflow.d.ts +8 -2
- package/dist/diffusion/workflow.js +13 -5
- package/dist/diffusion/workflow.js.map +1 -1
- package/dist/downloads/downloader.d.ts +6 -1
- package/dist/downloads/downloader.js +12 -1
- package/dist/downloads/downloader.js.map +1 -1
- package/dist/embedding/process.d.ts +4 -0
- package/dist/embedding/process.js +10 -1
- package/dist/embedding/process.js.map +1 -1
- package/dist/media/adapters/a1111.d.ts +32 -0
- package/dist/media/adapters/a1111.js +207 -0
- package/dist/media/adapters/a1111.js.map +1 -0
- package/dist/media/adapters/aimlapi-videos.d.ts +34 -0
- package/dist/media/adapters/aimlapi-videos.js +172 -0
- package/dist/media/adapters/aimlapi-videos.js.map +1 -0
- package/dist/media/adapters/dashscope-image.d.ts +26 -0
- package/dist/media/adapters/dashscope-image.js +160 -0
- package/dist/media/adapters/dashscope-image.js.map +1 -0
- package/dist/media/adapters/dashscope-video.d.ts +47 -0
- package/dist/media/adapters/dashscope-video.js +251 -0
- package/dist/media/adapters/dashscope-video.js.map +1 -0
- package/dist/media/adapters/gemini-image.d.ts +27 -0
- package/dist/media/adapters/gemini-image.js +181 -0
- package/dist/media/adapters/gemini-image.js.map +1 -0
- package/dist/media/adapters/gemini-veo.d.ts +39 -0
- package/dist/media/adapters/gemini-veo.js +196 -0
- package/dist/media/adapters/gemini-veo.js.map +1 -0
- package/dist/media/adapters/hf-images.d.ts +85 -0
- package/dist/media/adapters/hf-images.js +439 -0
- package/dist/media/adapters/hf-images.js.map +1 -0
- package/dist/media/adapters/hf-videos.d.ts +44 -0
- package/dist/media/adapters/hf-videos.js +265 -0
- package/dist/media/adapters/hf-videos.js.map +1 -0
- package/dist/media/adapters/minimax-image.d.ts +26 -0
- package/dist/media/adapters/minimax-image.js +111 -0
- package/dist/media/adapters/minimax-image.js.map +1 -0
- package/dist/media/adapters/minimax-video-v2.d.ts +34 -0
- package/dist/media/adapters/minimax-video-v2.js +191 -0
- package/dist/media/adapters/minimax-video-v2.js.map +1 -0
- package/dist/media/adapters/minimax-video.d.ts +28 -0
- package/dist/media/adapters/minimax-video.js +155 -0
- package/dist/media/adapters/minimax-video.js.map +1 -0
- package/dist/media/adapters/mistral-agent-image.d.ts +33 -0
- package/dist/media/adapters/mistral-agent-image.js +108 -0
- package/dist/media/adapters/mistral-agent-image.js.map +1 -0
- package/dist/media/adapters/nvidia-genai.d.ts +28 -0
- package/dist/media/adapters/nvidia-genai.js +182 -0
- package/dist/media/adapters/nvidia-genai.js.map +1 -0
- package/dist/media/adapters/openai-images.d.ts +23 -0
- package/dist/media/adapters/openai-images.js +164 -0
- package/dist/media/adapters/openai-images.js.map +1 -0
- package/dist/media/adapters/openai-videos.d.ts +34 -0
- package/dist/media/adapters/openai-videos.js +175 -0
- package/dist/media/adapters/openai-videos.js.map +1 -0
- package/dist/media/adapters/openrouter-images.d.ts +25 -0
- package/dist/media/adapters/openrouter-images.js +161 -0
- package/dist/media/adapters/openrouter-images.js.map +1 -0
- package/dist/media/adapters/openrouter-videos.d.ts +43 -0
- package/dist/media/adapters/openrouter-videos.js +208 -0
- package/dist/media/adapters/openrouter-videos.js.map +1 -0
- package/dist/media/adapters/registry.d.ts +7 -0
- package/dist/media/adapters/registry.js +45 -0
- package/dist/media/adapters/registry.js.map +1 -0
- package/dist/media/adapters/types.d.ts +133 -0
- package/dist/media/adapters/types.js +15 -0
- package/dist/media/adapters/types.js.map +1 -0
- package/dist/media/adapters/xai-images.d.ts +19 -0
- package/dist/media/adapters/xai-images.js +83 -0
- package/dist/media/adapters/xai-images.js.map +1 -0
- package/dist/media/adapters/xai-videos.d.ts +29 -0
- package/dist/media/adapters/xai-videos.js +148 -0
- package/dist/media/adapters/xai-videos.js.map +1 -0
- package/dist/media/catalog-baseline.d.ts +2 -0
- package/dist/media/catalog-baseline.js +10 -0
- package/dist/media/catalog-baseline.js.map +1 -0
- package/dist/media/catalog-baseline.json +1819 -0
- package/dist/media/catalog-service.d.ts +42 -0
- package/dist/media/catalog-service.js +111 -0
- package/dist/media/catalog-service.js.map +1 -0
- package/dist/media/catalog.d.ts +50 -0
- package/dist/media/catalog.js +315 -0
- package/dist/media/catalog.js.map +1 -0
- package/dist/media/http.d.ts +125 -0
- package/dist/media/http.js +308 -0
- package/dist/media/http.js.map +1 -0
- package/dist/media/index.d.ts +14 -0
- package/dist/media/index.js +15 -0
- package/dist/media/index.js.map +1 -0
- package/dist/media/mask.d.ts +12 -0
- package/dist/media/mask.js +57 -0
- package/dist/media/mask.js.map +1 -0
- package/dist/media/service.d.ts +42 -0
- package/dist/media/service.js +144 -0
- package/dist/media/service.js.map +1 -0
- package/dist/models/compatibility/inspect.d.ts +11 -2
- package/dist/models/compatibility/inspect.js +44 -13
- package/dist/models/compatibility/inspect.js.map +1 -1
- package/dist/models/compatibility/service.d.ts +3 -0
- package/dist/models/compatibility/service.js +1 -0
- package/dist/models/compatibility/service.js.map +1 -1
- package/dist/models/gguf/tensors.d.ts +1 -0
- package/dist/models/gguf/tensors.js +4 -1
- package/dist/models/gguf/tensors.js.map +1 -1
- package/dist/models/hf.d.ts +3 -16
- package/dist/models/hf.js +4 -42
- package/dist/models/hf.js.map +1 -1
- package/dist/router/resolve.d.ts +15 -4
- package/dist/router/resolve.js +25 -3
- package/dist/router/resolve.js.map +1 -1
- package/dist/runtime/environment/linux-provisioner.js +7 -67
- package/dist/runtime/environment/linux-provisioner.js.map +1 -1
- package/dist/runtime/environment/runtime-removal-plan.d.ts +19 -0
- package/dist/runtime/environment/runtime-removal-plan.js +74 -0
- package/dist/runtime/environment/runtime-removal-plan.js.map +1 -0
- package/dist/runtime/environment/windows-provisioner.js +20 -4
- package/dist/runtime/environment/windows-provisioner.js.map +1 -1
- package/dist/runtime/managed-engines/spec.d.ts +2 -2
- package/dist/runtime/managed-engines/spec.js +6 -0
- package/dist/runtime/managed-engines/spec.js.map +1 -1
- package/dist/runtime/managed-models/compatibility.d.ts +10 -0
- package/dist/runtime/managed-models/compatibility.js +18 -0
- package/dist/runtime/managed-models/compatibility.js.map +1 -1
- package/dist/runtime/managed-text/adapter.d.ts +17 -0
- package/dist/runtime/managed-text/adapter.js.map +1 -1
- package/dist/runtime/managed-text/lifecycle.d.ts +8 -0
- package/dist/runtime/managed-text/lifecycle.js +38 -1
- package/dist/runtime/managed-text/lifecycle.js.map +1 -1
- package/dist/runtime/managed-text/readiness.d.ts +21 -1
- package/dist/runtime/managed-text/readiness.js +64 -0
- package/dist/runtime/managed-text/readiness.js.map +1 -1
- package/dist/runtime/managed-text/request-rules.d.ts +9 -7
- package/dist/runtime/managed-text/request-rules.js +58 -2
- package/dist/runtime/managed-text/request-rules.js.map +1 -1
- package/dist/runtime/managed-text/setting-values.d.ts +9 -0
- package/dist/runtime/managed-text/setting-values.js +44 -0
- package/dist/runtime/managed-text/setting-values.js.map +1 -0
- package/dist/runtime/sglang/adapter.d.ts +50 -0
- package/dist/runtime/sglang/adapter.js +393 -0
- package/dist/runtime/sglang/adapter.js.map +1 -0
- package/dist/runtime/sglang/engine.d.ts +16 -0
- package/dist/runtime/sglang/engine.js +38 -0
- package/dist/runtime/sglang/engine.js.map +1 -0
- package/dist/runtime/sglang/index.d.ts +11 -0
- package/dist/runtime/sglang/index.js +12 -0
- package/dist/runtime/sglang/index.js.map +1 -0
- package/dist/runtime/sglang/memory.d.ts +64 -0
- package/dist/runtime/sglang/memory.js +90 -0
- package/dist/runtime/sglang/memory.js.map +1 -0
- package/dist/runtime/sglang/settings.d.ts +49 -0
- package/dist/runtime/sglang/settings.js +118 -0
- package/dist/runtime/sglang/settings.js.map +1 -0
- package/dist/runtime/shared/external-sessions.js +1 -0
- package/dist/runtime/shared/external-sessions.js.map +1 -1
- package/dist/runtime/shared/ports.d.ts +10 -0
- package/dist/runtime/shared/ports.js +30 -0
- package/dist/runtime/shared/ports.js.map +1 -1
- package/dist/runtime/tensorrt-llm/adapter.d.ts +1 -4
- package/dist/runtime/tensorrt-llm/adapter.js +28 -11
- package/dist/runtime/tensorrt-llm/adapter.js.map +1 -1
- package/dist/runtime/tensorrt-llm/check.js +1 -0
- package/dist/runtime/tensorrt-llm/check.js.map +1 -1
- package/dist/runtime/tensorrt-llm/compatibility.d.ts +30 -6
- package/dist/runtime/tensorrt-llm/compatibility.js +41 -9
- package/dist/runtime/tensorrt-llm/compatibility.js.map +1 -1
- package/dist/runtime/tensorrt-llm/cuda-graphs.d.ts +32 -0
- package/dist/runtime/tensorrt-llm/cuda-graphs.js +33 -0
- package/dist/runtime/tensorrt-llm/cuda-graphs.js.map +1 -0
- package/dist/runtime/tensorrt-llm/engine.js +11 -5
- package/dist/runtime/tensorrt-llm/engine.js.map +1 -1
- package/dist/runtime/tensorrt-llm/kv-cache.d.ts +16 -0
- package/dist/runtime/tensorrt-llm/kv-cache.js +21 -1
- package/dist/runtime/tensorrt-llm/kv-cache.js.map +1 -1
- package/dist/runtime/vllm/adapter.js +2 -47
- package/dist/runtime/vllm/adapter.js.map +1 -1
- package/dist/runtime/vllm/memory.js +3 -16
- package/dist/runtime/vllm/memory.js.map +1 -1
- package/dist/runtime/vllm/settings.d.ts +7 -0
- package/dist/runtime/vllm/settings.js +2 -30
- package/dist/runtime/vllm/settings.js.map +1 -1
- package/dist/server/control/router.js +5 -4
- package/dist/server/control/router.js.map +1 -1
- package/dist/server/control/routes/media.d.ts +9 -0
- package/dist/server/control/routes/media.js +24 -0
- package/dist/server/control/routes/media.js.map +1 -0
- package/dist/server/control/routes/model-compatibility.d.ts +9 -0
- package/dist/server/control/routes/model-compatibility.js +31 -0
- package/dist/server/control/routes/model-compatibility.js.map +1 -0
- package/dist/server/control/types.d.ts +18 -20
- package/dist/server/http.js +15 -2
- package/dist/server/http.js.map +1 -1
- package/dist/server/public/gates.d.ts +6 -1
- package/dist/server/public/gates.js +7 -3
- package/dist/server/public/gates.js.map +1 -1
- package/dist/server/public/images-params.js +18 -1
- package/dist/server/public/images-params.js.map +1 -1
- package/dist/server/public/images.d.ts +11 -2
- package/dist/server/public/images.js +73 -9
- package/dist/server/public/images.js.map +1 -1
- package/dist/server/public/index.d.ts +1 -0
- package/dist/server/public/index.js +16 -7
- package/dist/server/public/index.js.map +1 -1
- package/dist/server/public/listing.js +1 -0
- package/dist/server/public/listing.js.map +1 -1
- package/dist/server/public/remote-media.d.ts +51 -0
- package/dist/server/public/remote-media.js +225 -0
- package/dist/server/public/remote-media.js.map +1 -0
- package/dist/server/public/responses.js +4 -2
- package/dist/server/public/responses.js.map +1 -1
- package/dist/server/public/static-assets.generated.js +1 -1
- package/dist/server/public/static-assets.generated.js.map +1 -1
- package/dist/server/public/trace.js +2 -0
- package/dist/server/public/trace.js.map +1 -1
- package/dist/server/public/types.d.ts +12 -1
- package/dist/server/public/videos-params.js +13 -3
- package/dist/server/public/videos-params.js.map +1 -1
- package/dist/server/public/videos.d.ts +1 -0
- package/dist/server/public/videos.js +21 -3
- package/dist/server/public/videos.js.map +1 -1
- package/dist/settings/schema/llamacpp-upstream.json +9 -0
- package/dist/settings/schema/sglang.json +251 -0
- package/dist/settings/schema.js +27 -1
- package/dist/settings/schema.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +2 -6
- package/src/settings/schema/llamacpp-upstream.json +9 -0
- package/src/settings/schema/sglang.json +251 -0
- package/dist/backend/catalog/bundled-manifest-baseline.d.ts +0 -2
- package/dist/backend/catalog/bundled-manifest-baseline.js +0 -65
- package/dist/backend/catalog/bundled-manifest-baseline.js.map +0 -1
- package/dist/contracts/model-setup.d.ts +0 -115
- package/dist/contracts/model-setup.js +0 -33
- package/dist/contracts/model-setup.js.map +0 -1
- package/dist/core/model-setup/index.d.ts +0 -4
- package/dist/core/model-setup/index.js +0 -5
- package/dist/core/model-setup/index.js.map +0 -1
- package/dist/core/model-setup/plan.d.ts +0 -56
- package/dist/core/model-setup/plan.js +0 -158
- package/dist/core/model-setup/plan.js.map +0 -1
- package/dist/core/model-setup/service.d.ts +0 -92
- package/dist/core/model-setup/service.js +0 -329
- package/dist/core/model-setup/service.js.map +0 -1
- package/dist/core/model-setup/store.d.ts +0 -29
- package/dist/core/model-setup/store.js +0 -116
- package/dist/core/model-setup/store.js.map +0 -1
- package/dist/core/model-setup/wiring.d.ts +0 -59
- package/dist/core/model-setup/wiring.js +0 -132
- package/dist/core/model-setup/wiring.js.map +0 -1
- package/dist/server/control/routes/model-setups.d.ts +0 -11
- package/dist/server/control/routes/model-setups.js +0 -55
- package/dist/server/control/routes/model-setups.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../src/runtime/vllm/adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAE1D,OAAO,EACL,qCAAqC,EACrC,qBAAqB,EACrB,uBAAuB,EACvB,YAAY,EACZ,oBAAoB,EACpB,iBAAiB,GAQlB,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAE,oBAAoB,EAAqB,MAAM,eAAe,CAAA;AAEvE,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,CAAA;AAErB,6DAA6D;AAC7D,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,CAAA;AAEvC,0GAA0G;AAC1G,MAAM,CAAC,MAAM,+BAA+B,GAAG,EAAE,GAAG,GAAG,CAAA;AAevD,SAAS,MAAM,CAAC,KAAc;IAC5B,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAA;IAC7D,MAAM,IAAI,GAAG,KAAgC,CAAA;IAC7C,OAAO,CACL,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,IAAI;QAClC,CAAC,OAAO,IAAI,CAAC,oBAAoB,CAAC,KAAK,QAAQ;YAC7C,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YAC5C,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC;QACpC,OAAO,IAAI,CAAC,sBAAsB,CAAC,KAAK,QAAQ;QAChD,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC;QAChC,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC;QACjC,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,SAAS,CACxC,CAAA;AACH,CAAC;AAED,yGAAyG;AACzG,SAAS,aAAa,CAAC,iBAA4C;IACjE,IAAI,iBAAiB,KAAK,IAAI,IAAI,iBAAiB,KAAK,SAAS;QAAE,OAAO,KAAK,CAAA;IAC/E,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAA;IAC5F,IAAI,KAAK,KAAK,SAAS,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAA;IAC5D,OAAO,KAAK,GAAG,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;AACxD,CAAC;AAED,SAAS,KAAK,CAAC,OAA2C;IACxD,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAA;IACzC,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO,KAAK,CAAA;IAC/B,IAAI,IAAI,KAAK,KAAK;QAAE,OAAO,IAAI,CAAA;IAC/B,0EAA0E;IAC1E,IAAI,OAAO,CAAC,aAAa;QAAE,OAAO,KAAK,CAAA;IACvC,MAAM,KAAK,GAAG,OAAO,CAAC,iBAAiB,IAAI,IAAI,CAAA;IAC/C,OAAO,KAAK,KAAK,IAAI,IAAI,KAAK,GAAG,+BAA+B,CAAA;AAClE,CAAC;AAED,0GAA0G;AAC1G,SAAS,QAAQ,CAAC,KAAa;IAC7B,OAAO;QACL,eAAe,EAAE,GAAG,KAAK,OAAO;QAChC,gBAAgB,EAAE,GAAG,KAAK,SAAS;QACnC,uBAAuB,EAAE,GAAG,KAAK,WAAW;QAC5C,yBAAyB,EAAE,GAAG,KAAK,aAAa;KACjD,CAAA;AACH,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,OAA2C;IACzE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,eAAe,CACvB,kBAAkB,EAClB,2HAA2H,CAC5H,CAAA;IACH,CAAC;IACD,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IACpC,MAAM,IAAI,GAAG;QACX,MAAM;QACN,OAAO;QACP,OAAO,CAAC,SAAS;QACjB,qBAAqB;QACrB,OAAO,CAAC,OAAO;QACf,QAAQ;QACR,SAAS;QACT,QAAQ;QACR,MAAM,CAAC,mBAAmB,CAAC;QAC3B,iBAAiB;QACjB,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC;QAC/B,gBAAgB;QAChB,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC;QAC7B,0BAA0B;QAC1B,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5D,+FAA+F;QAC/F,+FAA+F;QAC/F,8BAA8B;QAC9B,IAAI,CAAC,SAAS,CAAC,EAAE,cAAc,EAAE,QAAQ,CAAC,iBAAiB,EAAE,GAAG,QAAQ,CAAC,UAAU,EAAE,CAAC;KACvF,CAAA;IACD,IAAI,OAAO,CAAC,IAAI,CAAC,kBAAkB,KAAK,IAAI,EAAE,CAAC;QAC7C,IAAI,CAAC,IAAI,CAAC,yBAAyB,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAA;IAC/E,CAAC;IACD,IAAI,QAAQ,CAAC,sBAAsB,KAAK,IAAI,EAAE,CAAC;QAC7C,IAAI,CAAC,IAAI,CAAC,0BAA0B,EAAE,MAAM,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAA;IAChF,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,qBAAqB;QAAE,IAAI,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAA;IAC5E,IAAI,QAAQ,CAAC,cAAc,GAAG,CAAC;QAAE,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAA;IAC/F,IAAI,QAAQ,CAAC,KAAK,KAAK,MAAM;QAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAA;IACnE,IAAI,QAAQ,CAAC,IAAI,KAAK,IAAI;QAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;IACtE,IAAI,QAAQ,CAAC,gBAAgB;QAAE,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;IAC9D,IAAI,OAAO,CAAC,IAAI,CAAC,UAAU;QAAE,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;IACvG,IAAI,KAAK,CAAC,OAAO,CAAC;QAAE,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;IAChD,IAAI,QAAQ,CAAC,cAAc,KAAK,KAAK,IAAI,aAAa,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,CAAC;QACrF,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAA;IACtC,CAAC;IACD,IAAI,MAAM,EAAE,WAAW;QAAE,IAAI,CAAC,IAAI,CAAC,2BAA2B,EAAE,oBAAoB,EAAE,MAAM,CAAC,WAAW,CAAC,CAAA;IACzG,IAAI,MAAM,EAAE,gBAAgB;QAAE,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAAA;IACtF,OAAO;QACL,MAAM,EAAE,EAAE,cAAc,EAAE,mBAAmB,EAAE;QAC/C,IAAI;QACJ,GAAG,EAAE;YACH,mBAAmB,EAAE,GAAG;YACxB,YAAY,EAAE,GAAG;YACjB,cAAc,EAAE,GAAG;YACnB,oBAAoB,EAAE,GAAG;YACzB,GAAG,QAAQ,CAAC,OAAO,CAAC,eAAe,CAAC;SACrC;KACF,CAAA;AACH,CAAC;AAED,oGAAoG;AACpG,MAAM,CAAC,MAAM,sBAAsB,GAAG,EAAE,GAAG,MAAM,CAAA;AACjD,MAAM,CAAC,MAAM,yBAAyB,GAAG,MAAM,CAAA;AAE/C,MAAM,UAAU,sBAAsB,CAAC,WAAmB,EAAE,QAAsB;IAChF,IAAI,QAAQ,CAAC,oBAAoB,KAAK,IAAI;QAAE,OAAO,QAAQ,CAAC,oBAAoB,GAAG,IAAI,CAAA;IACvF,OAAO,IAAI,CAAC,IAAI,CAAC,sBAAsB,GAAG,CAAC,WAAW,GAAG,GAAG,CAAC,GAAG,yBAAyB,CAAC,CAAA;AAC5F,CAAC;AAED,gGAAgG;AAChG,sBAAsB;AACtB,gGAAgG;AAEhG,MAAM,GAAG,GACP,iHAAiH,CAAA;AACnH,4FAA4F;AAC5F,MAAM,gBAAgB,GACpB,iJAAiJ,CAAA;AACnJ,MAAM,YAAY,GAChB,oNAAoN,CAAA;AACtN,MAAM,wBAAwB,GAAG,4DAA4D,CAAA;AAC7F,MAAM,OAAO,GAAG,gBAAgB,CAAA;AAEhC,MAAM,KAAK,GAAG,CAAC,MAAc,EAAE,IAAY,EAAU,EAAE,CACrD,IAAI,KAAK,KAAK;IACZ,CAAC,CAAC,MAAM;IACR,CAAC,CAAC,IAAI,KAAK,KAAK;QACd,CAAC,CAAC,MAAM,GAAG,IAAI;QACf,CAAC,CAAC,IAAI,KAAK,KAAK;YACd,CAAC,CAAC,MAAM,GAAG,IAAI,IAAI,CAAC;YACpB,CAAC,CAAC,MAAM,GAAG,GAAG,CAAA;AACtB,MAAM,KAAK,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,GAAG,CAAC,GAAG,GAAG,CAAA;AAE9D,MAAM,UAAU,gBAAgB,CAAC,GAAW,EAAE,QAAuB;IACnE,MAAM,EAAE,GAAG,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACjC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;QAChB,MAAM,WAAW,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;QACjC,MAAM,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;QACvD,OAAO;YACL,IAAI,EAAE,eAAe;YACrB,OAAO,EACL,sBAAsB,WAAW,wCAAwC,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,mBAAmB;gBAC/G,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,iBAAiB,IAAI,uDAAuD,CAAC;YACtG,OAAO,EAAE;gBACP,aAAa,EAAE,WAAW;gBAC1B,aAAa,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC5B,gBAAgB,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC/B,GAAG,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC;aACpD;YACD,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;SACf,CAAA;IACH,CAAC;IACD,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACvC,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QAClB,OAAO;YACL,IAAI,EAAE,eAAe;YACrB,OAAO,EACL,eAAe,IAAI,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC,kDAAkD,IAAI,CAAC,CAAC,CAAC,OAAO;gBACxG,6GAA6G;YAC/G,OAAO,EAAE;gBACP,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACzB,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC1B,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC5B,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aAC/B;YACD,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;SACjB,CAAA;IACH,CAAC;IACD,MAAM,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACzB,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QACjB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAW,CAAC,CAAC,CAAA;QAC5D,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAW,CAAC,CAAC,CAAA;QAC3D,OAAO;YACL,IAAI,EAAE,eAAe;YACrB,OAAO,EAAE,qDAAqD,GAAG,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,QAAQ;YAC/G,OAAO,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE;YACjD,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;SAChB,CAAA;IACH,CAAC;IACD,MAAM,IAAI,GAAG,wBAAwB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC/C,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QAClB,OAAO;YACL,IAAI,EAAE,mBAAmB;YACzB,OAAO,EAAE,0DAA0D,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG;YAChG,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;SACjB,CAAA;IACH,CAAC;IACD,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QACtB,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,+CAA+C,EAAE,CAAA;IAC5F,CAAC;IACD,OAAO;QACL,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,cAAc,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,QAAQ,EAAE,uBAAuB;KAChG,CAAA;AACH,CAAC;AAED,gGAAgG;AAChG,sDAAsD;AACtD,gGAAgG;AAEhG,MAAM,UAAU,gBAAgB,CAAC,OAGhC;IACC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;IAC7B,OAAO;QACL,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC;QACnC,SAAS,EAAE,OAAO,CAAC,MAAM,EAAE,gBAAgB,CAAC;QAC5C,iBAAiB,EAAE,MAAM,EAAE,iBAAiB,KAAK,IAAI;QACrD,MAAM,EAAE,KAAK;QACb,UAAU,EAAE,KAAK;QACjB,SAAS,EAAE,KAAK;KACjB,CAAA;AACH,CAAC;AAED,MAAM,CAAC,MAAM,WAAW,GAA4B;IAClD,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,sBAAsB,EAAE;IAChD,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE;IAC3C,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE;CACtC,CAAA;AAED,MAAM,CAAC,MAAM,sBAAsB,GAA4B;IAC7D,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,sBAAsB,EAAE;IAChD,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE;CAC5C,CAAA;AAED,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;AAE7E,SAAS,QAAQ,CAAC,IAA6B,EAAE,GAAW;IAC1D,IAAI,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI;QAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,CAAA;IAC7E,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;IACvB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;QACxE,MAAM,IAAI,eAAe,CAAC,kBAAkB,EAAE,GAAG,GAAG,8BAA8B,CAAC,CAAA;IACrF,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAA;AACjC,CAAC;AAED,4GAA4G;AAC5G,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC;IACzB,WAAW;IACX,aAAa;IACb,OAAO;IACP,WAAW;IACX,OAAO;IACP,aAAa;IACb,WAAW;CACZ,CAAC,CAAA;AAEF,SAAS,YAAY,CAAC,IAA6B;IACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,CAAA;IACjC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;QAAE,OAAO,KAAK,CAAA;IAC1C,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;QAC/B,MAAM,OAAO,GACX,OAAO,KAAK,IAAI,IAAI,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAE,OAAiC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAA;QACrG,OAAO,CACL,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;YACtB,OAAO,CAAC,IAAI,CACV,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,KAAK,IAAI;gBACb,OAAO,IAAI,KAAK,QAAQ;gBACxB,UAAU,CAAC,GAAG,CAAC,MAAM,CAAE,IAA2B,CAAC,IAAI,CAAC,CAAC,CAC5D,CACF,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CACpC,KAAa,EACb,IAAa,EACb,QAAsB,EACtB,YAAsC;IAEtC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAA;IACvC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAA;IACjF,MAAM,MAAM,GAAG,IAA+B,CAAA;IAC9C,MAAM,KAAK,GAAG,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,CAAA;IACnG,IAAI,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,qBAAqB,CAAC,GAAG,KAAK,2BAA2B,EAAE,wBAAwB,CAAC,CAAA;IAChG,CAAC;IACD,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC/B,IAAI,CAAC,YAAY,CAAC,KAAK,IAAI,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC;YAChD,MAAM,IAAI,qBAAqB,CAAC,GAAG,KAAK,iCAAiC,EAAE,wBAAwB,CAAC,CAAA;QACtG,CAAC;QACD,IAAI,CAAC,YAAY,CAAC,iBAAiB,IAAI,uBAAuB,CAAC,MAAM,CAAC,EAAE,CAAC;YACvE,MAAM,IAAI,qBAAqB,CAC7B,GAAG,KAAK,sCAAsC,EAC9C,wBAAwB,CACzB,CAAA;QACH,CAAC;IACH,CAAC;IACD,MAAM,GAAG,GAAG,QAAQ,CAAC,iBAAiB,CAAA;IACtC,IAAI,KAAK,KAAK,iBAAiB,EAAE,CAAC;QAChC,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;QAC5C,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAA;IACvF,CAAC;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IAC7C,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAA;IACxD,MAAM,KAAK,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IAC3F,uGAAuG;IACvG,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,MAAM,CAAA;IACrC,MAAM,IAAI,GAA4B,EAAE,GAAG,MAAM,EAAE,CAAA;IACnD,OAAO,IAAI,CAAC,YAAY,CAAC,CAAA;IACzB,OAAO,IAAI,CAAC,uBAAuB,CAAC,CAAA;IACpC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,CAAA;IACvF,OAAO,IAAI,CAAA;AACb,CAAC;AAED,4GAA4G;AAC5G,MAAM,QAAQ,GAAG;IACf,uFAAuF;IACvF,8EAA8E;IAC9E,gFAAgF;CACjF,CAAA;AAED,SAAS,YAAY,CAAC,IAAY;IAChC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAyD,CAAA;QACvF,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,EAAE,OAAO,IAAI,MAAM,CAAC,OAAO,CAAA;QACvD,OAAO,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAA;IACnD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAA;IACX,CAAC;AACH,CAAC;AAED,qGAAqG;AACrG,MAAM,UAAU,yBAAyB,CAAC,MAAc,EAAE,IAAY;IACpE,IAAI,MAAM,KAAK,GAAG;QAAE,OAAO,IAAI,CAAA;IAC/B,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,CAAA;IAClC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACnC,IAAI,KAAK,KAAK,IAAI;YAAE,SAAQ;QAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QAC9B,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QAClC,OAAO;YACL,KAAK,EAAE;gBACL,OAAO,EAAE,0CAA0C,KAAK,gCAAgC,SAAS,4DAA4D;gBAC7J,IAAI,EAAE,uBAAuB;gBAC7B,KAAK,EAAE,UAAU;gBACjB,IAAI,EAAE,yBAAyB;aAChC;SACF,CAAA;IACH,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,+BAA+B,GAAwB,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;AAEtF,MAAM,UAAU,sBAAsB,CACpC,KAAa,EACb,WAAoB,EACpB,MAAiC;IAEjC,IAAI,KAAK,KAAK,sBAAsB;QAAE,OAAO,IAAI,CAAA;IACjD,MAAM,MAAM,GAAG,MAAM,EAAE,gBAAgB,IAAI,IAAI,CAAA;IAC/C,IAAI,MAAM,KAAK,IAAI,IAAI,CAAC,+BAA+B,CAAC,GAAG,CAAC,MAAM,CAAC;QAAE,OAAO,IAAI,CAAA;IAChF,OAAO,iBAAiB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,oBAAoB,CAAA;AACrE,CAAC;AAED;;;;GAIG;AACH,MAAM,aAAa,GAAkC;IACnD,EAAE,KAAK,EAAE,qBAAqB,EAAE,OAAO,EAAE,wBAAwB,EAAE;IACnE,EAAE,KAAK,EAAE,qBAAqB,EAAE,OAAO,EAAE,uCAAuC,EAAE;IAClF,EAAE,KAAK,EAAE,qBAAqB,EAAE,OAAO,EAAE,oBAAoB,EAAE;IAC/D,EAAE,KAAK,EAAE,qBAAqB,EAAE,OAAO,EAAE,qCAAqC,EAAE;IAChF,EAAE,KAAK,EAAE,qBAAqB,EAAE,OAAO,EAAE,2BAA2B,EAAE;IACtE,EAAE,KAAK,EAAE,qBAAqB,EAAE,OAAO,EAAE,uBAAuB,EAAE;CACnE,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAqC;IAC3D,EAAE,EAAE,MAAM;IACV,eAAe,EAAE,qCAAqC;IACtD,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,EAAE;IACnD,MAAM,EAAE,WAAW;IACnB,gBAAgB,EAAE,sBAAsB;IACxC,YAAY,EAAE,aAAa;IAC3B,gBAAgB,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,oBAAoB,CAAC,CAAC,GAAG,IAAI,EAAE,CAA4B,CAAC;IACvF,WAAW,EAAE,eAAe;IAC5B,kBAAkB,EAAE,sBAAsB;IAC1C,YAAY,EAAE,gBAAgB;IAC9B,YAAY,EAAE,gBAAgB;IAC9B,kBAAkB,EAAE,sBAAsB;IAC1C,kBAAkB,EAAE,sBAAsB;IAC1C,gBAAgB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,yBAAyB,CAAC,MAAM,EAAE,IAAI,CAAC;IACnF,mGAAmG;IACnG,2CAA2C;IAC3C,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC;QACxB,QAAQ,CAAC,cAAc;QACvB,QAAQ,CAAC,iBAAiB;QAC1B,QAAQ,CAAC,YAAY;QACrB,QAAQ,CAAC,mBAAmB;QAC5B,QAAQ,CAAC,sBAAsB;QAC/B,QAAQ,CAAC,WAAW;QACpB,QAAQ,CAAC,cAAc;QACvB,QAAQ,CAAC,sBAAsB;QAC/B,QAAQ,CAAC,qBAAqB;QAC9B,QAAQ,CAAC,cAAc;QACvB,QAAQ,CAAC,KAAK;QACd,QAAQ,CAAC,IAAI;QACb,QAAQ,CAAC,gBAAgB;QACzB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC;KACpC;CACF,CAAA"}
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../src/runtime/vllm/adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { freeMemoryBytes, isUnifiedMemory, kvCacheQuantAlgo, readKvCacheShape, totalMemoryBytes, } from '../managed-models/index.js';
|
|
1
|
+
import { checkpointIsMultimodal, freeMemoryBytes, isUnifiedMemory, kvCacheQuantAlgo, readKvCacheShape, supportsFp8KvCache, totalMemoryBytes, } from '../managed-models/index.js';
|
|
2
2
|
const GiB = 1024 ** 3;
|
|
3
3
|
const MiB = 1024 ** 2;
|
|
4
4
|
/** What vLLM holds beyond weights and KV cache: CUDA context, activations, sampler, graphs. */
|
|
@@ -17,13 +17,6 @@ export const VLLM_UNIFIED_KV_CONTEXTS = 2;
|
|
|
17
17
|
/** Without the model's KV shape: a quarter of the weights, at least 1 GiB. */
|
|
18
18
|
const FALLBACK_KV_WEIGHT_SHARE = 0.25;
|
|
19
19
|
const FALLBACK_KV_MIN_BYTES = GiB;
|
|
20
|
-
/** Compute capability 8.9 (Ada) and newer. */
|
|
21
|
-
function supportsFp8Kv(computeCapability) {
|
|
22
|
-
const [major, minor] = computeCapability.split('.').map((part) => Number.parseInt(part, 10));
|
|
23
|
-
if (major === undefined || Number.isNaN(major))
|
|
24
|
-
return false;
|
|
25
|
-
return major > 8 || (major === 8 && (minor ?? 0) >= 9);
|
|
26
|
-
}
|
|
27
20
|
/** The tokens the KV cache estimate covers: context × requests (two contexts on unified memory). */
|
|
28
21
|
export function vllmKvTokens(settings, unifiedMemory) {
|
|
29
22
|
return unifiedMemory
|
|
@@ -47,7 +40,7 @@ export function vllmKvCacheBytes(checkpoint, settings, gpu, unifiedMemory) {
|
|
|
47
40
|
basis: 'weight_fraction',
|
|
48
41
|
};
|
|
49
42
|
}
|
|
50
|
-
const fp8 = (settings.kv_cache_dtype === 'fp8' &&
|
|
43
|
+
const fp8 = (settings.kv_cache_dtype === 'fp8' && supportsFp8KvCache(gpu.compute_capability)) ||
|
|
51
44
|
kvCacheQuantAlgo(checkpoint.configJson, checkpoint.hfQuantConfigJson)?.toUpperCase() === 'FP8';
|
|
52
45
|
const perToken = 2 * shape.numHiddenLayers * shape.numKeyValueHeads * shape.headDim * (fp8 ? 1 : 2);
|
|
53
46
|
return { bytes: perToken * vllmKvTokens(settings, unifiedMemory), basis: 'config' };
|
|
@@ -86,12 +79,6 @@ export function vllmMemoryNeed(gpu, checkpoint, settings, host) {
|
|
|
86
79
|
` needed_bytes=${neededBytes}`,
|
|
87
80
|
};
|
|
88
81
|
}
|
|
89
|
-
/** A vision or audio part in the checkpoint: a multimodal architecture, or its encoder's config. */
|
|
90
|
-
function isMultimodal(configJson) {
|
|
91
|
-
const architectures = Array.isArray(configJson['architectures']) ? configJson['architectures'] : [];
|
|
92
|
-
return (architectures.some((name) => typeof name === 'string' && name.endsWith('ForConditionalGeneration')) ||
|
|
93
|
-
['vision_config', 'audio_config', 'vision_tower'].some((key) => key in configJson));
|
|
94
|
-
}
|
|
95
82
|
/** `--gpu-memory-utilization` from the card as it stands now (see the file banner). */
|
|
96
83
|
export function vllmGpuMemoryUtilization(gpu, host) {
|
|
97
84
|
const total = totalMemoryBytes(gpu, host);
|
|
@@ -109,7 +96,7 @@ export function vllmLaunchPlan(settings, checkpoint, gpu, host) {
|
|
|
109
96
|
return {
|
|
110
97
|
kvCacheMemoryBytes: settings.kv_cache_memory_gib === null ? null : Math.round(settings.kv_cache_memory_gib * GiB),
|
|
111
98
|
gpuMemoryUtilization: settings.gpu_memory_utilization ?? vllmGpuMemoryUtilization(gpu, host),
|
|
112
|
-
multimodal:
|
|
99
|
+
multimodal: checkpointIsMultimodal(checkpoint.configJson),
|
|
113
100
|
};
|
|
114
101
|
}
|
|
115
102
|
/** The check skeleton's hooks for vLLM: its memory rule, and no checkpoint quirks of its own. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../../src/runtime/vllm/memory.ts"],"names":[],"mappings":"AA0BA,OAAO,EACL,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,GAOjB,MAAM,4BAA4B,CAAA;AAInC,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,CAAA;AACrB,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,CAAA;AAErB,+FAA+F;AAC/F,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,GAAG,GAAG,CAAA;AACjD,4FAA4F;AAC5F,MAAM,CAAC,MAAM,6BAA6B,GAAG,GAAG,GAAG,GAAG,CAAA;AACtD;;;GAGG;AACH,MAAM,CAAC,MAAM,6BAA6B,GAAG,IAAI,GAAG,GAAG,CAAA;AACvD,sDAAsD;AACtD,MAAM,CAAC,MAAM,+BAA+B,GAAG,IAAI,CAAA;AACnD,sGAAsG;AACtG,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,CAAA;AACzC,8EAA8E;AAC9E,MAAM,wBAAwB,GAAG,IAAI,CAAA;AACrC,MAAM,qBAAqB,GAAG,GAAG,CAAA;AAEjC,
|
|
1
|
+
{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../../src/runtime/vllm/memory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The `vllm` provider's settings (change `add-vllm-runtime`, task 3.1; spec `vllm-runtime`, "Выбор
|
|
3
|
+
* карты и настройки провайдера vllm"): stored values, overlaid by a load's own overrides, reduced to
|
|
4
|
+
* this provider's keys and validated before anything is asked of the machine — `INVALID_ARGUMENT` for
|
|
5
|
+
* anything the schema (`src/settings/schema/vllm.json`) would refuse. What the engine is never told
|
|
6
|
+
* by a setting: `trust_remote_code`, request logging, an API key — no key here reaches it.
|
|
7
|
+
*/
|
|
1
8
|
import { type GenerationDefaults } from '../managed-text/generation-defaults.js';
|
|
2
9
|
export interface VllmSettings {
|
|
3
10
|
/** `GPU-<uuid>`/`MIG-<uuid>`, or `null` to let the load pick the card with the most free memory. */
|
|
@@ -5,8 +5,8 @@
|
|
|
5
5
|
* anything the schema (`src/settings/schema/vllm.json`) would refuse. What the engine is never told
|
|
6
6
|
* by a setting: `trust_remote_code`, request logging, an API key — no key here reaches it.
|
|
7
7
|
*/
|
|
8
|
-
import { AtomicCoreError } from '../../contracts/index.js';
|
|
9
8
|
import { GENERATION_DEFAULT_KEYS, readGenerationDefaults, } from '../managed-text/generation-defaults.js';
|
|
9
|
+
import { settingValues } from '../managed-text/setting-values.js';
|
|
10
10
|
const KEYS = [
|
|
11
11
|
'gpu_id',
|
|
12
12
|
'context_length',
|
|
@@ -45,35 +45,7 @@ const DEFAULTS = {
|
|
|
45
45
|
generation: {},
|
|
46
46
|
};
|
|
47
47
|
const GPU_UUID = /^(GPU|MIG)-[0-9A-Za-z-]+$/;
|
|
48
|
-
const invalid
|
|
49
|
-
throw new AtomicCoreError('INVALID_ARGUMENT', `vllm setting ${key} ${why}.`, `${key}=${JSON.stringify(value)}`);
|
|
50
|
-
};
|
|
51
|
-
function integer(key, value, min, max) {
|
|
52
|
-
const number = typeof value === 'string' && value.trim() !== '' ? Number(value) : value;
|
|
53
|
-
if (typeof number !== 'number' || !Number.isInteger(number) || number < min || number > max) {
|
|
54
|
-
return invalid(key, value, `must be a whole number from ${min} to ${max}`);
|
|
55
|
-
}
|
|
56
|
-
return number;
|
|
57
|
-
}
|
|
58
|
-
function decimal(key, value, inRange, range) {
|
|
59
|
-
const number = typeof value === 'string' && value.trim() !== '' ? Number(value) : value;
|
|
60
|
-
if (typeof number !== 'number' || !Number.isFinite(number) || !inRange(number)) {
|
|
61
|
-
return invalid(key, value, `must be a number ${range}`);
|
|
62
|
-
}
|
|
63
|
-
return number;
|
|
64
|
-
}
|
|
65
|
-
function yesNo(key, value) {
|
|
66
|
-
if (value === true || value === 'true')
|
|
67
|
-
return true;
|
|
68
|
-
if (value === false || value === 'false')
|
|
69
|
-
return false;
|
|
70
|
-
return invalid(key, value, 'must be true or false');
|
|
71
|
-
}
|
|
72
|
-
function oneOf(key, value, allowed) {
|
|
73
|
-
return allowed.includes(value)
|
|
74
|
-
? value
|
|
75
|
-
: invalid(key, value, `must be one of ${allowed.join(', ')}`);
|
|
76
|
-
}
|
|
48
|
+
const { invalid, integer, decimal, yesNo, oneOf } = settingValues('vllm');
|
|
77
49
|
/** Validates already-merged values; anything absent takes the schema's default. */
|
|
78
50
|
export function validateVllmSettings(raw) {
|
|
79
51
|
const settings = { ...DEFAULTS };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../src/runtime/vllm/settings.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../src/runtime/vllm/settings.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ import { registerClientRoutes } from './routes/clients.js';
|
|
|
10
10
|
import { registerCloudRoutes } from './routes/cloud.js';
|
|
11
11
|
import { registerDecisionRoutes } from './routes/decision.js';
|
|
12
12
|
import { registerEmbeddingRoutes } from './routes/embedding.js';
|
|
13
|
+
import { registerMediaRoutes } from './routes/media.js';
|
|
13
14
|
import { registerDiffusionRoutes } from './routes/diffusion.js';
|
|
14
15
|
import { registerDiffusionVideoRoutes } from './routes/diffusion-video.js';
|
|
15
16
|
import { registerDiskRoutes } from './routes/disk.js';
|
|
@@ -20,7 +21,7 @@ import { registerExternalSessionRoutes } from './routes/external-sessions.js';
|
|
|
20
21
|
import { registerHardwareRoutes } from './routes/hardware.js';
|
|
21
22
|
import { registerLifecycleRoutes, registerShutdownRoute } from './routes/lifecycle.js';
|
|
22
23
|
import { registerModelRoutes } from './routes/models.js';
|
|
23
|
-
import {
|
|
24
|
+
import { registerModelCompatibilityRoutes } from './routes/model-compatibility.js';
|
|
24
25
|
import { registerPublicServerRoutes } from './routes/public-server.js';
|
|
25
26
|
import { registerRemoteAccessRoutes } from './routes/remote-access.js';
|
|
26
27
|
import { registerSettingsRoutes } from './routes/settings.js';
|
|
@@ -42,18 +43,17 @@ export function buildRouter(deps, self) {
|
|
|
42
43
|
sessions: deps.sessions(),
|
|
43
44
|
server: deps.publicServer.status(),
|
|
44
45
|
clients: deps.clients.list(),
|
|
45
|
-
downloads: [],
|
|
46
|
+
downloads: deps.downloads?.() ?? [],
|
|
46
47
|
optimal_backends: deps.backends.optimalSnapshot(),
|
|
47
48
|
environments: deps.environmentsSnapshot?.() ?? [],
|
|
48
49
|
environment_operations: deps.environmentOperations?.() ?? [],
|
|
49
|
-
model_setups: deps.modelSetups?.snapshot() ?? [],
|
|
50
50
|
});
|
|
51
51
|
const ctx = { p, now, startedAt, snapshot, self };
|
|
52
52
|
const router = new Router();
|
|
53
53
|
registerLifecycleRoutes(router, deps, ctx);
|
|
54
54
|
registerClientRoutes(router, deps, ctx);
|
|
55
55
|
registerModelRoutes(router, deps, ctx);
|
|
56
|
-
|
|
56
|
+
registerModelCompatibilityRoutes(router, deps, ctx);
|
|
57
57
|
registerBackendRoutes(router, deps, ctx);
|
|
58
58
|
registerEngineBuildRoutes(router, deps, ctx);
|
|
59
59
|
registerEngineRoutes(router, deps, ctx);
|
|
@@ -69,6 +69,7 @@ export function buildRouter(deps, self) {
|
|
|
69
69
|
registerDiffusionVideoRoutes(router, deps, ctx);
|
|
70
70
|
registerDecisionRoutes(router, deps, ctx);
|
|
71
71
|
registerEmbeddingRoutes(router, deps, ctx);
|
|
72
|
+
registerMediaRoutes(router, deps, ctx);
|
|
72
73
|
registerTelemetryRoutes(router, deps, ctx);
|
|
73
74
|
registerShutdownRoute(router, deps, ctx);
|
|
74
75
|
return router;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../src/server/control/router.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAA;AACvF,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACnC,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAC/D,OAAO,EAAE,4BAA4B,EAAE,MAAM,6BAA6B,CAAA;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AACrD,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAA;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAA;AACpE,OAAO,EAAE,6BAA6B,EAAE,MAAM,+BAA+B,CAAA;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAA;AACtF,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../src/server/control/router.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Remote media (ADR 2026-10-13-remote-media-shares-the-diffusion-job-table): the catalog of image
|
|
3
|
+
* and video models cloud providers and self-hosted servers offer, and one provider's models with its
|
|
4
|
+
* live listing merged in. snake_case like the cloud provider routes and conf's catalog. Generation
|
|
5
|
+
* itself goes through `/diffusion/jobs` and `/diffusion/video/jobs` with a `target`.
|
|
6
|
+
*/
|
|
7
|
+
import type { Router } from '../../http.js';
|
|
8
|
+
import type { ControlRouteContext, ControlServerDeps } from '../types.js';
|
|
9
|
+
export declare function registerMediaRoutes(router: Router, deps: ControlServerDeps, ctx: ControlRouteContext): void;
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Remote media (ADR 2026-10-13-remote-media-shares-the-diffusion-job-table): the catalog of image
|
|
3
|
+
* and video models cloud providers and self-hosted servers offer, and one provider's models with its
|
|
4
|
+
* live listing merged in. snake_case like the cloud provider routes and conf's catalog. Generation
|
|
5
|
+
* itself goes through `/diffusion/jobs` and `/diffusion/video/jobs` with a `target`.
|
|
6
|
+
*/
|
|
7
|
+
import { AtomicCoreError } from '../../../contracts/index.js';
|
|
8
|
+
import { queryOf, sendJson } from '../../http.js';
|
|
9
|
+
function control(deps) {
|
|
10
|
+
if (!deps.media)
|
|
11
|
+
throw new AtomicCoreError('REMOTE_NOT_CONFIGURED', 'Remote media is not available in this core.');
|
|
12
|
+
return deps.media;
|
|
13
|
+
}
|
|
14
|
+
export function registerMediaRoutes(router, deps, ctx) {
|
|
15
|
+
const { p } = ctx;
|
|
16
|
+
router.get(p('/media/catalog'), async (_req, res) => sendJson(res, 200, await control(deps).catalog()));
|
|
17
|
+
router.get(p('/media/providers/:provider/models'), async (req, res, { params }) => {
|
|
18
|
+
const kind = queryOf(req).get('kind');
|
|
19
|
+
if (kind !== 'image' && kind !== 'video')
|
|
20
|
+
throw new AtomicCoreError('INVALID_ARGUMENT', "kind must be 'image' or 'video'");
|
|
21
|
+
sendJson(res, 200, await control(deps).providerModels(params['provider'], kind));
|
|
22
|
+
});
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=media.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"media.js","sourceRoot":"","sources":["../../../../src/server/control/routes/media.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAIjD,SAAS,OAAO,CAAC,IAAuB;IACtC,IAAI,CAAC,IAAI,CAAC,KAAK;QACb,MAAM,IAAI,eAAe,CAAC,uBAAuB,EAAE,6CAA6C,CAAC,CAAA;IACnG,OAAO,IAAI,CAAC,KAAK,CAAA;AACnB,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,MAAc,EAAE,IAAuB,EAAE,GAAwB;IACnG,MAAM,EAAE,CAAC,EAAE,GAAG,GAAG,CAAA;IAEjB,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,gBAAgB,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;IAEvG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,mCAAmC,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;QAChF,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QACrC,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,OAAO;YACtC,MAAM,IAAI,eAAe,CAAC,kBAAkB,EAAE,iCAAiC,CAAC,CAAA;QAClF,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,UAAU,CAAW,EAAE,IAAI,CAAC,CAAC,CAAA;IAC5F,CAAC,CAAC,CAAA;AACJ,CAAC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Model compatibility: `POST /models/compatibility` (what a file needs and whether this core runs
|
|
3
|
+
* it, before download by repo and file or after it by `model_id`) and `GET /models/atomic-prism/families`
|
|
4
|
+
* (the Bonsai models the conf rules name, for a client to plan its own download). The core does not
|
|
5
|
+
* download model files; clients do (ADR 2026-10-15-core-does-not-download-models).
|
|
6
|
+
*/
|
|
7
|
+
import type { Router } from '../../http.js';
|
|
8
|
+
import type { ControlRouteContext, ControlServerDeps } from '../types.js';
|
|
9
|
+
export declare function registerModelCompatibilityRoutes(router: Router, deps: ControlServerDeps, ctx: ControlRouteContext): void;
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Model compatibility: `POST /models/compatibility` (what a file needs and whether this core runs
|
|
3
|
+
* it, before download by repo and file or after it by `model_id`) and `GET /models/atomic-prism/families`
|
|
4
|
+
* (the Bonsai models the conf rules name, for a client to plan its own download). The core does not
|
|
5
|
+
* download model files; clients do (ADR 2026-10-15-core-does-not-download-models).
|
|
6
|
+
*/
|
|
7
|
+
import { AtomicCoreError } from '../../../contracts/index.js';
|
|
8
|
+
import { readJsonBody, sendJson } from '../../http.js';
|
|
9
|
+
function control(deps) {
|
|
10
|
+
if (!deps.modelCompatibility)
|
|
11
|
+
throw new AtomicCoreError('INVALID_ARGUMENT', 'Model compatibility is not available in this core.');
|
|
12
|
+
return deps.modelCompatibility;
|
|
13
|
+
}
|
|
14
|
+
async function objectBody(req) {
|
|
15
|
+
const body = await readJsonBody(req);
|
|
16
|
+
if (typeof body !== 'object' || body === null || Array.isArray(body)) {
|
|
17
|
+
throw new AtomicCoreError('INVALID_ARGUMENT', 'The request body must be a JSON object.');
|
|
18
|
+
}
|
|
19
|
+
return body;
|
|
20
|
+
}
|
|
21
|
+
export function registerModelCompatibilityRoutes(router, deps, ctx) {
|
|
22
|
+
const { p } = ctx;
|
|
23
|
+
router.post(p('/models/compatibility'), async (req, res) => {
|
|
24
|
+
const compatibility = control(deps);
|
|
25
|
+
sendJson(res, 200, await compatibility.compatibility(await objectBody(req)));
|
|
26
|
+
});
|
|
27
|
+
router.get(p('/models/atomic-prism/families'), async (_req, res) => {
|
|
28
|
+
sendJson(res, 200, await control(deps).families());
|
|
29
|
+
});
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=model-compatibility.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"model-compatibility.js","sourceRoot":"","sources":["../../../../src/server/control/routes/model-compatibility.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAItD,SAAS,OAAO,CAAC,IAAuB;IACtC,IAAI,CAAC,IAAI,CAAC,kBAAkB;QAC1B,MAAM,IAAI,eAAe,CAAC,kBAAkB,EAAE,oDAAoD,CAAC,CAAA;IACrG,OAAO,IAAI,CAAC,kBAAkB,CAAA;AAChC,CAAC;AAED,KAAK,UAAU,UAAU,CAAI,GAAuC;IAClE,MAAM,IAAI,GAAG,MAAM,YAAY,CAAI,GAAG,CAAC,CAAA;IACvC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACrE,MAAM,IAAI,eAAe,CAAC,kBAAkB,EAAE,yCAAyC,CAAC,CAAA;IAC1F,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,UAAU,gCAAgC,CAC9C,MAAc,EACd,IAAuB,EACvB,GAAwB;IAExB,MAAM,EAAE,CAAC,EAAE,GAAG,GAAG,CAAA;IACjB,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,uBAAuB,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;QACzD,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;QACnC,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC,aAAa,CAAC,MAAM,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IAC9E,CAAC,CAAC,CAAA;IACF,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,+BAA+B,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QACjE,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;IACpD,CAAC,CAAC,CAAA;AACJ,CAAC"}
|
|
@@ -4,8 +4,8 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import type { CloudProviderInput, CloudProviderView, SubscriptionModel } from '../../cloud/index.js';
|
|
6
6
|
import type { ChatGptStatus } from '../../credentials/index.js';
|
|
7
|
-
import type { EngineBuildCatalog, EngineBuildCatalogRequest, EngineBuildId, EngineBuildInstallRequest, EngineBuildInstallResult, EngineBuildRemoveResult, EngineBuildUpdateCheck, EngineBuildUpdateCheckRequest, EngineActivateResult, EngineBuildDeleteResult, EngineOperationStarted, EngineUpdateRequest, EngineUpdateResult, EngineVersionsRequest, EngineVersionsResponse } from '../../contracts/index.js';
|
|
8
|
-
import type { BeginOperation, DecisionDecideRequest, DecisionOutcome, DecisionScoreRequest, DecisionSettings, DecisionStatus, EmbeddingEmbedResponse, EmbeddingSettings, EmbeddingStatus, RouterScoreResponse, SystemoneResponse, DeviceInfo, DiffusionCancelResult, DiffusionConfig, DiffusionModelFile, DiffusionStatus, EnvironmentDiagnostics, EnvironmentOperation, EnvironmentResetResult, EnvironmentSnapshot, ModelCompatibilityRequest, ModelCompatibilityResponse, PrismFamiliesResponse,
|
|
7
|
+
import type { EngineBuildCatalog, EngineBuildCatalogRequest, EngineBuildId, EngineBuildInstallRequest, EngineBuildInstallResult, EngineBuildRemoveResult, EngineBuildUpdateCheck, EngineBuildUpdateCheckRequest, EngineActivateResult, EngineBuildDeleteResult, EngineOperationStarted, EngineUpdateRequest, EngineUpdateResult, EngineVersionsRequest, EngineVersionsResponse, MediaCatalogView, MediaKind, MediaProviderModels } from '../../contracts/index.js';
|
|
8
|
+
import type { BeginOperation, DecisionDecideRequest, DecisionOutcome, DecisionScoreRequest, DecisionSettings, DecisionStatus, EmbeddingEmbedResponse, EmbeddingSettings, EmbeddingStatus, RouterScoreResponse, SystemoneResponse, DeviceInfo, DiffusionCancelResult, DownloadProgress, DiffusionConfig, DiffusionModelFile, DiffusionStatus, EnvironmentDiagnostics, EnvironmentOperation, EnvironmentResetResult, EnvironmentSnapshot, ModelCompatibilityRequest, ModelCompatibilityResponse, PrismFamiliesResponse, GalleryFlags, GalleryImageItem, GalleryListOptions, GalleryPage, ImageCapabilities, ImageGenerateRequest, ImageJob, LoadDiffusionModelRequest, LoadedDiffusionModel, VideoCapabilities, VideoEstimate, VideoGalleryPage, VideoGenerateRequest, VideoJob, GalleryVideoItem, HardwareInfoResponse, HardwareOverride, HardwareOverrideInput, LocalApiServerState, LocalProviderId, ManagedHostReceipt, ModelCompatibility, ManagedModelDeletion, ManagedModelLocation, ProbeEnvironmentInput, RemoteAccessStatus, RequirementPlan, ResumeOperation, RuntimeDescriptorSummary, SessionInfo, UnloadResult } from '../../contracts/index.js';
|
|
9
9
|
import type { CoreEmitter } from '../../events/index.js';
|
|
10
10
|
import type { CtxIncreaseResult } from '../../runtime/llamacpp/runtime.js';
|
|
11
11
|
import type { GgufValidation, ModelCapabilities } from '../../models/index.js';
|
|
@@ -255,6 +255,11 @@ export interface ExternalSessionControl {
|
|
|
255
255
|
list: () => unknown[];
|
|
256
256
|
answerCtx: (owner: string, requestId: string, outcome: unknown) => boolean;
|
|
257
257
|
}
|
|
258
|
+
/** Remote media (ADR 2026-10-13-remote-media-shares-the-diffusion-job-table): the catalog and a provider's models. */
|
|
259
|
+
export interface MediaControl {
|
|
260
|
+
catalog: () => Promise<MediaCatalogView>;
|
|
261
|
+
providerModels: (provider: string, kind: MediaKind) => Promise<MediaProviderModels>;
|
|
262
|
+
}
|
|
258
263
|
/** Cloud providers the public server routes to (PLAN.md §4, stage 4c). Keys are never read back. */
|
|
259
264
|
export interface CloudControl {
|
|
260
265
|
list: () => CloudProviderView[];
|
|
@@ -273,23 +278,15 @@ export interface ChatGptControl {
|
|
|
273
278
|
logout: () => Promise<ChatGptStatus>;
|
|
274
279
|
models: () => Promise<SubscriptionModel[]>;
|
|
275
280
|
}
|
|
276
|
-
/** Model compatibility
|
|
277
|
-
export interface
|
|
281
|
+
/** Model compatibility: what a GGUF file needs, before download and after it, and the Bonsai families. */
|
|
282
|
+
export interface ModelCompatibilityControl {
|
|
278
283
|
compatibility: (request: ModelCompatibilityRequest) => Promise<ModelCompatibilityResponse>;
|
|
279
|
-
plan
|
|
280
|
-
/** The Bonsai families the conf model rules name, for the Hub's PrismML list. */
|
|
284
|
+
/** The Bonsai families the conf model rules name, for a client to plan its own download. */
|
|
281
285
|
families: () => Promise<PrismFamiliesResponse>;
|
|
282
|
-
start: (request: ModelSetupStartRequest) => Promise<ModelSetup>;
|
|
283
|
-
list: () => Promise<ModelSetup[]>;
|
|
284
|
-
get: (setupId: string) => Promise<ModelSetup>;
|
|
285
|
-
cancel: (setupId: string) => Promise<ModelSetup>;
|
|
286
|
-
resume: (setupId: string, options: {
|
|
287
|
-
proxy?: ProxyConfig | null;
|
|
288
|
-
}) => Promise<ModelSetup>;
|
|
289
|
-
/** In memory, for the control snapshot. */
|
|
290
|
-
snapshot: () => ModelSetup[];
|
|
291
286
|
}
|
|
292
287
|
export interface ControlServerDeps {
|
|
288
|
+
/** Running downloads' last progress, for the snapshot (`Downloader.snapshot`); absent is none. */
|
|
289
|
+
downloads?: () => DownloadProgress[];
|
|
293
290
|
/** Absent in a build with no managed runtime wired; its routes then answer that it is not there. */
|
|
294
291
|
environments?: ManagedEnvironmentControl;
|
|
295
292
|
/** The snapshot's view of them, kept in memory so it needs no disk read. */
|
|
@@ -346,10 +343,12 @@ export interface ControlServerDeps {
|
|
|
346
343
|
decision?: DecisionControl;
|
|
347
344
|
/** The embedding model; without it the `/embedding/*` routes answer `EMBEDDING_UNAVAILABLE`. */
|
|
348
345
|
embedding?: EmbeddingControl;
|
|
346
|
+
/** Remote media; without it the `/media/*` routes answer `REMOTE_NOT_CONFIGURED`. */
|
|
347
|
+
media?: MediaControl;
|
|
349
348
|
/** What a model is and can do, without loading it (PLAN.md §4, stage 3d). */
|
|
350
349
|
models: ModelControl;
|
|
351
|
-
/** Absent in a core without
|
|
352
|
-
|
|
350
|
+
/** Absent in a core without it wired; its routes then answer `INVALID_ARGUMENT`. */
|
|
351
|
+
modelCompatibility?: ModelCompatibilityControl;
|
|
353
352
|
/**
|
|
354
353
|
* `POST /models/:provider/check` (spec `managed-model-store`, "Проверка совместимости одинакова по
|
|
355
354
|
* форме для всех managed-движков"): for each managed provider this core offers, whether a Hugging
|
|
@@ -406,13 +405,12 @@ export interface ControlSnapshot {
|
|
|
406
405
|
sessions: SessionSummary[];
|
|
407
406
|
server: LocalApiServerState;
|
|
408
407
|
clients: ReturnType<ClientRegistry['list']>;
|
|
409
|
-
downloads
|
|
408
|
+
/** Running downloads' last progress, so a client that reconnects mid-transfer need not wait for an event. */
|
|
409
|
+
downloads: DownloadProgress[];
|
|
410
410
|
optimal_backends: Record<string, OptimalState>;
|
|
411
411
|
/** The managed container runtimes this user has, and the changes in flight on them. */
|
|
412
412
|
environments: EnvironmentSnapshot[];
|
|
413
413
|
environment_operations: EnvironmentOperation[];
|
|
414
|
-
/** Model setups, the running ones and those left to resume or read. */
|
|
415
|
-
model_setups: ModelSetup[];
|
|
416
414
|
}
|
|
417
415
|
/**
|
|
418
416
|
* What every route family shares, built once per router: the prefixed path helper, the clock the
|
package/dist/server/http.js
CHANGED
|
@@ -113,7 +113,6 @@ export function statusForCode(code) {
|
|
|
113
113
|
case 'MODEL_MISSING':
|
|
114
114
|
case 'SIDE_FILE_MISSING':
|
|
115
115
|
case 'MANAGED_OPERATION_NOT_FOUND':
|
|
116
|
-
case 'MODEL_SETUP_NOT_FOUND':
|
|
117
116
|
return 404;
|
|
118
117
|
case 'CORE_ALREADY_RUNNING':
|
|
119
118
|
case 'AUTH_CANCELLED':
|
|
@@ -148,12 +147,26 @@ export function statusForCode(code) {
|
|
|
148
147
|
case 'EMBEDDING_NOT_CONFIGURED':
|
|
149
148
|
case 'EMBEDDING_ENGINE_UNSUPPORTED':
|
|
150
149
|
case 'EMBEDDING_MODEL_NOT_EMBEDDING':
|
|
151
|
-
case 'MODEL_SETUP_PLAN_STALE':
|
|
152
150
|
return 409;
|
|
153
151
|
case 'QUEUE_FULL':
|
|
152
|
+
case 'REMOTE_RATE_LIMITED':
|
|
154
153
|
return 429;
|
|
155
154
|
case 'DISK_FULL':
|
|
156
155
|
return 507;
|
|
156
|
+
// A provider's answer, not the caller's credentials: never a 401 the app would take for its own token.
|
|
157
|
+
case 'REMOTE_AUTH_FAILED':
|
|
158
|
+
case 'REMOTE_UNAVAILABLE':
|
|
159
|
+
return 502;
|
|
160
|
+
case 'REMOTE_TIMEOUT':
|
|
161
|
+
return 504;
|
|
162
|
+
case 'REMOTE_QUOTA':
|
|
163
|
+
return 402;
|
|
164
|
+
case 'REMOTE_REJECTED':
|
|
165
|
+
case 'REMOTE_CONTENT_BLOCKED':
|
|
166
|
+
case 'REMOTE_UNSUPPORTED':
|
|
167
|
+
return 422;
|
|
168
|
+
case 'REMOTE_NOT_CONFIGURED':
|
|
169
|
+
return 409;
|
|
157
170
|
case 'AUTH_FAILED':
|
|
158
171
|
case 'UPSTREAM_ERROR':
|
|
159
172
|
return 502;
|
package/dist/server/http.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/server/http.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/server/http.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,8 +44,13 @@ export declare function hostMessage(host: string): string;
|
|
|
44
44
|
export declare function preflight(req: IncomingMessage, config: PublicServerConfig): EarlyResponse;
|
|
45
45
|
/** What {@link hostAndKeyGate} needs: a shape `PublicServerConfig` also satisfies. */
|
|
46
46
|
export interface HostAndKeyConfig {
|
|
47
|
-
/** Key clients must present; empty disables the check. */
|
|
47
|
+
/** Key clients must present; empty disables the check. Ignored when `apiKeys` is set. */
|
|
48
48
|
apiKey: string;
|
|
49
|
+
/**
|
|
50
|
+
* The host's keyring (`AtomicCoreOptions.publicApiKeys`): when set, a client must present one of
|
|
51
|
+
* these and `apiKey` is ignored. An empty list refuses every client; an empty entry matches nothing.
|
|
52
|
+
*/
|
|
53
|
+
apiKeys?: readonly string[];
|
|
49
54
|
/** Hosts allowed besides the built-in loopback names; `*` allows every host. */
|
|
50
55
|
trustedHosts: readonly string[];
|
|
51
56
|
}
|
|
@@ -173,11 +173,15 @@ export function hostAndKeyGate(req, config) {
|
|
|
173
173
|
return { status: 400, headers: [], body: 'Missing host header', kind: 'bad_request' };
|
|
174
174
|
if (!isValidHost(host, config.trustedHosts))
|
|
175
175
|
return { status: 403, headers: [], body: hostMessage(host), kind: 'host' };
|
|
176
|
-
|
|
176
|
+
const keys = config.apiKeys ?? (config.apiKey !== '' ? [config.apiKey] : undefined);
|
|
177
|
+
if (keys !== undefined) {
|
|
177
178
|
// `Bearer ` is matched exactly, case included, as the proxy does.
|
|
178
179
|
const auth = header(req, 'authorization');
|
|
179
|
-
const
|
|
180
|
-
const
|
|
180
|
+
const bearer = auth.startsWith('Bearer ') ? auth.slice('Bearer '.length) : undefined;
|
|
181
|
+
const xApiKey = header(req, 'x-api-key');
|
|
182
|
+
const matches = (presented) => keys.some((key) => key !== '' && timingSafeEqualString(presented, key));
|
|
183
|
+
const bearerOk = bearer !== undefined && matches(bearer);
|
|
184
|
+
const keyOk = matches(xApiKey);
|
|
181
185
|
if (!bearerOk && !keyOk) {
|
|
182
186
|
return { status: 401, headers: [], body: 'Invalid or missing authorization token', kind: 'auth' };
|
|
183
187
|
}
|