starred/ollama
1
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2026-04-24 17:55:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

x/registry: work on getting basic test passing

Browse Source
This commit is contained in:
Blake Mizerany
2024-04-03 14:44:29 -07:00
parent f5883070f8
commit 1a346640db
3 changed files with 85 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
x/registry/server.go
View File

@@ -109,11 +109,12 @@ func (s *Server) handlePush(w http.ResponseWriter, r *http.Request) error {
return err
}
q := u.Query()
uploadID := q.Get("UploadId")
uploadID := q.Get("uploadId")
if uploadID == "" {
return oweb.Mistake("invalid", "url", "missing UploadId")
// not a part upload
continue
}
partNumber, err := strconv.Atoi(q.Get("PartNumber"))
partNumber, err := strconv.Atoi(q.Get("partNumber"))
if err != nil {
return oweb.Mistake("invalid", "url", "invalid or missing PartNumber")
}
@@ -165,12 +166,10 @@ func (s *Server) handlePush(w http.ResponseWriter, r *http.Request) error {
}
requirements = append(requirements, apitype.Requirement{
Digest: l.Digest,
Offset: 0,
Size: l.Size,
URL: signedURL.String(),
})
} else {
key := path.Join("blobs", l.Digest)
uploadID, err := mcc.NewMultipartUpload(r.Context(), bucketTODO, key, minio.PutObjectOptions{})
if err != nil {
return err
@@ -179,9 +178,8 @@ func (s *Server) handlePush(w http.ResponseWriter, r *http.Request) error {
const timeToStartUpload = 15 * time.Minute
signedURL, err := s.mc().Presign(r.Context(), "PUT", bucketTODO, key, timeToStartUpload, url.Values{
"UploadId": []string{uploadID},
"PartNumber": []string{strconv.Itoa(partNumber)},
"ContentLength": []string{strconv.FormatInt(c.N, 10)},
"uploadId": []string{uploadID},
"partNumber": []string{strconv.Itoa(partNumber)},
})
if err != nil {
return err