diff --git a/modules/services/ollama.nix b/modules/services/ollama.nix index 21e9e8089..06979cf44 100644 --- a/modules/services/ollama.nix +++ b/modules/services/ollama.nix @@ -19,12 +19,14 @@ let modelSources = pkgs.symlinkJoin { name = "ollama-models"; paths = with pkgs.ollamaPackages; [ - llama3_1-70b + # llama3_1-70b # generates like 1 word/sec, decent output (comparable to qwen2_5-32b) llama3_2-3b mistral mistral-large mixtral-8x7b - qwen2_5-32b + qwen2_5-7b + qwen2_5-14b + qwen2_5-32b # generates 3~5 words/sec, but notably more accurate than coder-7b qwen2_5-coder-7b ]; }; diff --git a/pkgs/by-name/ollamaPackages/llama3_1-70b.nix b/pkgs/by-name/ollamaPackages/llama3_1-70b.nix index ade243721..31b6bd84e 100644 --- a/pkgs/by-name/ollamaPackages/llama3_1-70b.nix +++ b/pkgs/by-name/ollamaPackages/llama3_1-70b.nix @@ -1,7 +1,5 @@ -{ - mkOllamaModel, -}: -mkOllamaModel { +# +{ mkOllamaModel }: mkOllamaModel { modelName = "llama3.1"; variant = "70b"; manifestHash = "sha256-4LWpHLldtUs3nsyNACCuEJ7bLH7Rvj8scM39fjNQYw0="; diff --git a/pkgs/by-name/ollamaPackages/llama3_2-3b.nix b/pkgs/by-name/ollamaPackages/llama3_2-3b.nix index 1bbca755f..8f0b23bec 100644 --- a/pkgs/by-name/ollamaPackages/llama3_2-3b.nix +++ b/pkgs/by-name/ollamaPackages/llama3_2-3b.nix @@ -1,7 +1,5 @@ -{ - mkOllamaModel -}: -mkOllamaModel { +# +{ mkOllamaModel }: mkOllamaModel { modelName = "llama3.2"; variant = "3b"; manifestHash = "sha256-Z0I0WdLn2VWqGnIGK1GnBPuvbwuCbSM1WFXp+ltJaN8="; diff --git a/pkgs/by-name/ollamaPackages/mistral-large.nix b/pkgs/by-name/ollamaPackages/mistral-large.nix index c7fb47f61..c09c2e28d 100644 --- a/pkgs/by-name/ollamaPackages/mistral-large.nix +++ b/pkgs/by-name/ollamaPackages/mistral-large.nix @@ -1,8 +1,5 @@ # -{ - mkOllamaModel -}: -mkOllamaModel { +{ mkOllamaModel }: mkOllamaModel { modelName = "mistral-large"; variant = "123b"; manifestHash = "sha256-bClIgCa5s/JxfrjB2RWw1mtSy4Lq9OkA2+YWvk7337g="; diff --git a/pkgs/by-name/ollamaPackages/mistral.nix b/pkgs/by-name/ollamaPackages/mistral.nix index c4f66c1bd..bf32604b7 100644 --- a/pkgs/by-name/ollamaPackages/mistral.nix +++ b/pkgs/by-name/ollamaPackages/mistral.nix @@ -1,7 +1,5 @@ -{ - mkOllamaModel -}: -mkOllamaModel { +# +{ mkOllamaModel }: mkOllamaModel { modelName = "mistral"; variant = "7b"; manifestHash = "sha256-O45li3MlGdY+tk0vj3N5CS/RGoLGKE4KZZKiyAVEZC4="; diff --git a/pkgs/by-name/ollamaPackages/package.nix b/pkgs/by-name/ollamaPackages/package.nix index 1c9bb1cf1..1e104324a 100644 --- a/pkgs/by-name/ollamaPackages/package.nix +++ b/pkgs/by-name/ollamaPackages/package.nix @@ -14,6 +14,8 @@ lib.recurseIntoAttrs (lib.makeScope newScope (self: with self; { mistral = callPackage ./mistral.nix { }; mistral-large = callPackage ./mistral-large.nix { }; mixtral-8x7b = callPackage ./mixtral-8x7b.nix { }; + qwen2_5-7b = callPackage ./qwen2_5-7b.nix { }; + qwen2_5-14b = callPackage ./qwen2_5-14b.nix { }; qwen2_5-32b = callPackage ./qwen2_5-32b.nix { }; qwen2_5-coder-7b = callPackage ./qwen2_5-coder-7b.nix { }; })) diff --git a/pkgs/by-name/ollamaPackages/qwen2_5-14b.nix b/pkgs/by-name/ollamaPackages/qwen2_5-14b.nix new file mode 100644 index 000000000..27d458dc0 --- /dev/null +++ b/pkgs/by-name/ollamaPackages/qwen2_5-14b.nix @@ -0,0 +1,10 @@ +# +{ mkOllamaModel }: mkOllamaModel { + modelName = "qwen2.5"; + variant = "14b"; + manifestHash = "sha256-1U+DYHu8mCbpzfSMeCgjYcGA9+mgNPSNQCOx5TQw92s="; + modelBlob = "2049f5674b1e92b4464e5729975c9689fcfbf0b0e4443ccf10b5339f370f9a54"; + modelBlobHash = "sha256-IEn1Z0sekrRGTlcpl1yWifz78LDkRDzPELUznzcPmlQ="; + systemBlob = "66b9ea09bd5b7099cbb4fc820f31b575c0366fa439b08245566692c6784e281e"; + systemBlobHash = "sha256-ZrnqCb1bcJnLtPyCDzG1dcA2b6Q5sIJFVmaSxnhOKB4="; +} diff --git a/pkgs/by-name/ollamaPackages/qwen2_5-32b.nix b/pkgs/by-name/ollamaPackages/qwen2_5-32b.nix index d54f47016..abd7cad47 100644 --- a/pkgs/by-name/ollamaPackages/qwen2_5-32b.nix +++ b/pkgs/by-name/ollamaPackages/qwen2_5-32b.nix @@ -1,7 +1,5 @@ -{ - mkOllamaModel -}: -mkOllamaModel { +# +{ mkOllamaModel }: mkOllamaModel { modelName = "qwen2.5"; variant = "32b"; manifestHash = "sha256-Gt8djxgzdAm9BK9FrMAz5dxFEP1+Sg86w0ESGzxsNuA="; diff --git a/pkgs/by-name/ollamaPackages/qwen2_5-7b.nix b/pkgs/by-name/ollamaPackages/qwen2_5-7b.nix new file mode 100644 index 000000000..dd2b8cca4 --- /dev/null +++ b/pkgs/by-name/ollamaPackages/qwen2_5-7b.nix @@ -0,0 +1,10 @@ +# +{ mkOllamaModel }: mkOllamaModel { + modelName = "qwen2.5"; + variant = "7b"; + manifestHash = "sha256-V8Fnts9pRDFAoqeav8cwXI9+RwrjNkPZEZvPw521cd8="; + modelBlob = "2bada8a7450677000f678be90653b85d364de7db25eb5ea54136ada5f3933730"; + modelBlobHash = "sha256-K62op0UGdwAPZ4vpBlO4XTZN59sl616lQTatpfOTNzA="; + systemBlob = "66b9ea09bd5b7099cbb4fc820f31b575c0366fa439b08245566692c6784e281e"; + systemBlobHash = "sha256-ZrnqCb1bcJnLtPyCDzG1dcA2b6Q5sIJFVmaSxnhOKB4="; +}