fix
This commit is contained in:
@@ -5,7 +5,7 @@ import (
|
||||
"encoding/json"
|
||||
)
|
||||
|
||||
// v1ProcessItemKeyOrder is the human-readable LegacyProcessItem property order.
|
||||
// v1ProcessItemKeyOrder is the human-readable ProcessItem property order.
|
||||
// Important catalog fields first; internal ids / SEO last.
|
||||
var v1ProcessItemKeyOrder = []string{
|
||||
"ean",
|
||||
@@ -23,13 +23,39 @@ var v1ProcessItemKeyOrder = []string{
|
||||
"error",
|
||||
"meta_title",
|
||||
"meta_description",
|
||||
"id",
|
||||
"processed_product_id",
|
||||
"raw_product_id",
|
||||
}
|
||||
|
||||
// MarshalJSON emits LegacyProcessItem keys in a stable human-readable order.
|
||||
// ASSUMPTION: JSON object key order is part of the V1 readability contract for A1.
|
||||
// v1ProcessItemInternalKeys must never appear on public ProcessItem JSON.
|
||||
var v1ProcessItemInternalKeys = map[string]struct{}{
|
||||
"id": {},
|
||||
"processed_product_id": {},
|
||||
"raw_product_id": {},
|
||||
"field_sources": {},
|
||||
"enhance_input_hash": {},
|
||||
"ai_enhance": {},
|
||||
"finish_reason": {},
|
||||
"gpt_response": {},
|
||||
"total_tokens": {},
|
||||
"prompt_tokens": {},
|
||||
"completion_tokens": {},
|
||||
"ai_provider_mode": {},
|
||||
"notes": {},
|
||||
"worker": {},
|
||||
"model": {},
|
||||
"provider": {},
|
||||
}
|
||||
|
||||
func stripV1ProcessItemInternalKeys(item V1ProcessJobItem) {
|
||||
if item == nil {
|
||||
return
|
||||
}
|
||||
for k := range v1ProcessItemInternalKeys {
|
||||
delete(item, k)
|
||||
}
|
||||
}
|
||||
|
||||
// MarshalJSON emits only the public ProcessItem allowlist in a stable order.
|
||||
// Unexpected keys (including pipeline internals) cannot ship.
|
||||
func (item V1ProcessJobItem) MarshalJSON() ([]byte, error) {
|
||||
if item == nil {
|
||||
return []byte("null"), nil
|
||||
@@ -55,43 +81,15 @@ func (item V1ProcessJobItem) MarshalJSON() ([]byte, error) {
|
||||
buf.Write(vb)
|
||||
return nil
|
||||
}
|
||||
seen := map[string]struct{}{}
|
||||
for _, k := range v1ProcessItemKeyOrder {
|
||||
v, ok := item[k]
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
seen[k] = struct{}{}
|
||||
if err := writePair(k, v); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
// Preserve any unexpected keys deterministically (sorted via encoding/json map).
|
||||
extras := map[string]any{}
|
||||
for k, v := range item {
|
||||
if _, ok := seen[k]; ok {
|
||||
continue
|
||||
}
|
||||
extras[k] = v
|
||||
}
|
||||
if len(extras) > 0 {
|
||||
eb, err := json.Marshal(extras)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
// eb is `{...}`; splice inner pairs.
|
||||
inner := bytes.TrimSpace(eb)
|
||||
if len(inner) >= 2 && inner[0] == '{' && inner[len(inner)-1] == '}' {
|
||||
inner = inner[1 : len(inner)-1]
|
||||
if len(bytes.TrimSpace(inner)) > 0 {
|
||||
if !first {
|
||||
buf.WriteByte(',')
|
||||
}
|
||||
first = false
|
||||
buf.Write(inner)
|
||||
}
|
||||
}
|
||||
}
|
||||
buf.WriteByte('}')
|
||||
return buf.Bytes(), nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user