Commit graph

4056 commits

Author SHA1 Message Date
Paul Gauthier
6be2075aad Updated HISTORY 2024-05-13 11:10:53 -07:00
Paul Gauthier
ea05cf05e1 Added --restore-chat-history 2024-05-13 11:09:28 -07:00
Paul Gauthier
6d75dc62d7 copy 2024-05-13 11:06:02 -07:00
Paul Gauthier
eea86ef4f6 copy 2024-05-13 11:05:05 -07:00
Paul Gauthier
45ea2d5871 copy 2024-05-13 11:03:12 -07:00
Paul Gauthier
5b3e9d7b05 copy 2024-05-13 10:59:14 -07:00
Paul Gauthier
8b99429dfa updated leaderboards 2024-05-13 10:58:06 -07:00
Paul Gauthier
bfba56c5f1 added 4o as default 2024-05-13 10:57:26 -07:00
Paul Gauthier
b6cd852124 added openai/ prefix 2024-05-13 10:36:07 -07:00
Paul Gauthier
7b19f767fc Added gpt-4o 2024-05-13 10:33:08 -07:00
Paul Gauthier
eea8e50c60 ask llm are you sure? when REPLACE exists 2024-05-11 16:56:14 -07:00
Paul Gauthier
90c0a5b9a4 reflect multiple messages; do not strip edit error messages 2024-05-11 16:40:37 -07:00
Paul Gauthier
0f9e314bb2 emit edit errors as proper tool_error() markdown 2024-05-11 15:38:03 -07:00
Paul Gauthier
cd78080fa5 on search/replace error ask the LLM did you mean? 2024-05-11 15:02:22 -07:00
Paul Gauthier
4841f318c1 always retry httpx errors 2024-05-11 15:01:56 -07:00
Paul Gauthier
6c45b58698 aider: Implemented find_similar_lines to fuzzy search content and return closest matching contiguous chunk of lines.
# Aider chat conversation:

USER: implement `find_similar_lines` which will fuzzy search the content for the original lines and return the contiguous chunk of lines from content which are the closest match

ASSISTANT: Here is the implementation of `find_similar_lines` to fuzzy search the content and return the closest matching contiguous chunk of lines:

aider/coders/editblock_coder.py
<source>python
<<<<<<< SEARCH
    #did_you_mean = find_similar_lines(original, content)
=======
    did_you_mean = find_similar_lines(original, content)
>>>>>>> REPLACE
</source>

aider/coders/editblock_coder.py
<source>python
<<<<<<< SEARCH
=======
def find_similar_lines(search_lines, content_lines, threshold=0.8):
    search_lines = search_lines.splitlines()
    content_lines = content_lines.splitlines()

    best_ratio = 0
    best_match = None

    for i in range(len(content_lines) - len(search_lines) + 1):
        chunk = content_lines[i:i+len(search_lines)]
        ratio = SequenceMatcher(None, search_lines, chunk).ratio()
        if ratio > best_ratio:
            best_ratio = ratio
            best_match = chunk

    if best_ratio >= threshold:
        return "\n".join(best_match)
    else:
        return ""
>>>>>>> REPLACE
</source>

This adds the `find_similar_lines` function which:

1. Splits the search lines and content lines on newlines
2. Iterates through the content lines, considering each contiguous chunk the same length as the search lines
3. Calculates the SequenceMatcher ratio between the search lines and each chunk
4. Keeps track of the chunk with the highest ratio
5. If the best ratio is above the threshold (default 0.8), it returns the best matching chunk joined back into a string
6. Otherwise it returns an empty string to indicate no close enough match was found

It also uncomments the line to call `find_similar_lines` and store the result in `did_you_mean`.

Let me know if you have any other questions!
2024-05-11 10:49:34 -07:00
Paul Gauthier
056dae6530 Removed unused find_similar_lines function call from EditBlockCoder class. 2024-05-11 10:49:33 -07:00
Paul Gauthier
fd6f31f972 Replaced find_similar_text with find_similar_lines in editblock_coder.py. 2024-05-11 10:48:45 -07:00
Paul Gauthier
d02506db16 aider: Implemented find_similar_text function to fuzzy search the content for the closest match to the original text.
# Aider chat conversation:

USER: I did `git reset --hard HEAD~1` to discard the last edits. Please wait for further instructions before attempting that change again. Feel free to ask relevant questions about why the changes were reverted.

ASSISTANT: I understand you reverted the previous changes. Before I attempt to implement the `find_similar_lines` function again, I have a few questions to ensure I follow your guidelines correctly:

1. When proposing changes, should I only modify the `aider/coders/editblock_coder.py` file since that is the only one you have explicitly added to the chat
^C KeyboardInterrupt

USER: implement `find_similar_text` which will fuzzy search the content for the original text and return the part of content which is the closest match

ASSISTANT: Here is the implementation of `find_similar_text` to fuzzy search the content for the closest match to the original text:

