Skip to content

feat(arkruntime): Responses API pre-serialized JSON body helpers #151

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
jesse-engineer wants to merge 1 commit into
base: master
Choose a base branch
from
+42 −3
Open

feat(arkruntime): Responses API pre-serialized JSON body helpers #151

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 42 additions & 3 deletions service/arkruntime/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (

"github.com/volcengine/volcengine-go-sdk/service/ark"
"github.com/volcengine/volcengine-go-sdk/service/arkruntime/model"
"github.com/volcengine/volcengine-go-sdk/service/arkruntime/model/responses"
"github.com/volcengine/volcengine-go-sdk/service/arkruntime/pkg/encryption"
"github.com/volcengine/volcengine-go-sdk/service/arkruntime/utils"
"github.com/volcengine/volcengine-go-sdk/volcengine"
Expand Down Expand Up @@ -157,9 +158,10 @@ func (c *Client) protectedRefresh(ctx context.Context, resourceType string, reso
}

type requestOptions struct {
body interface{}
header http.Header
query url.Values
body interface{}
header http.Header
query url.Values
responsesExtraFields map[string]interface{}
}

type requestOption func(*requestOptions)
Expand All @@ -184,6 +186,29 @@ func structToMap(obj interface{}) (map[string]interface{}, error) {
return result, nil
}

func mergeResponsesRequestBodyIfNeeded(args *requestOptions) error {
if len(args.responsesExtraFields) == 0 {
return nil
}
req, ok := args.body.(*responses.ResponsesRequest)
if !ok {
return fmt.Errorf("WithResponsesExtraFields only applies to *responses.ResponsesRequest body")
}
baseMap, err := structToMap(req)
if err != nil {
return err
}
for k, v := range args.responsesExtraFields {
baseMap[k] = v
}
b, err := json.Marshal(baseMap)
if err != nil {
return err
}
args.body = b
return nil
}

func withContentType(contentType string) requestOption {
return func(args *requestOptions) {
args.header.Set("Content-Type", contentType)
Expand Down Expand Up @@ -218,6 +243,16 @@ func WithQuery(key, value string) requestOption {
}
}

// WithResponsesExtraFields shallow-merges fields into the JSON body when the request body is
// a *responses.ResponsesRequest (Responses API). Merging runs after all requestOption setters
// apply, so it sees the same body that will be sent (including after multimodal preprocessing).
// Keys in fields overwrite top-level keys produced from the protobuf message.
func WithResponsesExtraFields(fields map[string]interface{}) requestOption {
return func(args *requestOptions) {
args.responsesExtraFields = fields
}
}

func (c *Client) newRequest(ctx context.Context, method, url, resourceType, resourceId string, setters ...requestOption) (*http.Request, *model.RequestError) {
// Default Options
args := &requestOptions{
Expand All @@ -238,6 +273,10 @@ func (c *Client) newRequest(ctx context.Context, method, url, resourceType, reso
setter(args)
}

if errBody := mergeResponsesRequestBodyIfNeeded(args); errBody != nil {
return nil, model.NewRequestError(http.StatusBadRequest, errBody, requestID)
}

errH := c.setCommonHeaders(ctx, args, resourceType, resourceId)
if errH != nil {
return nil, errH
Expand Down