Implement raw module output contracts

internal/modules/extract/dnd/spells/extractor.go

@@ -4,10 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"strings"
 
-	"gitea.maximumdirect.net/eric/notarius/internal/core/artifacts"
-	"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/sharedassets/dnd"
@@ -45,14 +42,6 @@ func (e *Extractor) Key() string {
 	return Key
 }
 
-func (e *Extractor) ArtifactType() string {
-	return ArtifactType
-}
-
-func (e *Extractor) SchemaVersion() string {
-	return SchemaVersion
-}
-
 func (e *Extractor) ReferenceSlots() []contracts.ReferenceSlot {
 	return dnd.ReferenceSlots(referenceSlotDescriptions)
 }
@@ -77,13 +66,6 @@ func (e *Extractor) ManifestMetadata() map[string]any {
 	return metadata
 }
 
-func (e *Extractor) Validators() []contracts.Validator {
-	return []contracts.Validator{
-		ShapeValidator{},
-		SourceRefValidator{},
-	}
-}
-
 func (e *Extractor) Extract(ctx context.Context, req contracts.ExtractionRequest) (contracts.ExtractionResult, error) {
 	if e == nil {
 		return contracts.ExtractionResult{}, extractorErrorf("extractor must not be nil")
@@ -121,22 +103,26 @@ func (e *Extractor) Extract(ctx context.Context, req contracts.ExtractionRequest
 	if response.SpellCasts == nil {
 		return contracts.ExtractionResult{}, extractorErrorf("malformed structured output: spell_casts must be present")
 	}
-	if len(response.SpellCasts) == 0 {
-		return contracts.ExtractionResult{}, nil
+	content, err := json.Marshal(response)
+	if err != nil {
+		return contracts.ExtractionResult{}, extractorErrorf("marshal raw output: %w", err)
 	}
-
-	candidates := make([]artifacts.ArtifactCandidate, 0, len(response.SpellCasts))
-	for i, spellCast := range response.SpellCasts {
-		payload, err := spellCastPayload(spellCast)
-		if err != nil {
-			return contracts.ExtractionResult{}, extractorErrorf("marshal spell cast[%d]: %w", i, err)
-		}
-		candidates = append(candidates, artifacts.ArtifactCandidate{
-			Payload:    payload,
-			SourceRefs: sourceRefCandidates(req.Source, spellCast.SourceRefs),
-		})
-	}
-	return contracts.ExtractionResult{Candidates: candidates}, nil
+	return contracts.ExtractionResult{
+		Output: contracts.ExtractOutput{
+			Schema: contracts.ResponseSchema{
+				ID:      ResponseSchemaID,
+				Name:    ResponseSchemaName,
+				Version: SchemaVersion,
+			},
+			Payload: contracts.RawPayload{
+				Content:   content,
+				MediaType: "application/json",
+				Metadata: map[string]any{
+					"spell_cast_count": len(response.SpellCasts),
+				},
+			},
+		},
+	}, nil
 }
 
 func ModuleSpec() pipeline.ModuleSpec {
@@ -155,26 +141,6 @@ func Register(registry *pipeline.ExtractorRegistry) error {
 	})
 }
 
-func spellCastPayload(spellCast spellCastResponse) (json.RawMessage, error) {
-	return json.Marshal(SpellCast{
-		Caster:               strings.TrimSpace(spellCast.Caster),
-		Spell:                strings.TrimSpace(spellCast.Spell),
-		Effect:               strings.TrimSpace(spellCast.Effect),
-		NarrativeDescription: strings.TrimSpace(spellCast.NarrativeDescription),
-	})
-}
-
-func sourceRefCandidates(doc *source.SourceDocument, refs []dnd.SourceRefResponse) []source.SourceRef {
-	if len(refs) == 0 {
-		return nil
-	}
-	out := make([]source.SourceRef, 0, len(refs))
-	for _, ref := range refs {
-		out = append(out, dnd.SourceRefCandidate(doc, ref))
-	}
-	return out
-}
-
 func extractorErrorf(format string, args ...any) error {
 	return fmt.Errorf("dnd spells extractor: "+format, args...)
 }