aider/coders/editblock_coder.py
<source>python
<<<<<<< SEARCH
=======
from difflib import SequenceMatcher

def find_similar_text(original, content):
    content_len = len(content)
    original_len = len(original)

    best_ratio = 0
    best_match = None

    for i in range(content_len - original_len + 1):
        chunk = content[i:i+original_len]
        ratio = SequenceMatcher(None, original, chunk).ratio()

        if ratio > best_ratio:
            best_ratio = ratio
            best_match = chunk

    return best_match
>>>>>>> REPLACE
</source>

This function:

1. Iterates through the content, considering each chunk of text the same length as the original
2. Calculates the SequenceMatcher ratio between the original text and each chunk
3. Keeps track of the chunk with the highest ratio
4. Returns the chunk of content that best matches the original text

It will return the portion of `content` that is the closest fuzzy match to `original`.

Let me know if you have any other questions!
2024-05-11 10:43:40 -07:00
Paul Gauthier
6d39e2c857 Replaced find_similar_lines with find_similar_text in the EditBlockCoder class. 2024-05-11 10:43:38 -07:00
Paul Gauthier
587ba4d676 Added functionality to suggest similar lines when a search block fails to match in EditBlockCoder. 2024-05-11 10:38:44 -07:00
Paul Gauthier
785259b59c try patching any of the other files in the chat 2024-05-11 10:33:46 -07:00
Paul Gauthier
5ec441dd2c More clear feedback when SEARCH/REPLACE blocks fail to match 2024-05-11 10:25:16 -07:00
Paul Gauthier
478b5c8e7c improved utils.split_chat_history_markdown 2024-05-11 08:06:16 -07:00
Paul Gauthier
602a0c7c31 refac utils.split_chat_history_markdown 2024-05-11 07:52:06 -07:00
Paul Gauthier
9fac20e432 Updated HISTORY 2024-05-11 07:49:58 -07:00
paul-gauthier
45b2ba8a10
Merge pull request #591 from paul-gauthier/restore-chat-history
Restore prior chat history on launch
2024-05-11 07:49:43 -07:00
Paul Gauthier
1098b428e6 prompt tweaks, retry on httpx.ReadTimeout 2024-05-11 07:47:53 -07:00
Paul Gauthier
3171789b1f look for mentions with trailing : 2024-05-10 19:38:05 -07:00
Paul Gauthier
4a0c0a3913 Recommend pipx upgrade command 2024-05-10 12:07:22 -07:00
Paul Gauthier
738c514168 set version to 0.34.1-dev 2024-05-10 09:15:04 -07:00
Paul Gauthier
6a452c3401 version bump to 0.34.0 2024-05-10 09:14:30 -07:00
Paul Gauthier
b2618d8bf4 Updated HISTORY 2024-05-10 09:10:54 -07:00
Paul Gauthier
bb93c2a903 fixed tests 2024-05-09 14:35:57 -07:00
Paul Gauthier
728a629789 Catch and appropriately retry *all* litellm exceptions #598 2024-05-09 14:16:09 -07:00
Paul Gauthier
b158e1c230 copy 2024-05-09 14:07:28 -07:00
Paul Gauthier
a5bc2e8b97 Added prompt to reply in the users language #597 2024-05-09 14:06:31 -07:00
Paul Gauthier
5eed34af5a Updated HISTORY 2024-05-09 13:49:01 -07:00
Paul Gauthier
d8e1628c18 Merge branch 'main' into read-write-changes 2024-05-09 13:43:53 -07:00
Paul Gauthier
a3c9bd97e2 updated deepseek-chat yaml 2024-05-09 12:51:16 -07:00
Paul Gauthier
80a3f6d4f6 updated deepseek-chat yaml 2024-05-09 11:57:41 -07:00
Paul Gauthier
4eec60f42c updated assistant auto-reply to no files 2024-05-09 11:56:11 -07:00
Paul Gauthier
444d17de93 reverted prompt closer to e9da401, added helpful assistant replies to repo and files messages 2024-05-09 11:27:13 -07:00
Paul Gauthier
b5ff2a505f twitter image 2024-05-09 11:19:25 -07:00
Paul Gauthier
cd10e0bf03 make all highlight_images jpg 2024-05-09 09:50:05 -07:00
Paul Gauthier
ccb8be7adf use jpg as highlight 2024-05-09 09:07:01 -07:00
Paul Gauthier
b58df9c16b no ex_sys for opus 2024-05-08 16:09:18 -07:00
Paul Gauthier
c415e6f775 opus with examples_as_sys_msg 2024-05-08 15:49:53 -07:00
Paul Gauthier
2269f56aed updated gpt-0125 refac 2024-05-08 15:38:41 -07:00
Paul Gauthier
5c4bc5b7ba oops 2024-05-08 15:25:55 -07:00