mirror of
https://github.com/Aider-AI/aider.git
synced 2025-05-30 17:24:59 +00:00
Merge branch 'main' into gpt-35
This commit is contained in:
commit
efb8cad881
2 changed files with 10 additions and 3 deletions
|
@ -58,9 +58,10 @@ def fname_to_components(fname, with_colon):
|
||||||
|
|
||||||
|
|
||||||
class RepoMap:
|
class RepoMap:
|
||||||
|
CACHE_VERSION = 1
|
||||||
ctags_cmd = ["ctags", "--fields=+S", "--extras=-F", "--output-format=json"]
|
ctags_cmd = ["ctags", "--fields=+S", "--extras=-F", "--output-format=json"]
|
||||||
IDENT_CACHE_DIR = ".aider.ident.cache"
|
IDENT_CACHE_DIR = f".aider.ident.cache.v{CACHE_VERSION}"
|
||||||
TAGS_CACHE_DIR = ".aider.tags.cache"
|
TAGS_CACHE_DIR = f".aider.tags.cache.v{CACHE_VERSION}"
|
||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
self, map_tokens=1024, root=None, main_model="gpt-4", io=None, repo_content_prefix=None
|
self, map_tokens=1024, root=None, main_model="gpt-4", io=None, repo_content_prefix=None
|
||||||
|
@ -318,7 +319,8 @@ class RepoMap:
|
||||||
|
|
||||||
top_rank = sorted([(rank, node) for (node, rank) in ranked.items()], reverse=True)
|
top_rank = sorted([(rank, node) for (node, rank) in ranked.items()], reverse=True)
|
||||||
for rank, fname in top_rank:
|
for rank, fname in top_rank:
|
||||||
rel_other_fnames_without_tags.remove(fname)
|
if fname in rel_other_fnames_without_tags:
|
||||||
|
rel_other_fnames_without_tags.remove(fname)
|
||||||
if fname not in fnames_already_included:
|
if fname not in fnames_already_included:
|
||||||
ranked_tags.append((fname,))
|
ranked_tags.append((fname,))
|
||||||
|
|
||||||
|
|
|
@ -26,3 +26,8 @@ tiktoken==0.4.0
|
||||||
configargparse
|
configargparse
|
||||||
PyYAML
|
PyYAML
|
||||||
backoff==2.2.1
|
backoff==2.2.1
|
||||||
|
networkx==3.1
|
||||||
|
diskcache==5.6.1
|
||||||
|
numpy==1.24.3
|
||||||
|
scipy==1.10.1
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue