greeneclipse/descrybe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
greeneclipse
2026-08-17 09:33:07 +02:00
parent 0dceb3a404
commit fe94c2fb9c
40 changed files with 2360 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/api/internal/catalog/prompt_repair.go
+3 -3
View File
@@ -48,11 +48,11 @@ type RepairCategoryEnhancePromptsResult struct {
// RepairA1DemoOptions configures optional seed overlay path for legacy splits.
type RepairA1DemoOptions struct {
// SeedPromptsPath points at a1-category-prompts.json OR wp_product_categories.sql.
// Empty → auto-detect WP SQL (SEED_A1_WP_CATEGORIES / Downloads), else JSON seed.
// Empty → auto-detect WP SQL (SEED_A1_WP_CATEGORIES / scripts/seed), else JSON seed.
SeedPromptsPath string
// WPCategoriesPath forces wp_product_categories.sql (overrides SeedPromptsPath when set).
WPCategoriesPath string
// WPCategoriesSQL is uploaded dump bytes (primary for Admin Sync A1 in prod).
// WPCategoriesSQL is optional dump bytes (legacy Admin Sync A1 upload / API clients).
// When non-empty, takes precedence over filesystem auto-detect / path options.
WPCategoriesSQL []byte
// ForceFromSeed overwrites already-sectioned prompts when a seed match exists
@@ -63,7 +63,7 @@ type RepairA1DemoOptions struct {
// RepairA1DemoCategoryEnhancePrompts replaces non-sectioned / legacy combined
// categories.prompt values for A1 Slovenija + Platform Demo with role-sectioned
// overlays (Title / Description / Meta / Attributes). Prefers wp_product_categories.sql
// (SEED_A1_WP_CATEGORIES / Downloads) as source of truth, then a1-category-prompts.json,
// (SEED_A1_WP_CATEGORIES / scripts/seed) as source of truth, then a1-category-prompts.json,
// splitting combined Name+Description prompts so naming rules land under Title and
// HTML body under Description; otherwise fall back to CategoryEnhanceUserTemplate.
//
apps/api/internal/catalog/wp_category_prompts.go
+21 -18
View File
@@ -18,8 +18,9 @@ const (
)
// ResolveWPCategoryPromptsPath picks an explicit path, else the first readable
// wp_product_categories.sql candidate (SEED_A1_WP_CATEGORIES + Downloads + scripts/seed).
// Used by Sync A1 / RepairCompanyCategoryEnhancePrompts as the A1 prompt source of truth.
// wp_product_categories.sql candidate (SEED_A1_WP_CATEGORIES, then scripts/seed,
// then optional local Downloads as last-resort). Used by Sync A1 /
// RepairCompanyCategoryEnhancePrompts as the A1 prompt source of truth — no UI upload required.
func ResolveWPCategoryPromptsPath(explicit string) string {
if p := strings.TrimSpace(explicit); p != "" {
if st, err := os.Stat(p); err == nil && !st.IsDir() {
@@ -31,7 +32,7 @@ func ResolveWPCategoryPromptsPath(explicit string) string {
if st, err := os.Stat(v); err == nil && !st.IsDir() {
return v
}
log.Printf("warning: %s=%q not readable — trying Downloads / scripts/seed", envSeedA1WPCategories, v)
log.Printf("warning: %s=%q not readable — trying scripts/seed", envSeedA1WPCategories, v)
}
for _, c := range WPCategoryPromptsCandidates() {
if st, err := os.Stat(c); err == nil && !st.IsDir() {
@@ -42,7 +43,8 @@ func ResolveWPCategoryPromptsPath(explicit string) string {
}
// WPCategoryPromptsCandidates lists local paths Sync A1 / repair try when
// SEED_A1_WP_CATEGORIES is unset. First readable file wins via ResolveWPCategoryPromptsPath.
// SEED_A1_WP_CATEGORIES is unset. Prefer committed scripts/seed first; Downloads
// is last-resort only. First readable file wins via ResolveWPCategoryPromptsPath.
func WPCategoryPromptsCandidates() []string {
var out []string
if v := strings.TrimSpace(os.Getenv(envSeedA1WPCategories)); v != "" {
@@ -53,13 +55,27 @@ func WPCategoryPromptsCandidates() []string {
"wp_product_categories (1).sql",
"wp_product_categories(1).sql",
}
// Repo seed is the default source of truth (no upload / Downloads required).
if root, ok := findMonorepoRootFromCwd(); ok {
for _, n := range names {
out = append(out, filepath.Join(root, "scripts", "seed", n))
}
}
for _, n := range names {
out = append(out,
filepath.Join("scripts", "seed", n),
filepath.Join("..", "..", "scripts", "seed", n),
n,
filepath.Join("..", "..", n),
)
}
// Optional local Downloads fallback (legacy / one-off machines without seed).
home, _ := os.UserHomeDir()
if home != "" {
for _, n := range names {
out = append(out, filepath.Join(home, "Downloads", n))
out = append(out, filepath.Join(home, "downloads", n))
}
// Windows secondary profile Downloads (e.g. D:\Users\…\Downloads).
for _, driveRoot := range []string{`D:\`, `C:\`} {
alt := filepath.Join(driveRoot, "Users", filepath.Base(home), "Downloads")
for _, n := range names {
@@ -67,19 +83,6 @@ func WPCategoryPromptsCandidates() []string {
}
}
}
for _, n := range names {
out = append(out,
n,
filepath.Join("..", "..", n),
filepath.Join("scripts", "seed", n),
filepath.Join("..", "..", "scripts", "seed", n),
)
}
if root, ok := findMonorepoRootFromCwd(); ok {
for _, n := range names {
out = append(out, filepath.Join(root, "scripts", "seed", n))
}
}
return out
}
apps/api/internal/catalog/wp_category_prompts_test.go
+7 -7
View File
@@ -81,14 +81,10 @@ func TestParseWPProductCategoriesSQL_SlusalkeSplit(t *testing.T) {
}
}
func TestParseWPProductCategoriesSQL_RealDownloadsFile(t *testing.T) {
path := ResolveWPCategoryPromptsPath(`d:\Users\Green Eclipse\Downloads\wp_product_categories.sql`)
func TestParseWPProductCategoriesSQL_RealSeedFile(t *testing.T) {
path := ResolveWPCategoryPromptsPath("")
if path == "" {
// Also try env / auto-detect without failing CI machines that lack the dump.
path = ResolveWPCategoryPromptsPath("")
}
if path == "" {
t.Skip("wp_product_categories.sql not available on this machine")
t.Skip("wp_product_categories.sql not available (expected under scripts/seed)")
}
byNorm, _, err := loadWPCategoryPromptOverlays(path)
if err != nil {
@@ -109,6 +105,10 @@ func TestParseWPProductCategoriesSQL_RealDownloadsFile(t *testing.T) {
if !strings.Contains(split, "tip izdelka lowercase") && !strings.Contains(split, "znamka") {
t.Fatalf("unexpected Title rules in split: %s", split[:min(400, len(split))])
}
if !strings.Contains(filepath.ToSlash(path), "scripts/seed/wp_product_categories.sql") &&
filepath.Base(path) != "wp_product_categories.sql" {
t.Logf("resolved path %s (prefer scripts/seed when present)", path)
}
}
func TestResolveWPCategoryPromptsPath_Explicit(t *testing.T) {