allow pushing/pulling to insecure registries

README.md

@@ -125,13 +125,3 @@ Finally, run a model!
 ```
 ./ollama run llama2
 ```
-
-## REST API
-
-### `POST /api/generate`
-
-Generate text from a model.
-
-```
-curl -X POST http://localhost:11434/api/generate -d '{"model": "llama2", "prompt":"Why is the sky blue?"}'
-```

api/client.go

@@ -27,7 +27,7 @@ func checkError(resp *http.Response, body []byte) error {
 	err := json.Unmarshal(body, &apiError)
 	if err != nil {
 		// Use the full body as the message if we fail to decode a response.
-		apiError.ErrorMessage = string(body)
+		apiError.Message = string(body)
 	}
 
 	return apiError
@@ -92,6 +92,7 @@ func (c *Client) do(ctx context.Context, method, path string, reqData, respData
 		}
 	}
 	return nil
+
 }
 
 func (c *Client) stream(ctx context.Context, method, path string, data any, fn func([]byte) error) error {
@@ -136,9 +137,9 @@ func (c *Client) stream(ctx context.Context, method, path string, data any, fn f
 
 		if response.StatusCode >= 400 {
 			return StatusError{
-				StatusCode:   response.StatusCode,
-				Status:       response.Status,
-				ErrorMessage: errorResponse.Error,
+				StatusCode: response.StatusCode,
+				Status:     response.Status,
+				Message:    errorResponse.Error,
 			}
 		}
 
@@ -210,9 +211,15 @@ func (c *Client) List(ctx context.Context) (*ListResponse, error) {
 	return &lr, nil
 }
 
-func (c *Client) Delete(ctx context.Context, req *DeleteRequest) error {
-	if err := c.do(ctx, http.MethodDelete, "/api/delete", req, nil); err != nil {
-		return err
-	}
-	return nil
+type DeleteProgressFunc func(ProgressResponse) error
+
+func (c *Client) Delete(ctx context.Context, req *DeleteRequest, fn DeleteProgressFunc) error {
+	return c.stream(ctx, http.MethodDelete, "/api/delete", req, func(bts []byte) error {
+		var resp ProgressResponse
+		if err := json.Unmarshal(bts, &resp); err != nil {
+			return err
+		}
+
+		return fn(resp)
+	})
 }

api/types.go

@@ -8,23 +8,16 @@ import (
 )
 
 type StatusError struct {
-	StatusCode   int
-	Status       string
-	ErrorMessage string `json:"error"`
+	StatusCode int
+	Status     string
+	Message    string
 }
 
 func (e StatusError) Error() string {
-	switch {
-	case e.Status != "" && e.ErrorMessage != "":
-		return fmt.Sprintf("%s: %s", e.Status, e.ErrorMessage)
-	case e.Status != "":
-		return e.Status
-	case e.ErrorMessage != "":
-		return e.ErrorMessage
-	default:
-		// this should not happen
-		return "something went wrong, please see the ollama server logs for details"
+	if e.Message != "" {
+		return fmt.Sprintf("%s: %s", e.Status, e.Message)
 	}
+	return e.Status
 }
 
 type GenerateRequest struct {

cmd/cmd.go

@@ -140,10 +140,14 @@ func DeleteHandler(cmd *cobra.Command, args []string) error {
 	client := api.NewClient()
 
 	request := api.DeleteRequest{Name: args[0]}
-	if err := client.Delete(context.Background(), &request); err != nil {
+	fn := func(resp api.ProgressResponse) error {
+		fmt.Println(resp.Status)
+		return nil
+	}
+
+	if err := client.Delete(context.Background(), &request, fn); err != nil {
 		return err
 	}
-	fmt.Printf("deleted '%s'\n", args[0])
 	return nil
 }
 

docs/development.md

@@ -6,12 +6,6 @@ Install required tools:
 brew install go
 ```
 
-Enable CGO:
-
-```
-export CGO_ENABLED=1
-```
-
 Then build ollama:
 
 ```

server/images.go

@@ -51,7 +51,7 @@ func (m *Model) Prompt(request api.GenerateRequest) (string, error) {
 		Context []int
 	}
 
-	vars.First = len(request.Context) == 0
+	vars.First = len(vars.Context) == 0
 	vars.System = m.System
 	vars.Prompt = request.Prompt
 	vars.Context = request.Context
@@ -108,8 +108,8 @@ func GetManifest(mp ModelPath) (*ManifestV2, error) {
 		return nil, err
 	}
 
-	if _, err = os.Stat(fp); err != nil {
-		return nil, err
+	if _, err = os.Stat(fp); err != nil && !errors.Is(err, os.ErrNotExist) {
+		return nil, fmt.Errorf("couldn't find model '%s'", mp.GetShortTagname())
 	}
 
 	var manifest *ManifestV2
@@ -493,11 +493,12 @@ func CreateLayer(f io.ReadSeeker) (*LayerReader, error) {
 	return layer, nil
 }
 
-func DeleteModel(name string) error {
+func DeleteModel(name string, fn func(api.ProgressResponse)) error {
 	mp := ParseModelPath(name)
 
 	manifest, err := GetManifest(mp)
 	if err != nil {
+		fn(api.ProgressResponse{Status: "couldn't retrieve manifest"})
 		return err
 	}
 	deleteMap := make(map[string]bool)
@@ -508,10 +509,12 @@ func DeleteModel(name string) error {
 
 	fp, err := GetManifestPath()
 	if err != nil {
+		fn(api.ProgressResponse{Status: "problem getting manifest path"})
 		return err
 	}
 	err = filepath.Walk(fp, func(path string, info os.FileInfo, err error) error {
 		if err != nil {
+			fn(api.ProgressResponse{Status: "problem walking manifest dir"})
 			return err
 		}
 		if !info.IsDir() {
@@ -545,13 +548,9 @@ func DeleteModel(name string) error {
 	// only delete the files which are still in the deleteMap
 	for k, v := range deleteMap {
 		if v {
-			fp, err := GetBlobsPath(k)
+			err := os.Remove(k)
 			if err != nil {
-				log.Printf("couldn't get file path for '%s': %v", k, err)
-				continue
-			}
-			if err := os.Remove(fp); err != nil {
-				log.Printf("couldn't remove file '%s': %v", fp, err)
+				log.Printf("couldn't remove file '%s': %v", k, err)
 				continue
 			}
 		}
@@ -566,6 +565,7 @@ func DeleteModel(name string) error {
 		log.Printf("couldn't remove manifest file '%s': %v", fp, err)
 		return err
 	}
+	fn(api.ProgressResponse{Status: fmt.Sprintf("deleted '%s'", name)})
 
 	return nil
 }

server/modelpath.go

@@ -45,7 +45,7 @@ func ParseModelPath(name string) ModelPath {
 		return ModelPath{}
 	}
 
-	colonParts := strings.Split(slashParts[len(slashParts)-1], ":")
+	colonParts := strings.Split(name, ":")
 	if len(colonParts) == 2 {
 		tag = colonParts[1]
 	} else {

server/routes.go

@@ -2,8 +2,6 @@ package server
 
 import (
 	"encoding/json"
-	"errors"
-	"fmt"
 	"io"
 	"log"
 	"net"
@@ -167,14 +165,20 @@ func DeleteModelHandler(c *gin.Context) {
 		return
 	}
 
-	if err := DeleteModel(req.Name); err != nil {
-		if os.IsNotExist(err) {
-			c.JSON(http.StatusNotFound, gin.H{"error": fmt.Sprintf("model '%s' not found", req.Name)})
-		} else {
-			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+	ch := make(chan any)
+	go func() {
+		defer close(ch)
+		fn := func(r api.ProgressResponse) {
+			ch <- r
 		}
-		return
-	}
+
+		if err := DeleteModel(req.Name, fn); err != nil {
+			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+			return
+		}
+	}()
+
+	streamResponse(c, ch)
 }
 
 func ListModelsHandler(c *gin.Context) {
@@ -186,10 +190,6 @@ func ListModelsHandler(c *gin.Context) {
 	}
 	err = filepath.Walk(fp, func(path string, info os.FileInfo, err error) error {
 		if err != nil {
-			if errors.Is(err, os.ErrNotExist) {
-				log.Printf("manifest file does not exist: %s", fp)
-				return nil
-			}
 			return err
 		}
 		if !info.IsDir() {

web/app/page.tsx

@@ -11,23 +11,18 @@ export default async function Home() {
         <Image src='/ollama.png' width={64} height={64} alt='ollamaIcon' />
         <section className='my-12 text-center'>
           <div className='flex flex-col space-y-2'>
-            <h2 className='md:max-w-md mx-auto my-2 text-3xl tracking-tight'>
-              Get up and running with large language models, locally.
-            </h2>
+            <h2 className='md:max-w-[18rem] mx-auto my-2 text-3xl tracking-tight'>Portable large language models</h2>
             <h3 className='md:max-w-xs mx-auto text-base text-neutral-500'>
-              Run Llama 2 and other models on macOS. Customize and create your own.
+              Bundle a model’s weights, configuration, prompts, data and more into self-contained packages that run anywhere.
             </h3>
           </div>
-          <div className='mx-auto max-w-xs flex flex-col space-y-4 mt-12'>
-            <Link
-              href='/download'
-              className='md:mx-10 lg:mx-14 bg-black text-white rounded-full px-4 py-2 focus:outline-none cursor-pointer'
-            >
+          <div className='mx-auto flex flex-col space-y-4 mt-12'>
+            <Link href='/download' className='md:mx-10 lg:mx-14 bg-black text-white rounded-full px-4 py-2 focus:outline-none cursor-pointer'>
               Download
             </Link>
             <p className='text-neutral-500 text-sm '>
-              Available for macOS with Apple Silicon <br />
-              Windows & Linux support coming soon.
+            Available for macOS with Apple Silicon <br />
+            Windows & Linux support coming soon.
             </p>
           </div>
         </section>