use upstream Ollama Heartbeat method for availability

README.md

@@ -73,8 +73,8 @@ Note: When an Ollama instance goes offline, OllamaFarm automatically selects the
   ```go
   type Options struct {
       Client     *http.Client
+      Heartbeat  time.Duration
       ModelsTTL  time.Duration
-      PingTTL    time.Duration
   }
   ```
 * `Properties`: Defines the properties of an Ollama client. All fields are optional.

farm.go

@@ -20,12 +20,12 @@ func NewWithOptions(options *Options) *Farm {
 	if options.Client == nil {
 		options.Client = http.DefaultClient
 	}
+	if options.Heartbeat == 0 {
+		options.Heartbeat = 5 * time.Second
+	}
 	if options.ModelsTTL == 0 {
 		options.ModelsTTL = 30 * time.Second
 	}
-	if options.PingTTL == 0 {
-		options.PingTTL = 5 * time.Second
-	}
 	return &Farm{
 		ollamas: make(map[string]*Ollama),
 		options: options,

farm_test.go

@@ -38,6 +38,8 @@ func setupTestServers() []*httptest.Server {
 			} else if r.URL.Path == "/api/version" {
 				w.WriteHeader(http.StatusOK)
 				w.Write([]byte(`{"version":"0.3.6"}`))
+			} else if r.URL.Path == "/" {
+				w.WriteHeader(http.StatusOK)
 			} else {
 				w.WriteHeader(http.StatusNotFound)
 			}
@@ -56,7 +58,7 @@ func TestFarmMethods(t *testing.T) {
 	}()
 
 	farm := ollamafarm.New()
-	farm2 := ollamafarm.NewWithOptions(&ollamafarm.Options{nil, time.Second, time.Second})
+	farm2 := ollamafarm.NewWithOptions(&ollamafarm.Options{Heartbeat: time.Second, ModelsTTL: time.Second})
 
 	// Register clients
 	for i, server := range servers {

ollama.go

@@ -55,7 +55,7 @@ func (ollama *Ollama) updateModels() {
 
 func (ollama *Ollama) updateOnline() {
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	_, err := ollama.client.Version(ctx)
+	err := ollama.client.Heartbeat(ctx)
 	cancel()
 
 	ollama.farm.mu.Lock()
@@ -66,20 +66,19 @@ func (ollama *Ollama) updateOnline() {
 // updateOllama fetches and updates the model list and checks the client's status.
 func (ollama *Ollama) updateTickers() {
 	ollama.farm.mu.Lock()
+	heartbeatTicker := time.NewTicker(ollama.farm.options.Heartbeat)
 	modelTicker := time.NewTicker(ollama.farm.options.ModelsTTL)
-	versionTicker := time.NewTicker(ollama.farm.options.PingTTL)
 	ollama.farm.mu.Unlock()
 
 	ollama.updateModels()
 	ollama.updateOnline()
 
 	for {
 		select {
+		case <-heartbeatTicker.C:
+			ollama.updateOnline()
 		case <-modelTicker.C:
 			ollama.updateModels()
-
-		case <-versionTicker.C:
-			ollama.updateOnline()
 		}
 	}
 }

types.go

@@ -28,10 +28,10 @@ type Ollama struct {
 type Options struct {
 	// Client is the HTTP client used to make requests.
 	Client *http.Client
+	// Heartbeat is the time-to-live for online/offline detection. Default: 5 seconds
+	Heartbeat time.Duration
 	// ModelsTTL is the time-to-live for the models cache. Default: 30 seconds
 	ModelsTTL time.Duration
-	// PingTTL is the time-to-live for the online/offline ping. Default: 5 seconds
-	PingTTL time.Duration
 }
 
 // Properties defines the properties of an Ollama client.