chore: clean up readline package

if the last item in history is the same as the one being added, skip it.
this reduces the number of history entries. the behaviour is similar to
how most shells maintain history

cmd/cmd.go

@@ -8,7 +8,6 @@ import (
 	"crypto/ed25519"
 	"crypto/rand"
 	"crypto/sha256"
-	"encoding/base64"
 	"encoding/json"
 	"encoding/pem"
 	"errors"
@@ -18,11 +17,9 @@ import (
 	"math"
 	"net"
 	"net/http"
-	"net/url"
 	"os"
 	"os/signal"
 	"path/filepath"
-	"regexp"
 	"runtime"
 	"strconv"
 	"strings"
@@ -33,13 +30,11 @@ import (
 	"github.com/containerd/console"
 	"github.com/mattn/go-runewidth"
 	"github.com/olekukonko/tablewriter"
-	"github.com/pkg/browser"
 	"github.com/spf13/cobra"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/term"
 
 	"github.com/ollama/ollama/api"
-	"github.com/ollama/ollama/auth"
 	"github.com/ollama/ollama/envconfig"
 	"github.com/ollama/ollama/format"
 	"github.com/ollama/ollama/llama"
@@ -47,7 +42,6 @@ import (
 	"github.com/ollama/ollama/parser"
 	"github.com/ollama/ollama/progress"
 	"github.com/ollama/ollama/server"
-	"github.com/ollama/ollama/types/errtypes"
 	"github.com/ollama/ollama/types/model"
 	"github.com/ollama/ollama/version"
 )
@@ -522,64 +516,6 @@ func RunHandler(cmd *cobra.Command, args []string) error {
 	return generate(cmd, opts)
 }
 
-// unknownKey handles key validation when a connection fails due to an unknown key.
-// It attempts to open the browser for interactive sessions to let users connect their key,
-// falling back to command-line instructions for non-interactive sessions.
-// Returns nil if browser flow succeeds, or an error with connection instructions otherwise.
-func unknownKey(unknownKeyErr error) error {
-	// find SSH public key in the error message
-	// TODO (brucemacd): the API should return structured errors so that this message parsing isn't needed
-	sshKeyPattern := `ssh-\w+ [^\s"]+`
-	re := regexp.MustCompile(sshKeyPattern)
-	matches := re.FindStringSubmatch(unknownKeyErr.Error())
-
-	if len(matches) > 0 {
-		serverPubKey := matches[0]
-
-		localPubKey, err := auth.GetPublicKey()
-		if err != nil {
-			return unknownKeyErr
-		}
-
-		if runtime.GOOS == "linux" && serverPubKey != localPubKey {
-			// try the ollama service public key
-			svcPubKey, err := os.ReadFile("/usr/share/ollama/.ollama/id_ed25519.pub")
-			if err != nil {
-				return unknownKeyErr
-			}
-			localPubKey = strings.TrimSpace(string(svcPubKey))
-		}
-
-		// check if the returned public key matches the local public key, this prevents adding a remote key to the user's account
-		if serverPubKey != localPubKey {
-			return unknownKeyErr
-		}
-
-		if term.IsTerminal(int(os.Stdout.Fd())) && !envconfig.Noninteractive() {
-			// URL encode the key and device name for the browser URL
-			encodedKey := base64.RawURLEncoding.EncodeToString([]byte(localPubKey))
-			d, _ := os.Hostname()
-			encodedDevice := url.QueryEscape(d)
-			browserURL := fmt.Sprintf("https://ollama.com/connect?host=%s&key=%s", encodedDevice, encodedKey)
-			if err := browser.OpenURL(browserURL); err == nil {
-				fmt.Println("Opening browser to connect your device...")
-				return nil
-			}
-		}
-
-		var msg strings.Builder
-		msg.WriteString(unknownKeyErr.Error())
-		msg.WriteString("\n\nYour ollama key is:\n")
-		msg.WriteString(localPubKey)
-		msg.WriteString("\nAdd your key at:\n")
-		msg.WriteString("https://ollama.com/settings/keys")
-
-		return errors.New(msg.String())
-	}
-
-	return unknownKeyErr
-}
-
 func PushHandler(cmd *cobra.Command, args []string) error {
 	client, err := api.ClientFromEnvironment()
 	if err != nil {
@@ -628,19 +564,10 @@ func PushHandler(cmd *cobra.Command, args []string) error {
 	request := api.PushRequest{Name: args[0], Insecure: insecure}
 
 	n := model.ParseName(args[0])
-	isOllamaHost := strings.HasSuffix(n.Host, ".ollama.ai") || strings.HasSuffix(n.Host, ".ollama.com")
 	if err := client.Push(cmd.Context(), &request, fn); err != nil {
 		if spinner != nil {
 			spinner.Stop()
 		}
-		if p != nil {
-			p.Stop()
-		}
-		if strings.Contains(err.Error(), errtypes.UnknownOllamaKeyErrMsg) && isOllamaHost {
-			// the user has not added their ollama key to ollama.com
-			// return an error with a more user-friendly message
-			return unknownKey(err)
-		}
 		if strings.Contains(err.Error(), "access denied") {
 			return errors.New("you are not authorized to push to this namespace, create the model under a namespace you own")
 		}
@@ -651,7 +578,7 @@ func PushHandler(cmd *cobra.Command, args []string) error {
 	spinner.Stop()
 
 	destination := n.String()
-	if isOllamaHost {
+	if strings.HasSuffix(n.Host, ".ollama.ai") || strings.HasSuffix(n.Host, ".ollama.com") {
 		destination = "https://ollama.com/" + strings.TrimSuffix(n.DisplayShortest(), ":latest")
 	}
 	fmt.Printf("\nYou can find your model at:\n\n")
@@ -1547,8 +1474,6 @@ func NewCLI() *cobra.Command {
 				envVars["OLLAMA_GPU_OVERHEAD"],
 				envVars["OLLAMA_LOAD_TIMEOUT"],
 			})
-		case pushCmd:
-			appendEnvDocs(cmd, []envconfig.EnvVar{envVars["OLLAMA_NONINTERACTIVE"]})
 		default:
 			appendEnvDocs(cmd, envs)
 		}

cmd/cmd_test.go

@@ -15,7 +15,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/ollama/ollama/api"
-	"github.com/ollama/ollama/types/errtypes"
 )
 
 func TestShowInfo(t *testing.T) {
@@ -369,13 +368,15 @@ func TestGetModelfileName(t *testing.T) {
 
 func TestPushHandler(t *testing.T) {
 	tests := []struct {
+		name           string
 		modelName      string
 		serverResponse map[string]func(w http.ResponseWriter, r *http.Request)
 		expectedError  string
 		expectedOutput string
 	}{
 		{
-			modelName: "successful-push",
+			name:      "successful push",
+			modelName: "test-model",
 			serverResponse: map[string]func(w http.ResponseWriter, r *http.Request){
 				"/api/push": func(w http.ResponseWriter, r *http.Request) {
 					if r.Method != http.MethodPost {
@@ -388,8 +389,8 @@ func TestPushHandler(t *testing.T) {
 						return
 					}
 
-					if req.Name != "successful-push" {
-						t.Errorf("expected model name 'successful-push', got %s", req.Name)
+					if req.Name != "test-model" {
+						t.Errorf("expected model name 'test-model', got %s", req.Name)
 					}
 
 					// Simulate progress updates
@@ -408,10 +409,11 @@ func TestPushHandler(t *testing.T) {
 					}
 				},
 			},
-			expectedOutput: "\nYou can find your model at:\n\n\thttps://ollama.com/successful-push\n",
+			expectedOutput: "\nYou can find your model at:\n\n\thttps://ollama.com/test-model\n",
 		},
 		{
-			modelName: "unauthorized-push",
+			name:      "unauthorized push",
+			modelName: "unauthorized-model",
 			serverResponse: map[string]func(w http.ResponseWriter, r *http.Request){
 				"/api/push": func(w http.ResponseWriter, r *http.Request) {
 					w.Header().Set("Content-Type", "application/json")
@@ -426,29 +428,10 @@ func TestPushHandler(t *testing.T) {
 			},
 			expectedError: "you are not authorized to push to this namespace, create the model under a namespace you own",
 		},
-		{
-			modelName: "unknown-key-err",
-			serverResponse: map[string]func(w http.ResponseWriter, r *http.Request){
-				"/api/push": func(w http.ResponseWriter, r *http.Request) {
-					w.Header().Set("Content-Type", "application/json")
-					w.WriteHeader(http.StatusUnauthorized)
-					uerr := errtypes.UnknownOllamaKey{
-						Key: "aaa",
-					}
-					err := json.NewEncoder(w).Encode(map[string]string{
-						"error": uerr.Error(),
-					})
-					if err != nil {
-						t.Fatal(err)
-					}
-				},
-			},
-			expectedError: "unauthorized: unknown ollama key \"aaa\"",
-		},
 	}
 
 	for _, tt := range tests {
-		t.Run(tt.modelName, func(t *testing.T) {
+		t.Run(tt.name, func(t *testing.T) {
 			mockServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 				if handler, ok := tt.serverResponse[r.URL.Path]; ok {
 					handler(w, r)

docs/tutorials.md

@@ -1,9 +0,0 @@
-# Tutorials
-
-Here is a list of ways you can use Ollama with other tools to build interesting applications.
-
-- [Using LangChain with Ollama in JavaScript](./tutorials/langchainjs.md)
-- [Using LangChain with Ollama in Python](./tutorials/langchainpy.md)
-- [Running Ollama on NVIDIA Jetson Devices](./tutorials/nvidia-jetson.md)
-
-Also be sure to check out the [examples](../examples) directory for more ways to use Ollama.

envconfig/config.go

@@ -165,9 +165,6 @@ var (
 	IntelGPU = Bool("OLLAMA_INTEL_GPU")
 	// MultiUserCache optimizes prompt caching for multi-user scenarios
 	MultiUserCache = Bool("OLLAMA_MULTIUSER_CACHE")
-	// Noninteractive is true when CLI interactive features should be disabled.
-	// This affects features like automatic browser opening.
-	Noninteractive = Bool("OLLAMA_NONINTERACTIVE")
 )
 
 func String(s string) func() string {
@@ -253,7 +250,6 @@ func AsMap() map[string]EnvVar {
 		"OLLAMA_ORIGINS":           {"OLLAMA_ORIGINS", Origins(), "A comma separated list of allowed origins"},
 		"OLLAMA_SCHED_SPREAD":      {"OLLAMA_SCHED_SPREAD", SchedSpread(), "Always schedule model across all GPUs"},
 		"OLLAMA_MULTIUSER_CACHE":   {"OLLAMA_MULTIUSER_CACHE", MultiUserCache(), "Optimize prompt caching for multi-user scenarios"},
-		"OLLAMA_NONINTERACTIVE":    {"OLLAMA_NONINTERACTIVE", Noninteractive(), "Disable interactive CLI features, such as automatically opening the browser"},
 
 		// Informational
 		"HTTP_PROXY":  {"HTTP_PROXY", String("HTTP_PROXY")(), "HTTP proxy"},

go.mod

@@ -4,7 +4,6 @@ go 1.23.4
 
 require (
 	github.com/containerd/console v1.0.3
-	github.com/emirpasic/gods v1.18.1
 	github.com/gin-gonic/gin v1.10.0
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/uuid v1.6.0
@@ -12,12 +11,13 @@ require (
 	github.com/spf13/cobra v1.7.0
 	github.com/stretchr/testify v1.9.0
 	github.com/x448/float16 v0.8.4
-	golang.org/x/sync v0.9.0
+	golang.org/x/sync v0.10.0
 )
 
 require (
 	github.com/agnivade/levenshtein v1.1.1
 	github.com/d4l3k/go-bfloat16 v0.0.0-20211005043715-690c3bdd05f1
+	github.com/emirpasic/gods/v2 v2.0.0-alpha
 	github.com/google/go-cmp v0.6.0
 	github.com/mattn/go-runewidth v0.0.14
 	github.com/nlpodyssey/gopickle v0.3.0
@@ -36,7 +36,6 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/flatbuffers v24.3.25+incompatible // indirect
 	github.com/kr/text v0.2.0 // indirect
-	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
@@ -69,12 +68,12 @@ require (
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
 	golang.org/x/arch v0.8.0 // indirect
-	golang.org/x/crypto v0.23.0
+	golang.org/x/crypto v0.31.0
 	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
 	golang.org/x/net v0.25.0 // indirect
-	golang.org/x/sys v0.20.0
-	golang.org/x/term v0.20.0
-	golang.org/x/text v0.20.0
+	golang.org/x/sys v0.28.0
+	golang.org/x/term v0.27.0
+	golang.org/x/text v0.21.0
 	google.golang.org/protobuf v1.34.1
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -42,8 +42,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48 h1:fRzb/w+pyskVMQ+UbP35JkH8yB7MYb4q/qhBarqZE6g=
 github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA=
-github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
-github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
+github.com/emirpasic/gods/v2 v2.0.0-alpha h1:dwFlh8pBg1VMOXWGipNMRt8v96dKAIvBehtCt6OtunU=
+github.com/emirpasic/gods/v2 v2.0.0-alpha/go.mod h1:W0y4M2dtBB9U5z3YlghmpuUhiaZT2h6yoeE+C1sCp6A=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -159,8 +159,6 @@ github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2
 github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
 github.com/pierrec/lz4/v4 v4.1.8 h1:ieHkV+i2BRzngO4Wd/3HGowuZStgq6QkPsD1eolNAO4=
 github.com/pierrec/lz4/v4 v4.1.8/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
-github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -214,8 +212,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -268,8 +266,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
-golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -283,20 +281,19 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
-golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
+golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
-golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

llama/grammar/grammar_test.go

@@ -0,0 +1,107 @@
+package grammar
+
+import (
+	"bufio"
+	"bytes"
+	"strings"
+	"testing"
+
+	"github.com/ollama/ollama/llama"
+)
+
+// https://github.com/ollama/ollama/issues/7978
+const issue7978JSONSchema = `{
+  "type": "object",
+  "properties": {
+    "steps": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "explanation": { "type": "string" },
+          "output": { "type": "string" },
+          "nested": {
+            "type": "object",
+            "properties": {
+              "deep": { "type": "string" }
+            }
+          }
+        },
+        "required": ["explanation", "output"],
+        "additionalProperties": false
+      }
+    },
+    "final_answer": { "type": "string" },
+    "01_numbered_key": { "type": "string" },
+    "numbers": {
+      "type": "array",
+      "items": { "type": "number" }
+    },
+    "booleans": {
+      "type": "array", 
+      "items": { "type": "boolean" }
+    },
+    "mixed": {
+      "type": "array",
+      "items": {
+        "oneOf": [
+          { "type": "string" },
+          { "type": "number" },
+          { "type": "boolean" }
+        ]
+      }
+    }
+  },
+  "required": ["steps", "final_answer"],
+  "additionalProperties": false
+}`
+
+func TestIssue7978(t *testing.T) {
+	g := llama.SchemaToGrammar([]byte(issue7978JSONSchema))
+	if g == nil {
+		t.Fatal("failed to convert JSON schema to grammar")
+	}
+
+	t.Logf("grammar:\n%s", g)
+	t.Log()
+
+	var got string
+	s := bufio.NewScanner(bytes.NewReader(g))
+	for s.Scan() {
+		line := strings.TrimSpace(s.Text())
+		step, _, _ := strings.Cut(line, " ::= ")
+		step = strings.TrimSpace(step)
+		if step == "root" {
+			got = line
+		}
+	}
+
+	want := `root ::= "{" space steps-kv "," space final-answer-kv ( "," space ( 01-numbered-key-kv 01-numbered-key-rest | numbers-kv numbers-rest | booleans-kv booleans-rest | mixed-kv ) )? "}" space`
+	if got != want {
+		t.Errorf("root =\n%qwant:\n%q", got, want)
+	}
+}
+
+func TestSchemaToGrammer(t *testing.T) {
+	cases := []struct {
+		schema string
+		prefix []byte // nil is check as nil
+	}{
+		{`invalid`, nil},
+
+		// Simple heuristic/smoke test
+		{`{"type":"object"}`, []byte("root ::= object")},
+	}
+
+	for _, c := range cases {
+		t.Run("x", func(t *testing.T) {
+			g := llama.SchemaToGrammar([]byte(c.schema))
+			if c.prefix == nil && g != nil {
+				t.Fatalf("grammar = %v, want nil", g)
+			}
+			if !bytes.HasPrefix(g, c.prefix) {
+				t.Errorf("grammar = %q, want %q", g, c.prefix)
+			}
+		})
+	}
+}

llama/grammar_test.go

@@ -1,76 +0,0 @@
-package llama
-
-import (
-	"bufio"
-	"bytes"
-	"strings"
-	"testing"
-)
-
-// https://github.com/ollama/ollama/issues/7978
-const issue7978JSONSchema = `{
-  "type": "object",
-  "properties": {
-    "steps": {
-      "type": "array",
-      "items": {
-	"type": "object",
-	"properties": {
-	  "explanation": { "type": "string" },
-	  "output": { "type": "string" }
-	},
-	"required": ["explanation", "output"],
-	"additionalProperties": false
-      }
-    },
-    "final_answer": { "type": "string" }
-  },
-  "required": ["steps", "final_answer"],
-  "additionalProperties": false
-}`
-
-func TestIssue7978(t *testing.T) {
-	g := SchemaToGrammar([]byte(issue7978JSONSchema))
-	if g == nil {
-		t.Fatal("failed to convert JSON schema to grammar")
-	}
-
-	t.Logf("grammar:\n%s", g)
-	t.Log()
-
-	var sawSteps bool
-	s := bufio.NewScanner(bytes.NewReader(g))
-	for s.Scan() {
-		line := s.Text()
-		if strings.Contains(line, "steps") {
-			sawSteps = true
-		}
-		if strings.Contains(line, "final-answer") && !sawSteps {
-			t.Error("expected 'steps' before 'final-answer'")
-		}
-	}
-}
-
-func TestSchemaToGrammer(t *testing.T) {
-	cases := []struct {
-		schema string
-		prefix []byte // nil is check as nil
-	}{
-		{`invalid`, nil},
-
-		// Simple heuristic/smoke test
-		{`{"type":"object"}`, []byte("root ::= object")},
-	}
-
-	for _, c := range cases {
-		t.Run("x", func(t *testing.T) {
-			g := SchemaToGrammar([]byte(c.schema))
-			if c.prefix == nil && g != nil {
-				t.Fatalf("grammar = %v, want nil", g)
-			}
-			if !bytes.HasPrefix(g, c.prefix) {
-				t.Errorf("grammar = %q, want %q", g, c.prefix)
-			}
-		})
-	}
-}

readline/buffer.go

@@ -4,21 +4,21 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/emirpasic/gods/lists/arraylist"
+	"github.com/emirpasic/gods/v2/lists/arraylist"
 	"github.com/mattn/go-runewidth"
 	"golang.org/x/term"
 )
 
 type Buffer struct {
-	DisplayPos int
-	Pos        int
-	Buf        *arraylist.List
-	// LineHasSpace is an arraylist of bools to keep track of whether a line has a space at the end
-	LineHasSpace *arraylist.List
-	Prompt       *Prompt
-	LineWidth    int
-	Width        int
-	Height       int
+	Prompt    *Prompt
+	LineWidth int
+	Width     int
+	Height    int
+
+	line       *arraylist.List[rune]
+	spaceMask  *arraylist.List[bool]
+	pos        int
+	displayPos int
 }
 
 func NewBuffer(prompt *Prompt) (*Buffer, error) {
@@ -30,139 +30,113 @@ func NewBuffer(prompt *Prompt) (*Buffer, error) {
 
 	lwidth := width - len(prompt.prompt())
 
-	b := &Buffer{
-		DisplayPos:   0,
-		Pos:          0,
-		Buf:          arraylist.New(),
-		LineHasSpace: arraylist.New(),
-		Prompt:       prompt,
-		Width:        width,
-		Height:       height,
-		LineWidth:    lwidth,
-	}
-
-	return b, nil
+	return &Buffer{
+		displayPos: 0,
+		pos:        0,
+		line:       arraylist.New[rune](),
+		spaceMask:  arraylist.New[bool](),
+		Prompt:     prompt,
+		Width:      width,
+		Height:     height,
+		LineWidth:  lwidth,
+	}, nil
 }
 
 func (b *Buffer) GetLineSpacing(line int) bool {
-	hasSpace, _ := b.LineHasSpace.Get(line)
-
-	if hasSpace == nil {
-		return false
-	}
-
-	return hasSpace.(bool)
+	hasSpace, _ := b.spaceMask.Get(line)
+	return hasSpace
 }
 
 func (b *Buffer) MoveLeft() {
-	if b.Pos > 0 {
-		// asserts that we retrieve a rune
-		if e, ok := b.Buf.Get(b.Pos - 1); ok {
-			if r, ok := e.(rune); ok {
-				rLength := runewidth.RuneWidth(r)
+	if b.pos > 0 {
+		r, _ := b.line.Get(b.pos - 1)
+		rLength := runewidth.RuneWidth(r)
 
-				if b.DisplayPos%b.LineWidth == 0 {
-					fmt.Print(CursorUp + CursorBOL + CursorRightN(b.Width))
-					if rLength == 2 {
-						fmt.Print(CursorLeft)
-					}
-
-					line := b.DisplayPos/b.LineWidth - 1
-					hasSpace := b.GetLineSpacing(line)
-					if hasSpace {
-						b.DisplayPos -= 1
-						fmt.Print(CursorLeft)
-					}
-				} else {
-					fmt.Print(CursorLeftN(rLength))
-				}
-
-				b.Pos -= 1
-				b.DisplayPos -= rLength
+		if b.displayPos%b.LineWidth == 0 {
+			fmt.Print(CursorUp + CursorBOL + CursorRightN(b.Width))
+			if rLength == 2 {
+				fmt.Print(CursorLeft)
 			}
+
+			line := b.displayPos/b.LineWidth - 1
+			hasSpace := b.GetLineSpacing(line)
+			if hasSpace {
+				b.displayPos -= 1
+				fmt.Print(CursorLeft)
+			}
+		} else {
+			fmt.Print(CursorLeftN(rLength))
 		}
+
+		b.pos -= 1
+		b.displayPos -= rLength
 	}
 }
 
 func (b *Buffer) MoveLeftWord() {
-	if b.Pos > 0 {
-		var foundNonspace bool
-		for {
-			v, _ := b.Buf.Get(b.Pos - 1)
-			if v == ' ' {
-				if foundNonspace {
-					break
-				}
-			} else {
-				foundNonspace = true
-			}
-			b.MoveLeft()
-
-			if b.Pos == 0 {
+	var foundNonspace bool
+	for b.pos > 0 {
+		v, _ := b.line.Get(b.pos - 1)
+		if v == ' ' {
+			if foundNonspace {
 				break
 			}
+		} else {
+			foundNonspace = true
 		}
+		b.MoveLeft()
 	}
 }
 
 func (b *Buffer) MoveRight() {
-	if b.Pos < b.Buf.Size() {
-		if e, ok := b.Buf.Get(b.Pos); ok {
-			if r, ok := e.(rune); ok {
-				rLength := runewidth.RuneWidth(r)
-				b.Pos += 1
-				hasSpace := b.GetLineSpacing(b.DisplayPos / b.LineWidth)
-				b.DisplayPos += rLength
+	if b.pos < b.line.Size() {
+		r, _ := b.line.Get(b.pos)
+		rLength := runewidth.RuneWidth(r)
+		b.pos += 1
+		hasSpace := b.GetLineSpacing(b.displayPos / b.LineWidth)
+		b.displayPos += rLength
 
-				if b.DisplayPos%b.LineWidth == 0 {
-					fmt.Print(CursorDown + CursorBOL + CursorRightN(len(b.Prompt.prompt())))
-				} else if (b.DisplayPos-rLength)%b.LineWidth == b.LineWidth-1 && hasSpace {
-					fmt.Print(CursorDown + CursorBOL + CursorRightN(len(b.Prompt.prompt())+rLength))
-					b.DisplayPos += 1
-				} else if b.LineHasSpace.Size() > 0 && b.DisplayPos%b.LineWidth == b.LineWidth-1 && hasSpace {
-					fmt.Print(CursorDown + CursorBOL + CursorRightN(len(b.Prompt.prompt())))
-					b.DisplayPos += 1
-				} else {
-					fmt.Print(CursorRightN(rLength))
-				}
-			}
+		if b.displayPos%b.LineWidth == 0 {
+			fmt.Print(CursorDown + CursorBOL + CursorRightN(len(b.Prompt.prompt())))
+		} else if (b.displayPos-rLength)%b.LineWidth == b.LineWidth-1 && hasSpace {
+			fmt.Print(CursorDown + CursorBOL + CursorRightN(len(b.Prompt.prompt())+rLength))
+			b.displayPos += 1
+		} else if b.spaceMask.Size() > 0 && b.displayPos%b.LineWidth == b.LineWidth-1 && hasSpace {
+			fmt.Print(CursorDown + CursorBOL + CursorRightN(len(b.Prompt.prompt())))
+			b.displayPos += 1
+		} else {
+			fmt.Print(CursorRightN(rLength))
 		}
 	}
 }
 
 func (b *Buffer) MoveRightWord() {
-	if b.Pos < b.Buf.Size() {
-		for {
-			b.MoveRight()
-			v, _ := b.Buf.Get(b.Pos)
-			if v == ' ' {
-				break
-			}
-
-			if b.Pos == b.Buf.Size() {
-				break
-			}
+	for b.pos < b.line.Size() {
+		b.MoveRight()
+		v, _ := b.line.Get(b.pos)
+		if v == ' ' {
+			break
 		}
 	}
 }
 
 func (b *Buffer) MoveToStart() {
-	if b.Pos > 0 {
-		currLine := b.DisplayPos / b.LineWidth
+	if b.pos > 0 {
+		currLine := b.displayPos / b.LineWidth
 		if currLine > 0 {
 			for range currLine {
 				fmt.Print(CursorUp)
 			}
 		}
 		fmt.Print(CursorBOL + CursorRightN(len(b.Prompt.prompt())))
-		b.Pos = 0
-		b.DisplayPos = 0
+		b.pos = 0
+		b.displayPos = 0
 	}
 }
 
 func (b *Buffer) MoveToEnd() {
-	if b.Pos < b.Buf.Size() {
-		currLine := b.DisplayPos / b.LineWidth
+	if b.pos < b.line.Size() {
+		currLine := b.displayPos / b.LineWidth
 		totalLines := b.DisplaySize() / b.LineWidth
 		if currLine < totalLines {
 			for range totalLines - currLine {
@@ -171,21 +145,19 @@ func (b *Buffer) MoveToEnd() {
 			remainder := b.DisplaySize() % b.LineWidth
 			fmt.Print(CursorBOL + CursorRightN(len(b.Prompt.prompt())+remainder))
 		} else {
-			fmt.Print(CursorRightN(b.DisplaySize() - b.DisplayPos))
+			fmt.Print(CursorRightN(b.DisplaySize() - b.displayPos))
 		}
 
-		b.Pos = b.Buf.Size()
-		b.DisplayPos = b.DisplaySize()
+		b.pos = b.line.Size()
+		b.displayPos = b.DisplaySize()
 	}
 }
 
 func (b *Buffer) DisplaySize() int {
 	sum := 0
-	for i := range b.Buf.Size() {
-		if e, ok := b.Buf.Get(i); ok {
-			if r, ok := e.(rune); ok {
-				sum += runewidth.RuneWidth(r)
-			}
+	for i := range b.line.Size() {
+		if r, ok := b.line.Get(i); ok {
+			sum += runewidth.RuneWidth(r)
 		}
 	}
 
@@ -193,7 +165,7 @@ func (b *Buffer) DisplaySize() int {
 }
 
 func (b *Buffer) Add(r rune) {
-	if b.Pos == b.Buf.Size() {
+	if b.pos == b.line.Size() {
 		b.AddChar(r, false)
 	} else {
 		b.AddChar(r, true)
@@ -202,32 +174,32 @@ func (b *Buffer) Add(r rune) {
 
 func (b *Buffer) AddChar(r rune, insert bool) {
 	rLength := runewidth.RuneWidth(r)
-	b.DisplayPos += rLength
+	b.displayPos += rLength
 
-	if b.Pos > 0 {
-		if b.DisplayPos%b.LineWidth == 0 {
+	if b.pos > 0 {
+		if b.displayPos%b.LineWidth == 0 {
 			fmt.Printf("%c", r)
 			fmt.Printf("\n%s", b.Prompt.AltPrompt)
 
 			if insert {
-				b.LineHasSpace.Set(b.DisplayPos/b.LineWidth-1, false)
+				b.spaceMask.Set(b.displayPos/b.LineWidth-1, false)
 			} else {
-				b.LineHasSpace.Add(false)
+				b.spaceMask.Add(false)
 			}
 
 			// this case occurs when a double-width rune crosses the line boundary
-		} else if b.DisplayPos%b.LineWidth < (b.DisplayPos-rLength)%b.LineWidth {
+		} else if b.displayPos%b.LineWidth < (b.displayPos-rLength)%b.LineWidth {
 			if insert {
 				fmt.Print(ClearToEOL)
 			}
 			fmt.Printf("\n%s", b.Prompt.AltPrompt)
-			b.DisplayPos += 1
+			b.displayPos += 1
 			fmt.Printf("%c", r)
 
 			if insert {
-				b.LineHasSpace.Set(b.DisplayPos/b.LineWidth-1, true)
+				b.spaceMask.Set(b.displayPos/b.LineWidth-1, true)
 			} else {
-				b.LineHasSpace.Add(true)
+				b.spaceMask.Add(true)
 			}
 		} else {
 			fmt.Printf("%c", r)
@@ -237,12 +209,12 @@ func (b *Buffer) AddChar(r rune, insert bool) {
 	}
 
 	if insert {
-		b.Buf.Insert(b.Pos, r)
+		b.line.Insert(b.pos, r)
 	} else {
-		b.Buf.Add(r)
+		b.line.Add(r)
 	}
 
-	b.Pos += 1
+	b.pos += 1
 
 	if insert {
 		b.drawRemaining()
@@ -257,11 +229,9 @@ func (b *Buffer) countRemainingLineWidth(place int) int {
 	for place <= b.LineWidth {
 		counter += 1
 		sum += prevLen
-		if e, ok := b.Buf.Get(b.Pos + counter); ok {
-			if r, ok := e.(rune); ok {
-				place += runewidth.RuneWidth(r)
-				prevLen = len(string(r))
-			}
+		if r, ok := b.line.Get(b.pos + counter); ok {
+			place += runewidth.RuneWidth(r)
+			prevLen = len(string(r))
 		} else {
 			break
 		}
@@ -272,9 +242,9 @@ func (b *Buffer) countRemainingLineWidth(place int) int {
 
 func (b *Buffer) drawRemaining() {
 	var place int
-	remainingText := b.StringN(b.Pos)
-	if b.Pos > 0 {
-		place = b.DisplayPos % b.LineWidth
+	remainingText := b.StringN(b.pos)
+	if b.pos > 0 {
+		place = b.displayPos % b.LineWidth
 	}
 	fmt.Print(CursorHide)
 
@@ -292,14 +262,14 @@ func (b *Buffer) drawRemaining() {
 	}
 
 	if currLineSpace != b.LineWidth-place && currLineSpace != remLength {
-		b.LineHasSpace.Set(b.DisplayPos/b.LineWidth, true)
+		b.spaceMask.Set(b.displayPos/b.LineWidth, true)
 	} else if currLineSpace != b.LineWidth-place {
-		b.LineHasSpace.Remove(b.DisplayPos / b.LineWidth)
+		b.spaceMask.Remove(b.displayPos / b.LineWidth)
 	} else {
-		b.LineHasSpace.Set(b.DisplayPos/b.LineWidth, false)
+		b.spaceMask.Set(b.displayPos/b.LineWidth, false)
 	}
 
-	if (b.DisplayPos+currLineSpace)%b.LineWidth == 0 && currLine == remainingText {
+	if (b.displayPos+currLineSpace)%b.LineWidth == 0 && currLine == remainingText {
 		fmt.Print(CursorRightN(currLineSpace))
 		fmt.Printf("\n%s", b.Prompt.AltPrompt)
 		fmt.Print(CursorUp + CursorBOL + CursorRightN(b.Width-currLineSpace))
@@ -319,9 +289,9 @@ func (b *Buffer) drawRemaining() {
 
 				if displayLength != 0 {
 					if lineLength == b.LineWidth {
-						b.LineHasSpace.Set(b.DisplayPos/b.LineWidth+totalLines-1, false)
+						b.spaceMask.Set(b.displayPos/b.LineWidth+totalLines-1, false)
 					} else {
-						b.LineHasSpace.Set(b.DisplayPos/b.LineWidth+totalLines-1, true)
+						b.spaceMask.Set(b.displayPos/b.LineWidth+totalLines-1, true)
 					}
 				}
 
@@ -334,9 +304,9 @@ func (b *Buffer) drawRemaining() {
 		}
 		fmt.Print(ClearToEOL + CursorUpN(totalLines) + CursorBOL + CursorRightN(b.Width-currLineSpace))
 
-		hasSpace := b.GetLineSpacing(b.DisplayPos / b.LineWidth)
+		hasSpace := b.GetLineSpacing(b.displayPos / b.LineWidth)
 
-		if hasSpace && b.DisplayPos%b.LineWidth != b.LineWidth-1 {
+		if hasSpace && b.displayPos%b.LineWidth != b.LineWidth-1 {
 			fmt.Print(CursorLeft)
 		}
 	}
@@ -345,65 +315,63 @@ func (b *Buffer) drawRemaining() {
 }
 
 func (b *Buffer) Remove() {
-	if b.Buf.Size() > 0 && b.Pos > 0 {
-		if e, ok := b.Buf.Get(b.Pos - 1); ok {
-			if r, ok := e.(rune); ok {
-				rLength := runewidth.RuneWidth(r)
-				hasSpace := b.GetLineSpacing(b.DisplayPos/b.LineWidth - 1)
+	if b.line.Size() > 0 && b.pos > 0 {
+		if r, ok := b.line.Get(b.pos - 1); ok {
+			rLength := runewidth.RuneWidth(r)
+			hasSpace := b.GetLineSpacing(b.displayPos/b.LineWidth - 1)
 
-				if b.DisplayPos%b.LineWidth == 0 {
-					// if the user backspaces over the word boundary, do this magic to clear the line
-					// and move to the end of the previous line
-					fmt.Print(CursorBOL + ClearToEOL + CursorUp + CursorBOL + CursorRightN(b.Width))
+			if b.displayPos%b.LineWidth == 0 {
+				// if the user backspaces over the word boundary, do this magic to clear the line
+				// and move to the end of the previous line
+				fmt.Print(CursorBOL + ClearToEOL + CursorUp + CursorBOL + CursorRightN(b.Width))
 
-					if b.DisplaySize()%b.LineWidth < (b.DisplaySize()-rLength)%b.LineWidth {
-						b.LineHasSpace.Remove(b.DisplayPos/b.LineWidth - 1)
-					}
+				if b.DisplaySize()%b.LineWidth < (b.DisplaySize()-rLength)%b.LineWidth {
+					b.spaceMask.Remove(b.displayPos/b.LineWidth - 1)
+				}
 
-					if hasSpace {
-						b.DisplayPos -= 1
-						fmt.Print(CursorLeft)
-					}
+				if hasSpace {
+					b.displayPos -= 1
+					fmt.Print(CursorLeft)
+				}
 
-					if rLength == 2 {
-						fmt.Print(CursorLeft + "  " + CursorLeftN(2))
-					} else {
-						fmt.Print(" " + CursorLeft)
-					}
-				} else if (b.DisplayPos-rLength)%b.LineWidth == 0 && hasSpace {
-					fmt.Print(CursorBOL + ClearToEOL + CursorUp + CursorBOL + CursorRightN(b.Width))
-
-					if b.Pos == b.Buf.Size() {
-						b.LineHasSpace.Remove(b.DisplayPos/b.LineWidth - 1)
-					}
-					b.DisplayPos -= 1
+				if rLength == 2 {
+					fmt.Print(CursorLeft + "  " + CursorLeftN(2))
 				} else {
-					fmt.Print(CursorLeftN(rLength))
-					for range rLength {
-						fmt.Print(" ")
-					}
-					fmt.Print(CursorLeftN(rLength))
+					fmt.Print(" " + CursorLeft)
 				}
+			} else if (b.displayPos-rLength)%b.LineWidth == 0 && hasSpace {
+				fmt.Print(CursorBOL + ClearToEOL + CursorUp + CursorBOL + CursorRightN(b.Width))
 
-				var eraseExtraLine bool
-				if (b.DisplaySize()-1)%b.LineWidth == 0 || (rLength == 2 && ((b.DisplaySize()-2)%b.LineWidth == 0)) || b.DisplaySize()%b.LineWidth == 0 {
-					eraseExtraLine = true
+				if b.pos == b.line.Size() {
+					b.spaceMask.Remove(b.displayPos/b.LineWidth - 1)
 				}
+				b.displayPos -= 1
+			} else {
+				fmt.Print(CursorLeftN(rLength))
+				for range rLength {
+					fmt.Print(" ")
+				}
+				fmt.Print(CursorLeftN(rLength))
+			}
 
-				b.Pos -= 1
-				b.DisplayPos -= rLength
-				b.Buf.Remove(b.Pos)
+			var eraseExtraLine bool
+			if (b.DisplaySize()-1)%b.LineWidth == 0 || (rLength == 2 && ((b.DisplaySize()-2)%b.LineWidth == 0)) || b.DisplaySize()%b.LineWidth == 0 {
+				eraseExtraLine = true
+			}
 
-				if b.Pos < b.Buf.Size() {
-					b.drawRemaining()
-					// this erases a line which is left over when backspacing in the middle of a line and there
-					// are trailing characters which go over the line width boundary
-					if eraseExtraLine {
-						remainingLines := (b.DisplaySize() - b.DisplayPos) / b.LineWidth
-						fmt.Print(CursorDownN(remainingLines+1) + CursorBOL + ClearToEOL)
-						place := b.DisplayPos % b.LineWidth
-						fmt.Print(CursorUpN(remainingLines+1) + CursorRightN(place+len(b.Prompt.prompt())))
-					}
+			b.pos -= 1
+			b.displayPos -= rLength
+			b.line.Remove(b.pos)
+
+			if b.pos < b.line.Size() {
+				b.drawRemaining()
+				// this erases a line which is left over when backspacing in the middle of a line and there
+				// are trailing characters which go over the line width boundary
+				if eraseExtraLine {
+					remainingLines := (b.DisplaySize() - b.displayPos) / b.LineWidth
+					fmt.Print(CursorDownN(remainingLines+1) + CursorBOL + ClearToEOL)
+					place := b.displayPos % b.LineWidth
+					fmt.Print(CursorUpN(remainingLines+1) + CursorRightN(place+len(b.Prompt.prompt())))
 				}
 			}
 		}
@@ -411,14 +379,14 @@ func (b *Buffer) Remove() {
 }
 
 func (b *Buffer) Delete() {
-	if b.Buf.Size() > 0 && b.Pos < b.Buf.Size() {
-		b.Buf.Remove(b.Pos)
+	if b.line.Size() > 0 && b.pos < b.line.Size() {
+		b.line.Remove(b.pos)
 		b.drawRemaining()
 		if b.DisplaySize()%b.LineWidth == 0 {
-			if b.DisplayPos != b.DisplaySize() {
-				remainingLines := (b.DisplaySize() - b.DisplayPos) / b.LineWidth
+			if b.displayPos != b.DisplaySize() {
+				remainingLines := (b.DisplaySize() - b.displayPos) / b.LineWidth
 				fmt.Print(CursorDownN(remainingLines) + CursorBOL + ClearToEOL)
-				place := b.DisplayPos % b.LineWidth
+				place := b.displayPos % b.LineWidth
 				fmt.Print(CursorUpN(remainingLines) + CursorRightN(place+len(b.Prompt.prompt())))
 			}
 		}
@@ -426,16 +394,16 @@ func (b *Buffer) Delete() {
 }
 
 func (b *Buffer) DeleteBefore() {
-	if b.Pos > 0 {
-		for cnt := b.Pos - 1; cnt >= 0; cnt-- {
+	if b.pos > 0 {
+		for cnt := b.pos - 1; cnt >= 0; cnt-- {
 			b.Remove()
 		}
 	}
 }
 
 func (b *Buffer) DeleteRemaining() {
-	if b.DisplaySize() > 0 && b.Pos < b.DisplaySize() {
-		charsToDel := b.Buf.Size() - b.Pos
+	if b.DisplaySize() > 0 && b.pos < b.DisplaySize() {
+		charsToDel := b.line.Size() - b.pos
 		for range charsToDel {
 			b.Delete()
 		}
@@ -443,10 +411,10 @@ func (b *Buffer) DeleteRemaining() {
 }
 
 func (b *Buffer) DeleteWord() {
-	if b.Buf.Size() > 0 && b.Pos > 0 {
+	if b.line.Size() > 0 {
 		var foundNonspace bool
-		for {
-			v, _ := b.Buf.Get(b.Pos - 1)
+		for b.pos > 0 {
+			v, _ := b.line.Get(b.pos - 1)
 			if v == ' ' {
 				if !foundNonspace {
 					b.Remove()
@@ -457,10 +425,6 @@ func (b *Buffer) DeleteWord() {
 				foundNonspace = true
 				b.Remove()
 			}
-
-			if b.Pos == 0 {
-				break
-			}
 		}
 	}
 }
@@ -471,10 +435,10 @@ func (b *Buffer) ClearScreen() {
 		ph := b.Prompt.placeholder()
 		fmt.Print(ColorGrey + ph + CursorLeftN(len(ph)) + ColorDefault)
 	} else {
-		currPos := b.DisplayPos
-		currIndex := b.Pos
-		b.Pos = 0
-		b.DisplayPos = 0
+		currPos := b.displayPos
+		currIndex := b.pos
+		b.pos = 0
+		b.displayPos = 0
 		b.drawRemaining()
 		fmt.Print(CursorReset + CursorRightN(len(b.Prompt.prompt())))
 		if currPos > 0 {
@@ -492,21 +456,21 @@ func (b *Buffer) ClearScreen() {
 				fmt.Print(CursorBOL + b.Prompt.AltPrompt)
 			}
 		}
-		b.Pos = currIndex
-		b.DisplayPos = currPos
+		b.pos = currIndex
+		b.displayPos = currPos
 	}
 }
 
 func (b *Buffer) IsEmpty() bool {
-	return b.Buf.Empty()
+	return b.line.Empty()
 }
 
 func (b *Buffer) Replace(r []rune) {
-	b.DisplayPos = 0
-	b.Pos = 0
+	b.displayPos = 0
+	b.pos = 0
 	lineNums := b.DisplaySize() / b.LineWidth
 
-	b.Buf.Clear()
+	b.line.Clear()
 
 	fmt.Print(CursorBOL + ClearToEOL)
 
@@ -532,11 +496,11 @@ func (b *Buffer) StringN(n int) string {
 func (b *Buffer) StringNM(n, m int) string {
 	var s string
 	if m == 0 {
-		m = b.Buf.Size()
+		m = b.line.Size()
 	}
 	for cnt := n; cnt < m; cnt++ {
-		c, _ := b.Buf.Get(cnt)
-		s += string(c.(rune))
+		c, _ := b.line.Get(cnt)
+		s += string(c)
 	}
 	return s
 }

readline/history.go

@@ -2,127 +2,100 @@ package readline
 
 import (
 	"bufio"
-	"errors"
-	"io"
+	"fmt"
 	"os"
 	"path/filepath"
 	"strings"
 
-	"github.com/emirpasic/gods/lists/arraylist"
+	"github.com/emirpasic/gods/v2/lists/arraylist"
 )
 
 type History struct {
-	Buf      *arraylist.List
-	Autosave bool
-	Pos      int
-	Limit    int
-	Filename string
-	Enabled  bool
+	Enabled bool
+
+	lines    *arraylist.List[string]
+	limit    int
+	pos      int
+	filename string
 }
 
 func NewHistory() (*History, error) {
 	h := &History{
-		Buf:      arraylist.New(),
-		Limit:    100, // resizeme
-		Autosave: true,
-		Enabled:  true,
+		Enabled: true,
+		lines:   arraylist.New[string](),
+		limit:   100, // resizeme
 	}
 
-	err := h.Init()
+	home, err := os.UserHomeDir()
 	if err != nil {
 		return nil, err
 	}
 
+	path := filepath.Join(home, ".ollama", "history")
+	if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
+		return nil, err
+	}
+
+	h.filename = path
+
+	f, err := os.OpenFile(path, os.O_CREATE|os.O_RDONLY, 0o600)
+	if err != nil {
+		return nil, err
+	}
+	defer f.Close()
+
+	scanner := bufio.NewScanner(f)
+	for scanner.Scan() {
+		if line := strings.TrimSpace(scanner.Text()); len(line) > 0 {
+			h.Add(line)
+		}
+	}
+
 	return h, nil
 }
 
-func (h *History) Init() error {
-	home, err := os.UserHomeDir()
-	if err != nil {
-		return err
-	}
-
-	path := filepath.Join(home, ".ollama", "history")
-	if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
-		return err
-	}
-
-	h.Filename = path
-
-	f, err := os.OpenFile(path, os.O_CREATE|os.O_RDONLY, 0o600)
-	if err != nil {
-		if errors.Is(err, os.ErrNotExist) {
-			return nil
-		}
-		return err
-	}
-	defer f.Close()
-
-	r := bufio.NewReader(f)
-	for {
-		line, err := r.ReadString('\n')
-		if err != nil {
-			if errors.Is(err, io.EOF) {
-				break
-			}
-			return err
-		}
-
-		line = strings.TrimSpace(line)
-		if len(line) == 0 {
-			continue
-		}
-
-		h.Add([]rune(line))
-	}
-
-	return nil
-}
-
-func (h *History) Add(l []rune) {
-	h.Buf.Add(l)
-	h.Compact()
-	h.Pos = h.Size()
-	if h.Autosave {
+func (h *History) Add(s string) {
+	if latest, _ := h.lines.Get(h.Size() - 1); latest != s {
+		h.lines.Add(s)
+		h.Compact()
 		_ = h.Save()
 	}
+	// always set position to the end
+	h.pos = h.Size()
 }
 
 func (h *History) Compact() {
-	s := h.Buf.Size()
-	if s > h.Limit {
-		for range s - h.Limit {
-			h.Buf.Remove(0)
+	if s := h.lines.Size(); s > h.limit {
+		for range s - h.limit {
+			h.lines.Remove(0)
 		}
 	}
 }
 
 func (h *History) Clear() {
-	h.Buf.Clear()
+	h.lines.Clear()
 }
 
-func (h *History) Prev() []rune {
-	var line []rune
-	if h.Pos > 0 {
-		h.Pos -= 1
+func (h *History) Prev() (line string) {
+	if h.pos > 0 {
+		h.pos -= 1
 	}
-	v, _ := h.Buf.Get(h.Pos)
-	line, _ = v.([]rune)
+	// return first line if at the beginning
+	line, _ = h.lines.Get(h.pos)
 	return line
 }
 
-func (h *History) Next() []rune {
-	var line []rune
-	if h.Pos < h.Buf.Size() {
-		h.Pos += 1
-		v, _ := h.Buf.Get(h.Pos)
-		line, _ = v.([]rune)
+func (h *History) Next() (line string) {
+	if h.pos < h.lines.Size() {
+		h.pos += 1
+		line, _ = h.lines.Get(h.pos)
 	}
+	// return empty string if at the end
 	return line
 }
 
 func (h *History) Size() int {
-	return h.Buf.Size()
+	return h.lines.Size()
 }
 
 func (h *History) Save() error {
@@ -130,28 +103,21 @@ func (h *History) Save() error {
 		return nil
 	}
 
-	tmpFile := h.Filename + ".tmp"
-
-	f, err := os.OpenFile(tmpFile, os.O_CREATE|os.O_WRONLY|os.O_TRUNC|os.O_APPEND, 0o600)
+	f, err := os.CreateTemp(filepath.Dir(h.filename), "")
 	if err != nil {
 		return err
 	}
-	defer f.Close()
 
-	buf := bufio.NewWriter(f)
-	for cnt := range h.Size() {
-		v, _ := h.Buf.Get(cnt)
-		line, _ := v.([]rune)
-		if _, err := buf.WriteString(string(line) + "\n"); err != nil {
-			return err
-		}
-	}
-	buf.Flush()
-	f.Close()
+	func() {
+		defer f.Close()
 
-	if err = os.Rename(tmpFile, h.Filename); err != nil {
-		return err
-	}
+		w := bufio.NewWriter(f)
+		defer w.Flush()
 
-	return nil
+		h.lines.Each(func(i int, line string) {
+			fmt.Fprintln(w, line)
+		})
+	}()
+
+	return os.Rename(f.Name(), h.filename)
 }

readline/readline.go

@@ -91,8 +91,6 @@ func (i *Instance) Readline() (string, error) {
 	var escex bool
 	var metaDel bool
 
-	var currentLineBuf []rune
-
 	for {
 		// don't show placeholder when pasting unless we're in multiline mode
 		showPlaceholder := !i.Pasting || i.Prompt.UseAlt
@@ -116,19 +114,9 @@ func (i *Instance) Readline() (string, error) {
 
 			switch r {
 			case KeyUp:
-				if i.History.Pos > 0 {
-					if i.History.Pos == i.History.Size() {
-						currentLineBuf = []rune(buf.String())
-					}
-					buf.Replace(i.History.Prev())
-				}
+				buf.Replace([]rune(i.History.Prev()))
 			case KeyDown:
-				if i.History.Pos < i.History.Size() {
-					buf.Replace(i.History.Next())
-					if i.History.Pos == i.History.Size() {
-						buf.Replace(currentLineBuf)
-					}
-				}
+				buf.Replace([]rune(i.History.Next()))
 			case KeyLeft:
 				buf.MoveLeft()
 			case KeyRight:
@@ -220,7 +208,7 @@ func (i *Instance) Readline() (string, error) {
 		case CharEnter, CharCtrlJ:
 			output := buf.String()
 			if output != "" {
-				i.History.Add([]rune(output))
+				i.History.Add(output)
 			}
 			buf.MoveToEnd()
 			fmt.Println()

scripts/build_darwin.sh

@@ -15,28 +15,36 @@ export CGO_CXXFLAGS=-mmacosx-version-min=11.3
 export CGO_LDFLAGS=-mmacosx-version-min=11.3
 
 rm -rf llama/build dist/darwin-*
+
+# Generate the universal ollama binary for stand-alone usage: metal + avx
+echo "Building binary"
 echo "Building darwin arm64"
 GOOS=darwin ARCH=arm64 GOARCH=arm64 make -j 8 dist
 echo "Building darwin amd64 with AVX enabled"
 GOOS=darwin ARCH=amd64 GOARCH=amd64 CUSTOM_CPU_FLAGS="avx" make -j 8 dist_exe
-
-# Generate the universal ollama binary for stand-alone usage: metal + avx
 lipo -create -output dist/ollama-darwin dist/darwin-arm64/bin/ollama dist/darwin-amd64/bin/ollama
 
+# sign the binary and rename it
+if [ -n "$APPLE_IDENTITY" ]; then
+    codesign -f --timestamp -s "$APPLE_IDENTITY" --identifier ai.ollama.ollama --options=runtime dist/ollama-darwin
+else
+    echo "WARNING: Skipping code signing - set APPLE_IDENTITY"
+fi
+ditto -c -k --keepParent dist/ollama-darwin dist/temp.zip
+if [ -n "$APPLE_IDENTITY" ]; then
+    xcrun notarytool submit dist/temp.zip --wait --timeout 10m --apple-id $APPLE_ID --password $APPLE_PASSWORD --team-id $APPLE_TEAM_ID
+fi
+rm -f dist/temp.zip
+
+# Build the app bundle
+echo "Building app"
 echo "Building darwin amd64 with runners"
 rm dist/darwin-amd64/bin/ollama
 GOOS=darwin ARCH=amd64 GOARCH=amd64 make -j 8 dist
+
 # Generate the universal ollama binary for the app bundle: metal + no-avx
 lipo -create -output dist/ollama dist/darwin-arm64/bin/ollama dist/darwin-amd64/bin/ollama
 
-
-if [ -n "$APPLE_IDENTITY" ]; then
-    codesign --deep --force --options=runtime --sign "$APPLE_IDENTITY" --timestamp dist/ollama
-else
-    echo "Skipping code signing - set APPLE_IDENTITY"
-fi
-chmod +x dist/ollama
-
 # build and optionally sign the mac app
 npm install --prefix macapp
 if [ -n "$APPLE_IDENTITY" ]; then
@@ -46,14 +54,3 @@ else
 fi
 cp macapp/out/make/zip/darwin/universal/Ollama-darwin-universal-$VERSION.zip dist/Ollama-darwin.zip
 
-# sign the binary and rename it
-if [ -n "$APPLE_IDENTITY" ]; then
-    codesign -f --timestamp -s "$APPLE_IDENTITY" --identifier ai.ollama.ollama --options=runtime dist/ollama
-else
-    echo "WARNING: Skipping code signing - set APPLE_IDENTITY"
-fi
-ditto -c -k --keepParent dist/ollama dist/temp.zip
-if [ -n "$APPLE_IDENTITY" ]; then
-    xcrun notarytool submit dist/temp.zip --wait --timeout 10m --apple-id $APPLE_ID --password $APPLE_PASSWORD --team-id $APPLE_TEAM_ID
-fi
-rm -f dist/temp.zip

server/images.go

@@ -23,16 +23,13 @@ import (
 	"strings"
 
 	"github.com/ollama/ollama/api"
-	"github.com/ollama/ollama/auth"
 	"github.com/ollama/ollama/envconfig"
 	"github.com/ollama/ollama/format"
 	"github.com/ollama/ollama/llama"
 	"github.com/ollama/ollama/llm"
 	"github.com/ollama/ollama/parser"
 	"github.com/ollama/ollama/template"
-	"github.com/ollama/ollama/types/errtypes"
 	"github.com/ollama/ollama/types/model"
-	"github.com/ollama/ollama/types/registry"
 	"github.com/ollama/ollama/version"
 )
 
@@ -987,6 +984,8 @@ func GetSHA256Digest(r io.Reader) (string, int64) {
 	return fmt.Sprintf("sha256:%x", h.Sum(nil)), n
 }
 
+var errUnauthorized = errors.New("unauthorized: access denied")
+
 func makeRequestWithRetry(ctx context.Context, method string, requestURL *url.URL, headers http.Header, body io.ReadSeeker, regOpts *registryOptions) (*http.Response, error) {
 	for range 2 {
 		resp, err := makeRequest(ctx, method, requestURL, headers, body, regOpts)
@@ -1024,33 +1023,13 @@ func makeRequestWithRetry(ctx context.Context, method string, requestURL *url.UR
 			if err != nil {
 				return nil, fmt.Errorf("%d: %s", resp.StatusCode, err)
 			}
-
-			var re registry.Errs
-			if err := json.Unmarshal(responseBody, &re); err == nil && len(re.Errors) > 0 {
-				if re.HasCode(registry.ErrCodeAnonymous) {
-					// if the error is due to anonymous access return a custom error
-					// this error is used by the CLI to direct a user to add their key to an account
-					pubKey, nestedErr := auth.GetPublicKey()
-					if nestedErr != nil {
-						slog.Error(fmt.Sprintf("couldn't get public key: %v", nestedErr))
-						return nil, re
-					}
-					return nil, errtypes.UnknownOllamaKey{
-						Key: pubKey,
-					}
-				}
-				return nil, re
-			}
-
-			// Fallback to returning the raw response if parsing fails
 			return nil, fmt.Errorf("%d: %s", resp.StatusCode, responseBody)
 		default:
 			return resp, nil
 		}
 	}
 
-	// should never be reached
-	return nil, fmt.Errorf("failed to make upload request")
+	return nil, errUnauthorized
 }
 
 // testMakeRequestDialContext specifies the dial function for the http client in

types/errtypes/errtypes.go

@@ -16,6 +16,6 @@ type UnknownOllamaKey struct {
 	Key string
 }
 
-func (e UnknownOllamaKey) Error() string {
+func (e *UnknownOllamaKey) Error() string {
 	return fmt.Sprintf("unauthorized: %s %q", UnknownOllamaKeyErrMsg, strings.TrimSpace(e.Key))
 }

types/registry/error.go

@@ -1,37 +0,0 @@
-package registry
-
-import (
-	"fmt"
-	"slices"
-	"strings"
-)
-
-const ErrCodeAnonymous = "ANONYMOUS_ACCESS_DENIED"
-
-type Err struct {
-	Code    string `json:"code"`
-	Message string `json:"message"`
-}
-
-// Errs represents the structure of error responses from the registry
-// TODO (brucemacd): this struct should be imported from some shared package that is used between the registry and ollama
-type Errs struct {
-	Errors []Err `json:"errors"`
-}
-
-func (e Errs) Error() string {
-	if len(e.Errors) == 0 {
-		return "unknown registry error"
-	}
-	var msgs []string
-	for _, err := range e.Errors {
-		msgs = append(msgs, fmt.Sprintf("%s: %s", err.Code, err.Message))
-	}
-	return strings.Join(msgs, "; ")
-}
-
-func (e Errs) HasCode(code string) bool {
-	return slices.ContainsFunc(e.Errors, func(err Err) bool {
-		return err.Code == code
-	})
-}