Browse Source
chore: use errors.New to replace fmt.Errorf will much better (#3789)
jmorganca/llama-cpp-8960fe8
Cheng
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with
5 additions and
4 deletions
-
api/types.go
-
llm/payload.go
-
server/images.go
|
|
|
@ -2,6 +2,7 @@ package api |
|
|
|
|
|
|
|
import ( |
|
|
|
"encoding/json" |
|
|
|
"errors" |
|
|
|
"fmt" |
|
|
|
"math" |
|
|
|
"os" |
|
|
|
@ -307,7 +308,7 @@ func (m *Metrics) Summary() { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
var ErrInvalidOpts = fmt.Errorf("invalid options") |
|
|
|
var ErrInvalidOpts = errors.New("invalid options") |
|
|
|
|
|
|
|
func (opts *Options) FromMap(m map[string]interface{}) error { |
|
|
|
valueOpts := reflect.ValueOf(opts).Elem() // names of the fields in the options struct
|
|
|
|
|
|
|
|
@ -17,7 +17,7 @@ import ( |
|
|
|
"github.com/ollama/ollama/gpu" |
|
|
|
) |
|
|
|
|
|
|
|
var errPayloadMissing = fmt.Errorf("expected payloads not included in this build of ollama") |
|
|
|
var errPayloadMissing = errors.New("expected payloads not included in this build of ollama") |
|
|
|
|
|
|
|
func Init() error { |
|
|
|
payloadsDir, err := gpu.PayloadsDir() |
|
|
|
|
|
|
|
@ -1137,7 +1137,7 @@ func GetSHA256Digest(r io.Reader) (string, int64) { |
|
|
|
return fmt.Sprintf("sha256:%x", h.Sum(nil)), n |
|
|
|
} |
|
|
|
|
|
|
|
var errUnauthorized = fmt.Errorf("unauthorized") |
|
|
|
var errUnauthorized = errors.New("unauthorized") |
|
|
|
|
|
|
|
func makeRequestWithRetry(ctx context.Context, method string, requestURL *url.URL, headers http.Header, body io.ReadSeeker, regOpts *registryOptions) (*http.Response, error) { |
|
|
|
for i := 0; i < 2; i++ { |
|
|
|
@ -1255,7 +1255,7 @@ func parseRegistryChallenge(authStr string) registryChallenge { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
var errDigestMismatch = fmt.Errorf("digest mismatch, file must be downloaded again") |
|
|
|
var errDigestMismatch = errors.New("digest mismatch, file must be downloaded again") |
|
|
|
|
|
|
|
func verifyBlob(digest string) error { |
|
|
|
fp, err := GetBlobsPath(digest) |
|
|
|
|