Skip to content

"Fix: Avoid double-wrapping JSON in DoStream" #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kowshickraj21 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

"Fix: Avoid double-wrapping JSON in DoStream" #287

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b53efc5
Added JSON Checking in Stream
kowshickraj21 Apr 9, 2025
d91ecf6
Fixed field name mismatch
kowshickraj21 Apr 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions pkg/client/analyze/v1/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,33 @@ func (c *Client) DoText(ctx context.Context, text string, options *interfaces.An
}

var buf bytes.Buffer
var tmp map[string]interface{}
isValidJSON := false

if err := json.Unmarshal([]byte(text), &tmp); err == nil {
// It's valid JSON, now check if it already contains a "text" field
if val, exists := tmp["text"]; exists && val != nil {
isValidJSON = true
}
}

if isValidJSON {
klog.V(6).Infof("Is Already JSON \n")
_,err = buf.WriteString(text)
if err != nil {
klog.V(1).Infof("JSON WriteString failed. Err: %v\n", err)
klog.V(6).Infof("speak.DoText() LEAVE\n")
return err
}

} else {
err = json.NewEncoder(&buf).Encode(textSource{Text: text})
if err != nil {
klog.V(1).Infof("json.NewEncoder().Encode() failed. Err: %v\n", err)
klog.V(6).Infof("speak.DoText() LEAVE\n")
return err
}
}

// using the Common SetupRequest (c.SetupRequest vs c.RESTClient.SetupRequest) method which
// also sets the common headers including the content-type (for example)
Expand Down