From 65658e4077235dec21e60ece3c3fe3220e7811d6 Mon Sep 17 00:00:00 2001
From: Josh Yan <jyan00017@gmail.com>
Date: Tue, 23 Jul 2024 14:05:48 -0700
Subject: [PATCH] default to post

---
 cmd/cmd.go       |  9 +--------
 server/routes.go | 12 ++++++------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/cmd/cmd.go b/cmd/cmd.go
index 97db35d77..d61de2095 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -5,7 +5,6 @@ import (
 	"bytes"
 	"context"
 	"crypto/sha256"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -307,15 +306,9 @@ func CreateBlob(ctx context.Context, src, digest string, r *os.File) (error) {
 		Host:   net.JoinHostPort(ollamaHost.Host, ollamaHost.Port),
 	}
 
-	data, err := json.Marshal(digest)
-	if err != nil {
-		return err
-	}
-
-	reqBody := bytes.NewReader(data)
 	path := fmt.Sprintf("/api/blobs/%s", digest)
 	requestURL := base.JoinPath(path)
-	request, err := http.NewRequestWithContext(ctx, http.MethodPost, requestURL.String(), reqBody)
+	request, err := http.NewRequestWithContext(ctx, http.MethodPost, requestURL.String(), r)
 	if err != nil {
 		return err
 	}
diff --git a/server/routes.go b/server/routes.go
index 672eec214..281c69dfe 100644
--- a/server/routes.go
+++ b/server/routes.go
@@ -943,13 +943,13 @@ func (s *Server) CreateBlobHandler(c *gin.Context) {
 		return
 	}
 
-	/* if c.GetHeader("X-Ollama-File") != "" && s.isLocal(c) {
+	if c.GetHeader("X-Ollama-File") != "" && s.isLocal(c) {
 		err = localBlobCopy(c.GetHeader("X-Ollama-File"), path)
 		if err == nil {
 			c.Status(http.StatusCreated)
 			return
 		}
-	} */
+	}
 
 	layer, err := NewLayer(c.Request.Body, "")
 	if err != nil {
@@ -971,15 +971,15 @@ func localBlobCopy (src, dest string) error {
 		return err
 	}
 
-	/* err = localCopy(src, dest)
+	err = localCopy(src, dest)
 	if err == nil {
 		return nil
-	}  */
+	}
 
-	/* err = defaultCopy(src, dest)
+	err = defaultCopy(src, dest)
 	if err == nil {
 		return nil
-	} */
+	}
 
 	return fmt.Errorf("failed to copy blob")
 }