server: compare options correctly

ollama · Aug 3, 2023 · e3fb1fd · e3fb1fd
1 parent 29b897f
commit e3fb1fd
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/server/routes.go b/server/routes.go
@@ -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