dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-24 14:25:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

accepts_multi_system_msgs -> reminder_as_sys_msg

Browse source
This commit is contained in:
Paul Gauthier 2024-05-01 10:30:41 -07:00
parent 31b7ed3660
commit e76d1c0cfa
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
aider/coders/base_coder.py
View file

@ -573,7 +573,7 @@ class Coder:
# Add the reminder prompt if we still have room to include it. # Add the reminder prompt if we still have room to include it.
if total_tokens < self.main_model.info.get("max_input_tokens", 0): if total_tokens < self.main_model.info.get("max_input_tokens", 0):
if self.main_model.accepts_multi_system_msgs: if self.main_model.reminder_as_sys_msg:
messages += reminder_message messages += reminder_message
elif final["role"] == "user": elif final["role"] == "user":
# stuff it into the user message # stuff it into the user message

28
aider/models.py
View file

@ -25,7 +25,7 @@ class ModelSettings:
send_undo_reply: bool = False send_undo_reply: bool = False
accepts_images: bool = False accepts_images: bool = False
lazy: bool = False lazy: bool = False
accepts_multi_system_msgs: bool = False reminder_as_sys_msg: bool = False
# https://platform.openai.com/docs/models/gpt-4-and-gpt-4-turbo # https://platform.openai.com/docs/models/gpt-4-and-gpt-4-turbo
@ -38,25 +38,25 @@ MODEL_SETTINGS = [
"gpt-3.5-turbo-0125", "gpt-3.5-turbo-0125",
"whole", "whole",
weak_model_name="gpt-3.5-turbo", weak_model_name="gpt-3.5-turbo",
accepts_multi_system_msgs=True, reminder_as_sys_msg=True,
), ),
ModelSettings( ModelSettings(
"gpt-3.5-turbo-1106", "gpt-3.5-turbo-1106",
"whole", "whole",
weak_model_name="gpt-3.5-turbo", weak_model_name="gpt-3.5-turbo",
accepts_multi_system_msgs=True, reminder_as_sys_msg=True,
), ),
ModelSettings( ModelSettings(
"gpt-3.5-turbo-0613", "gpt-3.5-turbo-0613",
"whole", "whole",
weak_model_name="gpt-3.5-turbo", weak_model_name="gpt-3.5-turbo",
accepts_multi_system_msgs=True, reminder_as_sys_msg=True,
), ),
ModelSettings( ModelSettings(
"gpt-3.5-turbo-16k-0613", "gpt-3.5-turbo-16k-0613",
"whole", "whole",
weak_model_name="gpt-3.5-turbo", weak_model_name="gpt-3.5-turbo",
accepts_multi_system_msgs=True, reminder_as_sys_msg=True,
), ),
# gpt-4 # gpt-4
ModelSettings( ModelSettings(
@ -67,7 +67,7 @@ MODEL_SETTINGS = [
send_undo_reply=True, send_undo_reply=True,
accepts_images=True, accepts_images=True,
lazy=True, lazy=True,
accepts_multi_system_msgs=True, reminder_as_sys_msg=True,
), ),
ModelSettings( ModelSettings(
"gpt-4-turbo", "gpt-4-turbo",
@ -77,7 +77,7 @@ MODEL_SETTINGS = [
send_undo_reply=True, send_undo_reply=True,
accepts_images=True, accepts_images=True,
lazy=True, lazy=True,
accepts_multi_system_msgs=True, reminder_as_sys_msg=True,
), ),
ModelSettings( ModelSettings(
"gpt-4-0125-preview", "gpt-4-0125-preview",
@ -86,7 +86,7 @@ MODEL_SETTINGS = [
use_repo_map=True, use_repo_map=True,
send_undo_reply=True, send_undo_reply=True,
lazy=True, lazy=True,
accepts_multi_system_msgs=True, reminder_as_sys_msg=True,
), ),
ModelSettings( ModelSettings(
"gpt-4-1106-preview", "gpt-4-1106-preview",
@ -95,7 +95,7 @@ MODEL_SETTINGS = [
use_repo_map=True, use_repo_map=True,
send_undo_reply=True, send_undo_reply=True,
lazy=True, lazy=True,
accepts_multi_system_msgs=True, reminder_as_sys_msg=True,
), ),
ModelSettings( ModelSettings(
"gpt-4-vision-preview", "gpt-4-vision-preview",
@ -104,7 +104,7 @@ MODEL_SETTINGS = [
use_repo_map=True, use_repo_map=True,
send_undo_reply=True, send_undo_reply=True,
accepts_images=True, accepts_images=True,
accepts_multi_system_msgs=True, reminder_as_sys_msg=True,
), ),
ModelSettings( ModelSettings(
"gpt-4-0613", "gpt-4-0613",
@ -112,7 +112,7 @@ MODEL_SETTINGS = [
weak_model_name="gpt-3.5-turbo", weak_model_name="gpt-3.5-turbo",
use_repo_map=True, use_repo_map=True,
send_undo_reply=True, send_undo_reply=True,
accepts_multi_system_msgs=True, reminder_as_sys_msg=True,
), ),
ModelSettings( ModelSettings(
"gpt-4-32k-0613", "gpt-4-32k-0613",
@ -120,7 +120,7 @@ MODEL_SETTINGS = [
weak_model_name="gpt-3.5-turbo", weak_model_name="gpt-3.5-turbo",
use_repo_map=True, use_repo_map=True,
send_undo_reply=True, send_undo_reply=True,
accepts_multi_system_msgs=True, reminder_as_sys_msg=True,
), ),
# Claude # Claude
ModelSettings( ModelSettings(
@ -176,7 +176,7 @@ class Model:
accepts_images = False accepts_images = False
weak_model_name = None weak_model_name = None
lazy = False lazy = False
accepts_multi_system_msgs = False reminder_as_sys_msg = False
max_chat_history_tokens = 1024 max_chat_history_tokens = 1024
weak_model = None weak_model = None
@ -236,7 +236,7 @@ class Model:
return # <-- return # <--
if "gpt-3.5" in model or "gpt-4" in model: if "gpt-3.5" in model or "gpt-4" in model:
self.accepts_multi_system_msgs = True self.reminder_as_sys_msg = True
# use the defaults # use the defaults
if self.edit_format == "diff": if self.edit_format == "diff":