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

Add some defensive coding to ChangeTracker

Browse source
This commit is contained in:
Amar Sood (tekacs) 2025-04-12 11:56:40 -04:00
parent 8e964bf6e2
commit 46b0bee184
1 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

31
aider/change_tracker.py
View file

@ -30,10 +30,24 @@ class ChangeTracker:
- change_id: Unique identifier for the change
"""
if change_id is None:
change_id = self._generate_change_id()
generated_id = self._generate_change_id()
# Ensure the generated ID is treated as a string
current_change_id = str(generated_id)
else:
# If an ID is provided, ensure it's treated as a string key/value
current_change_id = str(change_id)
# Defensive check: Ensure the ID isn't literally the string 'False' or boolean False
# which might indicate an upstream issue or unexpected input.
if current_change_id == 'False' or current_change_id is False:
# Log a warning? For now, generate a new ID to prevent storing False.
print(f"Warning: change_id evaluated to False for {file_path}. Generating new ID.")
current_change_id = self._generate_change_id()
change = {
'id': change_id,
# Use the confirmed string ID here
'id': current_change_id,
'file_path': file_path,
'type': change_type,
'original': original_content,
@ -41,10 +55,11 @@ class ChangeTracker:
'metadata': metadata or {},
'timestamp': time.time()
}
self.changes[change_id] = change
self.files_changed[file_path].append(change_id)
return change_id
# Use the confirmed string ID for storage and return
self.changes[current_change_id] = change
self.files_changed[file_path].append(current_change_id)
return current_change_id
def undo_change(self, change_id):
"""
@ -115,4 +130,4 @@ class ChangeTracker:
def _generate_change_id(self):
"""Generate a unique ID for a change."""
return str(uuid.uuid4())[:8] # Short, readable ID
return str(uuid.uuid4())[:8] # Short, readable ID