Validate internal decisions and reconcile exact model references
This commit is contained in:
@@ -2,10 +2,10 @@ package validators
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
frameworkvalidators "gitea.maximumdirect.net/eric/audita/v3/internal/framework/validators"
|
||||
"strings"
|
||||
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/core/modulecatalog"
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/framework/contracts"
|
||||
)
|
||||
|
||||
var builtInChains = map[string][]string{
|
||||
@@ -58,7 +58,7 @@ func BuiltInChainKeys(moduleKey string) ([]string, error) {
|
||||
return out, nil
|
||||
}
|
||||
|
||||
func ResolveBuiltInChain(moduleKey string, registry *Registry) ([]contracts.Validator, error) {
|
||||
func ResolveBuiltInChain(moduleKey string, registry *Registry) ([]frameworkvalidators.Validator, error) {
|
||||
moduleKey = strings.TrimSpace(moduleKey)
|
||||
keys, err := BuiltInChainKeys(moduleKey)
|
||||
if err != nil {
|
||||
@@ -68,7 +68,7 @@ func ResolveBuiltInChain(moduleKey string, registry *Registry) ([]contracts.Vali
|
||||
registry = NewBuiltInRegistry()
|
||||
}
|
||||
|
||||
out := make([]contracts.Validator, 0, len(keys))
|
||||
out := make([]frameworkvalidators.Validator, 0, len(keys))
|
||||
for _, key := range keys {
|
||||
v, buildErr := registry.MustBuild(key)
|
||||
if buildErr != nil {
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
package editorial_review
|
||||
|
||||
import (
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/framework/contracts"
|
||||
frameworkvalidators "gitea.maximumdirect.net/eric/audita/v3/internal/framework/validators"
|
||||
validatormetadata "gitea.maximumdirect.net/eric/audita/v3/internal/validators/metadata"
|
||||
)
|
||||
|
||||
const Key = "editorial_review"
|
||||
|
||||
func New() (contracts.Validator, error) {
|
||||
func New() (frameworkvalidators.Validator, error) {
|
||||
v, err := frameworkvalidators.NewLLMBackedValidator(Key, frameworkvalidators.LLMValidatorTypeEditorialReview)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
package meaning_reversal_review
|
||||
|
||||
import (
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/framework/contracts"
|
||||
frameworkvalidators "gitea.maximumdirect.net/eric/audita/v3/internal/framework/validators"
|
||||
validatormetadata "gitea.maximumdirect.net/eric/audita/v3/internal/validators/metadata"
|
||||
)
|
||||
|
||||
const Key = "meaning_reversal_review"
|
||||
|
||||
func New() (contracts.Validator, error) {
|
||||
func New() (frameworkvalidators.Validator, error) {
|
||||
v, err := frameworkvalidators.NewLLMBackedValidator(Key, frameworkvalidators.LLMValidatorTypeMeaningReversal)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
@@ -3,7 +3,7 @@ package metadata
|
||||
import (
|
||||
"strings"
|
||||
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/framework/contracts"
|
||||
frameworkvalidators "gitea.maximumdirect.net/eric/audita/v3/internal/framework/validators"
|
||||
)
|
||||
|
||||
type ExecutionClass string
|
||||
@@ -37,11 +37,11 @@ var executionClassByKey = map[string]ExecutionClass{
|
||||
}
|
||||
|
||||
type ClassifiedValidator interface {
|
||||
contracts.Validator
|
||||
frameworkvalidators.Validator
|
||||
ExecutionClass() ExecutionClass
|
||||
}
|
||||
|
||||
func ClassOf(v contracts.Validator) ExecutionClass {
|
||||
func ClassOf(v frameworkvalidators.Validator) ExecutionClass {
|
||||
if v == nil {
|
||||
return ExecutionClassDeterministic
|
||||
}
|
||||
@@ -69,7 +69,7 @@ func ClassForKey(key string) ExecutionClass {
|
||||
return class
|
||||
}
|
||||
|
||||
func Wrap(v contracts.Validator, class ExecutionClass) contracts.Validator {
|
||||
func Wrap(v frameworkvalidators.Validator, class ExecutionClass) frameworkvalidators.Validator {
|
||||
if v == nil {
|
||||
return nil
|
||||
}
|
||||
@@ -83,7 +83,7 @@ func Wrap(v contracts.Validator, class ExecutionClass) contracts.Validator {
|
||||
}
|
||||
|
||||
type wrappedValidator struct {
|
||||
contracts.Validator
|
||||
frameworkvalidators.Validator
|
||||
class ExecutionClass
|
||||
}
|
||||
|
||||
|
||||
@@ -4,7 +4,6 @@ import (
|
||||
"context"
|
||||
"testing"
|
||||
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/framework/contracts"
|
||||
frameworkvalidators "gitea.maximumdirect.net/eric/audita/v3/internal/framework/validators"
|
||||
)
|
||||
|
||||
@@ -12,7 +11,7 @@ type unclassifiedValidator struct{}
|
||||
|
||||
func (u unclassifiedValidator) Name() string { return "unclassified" }
|
||||
|
||||
func (u unclassifiedValidator) Validate(_ context.Context, _ contracts.ValidationRequest) (frameworkvalidators.Result, error) {
|
||||
func (u unclassifiedValidator) Validate(_ context.Context, _ frameworkvalidators.Request) (frameworkvalidators.Result, error) {
|
||||
return frameworkvalidators.Result{ValidatorName: u.Name(), Decisions: nil}, nil
|
||||
}
|
||||
|
||||
@@ -22,7 +21,7 @@ type namedUnclassifiedValidator struct {
|
||||
|
||||
func (n namedUnclassifiedValidator) Name() string { return n.name }
|
||||
|
||||
func (n namedUnclassifiedValidator) Validate(_ context.Context, _ contracts.ValidationRequest) (frameworkvalidators.Result, error) {
|
||||
func (n namedUnclassifiedValidator) Validate(_ context.Context, _ frameworkvalidators.Request) (frameworkvalidators.Result, error) {
|
||||
return frameworkvalidators.Result{ValidatorName: n.Name(), Decisions: nil}, nil
|
||||
}
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ package validators_test
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/framework/contracts"
|
||||
frameworkvalidators "gitea.maximumdirect.net/eric/audita/v3/internal/framework/validators"
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/modules/glossary"
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/modules/grammar"
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/modules/homophones"
|
||||
@@ -20,30 +20,30 @@ func TestProductionModulesUseRegisteredValidatorKeys(t *testing.T) {
|
||||
|
||||
cases := []struct {
|
||||
name string
|
||||
build func() ([]contracts.Validator, error)
|
||||
build func() ([]frameworkvalidators.Validator, error)
|
||||
}{
|
||||
{name: "glossary", build: func() ([]contracts.Validator, error) {
|
||||
{name: "glossary", build: func() ([]frameworkvalidators.Validator, error) {
|
||||
m, err := glossary.New()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return m.Validators(), nil
|
||||
}},
|
||||
{name: "homophones", build: func() ([]contracts.Validator, error) {
|
||||
{name: "homophones", build: func() ([]frameworkvalidators.Validator, error) {
|
||||
m, err := homophones.New()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return m.Validators(), nil
|
||||
}},
|
||||
{name: "spoken_word", build: func() ([]contracts.Validator, error) {
|
||||
{name: "spoken_word", build: func() ([]frameworkvalidators.Validator, error) {
|
||||
m, err := spoken_word.New()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return m.Validators(), nil
|
||||
}},
|
||||
{name: "grammar", build: func() ([]contracts.Validator, error) {
|
||||
{name: "grammar", build: func() ([]frameworkvalidators.Validator, error) {
|
||||
m, err := grammar.New()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
package no_effect
|
||||
|
||||
import (
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/framework/contracts"
|
||||
frameworkvalidators "gitea.maximumdirect.net/eric/audita/v3/internal/framework/validators"
|
||||
validatormetadata "gitea.maximumdirect.net/eric/audita/v3/internal/validators/metadata"
|
||||
)
|
||||
|
||||
const Key = "no_effect"
|
||||
|
||||
func New() (contracts.Validator, error) {
|
||||
func New() (frameworkvalidators.Validator, error) {
|
||||
return validatormetadata.Wrap(frameworkvalidators.NoEffectValidator{}, validatormetadata.ExecutionClassDeterministic), nil
|
||||
}
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
package non_empty_resulting_segment
|
||||
|
||||
import (
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/framework/contracts"
|
||||
frameworkvalidators "gitea.maximumdirect.net/eric/audita/v3/internal/framework/validators"
|
||||
validatormetadata "gitea.maximumdirect.net/eric/audita/v3/internal/validators/metadata"
|
||||
)
|
||||
|
||||
const Key = "non_empty_resulting_segment"
|
||||
|
||||
func New() (contracts.Validator, error) {
|
||||
func New() (frameworkvalidators.Validator, error) {
|
||||
return validatormetadata.Wrap(frameworkvalidators.NonEmptyResultingSegmentValidator{}, validatormetadata.ExecutionClassDeterministic), nil
|
||||
}
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
package original_text_presence
|
||||
|
||||
import (
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/framework/contracts"
|
||||
frameworkvalidators "gitea.maximumdirect.net/eric/audita/v3/internal/framework/validators"
|
||||
validatormetadata "gitea.maximumdirect.net/eric/audita/v3/internal/validators/metadata"
|
||||
)
|
||||
|
||||
const Key = "original_text_presence"
|
||||
|
||||
func New() (contracts.Validator, error) {
|
||||
func New() (frameworkvalidators.Validator, error) {
|
||||
return validatormetadata.Wrap(frameworkvalidators.OriginalTextPresenceValidator{}, validatormetadata.ExecutionClassDeterministic), nil
|
||||
}
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
package proposal_shape
|
||||
|
||||
import (
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/framework/contracts"
|
||||
frameworkvalidators "gitea.maximumdirect.net/eric/audita/v3/internal/framework/validators"
|
||||
validatormetadata "gitea.maximumdirect.net/eric/audita/v3/internal/validators/metadata"
|
||||
)
|
||||
|
||||
const Key = "proposal_shape"
|
||||
|
||||
func New() (contracts.Validator, error) {
|
||||
func New() (frameworkvalidators.Validator, error) {
|
||||
return validatormetadata.Wrap(frameworkvalidators.ProposalShapeValidator{}, validatormetadata.ExecutionClassDeterministic), nil
|
||||
}
|
||||
|
||||
@@ -3,14 +3,13 @@ package protected_terms
|
||||
import (
|
||||
"context"
|
||||
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/framework/contracts"
|
||||
frameworkvalidators "gitea.maximumdirect.net/eric/audita/v3/internal/framework/validators"
|
||||
validatormetadata "gitea.maximumdirect.net/eric/audita/v3/internal/validators/metadata"
|
||||
)
|
||||
|
||||
const Key = "protected_terms"
|
||||
|
||||
func New() (contracts.Validator, error) {
|
||||
func New() (frameworkvalidators.Validator, error) {
|
||||
return validatormetadata.Wrap(validator{}, validatormetadata.ExecutionClassDeterministic), nil
|
||||
}
|
||||
|
||||
@@ -18,6 +17,6 @@ type validator struct{}
|
||||
|
||||
func (v validator) Name() string { return Key }
|
||||
|
||||
func (v validator) Validate(_ context.Context, req contracts.ValidationRequest) (frameworkvalidators.Result, error) {
|
||||
func (v validator) Validate(_ context.Context, req frameworkvalidators.Request) (frameworkvalidators.Result, error) {
|
||||
return frameworkvalidators.ValidateProtectedTerms(req)
|
||||
}
|
||||
|
||||
@@ -6,7 +6,6 @@ import (
|
||||
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/core/glossary"
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/core/schema"
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/framework/contracts"
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/framework/proposals"
|
||||
frameworkvalidators "gitea.maximumdirect.net/eric/audita/v3/internal/framework/validators"
|
||||
validatormetadata "gitea.maximumdirect.net/eric/audita/v3/internal/validators/metadata"
|
||||
@@ -50,7 +49,7 @@ func TestNewUsesGeneralBehaviorForGlossaryModule(t *testing.T) {
|
||||
t.Fatalf("New: %v", err)
|
||||
}
|
||||
|
||||
req := contracts.ValidationRequest{
|
||||
req := frameworkvalidators.Request{
|
||||
ModuleKey: "glossary",
|
||||
Glossary: tinyGlossary(),
|
||||
CandidateProposal: []proposals.EnrichedCorrectionProposal{
|
||||
@@ -78,7 +77,7 @@ func TestNewRejectsProtectedTermChangeOutsideGlossaryStage(t *testing.T) {
|
||||
t.Fatalf("New: %v", err)
|
||||
}
|
||||
|
||||
req := contracts.ValidationRequest{
|
||||
req := frameworkvalidators.Request{
|
||||
WorkingTranscript: &schema.Transcript{Segments: []schema.Segment{{ID: 1, Text: "Jesters"}}},
|
||||
ReplacementPolicy: proposals.ReplacementPolicyRequireUnique,
|
||||
ModuleKey: "homophones",
|
||||
@@ -115,7 +114,7 @@ func TestNewGlossaryStageRejectsProtectedTermChange(t *testing.T) {
|
||||
t.Fatalf("expected deterministic class, got %q", got)
|
||||
}
|
||||
|
||||
req := contracts.ValidationRequest{
|
||||
req := frameworkvalidators.Request{
|
||||
WorkingTranscript: &schema.Transcript{Segments: []schema.Segment{{ID: 1, Text: "Jesters"}}},
|
||||
ReplacementPolicy: proposals.ReplacementPolicyRequireUnique,
|
||||
ModuleKey: "glossary",
|
||||
@@ -146,7 +145,7 @@ func TestNewGlossaryStageAllowsProtectedTermInsertion(t *testing.T) {
|
||||
t.Fatalf("New: %v", err)
|
||||
}
|
||||
|
||||
req := contracts.ValidationRequest{
|
||||
req := frameworkvalidators.Request{
|
||||
WorkingTranscript: &schema.Transcript{Segments: []schema.Segment{{ID: 1, Text: "gestures"}}},
|
||||
ReplacementPolicy: proposals.ReplacementPolicyRequireUnique,
|
||||
ModuleKey: "glossary",
|
||||
|
||||
@@ -2,9 +2,9 @@ package validators
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
frameworkvalidators "gitea.maximumdirect.net/eric/audita/v3/internal/framework/validators"
|
||||
"strings"
|
||||
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/framework/contracts"
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/validators/editorial_review"
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/validators/meaning_reversal_review"
|
||||
validatormetadata "gitea.maximumdirect.net/eric/audita/v3/internal/validators/metadata"
|
||||
@@ -30,7 +30,7 @@ const (
|
||||
|
||||
type BuiltInValidatorDefinition struct {
|
||||
Key string
|
||||
Build func() (contracts.Validator, error)
|
||||
Build func() (frameworkvalidators.Validator, error)
|
||||
}
|
||||
|
||||
type Registry struct {
|
||||
@@ -64,7 +64,7 @@ func (r *Registry) Lookup(key string) (BuiltInValidatorDefinition, bool) {
|
||||
return def, ok
|
||||
}
|
||||
|
||||
func (r *Registry) MustBuild(key string) (contracts.Validator, error) {
|
||||
func (r *Registry) MustBuild(key string) (frameworkvalidators.Validator, error) {
|
||||
if r == nil {
|
||||
return nil, fmt.Errorf("validator registry is nil")
|
||||
}
|
||||
|
||||
@@ -2,12 +2,12 @@ package validators
|
||||
|
||||
import (
|
||||
"context"
|
||||
frameworkvalidators "gitea.maximumdirect.net/eric/audita/v3/internal/framework/validators"
|
||||
"testing"
|
||||
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/core/glossary"
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/core/modulecatalog"
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/core/schema"
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/framework/contracts"
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/framework/proposals"
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/validators/editorial_review"
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/validators/meaning_reversal_review"
|
||||
@@ -50,7 +50,7 @@ func TestBuiltInValidatorPackagesConstruct(t *testing.T) {
|
||||
type validatorCtor struct {
|
||||
name string
|
||||
key string
|
||||
build func() (contracts.Validator, error)
|
||||
build func() (frameworkvalidators.Validator, error)
|
||||
wantClass validatormetadata.ExecutionClass
|
||||
}
|
||||
cases := []validatorCtor{
|
||||
@@ -117,7 +117,7 @@ func TestRegistryProtectedTermsUsesNonGlossaryStageBehavior(t *testing.T) {
|
||||
t.Fatalf("must build protected_terms: %v", err)
|
||||
}
|
||||
|
||||
req := contracts.ValidationRequest{
|
||||
req := frameworkvalidators.Request{
|
||||
ModuleKey: "glossary",
|
||||
Glossary: []glossary.Entry{{Collection: "party", ID: "jesters", Name: "Jesters", Category: "faction", Description: "Protected"}},
|
||||
CandidateProposal: []proposals.EnrichedCorrectionProposal{
|
||||
@@ -152,7 +152,7 @@ func TestResolveBuiltInChainUsesGlossaryStageProtectedTermsBehavior(t *testing.T
|
||||
t.Fatalf("resolve glossary chain: %v", err)
|
||||
}
|
||||
|
||||
var v contracts.Validator
|
||||
var v frameworkvalidators.Validator
|
||||
for _, candidate := range chain {
|
||||
if candidate.Name() == KeyProtectedTerms {
|
||||
v = candidate
|
||||
@@ -163,7 +163,7 @@ func TestResolveBuiltInChainUsesGlossaryStageProtectedTermsBehavior(t *testing.T
|
||||
t.Fatalf("expected protected_terms validator in glossary chain")
|
||||
}
|
||||
|
||||
req := contracts.ValidationRequest{
|
||||
req := frameworkvalidators.Request{
|
||||
WorkingTranscript: &schema.Transcript{Segments: []schema.Segment{{ID: 1, Text: "Jesters"}}},
|
||||
ReplacementPolicy: proposals.ReplacementPolicyReplaceAll,
|
||||
ModuleKey: "glossary",
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
package spoken_form_plausibility
|
||||
|
||||
import (
|
||||
"gitea.maximumdirect.net/eric/audita/v3/internal/framework/contracts"
|
||||
frameworkvalidators "gitea.maximumdirect.net/eric/audita/v3/internal/framework/validators"
|
||||
validatormetadata "gitea.maximumdirect.net/eric/audita/v3/internal/validators/metadata"
|
||||
)
|
||||
|
||||
const Key = "spoken_form_plausibility"
|
||||
|
||||
func New() (contracts.Validator, error) {
|
||||
func New() (frameworkvalidators.Validator, error) {
|
||||
v, err := frameworkvalidators.NewLLMBackedValidator(Key, frameworkvalidators.LLMValidatorTypeSpokenFormPlausibility)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
Reference in New Issue
Block a user