Adopt native configuration discovery and a single PromptKit entry file

This commit is contained in:
2026-11-20 04:26:17 +00:00
parent adbe62a1e9
commit 733540f936
16 changed files with 585 additions and 697 deletions

View File

@@ -3,7 +3,6 @@ package config
import (
"fmt"
renderformat "gitea.maximumdirect.net/eric/scriptorium/internal/format"
"go.maximumdirect.net/configkit"
)
@@ -15,13 +14,18 @@ type LoadOptions struct {
Overrides []configkit.Override
}
var applicationSearch = configkit.Searches(
configkit.WorkingDirectory(), configkit.UserConfigDirectory(),
configkit.HomeDirectory(), configkit.UnixSystemDirectories(),
)
// Load resolves one ConfigKit document and retains its inspection snapshot.
func Load(options LoadOptions) (*configkit.Result[Document], error) {
var source configkit.Source
if options.Explicit {
source = configkit.File(options.Path)
} else {
source = configkit.SearchConfig("scriptorium", configkit.SearchPaths(defaultConfigSearchPaths...))
source = configkit.SearchConfig("scriptorium", applicationSearch)
}
result, err := configkit.Load(source, configkit.Options[Document]{
@@ -39,17 +43,14 @@ func Load(options LoadOptions) (*configkit.Result[Document], error) {
// Settings converts a validated document without another merge or normalization.
func Settings(document Document) AppSettings {
settings := AppSettings{
SchemaDir: document.SchemaDir,
ServerAddr: document.Server.Addr,
ArtifactRoot: document.Server.ArtifactRoot,
MaxRequestBytes: document.Server.MaxRequestBytes,
MaxArtifactBytes: document.Server.MaxArtifactBytes,
MaxResponseBytes: document.Server.MaxResponseBytes,
DefaultRenderFormat: renderformat.PreparedRunOutputFormat(document.Defaults.RenderFormat),
TransientRetries: document.TransientRetries,
}
if document.PromptKitSources != nil {
settings.PromptKitSources = append([]SourceSelection{}, document.PromptKitSources...)
SchemaDir: document.PromptKit.SchemaDir,
PromptKitConfiguration: document.PromptKit.Configuration,
ServerAddr: document.Server.Addr,
ArtifactRoot: document.Server.ArtifactRoot,
MaxRequestBytes: document.Server.MaxRequestBytes,
MaxArtifactBytes: document.Server.MaxArtifactBytes,
MaxResponseBytes: document.Server.MaxResponseBytes,
TransientRetries: document.TransientRetries,
}
return settings
}