"vscode:/vscode.git/clone" did not exist on "9b3cb662a4d1c835be639774851fdaf47de73890"
Commit e3fb1fd3 authored by Jeffrey Morgan's avatar Jeffrey Morgan
Browse files

server: compare options correctly

parent 29b897f5
......@@ -52,25 +52,26 @@ func GenerateHandler(c *gin.Context) {
return
}
if model.Digest != loaded.digest || !reflect.DeepEqual(loaded.options, req.Options) {
opts := api.DefaultOptions()
if err := opts.FromMap(model.Options); err != nil {
log.Printf("could not load model options: %v", err)
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
}
if err := opts.FromMap(req.Options); err != nil {
log.Printf("could not merge model options: %v", err)
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
}
if model.Digest != loaded.digest || !reflect.DeepEqual(loaded.options, opts) {
if loaded.llm != nil {
loaded.llm.Close()
loaded.llm = nil
loaded.digest = ""
}
opts := api.DefaultOptions()
if err := opts.FromMap(model.Options); err != nil {
log.Printf("could not load model options: %v", err)
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
}
if err := opts.FromMap(req.Options); err != nil {
log.Printf("could not merge model options: %v", err)
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
}
llm, err := llama.New(model.ModelPath, opts)
if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
......@@ -79,6 +80,7 @@ func GenerateHandler(c *gin.Context) {
loaded.llm = llm
loaded.digest = model.Digest
loaded.options = opts
}
sessionDuration := 5 * time.Minute
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment