baalajimaestro/ollama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cmd: check GetBlobsPath error (#317)

Browse source 
The error returned by `server.GetBlobsPath` in `showLayer` was never
checked. Check the error and return if not nil. Also, make newlines at
the end of error messages consistent and fix a typo.
This commit is contained in:
Soroush Javadi 2023-08-10 20:27:49 +03:30 committed by GitHub
parent 178237d37f
commit bea683e3bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cmd/cmd.go
View file

@ -318,12 +318,16 @@ func generate(cmd *cobra.Command, model, prompt string) error {
func showLayer(l *server.Layer) { func showLayer(l *server.Layer) {
filename, err := server.GetBlobsPath(l.Digest) filename, err := server.GetBlobsPath(l.Digest)
bts, err := os.ReadFile(filename)
if err != nil { if err != nil {
fmt.Printf("Couldn't read layer") fmt.Println("Couldn't get layer's path")
return return
} }
fmt.Printf(string(bts) + "\n") bts, err := os.ReadFile(filename)
if err != nil {
fmt.Println("Couldn't read layer")
return
}
fmt.Println(string(bts))
} }
func generateInteractive(cmd *cobra.Command, model string) error { func generateInteractive(cmd *cobra.Command, model string) error {
@ -460,7 +464,7 @@ func generateInteractive(cmd *cobra.Command, model string) error {
mp := server.ParseModelPath(model) mp := server.ParseModelPath(model)
manifest, err := server.GetManifest(mp) manifest, err := server.GetManifest(mp)
if err != nil { if err != nil {
fmt.Printf("error: couldn't get a manifestfor this model") fmt.Println("error: couldn't get a manifest for this model")
continue continue
} }
switch args[1] { switch args[1] {