Move ModelType enum to dedicated file

Author: orionpapadakis

src/main/java/com/example/loader/weights/ModelLoader.java

@@ -12,6 +12,7 @@
 import com.example.core.types.Pair;
 import com.example.model.Configuration;
 import com.example.model.Model;
+import com.example.model.ModelType;
 import com.example.model.llama.LlamaConfiguration;
 import com.example.model.llama.Llama;
 import com.example.model.mistral.Mistral;
@@ -39,21 +40,13 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import static com.example.loader.weights.ModelLoader.ModelType.LLAMA_3;
-
 public final class ModelLoader {
     private static final String TOKENIZER_LLAMA_3_MODEL = "gpt2";
     private static final String TOKENIZER_MISTRAL_MODEL = "llama";
 
     private static final String LLAMA_3_PATTERN = "(?i:'s|'t|'re|'ve|'m|'ll|'d)|[^\\r\\n\\p{L}\\p{N}]?\\p{L}+|\\p{N}{1,3}| ?[^\\s\\p{L}\\p{N}]+[\\r\\n]*|\\s*[\\r\\n]+|\\s+(?!\\S)|\\s+";
     private static final String MISTRAL_PATTERN = "\\S+|\\s+";
 
-    public enum ModelType {
-        LLAMA_3,
-        MISTRAL,
-        UNKNOWN
-    }
-
     private static ModelType detectModelType(Map<String, Object> metadata) {
         String name = (String) metadata.get("general.name");
         String tokenizerModel = (String) metadata.get("tokenizer.ggml.model");
@@ -65,23 +58,23 @@ private static ModelType detectModelType(Map<String, Object> metadata) {
             if (lowerName.contains("mistral")) {
                 return ModelType.MISTRAL;
             } else if (lowerName.contains("llama")) {
-                return LLAMA_3;
+                return ModelType.LLAMA_3;
             }
         }
 
         // Check by tokenizer model
         if (TOKENIZER_MISTRAL_MODEL.equals(tokenizerModel)) {
             return ModelType.MISTRAL;
         } else if (TOKENIZER_LLAMA_3_MODEL.equals(tokenizerModel)) {
-            return LLAMA_3;
+            return ModelType.LLAMA_3;
         }
 
         // Check by vocabulary size as fallback
         if (vocabSize != null) {
             if (vocabSize == 32768) {
                 return ModelType.MISTRAL;
             } else if (vocabSize == 128256) {
-                return LLAMA_3;
+                return ModelType.LLAMA_3;
             }
         }
 

src/main/java/com/example/model/Model.java

@@ -5,7 +5,6 @@
 import com.example.inference.InferenceEngine;
 import com.example.inference.sampler.Sampler;
 import com.example.Options;
-import com.example.loader.weights.ModelLoader.ModelType;
 import com.example.loader.weights.State;
 import com.example.loader.weights.Weights;
 import com.example.tokenizer.impl.Tokenizer;

src/main/java/com/example/model/ModelType.java

@@ -0,0 +1,11 @@
+package com.example.model;
+
+import com.example.core.model.GGUF;
+
+import java.nio.channels.FileChannel;
+
+public enum ModelType {
+    LLAMA_3,
+    MISTRAL,
+    UNKNOWN;
+}

src/main/java/com/example/model/llama/Llama.java

@@ -1,9 +1,9 @@
 package com.example.model.llama;
 
 import com.example.model.Model;
-import com.example.loader.weights.ModelLoader;
 import com.example.loader.weights.State;
 import com.example.loader.weights.Weights;
+import com.example.model.ModelType;
 import com.example.tokenizer.impl.LlamaTokenizer;
 import com.example.tokenizer.impl.Tokenizer;
 
@@ -14,8 +14,8 @@ public record Llama(LlamaConfiguration configuration, Tokenizer tokenizer, Weigh
     private LlamaTokenizer getAsLlamaTokenizer() { return (LlamaTokenizer) tokenizer; }
 
     @Override
-    public ModelLoader.ModelType getModelType() {
-        return ModelLoader.ModelType.LLAMA_3;
+    public ModelType getModelType() {
+        return ModelType.LLAMA_3;
     }
 
     @Override

src/main/java/com/example/model/mistral/Mistral.java

@@ -1,9 +1,9 @@
 package com.example.model.mistral;
 
 import com.example.model.Model;
-import com.example.loader.weights.ModelLoader;
 import com.example.loader.weights.State;
 import com.example.loader.weights.Weights;
+import com.example.model.ModelType;
 import com.example.tokenizer.impl.MistralTokenizer;
 import com.example.tokenizer.impl.Tokenizer;
 
@@ -13,8 +13,8 @@ public record Mistral(MistralConfiguration configuration, Tokenizer tokenizer, W
     private MistralTokenizer getAsMistralTokenizer() { return (MistralTokenizer) tokenizer; }
 
     @Override
-    public ModelLoader.ModelType getModelType() {
-        return ModelLoader.ModelType.MISTRAL;
+    public ModelType getModelType() {
+        return ModelType.MISTRAL;
     }
 
     public State createNewState() {