fix extended tag names

api/client.go

@@ -210,9 +210,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)
+	})
 }

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
 }
 

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() {
@@ -566,6 +569,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/routes.go

@@ -3,7 +3,6 @@ package server
 import (
 	"encoding/json"
 	"errors"
-	"fmt"
 	"io"
 	"log"
 	"net"
@@ -167,14 +166,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) {