Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 13 additions & 5 deletions internal/llm/openai.go
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,16 @@ func New(baseURL, apiKey string) *Client {
}
}

const userAgent = "whip"

func (c *Client) setProviderHeaders(req *http.Request, contentType bool) {
if contentType {
req.Header.Set("Content-Type", "application/json")
}
req.Header.Set("Authorization", "Bearer "+c.APIKey)
req.Header.Set("User-Agent", userAgent)
}

// Request is a chat completions request.
type Request struct {
Model string `json:"model"`
Expand Down Expand Up @@ -600,7 +610,7 @@ func (c *Client) Models(ctx context.Context) ([]ModelInfo, error) {
if err != nil {
return nil, err
}
hr.Header.Set("Authorization", "Bearer "+c.APIKey)
c.setProviderHeaders(hr, false)
resp, err := c.HTTP.Do(hr)
if err != nil {
return nil, err
Expand Down Expand Up @@ -683,8 +693,7 @@ func (c *Client) streamOnce(ctx context.Context, body []byte, onText, onThink fu
if err != nil {
return Message{}, Usage{}, err
}
hr.Header.Set("Content-Type", "application/json")
hr.Header.Set("Authorization", "Bearer "+c.APIKey)
c.setProviderHeaders(hr, true)
resp, err := c.HTTP.Do(hr)
if err != nil {
return Message{}, Usage{}, err
Expand Down Expand Up @@ -814,8 +823,7 @@ func (c *Client) completeOnce(ctx context.Context, body []byte) (string, Usage,
if err != nil {
return "", Usage{}, err
}
hr.Header.Set("Content-Type", "application/json")
hr.Header.Set("Authorization", "Bearer "+c.APIKey)
c.setProviderHeaders(hr, true)
resp, err := c.HTTP.Do(hr)
if err != nil {
return "", Usage{}, err
Expand Down
72 changes: 72 additions & 0 deletions internal/llm/user_agent_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
package llm

import (
"context"
"net/http"
"net/http/httptest"
"testing"
)

func TestClientSendsWhipUserAgent(t *testing.T) {
tests := []struct {
name string
run func(*Client) error
}{
{
name: "models",
run: func(c *Client) error {
_, err := c.Models(context.Background())
return err
},
},
{
name: "stream",
run: func(c *Client) error {
_, _, err := c.Stream(context.Background(), Request{Model: "m", Messages: []Message{{Role: "user", Content: "hi"}}}, nil, nil, nil)
return err
},
},
{
name: "complete",
run: func(c *Client) error {
_, _, err := c.Complete(context.Background(), Request{Model: "m", Messages: []Message{{Role: "user", Content: "hi"}}})
return err
},
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
var gotUserAgent string
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
gotUserAgent = r.Header.Get("User-Agent")
switch r.URL.Path {
case "/models":
w.Header().Set("Content-Type", "application/json")
_, _ = w.Write([]byte(`{"data":[]}`))
case "/chat/completions":
if r.Header.Get("Content-Type") != "application/json" {
t.Fatalf("Content-Type = %q, want application/json", r.Header.Get("Content-Type"))
}
w.Header().Set("Content-Type", "text/event-stream")
if tt.name == "complete" {
_, _ = w.Write([]byte(`{"choices":[{"message":{"content":"ok"}}]}`))
return
}
_, _ = w.Write([]byte("data: {\"choices\":[{\"delta\":{\"content\":\"ok\"}}]}\n\ndata: [DONE]\n\n"))
default:
t.Fatalf("unexpected path %s", r.URL.Path)
}
}))
defer srv.Close()

c := New(srv.URL, "k")
if err := tt.run(c); err != nil {
t.Fatal(err)
}
if gotUserAgent != "whip" {
t.Fatalf("User-Agent = %q, want whip", gotUserAgent)
}
})
}
}