Complete assembled validation and migrate remaining tests

2026-11-10 18:13:12 +00:00
parent ba1d5d2367
commit 2844ce7e6a
44 changed files with 577 additions and 1624 deletions
--- a/internal/framework/proposal_generation/adapter_integration_test.go
+++ b/internal/framework/proposal_generation/adapter_integration_test.go
@@ -4,73 +4,74 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"io"
 	"net/http"
-	"net/http/httptest"
 	"os"
 	"path/filepath"
+	"strings"
 	"testing"

-	ck "gitea.maximumdirect.net/eric/ConfigKit"
 	"gitea.maximumdirect.net/eric/audita/v3/internal/core/config"
 	"gitea.maximumdirect.net/eric/audita/v3/internal/core/schema"
 	"gitea.maximumdirect.net/eric/audita/v3/internal/framework/llm"
 	"gitea.maximumdirect.net/eric/audita/v3/internal/framework/proposals"
 	"gitea.maximumdirect.net/eric/audita/v3/internal/framework/validators"
 	"gitea.maximumdirect.net/eric/audita/v3/internal/prompts"
+	ck "go.maximumdirect.net/configkit"
 )

+type proposalTransport func(*http.Request) (*http.Response, error)
+
+func (f proposalTransport) RoundTrip(r *http.Request) (*http.Response, error) { return f(r) }
+
 func TestRepairedProposalStillFacesDomainChecks(t *testing.T) {
 	calls := 0
 	outputs := []string{`{"wrong":true}`, `{"corrections":[{"id":1,"original_text":"absent","corrected_text":"present","confidence":0.4}]}`}
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	transport := proposalTransport(func(r *http.Request) (*http.Response, error) {
 		output := outputs[len(outputs)-1]
 		if calls < len(outputs) {
 			output = outputs[calls]
 		}
 		calls++
 		content, _ := json.Marshal(output)
-		_, _ = fmt.Fprintf(w, `{"choices":[{"message":{"content":%s}}]}`, content)
-	}))
-	defer server.Close()
+		body := fmt.Sprintf(`{"choices":[{"message":{"content":%s}}]}`, content)
+		return &http.Response{StatusCode: 200, Header: make(http.Header), Body: io.NopCloser(strings.NewReader(body)), Request: r}, nil
+	})
 	dir := t.TempDir()
-	if err := os.Mkdir(filepath.Join(dir, "profiles"), 0700); err != nil {
-		t.Fatal(err)
-	}
 	main := filepath.Join(dir, "config.yml")
