From 6945617af527bed4d471c114f4a2686b1770c309 Mon Sep 17 00:00:00 2001
From: Jesse Gross <jesse@ollama.com>
Date: Wed, 5 Feb 2025 11:16:28 -0800
Subject: [PATCH] models: Move model into their own directory

This allows there to be a file that is a list of models that is
not mixed into the runner code.
---
 model/{ => models}/llama/model.go            | 0
 model/{ => models}/mllama/imageproc.go       | 0
 model/{ => models}/mllama/imageproc_test.go  | 0
 model/{ => models}/mllama/model.go           | 0
 model/{ => models}/mllama/model_text.go      | 0
 model/{ => models}/mllama/model_vision.go    | 0
 model/{ => models}/mllama/process_image.go   | 0
 model/models/models.go                       | 6 ++++++
 model/{ => models}/pixtral/imageproc.go      | 0
 model/{ => models}/pixtral/imageproc_test.go | 0
 model/{ => models}/qwen2vl/imageproc.go      | 0
 model/{ => models}/qwen2vl/imageproc_test.go | 0
 server/prompt.go                             | 2 +-
 server/routes.go                             | 2 +-
 14 files changed, 8 insertions(+), 2 deletions(-)
 rename model/{ => models}/llama/model.go (100%)
 rename model/{ => models}/mllama/imageproc.go (100%)
 rename model/{ => models}/mllama/imageproc_test.go (100%)
 rename model/{ => models}/mllama/model.go (100%)
 rename model/{ => models}/mllama/model_text.go (100%)
 rename model/{ => models}/mllama/model_vision.go (100%)
 rename model/{ => models}/mllama/process_image.go (100%)
 create mode 100644 model/models/models.go
 rename model/{ => models}/pixtral/imageproc.go (100%)
 rename model/{ => models}/pixtral/imageproc_test.go (100%)
 rename model/{ => models}/qwen2vl/imageproc.go (100%)
 rename model/{ => models}/qwen2vl/imageproc_test.go (100%)

diff --git a/model/llama/model.go b/model/models/llama/model.go
similarity index 100%
rename from model/llama/model.go
rename to model/models/llama/model.go
diff --git a/model/mllama/imageproc.go b/model/models/mllama/imageproc.go
similarity index 100%
rename from model/mllama/imageproc.go
rename to model/models/mllama/imageproc.go
diff --git a/model/mllama/imageproc_test.go b/model/models/mllama/imageproc_test.go
similarity index 100%
rename from model/mllama/imageproc_test.go
rename to model/models/mllama/imageproc_test.go
diff --git a/model/mllama/model.go b/model/models/mllama/model.go
similarity index 100%
rename from model/mllama/model.go
rename to model/models/mllama/model.go
diff --git a/model/mllama/model_text.go b/model/models/mllama/model_text.go
similarity index 100%
rename from model/mllama/model_text.go
rename to model/models/mllama/model_text.go
diff --git a/model/mllama/model_vision.go b/model/models/mllama/model_vision.go
similarity index 100%
rename from model/mllama/model_vision.go
rename to model/models/mllama/model_vision.go
diff --git a/model/mllama/process_image.go b/model/models/mllama/process_image.go
similarity index 100%
rename from model/mllama/process_image.go
rename to model/models/mllama/process_image.go
diff --git a/model/models/models.go b/model/models/models.go
new file mode 100644
index 000000000..d0b68b320
--- /dev/null
+++ b/model/models/models.go
@@ -0,0 +1,6 @@
+package models
+
+import (
+	_ "github.com/ollama/ollama/model/models/llama"
+	_ "github.com/ollama/ollama/model/models/mllama"
+)
diff --git a/model/pixtral/imageproc.go b/model/models/pixtral/imageproc.go
similarity index 100%
rename from model/pixtral/imageproc.go
rename to model/models/pixtral/imageproc.go
diff --git a/model/pixtral/imageproc_test.go b/model/models/pixtral/imageproc_test.go
similarity index 100%
rename from model/pixtral/imageproc_test.go
rename to model/models/pixtral/imageproc_test.go
diff --git a/model/qwen2vl/imageproc.go b/model/models/qwen2vl/imageproc.go
similarity index 100%
rename from model/qwen2vl/imageproc.go
rename to model/models/qwen2vl/imageproc.go
diff --git a/model/qwen2vl/imageproc_test.go b/model/models/qwen2vl/imageproc_test.go
similarity index 100%
rename from model/qwen2vl/imageproc_test.go
rename to model/models/qwen2vl/imageproc_test.go
diff --git a/server/prompt.go b/server/prompt.go
index cc69fe8cf..610891729 100644
--- a/server/prompt.go
+++ b/server/prompt.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/ollama/ollama/api"
 	"github.com/ollama/ollama/llm"
-	"github.com/ollama/ollama/model/mllama"
+	"github.com/ollama/ollama/model/models/mllama"
 	"github.com/ollama/ollama/template"
 )
 
diff --git a/server/routes.go b/server/routes.go
index 2670ca954..779d3205d 100644
--- a/server/routes.go
+++ b/server/routes.go
@@ -32,7 +32,7 @@ import (
 	"github.com/ollama/ollama/envconfig"
 	"github.com/ollama/ollama/fs/ggml"
 	"github.com/ollama/ollama/llm"
-	"github.com/ollama/ollama/model/mllama"
+	"github.com/ollama/ollama/model/models/mllama"
 	"github.com/ollama/ollama/openai"
 	"github.com/ollama/ollama/template"
 	"github.com/ollama/ollama/types/errtypes"