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

windows: fix create modelfile

Browse Source
This commit is contained in:
Michael Yang 2023-08-30 16:01:23 -04:00
parent ae950b00f1
commit 1c8fd627ad
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/images.go
View File

@ -235,8 +235,8 @@ func GetModel(name string) (*Model, error) {
func filenameWithPath(path, f string) (string, error) { func filenameWithPath(path, f string) (string, error) {
// if filePath starts with ~/, replace it with the user's home directory. // if filePath starts with ~/, replace it with the user's home directory.
if strings.HasPrefix(f, "~/") { if strings.HasPrefix(f, fmt.Sprintf("~%s", string(os.PathSeparator))) {
parts := strings.Split(f, "/") parts := strings.Split(f, string(os.PathSeparator))
home, err := os.UserHomeDir() home, err := os.UserHomeDir()
if err != nil { if err != nil {
return "", fmt.Errorf("failed to open file: %v", err) return "", fmt.Errorf("failed to open file: %v", err)
@ -374,20 +374,9 @@ func CreateModel(ctx context.Context, name string, path string, fn func(resp api
case "adapter": case "adapter":
fn(api.ProgressResponse{Status: fmt.Sprintf("creating model %s layer", c.Name)}) fn(api.ProgressResponse{Status: fmt.Sprintf("creating model %s layer", c.Name)})
fp := c.Args fp, err := filenameWithPath(path, c.Args)
if strings.HasPrefix(fp, "~/") { if err != nil {
parts := strings.Split(fp, "/") return err
home, err := os.UserHomeDir()
if err != nil {
return fmt.Errorf("failed to open file: %v", err)
}
fp = filepath.Join(home, filepath.Join(parts[1:]...))
}
// If filePath is not an absolute path, make it relative to the modelfile path
if !filepath.IsAbs(fp) {
fp = filepath.Join(filepath.Dir(path), fp)
} }
// create a model from this specified file // create a model from this specified file