Improve D&D validation reliability

This commit is contained in:
2026-08-29 01:24:45 +00:00
parent 4da9360d74
commit 917d150279
55 changed files with 1300 additions and 565 deletions

View File

@@ -15,7 +15,7 @@ import (
const (
Key = "extract/dnd/npc-occurrences/shape"
ReasonCode = "invalid_npc_occurrence_shape"
policy = "dnd.npc_occurrences.validator.shape.v1"
policy = "dnd.npc_occurrences.validator.shape.v2"
)
type Options struct{}
@@ -34,41 +34,54 @@ func (v *Validator) CheckpointFingerprints() []pipeline.CheckpointFingerprint {
}
func (v *Validator) Validate(_ context.Context, req contracts.TypedValidationRequest[dnd.NPCOccurrenceList]) (contracts.ValidationResult, error) {
if err := Validate(req.Value); err != nil {
return contracts.ValidationResult{Approved: false, ReasonCode: ReasonCode, Message: err.Error(), CorrectionGuidance: "Return a complete NPC-occurrence list with every required field present, valid contextual NPC names, supported interaction kinds, and valid source references."}, nil
issues, corrections := assess(req.Value)
if len(issues) != 0 {
return contracts.ValidationResult{
Approved: false,
ReasonCode: ReasonCode,
Message: diagnostics.Aggregate("invalid NPC occurrence shape", issues),
CorrectionGuidance: corrections.Guidance("Correct every rejected NPC occurrence and return the complete replacement occurrence list"),
}, nil
}
return contracts.ValidationResult{Approved: true}, nil
}
func Validate(value dnd.NPCOccurrenceList) error {
issues := issuesFor(value)
issues, _ := assess(value)
if len(issues) == 0 {
return nil
}
return fmt.Errorf("%s", diagnostics.Aggregate("invalid NPC occurrence shape", issues))
}
func issuesFor(value dnd.NPCOccurrenceList) []string {
func assess(value dnd.NPCOccurrenceList) ([]string, diagnostics.Corrections) {
var corrections diagnostics.Corrections
if value.Occurrences == nil {
return []string{"occurrences must be present"}
corrections.Add("list", "Return an `occurrences` array; use an empty array when the transcript establishes no NPC occurrences.", "")
return []string{"occurrences must be present"}, corrections
}
issues := make([]string, 0)
for index, occurrence := range value.Occurrences {
prefix := fmt.Sprintf("occurrences[%d]", index)
record := fmt.Sprintf("Affected %s occurrence for NPC %s %s.", diagnostics.Quote(string(occurrence.Kind)), diagnostics.Quote(strings.TrimSpace(occurrence.Name)), diagnostics.SourceRange(occurrence.SourceRefs))
if strings.TrimSpace(occurrence.NPCID) == "" {
issues = append(issues, prefix+".npc_id must not be empty: "+diagnostics.Quote(occurrence.NPCID))
corrections.Add("name", "Select a nonblank contextual NPC name from the supplied registry for every occurrence.", record)
}
if strings.TrimSpace(occurrence.Name) == "" {
issues = append(issues, prefix+".name must not be empty: "+diagnostics.Quote(occurrence.Name))
corrections.Add("name", "Select a nonblank contextual NPC name from the supplied registry for every occurrence.", record)
}
if !validKind(occurrence.Kind) {
issues = append(issues, prefix+".kind is unsupported: "+diagnostics.Quote(string(occurrence.Kind)))
corrections.Add("kind", "Set `kind` to exactly one of `mentioned`, `noncombat_presence`, `dialogue`, `combat_ally`, `combat_opponent`, or `other`.", record)
}
if len(occurrence.SourceRefs) == 0 {
issues = append(issues, prefix+".source_refs must contain at least one reference")
corrections.Add("source-refs", "Provide at least one transcript source range that directly supports every NPC occurrence.", record)
}
}
return issues
return issues, corrections
}
func validKind(value dnd.NPCOccurrenceKind) bool {