Merge pull request #4265 from ollama/mxyng/fix-show-llava

routes: fix show llava models

server/images.go

@@ -68,31 +68,31 @@ func (m *Model) String() string {
 		Args: m.ModelPath,
 	})
 
-	if m.Template != "" {
+	for _, adapter := range m.AdapterPaths {
 		modelfile.Commands = append(modelfile.Commands, model.Command{
-			Name: "template",
-			Args: m.Template,
+			Name: "adapter",
+			Args: adapter,
 		})
 	}
 
-	if m.System != "" {
+	for _, projector := range m.ProjectorPaths {
 		modelfile.Commands = append(modelfile.Commands, model.Command{
-			Name: "system",
-			Args: m.System,
+			Name: "model",
+			Args: projector,
 		})
 	}
 
-	for _, adapter := range m.AdapterPaths {
+	if m.Template != "" {
 		modelfile.Commands = append(modelfile.Commands, model.Command{
-			Name: "adapter",
-			Args: adapter,
+			Name: "template",
+			Args: m.Template,
 		})
 	}
 
-	for _, projector := range m.ProjectorPaths {
+	if m.System != "" {
 		modelfile.Commands = append(modelfile.Commands, model.Command{
-			Name: "projector",
-			Args: projector,
+			Name: "system",
+			Args: m.System,
 		})
 	}