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

simplify format_files_for_input

Browse source
This commit is contained in:
Paul Gauthier 2024-10-22 10:02:42 -07:00
parent cb306b61cd
commit ae54ef57ae
1 changed files with 7 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

55
aider/io.py
View file

@ -358,7 +358,9 @@ class InputOutput:
rel_fnames = list(rel_fnames)
show = ""
if rel_fnames:
rel_read_only_fnames = [os.path.relpath(fname, root) for fname in (abs_read_only_fnames or [])]
rel_read_only_fnames = [
os.path.relpath(fname, root) for fname in (abs_read_only_fnames or [])
]
show = self.format_files_for_input(rel_fnames, rel_read_only_fnames)
if edit_format:
show += edit_format
@ -698,57 +700,14 @@ class InputOutput:
self.chat_history_file = None # Disable further attempts to write
def format_files_for_input(self, rel_fnames, rel_read_only_fnames):
minimal_unique_fileids = self.compute_minimal_fileids(rel_fnames)
# Format the filename for display in the prompt, with disambiguating path
# in parentheses, if needed.
def format_minimal_fileid(fname):
pth = Path(minimal_unique_fileids[fname])
if len(pth.parts) > 1:
return f"{pth.name} ({'/'.join(pth.parts[:-1])})"
else:
return pth.name
read_only_files = []
for full_path in (rel_read_only_fnames or []):
name = format_minimal_fileid(full_path)
read_only_files.append(f" R {name}")
for full_path in rel_read_only_fnames or []:
read_only_files.append(f"{full_path} (read only)")
editable_files = []
for full_path in rel_fnames:
if full_path in rel_read_only_fnames:
continue
name = format_minimal_fileid(full_path)
editable_files.append(f" {name}")
editable_files.append(f"{full_path}")
return "\n".join(read_only_files + editable_files) + '\n'
def compute_minimal_fileids(self, rel_fnames):
# First pass: group files with the same name
grouped_fnames = defaultdict(list)
for full_path in rel_fnames:
pth = Path(full_path)
fname = pth.name
grouped_fnames[fname].append(list(pth.parts))
# Second pass: compute the shared prefix of each group of files.
shared_prefixes = {}
for fname, paths in grouped_fnames.items():
shared_prefix = []
while all(len(path) > 1 for path in paths):
next_part = paths[0][0]
if not all(path[0] == next_part for path in paths):
break
shared_prefix.append(next_part)
paths = [path[1:] for path in paths]
shared_prefixes[fname] = Path(*shared_prefix)
# Third pass: subtract the shared prefix from the full path to get the minimal unique id
minimal_unique_ids = {}
for full_path in rel_fnames:
pth = Path(full_path)
fname = pth.name
prefix = shared_prefixes[fname]
minimal_unique_ids[full_path] = str(pth.relative_to(prefix))
return minimal_unique_ids
return "\n".join(read_only_files + editable_files) + "\n"