dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-23 13:54:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

updated tests, disabled send cache

Browse source
This commit is contained in:
Paul Gauthier 2023-08-10 12:27:46 -03:00
parent 7eab7b54b8
commit 7924900bc4
2 changed files with 32 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

10
aider/sendchat.py
View file

@ -4,7 +4,8 @@ import json
import backoff import backoff
import openai import openai
import requests import requests
from diskcache import Cache
# from diskcache import Cache
from openai.error import ( from openai.error import (
APIConnectionError, APIConnectionError,
APIError, APIError,
@ -14,7 +15,8 @@ from openai.error import (
) )
CACHE_PATH = "~/.aider.send.cache.v1" CACHE_PATH = "~/.aider.send.cache.v1"
CACHE = Cache(CACHE_PATH) CACHE = None
# CACHE = Cache(CACHE_PATH)
@backoff.on_exception( @backoff.on_exception(
@ -53,12 +55,12 @@ def send_with_retries(model, messages, functions, stream):
# Generate SHA1 hash of kwargs and append it to chat_completion_call_hashes # Generate SHA1 hash of kwargs and append it to chat_completion_call_hashes
hash_object = hashlib.sha1(key) hash_object = hashlib.sha1(key)
if not stream and key in CACHE: if not stream and CACHE is not None and key in CACHE:
return hash_object, CACHE[key] return hash_object, CACHE[key]
res = openai.ChatCompletion.create(**kwargs) res = openai.ChatCompletion.create(**kwargs)
if not stream: if not stream and CACHE is not None:
CACHE[key] = res CACHE[key] = res
return hash_object, res return hash_object, res

50
tests/test_editblock.py
View file

@ -21,7 +21,8 @@ class TestUtils(unittest.TestCase):
def tearDown(self): def tearDown(self):
self.patcher.stop() self.patcher.stop()
def test_replace_most_similar_chunk(self): # fuzzy logic disabled v0.11.2-dev
def __test_replace_most_similar_chunk(self):
whole = "This is a sample text.\nAnother line of text.\nYet another line.\n" whole = "This is a sample text.\nAnother line of text.\nYet another line.\n"
part = "This is a sample text\n" part = "This is a sample text\n"
replace = "This is a replaced text.\n" replace = "This is a replaced text.\n"
@ -30,7 +31,8 @@ class TestUtils(unittest.TestCase):
result = eb.replace_most_similar_chunk(whole, part, replace) result = eb.replace_most_similar_chunk(whole, part, replace)
self.assertEqual(result, expected_output) self.assertEqual(result, expected_output)
def test_replace_most_similar_chunk_not_perfect_match(self): # fuzzy logic disabled v0.11.2-dev
def __test_replace_most_similar_chunk_not_perfect_match(self):
whole = "This is a sample text.\nAnother line of text.\nYet another line.\n" whole = "This is a sample text.\nAnother line of text.\nYet another line.\n"
part = "This was a sample text.\nAnother line of txt\n" part = "This was a sample text.\nAnother line of txt\n"
replace = "This is a replaced text.\nModified line of text.\n" replace = "This is a replaced text.\nModified line of text.\n"
@ -65,11 +67,11 @@ Here's the change:
```text ```text
foo.txt foo.txt
<<<<<<< ORIGINAL <<<<<<< HEAD
Two Two
======= =======
Tooooo Tooooo
>>>>>>> UPDATED >>>>>>> updated
``` ```
Hope you like it! Hope you like it!
@ -84,11 +86,11 @@ Here's the change:
foo.txt foo.txt
```text ```text
<<<<<<< ORIGINAL <<<<<<< HEAD
Two Two
======= =======
Tooooo Tooooo
>>>>>>> UPDATED >>>>>>> updated
``` ```
Hope you like it! Hope you like it!
@ -103,7 +105,7 @@ Here's the change:
```text ```text
foo.txt foo.txt
<<<<<<< ORIGINAL <<<<<<< HEAD
Two Two
======= =======
Tooooo Tooooo
@ -121,7 +123,7 @@ oops!
Here's the change: Here's the change:
```text ```text
<<<<<<< ORIGINAL <<<<<<< HEAD
Two Two
======= =======
Tooooo Tooooo
@ -137,34 +139,34 @@ oops!
def test_find_original_update_blocks_no_final_newline(self): def test_find_original_update_blocks_no_final_newline(self):
edit = """ edit = """
aider/coder.py aider/coder.py
<<<<<<< ORIGINAL <<<<<<< HEAD
self.console.print("[red]^C again to quit") self.console.print("[red]^C again to quit")
======= =======
self.io.tool_error("^C again to quit") self.io.tool_error("^C again to quit")
>>>>>>> UPDATED >>>>>>> updated
aider/coder.py aider/coder.py
<<<<<<< ORIGINAL <<<<<<< HEAD
self.io.tool_error("Malformed ORIGINAL/UPDATE blocks, retrying...") self.io.tool_error("Malformed ORIGINAL/UPDATE blocks, retrying...")
self.io.tool_error(err) self.io.tool_error(err)
======= =======
self.io.tool_error("Malformed ORIGINAL/UPDATE blocks, retrying...") self.io.tool_error("Malformed ORIGINAL/UPDATE blocks, retrying...")
self.io.tool_error(str(err)) self.io.tool_error(str(err))
>>>>>>> UPDATED >>>>>>> updated
aider/coder.py aider/coder.py
<<<<<<< ORIGINAL <<<<<<< HEAD
self.console.print("[red]Unable to get commit message from gpt-3.5-turbo. Use /commit to try again.\n") self.console.print("[red]Unable to get commit message from gpt-3.5-turbo. Use /commit to try again.\n")
======= =======
self.io.tool_error("Unable to get commit message from gpt-3.5-turbo. Use /commit to try again.") self.io.tool_error("Unable to get commit message from gpt-3.5-turbo. Use /commit to try again.")
>>>>>>> UPDATED >>>>>>> updated
aider/coder.py aider/coder.py
<<<<<<< ORIGINAL <<<<<<< HEAD
self.console.print("[red]Skipped commmit.") self.console.print("[red]Skipped commmit.")
======= =======
self.io.tool_error("Skipped commmit.") self.io.tool_error("Skipped commmit.")
>>>>>>> UPDATED""" >>>>>>> updated"""
# Should not raise a ValueError # Should not raise a ValueError
list(eb.find_original_update_blocks(edit)) list(eb.find_original_update_blocks(edit))
@ -175,7 +177,7 @@ No problem! Here are the changes to patch `subprocess.check_output` instead of `
```python ```python
tests/test_repomap.py tests/test_repomap.py
<<<<<<< ORIGINAL <<<<<<< HEAD
def test_check_for_ctags_failure(self): def test_check_for_ctags_failure(self):
with patch("subprocess.run") as mock_run: with patch("subprocess.run") as mock_run:
mock_run.side_effect = Exception("ctags not found") mock_run.side_effect = Exception("ctags not found")
@ -183,9 +185,9 @@ tests/test_repomap.py
def test_check_for_ctags_failure(self): def test_check_for_ctags_failure(self):
with patch("subprocess.check_output") as mock_check_output: with patch("subprocess.check_output") as mock_check_output:
mock_check_output.side_effect = Exception("ctags not found") mock_check_output.side_effect = Exception("ctags not found")
>>>>>>> UPDATED >>>>>>> updated
<<<<<<< ORIGINAL <<<<<<< HEAD
def test_check_for_ctags_success(self): def test_check_for_ctags_success(self):
with patch("subprocess.run") as mock_run: with patch("subprocess.run") as mock_run:
mock_run.return_value = CompletedProcess(args=["ctags", "--version"], returncode=0, stdout='''{ mock_run.return_value = CompletedProcess(args=["ctags", "--version"], returncode=0, stdout='''{
@ -205,7 +207,7 @@ tests/test_repomap.py
"pattern": "/^ status = main()$/", "pattern": "/^ status = main()$/",
"kind": "variable" "kind": "variable"
}''' }'''
>>>>>>> UPDATED >>>>>>> updated
``` ```
These changes replace the `subprocess.run` patches with `subprocess.check_output` patches in both `test_check_for_ctags_failure` and `test_check_for_ctags_success` tests. These changes replace the `subprocess.run` patches with `subprocess.check_output` patches in both `test_check_for_ctags_failure` and `test_check_for_ctags_success` tests.
@ -284,11 +286,11 @@ These changes replace the `subprocess.run` patches with `subprocess.check_output
Do this: Do this:
{Path(file1).name} {Path(file1).name}
<<<<<<< ORIGINAL <<<<<<< HEAD
two two
======= =======
new new
>>>>>>> UPDATED >>>>>>> updated
""" """
coder.partial_response_function_call = dict() coder.partial_response_function_call = dict()
@ -326,11 +328,11 @@ new
Do this: Do this:
{Path(file1).name} {Path(file1).name}
<<<<<<< ORIGINAL <<<<<<< HEAD
two two
======= =======
new new
>>>>>>> UPDATED >>>>>>> updated
""" """
coder.partial_response_function_call = dict() coder.partial_response_function_call = dict()