Share module proposal execution and transcript-section prompt payload helpers

internal/modules/glossary/module.go

@@ -3,11 +3,10 @@ package glossary
 import (
 	"context"
 
-	"gitea.maximumdirect.net/eric/audita/internal/core/schema"
 	"gitea.maximumdirect.net/eric/audita/internal/framework/contracts"
 	"gitea.maximumdirect.net/eric/audita/internal/framework/proposal_generation"
 	"gitea.maximumdirect.net/eric/audita/internal/framework/proposals"
-	"gitea.maximumdirect.net/eric/audita/internal/framework/stagename"
+	"gitea.maximumdirect.net/eric/audita/internal/prompts"
 	builtinvalidators "gitea.maximumdirect.net/eric/audita/internal/validators"
 )
 
@@ -37,62 +36,9 @@ func (m *Module) Validators() []contracts.Validator {
 }
 
 func (m *Module) Propose(ctx context.Context, req contracts.ProposalRequest) (contracts.ProposalResult, error) {
-	sectionTranscript := transcriptForSection(req.WorkingTranscript, req.Section)
-	sectionIndex := 0
-	if req.Section != nil {
-		sectionIndex = req.Section.Index
-	}
-	transcriptDescription := ""
-	if req.Config != nil {
-		transcriptDescription = req.Config.TranscriptDescription
-	}
-	messages, err := BuildProposalMessages(sectionTranscript, req.Glossary, sectionIndex, transcriptDescription)
-	if err != nil {
-		return contracts.ProposalResult{}, err
-	}
-
-	generated, err := proposal_generation.GenerateCandidates(ctx, proposal_generation.Request{
-		ModuleKey:         req.RunSpec.ModuleKey,
-		ModuleInstance:    req.RunSpec.InstanceName,
-		ReplacementPolicy: req.RunSpec.ReplacementPolicy,
-		WorkingTranscript: req.WorkingTranscript,
-		Section:           req.Section,
-		Glossary:          req.Glossary,
-		Config:            req.Config,
-		Messages:          messages,
-		PromptMetadata:    proposalPromptMetadata().DiagnosticsMap(),
-		StageName:         stagename.ModuleProposal(req.RunSpec.InstanceName, sectionIndexPtr(req.Section)),
-		StartIndex:        0,
-		LLMClient:         req.LLMClient,
-		Scheduler:         req.LLMScheduler,
-		DiagnosticsDir:    req.DiagnosticsDir,
+	return proposal_generation.ExecuteModuleProposal(ctx, proposal_generation.ModuleProposalRequest{
+		ProposalRequest: req,
+		PromptID:        prompts.PromptIDModuleGlossaryProposal,
+		BuildMessages:   BuildProposalMessages,
 	})
-	if err != nil {
-		return contracts.ProposalResult{}, err
-	}
-	return contracts.ProposalResult{
-		Proposals: generated.Corrections,
-		Warnings:  generated.Warnings,
-	}, nil
-}
-
-func transcriptForSection(transcript *schema.Transcript, section *contracts.SectionMetadata) *schema.Transcript {
-	if section == nil || transcript == nil {
-		return transcript
-	}
-	segments := make([]schema.Segment, 0, len(transcript.Segments))
-	for _, seg := range transcript.Segments {
-		if seg.ID >= section.StartSegmentID && seg.ID <= section.EndSegmentID {
-			segments = append(segments, seg)
-		}
-	}
-	return &schema.Transcript{Segments: segments}
-}
-
-func sectionIndexPtr(section *contracts.SectionMetadata) *int {
-	if section == nil {
-		return nil
-	}
-	index := section.Index
-	return &index
 }

internal/modules/glossary/prompt.go

@@ -10,43 +10,13 @@ import (
 	"gitea.maximumdirect.net/eric/audita/internal/prompts"
 )
 
-type promptSegment struct {
-	ID         int      `json:"id"`
-	Speaker    string   `json:"speaker"`
-	Start      float64  `json:"start"`
-	End        float64  `json:"end"`
-	Text       string   `json:"text"`
-	Categories []string `json:"categories,omitempty"`
-}
-
-type promptTranscriptSection struct {
-	SectionIndex int             `json:"section_index"`
-	Segments     []promptSegment `json:"segments"`
-}
-
 func BuildProposalMessages(transcript *schema.Transcript, glossary *schema.Glossary, sectionIndex int, transcriptDescription string) ([]contracts.LLMMessage, error) {
 	glossaryJSON, err := json.MarshalIndent(glossary, "", "  ")
 	if err != nil {
 		return nil, fmt.Errorf("marshal glossary prompt context: %w", err)
 	}
 
-	sectionPayload := promptTranscriptSection{
-		SectionIndex: sectionIndex,
-		Segments:     make([]promptSegment, 0),
-	}
-	if transcript != nil {
-		for _, s := range transcript.Segments {
-			sectionPayload.Segments = append(sectionPayload.Segments, promptSegment{
-				ID:         s.ID,
-				Speaker:    s.Speaker,
-				Start:      s.Start,
-				End:        s.End,
-				Text:       s.Text,
-				Categories: append([]string(nil), s.Categories...),
-			})
-		}
-	}
-	sectionJSON, err := json.MarshalIndent(sectionPayload, "", "  ")
+	sectionJSON, err := promptcontext.MarshalTranscriptSectionJSON(transcript, sectionIndex)
 	if err != nil {
 		return nil, fmt.Errorf("marshal transcript prompt context: %w", err)
 	}
@@ -65,7 +35,3 @@ func BuildProposalMessages(transcript *schema.Transcript, glossary *schema.Gloss
 		{Role: "user", Content: user},
 	}, nil
 }
-
-func proposalPromptMetadata() prompts.Metadata {
-	return prompts.MustLookupMetadata(prompts.PromptIDModuleGlossaryProposal)
-}