Skip to content

fix(vertex): do not override custom http client when using vertex #238

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
andreynering wants to merge 3 commits into
base: main
Choose a base branch
from
+28 −8
Open

fix(vertex): do not override custom http client when using vertex #238

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3eb2f9e
fix(vertex): check close error
andreynering Sep 25, 2025
23829a6
fix(vertex): do not override custom http client when using vertex
andreynering Sep 25, 2025
7b1c366
fix(vertex): error when an unknown path is requested
andreynering Sep 25, 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
36 changes: 28 additions & 8 deletions vertex/vertex.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"golang.org/x/oauth2/google"
"google.golang.org/api/option"
"google.golang.org/api/transport"
thttp "google.golang.org/api/transport/http"

"github.com/anthropics/anthropic-sdk-go/internal/requestconfig"
sdkoption "github.com/anthropics/anthropic-sdk-go/option"
Expand Down Expand Up @@ -39,10 +40,6 @@ func WithGoogleAuth(ctx context.Context, region string, projectID string, scopes
// WithCredentials returns a request option which uses the provided credentials for Google Vertex AI and registers middleware that
// intercepts request to the Messages API.
func WithCredentials(ctx context.Context, region string, projectID string, creds *google.Credentials) sdkoption.RequestOption {
client, _, err := transport.NewHTTPClient(ctx, option.WithTokenSource(creds.TokenSource))
if err != nil {
panic(fmt.Errorf("failed to create HTTP client: %v", err))
}
middleware := vertexMiddleware(region, projectID)

var baseURL string
Expand All @@ -53,6 +50,24 @@ func WithCredentials(ctx context.Context, region string, projectID string, creds
}

return requestconfig.RequestOptionFunc(func(rc *requestconfig.RequestConfig) error {
getClient := func() (*http.Client, error) {
if rc.HTTPClient == nil || rc.HTTPClient.Transport == nil {
c, _, err := transport.NewHTTPClient(ctx, option.WithTokenSource(creds.TokenSource))
return c, err
}
transport, err := thttp.NewTransport(
ctx,
rc.HTTPClient.Transport,
option.WithTokenSource(creds.TokenSource),
)
return &http.Client{Transport: transport}, err
}

client, err := getClient()
if err != nil {
return fmt.Errorf("failed to create http client: %v", err)
}

return rc.Apply(
sdkoption.WithBaseURL(baseURL),
sdkoption.WithMiddleware(middleware),
Expand All @@ -68,13 +83,16 @@ func vertexMiddleware(region, projectID string) sdkoption.Middleware {
if err != nil {
return nil, err
}
r.Body.Close()
if err := r.Body.Close(); err != nil {
return nil, err
}

if !gjson.GetBytes(body, "anthropic_version").Exists() {
body, _ = sjson.SetBytes(body, "anthropic_version", DefaultVersion)
}

if r.URL.Path == "/v1/messages" && r.Method == http.MethodPost {
switch {
case r.URL.Path == "/v1/messages" && r.Method == http.MethodPost:
if projectID == "" {
return nil, fmt.Errorf("no projectId was given and it could not be resolved from credentials")
}
Expand All @@ -90,14 +108,16 @@ func vertexMiddleware(region, projectID string) sdkoption.Middleware {
}

r.URL.Path = fmt.Sprintf("/v1/projects/%s/locations/%s/publishers/anthropic/models/%s:%s", projectID, region, model, specifier)
}

if r.URL.Path == "/v1/messages/count_tokens" && r.Method == http.MethodPost {
case r.URL.Path == "/v1/messages/count_tokens" && r.Method == http.MethodPost:
if projectID == "" {
return nil, fmt.Errorf("no projectId was given and it could not be resolved from credentials")
}

r.URL.Path = fmt.Sprintf("/v1/projects/%s/locations/%s/publishers/anthropic/models/count-tokens:rawPredict", projectID, region)

default:
return nil, fmt.Errorf("vertex middleware does not support %s %s", r.Method, r.URL.Path)
Comment on lines +119 to +120
Copy link
Author

@andreynering andreynering Sep 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like if we miss any path, we probably forgot something in the code. A good idea to error here?

}

reader := bytes.NewReader(body)
Expand Down