Initialize standalone sessions from native local authoring context

This commit is contained in:
2026-11-18 04:06:29 +00:00
parent 33d2ebf44c
commit 435ec79185
6 changed files with 126 additions and 12 deletions

View File

@@ -241,16 +241,12 @@ inputs:
t.Fatalf("read generated session: %v", err)
}
got := string(data)
for _, want := range []string{
`session_id: "2026-06-07"`,
`previous_session_id: "2026-05-31"`,
`date: "2026-06-07"`,
`title: "The Black Cabin"`,
`prefix: "audio/"`,
} {
if !strings.Contains(got, want) {
t.Fatalf("generated session = %q, want %q", got, want)
}
generated, err := config.LoadSession(outputPath)
if err != nil {
t.Fatal(err)
}
if generated.SessionID != "2026-06-07" || generated.PreviousSessionID != "2026-05-31" || generated.Date != "2026-06-07" || generated.Title != "The Black Cabin" || generated.Inputs.AudioS3 == nil || generated.Inputs.AudioS3.Prefix != "audio/" {
t.Fatalf("generated session = %#v", generated)
}
if strings.Contains(got, "{{") {
t.Fatalf("generated session still contains template placeholder: %q", got)

View File

@@ -58,6 +58,13 @@ func sessionInitWithDependencies(ctx context.Context, args []string, out io.Writ
if strings.TrimSpace(audioDir) != "" && strings.TrimSpace(audioS3Prefix) != "" {
return fmt.Errorf("session init: --audio-dir and --audio-s3-prefix are mutually exclusive")
}
if strings.TrimSpace(audioDir) != "" {
var err error
audioDir, err = filepath.Abs(audioDir)
if err != nil {
return fmt.Errorf("session init: resolve --audio-dir: %w", err)
}
}
base, err := loadPipelineCampaignConfigWithDependencies(pipelinePath, campaignPath, campaignFilePath, config.PipelineLoadOptions{Overlay: overlay.pointer()}, secretsDir.pointer(), deps)
if err != nil {
@@ -83,7 +90,13 @@ func sessionInitWithDependencies(ctx context.Context, args []string, out io.Writ
if label == "" {
label = "remote session.yml"
}
sessionCfg, err := config.LoadSessionBytesWithOptions(label, data, config.SessionLoadOptions{
// Generated defaults and CLI resources originate at the invocation. A
// configured template supplies its own existing local authoring context.
authoringPath := "session.yml"
if input.TemplateFile != "" {
authoringPath = resolveSessionInitTemplatePath(input.CampaignPath, input.TemplateFile)
}
sessionCfg, err := config.LoadSessionAuthoringBytes(authoringPath, data, config.SessionLoadOptions{
SessionID: sessionID,
PreviousSessionID: previousSessionID,
})
@@ -97,6 +110,10 @@ func sessionInitWithDependencies(ctx context.Context, args []string, out io.Writ
if err := config.Validate(cfg); err != nil {
return fmt.Errorf("session init: %w", err)
}
data, err = config.RenderSessionDocument(cfg, sessionID)
if err != nil {
return fmt.Errorf("session init: render effective session: %w", err)
}
if !remote {
if err := writeLocalFile(output, data, force); err != nil {

View File

@@ -0,0 +1,75 @@
package app
import (
"bytes"
"context"
"os"
"path/filepath"
"testing"
"gitea.maximumdirect.net/eric/narratio/internal/adapters/storage"
"gitea.maximumdirect.net/eric/narratio/internal/artifacts"
"gitea.maximumdirect.net/eric/narratio/internal/config"
)
func TestSessionInitMaterializesLocalTemplateImports(t *testing.T) {
pipeline, campaign, _ := writeValidConfigFiles(t, t.TempDir())
writeSessionInitTemplate(t, campaign, "config:\n imports:\n - path: shared.yml\n required: true\nsession_id: '{{ session_id }}'\ninputs:\n audio_s3: {prefix: audio/}\n")
fragment := filepath.Join(filepath.Dir(campaign), "shared.yml")
mustWriteTestFile(t, fragment, "title: Shared metadata\n")
output := filepath.Join(t.TempDir(), "nested", "session.yml")
if err := sessionInitWithDependencies(context.Background(), []string{"2026-06-07", "--config", pipeline, "--campaign-file", campaign, "--output", output}, &bytes.Buffer{}, commandDependencies{}); err != nil {
t.Fatal(err)
}
if err := os.Remove(fragment); err != nil {
t.Fatal(err)
}
loaded, err := config.LoadSession(output)
if err != nil {
t.Fatal(err)
}
if loaded.Title != "Shared metadata" || loaded.Inputs.SpeakersFile != "" {
t.Fatalf("unexpected standalone session: %#v", loaded)
}
}
func TestSessionInitPublishesStandaloneImportedTemplate(t *testing.T) {
pipeline, campaign, _ := writeValidConfigFiles(t, t.TempDir())
writeSessionInitTemplate(t, campaign, "config:\n imports:\n - path: shared.yml\n required: true\nsession_id: '{{ session_id }}'\ninputs: {audio_s3: {prefix: audio/}}\n")
fragment := filepath.Join(filepath.Dir(campaign), "shared.yml")
mustWriteTestFile(t, fragment, "title: Shared metadata\n")
fake := &storage.FakeBackend{}
if err := sessionInitWithDependencies(context.Background(), []string{"2026-06-07", "--config", pipeline, "--campaign-file", campaign, "--remote"}, &bytes.Buffer{}, restoreCommandDependencies(fake)); err != nil {
t.Fatal(err)
}
key := artifacts.S3SessionConfigKey(artifacts.S3SessionPrefix("dnd", "sample-campaign", "2026-06-07"))
if err := os.Remove(fragment); err != nil {
t.Fatal(err)
}
loaded, err := config.LoadSessionBytesWithOptions("remote session", fake.Objects[key].Data, config.SessionLoadOptions{})
if err != nil {
t.Fatal(err)
}
if loaded.Title != "Shared metadata" {
t.Fatalf("title = %q", loaded.Title)
}
}
func TestSessionInitPersistsInvocationRelativeAudio(t *testing.T) {
pipeline, campaign, _ := writeValidConfigFiles(t, t.TempDir())
output := filepath.Join(t.TempDir(), "nested", "session.yml")
if err := sessionInitWithDependencies(context.Background(), []string{"2026-06-07", "--config", pipeline, "--campaign-file", campaign, "--output", output, "--audio-dir", "./audio"}, &bytes.Buffer{}, commandDependencies{}); err != nil {
t.Fatal(err)
}
loaded, err := config.LoadSession(output)
if err != nil {
t.Fatal(err)
}
want, err := filepath.Abs("./audio")
if err != nil {
t.Fatal(err)
}
if loaded.Inputs.AudioDir != want {
t.Fatalf("audio = %q; want %q", loaded.Inputs.AudioDir, want)
}
}

View File

@@ -84,12 +84,31 @@ func loadCampaignWithConfigKit(path string) (*CampaignConfig, error) {
}
func loadSessionSource(source configkit.Source, label string, opts SessionLoadOptions, imports bool) (*SessionConfig, string, error) {
return loadSessionSourceWithFilesystem(source, label, opts, imports, nil)
}
// LoadSessionAuthoringBytes resolves a rendered local document before moving or
// publishing it. The path supplies its authoring base without writing that file.
func LoadSessionAuthoringBytes(path string, data []byte, opts SessionLoadOptions) (*SessionConfig, error) {
absolute, err := filepath.Abs(path)
if err != nil {
return nil, err
}
filesystem := &configkit.FilesystemContext{BaseDir: filepath.Dir(absolute), Root: string(filepath.Separator)}
cfg, _, err := loadSessionSourceWithFilesystem(configkit.Bytes(absolute, data), absolute, opts, true, filesystem)
return cfg, err
}
func loadSessionSourceWithFilesystem(source configkit.Source, label string, opts SessionLoadOptions, imports bool, filesystem *configkit.FilesystemContext) (*SessionConfig, string, error) {
invocationDir, err := os.Getwd()
if err != nil {
return nil, "", err
}
if filesystem != nil {
invocationDir = filesystem.BaseDir
}
sources := make(map[string]string)
result, err := configkit.Load(source, configkit.Options[SessionConfig]{Imports: imports, Definition: sessionDefinition(invocationDir, sources)})
result, err := configkit.Load(source, configkit.Options[SessionConfig]{Imports: imports, Filesystem: filesystem, Definition: sessionDefinition(invocationDir, sources)})
if err != nil {
return nil, "", describeConfigKitLoadError("session", err)
}