dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-29 08:44:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

cleaned up 35/4 logic

Browse source
This commit is contained in:
Paul Gauthier 2023-06-05 17:14:44 -07:00
parent fcd8a6df73
commit c8beac9a2d
1 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

33
aider/coder.py
View file

@ -31,6 +31,7 @@ class Coder:
repo = None repo = None
last_aider_commit_hash = None last_aider_commit_hash = None
last_asked_for_commit_time = 0 last_asked_for_commit_time = 0
repo_map = None
def check_model_availability(self, main_model): def check_model_availability(self, main_model):
available_models = openai.Model.list() available_models = openai.Model.list()
@ -73,7 +74,7 @@ class Coder:
self.console = Console(force_terminal=True, no_color=True) self.console = Console(force_terminal=True, no_color=True)
main_model = Models(main_model) main_model = Models(main_model)
if not self.check_model_availability(main_model): if main_model != Models.GPT35 and not self.check_model_availability(main_model):
main_model = Models.GPT35 main_model = Models.GPT35
self.main_model = main_model self.main_model = main_model
@ -82,7 +83,6 @@ class Coder:
f"Using {main_model.value}: showing diffs and disabling ctags/repo-maps.", f"Using {main_model.value}: showing diffs and disabling ctags/repo-maps.",
) )
self.gpt_prompts = prompts.GPT35() self.gpt_prompts = prompts.GPT35()
map_tokens = 0
show_diffs = True show_diffs = True
else: else:
self.gpt_prompts = prompts.GPT4() self.gpt_prompts = prompts.GPT4()
@ -100,16 +100,16 @@ class Coder:
self.io.tool_output("Not using git.") self.io.tool_output("Not using git.")
self.find_common_root() self.find_common_root()
rm_io = io if self.verbose else None if main_model == Models.GPT4:
self.repo_map = RepoMap( rm_io = io if self.verbose else None
map_tokens, self.repo_map = RepoMap(
self.root, map_tokens,
self.main_model, self.root,
rm_io, self.main_model,
self.gpt_prompts.repo_content_prefix, rm_io,
) self.gpt_prompts.repo_content_prefix,
)
if main_model != Models.GPT35:
if self.repo_map.has_ctags: if self.repo_map.has_ctags:
self.io.tool_output("Using ctags to build repo-map.") self.io.tool_output("Using ctags to build repo-map.")
@ -209,11 +209,12 @@ class Coder:
all_content += files_content all_content += files_content
other_files = set(self.get_all_abs_files()) - set(self.abs_fnames) other_files = set(self.get_all_abs_files()) - set(self.abs_fnames)
repo_content = self.repo_map.get_repo_map(self.abs_fnames, other_files) if self.repo_map:
if repo_content: repo_content = self.repo_map.get_repo_map(self.abs_fnames, other_files)
if all_content: if repo_content:
all_content += "\n" if all_content:
all_content += repo_content all_content += "\n"
all_content += repo_content
files_messages = [ files_messages = [
dict(role="user", content=all_content), dict(role="user", content=all_content),