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

feat: improve SQLite error handling with original exception details

Browse source
This commit is contained in:
Paul Gauthier (aider) 2024-10-29 15:05:16 -07:00
parent ef0fcb8f38
commit adca062081
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
aider/repomap.py
View file

@ -167,7 +167,7 @@ class RepoMap:
# Just return the full fname. # Just return the full fname.
return fname return fname
def tags_cache_error(self): def tags_cache_error(self, original_error=None):
"""Handle SQLite errors by trying to recreate cache, falling back to dict if needed""" """Handle SQLite errors by trying to recreate cache, falling back to dict if needed"""
if isinstance(getattr(self, "TAGS_CACHE", None), dict): if isinstance(getattr(self, "TAGS_CACHE", None), dict):
return return
@ -199,7 +199,9 @@ class RepoMap:
f"Unable to use tags cache at {path}, falling back to memory cache" f"Unable to use tags cache at {path}, falling back to memory cache"
) )
if self.verbose: if self.verbose:
self.io.tool_warning(f"Cache error: {str(e)}") if original_error:
self.io.tool_warning(f"Original error: {str(original_error)}")
self.io.tool_warning(f"Cache recreation error: {str(e)}")
self.TAGS_CACHE = dict() self.TAGS_CACHE = dict()
@ -207,8 +209,8 @@ class RepoMap:
path = Path(self.root) / self.TAGS_CACHE_DIR path = Path(self.root) / self.TAGS_CACHE_DIR
try: try:
self.TAGS_CACHE = Cache(path) self.TAGS_CACHE = Cache(path)
except SQLITE_ERRORS: except SQLITE_ERRORS as e:
self.tags_cache_error() self.tags_cache_error(e)
def save_tags_cache(self): def save_tags_cache(self):
pass pass
@ -228,8 +230,8 @@ class RepoMap:
cache_key = fname cache_key = fname
try: try:
val = self.TAGS_CACHE.get(cache_key) # Issue #1308 val = self.TAGS_CACHE.get(cache_key) # Issue #1308
except SQLITE_ERRORS: except SQLITE_ERRORS as e:
self.tags_cache_error() self.tags_cache_error(e)
val = self.TAGS_CACHE.get(cache_key) val = self.TAGS_CACHE.get(cache_key)
if val is not None and val.get("mtime") == file_mtime: if val is not None and val.get("mtime") == file_mtime: