diff --git a/docs/roadmap/implementation.md b/docs/roadmap/implementation.md index 0df88327..a071ad90 100644 --- a/docs/roadmap/implementation.md +++ b/docs/roadmap/implementation.md @@ -1675,8 +1675,7 @@ fake HTTP provider, closing their earlier runtime-wrapper setup blocker. All D&D module and configuration tests, their focused vet checks, contracts/shared/helper tests, and focused native CLI tests pass. Whole-tree compilation remains pending: CLI and integration fixtures still reference removed APIs and legacy imports. -Leaf-assembled module tests also need a proper integration-test home to -satisfy the existing import-boundary check. Dependency tidy/old-path removal, +Dependency tidy/old-path removal, notice reconciliation, remaining fixture migration, and full validation are not complete; this stage is not marked finished. @@ -1690,6 +1689,16 @@ behavioral coverage. Whole-tree compile-only validation still fails at the old ConfigKit YAML import in CLI tests and removed completion/checkpoint APIs in module integration fixtures; those blockers remain required work. +Moved the cross-family spell, combat, enemy-event, and Seriatim runner contracts +into the black-box module integration package. They use public module APIs and +share a small native provider/embedded-engine fixture, preserving complete +assessment/history, strict/permissive outcomes, scene gating, intrinsic codec, +and transcript metadata/source-reference coverage. These selected integration +tests and their vet/repeated race checks pass, as do all D&D, generic, and +Seriatim package tests and the unchanged production import-boundary suite. +The remaining legacy integration files still prevent running that whole package; +their completion/checkpoint fixture migration is not finished. + **Goal:** delete the old architecture rather than leave dormant alternatives. **Inspect/change:** all production/test callers of the feature roadmap's removal diff --git a/internal/modules/dnd/extract/combatturns/pipeline_test.go b/internal/modules/integration/native_combat_pipeline_test.go similarity index 89% rename from internal/modules/dnd/extract/combatturns/pipeline_test.go rename to internal/modules/integration/native_combat_pipeline_test.go index de856a5e..ee22cef2 100644 --- a/internal/modules/dnd/extract/combatturns/pipeline_test.go +++ b/internal/modules/integration/native_combat_pipeline_test.go @@ -1,4 +1,4 @@ -package combatturns +package integration_test import ( "context" @@ -12,6 +12,7 @@ import ( "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd" combatcodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/combatturns" scenecodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/scenedescriptions" + combatextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/combatturns" "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/combatturns/shape" sourcerefs "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/combatturns/source_refs" relatedness "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/combatturns/source_relatedness" @@ -37,8 +38,8 @@ func TestNativeCombatPipelineHonorsSceneEligibilityWithoutSyntheticRequests(t *t {"mismatched combat", dnd.SceneKindCombat, true, 0}, } { t.Run(test.name, func(t *testing.T) { - client := &fakeCombatTurnsLLMClient{raw: `{"combat_turns":[{"actor":"Aria","turn_kind":"turn","source_refs":[{"start_unit_id":1,"end_unit_id":1}]}]}`} - engine := newExtractor(t, client).engine + client := &nativeSequenceClient{responses: []string{`{"combat_turns":[{"actor":"Aria","turn_kind":"turn","source_refs":[{"start_unit_id":1,"end_unit_id":1}]}]}`}} + engine := nativeTestEngine(t, client, "profile-combat") registries := pipeline.Registries{ Inputs: pipeline.NewInputAdapterRegistry(), Chunkers: pipeline.NewChunkerRegistry(), ArtifactCodecs: pipeline.NewArtifactCodecRegistry(), Extractors: pipeline.NewExtractorRegistry(), @@ -55,7 +56,7 @@ func TestNativeCombatPipelineHonorsSceneEligibilityWithoutSyntheticRequests(t *t check(transcript.Register(registries.Inputs)) check(units.Register(registries.Chunkers)) check(pipeline.RegisterArtifactCodec(registries.ArtifactCodecs, combatcodec.New())) - check(Register(registries.Extractors)) + check(combatextract.Register(registries.Extractors)) check(appendorder.RegisterTyped(registries.Mergers, dnd.CombatTurnListKind, func(values []dnd.CombatTurnList) (dnd.CombatTurnList, error) { result := dnd.CombatTurnList{CombatTurns: []dnd.CombatTurn{}} for _, value := range values { @@ -83,9 +84,9 @@ func TestNativeCombatPipelineHonorsSceneEligibilityWithoutSyntheticRequests(t *t ID: "native-combat", Input: pipeline.Binding(transcript.Key), Chunk: pipeline.Binding(units.Key), Output: pipeline.Binding(jsonoutput.Key), LLMProfile: "profile-combat", Artifacts: map[string]pipeline.ArtifactLaneProfile{"combat": { - Extract: pipeline.ModuleBinding{Module: Key, Validators: pipeline.ValidatorOverride{Set: true, Validators: []pipeline.ModuleBinding{ + Extract: pipeline.ModuleBinding{Module: combatextract.Key, Validators: pipeline.ValidatorOverride{Set: true, Validators: []pipeline.ModuleBinding{ pipeline.Binding(shape.Key), pipeline.Binding(sourcerefs.Key), pipeline.Binding(relatedness.Key), - }}, References: map[string]pipeline.ReferenceSource{SceneDescriptionReferenceSlot: pipeline.ExternalReference(path)}}, + }}, References: map[string]pipeline.ReferenceSource{combatextract.SceneDescriptionReferenceSlot: pipeline.ExternalReference(path)}}, Merge: pipeline.Binding(appendorder.Key), Normalize: pipeline.Binding(noop.Key), }}, } diff --git a/internal/modules/dnd/extract/enemyevents/pipeline_test.go b/internal/modules/integration/native_enemy_pipeline_test.go similarity index 59% rename from internal/modules/dnd/extract/enemyevents/pipeline_test.go rename to internal/modules/integration/native_enemy_pipeline_test.go index 0491cc78..0888a962 100644 --- a/internal/modules/dnd/extract/enemyevents/pipeline_test.go +++ b/internal/modules/integration/native_enemy_pipeline_test.go @@ -1,7 +1,8 @@ -package enemyevents +package integration_test import ( "context" + "fmt" "os" "path/filepath" "strings" @@ -10,8 +11,13 @@ import ( "gitea.maximumdirect.net/eric/notarius/internal/core/source" "gitea.maximumdirect.net/eric/notarius/internal/framework/pipeline" "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd" + combatcodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/combatturns" eventcodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/enemyevents" + occurrencecodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/npcoccurrences" + npccodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/npcregistry" scenecodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/scenedescriptions" + enemyextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/enemyevents" + "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/npcs/identity" "gitea.maximumdirect.net/eric/notarius/internal/modules/generic/chunk/units" "gitea.maximumdirect.net/eric/notarius/internal/modules/generic/merge/appendorder" "gitea.maximumdirect.net/eric/notarius/internal/modules/generic/normalize/noop" @@ -19,13 +25,51 @@ import ( "gitea.maximumdirect.net/eric/notarius/internal/modules/seriatim/input/transcript" ) +func enemyPipelineReferenceSources(t *testing.T) map[string]pipeline.ReferenceSource { + t.Helper() + ref := func(unit int) source.SourceRef { + return source.SourceRef{SourceID: "combat-session", StartUnitID: unit, EndUnitID: unit} + } + encode := func(content []byte, err error) []byte { + t.Helper() + if err != nil { + t.Fatal(err) + } + return content + } + contents := map[string][]byte{ + enemyextract.NPCRegistryReferenceSlot: encode(npccodec.New().Encode(dnd.NPCRegistry{NPCs: []dnd.NPC{{ + ID: identity.DeriveID("Ashfang"), Name: "Ashfang", SourceRefs: []source.SourceRef{ref(1)}, + }}})), + enemyextract.SceneDescriptionReferenceSlot: encode(scenecodec.New().Encode(dnd.SceneDescriptionList{Scenes: []dnd.SceneDescription{{ + ID: "chunk-000001", SourceRef: ref(1), Kind: dnd.SceneKindCombat, Title: "Combat", Summary: "Ashfang opposes the party.", + }}})), + enemyextract.CombatTurnReferenceSlot: encode(combatcodec.New().Encode(dnd.CombatTurnList{CombatTurns: []dnd.CombatTurn{ + {Actor: "Ashfang", TurnKind: dnd.CombatTurnKindTurn, SourceRefs: []source.SourceRef{ref(1)}}, + {Actor: "Aria", TurnKind: dnd.CombatTurnKindReaction, SourceRefs: []source.SourceRef{ref(2)}}, + }})), + enemyextract.NPCOccurrenceReferenceSlot: encode(occurrencecodec.New().Encode(dnd.NPCOccurrenceList{Occurrences: []dnd.NPCOccurrence{ + {NPCID: identity.DeriveID("Ashfang"), Name: "Ashfang", Kind: dnd.NPCOccurrenceKindCombatOpponent, SourceRefs: []source.SourceRef{ref(1)}}, + {NPCID: identity.DeriveID("Aria"), Name: "Aria", Kind: dnd.NPCOccurrenceKindCombatAlly, SourceRefs: []source.SourceRef{ref(2)}}, + }})), + } + root := t.TempDir() + references := make(map[string]pipeline.ReferenceSource, len(contents)) + for slot, content := range contents { + path := filepath.Join(root, slot+".json") + if err := os.WriteFile(path, content, 0600); err != nil { + t.Fatal(err) + } + references[slot] = pipeline.ExternalReference(path) + } + return references +} + func TestNativeEnemyPipelineRetainsIntrinsicCodecBoundaryWithEmptyValidators(t *testing.T) { for _, name := range []string{"Ashfang", " "} { t.Run(name, func(t *testing.T) { - client := &fakeEnemyEventsLLMClient{response: extractionResponse{Events: []enemyEventResponse{ - {Name: name, Kind: "engaged", SourceRefs: []enemySourceRefResponse{{StartUnitID: 1, EndUnitID: 1}}}, - }}} - engine := newEnemyExtractor(t, client).engine + client := &nativeSequenceClient{responses: []string{fmt.Sprintf(`{"events":[{"name":%q,"kind":"engaged","source_refs":[{"start_unit_id":1,"end_unit_id":1}]}]}`, name)}} + engine := nativeTestEngine(t, client, "enemy-profile") registries := pipeline.Registries{ Inputs: pipeline.NewInputAdapterRegistry(), Chunkers: pipeline.NewChunkerRegistry(), ArtifactCodecs: pipeline.NewArtifactCodecRegistry(), Extractors: pipeline.NewExtractorRegistry(), @@ -42,7 +86,7 @@ func TestNativeEnemyPipelineRetainsIntrinsicCodecBoundaryWithEmptyValidators(t * check(transcript.Register(registries.Inputs)) check(units.Register(registries.Chunkers)) check(pipeline.RegisterArtifactCodec(registries.ArtifactCodecs, eventcodec.New())) - check(Register(registries.Extractors)) + check(enemyextract.Register(registries.Extractors)) check(appendorder.RegisterTyped(registries.Mergers, dnd.EnemyEventListKind, func(values []dnd.EnemyEventList) (dnd.EnemyEventList, error) { result := dnd.EnemyEventList{Events: []dnd.EnemyEvent{}} for _, value := range values { @@ -52,25 +96,12 @@ func TestNativeEnemyPipelineRetainsIntrinsicCodecBoundaryWithEmptyValidators(t * })) check(noop.RegisterTyped[dnd.EnemyEventList](registries.Normalizers, dnd.EnemyEventListKind)) check(jsonoutput.Register(registries.Outputs)) - references := groundingReferences(t, "Ashfang", dnd.SceneKindCombat) - content, err := scenecodec.New().Encode(dnd.SceneDescriptionList{Scenes: []dnd.SceneDescription{{ - ID: "chunk-000001", SourceRef: source.SourceRef{SourceID: "combat-session", StartUnitID: 1, EndUnitID: 1}, - Kind: dnd.SceneKindCombat, Title: "Combat", Summary: "Ashfang opposes the party.", - }}}) - check(err) - references = replaceItem(references, SceneDescriptionReferenceSlot, newReferenceItem(SceneDescriptionReferenceSlot, content)) - referenceSources := make(map[string]pipeline.ReferenceSource) - root := t.TempDir() - for name, slot := range references.Slots { - path := filepath.Join(root, name+".json") - check(os.WriteFile(path, slot.Items[0].Content, 0600)) - referenceSources[name] = pipeline.ExternalReference(path) - } + referenceSources := enemyPipelineReferenceSources(t) profile := pipeline.PipelineProfile{ ID: "native-enemies", Input: pipeline.Binding(transcript.Key), Chunk: pipeline.Binding(units.Key), Output: pipeline.Binding(jsonoutput.Key), LLMProfile: "enemy-profile", Artifacts: map[string]pipeline.ArtifactLaneProfile{"enemies": { - Extract: pipeline.ModuleBinding{Module: Key, References: referenceSources, Validators: pipeline.ValidatorOverride{Set: true, Validators: []pipeline.ModuleBinding{}}}, + Extract: pipeline.ModuleBinding{Module: enemyextract.Key, References: referenceSources, Validators: pipeline.ValidatorOverride{Set: true, Validators: []pipeline.ModuleBinding{}}}, Merge: pipeline.Binding(appendorder.Key), Normalize: pipeline.Binding(noop.Key), }}, } diff --git a/internal/modules/integration/native_provider_test.go b/internal/modules/integration/native_provider_test.go new file mode 100644 index 00000000..ce13d4c6 --- /dev/null +++ b/internal/modules/integration/native_provider_test.go @@ -0,0 +1,74 @@ +package integration_test + +import ( + "context" + "encoding/json" + "fmt" + "strings" + "sync" + "testing" + + "gitea.maximumdirect.net/eric/notarius/assets" + "go.maximumdirect.net/configkit" + "go.maximumdirect.net/promptkit" +) + +func nativeTestEngine(t *testing.T, client promptkit.LLMClient, profileIDs ...string) *promptkit.Engine { + t.Helper() + type settings struct { + PromptKit promptkit.Settings `yaml:"promptkit"` + } + profiles := make([]map[string]any, len(profileIDs)) + for index, id := range profileIDs { + profiles[index] = map[string]any{"id": id, "endpoint": "https://example.invalid/v1", "model": "integration-test-model", "api_key_required": false} + } + content, err := json.Marshal(map[string]any{"promptkit": map[string]any{"profiles": profiles}}) + if err != nil { + t.Fatal(err) + } + definition := promptkit.Configure(configkit.Definition[settings]{}, func(value *settings) *promptkit.Settings { return &value.PromptKit }) + filesystem := configkit.NewFilesystem("Notarius assets", assets.FS()) + result, err := configkit.LoadLayered(configkit.Input{Source: configkit.Bytes("native provider fixture", content)}, configkit.LayeredOptions[settings]{ + Definition: definition, + Underlays: []configkit.Underlay{ + promptkit.BundledOpenRouterUnderlay(), + {Inputs: []configkit.Input{{Source: filesystem.File("notarius.yml"), Imports: true, Filesystem: &configkit.FilesystemContext{FS: &filesystem, Root: "."}}}}, + }, + }) + if err != nil { + t.Fatal(err) + } + engine, err := promptkit.NewFromConfig(result, promptkit.RuntimeConfig{}, promptkit.WithLLMClient(client)) + if err != nil { + t.Fatal(err) + } + return engine +} + +type nativeSequenceClient struct { + mu sync.Mutex + responses []string + requests []promptkit.GenerateRequest +} + +func (client *nativeSequenceClient) Generate(ctx context.Context, request promptkit.GenerateRequest) (*promptkit.GenerateResponse, error) { + client.mu.Lock() + defer client.mu.Unlock() + if err := ctx.Err(); err != nil { + return nil, err + } + index := len(client.requests) + client.requests = append(client.requests, request) + if index >= len(client.responses) { + return nil, fmt.Errorf("unexpected provider request %d", index+1) + } + return &promptkit.GenerateResponse{Content: client.responses[index]}, nil +} + +func nativePromptText(request promptkit.GenerateRequest) string { + var content []string + for _, message := range request.Prompt.Messages { + content = append(content, message.Content) + } + return strings.Join(content, "\n") +} diff --git a/internal/modules/dnd/extract/spells/pipeline_test.go b/internal/modules/integration/native_spell_pipeline_test.go similarity index 94% rename from internal/modules/dnd/extract/spells/pipeline_test.go rename to internal/modules/integration/native_spell_pipeline_test.go index 12c07cf1..873b2e80 100644 --- a/internal/modules/dnd/extract/spells/pipeline_test.go +++ b/internal/modules/integration/native_spell_pipeline_test.go @@ -1,4 +1,4 @@ -package spells +package integration_test import ( "context" @@ -14,6 +14,7 @@ import ( "gitea.maximumdirect.net/eric/notarius/internal/framework/pipeline" "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd" spellcodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/spells" + spells "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/spells" spellcatalogvalidator "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/spells/catalog" spellshape "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/spells/shape" spellsourcerefs "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/spells/source_refs" @@ -54,8 +55,8 @@ func TestNativeSpellPipelineAssessesEveryCandidateOnce(t *testing.T) { {"permissive empty fallback", contracts.ModePermissive, []string{response("Unknown Spell"), response("Unknown Spell"), response("Unknown Spell")}, false, 1}, } { t.Run(test.name, func(t *testing.T) { - client := &fakeSpellsLLMClient{outputs: append([]string(nil), test.responses...)} - engine := newSpellEngine(t, client) + client := &nativeSequenceClient{responses: append([]string(nil), test.responses...)} + engine := nativeTestEngine(t, client, "profile-spells") registries := pipeline.Registries{ Inputs: pipeline.NewInputAdapterRegistry(), Chunkers: pipeline.NewChunkerRegistry(), ArtifactCodecs: pipeline.NewArtifactCodecRegistry(), Extractors: pipeline.NewExtractorRegistry(), @@ -72,7 +73,7 @@ func TestNativeSpellPipelineAssessesEveryCandidateOnce(t *testing.T) { check(transcript.Register(registries.Inputs)) check(units.Register(registries.Chunkers)) check(pipeline.RegisterArtifactCodec(registries.ArtifactCodecs, spellcodec.New())) - check(Register(registries.Extractors)) + check(spells.Register(registries.Extractors)) check(appendorder.RegisterTyped(registries.Mergers, dnd.SpellListKind, func(values []dnd.SpellList) (dnd.SpellList, error) { result := dnd.SpellList{SpellCasts: []dnd.SpellCast{}} for _, value := range values { @@ -110,7 +111,7 @@ func TestNativeSpellPipelineAssessesEveryCandidateOnce(t *testing.T) { Chunk: pipeline.Binding(units.Key), Output: pipeline.Binding(jsonoutput.Key), LLMProfile: "profile-spells", Artifacts: map[string]pipeline.ArtifactLaneProfile{"spells": { - Extract: pipeline.ModuleBinding{Module: Key, Mode: &test.mode, MaxAdditionalTurns: &turns, + Extract: pipeline.ModuleBinding{Module: spells.Key, Mode: &test.mode, MaxAdditionalTurns: &turns, Validators: pipeline.ValidatorOverride{Set: true, Validators: bindings}, References: map[string]pipeline.ReferenceSource{"party": pipeline.ExternalReference(partyFile)}}, Merge: pipeline.Binding(appendorder.Key), Normalize: pipeline.Binding(noop.Key), @@ -153,9 +154,9 @@ func TestNativeSpellPipelineAssessesEveryCandidateOnce(t *testing.T) { if request.Target.Model != model || request.Prompt.SessionID != "spell-session-override" || preparations[i].SelectedProfileID != "profile-spells" { t.Fatal("native profile/session/execution override lost") } - wantID := PromptID + wantID := spells.PromptID if i > 0 { - wantID = CorrectionPromptID + wantID = spells.CorrectionPromptID } if preparations[i].PromptID != wantID { t.Fatalf("prompt = %q, want %q", preparations[i].PromptID, wantID) @@ -172,7 +173,7 @@ func TestNativeSpellPipelineAssessesEveryCandidateOnce(t *testing.T) { !strings.Contains(current[len(previous)+1].Content, "recognized D&D spell") { t.Fatal("correction lost the actual candidate or catalog guidance") } - if strings.Count(promptText(request), "party-grounding-sentinel") != 1 { + if strings.Count(nativePromptText(request), "party-grounding-sentinel") != 1 { t.Fatal("reference bytes were regenerated in correction") } } diff --git a/internal/modules/seriatim/input/transcript/runner_helpers_test.go b/internal/modules/integration/seriatim_runner_helpers_test.go similarity index 96% rename from internal/modules/seriatim/input/transcript/runner_helpers_test.go rename to internal/modules/integration/seriatim_runner_helpers_test.go index 9de0b490..38526a5a 100644 --- a/internal/modules/seriatim/input/transcript/runner_helpers_test.go +++ b/internal/modules/integration/seriatim_runner_helpers_test.go @@ -1,4 +1,4 @@ -package transcript +package integration_test import ( "context" @@ -10,6 +10,7 @@ import ( "gitea.maximumdirect.net/eric/notarius/internal/core/source" "gitea.maximumdirect.net/eric/notarius/internal/framework/contracts" "gitea.maximumdirect.net/eric/notarius/internal/framework/pipeline" + "gitea.maximumdirect.net/eric/notarius/internal/modules/seriatim/input/transcript" ) func loadPipelineConfig(t *testing.T) config.Config { @@ -18,7 +19,7 @@ func loadPipelineConfig(t *testing.T) config.Config { cfg := config.Default() cfg.Pipelines["seriatim-fixture"] = pipeline.PipelineProfile{ ID: "seriatim-fixture", - Input: pipeline.Binding(Key), + Input: pipeline.Binding(transcript.Key), Chunk: pipeline.Binding("fake/chunk"), Artifacts: map[string]pipeline.ArtifactLaneProfile{ "events": {Extract: pipeline.Binding("fake/extract")}, @@ -37,12 +38,12 @@ func seriatimTestCatalog(t *testing.T, inputSpec pipeline.ModuleSpec) pipeline.M normalizers := pipeline.NewNormalizerRegistry() outputs := pipeline.NewOutputEncoderRegistry() - if reflect.DeepEqual(inputSpec, ModuleSpec()) { - if err := Register(inputs); err != nil { + if reflect.DeepEqual(inputSpec, transcript.ModuleSpec()) { + if err := transcript.Register(inputs); err != nil { t.Fatalf("register seriatim input: %v", err) } } else if err := inputs.RegisterWithSpec(inputSpec, func() (contracts.InputAdapter, error) { - return New(), nil + return transcript.New(), nil }); err != nil { t.Fatalf("register seriatim input override: %v", err) } diff --git a/internal/modules/seriatim/input/transcript/runner_test.go b/internal/modules/integration/seriatim_runner_test.go similarity index 91% rename from internal/modules/seriatim/input/transcript/runner_test.go rename to internal/modules/integration/seriatim_runner_test.go index 626da0ea..f8d931e5 100644 --- a/internal/modules/seriatim/input/transcript/runner_test.go +++ b/internal/modules/integration/seriatim_runner_test.go @@ -1,9 +1,10 @@ -package transcript +package integration_test import ( "context" "encoding/json" "fmt" + "os" "strings" "testing" @@ -12,9 +13,10 @@ import ( "gitea.maximumdirect.net/eric/notarius/internal/framework/contracts" "gitea.maximumdirect.net/eric/notarius/internal/framework/pipeline" jsonoutput "gitea.maximumdirect.net/eric/notarius/internal/modules/generic/output/json" + "gitea.maximumdirect.net/eric/notarius/internal/modules/seriatim/input/transcript" ) -func runPreparedPipeline(t *testing.T, registries pipeline.Registries, resolved pipeline.ResolvedPipeline, input pipeline.RunInput) (pipeline.RunOutput, error) { +func runSeriatimPipeline(t *testing.T, registries pipeline.Registries, resolved pipeline.ResolvedPipeline, input pipeline.RunInput) (pipeline.RunOutput, error) { t.Helper() prepared, err := pipeline.Prepare(resolved, registries, pipeline.ModuleDependencies{}) if err != nil { @@ -25,8 +27,11 @@ func runPreparedPipeline(t *testing.T, registries pipeline.Registries, resolved } func TestRunnerProcessesSeriatimInputWithFakeModules(t *testing.T) { - raw := readFixture(t, "testdata/valid_minimal.json") - expectedDoc, err := New().Parse(context.Background(), contracts.ParseRequest{Raw: raw}) + raw, err := os.ReadFile("../seriatim/input/transcript/testdata/valid_minimal.json") + if err != nil { + t.Fatal(err) + } + expectedDoc, err := transcript.New().Parse(context.Background(), contracts.ParseRequest{Raw: raw}) if err != nil { t.Fatalf("Parse() error = %v, want nil", err) } @@ -37,7 +42,7 @@ func TestRunnerProcessesSeriatimInputWithFakeModules(t *testing.T) { } extractor := &runnerSeriatimExtractor{} - output, err := runPreparedPipeline(t, seriatimRunnerRegistries(t, extractor), resolved.ResolvedPipeline, pipeline.RunInput{ + output, err := runSeriatimPipeline(t, seriatimRunnerRegistries(t, extractor), resolved.ResolvedPipeline, pipeline.RunInput{ RawInput: raw, }) if err != nil { @@ -80,7 +85,7 @@ func TestRunnerFailsOnInvalidSeriatimInput(t *testing.T) { t.Fatalf("Resolve() error = %v, want nil", err) } - output, err := runPreparedPipeline(t, seriatimRunnerRegistries(t, &runnerSeriatimExtractor{}), resolved.ResolvedPipeline, pipeline.RunInput{ + output, err := runSeriatimPipeline(t, seriatimRunnerRegistries(t, &runnerSeriatimExtractor{}), resolved.ResolvedPipeline, pipeline.RunInput{ RawInput: []byte(`{"metadata":{},"segments":[]}`), SourceID: "invalid-source", }) @@ -99,7 +104,7 @@ func configResolveInput(t *testing.T) config.ResolveInput { t.Helper() return config.ResolveInput{ PipelineID: "seriatim-fixture", - Catalog: seriatimTestCatalog(t, ModuleSpec()), + Catalog: seriatimTestCatalog(t, transcript.ModuleSpec()), } } @@ -113,7 +118,7 @@ func seriatimRunnerRegistries(t *testing.T, extractor contracts.Extractor[seriat normalizers := pipeline.NewNormalizerRegistry() outputs := pipeline.NewOutputEncoderRegistry() - if err := Register(inputs); err != nil { + if err := transcript.Register(inputs); err != nil { t.Fatalf("register seriatim input: %v", err) } if err := chunkers.RegisterWithSpec(pipeline.ModuleSpec{Key: "fake/chunk", Stage: pipeline.StageChunk, ExecutionClass: contracts.ExecutionClassDeterministic}, func() (contracts.Chunker, error) { @@ -200,13 +205,13 @@ func (e *runnerSeriatimExtractor) Extract(ctx context.Context, req contracts.Typ return contracts.TypedExtractionResult[seriatimArtifact]{}, fmt.Errorf("chunk unit IDs = %#v, want Seriatim segment IDs", got) } for _, unit := range req.Chunk.Units { - if speaker, ok := Speaker(unit); !ok || speaker == "" { + if speaker, ok := transcript.Speaker(unit); !ok || speaker == "" { return contracts.TypedExtractionResult[seriatimArtifact]{}, fmt.Errorf("unit %d missing speaker metadata", unit.ID) } - if _, ok := Start(unit); !ok { + if _, ok := transcript.Start(unit); !ok { return contracts.TypedExtractionResult[seriatimArtifact]{}, fmt.Errorf("unit %d missing start metadata", unit.ID) } - if _, ok := End(unit); !ok { + if _, ok := transcript.End(unit); !ok { return contracts.TypedExtractionResult[seriatimArtifact]{}, fmt.Errorf("unit %d missing end metadata", unit.ID) } }