Compose reusable configuration rules at the PromptKit path

This commit is contained in:
2026-11-21 14:18:15 +00:00
parent 76c8789e65
commit 34c0cf3f14
7 changed files with 207 additions and 88 deletions

View File

@@ -48,12 +48,17 @@ func Diff(left, right Inspection) ([]configkit.Difference, error) {
return configkit.Diff(leftResult, rightResult)
}
func secretProviderPath(path configkit.Path) bool {
// Sensitive marks credential-shaped provider values beneath PromptKit settings.
func Sensitive(path configkit.Path) bool {
pointer := path.String()
if pointer == "" {
return false
}
parts := strings.Split(strings.TrimPrefix(pointer, "/"), "/")
if len(parts) == 0 || parts[0] != "promptkit" {
return false
}
parts = parts[1:]
if !providerExtraParamsPath(parts) {
return false
}

View File

@@ -17,8 +17,8 @@ import (
)
type document struct {
Version *string `yaml:"version"`
settings.Settings `yaml:",inline"`
PromptKit settings.Settings `yaml:"promptkit"`
Application map[string]any `yaml:",inline"`
}
type collectionConfig = settings.CollectionSettings
@@ -72,20 +72,20 @@ type resourceSet struct {
func rootResourceBases() resourceBases {
return resourceBases{
backends: configkit.Keys("backends"),
profiles: configkit.Keys("profiles"),
prompts: configkit.Keys("prompts"),
backends: configkit.Keys("promptkit", "backends"),
profiles: configkit.Keys("promptkit", "profiles"),
prompts: configkit.Keys("promptkit", "prompts"),
}
}
func resourceSets(config *document) []resourceSet {
func resourceSets(config *settings.Settings) []resourceSet {
sets := make([]resourceSet, 0, len(config.Collections)+1)
sets = append(sets, resourceSet{
bases: rootResourceBases(), backends: config.Backends, profiles: config.Profiles, prompts: config.Prompts,
})
for _, namespace := range sortedKeys(config.Collections) {
collection := config.Collections[namespace]
base := configkit.Keys("collections", namespace)
base := configkit.Keys("promptkit", "collections", namespace)
sets = append(sets, resourceSet{
isCollection: true,
namespace: namespace,
@@ -113,7 +113,7 @@ func indexedResourceID(namespace, localKey string) string {
return namespace + "/" + localKey
}
func indexedBackends(config *document) map[string]backendConfig {
func indexedBackends(config *settings.Settings) map[string]backendConfig {
backends := make(map[string]backendConfig)
for _, resources := range resourceSets(config) {
for _, definition := range resources.backends {
@@ -123,7 +123,7 @@ func indexedBackends(config *document) map[string]backendConfig {
return backends
}
func indexedProfiles(config *document) map[string]profileConfig {
func indexedProfiles(config *settings.Settings) map[string]profileConfig {
profiles := make(map[string]profileConfig)
for _, resources := range resourceSets(config) {
for _, definition := range resources.profiles {
@@ -140,34 +140,47 @@ func Load(main configkit.Input, underlays []configkit.Underlay) (*loaded, error)
return load(main, underlays)
}
func configurationDefinition(state *loaded) configkit.Definition[document] {
// SequenceIdentities returns the component's native sequence registrations.
func SequenceIdentities() []configkit.SequenceIdentity {
return []configkit.SequenceIdentity{
configkit.SequenceIdentityAt(configkit.Keys("promptkit", "backends"), "id"),
configkit.SequenceIdentityAt(configkit.Keys("promptkit", "profiles"), "id"),
configkit.SequenceIdentityAt(configkit.Keys("promptkit", "prompts"), "id"),
configkit.SequenceIdentityMatching(configkit.SequenceSelector{configkit.SequenceLiteralKey("promptkit"), configkit.SequenceLiteralKey("collections"), configkit.SequenceAnyMappingKey(), configkit.SequenceLiteralKey("backends")}, "id"),
configkit.SequenceIdentityMatching(configkit.SequenceSelector{configkit.SequenceLiteralKey("promptkit"), configkit.SequenceLiteralKey("collections"), configkit.SequenceAnyMappingKey(), configkit.SequenceLiteralKey("profiles")}, "id"),
configkit.SequenceIdentityMatching(configkit.SequenceSelector{configkit.SequenceLiteralKey("promptkit"), configkit.SequenceLiteralKey("collections"), configkit.SequenceAnyMappingKey(), configkit.SequenceLiteralKey("prompts")}, "id"),
}
}
// Resolve normalizes the selected effective settings in place.
func Resolve(config *settings.Settings, resolution *configkit.Resolution) {
if config == nil {
return
}
for _, resources := range resourceSets(config) {
resolveBackends(resources.backends, resources.bases.backends, resolution)
resolveProfiles(resources.profiles, resources.bases.profiles, resolution)
resolvePrompts(resources.prompts, resources.bases.prompts, resolution)
}
}
// Validate checks the selected effective settings.
func Validate(config *settings.Settings, validation *configkit.Validation) {
if config != nil {
validateEffective(config, validation)
}
}
func configurationDefinition() configkit.Definition[document] {
return configkit.Definition[document]{
SequenceIdentities: []configkit.SequenceIdentity{
configkit.SequenceIdentityAt(configkit.Keys("backends"), "id"),
configkit.SequenceIdentityAt(configkit.Keys("profiles"), "id"),
configkit.SequenceIdentityAt(configkit.Keys("prompts"), "id"),
configkit.SequenceIdentityMatching(configkit.SequenceSelector{configkit.SequenceLiteralKey("collections"), configkit.SequenceAnyMappingKey(), configkit.SequenceLiteralKey("backends")}, "id"),
configkit.SequenceIdentityMatching(configkit.SequenceSelector{configkit.SequenceLiteralKey("collections"), configkit.SequenceAnyMappingKey(), configkit.SequenceLiteralKey("profiles")}, "id"),
configkit.SequenceIdentityMatching(configkit.SequenceSelector{configkit.SequenceLiteralKey("collections"), configkit.SequenceAnyMappingKey(), configkit.SequenceLiteralKey("prompts")}, "id"),
},
Version: &configkit.VersionRule{
Path: configkit.Keys("version"),
Check: checkConfigurationVersion,
},
Sensitive: secretProviderPath,
SequenceIdentities: SequenceIdentities(),
Sensitive: Sensitive,
Resolve: func(config *document, resolution *configkit.Resolution) error {
for _, resources := range resourceSets(config) {
capturePromptMetadata(resources.prompts, resources.bases.prompts, resources.namespace, resolution, state.promptMetadata)
}
for _, resources := range resourceSets(config) {
resolveBackends(resources.backends, resources.bases.backends, resolution)
resolveProfiles(resources.profiles, resources.bases.profiles, resolution)
resolvePrompts(resources.prompts, resources.bases.prompts, resolution)
}
Resolve(&config.PromptKit, resolution)
return nil
},
Validate: func(config *document, validation *configkit.Validation) {
validateEffective(config, validation)
Validate(&config.PromptKit, validation)
},
}
}
@@ -178,9 +191,8 @@ func load(main configkit.Input, underlays []configkit.Underlay) (*loaded, error)
promptMetadata: make(map[string][]promptInputPresence),
}
result, err := configkit.LoadLayered(main, configkit.LayeredOptions[document]{
Underlays: underlays,
SourceVersionMode: configkit.SourceVersionModeIfPresent,
Definition: configurationDefinition(state),
Underlays: underlays,
Definition: configurationDefinition(),
})
if err != nil {
return nil, fmt.Errorf("load configuration: %w", err)
@@ -192,7 +204,7 @@ func load(main configkit.Input, underlays []configkit.Underlay) (*loaded, error)
if err := state.buildExecutionProfiles(); err != nil {
return nil, fmt.Errorf("load configuration: %w", err)
}
state.backendIDs = sortedKeys(indexedBackends(&state.result.Config))
state.backendIDs = sortedKeys(indexedBackends(&state.result.Config.PromptKit))
state.profileIDs = sortedKeys(state.indexedProfiles)
for _, id := range sortedKeys(state.prompts) {
state.promptIDs = append(state.promptIDs, domain.PromptIdentity{ID: id})
@@ -202,8 +214,8 @@ func load(main configkit.Input, underlays []configkit.Underlay) (*loaded, error)
"profile": resourceNamespaces(state.profileIDs),
"prompt": promptNamespaces(state.promptIDs),
}
for _, namespace := range sortedKeys(result.Config.Collections) {
collection := result.Config.Collections[namespace]
for _, namespace := range sortedKeys(result.Config.PromptKit.Collections) {
collection := result.Config.PromptKit.Collections[namespace]
state.collections = append(state.collections, CollectionIdentity{
Namespace: namespace, ReleaseVersion: stringPointerValue(collection.ReleaseVersion),
})
@@ -229,51 +241,12 @@ func promptNamespaces(prompts []domain.PromptIdentity) []string {
return resourceNamespaces(ids)
}
func checkConfigurationVersion(version configkit.Version, validation *configkit.Validation) error {
if !version.Present {
return nil
}
if version.Null || version.Text != "2" {
validation.Error(configkit.Keys("version"), "unsupported configuration specification version")
}
return nil
}
type promptInputPresence struct {
required fieldState
contentType fieldState
description fieldState
}
func capturePromptMetadata(prompts []promptConfig, basePath configkit.Path, namespace string, resolution *configkit.Resolution, destination map[string][]promptInputPresence) {
for promptIndex, prompt := range prompts {
inputs := prompt.Inputs
states := make([]promptInputPresence, len(inputs))
base := basePath.Index(promptIndex).Key("inputs")
for index := range inputs {
path := base.Index(index)
states[index] = promptInputPresence{
required: captureFieldState(path.Key("required"), resolution),
contentType: captureFieldState(path.Key("content_type"), resolution),
description: captureFieldState(path.Key("description"), resolution),
}
}
destination[indexedResourceID(namespace, prompt.ID)] = states
}
}
func captureFieldState(path configkit.Path, resolution *configkit.Resolution) fieldState {
info, exists := resolution.EntryInfo(path)
switch {
case !exists || !info.Explicit:
return fieldAbsent
case info.Null:
return fieldNull
default:
return fieldValue
}
}
// eligibleResourceList leaves invalid identities to the existing validation
// boundaries, without mutating a list that cannot be recorded by identity.
func eligibleResourceList[T any](entries []T, identity func(T) string) bool {
@@ -306,12 +279,12 @@ func sortedKeys[T any](entries map[string]T) []string {
return keys
}
func validateEffective(config *document, validation *configkit.Validation) {
func validateEffective(config *settings.Settings, validation *configkit.Validation) {
sets := resourceSets(config)
backendIDs := make(map[string]struct{})
for _, resources := range sets {
if resources.isCollection && !domain.IsValidResourceNamespace(resources.namespace) {
validation.Error(configkit.Keys("collections", resources.namespace), "collection namespace must be nonblank and contain no slash")
validation.Error(configkit.Keys("promptkit", "collections", resources.namespace), "collection namespace must be nonblank and contain no slash")
}
for _, backend := range resources.backends {
backendIDs[indexedResourceID(resources.namespace, backend.ID)] = struct{}{}

View File

@@ -40,20 +40,20 @@ func (state *loaded) materializePrompts() error {
}
return metadata.Lookup(path)
}
applicationRoot, err := state.captureSchemaRoot(state.result.Config.SchemaRoot, configkit.Keys("schema_root"), lookupOrigin)
applicationRoot, err := state.captureSchemaRoot(state.result.Config.PromptKit.SchemaRoot, configkit.Keys("promptkit", "schema_root"), lookupOrigin)
if err != nil {
return err
}
roots := make(map[string]*domain.ResourceBinding, len(state.result.Config.Collections))
for _, name := range sortedKeys(state.result.Config.Collections) {
collection := state.result.Config.Collections[name]
root, err := state.captureSchemaRoot(collection.SchemaRoot, configkit.Keys("collections", name, "schema_root"), lookupOrigin)
roots := make(map[string]*domain.ResourceBinding, len(state.result.Config.PromptKit.Collections))
for _, name := range sortedKeys(state.result.Config.PromptKit.Collections) {
collection := state.result.Config.PromptKit.Collections[name]
root, err := state.captureSchemaRoot(collection.SchemaRoot, configkit.Keys("promptkit", "collections", name, "schema_root"), lookupOrigin)
if err != nil {
return err
}
roots[name] = root
}
for _, resources := range resourceSets(&state.result.Config) {
for _, resources := range resourceSets(&state.result.Config.PromptKit) {
root := applicationRoot
if selected := roots[resources.namespace]; resources.isCollection && selected != nil {
root = selected

View File

@@ -12,8 +12,8 @@ import (
)
func (state *loaded) buildExecutionProfiles() error {
backendConfigs := indexedBackends(&state.result.Config)
profileConfigs := indexedProfiles(&state.result.Config)
backendConfigs := indexedBackends(&state.result.Config.PromptKit)
profileConfigs := indexedProfiles(&state.result.Config.PromptKit)
state.backendRecords = backendConfigs
state.profileRecords = profileConfigs
definitions := make(map[string]domain.Backend, len(backendConfigs))