Skip to content
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

Jump to bottom

add _defaultApiClient in api/client.go for reuse #4096

Closed
wants to merge 1 commit into from
Closed

add _defaultApiClient in api/client.go for reuse #4096

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 11 additions & 2 deletions api/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ func checkError(resp *http.Response, body []byte) error {
return apiError
}

// _defaultApiClient the default api client for reuse
var _defaultApiClient *Client

// ClientFromEnvironment creates a new [Client] using configuration from the
// environment variable OLLAMA_HOST, which points to the network host and
// port on which the ollama service is listenting. The format of this variable
Expand All @@ -65,18 +68,24 @@ func checkError(resp *http.Response, body []byte) error {
// If the variable is not specified, a default ollama host and port will be
// used.
func ClientFromEnvironment() (*Client, error) {
if _defaultApiClient != nil {
return _defaultApiClient, nil
}

ollamaHost, err := GetOllamaHost()
if err != nil {
return nil, err
}

return &Client{
_defaultApiClient = &Client{
base: &url.URL{
Scheme: ollamaHost.Scheme,
Host: net.JoinHostPort(ollamaHost.Host, ollamaHost.Port),
},
http: http.DefaultClient,
}, nil
}

return _defaultApiClient, nil
}

type OllamaHost struct {
Expand Down
44 changes: 39 additions & 5 deletions api/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestClientFromEnvironment(t *testing.T) {
Expand All @@ -32,22 +33,55 @@ func TestClientFromEnvironment(t *testing.T) {
"trailing slash port": {value: "example.com:1234/", expect: "http://example.com:1234"},
}

// test ingnore _defaultApiClient
for k, v := range testCases {
t.Run(k, func(t *testing.T) {
t.Setenv("OLLAMA_HOST", v.value)
// set _defaultApiClient=nil for really new client in ClientFromEnvironment
_defaultApiClient = nil

t.Setenv("OLLAMA_HOST", v.value)
client, err := ClientFromEnvironment()
if err != v.err {
t.Fatalf("expected %s, got %s", v.err, err)
t.Fatalf("case %s: expected %s, got %s", k, v.err, err)
}

if client.base.String() != v.expect {
t.Fatalf("expected %s, got %s", v.expect, client.base.String())
t.Fatalf("case %s: expected %s, got %s", k, v.expect, client.base.String())
}
})
}

hostTestCases := map[string]*testCase{
// test with _defaultApiClient
for k, v := range testCases {
_defaultApiClient = nil
t.Setenv("OLLAMA_HOST", v.value)
client, err := ClientFromEnvironment()
if err != v.err {
t.Fatalf("case %s: expected %s, got %s", k, v.err, err)
}
if client.base.String() != v.expect {
t.Fatalf("case %s: expected %s, got %s", k, v.expect, client.base.String())
}
require.Equal(t, _defaultApiClient, client)

// call ClientFromEnvironment again, should return _defaultApiClient directly
client2, err := ClientFromEnvironment()
require.Nil(t, err)
require.NotNil(t, client2)
// address and fields of _defaultApiClient, client2 and client should equal
require.Equal(t, client, client2, fmt.Sprintf("case %s: expected %T, got %T", k, client, client2))
require.Equal(t, _defaultApiClient, client2, fmt.Sprintf("case %s: expected %T, got %T", k, _defaultApiClient, client2))
require.Equal(t, client.base.String(), client2.base.String(), fmt.Sprintf("case %s: expected %s, got %s", k, client.base.String(), client2.base.String()))
require.Equal(t, client.http, _defaultApiClient.http, fmt.Sprintf("case %s: expected %T, got %T", k, client.http, _defaultApiClient.http))
}
}

func TestGetOllamaHost(t *testing.T) {
hostTestCases := map[string]*struct {
value string
expect string
err error
}{
"empty": {value: "", expect: "127.0.0.1:11434"},
"only address": {value: "1.2.3.4", expect: "1.2.3.4:11434"},
"only port": {value: ":1234", expect: ":1234"},
Expand All @@ -73,7 +107,7 @@ func TestClientFromEnvironment(t *testing.T) {

oh, err := GetOllamaHost()
if err != v.err {
t.Fatalf("expected %s, got %s", v.err, err)
t.Fatalf("case %s: expected %s, got %s", k, v.err, err)
}

if err == nil {
Expand Down