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

use filepath for os compat

Browse source
This commit is contained in:
Michael Yang 2023-07-14 17:27:14 -07:00
parent 560f36e6c8
commit 743e957d88
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/cmd.go
View file

@ -9,7 +9,7 @@ import (
"net"
"net/http"
"os"
"path"
"path/filepath"
"strings"
"time"
@ -27,7 +27,7 @@ func cacheDir() string {
panic(err)
}
return path.Join(home, ".ollama")
return filepath.Join(home, ".ollama")
}
func RunRun(cmd *cobra.Command, args []string) error {
@ -209,7 +209,7 @@ func NewCLI() *cobra.Command {
},
PersistentPreRunE: func(_ *cobra.Command, args []string) error {
// create the models directory and it's parent
return os.MkdirAll(path.Join(cacheDir(), "models"), 0o700)
return os.MkdirAll(filepath.Join(cacheDir(), "models"), 0o700)
},
}

12
server/models.go
View file

@ -7,7 +7,7 @@ import (
"io"
"net/http"
"os"
"path"
"path/filepath"
"strconv"
)
@ -32,14 +32,14 @@ func (m *Model) FullName() string {
panic(err)
}
return path.Join(home, ".ollama", "models", m.Name+".bin")
return filepath.Join(home, ".ollama", "models", m.Name+".bin")
}
func (m *Model) TempFile() string {
fullName := m.FullName()
return path.Join(
path.Dir(fullName),
fmt.Sprintf(".%s.part", path.Base(fullName)),
return filepath.Join(
filepath.Dir(fullName),
fmt.Sprintf(".%s.part", filepath.Base(fullName)),
)
}
@ -118,7 +118,7 @@ func saveModel(model *Model, fn func(total, completed int64)) error {
return os.Rename(model.TempFile(), model.FullName())
}
n , err := io.CopyN(out, resp.Body, 8192)
n, err := io.CopyN(out, resp.Body, 8192)
if err != nil && !errors.Is(err, io.EOF) {
return err
}

8
server/routes.go
View file

@ -10,7 +10,7 @@ import (
"net"
"net/http"
"os"
"path"
"path/filepath"
"strings"
"text/template"
"time"
@ -32,7 +32,7 @@ func cacheDir() string {
panic(err)
}
return path.Join(home, ".ollama")
return filepath.Join(home, ".ollama")
}
func generate(c *gin.Context) {
@ -55,7 +55,7 @@ func generate(c *gin.Context) {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
}
req.Model = path.Join(cacheDir(), "models", req.Model+".bin")
req.Model = filepath.Join(cacheDir(), "models", req.Model+".bin")
}
templateNames := make([]string, 0, len(templates.Templates()))
@ -63,7 +63,7 @@ func generate(c *gin.Context) {
templateNames = append(templateNames, template.Name())
}
match, _ := matchRankOne(path.Base(req.Model), templateNames)
match, _ := matchRankOne(filepath.Base(req.Model), templateNames)
if template := templates.Lookup(match); template != nil {
var sb strings.Builder
if err := template.Execute(&sb, req); err != nil {