eric/weatherreporter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Bound generated text content and diagnostics

Browse Source
This commit is contained in:
Eric Rakestraw
2026-08-13 01:47:47 +00:00
parent f8beed04cf
commit e520ffb13b
20 changed files with 400 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
internal/generatedtext/json.go
View File

@@ -16,18 +16,21 @@ var generatedTextFieldNames = map[string]struct{}{
func decodeGeneratedText[T any](data []byte, name string) (T, error) {
var value T
if err := validateGeneratedTextSize(data, name); err != nil {
return value, err
}
if err := validateGeneratedTextObject(data, name); err != nil {
return value, err
}
decoder := json.NewDecoder(bytes.NewReader(data))
decoder.DisallowUnknownFields()
if err := decoder.Decode(&value); err != nil {
return value, fmt.Errorf("decode %s generated text: %w", name, err)
return value, fmt.Errorf("decode %s generated text: invalid field value", name)
}
var extra any
if err := decoder.Decode(&extra); err != nil {
if err != io.EOF {
return value, fmt.Errorf("decode %s generated text: %w", name, err)
return value, fmt.Errorf("decode %s generated text: invalid JSON", name)
}
return value, nil
}
@@ -38,35 +41,39 @@ func validateGeneratedTextObject(data []byte, name string) error {
decoder := json.NewDecoder(bytes.NewReader(data))
token, err := decoder.Token()
if err != nil {
return fmt.Errorf("decode %s generated text: %w", name, err)
return fmt.Errorf("decode %s generated text: invalid JSON", name)
}
if delimiter, ok := token.(json.Delim); !ok || delimiter != '{' {
return fmt.Errorf("decode %s generated text: expected JSON object", name)
}
seen := make(map[string]struct{}, len(generatedTextFieldNames))
totalCharacters := 0
for decoder.More() {
token, err := decoder.Token()
if err != nil {
return fmt.Errorf("decode %s generated text: %w", name, err)
return fmt.Errorf("decode %s generated text: invalid JSON", name)
}
field, ok := token.(string)
if !ok {
return fmt.Errorf("decode %s generated text: expected object field name", name)
}
if _, ok := generatedTextFieldNames[field]; !ok {
return fmt.Errorf("decode %s generated text: json: unknown field %q", name, field)
return fmt.Errorf("decode %s generated text: unsupported field", name)
}
if _, ok := seen[field]; ok {
return fmt.Errorf("decode %s generated text: duplicate field %q", name, field)
return fmt.Errorf("decode %s generated text: duplicate %s field", name, generatedTextFieldLabel(field))
}
seen[field] = struct{}{}
var value json.RawMessage
if err := decoder.Decode(&value); err != nil {
return fmt.Errorf("decode %s generated text: %w", name, err)
return fmt.Errorf("decode %s generated text: invalid JSON", name)
}
if err := validateGeneratedTextField(name, field, value, &totalCharacters); err != nil {
return err
}
}
if _, err := decoder.Token(); err != nil {
return fmt.Errorf("decode %s generated text: %w", name, err)
return fmt.Errorf("decode %s generated text: invalid JSON", name)
}
return nil
}
@@ -74,15 +81,12 @@ func validateGeneratedTextObject(data []byte, name string) error {
func requireGeneratedTextStringField(data []byte, name, field string) error {
var fields map[string]json.RawMessage
if err := json.Unmarshal(data, &fields); err != nil {
return fmt.Errorf("decode %s generated text: %w", name, err)
return fmt.Errorf("decode %s generated text: invalid JSON", name)
}
raw, ok := fields[field]
_, ok := fields[field]
if !ok {
return fmt.Errorf("%s generated text %s is required", name, strings.ReplaceAll(field, "_", " "))
}
if bytes.Equal(bytes.TrimSpace(raw), []byte("null")) {
return fmt.Errorf("%s generated text %s must be a string", name, strings.ReplaceAll(field, "_", " "))
}
return nil
}