summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Sima <ben@bensima.com>2025-11-30 20:54:58 -0500
committerBen Sima <ben@bensima.com>2025-11-30 20:54:58 -0500
commit194173619e0e1940284f4d4fa3de49f5197636c1 (patch)
tree8bf8a312b5c804173ae3841322fee159b2a53ea4
parentc156247790c54e9e20f574d8238d7c47dec29b19 (diff)
Fix jr loop: update model IDs and dev shellHEADlive
- Update OpenRouter model IDs to Claude 4.5 family: - anthropic/claude-sonnet-4.5 (default) - anthropic/claude-haiku-4.5 (simple tasks) - anthropic/claude-opus-4.5 (complex tasks) - Remove aider-chat from dev shell (broken, unused) - Simplify llm package (remove llm-ollama plugin) - Update nixos-unstable for llm 0.27.1 Task-Id: t-163
-rw-r--r--Omni/Agent/Engine.hs4
-rw-r--r--Omni/Agent/Worker.hs14
-rw-r--r--Omni/Bild.nix6
-rw-r--r--Omni/Bild/Sources.json8
4 files changed, 14 insertions, 18 deletions
diff --git a/Omni/Agent/Engine.hs b/Omni/Agent/Engine.hs
index 2704606..e019341 100644
--- a/Omni/Agent/Engine.hs
+++ b/Omni/Agent/Engine.hs
@@ -77,7 +77,7 @@ test =
llmBaseUrl defaultLLM Test.@=? "https://openrouter.ai/api/v1",
Test.unit "defaultLLM has OpenRouter headers" <| do
length (llmExtraHeaders defaultLLM) Test.@=? 2
- llmModel defaultLLM Test.@=? "anthropic/claude-sonnet-4-20250514",
+ llmModel defaultLLM Test.@=? "anthropic/claude-sonnet-4.5",
Test.unit "defaultAgentConfig has sensible defaults" <| do
agentMaxIterations defaultAgentConfig Test.@=? 10,
Test.unit "defaultEngineConfig has no-op callbacks" <| do
@@ -227,7 +227,7 @@ defaultLLM =
LLM
{ llmBaseUrl = "https://openrouter.ai/api/v1",
llmApiKey = "",
- llmModel = "anthropic/claude-sonnet-4-20250514",
+ llmModel = "anthropic/claude-sonnet-4.5",
llmExtraHeaders =
[ ("HTTP-Referer", "https://omni.dev"),
("X-Title", "Omni Agent")
diff --git a/Omni/Agent/Worker.hs b/Omni/Agent/Worker.hs
index ded4144..61c392b 100644
--- a/Omni/Agent/Worker.hs
+++ b/Omni/Agent/Worker.hs
@@ -343,13 +343,13 @@ selectModel task = selectModelByComplexity (TaskCore.taskComplexity task)
-- | Select model based on complexity level
selectModelByComplexity :: Maybe Int -> Text
-selectModelByComplexity Nothing = "anthropic/claude-sonnet-4-20250514"
-selectModelByComplexity (Just 1) = "anthropic/claude-haiku"
-selectModelByComplexity (Just 2) = "anthropic/claude-haiku"
-selectModelByComplexity (Just 3) = "anthropic/claude-sonnet-4-20250514"
-selectModelByComplexity (Just 4) = "anthropic/claude-sonnet-4-20250514"
-selectModelByComplexity (Just 5) = "anthropic/claude-opus-4-20250514"
-selectModelByComplexity (Just _) = "anthropic/claude-sonnet-4-20250514"
+selectModelByComplexity Nothing = "anthropic/claude-sonnet-4.5"
+selectModelByComplexity (Just 1) = "anthropic/claude-haiku-4.5"
+selectModelByComplexity (Just 2) = "anthropic/claude-haiku-4.5"
+selectModelByComplexity (Just 3) = "anthropic/claude-sonnet-4.5"
+selectModelByComplexity (Just 4) = "anthropic/claude-sonnet-4.5"
+selectModelByComplexity (Just 5) = "anthropic/claude-opus-4.5"
+selectModelByComplexity (Just _) = "anthropic/claude-sonnet-4.5"
formatTask :: TaskCore.Task -> Text
formatTask t =
diff --git a/Omni/Bild.nix b/Omni/Bild.nix
index 51cb2e2..b7e0801 100644
--- a/Omni/Bild.nix
+++ b/Omni/Bild.nix
@@ -143,11 +143,8 @@
tree
wemux
;
- aider-chat = unstable.aider-chat;
llama-cpp = unstable.llama-cpp;
- llm =
- unstable.python312.withPackages
- (p: [p.llm p.llm-ollama p.llm-sentence-transformers]);
+ llm = unstable.python312.withPackages (p: [p.llm]);
ollama = unstable.ollama;
ruff = unstable.ruff;
shellcheck = unstable.shellcheck;
@@ -255,7 +252,6 @@
name = "omnidev";
# this should just be dev tools
buildInputs = with self.pkgs; [
- aider-chat
bat
bc
self.bild
diff --git a/Omni/Bild/Sources.json b/Omni/Bild/Sources.json
index 4e1e9d6..a7d057a 100644
--- a/Omni/Bild/Sources.json
+++ b/Omni/Bild/Sources.json
@@ -187,10 +187,10 @@
"homepage": "",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "6f16a3566ed9024338f82e8c98f07303c17479ab",
- "sha256": "1z75blbml59sal35w1hvfk3ig2s86n4zidxjpcida0md7rrcinh2",
+ "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
+ "sha256": "14inw2gxia29f0qh9kyvdq9y1wcv43r4cc7fylz9v372z5chiamh",
"type": "tarball",
- "url": "https://github.com/nixos/nixpkgs/archive/6f16a3566ed9024338f82e8c98f07303c17479ab.tar.gz",
+ "url": "https://github.com/nixos/nixpkgs/archive/2fad6eac6077f03fe109c4d4eb171cf96791faa4.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nvidia-patch-nixos": {
@@ -211,7 +211,7 @@
"homepage": "https://ollama.com",
"owner": "ollama",
"repo": "ollama-python",
- "rev": "ee349ecc6d05ea57c9e91bc9345e2db3bc79bb5b",
+ "rev": "115792583ed248411d68334050ffed03ce9bc065",
"sha256": "1dkrdkw7gkr9ilfb34qh9vwm0231csg7raln69p00p4mvx2w53gi",
"type": "tarball",
"url": "https://github.com/ollama/ollama-python/archive/refs/tags/v0.4.5.tar.gz",