Centralize location LLM assets

internal/modules/dnd/extract/locationoccurrences/assets.go

@@ -1,6 +0,0 @@
-package locationoccurrences
-
-import "embed"
-
-//go:embed assets/prompts/*.yaml assets/prompts/*.md assets/schemas/*.json
-var embeddedAssets embed.FS

internal/modules/dnd/extract/locationoccurrences/prompt_assets.go

@@ -2,8 +2,10 @@ package locationoccurrences
 
 import (
 	"fmt"
+	"io/fs"
 	"sync"
 
+	rootassets "gitea.maximumdirect.net/eric/notarius/assets"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/llm"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/promptfs"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/shared"
@@ -14,10 +16,10 @@ const promptAssetRoot = "assets/prompts"
 var promptAssetManifest = shared.PromptAssetManifest{
 	ModuleDir: PromptID,
 	ModuleFiles: []promptfs.ModulePromptFile{
-		{Name: "dnd.location_occurrences.yaml", Path: "assets/prompts/dnd.location_occurrences.yaml"},
-		{Name: "locations.md", Path: "assets/prompts/locations.md"},
-		{Name: "task.md", Path: "assets/prompts/task.md"},
-		{Name: "instructions.md", Path: "assets/prompts/instructions.md"},
+		{Name: "dnd.location_occurrences.yaml", Path: "prompts/dnd.location_occurrences.yaml"},
+		{Name: "locations.md", Path: "prompts/locations.md"},
+		{Name: "task.md", Path: "prompts/task.md"},
+		{Name: "instructions.md", Path: "prompts/instructions.md"},
 	},
 	SharedFiles: []string{
 		"common-dnd-system.md",
@@ -28,20 +30,41 @@ var promptAssetManifest = shared.PromptAssetManifest{
 	},
 }
 
+func moduleAssetFS() (fs.FS, error) {
+	assets, err := fs.Sub(rootassets.FS(), "dnd/location-occurrences")
+	if err != nil {
+		return nil, fmt.Errorf("scope location-occurrence assets: %w", err)
+	}
+	return assets, nil
+}
+
 func RegisterPromptAssets(registry *llm.AssetRegistry) error {
-	promptFS, err := promptAssetManifest.PromptFS(embeddedAssets)
+	assets, err := moduleAssetFS()
+	if err != nil {
+		return err
+	}
+	promptFS, err := promptAssetManifest.PromptFS(assets)
 	if err != nil {
 		return fmt.Errorf("prepare location-occurrence prompt assets: %w", err)
 	}
 	if err := registry.RegisterPromptFS(promptFS, promptAssetRoot); err != nil {
 		return err
 	}
-	return registry.RegisterSchemaFS(embeddedAssets, "assets/schemas")
+	schemas, err := fs.Sub(assets, "schemas")
+	if err != nil {
+		return fmt.Errorf("scope location-occurrence schemas: %w", err)
+	}
+	return registry.RegisterSchemaFS(schemas, ".")
 }
 
 func promptAssetMetadata() (string, error) {
 	promptAssetHashOnce.Do(func() {
-		promptAssetHash, promptAssetHashErr = promptAssetManifest.Hash(embeddedAssets)
+		assets, err := moduleAssetFS()
+		if err != nil {
+			promptAssetHashErr = err
+			return
+		}
+		promptAssetHash, promptAssetHashErr = promptAssetManifest.Hash(assets)
 	})
 	return promptAssetHash, promptAssetHashErr
 }

internal/modules/dnd/extract/locationoccurrences/schema.go

@@ -11,11 +11,15 @@ const (
 )
 
 func loadResponseSchema() (llm.ResponseSchema, error) {
-	return llm.LoadResponseSchema(embeddedAssets, llm.ResponseSchemaDefinition{
+	assets, err := moduleAssetFS()
+	if err != nil {
+		return llm.ResponseSchema{}, err
+	}
+	return llm.LoadResponseSchema(assets, llm.ResponseSchemaDefinition{
 		Key:       ResponseSchemaKey,
 		ID:        ResponseSchemaID,
 		Version:   SchemaVersion,
 		Name:      ResponseSchemaName,
-		AssetPath: "assets/schemas/dnd_location_occurrences_llm.v1.json",
+		AssetPath: "schemas/dnd_location_occurrences_llm.v1.json",
 	})
 }

internal/modules/dnd/extract/locations/assets.go

@@ -1,6 +0,0 @@
-package locations
-
-import "embed"
-
-//go:embed assets/prompts/*.yaml assets/prompts/*.md assets/schemas/*.json
-var embeddedAssets embed.FS

internal/modules/dnd/extract/locations/prompt_assets.go

@@ -2,8 +2,10 @@ package locations
 
 import (
 	"fmt"
+	"io/fs"
 	"sync"
 
+	rootassets "gitea.maximumdirect.net/eric/notarius/assets"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/llm"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/promptfs"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/shared"
@@ -14,9 +16,9 @@ const promptAssetRoot = "assets/prompts"
 var promptAssetManifest = shared.PromptAssetManifest{
 	ModuleDir: PromptID,
 	ModuleFiles: []promptfs.ModulePromptFile{
-		{Name: "dnd.locations.yaml", Path: "assets/prompts/dnd.locations.yaml"},
-		{Name: "task.md", Path: "assets/prompts/task.md"},
-		{Name: "instructions.md", Path: "assets/prompts/instructions.md"},
+		{Name: "dnd.locations.yaml", Path: "prompts/dnd.locations.yaml"},
+		{Name: "task.md", Path: "prompts/task.md"},
+		{Name: "instructions.md", Path: "prompts/instructions.md"},
 	},
 	SharedFiles: []string{
 		"common-dnd-system.md",
@@ -27,20 +29,41 @@ var promptAssetManifest = shared.PromptAssetManifest{
 	},
 }
 
+func moduleAssetFS() (fs.FS, error) {
+	assets, err := fs.Sub(rootassets.FS(), "dnd/locations/extract")
+	if err != nil {
+		return nil, fmt.Errorf("scope location extraction assets: %w", err)
+	}
+	return assets, nil
+}
+
 func RegisterPromptAssets(registry *llm.AssetRegistry) error {
-	promptFS, err := promptAssetManifest.PromptFS(embeddedAssets)
+	assets, err := moduleAssetFS()
+	if err != nil {
+		return err
+	}
+	promptFS, err := promptAssetManifest.PromptFS(assets)
 	if err != nil {
 		return fmt.Errorf("prepare location prompt assets: %w", err)
 	}
 	if err := registry.RegisterPromptFS(promptFS, promptAssetRoot); err != nil {
 		return err
 	}
-	return registry.RegisterSchemaFS(embeddedAssets, "assets/schemas")
+	schemas, err := fs.Sub(assets, "schemas")
+	if err != nil {
+		return fmt.Errorf("scope location extraction schemas: %w", err)
+	}
+	return registry.RegisterSchemaFS(schemas, ".")
 }
 
 func promptAssetMetadata() (string, error) {
 	promptAssetHashOnce.Do(func() {
-		promptAssetHash, promptAssetHashErr = promptAssetManifest.Hash(embeddedAssets)
+		assets, err := moduleAssetFS()
+		if err != nil {
+			promptAssetHashErr = err
+			return
+		}
+		promptAssetHash, promptAssetHashErr = promptAssetManifest.Hash(assets)
 	})
 	return promptAssetHash, promptAssetHashErr
 }

internal/modules/dnd/extract/locations/schema.go

@@ -11,11 +11,15 @@ const (
 )
 
 func loadResponseSchema() (llm.ResponseSchema, error) {
-	return llm.LoadResponseSchema(embeddedAssets, llm.ResponseSchemaDefinition{
+	assets, err := moduleAssetFS()
+	if err != nil {
+		return llm.ResponseSchema{}, err
+	}
+	return llm.LoadResponseSchema(assets, llm.ResponseSchemaDefinition{
 		Key:       ResponseSchemaKey,
 		ID:        ResponseSchemaID,
 		Version:   SchemaVersion,
 		Name:      ResponseSchemaName,
-		AssetPath: "assets/schemas/dnd_locations_llm.v1.json",
+		AssetPath: "schemas/dnd_locations_llm.v1.json",
 	})
 }

internal/modules/dnd/normalize/locations/assets.go

@@ -1,6 +0,0 @@
-package locations
-
-import "embed"
-
-//go:embed assets/prompts/*.yaml assets/prompts/*.md
-var embeddedAssets embed.FS

internal/modules/dnd/normalize/locations/prompt_assets.go

@@ -2,8 +2,10 @@ package locations
 
 import (
 	"fmt"
+	"io/fs"
 	"sync"
 
+	rootassets "gitea.maximumdirect.net/eric/notarius/assets"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/llm"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/promptfs"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/shared"
@@ -14,15 +16,27 @@ const promptAssetRoot = "assets/prompts"
 var promptAssetManifest = shared.PromptAssetManifest{
 	ModuleDir: PromptID,
 	ModuleFiles: []promptfs.ModulePromptFile{
-		{Name: "dnd.locations.normalize.yaml", Path: "assets/prompts/dnd.locations.normalize.yaml"},
-		{Name: "task.md", Path: "assets/prompts/task.md"},
-		{Name: "candidates.md", Path: "assets/prompts/candidates.md"},
+		{Name: "dnd.locations.normalize.yaml", Path: "prompts/dnd.locations.normalize.yaml"},
+		{Name: "task.md", Path: "prompts/task.md"},
+		{Name: "candidates.md", Path: "prompts/candidates.md"},
 	},
 	SharedFiles: []string{"common-dnd-system.md", "common-dnd-entity-reconciliation.md", "common-dnd-transcript.md"},
 }
 
+func moduleAssetFS() (fs.FS, error) {
+	assets, err := fs.Sub(rootassets.FS(), "dnd/locations/normalize")
+	if err != nil {
+		return nil, fmt.Errorf("scope location normalization assets: %w", err)
+	}
+	return assets, nil
+}
+
 func RegisterPromptAssets(registry *llm.AssetRegistry) error {
-	promptFS, err := promptAssetManifest.PromptFS(embeddedAssets)
+	assets, err := moduleAssetFS()
+	if err != nil {
+		return err
+	}
+	promptFS, err := promptAssetManifest.PromptFS(assets)
 	if err != nil {
 		return fmt.Errorf("prepare location normalization prompt assets: %w", err)
 	}
@@ -30,7 +44,14 @@ func RegisterPromptAssets(registry *llm.AssetRegistry) error {
 }
 
 func promptAssetMetadata() (string, error) {
-	promptAssetHashOnce.Do(func() { promptAssetHash, promptAssetHashErr = promptAssetManifest.Hash(embeddedAssets) })
+	promptAssetHashOnce.Do(func() {
+		assets, err := moduleAssetFS()
+		if err != nil {
+			promptAssetHashErr = err
+			return
+		}
+		promptAssetHash, promptAssetHashErr = promptAssetManifest.Hash(assets)
+	})
 	return promptAssetHash, promptAssetHashErr
 }