Materialize effective campaign and session inputs
This commit is contained in:
@@ -95,3 +95,36 @@ func TestRemoteSessionResourceBaseIgnoresDiagnosticLabel(t *testing.T) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestEquivalentDocumentLayoutsRenderIdentically(t *testing.T) {
|
||||
dir := t.TempDir()
|
||||
firstCampaign := writePipelineFixture(t, dir, "first-campaign.yml", "campaign_id: sample\ninputs: {speakers_file: shared/speakers.yml}\n")
|
||||
secondCampaign := writePipelineFixture(t, dir, "second-campaign.yml", "config:\n imports:\n - path: shared/campaign.yml\ncampaign_id: sample\n")
|
||||
writePipelineFixture(t, dir, "shared/campaign.yml", "inputs: {speakers_file: speakers.yml}\n")
|
||||
firstSession := writePipelineFixture(t, dir, "first-session.yml", "session_id: sample\ninputs: {audio_dir: shared/audio}\n")
|
||||
secondSession := writePipelineFixture(t, dir, "second-session.yml", "config:\n imports:\n - path: shared/session.yml\nsession_id: sample\n")
|
||||
writePipelineFixture(t, dir, "shared/session.yml", "inputs: {audio_dir: audio}\n")
|
||||
var campaigns, sessions [2][]byte
|
||||
for i, files := range [][2]string{{firstCampaign, firstSession}, {secondCampaign, secondSession}} {
|
||||
campaign, err := LoadCampaign(files[0])
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
session, err := LoadSession(files[1])
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
cfg := &Config{Campaign: campaign, Session: session, CampaignDocument: campaign, SessionDocument: session}
|
||||
campaigns[i], err = RenderCampaignDocument(cfg)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
sessions[i], err = RenderSessionDocument(cfg, "sample")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
if string(campaigns[0]) != string(campaigns[1]) || string(sessions[0]) != string(sessions[1]) {
|
||||
t.Fatalf("equivalent documents differ: %q / %q; %q / %q", campaigns[0], campaigns[1], sessions[0], sessions[1])
|
||||
}
|
||||
}
|
||||
|
||||
70
internal/config/document_render.go
Normal file
70
internal/config/document_render.go
Normal file
@@ -0,0 +1,70 @@
|
||||
package config
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"gopkg.in/yaml.v3"
|
||||
)
|
||||
|
||||
type renderedCampaignInputs struct {
|
||||
SpeakersFile string `yaml:"speakers_file,omitempty"`
|
||||
AutocorrectFile string `yaml:"autocorrect_file,omitempty"`
|
||||
GlossaryFile string `yaml:"glossary_file,omitempty"`
|
||||
PartyFile string `yaml:"party_file,omitempty"`
|
||||
SpellCatalogFile string `yaml:"spell_catalog_file,omitempty"`
|
||||
}
|
||||
|
||||
// RenderCampaignDocument serializes the loaded effective campaign document.
|
||||
func RenderCampaignDocument(cfg *Config) ([]byte, error) {
|
||||
if cfg == nil {
|
||||
return nil, fmt.Errorf("campaign document is required")
|
||||
}
|
||||
doc := cfg.CampaignDocument
|
||||
if doc == nil {
|
||||
doc = cfg.Campaign
|
||||
}
|
||||
if doc == nil {
|
||||
return nil, fmt.Errorf("campaign document is required")
|
||||
}
|
||||
value := struct {
|
||||
CampaignID string `yaml:"campaign_id"`
|
||||
SessionTemplateFile string `yaml:"session_template_file,omitempty"`
|
||||
Inputs renderedCampaignInputs `yaml:"inputs"`
|
||||
}{doc.CampaignID, doc.SessionTemplateFile, renderedCampaignInputs{
|
||||
doc.Inputs.SpeakersFile, doc.Inputs.AutocorrectFile, doc.Inputs.GlossaryFile, doc.Inputs.PartyFile, doc.Inputs.SpellCatalogFile,
|
||||
}}
|
||||
return yaml.Marshal(value)
|
||||
}
|
||||
|
||||
// RenderSessionDocument serializes the session's own fields and actual identity.
|
||||
func RenderSessionDocument(cfg *Config, sessionID string) ([]byte, error) {
|
||||
if cfg == nil || cfg.Session == nil {
|
||||
return nil, fmt.Errorf("session document is required")
|
||||
}
|
||||
doc := cfg.SessionDocument
|
||||
if doc == nil {
|
||||
doc = cfg.Session
|
||||
}
|
||||
id := cfg.Session.SessionID
|
||||
if id == "" {
|
||||
id = sessionID
|
||||
}
|
||||
inputs := struct {
|
||||
AudioDir string `yaml:"audio_dir,omitempty"`
|
||||
AudioFiles []string `yaml:"audio_files,omitempty"`
|
||||
AudioS3 *SessionAudioS3Input `yaml:"audio_s3,omitempty"`
|
||||
SpeakersFile string `yaml:"speakers_file,omitempty"`
|
||||
AutocorrectFile string `yaml:"autocorrect_file,omitempty"`
|
||||
GlossaryFile string `yaml:"glossary_file,omitempty"`
|
||||
SpellCatalogFile string `yaml:"spell_catalog_file,omitempty"`
|
||||
}{doc.Inputs.AudioDir, doc.Inputs.AudioFiles, doc.Inputs.AudioS3, doc.Inputs.SpeakersFile, doc.Inputs.AutocorrectFile, doc.Inputs.GlossaryFile, doc.Inputs.SpellCatalogFile}
|
||||
value := struct {
|
||||
SessionID string `yaml:"session_id"`
|
||||
PreviousSessionID string `yaml:"previous_session_id,omitempty"`
|
||||
Campaign string `yaml:"campaign,omitempty"`
|
||||
Date string `yaml:"date,omitempty"`
|
||||
Title string `yaml:"title,omitempty"`
|
||||
Inputs any `yaml:"inputs"`
|
||||
}{id, cfg.Session.PreviousSessionID, cfg.Session.Campaign, doc.Date, doc.Title, inputs}
|
||||
return yaml.Marshal(value)
|
||||
}
|
||||
Reference in New Issue
Block a user