Merge remote-tracking branch 'refs/remotes/origin/main'

aider/models.py

@@ -18,7 +18,7 @@ from aider.dump import dump  # noqa: F401
 from aider.llm import litellm
 
 DEFAULT_MODEL_NAME = "gpt-4o"
-ANTHROPIC_BETA_HEADER = "max-tokens-3-5-sonnet-2024-07-15,prompt-caching-2024-07-31"
+ANTHROPIC_BETA_HEADER = "prompt-caching-2024-07-31"
 
 OPENAI_MODELS = """
 gpt-4
@@ -306,10 +306,8 @@ MODEL_SETTINGS = [
         examples_as_sys_msg=True,
         accepts_images=True,
         max_tokens=8192,
-        extra_headers={
-            "anthropic-beta": "max-tokens-3-5-sonnet-2024-07-15",
-        },
         reminder="user",
+        cache_control=True,
     ),
     # Vertex AI Claude models
     # Does not yet support 8k token
@@ -320,6 +318,7 @@ MODEL_SETTINGS = [
         use_repo_map=True,
         examples_as_sys_msg=True,
         accepts_images=True,
+        max_tokens=8192,
         reminder="user",
     ),
     ModelSettings(

aider/website/_data/edit_leaderboard.yml

@@ -950,7 +950,7 @@
 
 - dirname: 2024-09-04-16-08-09--yi-coder-9b-whole
   test_cases: 133
-  model: openai/hf:01-ai/Yi-Coder-9B-Chat
+  model: Yi Coder 9B Chat
   edit_format: whole
   commit_hash: c4e4967
   pass_rate_1: 46.6
@@ -974,7 +974,7 @@
 
 - dirname: 2024-09-04-16-17-33--yi-coder-9b-chat-q4_0-whole
   test_cases: 133
-  model: ollama/yi-coder:9b-chat-q4_0
+  model: yi-coder:9b-chat-q4_0
   edit_format: whole
   commit_hash: c4e4967
   pass_rate_1: 41.4