fix mkdir blob path

This commit is contained in:
Michael Yang 2023-07-18 11:24:19 -07:00
parent a9cc270b4d
commit f20426a768
2 changed files with 2 additions and 16 deletions

View file

@ -9,7 +9,6 @@ import (
"net" "net"
"net/http" "net/http"
"os" "os"
"path/filepath"
"strings" "strings"
"time" "time"
@ -24,15 +23,6 @@ import (
"github.com/jmorganca/ollama/server" "github.com/jmorganca/ollama/server"
) )
func cacheDir() string {
home, err := os.UserHomeDir()
if err != nil {
panic(err)
}
return filepath.Join(home, ".ollama")
}
func create(cmd *cobra.Command, args []string) error { func create(cmd *cobra.Command, args []string) error {
filename, _ := cmd.Flags().GetString("file") filename, _ := cmd.Flags().GetString("file")
client := api.NewClient() client := api.NewClient()
@ -292,10 +282,6 @@ func NewCLI() *cobra.Command {
CompletionOptions: cobra.CompletionOptions{ CompletionOptions: cobra.CompletionOptions{
DisableDefaultCmd: true, DisableDefaultCmd: true,
}, },
PersistentPreRunE: func(_ *cobra.Command, args []string) error {
// create the models directory and it's parent
return os.MkdirAll(filepath.Join(cacheDir(), "models"), 0o700)
},
} }
cobra.EnableCommandSorting = false cobra.EnableCommandSorting = false

View file

@ -106,10 +106,10 @@ func GetBlobsPath(digest string) (string, error) {
return "", err return "", err
} }
path := filepath.Join(home, ".ollama", "models", "blobs") path := filepath.Join(home, ".ollama", "models", "blobs", digest)
if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil { if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
return "", err return "", err
} }
return filepath.Join(path, digest), nil return path, nil
} }