|
67 | 67 | }, |
68 | 68 | { |
69 | 69 | "$ref": "#/definitions/presetManifest" |
| 70 | + }, |
| 71 | + { |
| 72 | + "$ref": "#/definitions/modelManifest" |
70 | 73 | } |
71 | 74 | ], |
72 | 75 | "discriminator": { |
73 | 76 | "mapping": { |
74 | 77 | "plugin": "#/definitions/pluginManifest", |
75 | | - "preset": "#/definitions/presetManifest" |
| 78 | + "preset": "#/definitions/presetManifest", |
| 79 | + "model": "#/definitions/modelManifest" |
76 | 80 | }, |
77 | 81 | "propertyName": "type" |
78 | 82 | } |
|
84 | 88 | "$ref": "#/definitions/kebabCase" |
85 | 89 | }, |
86 | 90 | "name": { |
87 | | - "$ref": "#/definitions/kebabCase" |
| 91 | + "type": "string", |
| 92 | + "pattern": "^[a-z0-9]+(?:-[a-z0-9]+)*$", |
| 93 | + "minLength": 1, |
| 94 | + "maxLength": 100 |
88 | 95 | }, |
89 | 96 | "description": { |
90 | | - "type": "string" |
| 97 | + "type": "string", |
| 98 | + "maxLength": 1000 |
91 | 99 | }, |
92 | 100 | "revision": { |
93 | 101 | "type": "integer" |
|
425 | 433 | "embeddingLoadModelConfig": { |
426 | 434 | "type": "object", |
427 | 435 | "properties": { |
428 | | - "gpuOffload": { |
| 436 | + "gpu": { |
429 | 437 | "$ref": "#/definitions/gpuSetting" |
430 | 438 | }, |
431 | 439 | "contextLength": { |
|
592 | 600 | }, |
593 | 601 | { |
594 | 602 | "$ref": "#/definitions/errorDisplayDataGenericEngineDoesNotSupportFeature" |
| 603 | + }, |
| 604 | + { |
| 605 | + "$ref": "#/definitions/errorDisplayDataGenericPresetNotFound" |
595 | 606 | } |
596 | 607 | ], |
597 | 608 | "discriminator": { |
|
601 | 612 | "generic.pathNotFound": "#/definitions/errorDisplayDataGenericPathNotFound", |
602 | 613 | "generic.identifierNotFound": "#/definitions/errorDisplayDataGenericIdentifierNotFound", |
603 | 614 | "generic.domainMismatch": "#/definitions/errorDisplayDataGenericDomainMismatch", |
604 | | - "generic.engineDoesNotSupportFeature": "#/definitions/errorDisplayDataGenericEngineDoesNotSupportFeature" |
| 615 | + "generic.engineDoesNotSupportFeature": "#/definitions/errorDisplayDataGenericEngineDoesNotSupportFeature", |
| 616 | + "generic.presetNotFound": "#/definitions/errorDisplayDataGenericPresetNotFound" |
605 | 617 | }, |
606 | 618 | "propertyName": "code" |
607 | 619 | } |
|
656 | 668 | "unknown" |
657 | 669 | ] |
658 | 670 | }, |
| 671 | + "gpuSplitConfig": { |
| 672 | + "type": "object", |
| 673 | + "properties": { |
| 674 | + "strategy": { |
| 675 | + "$ref": "#/definitions/gpuSplitStrategy" |
| 676 | + }, |
| 677 | + "disabledGpus": { |
| 678 | + "type": "array", |
| 679 | + "items": { |
| 680 | + "type": "integer", |
| 681 | + "minimum": 0 |
| 682 | + } |
| 683 | + }, |
| 684 | + "priority": { |
| 685 | + "type": "array", |
| 686 | + "items": { |
| 687 | + "type": "integer", |
| 688 | + "minimum": 0 |
| 689 | + } |
| 690 | + }, |
| 691 | + "customRatio": { |
| 692 | + "type": "array", |
| 693 | + "items": { |
| 694 | + "type": "number", |
| 695 | + "minimum": 0 |
| 696 | + } |
| 697 | + } |
| 698 | + }, |
| 699 | + "required": [ |
| 700 | + "strategy", |
| 701 | + "disabledGpus", |
| 702 | + "priority", |
| 703 | + "customRatio" |
| 704 | + ], |
| 705 | + "additionalProperties": false |
| 706 | + }, |
| 707 | + "gpuSplitStrategy": { |
| 708 | + "type": "string", |
| 709 | + "enum": [ |
| 710 | + "evenly", |
| 711 | + "priorityOrder", |
| 712 | + "custom" |
| 713 | + ] |
| 714 | + }, |
659 | 715 | "kvConfigFieldDependency": { |
660 | 716 | "type": "object", |
661 | 717 | "properties": { |
|
688 | 744 | "kvConfigLayerName": { |
689 | 745 | "type": "string", |
690 | 746 | "enum": [ |
| 747 | + "currentlyEditing", |
691 | 748 | "currentlyLoaded", |
692 | 749 | "apiOverride", |
693 | 750 | "conversationSpecific", |
694 | 751 | "conversationGlobal", |
| 752 | + "preset", |
695 | 753 | "serverSession", |
696 | 754 | "httpServerRequestOverride", |
697 | 755 | "completeModeFormatting", |
|
852 | 910 | "llmLoadModelConfig": { |
853 | 911 | "type": "object", |
854 | 912 | "properties": { |
855 | | - "gpuOffload": { |
| 913 | + "gpu": { |
856 | 914 | "$ref": "#/definitions/gpuSetting" |
857 | 915 | }, |
| 916 | + "gpuStrictVramCap": { |
| 917 | + "type": "boolean" |
| 918 | + }, |
858 | 919 | "contextLength": { |
859 | 920 | "type": "integer", |
860 | 921 | "minimum": 1 |
|
1697 | 1758 | }, |
1698 | 1759 | "jsonSchema": { |
1699 | 1760 | "$ref": "#/definitions/functionToolCallRequest/properties/arguments/additionalProperties" |
| 1761 | + }, |
| 1762 | + "gbnfGrammar": { |
| 1763 | + "type": "string" |
1700 | 1764 | } |
1701 | 1765 | }, |
1702 | 1766 | "required": [ |
|
1708 | 1772 | "type": "string", |
1709 | 1773 | "enum": [ |
1710 | 1774 | "none", |
1711 | | - "json" |
| 1775 | + "json", |
| 1776 | + "gbnf" |
1712 | 1777 | ] |
1713 | 1778 | }, |
1714 | 1779 | "llmToolArray": { |
|
2449 | 2514 | ], |
2450 | 2515 | "additionalProperties": false |
2451 | 2516 | }, |
| 2517 | + "modelManifest": { |
| 2518 | + "type": "object", |
| 2519 | + "properties": { |
| 2520 | + "type": { |
| 2521 | + "type": "string", |
| 2522 | + "const": "model", |
| 2523 | + "default": "model", |
| 2524 | + "title": "Type" |
| 2525 | + }, |
| 2526 | + "virtual": { |
| 2527 | + "type": "boolean", |
| 2528 | + "const": true |
| 2529 | + }, |
| 2530 | + "owner": { |
| 2531 | + "$ref": "#/definitions/kebabCase" |
| 2532 | + }, |
| 2533 | + "name": { |
| 2534 | + "$ref": "#/definitions/artifactManifestBase/properties/name" |
| 2535 | + }, |
| 2536 | + "description": { |
| 2537 | + "$ref": "#/definitions/artifactManifestBase/properties/description" |
| 2538 | + }, |
| 2539 | + "revision": { |
| 2540 | + "$ref": "#/definitions/artifactManifestBase/properties/revision" |
| 2541 | + } |
| 2542 | + }, |
| 2543 | + "required": [ |
| 2544 | + "type", |
| 2545 | + "virtual", |
| 2546 | + "owner", |
| 2547 | + "name", |
| 2548 | + "description" |
| 2549 | + ], |
| 2550 | + "additionalProperties": false |
| 2551 | + }, |
2452 | 2552 | "modelQuery": { |
2453 | 2553 | "type": "object", |
2454 | 2554 | "properties": { |
|
2500 | 2600 | "$ref": "#/definitions/kebabCase" |
2501 | 2601 | }, |
2502 | 2602 | "name": { |
2503 | | - "$ref": "#/definitions/kebabCase" |
| 2603 | + "$ref": "#/definitions/artifactManifestBase/properties/name" |
2504 | 2604 | }, |
2505 | 2605 | "description": { |
2506 | 2606 | "$ref": "#/definitions/artifactManifestBase/properties/description" |
|
2537 | 2637 | "$ref": "#/definitions/kebabCase" |
2538 | 2638 | }, |
2539 | 2639 | "name": { |
2540 | | - "$ref": "#/definitions/kebabCase" |
| 2640 | + "$ref": "#/definitions/artifactManifestBase/properties/name" |
2541 | 2641 | }, |
2542 | 2642 | "description": { |
2543 | 2643 | "$ref": "#/definitions/artifactManifestBase/properties/description" |
|
4149 | 4249 | "predictionConfigStack": { |
4150 | 4250 | "$ref": "#/definitions/kvConfigStack" |
4151 | 4251 | }, |
| 4252 | + "fuzzyPresetIdentifier": { |
| 4253 | + "type": "string" |
| 4254 | + }, |
4152 | 4255 | "ignoreServerSessionConfig": { |
4153 | 4256 | "type": "boolean" |
4154 | 4257 | } |
|
5585 | 5688 | ], |
5586 | 5689 | "additionalProperties": false |
5587 | 5690 | }, |
| 5691 | + "errorDisplayDataGenericPresetNotFound": { |
| 5692 | + "type": "object", |
| 5693 | + "properties": { |
| 5694 | + "code": { |
| 5695 | + "type": "string", |
| 5696 | + "const": "generic.presetNotFound", |
| 5697 | + "default": "generic.presetNotFound", |
| 5698 | + "title": "Code" |
| 5699 | + }, |
| 5700 | + "specifiedFuzzyPresetIdentifier": { |
| 5701 | + "type": "string" |
| 5702 | + }, |
| 5703 | + "availablePresetsSample": { |
| 5704 | + "type": "array", |
| 5705 | + "items": { |
| 5706 | + "type": "object", |
| 5707 | + "properties": { |
| 5708 | + "identifier": { |
| 5709 | + "type": "string" |
| 5710 | + }, |
| 5711 | + "name": { |
| 5712 | + "type": "string" |
| 5713 | + } |
| 5714 | + }, |
| 5715 | + "required": [ |
| 5716 | + "identifier", |
| 5717 | + "name" |
| 5718 | + ], |
| 5719 | + "additionalProperties": false |
| 5720 | + } |
| 5721 | + }, |
| 5722 | + "totalAvailablePresets": { |
| 5723 | + "type": "integer" |
| 5724 | + } |
| 5725 | + }, |
| 5726 | + "required": [ |
| 5727 | + "code", |
| 5728 | + "specifiedFuzzyPresetIdentifier", |
| 5729 | + "availablePresetsSample", |
| 5730 | + "totalAvailablePresets" |
| 5731 | + ], |
| 5732 | + "additionalProperties": false |
| 5733 | + }, |
5588 | 5734 | "parsedFileIdentifierLocal": { |
5589 | 5735 | "type": "object", |
5590 | 5736 | "properties": { |
|
0 commit comments