@atomic-chat/core 0.17.0 → 0.18.4
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/dist/app-daemon.js +7 -0
- package/dist/app-daemon.js.map +1 -1
- package/dist/backend/advisor/advisor.d.ts +6 -1
- package/dist/backend/advisor/advisor.js +69 -7
- package/dist/backend/advisor/advisor.js.map +1 -1
- package/dist/backend/catalog/prism-manifest.d.ts +2 -0
- package/dist/backend/catalog/prism-manifest.js +3 -2
- package/dist/backend/catalog/prism-manifest.js.map +1 -1
- package/dist/cli/main.d.ts +1 -1
- package/dist/cli/main.js +5 -0
- package/dist/cli/main.js.map +1 -1
- package/dist/client/control-client.d.ts +10 -1
- package/dist/client/control-client.js +15 -0
- package/dist/client/control-client.js.map +1 -1
- package/dist/cloud/registry.js +1 -0
- package/dist/cloud/registry.js.map +1 -1
- package/dist/config/paths.d.ts +4 -0
- package/dist/config/paths.js +11 -0
- package/dist/config/paths.js.map +1 -1
- package/dist/contracts/backend-advisor.d.ts +12 -0
- package/dist/contracts/engine-builds.d.ts +1 -1
- package/dist/contracts/engine-builds.js +1 -1
- package/dist/contracts/engine-builds.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 +13 -2
- package/dist/contracts/errors.js.map +1 -1
- package/dist/contracts/events.d.ts +7 -0
- package/dist/contracts/foundry-local.d.ts +77 -0
- package/dist/contracts/foundry-local.js +17 -0
- package/dist/contracts/foundry-local.js.map +1 -0
- package/dist/contracts/index.d.ts +1 -0
- package/dist/contracts/index.js +1 -0
- package/dist/contracts/index.js.map +1 -1
- package/dist/contracts/model-yml.d.ts +28 -0
- package/dist/contracts/model-yml.js +11 -0
- package/dist/contracts/model-yml.js.map +1 -1
- package/dist/contracts/session.d.ts +5 -1
- package/dist/contracts/session.js.map +1 -1
- package/dist/contracts/settings.d.ts +5 -1
- package/dist/contracts/settings.js.map +1 -1
- package/dist/core/atomic-core.d.ts +1 -1
- package/dist/core/create.js +106 -5
- package/dist/core/create.js.map +1 -1
- package/dist/core/types.d.ts +9 -0
- package/dist/core/types.js.map +1 -1
- package/dist/diffusion/install.d.ts +0 -4
- package/dist/diffusion/install.js +5 -2
- package/dist/diffusion/install.js.map +1 -1
- package/dist/diffusion/server-process.d.ts +5 -2
- package/dist/diffusion/server-process.js +10 -2
- package/dist/diffusion/server-process.js.map +1 -1
- package/dist/downloads/archive.d.ts +1 -1
- package/dist/downloads/archive.js +2 -2
- package/dist/downloads/archive.js.map +1 -1
- package/dist/engine-builds/engines.d.ts +83 -0
- package/dist/engine-builds/engines.js +144 -0
- package/dist/engine-builds/engines.js.map +1 -0
- package/dist/engine-builds/foundry-local.d.ts +22 -0
- package/dist/engine-builds/foundry-local.js +100 -0
- package/dist/engine-builds/foundry-local.js.map +1 -0
- package/dist/engine-builds/manifest.d.ts +57 -6
- package/dist/engine-builds/manifest.js +109 -4
- package/dist/engine-builds/manifest.js.map +1 -1
- package/dist/engine-builds/order.d.ts +2 -1
- package/dist/engine-builds/order.js +11 -4
- package/dist/engine-builds/order.js.map +1 -1
- package/dist/engine-builds/select.d.ts +27 -0
- package/dist/engine-builds/select.js +45 -0
- package/dist/engine-builds/select.js.map +1 -1
- package/dist/engine-builds/service.d.ts +14 -15
- package/dist/engine-builds/service.js +68 -126
- package/dist/engine-builds/service.js.map +1 -1
- package/dist/engines/service.d.ts +6 -3
- package/dist/engines/service.js +6 -3
- package/dist/engines/service.js.map +1 -1
- package/dist/hardware/index.d.ts +1 -0
- package/dist/hardware/index.js +1 -0
- package/dist/hardware/index.js.map +1 -1
- package/dist/hardware/npu.d.ts +14 -0
- package/dist/hardware/npu.js +29 -0
- package/dist/hardware/npu.js.map +1 -0
- package/dist/host/recipes/executor-io-windows.d.ts +11 -0
- package/dist/host/recipes/executor-io-windows.js +23 -5
- package/dist/host/recipes/executor-io-windows.js.map +1 -1
- package/dist/integrations/detect.d.ts +2 -0
- package/dist/integrations/detect.js +4 -3
- package/dist/integrations/detect.js.map +1 -1
- package/dist/lock/instance-lock.js +5 -2
- package/dist/lock/instance-lock.js.map +1 -1
- package/dist/lock/process-identity.d.ts +9 -3
- package/dist/lock/process-identity.js +75 -9
- package/dist/lock/process-identity.js.map +1 -1
- package/dist/router/resolve.d.ts +2 -2
- package/dist/router/resolve.js +2 -1
- package/dist/router/resolve.js.map +1 -1
- package/dist/runtime/foundry-local/accelerators.d.ts +42 -0
- package/dist/runtime/foundry-local/accelerators.js +153 -0
- package/dist/runtime/foundry-local/accelerators.js.map +1 -0
- package/dist/runtime/foundry-local/check.d.ts +19 -0
- package/dist/runtime/foundry-local/check.js +69 -0
- package/dist/runtime/foundry-local/check.js.map +1 -0
- package/dist/runtime/foundry-local/foundry-host.d.ts +18 -0
- package/dist/runtime/foundry-local/foundry-host.js +23 -0
- package/dist/runtime/foundry-local/foundry-host.js.map +1 -0
- package/dist/runtime/foundry-local/host/args.d.ts +44 -0
- package/dist/runtime/foundry-local/host/args.js +109 -0
- package/dist/runtime/foundry-local/host/args.js.map +1 -0
- package/dist/runtime/foundry-local/host/execution-providers.d.ts +27 -0
- package/dist/runtime/foundry-local/host/execution-providers.js +43 -0
- package/dist/runtime/foundry-local/host/execution-providers.js.map +1 -0
- package/dist/runtime/foundry-local/host/ffi-bun.d.ts +17 -0
- package/dist/runtime/foundry-local/host/ffi-bun.js +256 -0
- package/dist/runtime/foundry-local/host/ffi-bun.js.map +1 -0
- package/dist/runtime/foundry-local/host/library.d.ts +61 -0
- package/dist/runtime/foundry-local/host/library.js +17 -0
- package/dist/runtime/foundry-local/host/library.js.map +1 -0
- package/dist/runtime/foundry-local/host/run.d.ts +54 -0
- package/dist/runtime/foundry-local/host/run.js +316 -0
- package/dist/runtime/foundry-local/host/run.js.map +1 -0
- package/dist/runtime/foundry-local/host-process.d.ts +81 -0
- package/dist/runtime/foundry-local/host-process.js +185 -0
- package/dist/runtime/foundry-local/host-process.js.map +1 -0
- package/dist/runtime/foundry-local/index.d.ts +10 -0
- package/dist/runtime/foundry-local/index.js +10 -0
- package/dist/runtime/foundry-local/index.js.map +1 -0
- package/dist/runtime/foundry-local/model-yml.d.ts +8 -0
- package/dist/runtime/foundry-local/model-yml.js +63 -0
- package/dist/runtime/foundry-local/model-yml.js.map +1 -0
- package/dist/runtime/foundry-local/runtime.d.ts +88 -0
- package/dist/runtime/foundry-local/runtime.js +321 -0
- package/dist/runtime/foundry-local/runtime.js.map +1 -0
- package/dist/runtime/llamacpp/args.d.ts +5 -0
- package/dist/runtime/llamacpp/args.js +7 -1
- package/dist/runtime/llamacpp/args.js.map +1 -1
- package/dist/runtime/llamacpp/errors.d.ts +1 -0
- package/dist/runtime/llamacpp/errors.js +10 -0
- package/dist/runtime/llamacpp/errors.js.map +1 -1
- package/dist/runtime/llamacpp/load-plan.d.ts +5 -0
- package/dist/runtime/llamacpp/load-plan.js +8 -0
- package/dist/runtime/llamacpp/load-plan.js.map +1 -1
- package/dist/runtime/llamacpp/runtime-device.d.ts +8 -0
- package/dist/runtime/llamacpp/runtime-device.js +9 -3
- package/dist/runtime/llamacpp/runtime-device.js.map +1 -1
- package/dist/runtime/llamacpp/runtime.d.ts +6 -1
- package/dist/runtime/llamacpp/runtime.js +19 -3
- package/dist/runtime/llamacpp/runtime.js.map +1 -1
- package/dist/runtime/managed-text/gateway.d.ts +2 -0
- package/dist/runtime/managed-text/gateway.js +1 -1
- package/dist/runtime/managed-text/gateway.js.map +1 -1
- package/dist/runtime/shared/external-sessions.js +1 -0
- package/dist/runtime/shared/external-sessions.js.map +1 -1
- package/dist/runtime/shared/process.d.ts +13 -1
- package/dist/runtime/shared/process.js +21 -12
- package/dist/runtime/shared/process.js.map +1 -1
- package/dist/server/control/router.js +2 -0
- package/dist/server/control/router.js.map +1 -1
- package/dist/server/control/routes/foundry-local.d.ts +10 -0
- package/dist/server/control/routes/foundry-local.js +42 -0
- package/dist/server/control/routes/foundry-local.js.map +1 -0
- package/dist/server/control/routes/models.js +6 -3
- package/dist/server/control/routes/models.js.map +1 -1
- package/dist/server/control/types.d.ts +17 -1
- package/dist/server/control/types.js.map +1 -1
- package/dist/server/http.js +45 -7
- package/dist/server/http.js.map +1 -1
- package/dist/server/public/errors.d.ts +1 -0
- package/dist/server/public/errors.js +18 -0
- package/dist/server/public/errors.js.map +1 -1
- package/dist/server/public/listing.js +1 -0
- package/dist/server/public/listing.js.map +1 -1
- package/dist/settings/public.d.ts +7 -0
- package/dist/settings/public.js +8 -0
- package/dist/settings/public.js.map +1 -0
- package/dist/settings/schema/foundry-local.json +14 -0
- package/dist/settings/schema.js +8 -0
- package/dist/settings/schema.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +11 -3
- package/src/settings/schema/atomic-prism.json +0 -433
- package/src/settings/schema/foundation-models.json +0 -1
- package/src/settings/schema/llamacpp-upstream.json +0 -498
- package/src/settings/schema/llamacpp.json +0 -475
- package/src/settings/schema/mlx.json +0 -136
- package/src/settings/schema/sglang.json +0 -251
- package/src/settings/schema/tensorrt-llm.json +0 -253
- package/src/settings/schema/vllm.json +0 -273
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"foundry-local.js","sourceRoot":"","sources":["../../../../src/server/control/routes/foundry-local.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAE7D,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAI1E,MAAM,OAAO,GAAG,CAAC,GAAW,EAAE,OAAgB,EAAS,EAAE;IACvD,MAAM,IAAI,eAAe,CAAC,kBAAkB,EAAE,GAAG,EAAE,OAAO,CAAC,CAAA;AAC7D,CAAC,CAAA;AAED,4DAA4D;AAC5D,MAAM,gBAAgB,GAAG,yBAAyB,CAAA;AAElD,MAAM,UAAU,gBAAgB,CAAC,GAAY;IAC3C,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;QAC/D,OAAO,OAAO,CAAC,yCAAyC,CAAC,CAAA;IAC3D,MAAM,IAAI,GAAG,GAA8B,CAAA;IAC3C,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,cAAc,CAAC,CAAA;IACvE,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,CAAC,iDAAiD,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IACzG,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,CAAA;IAClC,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,EAAE,CAAA;IAClC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzG,OAAO,OAAO,CAAC,mDAAmD,CAAC,CAAA;IACrE,OAAO,EAAE,YAAY,EAAE,KAAiB,EAAE,CAAA;AAC5C,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,MAAc,EACd,IAAuB,EACvB,GAAwB;IAExB,MAAM,EAAE,CAAC,EAAE,GAAG,GAAG,CAAA;IACjB,MAAM,MAAM,GAAG,GAAG,EAAE,CAClB,IAAI,eAAe,CAAC,oBAAoB,EAAE,8CAA8C,EAAE,eAAe,CAAC,CAAA;IAE5G,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,sCAAsC,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;QACvE,IAAI,CAAC,IAAI,CAAC,YAAY;YAAE,OAAO,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,CAAA;QACvD,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;IAC7F,CAAC,CAAC,CAAA;IAEF,6FAA6F;IAC7F,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,8CAA8C,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;QAChF,IAAI,CAAC,IAAI,CAAC,YAAY;YAAE,OAAO,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,CAAA;QACvD,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,gBAAgB,CAAC,MAAM,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IAChG,CAAC,CAAC,CAAA;AACJ,CAAC"}
|
|
@@ -60,7 +60,9 @@ export function registerModelRoutes(router, deps, ctx) {
|
|
|
60
60
|
const provider = params['provider'];
|
|
61
61
|
const check = Object.hasOwn(deps.managedModelChecks ?? {}, provider)
|
|
62
62
|
? deps.managedModelChecks?.[provider]
|
|
63
|
-
:
|
|
63
|
+
: Object.hasOwn(deps.nativeModelChecks ?? {}, provider)
|
|
64
|
+
? deps.nativeModelChecks?.[provider]
|
|
65
|
+
: undefined;
|
|
64
66
|
if (check === undefined) {
|
|
65
67
|
return sendError(res, new AtomicCoreError('PROVIDER_NOT_FOUND', `${provider} has no model check in this build.`, provider));
|
|
66
68
|
}
|
|
@@ -79,8 +81,9 @@ export function registerModelRoutes(router, deps, ctx) {
|
|
|
79
81
|
});
|
|
80
82
|
// Deleting a model of the store (spec "Модель хранилища удаляется через core"): only core knows
|
|
81
83
|
// whether any managed provider has it loaded and owns every engine's caches of it, so clients never
|
|
82
|
-
// remove its folder themselves. The id
|
|
83
|
-
//
|
|
84
|
+
// remove its folder themselves. The id arrives percent-decoded segment by segment, like every path
|
|
85
|
+
// parameter (change close-cli-core-gaps, design D4: `Qwen%2FQwen3-1.7B` is `Qwen/Qwen3-1.7B`), and is
|
|
86
|
+
// then compared exactly with the ids the store lists, never resolved as a path.
|
|
84
87
|
router.delete(p('/managed-models/*modelId'), async (_req, res, { params }) => {
|
|
85
88
|
if (!deps.managedModelDelete) {
|
|
86
89
|
return sendError(res, new AtomicCoreError('PROVIDER_NOT_FOUND', 'No managed engine is available in this build.', 'managed-models'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../../src/server/control/routes/models.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../../src/server/control/routes/models.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@
|
|
|
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, MediaCatalogView, MediaKind, MediaProviderModels } from '../../contracts/index.js';
|
|
7
|
+
import type { FoundryLocalAccelerators, FoundryLocalPrepareRequest, FoundryLocalPrepareResult, EngineBuildCatalog, EngineBuildCatalogRequest, EngineBuildId, EngineBuildInstallRequest, EngineBuildInstallResult, EngineBuildRemoveResult, EngineBuildUpdateCheck, EngineBuildUpdateCheckRequest, EngineActivateResult, EngineBuildDeleteResult, EngineOperationStarted, EngineUpdateRequest, EngineUpdateResult, EngineVersionsRequest, EngineVersionsResponse, MediaCatalogView, MediaKind, MediaProviderModels } from '../../contracts/index.js';
|
|
8
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';
|
|
@@ -357,6 +357,11 @@ export interface ControlServerDeps {
|
|
|
357
357
|
* Windows) answers `PROVIDER_NOT_FOUND`.
|
|
358
358
|
*/
|
|
359
359
|
managedModelChecks?: Readonly<Record<string, (body: unknown) => Promise<ModelCompatibility>>>;
|
|
360
|
+
/**
|
|
361
|
+
* The same route for a native provider with its own answer (change `add-foundry-local`, task 6.5:
|
|
362
|
+
* `foundry-local` → `FoundryLocalCheckResult`). Asked when `managedModelChecks` has no entry.
|
|
363
|
+
*/
|
|
364
|
+
nativeModelChecks?: Readonly<Record<string, (body: unknown) => Promise<object>>>;
|
|
360
365
|
/**
|
|
361
366
|
* `DELETE /managed-models/:id` (spec `managed-model-store`, "Модель хранилища удаляется через core"):
|
|
362
367
|
* stop the model in whichever managed provider holds it, with Docker's confirmation, then remove every
|
|
@@ -376,6 +381,11 @@ export interface ControlServerDeps {
|
|
|
376
381
|
* Answers `unavailable` on a platform without the runtime.
|
|
377
382
|
*/
|
|
378
383
|
foundationModelsAvailability?: (force: boolean) => Promise<string>;
|
|
384
|
+
/**
|
|
385
|
+
* Foundry Local's accelerators (change `add-foundry-local`, task 6.4); absent where the provider is
|
|
386
|
+
* not registered, and its routes then answer `PROVIDER_NOT_FOUND`.
|
|
387
|
+
*/
|
|
388
|
+
foundryLocal?: FoundryLocalControl;
|
|
379
389
|
cloud: CloudControl;
|
|
380
390
|
chatgpt: ChatGptControl;
|
|
381
391
|
externalSessions: ExternalSessionControl;
|
|
@@ -425,3 +435,9 @@ export interface ControlRouteContext {
|
|
|
425
435
|
/** The server being constructed; `undefined` until `ControlServer.start` has built it. */
|
|
426
436
|
self: () => ControlServer | undefined;
|
|
427
437
|
}
|
|
438
|
+
export interface FoundryLocalControl {
|
|
439
|
+
/** The last probe of the active build; `force` probes again. */
|
|
440
|
+
accelerators(force: boolean): Promise<FoundryLocalAccelerators>;
|
|
441
|
+
/** Downloads and registers the accelerators named (none: all offered); one at a time. */
|
|
442
|
+
prepare(request: FoundryLocalPrepareRequest): Promise<FoundryLocalPrepareResult>;
|
|
443
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/server/control/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/server/control/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAkHH,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAA"}
|
package/dist/server/http.js
CHANGED
|
@@ -34,14 +34,14 @@ export class Router {
|
|
|
34
34
|
const segments = splitPath(path);
|
|
35
35
|
let methodMismatch = false;
|
|
36
36
|
for (const route of this.routes) {
|
|
37
|
-
const
|
|
38
|
-
if (!
|
|
37
|
+
const raw = matchSegments(route.segments, segments);
|
|
38
|
+
if (!raw)
|
|
39
39
|
continue;
|
|
40
40
|
if (route.method !== method) {
|
|
41
41
|
methodMismatch = true;
|
|
42
42
|
continue;
|
|
43
43
|
}
|
|
44
|
-
return { route, match: { params } };
|
|
44
|
+
return { route, match: { params: decodeParams(raw) } };
|
|
45
45
|
}
|
|
46
46
|
return methodMismatch ? { methodMismatch: true } : undefined;
|
|
47
47
|
}
|
|
@@ -49,6 +49,11 @@ export class Router {
|
|
|
49
49
|
function splitPath(path) {
|
|
50
50
|
return path.split('/').filter((s) => s.length > 0);
|
|
51
51
|
}
|
|
52
|
+
/**
|
|
53
|
+
* The raw (still percent-encoded) segments of each parameter: one for `:param`, every segment it took
|
|
54
|
+
* for `*rest`. Matching runs on raw segments, so a `%2F` inside one never shifts the boundary with the
|
|
55
|
+
* fixed segments after a rest parameter.
|
|
56
|
+
*/
|
|
52
57
|
function matchSegments(pattern, actual) {
|
|
53
58
|
const params = {};
|
|
54
59
|
let p = 0;
|
|
@@ -61,7 +66,7 @@ function matchSegments(pattern, actual) {
|
|
|
61
66
|
const take = actual.length - a - remainingFixed;
|
|
62
67
|
if (take < 1)
|
|
63
68
|
return undefined;
|
|
64
|
-
params[seg.slice(1)] = actual.slice(a, a + take)
|
|
69
|
+
params[seg.slice(1)] = actual.slice(a, a + take);
|
|
65
70
|
a += take;
|
|
66
71
|
p++;
|
|
67
72
|
continue;
|
|
@@ -70,7 +75,7 @@ function matchSegments(pattern, actual) {
|
|
|
70
75
|
return undefined;
|
|
71
76
|
const value = actual[a];
|
|
72
77
|
if (seg.startsWith(':'))
|
|
73
|
-
params[seg.slice(1)] =
|
|
78
|
+
params[seg.slice(1)] = [value];
|
|
74
79
|
else if (seg !== value)
|
|
75
80
|
return undefined;
|
|
76
81
|
p++;
|
|
@@ -78,6 +83,35 @@ function matchSegments(pattern, actual) {
|
|
|
78
83
|
}
|
|
79
84
|
return a === actual.length ? params : undefined;
|
|
80
85
|
}
|
|
86
|
+
/**
|
|
87
|
+
* Each segment decoded on its own, then a rest parameter's joined with `/` (change close-cli-core-gaps,
|
|
88
|
+
* design D4). A broken percent sequence is the caller's mistake: `INVALID_ARGUMENT` (400), not a 500.
|
|
89
|
+
* So is a segment whose decoding produced a path step — `.`, `..` or an empty piece between `/` or
|
|
90
|
+
* `\` (`%2E%2E`, `a%2F..%2Fb`, `%2Fx`): ids reach `join` (`modelDirFromId`), and an encoding must not
|
|
91
|
+
* walk one out of its folder. A segment without `%` is passed on as it came.
|
|
92
|
+
*/
|
|
93
|
+
function decodeParams(raw) {
|
|
94
|
+
const params = {};
|
|
95
|
+
for (const [name, segments] of Object.entries(raw)) {
|
|
96
|
+
params[name] = segments.map((segment) => decodeSegment(name, segment)).join('/');
|
|
97
|
+
}
|
|
98
|
+
return params;
|
|
99
|
+
}
|
|
100
|
+
function decodeSegment(name, segment) {
|
|
101
|
+
let decoded;
|
|
102
|
+
try {
|
|
103
|
+
decoded = decodeURIComponent(segment);
|
|
104
|
+
}
|
|
105
|
+
catch (error) {
|
|
106
|
+
if (!(error instanceof URIError))
|
|
107
|
+
throw error;
|
|
108
|
+
throw new AtomicCoreError('INVALID_ARGUMENT', `The path parameter ${name} is not valid percent-encoding.`, segment);
|
|
109
|
+
}
|
|
110
|
+
if (decoded !== segment &&
|
|
111
|
+
decoded.split(/[\\/]/).some((piece) => piece === '' || piece === '.' || piece === '..'))
|
|
112
|
+
throw new AtomicCoreError('INVALID_ARGUMENT', `The path parameter ${name} encodes a path step (".", ".." or an empty segment).`, segment);
|
|
113
|
+
return decoded;
|
|
114
|
+
}
|
|
81
115
|
export function sendJson(res, status, body) {
|
|
82
116
|
const payload = JSON.stringify(body);
|
|
83
117
|
res.writeHead(status, {
|
|
@@ -120,6 +154,7 @@ export function statusForCode(code) {
|
|
|
120
154
|
case 'REMOTE_ACCESS_SERVER_STOPPED':
|
|
121
155
|
case 'REMOTE_ACCESS_OPERATION_IN_PROGRESS':
|
|
122
156
|
case 'ENGINE_INSTALL_IN_PROGRESS':
|
|
157
|
+
case 'FOUNDRY_LOCAL_ACCELERATOR_NOT_PREPARED':
|
|
123
158
|
case 'REMOTE_ACCESS_STOP_FAILED':
|
|
124
159
|
case 'JOB_BUSY':
|
|
125
160
|
case 'BACKEND_IN_USE':
|
|
@@ -164,6 +199,7 @@ export function statusForCode(code) {
|
|
|
164
199
|
case 'REMOTE_REJECTED':
|
|
165
200
|
case 'REMOTE_CONTENT_BLOCKED':
|
|
166
201
|
case 'REMOTE_UNSUPPORTED':
|
|
202
|
+
case 'FOUNDRY_LOCAL_VARIANT_UNSUPPORTED':
|
|
167
203
|
return 422;
|
|
168
204
|
case 'REMOTE_NOT_CONFIGURED':
|
|
169
205
|
return 409;
|
|
@@ -186,11 +222,13 @@ export function statusForCode(code) {
|
|
|
186
222
|
case 'MANAGED_HOST_STEP_INVALID':
|
|
187
223
|
case 'MANAGED_METADATA_INVALID':
|
|
188
224
|
return 400;
|
|
189
|
-
// Understood, well-formed, and asking for an engine this build has no adapter for,
|
|
190
|
-
// provider to run a file it cannot (or a file nothing runs any more)
|
|
225
|
+
// Understood, well-formed, and asking for an engine this build has no adapter for, asking a
|
|
226
|
+
// provider to run a file it cannot (or a file nothing runs any more), or for an engine build that
|
|
227
|
+
// meets a file's requirements when none on offer does.
|
|
191
228
|
case 'MANAGED_ADAPTER_UNAVAILABLE':
|
|
192
229
|
case 'MODEL_ENGINE_INCOMPATIBLE':
|
|
193
230
|
case 'MODEL_FORMAT_LEGACY':
|
|
231
|
+
case 'BACKEND_BUILD_UNAVAILABLE':
|
|
194
232
|
return 422;
|
|
195
233
|
case 'CORE_NOT_RUNNING':
|
|
196
234
|
case 'FOUNDATION_MODELS_UNAVAILABLE':
|
package/dist/server/http.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/server/http.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAGvD,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAA;AAmBlD,MAAM,OAAO,MAAM;IACA,MAAM,GAAoB,EAAE,CAAA;IAE7C,GAAG,CAAC,MAAc,EAAE,OAAe,EAAE,OAAgB;QACnD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAC5E,OAAO,IAAI,CAAA;IACb,CAAC;IAED,GAAG,CAAC,OAAe,EAAE,OAAgB;QACnC,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;IAC1C,CAAC;IAED,IAAI,CAAC,OAAe,EAAE,OAAgB;QACpC,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;IAC3C,CAAC;IAED,GAAG,CAAC,OAAe,EAAE,OAAgB;QACnC,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;IAC1C,CAAC;IAED,KAAK,CAAC,OAAe,EAAE,OAAgB;QACrC,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;IAC5C,CAAC;IAED,MAAM,CAAC,OAAe,EAAE,OAAgB;QACtC,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;IAC7C,CAAC;IAED,uFAAuF;IACvF,IAAI,CACF,MAAc,EACd,IAAY;QAEZ,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,CAAA;QAChC,IAAI,cAAc,GAAG,KAAK,CAAA;QAC1B,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChC,MAAM,
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/server/http.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
* it to decide whether to offer a larger context or a smaller model.
|
|
11
11
|
*/
|
|
12
12
|
import type { JsonValue } from '../shims/index.js';
|
|
13
|
+
export declare const LLAMA_CONTEXT_OVERFLOW_TYPE = "exceed_context_size_error";
|
|
13
14
|
/** A request that no longer fits the loaded context window, as llama.cpp and MLX word it. */
|
|
14
15
|
export declare function isContextLimitError(status: number, body: string): boolean;
|
|
15
16
|
export declare function bodyIndicatesOom(body: string): boolean;
|
|
@@ -10,11 +10,22 @@
|
|
|
10
10
|
* it to decide whether to offer a larger context or a smaller model.
|
|
11
11
|
*/
|
|
12
12
|
import { isJsonObject, serdeToString } from '../shims/index.js';
|
|
13
|
+
/**
|
|
14
|
+
* How llama.cpp says a prompt does not fit (upstream, TurboQuant and Prism alike): a 400 with
|
|
15
|
+
* `request (N tokens) exceeds the available context size (M tokens), try increasing it` and this
|
|
16
|
+
* error type, which it also sends for `input (N tokens) is larger than the max context size`.
|
|
17
|
+
* Pinned by the engine contract (test/fixtures/llamacpp/engine-contract.json).
|
|
18
|
+
*/
|
|
19
|
+
const LLAMA_CONTEXT_OVERFLOW = /request \(\d+ tokens\) exceeds the available context size/i;
|
|
20
|
+
export const LLAMA_CONTEXT_OVERFLOW_TYPE = 'exceed_context_size_error';
|
|
13
21
|
/** A request that no longer fits the loaded context window, as llama.cpp and MLX word it. */
|
|
14
22
|
export function isContextLimitError(status, body) {
|
|
15
23
|
if (![400, 413, 500, 503].includes(status))
|
|
16
24
|
return false;
|
|
17
25
|
const b = body.toLowerCase();
|
|
26
|
+
if (LLAMA_CONTEXT_OVERFLOW.test(body) || errorTypeOf(body) === LLAMA_CONTEXT_OVERFLOW_TYPE)
|
|
27
|
+
return true;
|
|
28
|
+
// Older builds' wording.
|
|
18
29
|
if (b.includes('the request exceeds the available context size'))
|
|
19
30
|
return true;
|
|
20
31
|
if (b.includes('max_kv_size') || b.includes('max-kv-size') || b.includes('max kv size'))
|
|
@@ -71,6 +82,13 @@ function parseJson(text) {
|
|
|
71
82
|
return undefined;
|
|
72
83
|
}
|
|
73
84
|
}
|
|
85
|
+
/** `error.type` of an OpenAI-style error envelope, if the body is one. */
|
|
86
|
+
function errorTypeOf(body) {
|
|
87
|
+
const parsed = parseJson(body);
|
|
88
|
+
const error = isJsonObject(parsed) ? parsed['error'] : undefined;
|
|
89
|
+
const type = isJsonObject(error) ? error['type'] : undefined;
|
|
90
|
+
return typeof type === 'string' ? type : undefined;
|
|
91
|
+
}
|
|
74
92
|
function isStructuredErrorBody(body) {
|
|
75
93
|
const parsed = parseJson(body);
|
|
76
94
|
return isJsonObject(parsed) && isJsonObject(parsed['error']);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/server/public/errors.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/server/public/errors.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listing.js","sourceRoot":"","sources":["../../../src/server/public/listing.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAEjD,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAEhE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAGnD;;;;GAIG;AACH,MAAM,wBAAwB,GAAG,MAAM,CAAA;AACvC,MAAM,yBAAyB,GAAG,OAAO,CAAA;AACzC,MAAM,iBAAiB,GAAG,MAAM,CAAA;AAEhC,kFAAkF;AAClF,MAAM,QAAQ,GAAkC;IAC9C,UAAU,EAAE,WAAW;IACvB,mBAAmB,EAAE,oBAAoB;IACzC,KAAK,EAAE,KAAK;IACZ,cAAc,EAAE,cAAc;IAC9B,cAAc,EAAE,iBAAiB;IACjC,MAAM,EAAE,MAAM;IACd,QAAQ,EAAE,QAAQ;
|
|
1
|
+
{"version":3,"file":"listing.js","sourceRoot":"","sources":["../../../src/server/public/listing.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `@atomic-chat/core/settings`: the provider setting schemas for a program that embeds the core as a
|
|
3
|
+
* library (`atc`), so it serves the descriptors of the very core it runs instead of reading JSON from
|
|
4
|
+
* the package's sources (change close-cli-core-gaps, design D3). Only the schemas: the store in
|
|
5
|
+
* `./index.ts` needs `node:fs` and stays internal.
|
|
6
|
+
*/
|
|
7
|
+
export { LOCAL_PROVIDER_IDS, settingsSchema } from './schema.js';
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `@atomic-chat/core/settings`: the provider setting schemas for a program that embeds the core as a
|
|
3
|
+
* library (`atc`), so it serves the descriptors of the very core it runs instead of reading JSON from
|
|
4
|
+
* the package's sources (change close-cli-core-gaps, design D3). Only the schemas: the store in
|
|
5
|
+
* `./index.ts` needs `node:fs` and stays internal.
|
|
6
|
+
*/
|
|
7
|
+
export { LOCAL_PROVIDER_IDS, settingsSchema } from './schema.js';
|
|
8
|
+
//# sourceMappingURL=public.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"public.js","sourceRoot":"","sources":["../../src/settings/public.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
[
|
|
2
|
+
{
|
|
3
|
+
"key": "timeout",
|
|
4
|
+
"title": "Timeout for Foundry Local",
|
|
5
|
+
"description": "How long a Foundry Local model may take to load, in seconds: registering it, building its ONNX Runtime session and starting the host's server.",
|
|
6
|
+
"controllerType": "input",
|
|
7
|
+
"controllerProps": {
|
|
8
|
+
"value": 600,
|
|
9
|
+
"placeholder": "e.g 600",
|
|
10
|
+
"type": "number",
|
|
11
|
+
"textAlign": "right"
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
]
|
package/dist/settings/schema.js
CHANGED
|
@@ -20,6 +20,7 @@ import llamacppUpstreamSchema from './schema/llamacpp-upstream.json' with { type
|
|
|
20
20
|
import llamacppSchema from './schema/llamacpp.json' with { type: 'json' };
|
|
21
21
|
import mlxSchema from './schema/mlx.json' with { type: 'json' };
|
|
22
22
|
import sglangSchema from './schema/sglang.json' with { type: 'json' };
|
|
23
|
+
import foundryLocalSchema from './schema/foundry-local.json' with { type: 'json' };
|
|
23
24
|
import tensorrtLlmSchema from './schema/tensorrt-llm.json' with { type: 'json' };
|
|
24
25
|
import vllmSchema from './schema/vllm.json' with { type: 'json' };
|
|
25
26
|
export const LOCAL_PROVIDER_IDS = [
|
|
@@ -31,6 +32,7 @@ export const LOCAL_PROVIDER_IDS = [
|
|
|
31
32
|
'tensorrt-llm',
|
|
32
33
|
'vllm',
|
|
33
34
|
'sglang',
|
|
35
|
+
'foundry-local',
|
|
34
36
|
];
|
|
35
37
|
const CONTROLLER_TYPES = new Set(['checkbox', 'input', 'dropdown', 'slider']);
|
|
36
38
|
/** Validate the embedded JSON once at load time; a bad descriptor is a packaging bug, not user input. */
|
|
@@ -60,6 +62,7 @@ const SCHEMAS = {
|
|
|
60
62
|
'tensorrt-llm': toDescriptors('tensorrt-llm', tensorrtLlmSchema),
|
|
61
63
|
'vllm': toDescriptors('vllm', vllmSchema),
|
|
62
64
|
'sglang': toDescriptors('sglang', sglangSchema),
|
|
65
|
+
'foundry-local': toDescriptors('foundry-local', foundryLocalSchema),
|
|
63
66
|
};
|
|
64
67
|
/** The descriptor array as the app registers it (deep copy — callers may mutate `options`/`value`). */
|
|
65
68
|
export function settingsSchema(provider) {
|
|
@@ -145,6 +148,10 @@ const MLX_VALUE_TYPES = {
|
|
|
145
148
|
const FOUNDATION_MODELS_VALUE_TYPES = {
|
|
146
149
|
timeout: 'number',
|
|
147
150
|
};
|
|
151
|
+
/** `FoundryLocalConfig`: the host's load timeout. */
|
|
152
|
+
const FOUNDRY_LOCAL_VALUE_TYPES = {
|
|
153
|
+
timeout: 'number',
|
|
154
|
+
};
|
|
148
155
|
/** `TensorrtLlmProviderConfig`: the card's UUID as text, every other key a number. */
|
|
149
156
|
const TENSORRT_LLM_VALUE_TYPES = {
|
|
150
157
|
gpu_id: 'string',
|
|
@@ -222,6 +229,7 @@ export const CANONICAL_VALUE_TYPES = {
|
|
|
222
229
|
'tensorrt-llm': TENSORRT_LLM_VALUE_TYPES,
|
|
223
230
|
'vllm': VLLM_VALUE_TYPES,
|
|
224
231
|
'sglang': SGLANG_VALUE_TYPES,
|
|
232
|
+
'foundry-local': FOUNDRY_LOCAL_VALUE_TYPES,
|
|
225
233
|
};
|
|
226
234
|
/**
|
|
227
235
|
* Coerce one value to its wire type. Uncoercible input ("abc" for a number, `{}` for a boolean) is
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/settings/schema.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,iBAAiB,MAAM,4BAA4B,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAA;AAChF,OAAO,sBAAsB,MAAM,iCAAiC,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAA;AAC1F,OAAO,sBAAsB,MAAM,iCAAiC,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAA;AAC1F,OAAO,cAAc,MAAM,wBAAwB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAA;AACzE,OAAO,SAAS,MAAM,mBAAmB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAA;AAC/D,OAAO,YAAY,MAAM,sBAAsB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAA;AACrE,OAAO,iBAAiB,MAAM,4BAA4B,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAA;AAChF,OAAO,UAAU,MAAM,oBAAoB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAA;AAEjE,MAAM,CAAC,MAAM,kBAAkB,GAA+B;IAC5D,mBAAmB;IACnB,UAAU;IACV,cAAc;IACd,KAAK;IACL,mBAAmB;IACnB,cAAc;IACd,MAAM;IACN,QAAQ;
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/settings/schema.ts"],"names":[],"mappings":"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"}
|
package/dist/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
/** Kept in sync with package.json by `src/version.test.ts`. Bump both together. */
|
|
2
|
-
export declare const CORE_VERSION = "0.
|
|
2
|
+
export declare const CORE_VERSION = "0.18.4";
|
package/dist/version.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atomic-chat/core",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.18.4",
|
|
4
4
|
"description": "Inference core of Atomic Chat: local llama.cpp/MLX/Foundation Models runtime, cloud providers, model router and the OpenAI-compatible server on :1337.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -30,12 +30,19 @@
|
|
|
30
30
|
"./models": {
|
|
31
31
|
"types": "./dist/models/index.d.ts",
|
|
32
32
|
"import": "./dist/models/index.js"
|
|
33
|
+
},
|
|
34
|
+
"./foundry-host": {
|
|
35
|
+
"types": "./dist/runtime/foundry-local/foundry-host.d.ts",
|
|
36
|
+
"import": "./dist/runtime/foundry-local/foundry-host.js"
|
|
37
|
+
},
|
|
38
|
+
"./settings": {
|
|
39
|
+
"types": "./dist/settings/public.d.ts",
|
|
40
|
+
"import": "./dist/settings/public.js"
|
|
33
41
|
}
|
|
34
42
|
},
|
|
35
43
|
"files": [
|
|
36
44
|
"dist",
|
|
37
|
-
"!dist/bin"
|
|
38
|
-
"src/settings/schema"
|
|
45
|
+
"!dist/bin"
|
|
39
46
|
],
|
|
40
47
|
"scripts": {
|
|
41
48
|
"build": "tsc -p tsconfig.build.json",
|
|
@@ -52,6 +59,7 @@
|
|
|
52
59
|
"test:app-e2e": "vitest run --project app-e2e",
|
|
53
60
|
"test:runtime-compat": "vitest run --project runtime-compat",
|
|
54
61
|
"test:live": "ATOMIC_LIVE=1 vitest run --project live",
|
|
62
|
+
"engine:check": "node scripts/engine-candidate.mjs local",
|
|
55
63
|
"test:coverage": "vitest run --project unit --project contract --coverage && node scripts/check-coverage-floor.mjs",
|
|
56
64
|
"fixtures:import": "node scripts/import-app-fixtures.mjs",
|
|
57
65
|
"release": "node scripts/release.mjs",
|