jeans/ollama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: remove superfluous parseCompleteRef

Browse Source
This commit is contained in:
Blake Mizerany 2024-04-01 23:41:42 -07:00
parent 628f1feb36
commit aff7970628
1 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
build/build.go
View File

@ -113,21 +113,13 @@ func (s *Server) LayerFile(digest string) (string, error) {
} }
func (s *Server) ManifestData(ref string) ([]byte, error) { func (s *Server) ManifestData(ref string) ([]byte, error) {
br, err := parseCompleteRef(ref) data, _, err := s.resolve(blob.ParseRef(ref))
if err != nil {
return nil, err
}
data, _, err := s.resolve(br)
return data, err return data, err
} }
// WeightFile returns the absolute path to the weights file for the given model ref. // WeightFile returns the absolute path to the weights file for the given model ref.
func (s *Server) WeightsFile(ref string) (string, error) { func (s *Server) WeightsFile(ref string) (string, error) {
br, err := parseCompleteRef(ref) m, err := s.getManifest(blob.ParseRef(ref))
if err != nil {
return "", err
}
m, err := s.getManifest(br)
if err != nil { if err != nil {
return "", err return "", err
} }
@ -167,11 +159,7 @@ func (s *Server) resolve(ref blob.Ref) (data []byte, path string, err error) {
} }
func (s *Server) SetManifestData(ref string, data []byte) error { func (s *Server) SetManifestData(ref string, data []byte) error {
br, err := parseCompleteRef(ref) return s.setManifestData(blob.ParseRef(ref), data)
if err != nil {
return err
}
return s.setManifestData(br, data)
} }
// Set sets the data for the given ref. // Set sets the data for the given ref.
@ -220,11 +208,3 @@ func (s *Server) getManifest(ref blob.Ref) (manifestJSON, error) {
} }
return m, nil return m, nil
} }
func parseCompleteRef(ref string) (blob.Ref, error) {
br := blob.ParseRef(ref)
if !br.Complete() {
return blob.Ref{}, fmt.Errorf("%w: %q", ErrIncompleteRef, ref)
}
return br, nil
}