Accept composed ConfigKit artifact definitions

This commit is contained in:
2026-10-04 13:10:53 +00:00
parent c4abdc19df
commit 428f435734
8 changed files with 226 additions and 95 deletions

View File

@@ -169,9 +169,6 @@ func expandFamilyPublishRules(cfg *PipelineConfig, catalog ArtifactFamilyCatalog
if family.Publish == nil || !family.Publish.Enabled {
continue
}
if cfg.resolution == nil || !cfg.resolution.publishDeclared {
return fmt.Errorf("pipeline.scriptorium.artifact_families.%s.publish requires pipeline.publish", familyKey)
}
pattern := strings.TrimSpace(family.Publish.DestPattern)
if pattern != "" {
if err := validateFamilyOutputPattern("pipeline.scriptorium.artifact_families."+familyKey+".publish.dest_pattern", pattern); err != nil {

View File

@@ -312,8 +312,7 @@ func TestFamilyPublishRulesExpandToConcreteArtifacts(t *testing.T) {
"character_meta_alpha": {OutputPath: "artifacts/characters/alpha/meta.md"},
"character_meta_zeta": {OutputPath: "artifacts/characters/zeta/meta.md"},
}},
Publish: &PublishConfig{},
resolution: &pipelineResolutionMetadata{publishDeclared: true},
Publish: &PublishConfig{},
}
catalog := ArtifactFamilyCatalog{Families: map[string]ArtifactFamilyOrigin{
"character_meta": {Members: []string{"character_meta_alpha", "character_meta_zeta"}, Publish: &ScriptoriumArtifactFamilyPublishConfig{Enabled: true, Required: required, DestPattern: "published/{character_id}.md"}},
@@ -328,12 +327,86 @@ func TestFamilyPublishRulesExpandToConcreteArtifacts(t *testing.T) {
}
cfg.Publish.Outputs = nil
catalog.Families["character_meta"] = ArtifactFamilyOrigin{Members: []string{"character_meta_alpha"}, Publish: &ScriptoriumArtifactFamilyPublishConfig{Enabled: true}}
cfg.resolution.publishDeclared = false
cfg.Publish = nil
if err := expandFamilyPublishRules(cfg, catalog); err == nil || !strings.Contains(err.Error(), "requires pipeline.publish") {
t.Fatalf("missing publish error = %v", err)
}
}
func TestArtifactFamilyInheritanceAcrossImports(t *testing.T) {
dir := t.TempDir()
writePartyResolutionFile(t, filepath.Join(dir, "party.yml"), `schema_version: narratio.party.v1
characters:
alice:
player: {name: Alice Player}
character:
name: Alice
classes: [{name: wizard}]
`)
pipeline := `configkit:
imports:
- path: families/summary.yml
- path: families/notes.yml
whisperx:
transcribe_url: https://transcription.example.test/transcribe
`
writePipelineFixture(t, dir, "families/summary.yml", `scriptorium:
artifact_families:
character_summary:
enabled: true
for_each: party.characters
prompt_id: dnd.character_summary
profile_id: production
output_path_pattern: artifacts/characters/{character_id}/summary.md
publish:
enabled: true
required: true
dest_pattern: published/characters/{character_id}/summary.md
`)
writePipelineFixture(t, dir, "families/notes.yml", `scriptorium:
artifact_families:
character_notes:
extends: character_summary
output_path_pattern: artifacts/characters/{character_id}/notes.md
publish:
dest_pattern: published/characters/{character_id}/notes.md
`)
pipelinePath, campaignPath, sessionPath := writeArtifactFamilyConfig(t, dir, pipeline)
cfg, err := LoadWithSessionOptions(pipelinePath, campaignPath, sessionPath, SessionLoadOptions{})
if err != nil {
t.Fatal(err)
}
for key, wantPath := range map[string]string{
"character_summary_alice": "artifacts/characters/alice/summary.md",
"character_notes_alice": "artifacts/characters/alice/notes.md",
} {
artifact, ok := cfg.Pipeline.Scriptorium.Artifacts[key]
if !ok {
t.Fatalf("inherited family member %q is missing", key)
}
if !artifact.Enabled || artifact.PromptID != "dnd.character_summary" || artifact.ProfileID != "production" || artifact.OutputPath != wantPath {
t.Fatalf("expanded family member %q = %#v", key, artifact)
}
}
wantPublish := map[string]string{
"narratio.artifact.character_summary_alice": "published/characters/alice/summary.md",
"narratio.artifact.character_notes_alice": "published/characters/alice/notes.md",
}
for _, rule := range cfg.Pipeline.Publish.Outputs {
if want, ok := wantPublish[rule.Source]; ok {
if rule.Dest != want {
t.Errorf("family publish destination for %q = %q, want %q", rule.Source, rule.Dest, want)
}
delete(wantPublish, rule.Source)
}
}
if len(wantPublish) != 0 {
t.Fatalf("inherited family publish rules missing: %#v", wantPublish)
}
}
func TestExplicitFamilyMemberPublishDestinationResolution(t *testing.T) {
dir := t.TempDir()
writePartyResolutionFile(t, filepath.Join(dir, "party.yml"), `schema_version: narratio.party.v1

View File

@@ -6,7 +6,6 @@ import (
"fmt"
"path/filepath"
"reflect"
"sort"
"strings"
configkit "gitea.maximumdirect.net/eric/ConfigKit"
@@ -24,7 +23,6 @@ type pipelineResolutionMetadata struct {
ownership []pipelineFieldOwnership
artifactFamilies map[string]ScriptoriumArtifactFamilyConfig
artifactFamiliesExpanded bool
publishDeclared bool
configkitMetadata configkit.Metadata
configkitSources []configkit.SourceInfo
}
@@ -262,12 +260,8 @@ func validatePipelineConfigKit(cfg *PipelineConfig, validation *configkit.Valida
func pipelineMetadataFromConfigKit(cfg *PipelineConfig, result *configkit.Result[PipelineConfig], opts PipelineLoadOptions) (*pipelineResolutionMetadata, error) {
sources := result.Sources()
metadata := result.Metadata()
if err := rejectDuplicateBaseDefinitions(metadata, sources); err != nil {
return nil, err
}
resolved := &pipelineResolutionMetadata{
configkitMetadata: metadata, configkitSources: sources,
publishDeclared: metadata.IsExplicit(configkit.Keys("publish")),
}
pathsByID := make(map[string]string, len(sources))
for index, source := range sources {
@@ -341,50 +335,6 @@ func ownershipSources(origin configkit.Origin, pathsByID map[string]string) []st
return sources
}
func rejectDuplicateBaseDefinitions(metadata configkit.Metadata, sources []configkit.SourceInfo) error {
pathsByID := make(map[string]string, len(sources))
for _, source := range sources {
pathsByID[source.ID] = source.Path
}
// Enumerate retained declarations, not just surviving effective keys. Loading
// the base separately would also resolve credentials removed by the overlay.
// ConfigKit returns canonical JSON Pointers in deterministic order.
for _, path := range metadata.HistoricalPaths() {
parts := strings.Split(path.String(), "/")
if len(parts) != 4 || parts[1] != "scriptorium" {
continue
}
var kind string
switch parts[2] {
case "artifacts":
kind = "artifact"
case "artifact_families":
kind = "artifact family"
default:
continue
}
seen := map[string]struct{}{}
for _, change := range metadata.History(path) {
if change.Origin.Layer != configkit.LayerBase {
continue
}
for _, location := range change.Origin.Locations {
seen[location.SourceID] = struct{}{}
}
}
if len(seen) > 1 {
claims := make([]string, 0, len(seen))
for sourceID := range seen {
claims = append(claims, pathsByID[sourceID])
}
sort.Strings(claims)
key := strings.NewReplacer("~1", "/", "~0", "~").Replace(parts[3])
return fmt.Errorf("pipeline Scriptorium %s %q is declared by multiple base files: %s", kind, key, strings.Join(claims, ", "))
}
}
return nil
}
func intPtr(value int) *int { return &value }
func float64Ptr(value float64) *float64 { return &value }
func boolPtr(value bool) *bool { return &value }

View File

@@ -80,41 +80,151 @@ func TestPipelineOverlayDoesNotDiscoverLegacyDirectory(t *testing.T) {
}
}
func TestPipelineConfigKitRejectsDuplicateBaseDeclarations(t *testing.T) {
func TestPipelineConfigKitComposesDisjointDefinitionsAndHonorsOverlay(t *testing.T) {
for _, test := range []struct {
name, first, second, clearedContainer string
name, first, second, replacement, removal string
}{
{name: "artifact", first: "scriptorium:\n artifacts:\n recap:\n prompt_id: recap\n", second: "scriptorium:\n artifacts:\n recap:\n output_path: artifacts/recap.md\n", clearedContainer: "scriptorium:\n artifacts: null\n"},
{name: "artifact family", first: "scriptorium:\n artifact_families:\n recap:\n for_each: party.characters\n", second: "scriptorium:\n artifact_families:\n recap:\n output_path_pattern: artifacts/{character_id}.md\n", clearedContainer: "scriptorium:\n artifact_families: null\n"},
{
name: "artifact",
first: "scriptorium:\n artifacts:\n recap:\n enabled: true\n prompt_id: dnd.recap\n",
second: "scriptorium:\n artifacts:\n recap:\n output_path: artifacts/recap.md\n",
replacement: "scriptorium:\n artifacts:\n recap:\n output_path: artifacts/replaced.md\n",
removal: "scriptorium:\n artifacts: null\n",
},
{
name: "artifact family",
first: "scriptorium:\n artifact_families:\n recap:\n enabled: true\n for_each: party.characters\n prompt_id: dnd.recap\n profile_id: production\n",
second: "scriptorium:\n artifact_families:\n recap:\n output_path_pattern: artifacts/{character_id}.md\n",
replacement: "scriptorium:\n artifact_families:\n recap:\n output_path_pattern: artifacts/{character_id}_replaced.md\n",
removal: "scriptorium:\n artifact_families: null\n",
},
} {
t.Run(test.name, func(t *testing.T) {
dir := t.TempDir()
writePipelineFixture(t, dir, "pipeline.yml", `configkit:
writePartyResolutionFile(t, filepath.Join(dir, "party.yml"), `schema_version: narratio.party.v1
characters:
alice:
player: {name: Alice Player}
character:
name: Alice
classes: [{name: wizard}]
`)
pipeline := `configkit:
imports:
- path: first.yml
- path: second.yml
whisperx:
transcribe_url: https://transcription.example.test/transcribe
`
pipelinePath, campaignPath, sessionPath := writeArtifactFamilyConfig(t, dir, pipeline)
writePipelineFixture(t, dir, "first.yml", test.first)
writePipelineFixture(t, dir, "second.yml", test.second)
writePipelineFixture(t, dir, "overlays/replacement.yml", test.replacement)
writePipelineFixture(t, dir, "overlays/removal.yml", test.removal)
cfg, err := LoadWithSessionOptions(pipelinePath, campaignPath, sessionPath, SessionLoadOptions{})
if err != nil {
t.Fatalf("load disjoint contributions: %v", err)
}
if test.name == "artifact" {
artifact := cfg.Pipeline.Scriptorium.Artifacts["recap"]
if !artifact.Enabled || artifact.PromptID != "dnd.recap" || artifact.OutputPath != "artifacts/recap.md" {
t.Fatalf("composed artifact = %#v", artifact)
}
} else {
artifact := cfg.Pipeline.Scriptorium.Artifacts["recap_alice"]
if !artifact.Enabled || artifact.PromptID != "dnd.recap" || artifact.OutputPath != "artifacts/alice.md" {
t.Fatalf("composed artifact family member = %#v", artifact)
}
}
replacement := "replacement"
cfg, err = LoadWithSessionOptions(pipelinePath, campaignPath, sessionPath, SessionLoadOptions{Overlay: &replacement})
if err != nil {
t.Fatalf("load replacement overlay: %v", err)
}
if test.name == "artifact" && cfg.Pipeline.Scriptorium.Artifacts["recap"].OutputPath != "artifacts/replaced.md" {
t.Fatalf("overlay artifact replacement = %#v", cfg.Pipeline.Scriptorium.Artifacts["recap"])
}
if test.name == "artifact family" && cfg.Pipeline.Scriptorium.Artifacts["recap_alice"].OutputPath != "artifacts/alice_replaced.md" {
t.Fatalf("overlay family replacement = %#v", cfg.Pipeline.Scriptorium.Artifacts["recap_alice"])
}
removal := "removal"
cfg, err = LoadWithSessionOptions(pipelinePath, campaignPath, sessionPath, SessionLoadOptions{Overlay: &removal})
if err != nil {
t.Fatalf("load removal overlay: %v", err)
}
if len(cfg.Pipeline.Scriptorium.Artifacts) != 0 {
t.Fatalf("overlay left artifacts after removal: %#v", cfg.Pipeline.Scriptorium.Artifacts)
}
})
}
t.Run("structural conflict remains a loader error", func(t *testing.T) {
dir := t.TempDir()
writePipelineFixture(t, dir, "pipeline.yml", `configkit:
imports:
- path: first.yml
- path: second.yml
whisperx:
transcribe_url: https://transcription.example.test/transcribe
`)
writePipelineFixture(t, dir, "first.yml", test.first)
writePipelineFixture(t, dir, "second.yml", test.second)
writePipelineFixture(t, dir, "overlays/clear-container.yml", test.clearedContainer)
writePipelineFixture(t, dir, "overlays/clear-scriptorium.yml", "scriptorium: null\n")
writePipelineFixture(t, dir, "first.yml", "workspace:\n root: /srv/first\n")
writePipelineFixture(t, dir, "second.yml", "workspace:\n root: /srv/second\n")
if _, err := LoadPipeline(filepath.Join(dir, "pipeline.yml")); err == nil || !strings.Contains(strings.ToLower(err.Error()), "conflict") {
t.Fatalf("structural conflict error = %v", err)
}
})
}
for _, profile := range []string{"", "clear-container", "clear-scriptorium"} {
t.Run(profile, func(t *testing.T) {
options := PipelineLoadOptions{}
if profile != "" {
options.Overlay = &profile
}
_, err := LoadPipelineWithOptions(filepath.Join(dir, "pipeline.yml"), options)
if err == nil || !strings.Contains(err.Error(), "declared by multiple base files") ||
!strings.Contains(err.Error(), "first.yml") || !strings.Contains(err.Error(), "second.yml") {
t.Fatalf("duplicate declaration error = %v", err)
}
})
}
})
func TestPipelineConfigKitInheritsArtifactAcrossImports(t *testing.T) {
dir := t.TempDir()
writePartyResolutionFile(t, filepath.Join(dir, "party.yml"), `schema_version: narratio.party.v1
characters:
alice:
player: {name: Alice Player}
character:
name: Alice
classes: [{name: wizard}]
`)
pipeline := `configkit:
imports:
- path: artifacts/parent.yml
- path: artifacts/child.yml
whisperx:
transcribe_url: https://transcription.example.test/transcribe
`
pipelinePath, campaignPath, sessionPath := writeArtifactFamilyConfig(t, dir, pipeline)
writePipelineFixture(t, dir, "artifacts/parent.yml", `scriptorium:
artifacts:
session_recap:
enabled: true
prompt_id: dnd.session_recap
profile_id: production
output_path: artifacts/session_recap.md
`)
writePipelineFixture(t, dir, "artifacts/child.yml", `scriptorium:
artifacts:
session_notes:
extends: session_recap
output_path: artifacts/session_notes.md
`)
cfg, err := LoadWithSessionOptions(pipelinePath, campaignPath, sessionPath, SessionLoadOptions{})
if err != nil {
t.Fatal(err)
}
parent := cfg.Pipeline.Scriptorium.Artifacts["session_recap"]
child, ok := cfg.Pipeline.Scriptorium.Artifacts["session_notes"]
if !ok {
t.Fatal("inherited child artifact identity was not retained")
}
if parent.OutputPath != "artifacts/session_recap.md" || child.OutputPath != "artifacts/session_notes.md" {
t.Fatalf("artifact destinations = parent %q, child %q", parent.OutputPath, child.OutputPath)
}
if !child.Enabled || child.PromptID != "dnd.session_recap" || child.ProfileID != "production" {
t.Fatalf("inherited child artifact = %#v", child)
}
}