-	content := fmt.Sprintf("version: 2\nbackends:\n  offline:\n    endpoint: %s/v1\nllm:\n  proposal_profile: base\n  transient_retries: 0\n  repair_attempts: 1\n", server.URL)
-	if err := os.WriteFile(main, []byte(content), 0600); err != nil {
+	if err := os.WriteFile(main, []byte("version: 3\n"), 0600); err != nil {
 		t.Fatal(err)
 	}
-	if err := os.WriteFile(filepath.Join(dir, "profiles", "base.yaml"), []byte("profiles:\n  base:\n    backend: offline\n    model: local-model\n"), 0600); err != nil {
+	if err := os.WriteFile(filepath.Join(dir, "prompts.yml"), []byte("profiles:\n  - {id: base, endpoint: 'https://example.invalid/v1', model: local-model, api_key_required: false}\n"), 0600); err != nil {
 		t.Fatal(err)
 	}
-	loaded, err := config.Load(ck.File(main), "")
+	loaded, err := config.Load(ck.Input{Source: ck.File(main)}, "")
 	if err != nil {
 		t.Fatal(err)
 	}
-	runtime, err := llm.NewRuntime(context.Background(), loaded.Config, main, server.Client())
+	runtime, err := llm.NewRuntime(context.Background(), loaded, &http.Client{Transport: transport})
 	if err != nil {
 		t.Fatal(err)
 	}
-	client, err := runtime.NewRoleClient("proposal", llm.CallHooks{})
+	settings := loaded.Config.LLM
+	settings.TransientRetries, settings.RepairAttempts = 0, 1
+	client, err := runtime.NewRoleClient("proposal", "base", settings, llm.CallHooks{})
 	if err != nil {
 		t.Fatal(err)
 	}
 	transcript := &schema.Transcript{Segments: []schema.Segment{{ID: 1, Speaker: "A", Start: 0, End: 1, Text: "gestures"}}}
-	vars, err := BuildProposalVariables(transcript, &schema.Glossary{}, 0, "")
+	vars, err := BuildProposalVariables(transcript, nil, 0, "")
 	if err != nil {
 		t.Fatal(err)
 	}
-	generated, err := GenerateCandidates(context.Background(), Request{WorkingTranscript: transcript, ModuleKey: "grammar", ModuleInstance: "grammar", ReplacementPolicy: proposals.ReplacementPolicyRequireUnique, Config: &loaded.Config, PromptID: prompts.PromptIDModuleGrammarProposal, PromptVersion: prompts.VersionV1, Variables: vars, LLMClient: client})
+	generated, err := GenerateCandidates(context.Background(), Request{WorkingTranscript: transcript, ModuleKey: "grammar", ModuleInstance: "grammar", ReplacementPolicy: proposals.ReplacementPolicyRequireUnique, PromptID: prompts.PromptIDModuleGrammarProposal, Variables: vars, LLMClient: client})
 	if err != nil {
 		t.Fatal(err)
 	}
 	if calls != 2 || len(generated.Enriched) != 1 {
 		t.Fatalf("repair path: calls=%d, result=%+v", calls, generated)
 	}
-	cfg := loaded.Config
-	cfg.Thresholds.Grammar = .8
-	input := validators.Request{ModuleKey: "grammar", Config: &cfg, CandidateProposal: generated.Enriched, WorkingTranscript: transcript}
+	input := validators.Request{ModuleKey: "grammar", Settings: config.Stage{ConfidenceThreshold: .8}, CandidateProposal: generated.Enriched, WorkingTranscript: transcript}
 	low, err := (validators.ConfidenceThresholdValidator{}).Validate(context.Background(), input)
 	if err != nil {
 		t.Fatal(err)
--- a/internal/framework/proposal_generation/generate_test.go
+++ b/internal/framework/proposal_generation/generate_test.go
@@ -10,8 +10,6 @@ import (
 	"strings"
 	"testing"

-	ck "gitea.maximumdirect.net/eric/ConfigKit"
-	"gitea.maximumdirect.net/eric/audita/v3/internal/core/config"
 	"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/outcomes"
@@ -21,6 +19,7 @@ import (
 )

 type fakeStructuredClient struct {
+	secrets    []string
 	responses  []StructuredCorrectionSet
 	err        error
 	completion contracts.StructuredCompletionResponse
@@ -51,6 +50,8 @@ func (f *fakeStructuredClient) CompleteStructured(ctx context.Context, req contr
 	return response, nil
 }

+func (f *fakeStructuredClient) ConfiguredSecrets(context.Context) []string { return f.secrets }
+
 type captureDiagnosticsWriter struct {
 	err                 error
 	lastStage           string
@@ -69,14 +70,11 @@ func (w *captureDiagnosticsWriter) WriteInteraction(stage string, requestMetadat

 func defaultRequest(t *testing.T) Request {
 	t.Helper()
-	cfg := config.Config{}
 	return Request{
 		ModuleKey:         "test_module",
 		ModuleInstance:    "test_module",
 		ReplacementPolicy: proposals.ReplacementPolicyRequireUnique,
-		Config:            &cfg,
 		PromptID:          "modules.grammar.proposal",
-		PromptVersion:     "v1",
 		Variables:         map[string]string{"SectionJSON": "[]"},
 		WorkingTranscript: &schema.Transcript{Segments: []schema.Segment{{ID: 7, Text: "teh"}, {ID: 25, Text: "other"}}},
 		StartIndex:        0,
@@ -323,13 +321,8 @@ func TestGenerateCandidatesDiagnosticsWrittenAndRedacted(t *testing.T) {
 	}
 	t.Setenv("PRIMARY_SECRET", primarySecret)
 	t.Setenv("VALIDATION_SECRET", validationSecret)
-	loaded, loadErr := config.Load(ck.Bytes("config.yml", []byte("version: 2\nbackends:\n  primary:\n    endpoint: https://primary.invalid/v1\n    credential: PRIMARY_SECRET\n  validation:\n    endpoint: https://validation.invalid/v1\n    credential: VALIDATION_SECRET\nllm:\n  proposal_profile: base\n")), "")
-	if loadErr != nil {
-		t.Fatal(loadErr)
-	}
-	cfg := loaded.Config
+	client.secrets = []string{primarySecret, validationSecret}
 	req := defaultRequest(t)
-	req.Config = &cfg
 	req.LLMClient = client
 	req.DiagnosticsDir = t.TempDir()
 	req.Variables = map[string]string{"SectionJSON": "include secret " + primarySecret}
--- a/internal/framework/proposal_generation/module_proposal_test.go
+++ b/internal/framework/proposal_generation/module_proposal_test.go
@@ -4,9 +4,11 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"reflect"
 	"testing"

 	"gitea.maximumdirect.net/eric/audita/v3/internal/core/config"
+	domain "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/outcomes"
@@ -22,20 +24,20 @@ func TestExecuteModuleProposalBuildsMessagesFromSectionAndDescription(t *testing
 		},
 	}
 	section := contracts.SectionMetadata{Index: 7}
-	cfg := config.Config{}
+	cfg := config.Stage{}
 	cfg.Context.Description = "Hearing transcript with role titles."
 	transcript := &schema.Transcript{Segments: []schema.Segment{{ID: 1, Speaker: "A", Start: 0, End: 1, Text: "teh"}}}
-	glossary := &schema.Glossary{Entries: []schema.GlossaryEntry{{Name: "X"}}}
+	glossary := []domain.Entry{{ID: "x", Name: "X"}}

 	var gotSectionIndex int
 	var gotDescription string
 	var gotTranscript *schema.Transcript
-	var gotGlossary *schema.Glossary
+	var gotGlossary []domain.Entry

 	out, err := ExecuteModuleProposal(context.Background(), ModuleProposalRequest{
 		ProposalRequest: contracts.ProposalRequest{
 			ExecutionContext: contracts.ExecutionContext{
-				Config:            &cfg,
+				Settings:          cfg,
 				WorkingTranscript: transcript,
 				Glossary:          glossary,
 				Section:           &section,
@@ -48,7 +50,7 @@ func TestExecuteModuleProposalBuildsMessagesFromSectionAndDescription(t *testing
 			LLMClient: client,
 		},
 		PromptID: prompts.PromptIDModuleGrammarProposal,
-		BuildVariables: func(inTranscript *schema.Transcript, inGlossary *schema.Glossary, sectionIndex int, transcriptDescription string) (map[string]string, error) {
+		BuildVariables: func(inTranscript *schema.Transcript, inGlossary []domain.Entry, sectionIndex int, transcriptDescription string) (map[string]string, error) {
 			gotSectionIndex = sectionIndex
 			gotDescription = transcriptDescription
 			gotTranscript = inTranscript
@@ -68,8 +70,8 @@ func TestExecuteModuleProposalBuildsMessagesFromSectionAndDescription(t *testing
 	if gotTranscript != transcript {
 		t.Fatalf("expected shared transcript pointer")
 	}
-	if gotGlossary != glossary {
-		t.Fatalf("expected shared glossary pointer")
+	if !reflect.DeepEqual(gotGlossary, glossary) {
+		t.Fatalf("expected glossary entries")
 	}
 	if len(client.calls) != 1 || client.calls[0].PromptID != prompts.PromptIDModuleGrammarProposal || client.calls[0].Context.SectionIndex == nil || *client.calls[0].Context.SectionIndex != 7 {
 		t.Fatalf("unexpected stage name calls: %+v", client.calls)
@@ -85,7 +87,7 @@ func TestExecuteModuleProposalValidatesInputs(t *testing.T) {
 	}

 	_, err := ExecuteModuleProposal(context.Background(), ModuleProposalRequest{
-		BuildVariables: func(transcript *schema.Transcript, glossary *schema.Glossary, sectionIndex int, transcriptDescription string) (map[string]string, error) {
+		BuildVariables: func(transcript *schema.Transcript, glossary []domain.Entry, sectionIndex int, transcriptDescription string) (map[string]string, error) {
 			return nil, nil
 		},
 	})
@@ -95,7 +97,7 @@ func TestExecuteModuleProposalValidatesInputs(t *testing.T) {

 	_, err = ExecuteModuleProposal(context.Background(), ModuleProposalRequest{
 		PromptID: "missing.prompt.id",
-		BuildVariables: func(transcript *schema.Transcript, glossary *schema.Glossary, sectionIndex int, transcriptDescription string) (map[string]string, error) {
+		BuildVariables: func(transcript *schema.Transcript, glossary []domain.Entry, sectionIndex int, transcriptDescription string) (map[string]string, error) {
 			return map[string]string{"SectionJSON": "[]"}, nil
 		},
 	})
@@ -108,7 +110,7 @@ func TestExecuteModuleProposalPropagatesBuilderError(t *testing.T) {
 	wantErr := errors.New("builder failed")
 	_, err := ExecuteModuleProposal(context.Background(), ModuleProposalRequest{
 		PromptID: prompts.PromptIDModuleGlossaryProposal,
-		BuildVariables: func(transcript *schema.Transcript, glossary *schema.Glossary, sectionIndex int, transcriptDescription string) (map[string]string, error) {
+		BuildVariables: func(transcript *schema.Transcript, glossary []domain.Entry, sectionIndex int, transcriptDescription string) (map[string]string, error) {
 			return nil, wantErr
 		},
 	})
@@ -128,7 +130,7 @@ func TestExecuteModuleProposalPreservesFatalOperation(t *testing.T) {
 			LLMClient:        client,
 		},
 		PromptID: prompts.PromptIDModuleGrammarProposal,
-		BuildVariables: func(*schema.Transcript, *schema.Glossary, int, string) (map[string]string, error) {
+		BuildVariables: func(*schema.Transcript, []domain.Entry, int, string) (map[string]string, error) {
 			return map[string]string{"SectionJSON": "[]"}, nil
 		},
 	})
--- a/internal/framework/proposal_generation/variables_test.go
+++ b/internal/framework/proposal_generation/variables_test.go
@@ -4,12 +4,13 @@ import (
 	"strings"
 	"testing"

+	domain "gitea.maximumdirect.net/eric/audita/v3/internal/core/glossary"
 	"gitea.maximumdirect.net/eric/audita/v3/internal/core/schema"
 )

 func TestBuildProposalVariablesPreservesSectionGlossaryAndDescription(t *testing.T) {
 	transcript := &schema.Transcript{Segments: []schema.Segment{{ID: 1, Speaker: "A", Start: 0, End: 1, Text: "gestures"}}}
-	glossary := &schema.Glossary{Entries: []schema.GlossaryEntry{{Name: "Jesters"}}}
+	glossary := []domain.Entry{{ID: "jesters", Name: "Jesters"}}
 	variables, err := BuildProposalVariables(transcript, glossary, 0, "  Fantasy names  ")
 	if err != nil {
 		t.Fatal(err)