mirror of
https://github.com/Aider-AI/aider.git
synced 2025-05-29 08:44:59 +00:00
Refactor: Remove keys immediately in clean_metadata.py
This commit is contained in:
parent
ce1266be68
commit
b4673fdc85
1 changed files with 20 additions and 28 deletions
|
@ -45,8 +45,8 @@ def main():
|
||||||
litellm_keys = set(litellm_data.keys())
|
litellm_keys = set(litellm_data.keys())
|
||||||
aider_keys = set(aider_data.keys())
|
aider_keys = set(aider_data.keys())
|
||||||
|
|
||||||
keys_to_remove = set()
|
|
||||||
common_keys = sorted(list(litellm_keys.intersection(aider_keys)))
|
common_keys = sorted(list(litellm_keys.intersection(aider_keys)))
|
||||||
|
removed_count = 0
|
||||||
|
|
||||||
if common_keys:
|
if common_keys:
|
||||||
print("Comparing common models found in both files:\n")
|
print("Comparing common models found in both files:\n")
|
||||||
|
@ -90,8 +90,21 @@ def main():
|
||||||
.lower()
|
.lower()
|
||||||
)
|
)
|
||||||
if response == "y":
|
if response == "y":
|
||||||
keys_to_remove.add(key)
|
if key in aider_data:
|
||||||
print(f"Marked '{key}' for removal.")
|
print(f"Removing '{key}' from aider data...")
|
||||||
|
del aider_data[key]
|
||||||
|
removed_count += 1
|
||||||
|
# Write the modified data back immediately
|
||||||
|
try:
|
||||||
|
with open(aider_path, "w") as f:
|
||||||
|
json.dump(aider_data, f, indent=4, sort_keys=True)
|
||||||
|
f.write("\n")
|
||||||
|
print(f"Successfully removed '{key}' and updated {aider_path}.")
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Error writing updated data to {aider_path} after removing {key}: {e}")
|
||||||
|
# Exit or handle error appropriately? For now, just print.
|
||||||
|
else:
|
||||||
|
print(f"'{key}' not found in aider data (already removed?).")
|
||||||
else:
|
else:
|
||||||
print(f"Keeping '{key}'.")
|
print(f"Keeping '{key}'.")
|
||||||
print("-" * 40 + "\n") # Separator for the next model
|
print("-" * 40 + "\n") # Separator for the next model
|
||||||
|
@ -100,32 +113,11 @@ def main():
|
||||||
print("No common models found between the two files.")
|
print("No common models found between the two files.")
|
||||||
return # Exit if no common keys
|
return # Exit if no common keys
|
||||||
|
|
||||||
# Remove marked keys after iterating through all common models
|
# Final summary message
|
||||||
if keys_to_remove:
|
|
||||||
print("\nRemoving marked entries from aider data...")
|
|
||||||
removed_count = 0
|
|
||||||
for key in keys_to_remove:
|
|
||||||
if key in aider_data:
|
|
||||||
del aider_data[key]
|
|
||||||
print(f" - Removed {key}")
|
|
||||||
removed_count += 1
|
|
||||||
|
|
||||||
if removed_count > 0:
|
if removed_count > 0:
|
||||||
# Write the modified data back to the aider metadata file
|
print(f"\nFinished comparing. A total of {removed_count} entr(y/ies) were removed.")
|
||||||
try:
|
|
||||||
with open(aider_path, "w") as f:
|
|
||||||
# Use json.dump for standard, clean JSON output
|
|
||||||
# Using sort_keys=True for consistent ordering
|
|
||||||
json.dump(aider_data, f, indent=4, sort_keys=True)
|
|
||||||
# Add a trailing newline for POSIX compatibility
|
|
||||||
f.write("\n")
|
|
||||||
print(f"\nSuccessfully updated {aider_path} with {removed_count} removal(s).")
|
|
||||||
except Exception as e:
|
|
||||||
print(f"\nError writing updated data to {aider_path}: {e}")
|
|
||||||
else:
|
else:
|
||||||
print("\nNo entries were actually removed (perhaps they were already gone?).")
|
print("\nFinished comparing. No entries were removed.")
|
||||||
else:
|
|
||||||
print("\nNo entries marked for removal.")
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue