eric/notarius
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adopt location registry durable contract

Browse Source
This commit is contained in:
Eric Rakestraw
2026-08-05 19:05:42 +00:00
parent 2f61118e78
commit c006b163d5
41 changed files with 196 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/modules/dnd/validate/locations/identity/validator.go
View File

@@ -22,7 +22,7 @@ const (
type Options struct{}
type Validator struct{}
var _ contracts.TypedValidator[dnd.LocationList] = (*Validator)(nil)
var _ contracts.TypedValidator[dnd.LocationRegistry] = (*Validator)(nil)
var _ pipeline.CheckpointFingerprintProvider = (*Validator)(nil)
func New(Options) *Validator { return &Validator{} }
@@ -34,7 +34,7 @@ func (v *Validator) CheckpointFingerprints() []pipeline.CheckpointFingerprint {
return []pipeline.CheckpointFingerprint{{Name: "policy", Value: policy}}
}
func (v *Validator) Validate(_ context.Context, req contracts.TypedValidationRequest[dnd.LocationList]) (contracts.ValidationResult, error) {
func (v *Validator) Validate(_ context.Context, req contracts.TypedValidationRequest[dnd.LocationRegistry]) (contracts.ValidationResult, error) {
if err := locationshape.Validate(req.Value); err != nil {
return contracts.ValidationResult{Approved: true}, nil
}
@@ -57,7 +57,7 @@ func Spec() pipeline.ValidatorSpec {
}
func Register(registry *pipeline.ValidatorRegistry) error {
return pipeline.RegisterTypedValidatorBuilder(registry, dnd.LocationListKind, Spec(), validateOptions, func(request pipeline.BuildRequest) (contracts.TypedValidator[dnd.LocationList], error) {
return pipeline.RegisterTypedValidatorBuilder(registry, dnd.LocationRegistryKind, Spec(), validateOptions, func(request pipeline.BuildRequest) (contracts.TypedValidator[dnd.LocationRegistry], error) {
options, err := DecodeOptions(request.Options)
if err != nil {
return nil, err

10
internal/modules/dnd/validate/locations/identity/validator_test.go
View File

@@ -16,7 +16,7 @@ import (
func TestValidatorAllowsSameNameAtDistinctEvidence(t *testing.T) {
refs := []source.SourceRef{{SourceID: "session", StartUnitID: 1, EndUnitID: 1}}
otherRefs := []source.SourceRef{{SourceID: "session", StartUnitID: 2, EndUnitID: 2}}
value := dnd.LocationList{Locations: []dnd.Location{
value := dnd.LocationRegistry{Locations: []dnd.Location{
{ID: domainidentity.DeriveID("Watchtower", refs), Name: "Watchtower", SourceRefs: refs},
{ID: domainidentity.DeriveID("Watchtower", otherRefs), Name: "Watchtower", SourceRefs: otherRefs},
}}
@@ -28,12 +28,12 @@ func TestValidatorAllowsSameNameAtDistinctEvidence(t *testing.T) {
}
func TestValidatorDefersShapeAndRejectsDerivationAndDuplicateID(t *testing.T) {
result, err := New(Options{}).Validate(context.Background(), request(dnd.LocationList{Locations: []dnd.Location{{Name: "Missing"}}}))
result, err := New(Options{}).Validate(context.Background(), request(dnd.LocationRegistry{Locations: []dnd.Location{{Name: "Missing"}}}))
if err != nil || !result.Approved {
t.Fatalf("shape-invalid result = %#v, %v; want deferral", result, err)
}
refs := []source.SourceRef{{SourceID: "session", StartUnitID: 1, EndUnitID: 1}}
value := dnd.LocationList{Locations: []dnd.Location{
value := dnd.LocationRegistry{Locations: []dnd.Location{
{ID: "not-an-id", Name: "Gate", SourceRefs: refs},
{ID: domainidentity.DeriveID("Gate", refs), Name: "Other Gate", SourceRefs: refs},
{ID: domainidentity.DeriveID("Gate", refs), Name: "Gate", SourceRefs: refs},
@@ -65,6 +65,6 @@ func TestValidatorRegistersIdentityPolicy(t *testing.T) {
}
}
func request(value dnd.LocationList) contracts.TypedValidationRequest[dnd.LocationList] {
return contracts.TypedValidationRequest[dnd.LocationList]{Value: value}
func request(value dnd.LocationRegistry) contracts.TypedValidationRequest[dnd.LocationRegistry] {
return contracts.TypedValidationRequest[dnd.LocationRegistry]{Value: value}
}

10
internal/modules/dnd/validate/locations/shape/validator.go
View File

@@ -21,7 +21,7 @@ const (
type Options struct{}
type Validator struct{}
var _ contracts.TypedValidator[dnd.LocationList] = (*Validator)(nil)
var _ contracts.TypedValidator[dnd.LocationRegistry] = (*Validator)(nil)
var _ pipeline.CheckpointFingerprintProvider = (*Validator)(nil)
func New(Options) *Validator { return &Validator{} }
@@ -33,7 +33,7 @@ func (v *Validator) CheckpointFingerprints() []pipeline.CheckpointFingerprint {
return []pipeline.CheckpointFingerprint{{Name: "policy", Value: policy}}
}
func (v *Validator) Validate(_ context.Context, req contracts.TypedValidationRequest[dnd.LocationList]) (contracts.ValidationResult, error) {
func (v *Validator) Validate(_ context.Context, req contracts.TypedValidationRequest[dnd.LocationRegistry]) (contracts.ValidationResult, error) {
issues := issuesFor(req.Value)
if len(issues) > 0 {
return rejection(diagnostics.Aggregate("invalid location shape", issues)), nil
@@ -41,7 +41,7 @@ func (v *Validator) Validate(_ context.Context, req contracts.TypedValidationReq
return contracts.ValidationResult{Approved: true}, nil
}
func Validate(value dnd.LocationList) error {
func Validate(value dnd.LocationRegistry) error {
issues := issuesFor(value)
if len(issues) == 0 {
return nil
@@ -49,7 +49,7 @@ func Validate(value dnd.LocationList) error {
return fmt.Errorf("%s", diagnostics.Aggregate("invalid location shape", issues))
}
func issuesFor(value dnd.LocationList) []string {
func issuesFor(value dnd.LocationRegistry) []string {
if value.Locations == nil {
return []string{"locations must be present"}
}
@@ -74,7 +74,7 @@ func Spec() pipeline.ValidatorSpec {
}
func Register(registry *pipeline.ValidatorRegistry) error {
return pipeline.RegisterTypedValidatorBuilder(registry, dnd.LocationListKind, Spec(), validateOptions, func(request pipeline.BuildRequest) (contracts.TypedValidator[dnd.LocationList], error) {
return pipeline.RegisterTypedValidatorBuilder(registry, dnd.LocationRegistryKind, Spec(), validateOptions, func(request pipeline.BuildRequest) (contracts.TypedValidator[dnd.LocationRegistry], error) {
options, err := DecodeOptions(request.Options)
if err != nil {
return nil, err

14
internal/modules/dnd/validate/locations/shape/validator_test.go
View File

@@ -14,7 +14,7 @@ import (
)
func TestValidatorRejectsMissingRequiredFieldsWithoutMutation(t *testing.T) {
value := dnd.LocationList{Locations: []dnd.Location{{Name: strings.Repeat("火", 220), SourceRefs: []source.SourceRef{}}}}
value := dnd.LocationRegistry{Locations: []dnd.Location{{Name: strings.Repeat("火", 220), SourceRefs: []source.SourceRef{}}}}
before := value
result, err := New(Options{}).Validate(context.Background(), requestWithValue(value))
if err != nil || result.Approved || result.ReasonCode != ReasonCode || !strings.Contains(result.Message, "id must not be empty") || !strings.Contains(result.Message, "source_refs must not be empty") {
@@ -23,14 +23,14 @@ func TestValidatorRejectsMissingRequiredFieldsWithoutMutation(t *testing.T) {
if len(result.Message) > 4096 || !utf8.ValidString(result.Message) || !reflect.DeepEqual(value, before) {
t.Fatalf("Validate() produced unsafe diagnostics or mutated value: %#v", value)
}
result, err = New(Options{}).Validate(context.Background(), requestWithValue(dnd.LocationList{}))
result, err = New(Options{}).Validate(context.Background(), requestWithValue(dnd.LocationRegistry{}))
if err != nil || result.Approved || !strings.Contains(result.Message, "locations must be present") {
t.Fatalf("missing locations = %#v, %v; want rejection", result, err)
}
}
func TestValidatorApprovesAndRegisters(t *testing.T) {
result, err := New(Options{}).Validate(context.Background(), requestWithValue(validLocationList()))
result, err := New(Options{}).Validate(context.Background(), requestWithValue(validLocationRegistry()))
if err != nil || !result.Approved {
t.Fatalf("Validate() = %#v, %v; want approval", result, err)
}
@@ -49,10 +49,10 @@ func TestValidatorApprovesAndRegisters(t *testing.T) {
}
}
func requestWithValue(value dnd.LocationList) contracts.TypedValidationRequest[dnd.LocationList] {
return contracts.TypedValidationRequest[dnd.LocationList]{Value: value}
func requestWithValue(value dnd.LocationRegistry) contracts.TypedValidationRequest[dnd.LocationRegistry] {
return contracts.TypedValidationRequest[dnd.LocationRegistry]{Value: value}
}
func validLocationList() dnd.LocationList {
return dnd.LocationList{Locations: []dnd.Location{{ID: "candidate", Name: "Moon Gate", SourceRefs: []source.SourceRef{{SourceID: "session", StartUnitID: 1, EndUnitID: 1}}}}}
func validLocationRegistry() dnd.LocationRegistry {
return dnd.LocationRegistry{Locations: []dnd.Location{{ID: "candidate", Name: "Moon Gate", SourceRefs: []source.SourceRef{{SourceID: "session", StartUnitID: 1, EndUnitID: 1}}}}}
}

6
internal/modules/dnd/validate/locations/source_refs/validator.go
View File

@@ -22,7 +22,7 @@ const (
type Options struct{}
type Validator struct{}
var _ contracts.TypedValidator[dnd.LocationList] = (*Validator)(nil)
var _ contracts.TypedValidator[dnd.LocationRegistry] = (*Validator)(nil)
var _ pipeline.CheckpointFingerprintProvider = (*Validator)(nil)
func New(Options) *Validator { return &Validator{} }
@@ -34,7 +34,7 @@ func (v *Validator) CheckpointFingerprints() []pipeline.CheckpointFingerprint {
return []pipeline.CheckpointFingerprint{{Name: "policy", Value: policy}}
}
func (v *Validator) Validate(_ context.Context, req contracts.TypedValidationRequest[dnd.LocationList]) (contracts.ValidationResult, error) {
func (v *Validator) Validate(_ context.Context, req contracts.TypedValidationRequest[dnd.LocationRegistry]) (contracts.ValidationResult, error) {
if req.Stage == string(pipeline.StageExtract) && req.Chunk == nil {
return contracts.ValidationResult{}, fmt.Errorf("location source-reference validator requires the current extraction chunk")
}
@@ -78,7 +78,7 @@ func Spec() pipeline.ValidatorSpec {
}
func Register(registry *pipeline.ValidatorRegistry) error {
return pipeline.RegisterTypedValidatorBuilder(registry, dnd.LocationListKind, Spec(), validateOptions, func(request pipeline.BuildRequest) (contracts.TypedValidator[dnd.LocationList], error) {
return pipeline.RegisterTypedValidatorBuilder(registry, dnd.LocationRegistryKind, Spec(), validateOptions, func(request pipeline.BuildRequest) (contracts.TypedValidator[dnd.LocationRegistry], error) {
options, err := DecodeOptions(request.Options)
if err != nil {
return nil, err

22
internal/modules/dnd/validate/locations/source_refs/validator_test.go
View File

@@ -14,7 +14,7 @@ import (
)
func TestValidatorRejectsForeignAndOutOfRangeReferencesWithoutMutation(t *testing.T) {
value := validLocationList()
value := validLocationRegistry()
value.Locations[0].SourceRefs = []source.SourceRef{{SourceID: "foreign", StartUnitID: 1, EndUnitID: 1}, {SourceID: "session", StartUnitID: 9, EndUnitID: 9}}
before := value
result, err := New(Options{}).Validate(context.Background(), request(validDocument(), value))
@@ -27,11 +27,11 @@ func TestValidatorRejectsForeignAndOutOfRangeReferencesWithoutMutation(t *testin
}
func TestValidatorApprovesValidReferencesAndDefersMalformedShape(t *testing.T) {
result, err := New(Options{}).Validate(context.Background(), request(validDocument(), validLocationList()))
result, err := New(Options{}).Validate(context.Background(), request(validDocument(), validLocationRegistry()))
if err != nil || !result.Approved {
t.Fatalf("valid references = %#v, %v", result, err)
}
result, err = New(Options{}).Validate(context.Background(), request(nil, dnd.LocationList{Locations: []dnd.Location{{Name: "Missing"}}}))
result, err = New(Options{}).Validate(context.Background(), request(nil, dnd.LocationRegistry{Locations: []dnd.Location{{Name: "Missing"}}}))
if err != nil || !result.Approved || result.ReasonCode != "" {
t.Fatalf("malformed shape = %#v, %v; want deferral", result, err)
}
@@ -39,8 +39,8 @@ func TestValidatorApprovesValidReferencesAndDefersMalformedShape(t *testing.T) {
func TestValidatorRequiresCurrentChunkAndRejectsEvidenceOutsideIt(t *testing.T) {
doc := &source.SourceDocument{ID: "session", Units: []source.SourceUnit{{ID: 1}, {ID: 2}}}
value := validLocationList()
result, err := New(Options{}).Validate(context.Background(), contracts.TypedValidationRequest[dnd.LocationList]{
value := validLocationRegistry()
result, err := New(Options{}).Validate(context.Background(), contracts.TypedValidationRequest[dnd.LocationRegistry]{
Stage: string(pipeline.StageExtract), Source: doc,
Chunk: &source.Chunk{SourceID: "session", Units: []source.SourceUnit{{ID: 1}}}, Value: value,
})
@@ -48,14 +48,14 @@ func TestValidatorRequiresCurrentChunkAndRejectsEvidenceOutsideIt(t *testing.T)
t.Fatalf("contained extraction evidence = %#v, %v", result, err)
}
value.Locations[0].SourceRefs[0].EndUnitID = 2
result, err = New(Options{}).Validate(context.Background(), contracts.TypedValidationRequest[dnd.LocationList]{
result, err = New(Options{}).Validate(context.Background(), contracts.TypedValidationRequest[dnd.LocationRegistry]{
Stage: string(pipeline.StageExtract), Source: doc,
Chunk: &source.Chunk{SourceID: "session", Units: []source.SourceUnit{{ID: 1}}}, Value: value,
})
if err != nil || result.Approved || !strings.Contains(result.Message, "outside the current extraction chunk") {
t.Fatalf("out-of-chunk extraction evidence = %#v, %v", result, err)
}
_, err = New(Options{}).Validate(context.Background(), contracts.TypedValidationRequest[dnd.LocationList]{Stage: string(pipeline.StageExtract), Source: doc, Value: validLocationList()})
_, err = New(Options{}).Validate(context.Background(), contracts.TypedValidationRequest[dnd.LocationRegistry]{Stage: string(pipeline.StageExtract), Source: doc, Value: validLocationRegistry()})
if err == nil || !strings.Contains(err.Error(), "requires the current extraction chunk") {
t.Fatalf("missing chunk error = %v", err)
}
@@ -74,14 +74,14 @@ func TestValidatorRegisters(t *testing.T) {
}
}
func request(doc *source.SourceDocument, value dnd.LocationList) contracts.TypedValidationRequest[dnd.LocationList] {
return contracts.TypedValidationRequest[dnd.LocationList]{Source: doc, Value: value}
func request(doc *source.SourceDocument, value dnd.LocationRegistry) contracts.TypedValidationRequest[dnd.LocationRegistry] {
return contracts.TypedValidationRequest[dnd.LocationRegistry]{Source: doc, Value: value}
}
func validDocument() *source.SourceDocument {
return &source.SourceDocument{ID: "session", Kind: "transcript", Format: "application/json", Digest: "sha256:session", Units: []source.SourceUnit{{ID: 1, Kind: "message", Text: "Moon Gate opens."}}}
}
func validLocationList() dnd.LocationList {
return dnd.LocationList{Locations: []dnd.Location{{ID: "candidate", Name: "Moon Gate", SourceRefs: []source.SourceRef{{SourceID: "session", StartUnitID: 1, EndUnitID: 1}}}}}
func validLocationRegistry() dnd.LocationRegistry {
return dnd.LocationRegistry{Locations: []dnd.Location{{ID: "candidate", Name: "Moon Gate", SourceRefs: []source.SourceRef{{SourceID: "session", StartUnitID: 1, EndUnitID: 1}}}}}
}

6
internal/modules/dnd/validate/locations/source_relatedness/validator.go
View File

@@ -23,7 +23,7 @@ const (
type Options struct{}
type Validator struct{}
var _ contracts.TypedValidator[dnd.LocationList] = (*Validator)(nil)
var _ contracts.TypedValidator[dnd.LocationRegistry] = (*Validator)(nil)
var _ pipeline.CheckpointFingerprintProvider = (*Validator)(nil)
func New(Options) *Validator { return &Validator{} }
@@ -35,7 +35,7 @@ func (v *Validator) CheckpointFingerprints() []pipeline.CheckpointFingerprint {
return []pipeline.CheckpointFingerprint{{Name: "policy", Value: policy}}
}
func (v *Validator) Validate(_ context.Context, req contracts.TypedValidationRequest[dnd.LocationList]) (contracts.ValidationResult, error) {
func (v *Validator) Validate(_ context.Context, req contracts.TypedValidationRequest[dnd.LocationRegistry]) (contracts.ValidationResult, error) {
if err := locationshape.Validate(req.Value); err != nil {
return contracts.ValidationResult{Approved: true}, nil
}
@@ -69,7 +69,7 @@ func Spec() pipeline.ValidatorSpec {
}
func Register(registry *pipeline.ValidatorRegistry) error {
return pipeline.RegisterTypedValidatorBuilder(registry, dnd.LocationListKind, Spec(), validateOptions, func(request pipeline.BuildRequest) (contracts.TypedValidator[dnd.LocationList], error) {
return pipeline.RegisterTypedValidatorBuilder(registry, dnd.LocationRegistryKind, Spec(), validateOptions, func(request pipeline.BuildRequest) (contracts.TypedValidator[dnd.LocationRegistry], error) {
options, err := DecodeOptions(request.Options)
if err != nil {
return nil, err

12
internal/modules/dnd/validate/locations/source_relatedness/validator_test.go
View File

@@ -14,7 +14,7 @@ import (
)
func TestValidatorUsesOnlyCitedTranscriptText(t *testing.T) {
value := dnd.LocationList{Locations: []dnd.Location{{ID: "candidate", Name: "O'Rin's Gate", SourceRefs: []source.SourceRef{{SourceID: "session", StartUnitID: 1, EndUnitID: 1}}}}}
value := dnd.LocationRegistry{Locations: []dnd.Location{{ID: "candidate", Name: "O'Rin's Gate", SourceRefs: []source.SourceRef{{SourceID: "session", StartUnitID: 1, EndUnitID: 1}}}}}
doc := &source.SourceDocument{ID: "session", Kind: "transcript", Format: "application/json", Digest: "sha256:session", Units: []source.SourceUnit{{ID: 1, Kind: "message", Text: "The party enters o’rin’s gate."}, {ID: 2, Kind: "message", Text: "Unrelated location."}}}
result, err := New(Options{}).Validate(context.Background(), request(doc, value, contracts.ReferenceSet{}))
if err != nil || !result.Approved || len(result.Warnings) != 0 {
@@ -30,12 +30,12 @@ func TestValidatorUsesOnlyCitedTranscriptText(t *testing.T) {
}
func TestValidatorDefersMalformedOrUnreadableCitations(t *testing.T) {
invalid := dnd.LocationList{Locations: []dnd.Location{{Name: "Missing"}}}
invalid := dnd.LocationRegistry{Locations: []dnd.Location{{Name: "Missing"}}}
result, err := New(Options{}).Validate(context.Background(), request(document(), invalid, contracts.ReferenceSet{}))
if err != nil || !result.Approved || len(result.Warnings) != 0 {
t.Fatalf("shape deferral = %#v, %v", result, err)
}
value := dnd.LocationList{Locations: []dnd.Location{{ID: "candidate", Name: "Missing", SourceRefs: []source.SourceRef{{SourceID: "session", StartUnitID: 99, EndUnitID: 99}}}}}
value := dnd.LocationRegistry{Locations: []dnd.Location{{ID: "candidate", Name: "Missing", SourceRefs: []source.SourceRef{{SourceID: "session", StartUnitID: 99, EndUnitID: 99}}}}}
result, err = New(Options{}).Validate(context.Background(), request(document(), value, contracts.ReferenceSet{}))
if err != nil || !result.Approved || len(result.Warnings) != 0 {
t.Fatalf("unreadable citation = %#v, %v", result, err)
@@ -60,14 +60,14 @@ func TestValidatorBoundsWarnings(t *testing.T) {
for index := range locations {
locations[index] = dnd.Location{ID: "candidate", Name: "Missing", SourceRefs: []source.SourceRef{{SourceID: "session", StartUnitID: 1, EndUnitID: 1}}}
}
result, err := New(Options{}).Validate(context.Background(), request(document(), dnd.LocationList{Locations: locations}, contracts.ReferenceSet{}))
result, err := New(Options{}).Validate(context.Background(), request(document(), dnd.LocationRegistry{Locations: locations}, contracts.ReferenceSet{}))
if err != nil || !result.Approved || len(result.Warnings) != diagnostics.MaxWarnings || result.Warnings[len(result.Warnings)-1].ReasonCode != OmittedReasonCode {
t.Fatalf("bounded warnings = %#v, %v", result, err)
}
}
func request(doc *source.SourceDocument, value dnd.LocationList, references contracts.ReferenceSet) contracts.TypedValidationRequest[dnd.LocationList] {
return contracts.TypedValidationRequest[dnd.LocationList]{Source: doc, References: references, Value: value}
func request(doc *source.SourceDocument, value dnd.LocationRegistry, references contracts.ReferenceSet) contracts.TypedValidationRequest[dnd.LocationRegistry] {
return contracts.TypedValidationRequest[dnd.LocationRegistry]{Source: doc, References: references, Value: value}
}
func document() *source.SourceDocument {