Improve D&D validation reliability
This commit is contained in:
@@ -14,9 +14,10 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
Key = "normalize/dnd/item-registry/identity"
|
||||
ReasonCode = "invalid_item_identity"
|
||||
policy = domainidentity.Policy
|
||||
Key = "normalize/dnd/item-registry/identity"
|
||||
ReasonCode = "invalid_item_identity"
|
||||
policy = domainidentity.Policy
|
||||
correctionPolicy = "dnd.item_registry.validator.identity.v2"
|
||||
)
|
||||
|
||||
type Options struct{}
|
||||
@@ -31,7 +32,7 @@ func (v *Validator) ExecutionClass() contracts.ExecutionClass {
|
||||
return contracts.ExecutionClassDeterministic
|
||||
}
|
||||
func (v *Validator) CheckpointFingerprints() []pipeline.CheckpointFingerprint {
|
||||
return []pipeline.CheckpointFingerprint{{Name: "policy", Value: policy}}
|
||||
return []pipeline.CheckpointFingerprint{{Name: "policy", Value: policy}, {Name: "correction_policy", Value: correctionPolicy}}
|
||||
}
|
||||
|
||||
func (v *Validator) Validate(_ context.Context, req contracts.TypedValidationRequest[dnd.ItemRegistry]) (contracts.ValidationResult, error) {
|
||||
@@ -43,10 +44,31 @@ func (v *Validator) Validate(_ context.Context, req contracts.TypedValidationReq
|
||||
return contracts.ValidationResult{Approved: true}, nil
|
||||
}
|
||||
issues := make([]string, len(identityIssues))
|
||||
var corrections diagnostics.Corrections
|
||||
for index, issue := range identityIssues {
|
||||
issues[index] = fmt.Sprintf("items[%d] %s: %s", issue.RecordIndex, issue.Code, diagnostics.Quote(issue.Value))
|
||||
if issue.RecordIndex < 0 || issue.RecordIndex >= len(req.Value.Items) {
|
||||
continue
|
||||
}
|
||||
item := req.Value.Items[issue.RecordIndex]
|
||||
corrections.Add(string(issue.Code), itemIdentityCorrection(issue.Code), fmt.Sprintf("Affected item %s %s.", diagnostics.Quote(item.Name), diagnostics.SourceRange(item.SourceRefs)))
|
||||
}
|
||||
return contracts.ValidationResult{Approved: false, ReasonCode: ReasonCode, Message: diagnostics.Aggregate("invalid item identity", issues), CorrectionGuidance: corrections.Guidance("Correct the duplicate-group proposals and return the complete replacement proposal response")}, nil
|
||||
}
|
||||
|
||||
func itemIdentityCorrection(code domainidentity.IssueCode) string {
|
||||
switch code {
|
||||
case domainidentity.IssueEmptyCanonicalName:
|
||||
return "Select a canonical proposal member with a nonblank, transcript-supported item name."
|
||||
case domainidentity.IssueDuplicateCanonical:
|
||||
return "Put duplicate mentions of the same item in one proposal group and select one transcript-supported canonical member."
|
||||
case domainidentity.IssueInvalidID, domainidentity.IssueIDMismatch:
|
||||
return "Revise the proposal so its canonical item member has a valid transcript-supported name; Notarius derives durable identity without model input."
|
||||
case domainidentity.IssueDuplicateID:
|
||||
return "Do not use proposals that collapse distinct items into one canonical identity; group only records that describe the same item."
|
||||
default:
|
||||
return "Revise the duplicate-group proposal so every canonical item is transcript-supported and distinct."
|
||||
}
|
||||
return contracts.ValidationResult{Approved: false, ReasonCode: ReasonCode, Message: diagnostics.Aggregate("invalid item identity", issues), CorrectionGuidance: "Return one canonical registry entry per distinct properly named item, combining duplicate mentions under the same transcript-supported name."}, nil
|
||||
}
|
||||
|
||||
func Spec() pipeline.ValidatorSpec {
|
||||
|
||||
@@ -21,6 +21,9 @@ func TestValidatorRejectsInvalidAndDuplicateItemIdentity(t *testing.T) {
|
||||
if err != nil || result.Approved || result.ReasonCode != ReasonCode || !strings.Contains(result.Message, "invalid_id") || !strings.Contains(result.Message, "duplicate_canonical_identity") {
|
||||
t.Fatalf("Validate() = %#v, %v; want identity rejection", result, err)
|
||||
}
|
||||
if !strings.Contains(result.CorrectionGuidance, "duplicate-group proposals") || !strings.Contains(result.CorrectionGuidance, "Rope") || strings.Contains(result.CorrectionGuidance, "wrong") || strings.Contains(result.CorrectionGuidance, "items[") {
|
||||
t.Fatalf("CorrectionGuidance = %q, want contextual proposal guidance without IDs or operator paths", result.CorrectionGuidance)
|
||||
}
|
||||
}
|
||||
|
||||
func TestValidatorRegistersPolicy(t *testing.T) {
|
||||
@@ -31,7 +34,7 @@ func TestValidatorRegistersPolicy(t *testing.T) {
|
||||
if got, ok := registry.Spec(Key); !ok || got != Spec() || got.ExecutionClass != contracts.ExecutionClassDeterministic {
|
||||
t.Fatalf("registered spec = %#v, present = %t", got, ok)
|
||||
}
|
||||
if got := New(Options{}).CheckpointFingerprints(); len(got) != 1 || got[0].Value != domainidentity.Policy {
|
||||
if got := New(Options{}).CheckpointFingerprints(); len(got) != 2 || got[0].Value != domainidentity.Policy || got[1].Name != "correction_policy" || got[1].Value != correctionPolicy {
|
||||
t.Fatalf("fingerprints = %#v", got)
|
||||
}
|
||||
if _, err := DecodeOptions(map[string]any{"unexpected": true}); err == nil {
|
||||
|
||||
Reference in New Issue
Block a user