Merge branch 'release/1.0'

explain/cli.go

@@ -23,13 +23,17 @@ func (e *Explain) before(_ *cli.Context) error {
 		os.Exit(-1)
 	}
 
+	found := false
 	for _, model := range list.Models {
-		if model.Name == e.modelfile {
-			return nil
+		if model.Name == e.modelfileName {
+			found = true
+			break
 		}
-		fmt.Println(shell.Err() + " " + "tlm explain:7b model not found.\n\nPlease run `tlm deploy` to deploy tlm models first.")
+	}
+
+	if !found {
+		fmt.Println(shell.Err() + " " + "tlm's explain model not found.\n\nPlease run `tlm deploy` to deploy tlm models first.")
 		os.Exit(-1)
-		return nil
 	}
 
 	return nil

explain/explain.go

@@ -5,11 +5,12 @@ import (
 )
 
 type Explain struct {
-	api       *ollama.Client
-	modelfile string
+	api           *ollama.Client
+	modelfile     string
+	modelfileName string
 }
 
 func New(api *ollama.Client, modelfile string) *Explain {
-	e := &Explain{api: api, modelfile: modelfile}
+	e := &Explain{api: api, modelfile: modelfile, modelfileName: "explain:7b"}
 	return e
 }

suggest/cli.go

@@ -29,13 +29,17 @@ func (s *Suggest) before(_ *cli.Context) error {
 		os.Exit(-1)
 	}
 
+	found := false
 	for _, model := range list.Models {
-		if model.Name == s.modelfile {
-			return nil
+		if model.Name == s.modelfileName {
+			found = true
+			break
 		}
-		fmt.Println(shell.Err() + " " + "tlm suggest:7b model not found.\n\nPlease run `tlm deploy` to deploy tlm models first.")
+	}
+
+	if !found {
+		fmt.Println(shell.Err() + " " + "tlm's suggest model not found.\n\nPlease run `tlm deploy` to deploy tlm models first.")
 		os.Exit(-1)
-		return nil
 	}
 
 	return nil

suggest/suggest.go

@@ -5,10 +5,11 @@ import (
 )
 
 type Suggest struct {
-	api       *ollama.Client
-	modelfile string
+	api           *ollama.Client
+	modelfile     string
+	modelfileName string
 }
 
 func New(api *ollama.Client, modelfile string) *Suggest {
-	return &Suggest{api: api, modelfile: modelfile}
+	return &Suggest{api: api, modelfile: modelfile, modelfileName: "suggest:7b"}
 }