highperfocused/ollama
1
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2025-07-28 18:15:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

pr feedback

Browse Source 
- move error check to api client pull
- simplify error check in generate
- return nil on any pull error
This commit is contained in:
Bruce MacDonald
2023-07-07 17:12:02 -04:00
parent 61dd87bd90
commit f533f85d44
3 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server/routes.go
View File

@@ -45,22 +45,16 @@ func generate(c *gin.Context) {
return
}
remoteModel, err := getRemote(req.Model)
if err != nil {
// couldn't check the directory, proceed in offline mode
_, err := os.Stat(req.Model)
if err != nil {
if !os.IsNotExist(err) {
c.JSON(http.StatusInternalServerError, gin.H{"message": err.Error()})
return
}
// couldn't find the model file, try setting the model to the cache directory
req.Model = path.Join(cacheDir(), "models", req.Model+".bin")
}
}
if remoteModel != nil {
if remoteModel, _ := getRemote(req.Model); remoteModel != nil {
req.Model = remoteModel.FullName()
}
if _, err := os.Stat(req.Model); err != nil {
if !errors.Is(err, os.ErrNotExist) {
c.JSON(http.StatusBadRequest, gin.H{"message": err.Error()})
return
}
req.Model = path.Join(cacheDir(), "models", req.Model+".bin")
}
modelOpts := getModelOpts(req)
modelOpts.NGPULayers = 1 // hard-code this for now