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

fixed test_editblock and _wholefile

Browse source
This commit is contained in:
Paul Gauthier 2024-04-18 16:02:50 -07:00
parent 512b991a51
commit 2a3eb8ac35
2 changed files with 18 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tests/test_editblock.py
View file

@ -5,21 +5,16 @@ import unittest
from pathlib import Path from pathlib import Path
from unittest.mock import MagicMock, patch from unittest.mock import MagicMock, patch
from aider import models
from aider.coders import Coder from aider.coders import Coder
from aider.coders import editblock_coder as eb from aider.coders import editblock_coder as eb
from aider.dump import dump # noqa: F401 from aider.dump import dump # noqa: F401
from aider.io import InputOutput from aider.io import InputOutput
from aider.models import Model
class TestUtils(unittest.TestCase): class TestUtils(unittest.TestCase):
def setUp(self): def setUp(self):
self.patcher = patch("aider.coders.base_coder.check_model_availability") self.GPT35 = Model("gpt-3.5-turbo")
self.mock_check = self.patcher.start()
self.mock_check.return_value = True
def tearDown(self):
self.patcher.stop()
# fuzzy logic disabled v0.11.2-dev # fuzzy logic disabled v0.11.2-dev
def __test_replace_most_similar_chunk(self): def __test_replace_most_similar_chunk(self):
@ -302,7 +297,7 @@ These changes replace the `subprocess.run` patches with `subprocess.check_output
files = [file1] files = [file1]
# Initialize the Coder object with the mocked IO and mocked repo # Initialize the Coder object with the mocked IO and mocked repo
coder = Coder.create(models.GPT4, "diff", io=InputOutput(), fnames=files) coder = Coder.create(self.GPT35, "diff", io=InputOutput(), fnames=files)
def mock_send(*args, **kwargs): def mock_send(*args, **kwargs):
coder.partial_response_content = f""" coder.partial_response_content = f"""
@ -339,7 +334,7 @@ new
# Initialize the Coder object with the mocked IO and mocked repo # Initialize the Coder object with the mocked IO and mocked repo
coder = Coder.create( coder = Coder.create(
models.GPT4, self.GPT35,
"diff", "diff",
io=InputOutput(dry_run=True), io=InputOutput(dry_run=True),
fnames=files, fnames=files,

32
tests/test_wholefile.py
View file

@ -3,13 +3,13 @@ import shutil
import tempfile import tempfile
import unittest import unittest
from pathlib import Path from pathlib import Path
from unittest.mock import MagicMock, patch from unittest.mock import MagicMock
from aider import models
from aider.coders import Coder from aider.coders import Coder
from aider.coders.wholefile_coder import WholeFileCoder from aider.coders.wholefile_coder import WholeFileCoder
from aider.dump import dump # noqa: F401 from aider.dump import dump # noqa: F401
from aider.io import InputOutput from aider.io import InputOutput
from aider.models import Model
class TestWholeFileCoder(unittest.TestCase): class TestWholeFileCoder(unittest.TestCase):
@ -18,21 +18,17 @@ class TestWholeFileCoder(unittest.TestCase):
self.tempdir = tempfile.mkdtemp() self.tempdir = tempfile.mkdtemp()
os.chdir(self.tempdir) os.chdir(self.tempdir)
self.patcher = patch("aider.coders.base_coder.check_model_availability") self.GPT35 = Model("gpt-3.5-turbo")
self.mock_check = self.patcher.start()
self.mock_check.return_value = True
def tearDown(self): def tearDown(self):
os.chdir(self.original_cwd) os.chdir(self.original_cwd)
shutil.rmtree(self.tempdir, ignore_errors=True) shutil.rmtree(self.tempdir, ignore_errors=True)
self.patcher.stop()
def test_no_files(self): def test_no_files(self):
# Initialize WholeFileCoder with the temporary directory # Initialize WholeFileCoder with the temporary directory
io = InputOutput(yes=True) io = InputOutput(yes=True)
coder = WholeFileCoder(None, main_model=models.GPT35, io=io, fnames=[]) coder = WholeFileCoder(main_model=self.GPT35, io=io, fnames=[])
coder.partial_response_content = ( coder.partial_response_content = (
'To print "Hello, World!" in most programming languages, you can use the following' 'To print "Hello, World!" in most programming languages, you can use the following'
' code:\n\n```python\nprint("Hello, World!")\n```\n\nThis code will output "Hello,' ' code:\n\n```python\nprint("Hello, World!")\n```\n\nThis code will output "Hello,'
@ -44,7 +40,7 @@ class TestWholeFileCoder(unittest.TestCase):
def test_no_files_new_file_should_ask(self): def test_no_files_new_file_should_ask(self):
io = InputOutput(yes=False) # <- yes=FALSE io = InputOutput(yes=False) # <- yes=FALSE
coder = WholeFileCoder(None, main_model=models.GPT35, io=io, fnames=[]) coder = WholeFileCoder(main_model=self.GPT35, io=io, fnames=[])
coder.partial_response_content = ( coder.partial_response_content = (
'To print "Hello, World!" in most programming languages, you can use the following' 'To print "Hello, World!" in most programming languages, you can use the following'
' code:\n\nfoo.js\n```python\nprint("Hello, World!")\n```\n\nThis code will output' ' code:\n\nfoo.js\n```python\nprint("Hello, World!")\n```\n\nThis code will output'
@ -61,7 +57,7 @@ class TestWholeFileCoder(unittest.TestCase):
# Initialize WholeFileCoder with the temporary directory # Initialize WholeFileCoder with the temporary directory
io = InputOutput(yes=True) io = InputOutput(yes=True)
coder = WholeFileCoder(None, main_model=models.GPT35, io=io, fnames=[sample_file]) coder = WholeFileCoder(main_model=self.GPT35, io=io, fnames=[sample_file])
# Set the partial response content with the updated content # Set the partial response content with the updated content
coder.partial_response_content = f"{sample_file}\n```\nUpdated content\n```" coder.partial_response_content = f"{sample_file}\n```\nUpdated content\n```"
@ -85,7 +81,7 @@ class TestWholeFileCoder(unittest.TestCase):
# Initialize WholeFileCoder with the temporary directory # Initialize WholeFileCoder with the temporary directory
io = InputOutput(yes=True) io = InputOutput(yes=True)
coder = WholeFileCoder(None, main_model=models.GPT35, io=io, fnames=[sample_file]) coder = WholeFileCoder(main_model=self.GPT35, io=io, fnames=[sample_file])
# Set the partial response content with the updated content # Set the partial response content with the updated content
coder.partial_response_content = f"{sample_file}\n```\n0\n\1\n2\n" coder.partial_response_content = f"{sample_file}\n```\n0\n\1\n2\n"
@ -109,7 +105,7 @@ Quote!
# Initialize WholeFileCoder with the temporary directory # Initialize WholeFileCoder with the temporary directory
io = InputOutput(yes=True) io = InputOutput(yes=True)
coder = WholeFileCoder(None, main_model=models.GPT35, io=io, fnames=[sample_file]) coder = WholeFileCoder(main_model=self.GPT35, io=io, fnames=[sample_file])
coder.choose_fence() coder.choose_fence()
@ -139,7 +135,7 @@ Quote!
# Initialize WholeFileCoder with the temporary directory # Initialize WholeFileCoder with the temporary directory
io = InputOutput(yes=True) io = InputOutput(yes=True)
coder = WholeFileCoder(None, main_model=models.GPT35, io=io, fnames=[sample_file]) coder = WholeFileCoder(main_model=self.GPT35, io=io, fnames=[sample_file])
# Set the partial response content with the updated content # Set the partial response content with the updated content
# With path/to/ prepended onto the filename # With path/to/ prepended onto the filename
@ -164,7 +160,7 @@ Quote!
# Initialize WholeFileCoder with the temporary directory # Initialize WholeFileCoder with the temporary directory
io = InputOutput(yes=True) io = InputOutput(yes=True)
coder = WholeFileCoder(None, main_model=models.GPT35, io=io) coder = WholeFileCoder(main_model=self.GPT35, io=io)
# Set the partial response content with the updated content # Set the partial response content with the updated content
coder.partial_response_content = f"{sample_file}\n```\nUpdated content\n```" coder.partial_response_content = f"{sample_file}\n```\nUpdated content\n```"
@ -192,7 +188,7 @@ Quote!
# Initialize WholeFileCoder with the temporary directory # Initialize WholeFileCoder with the temporary directory
io = InputOutput(yes=True) io = InputOutput(yes=True)
coder = WholeFileCoder(None, main_model=models.GPT35, io=io, fnames=[sample_file]) coder = WholeFileCoder(main_model=self.GPT35, io=io, fnames=[sample_file])
# Set the partial response content with the updated content # Set the partial response content with the updated content
coder.partial_response_content = ( coder.partial_response_content = (
@ -235,7 +231,7 @@ after b
""" """
# Initialize WholeFileCoder with the temporary directory # Initialize WholeFileCoder with the temporary directory
io = InputOutput(yes=True) io = InputOutput(yes=True)
coder = WholeFileCoder(None, main_model=models.GPT35, io=io, fnames=[fname_a, fname_b]) coder = WholeFileCoder(main_model=self.GPT35, io=io, fnames=[fname_a, fname_b])
# Set the partial response content with the updated content # Set the partial response content with the updated content
coder.partial_response_content = response coder.partial_response_content = response
@ -259,7 +255,7 @@ after b
# Initialize WholeFileCoder with the temporary directory # Initialize WholeFileCoder with the temporary directory
io = InputOutput(yes=True) io = InputOutput(yes=True)
coder = WholeFileCoder(None, main_model=models.GPT35, io=io, fnames=[sample_file]) coder = WholeFileCoder(main_model=self.GPT35, io=io, fnames=[sample_file])
# Set the partial response content with the updated content # Set the partial response content with the updated content
coder.partial_response_content = ( coder.partial_response_content = (
@ -292,7 +288,7 @@ after b
files = [file1] files = [file1]
# Initialize the Coder object with the mocked IO and mocked repo # Initialize the Coder object with the mocked IO and mocked repo
coder = Coder.create(models.GPT4, "whole", io=InputOutput(), fnames=files) coder = Coder.create(self.GPT35, "whole", io=InputOutput(), fnames=files)
# no trailing newline so the response content below doesn't add ANOTHER newline # no trailing newline so the response content below doesn't add ANOTHER newline
new_content = "new\ntwo\nthree" new_content = "new\ntwo\nthree"