Skip to content

Commit c902579

Browse files
chore: only set usage request param for openai not model providers
1 parent 4d17612 commit c902579

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

pkg/monitor/display.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,9 @@ func (d *display) Stop(output string, err error) {
288288
defer d.callLock.Unlock()
289289

290290
log.Fields("runID", d.dump.ID, "output", output, "err", err).Debugf("Run stopped")
291-
log.Fields("runID", d.dump.ID, "total", d.usage.TotalTokens, "prompt", d.usage.PromptTokens, "completion", d.usage.CompletionTokens).Infof("usage ")
291+
if d.usage.TotalTokens > 0 {
292+
log.Fields("runID", d.dump.ID, "total", d.usage.TotalTokens, "prompt", d.usage.PromptTokens, "completion", d.usage.CompletionTokens).Infof("usage ")
293+
}
292294
d.dump.Output = output
293295
d.dump.Err = err
294296
if d.dumpState != "" {

pkg/openai/client.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -302,9 +302,6 @@ func (c *Client) Call(ctx context.Context, messageRequest types.CompletionReques
302302
Model: messageRequest.Model,
303303
Messages: msgs,
304304
MaxTokens: messageRequest.MaxTokens,
305-
StreamOptions: &openai.StreamOptions{
306-
IncludeUsage: true,
307-
},
308305
}
309306

310307
if messageRequest.Temperature == nil {
@@ -344,6 +341,9 @@ func (c *Client) Call(ctx context.Context, messageRequest types.CompletionReques
344341
var cacheResponse bool
345342
if c.setSeed {
346343
request.Seed = ptr(c.seed(request))
344+
request.StreamOptions = &openai.StreamOptions{
345+
IncludeUsage: true,
346+
}
347347
}
348348
response, ok, err := c.fromCache(ctx, messageRequest, request)
349349
if err != nil {

0 commit comments

Comments
 (0)