Commit graph

66 commits

Author SHA1 Message Date
Paul Gauthier
59ad370611 Improve linter error handling by replacing invalid characters and adding error handling for subprocess. 2024-07-30 15:21:01 -03:00
Paul Gauthier (aider)
9b129a7f03 Update the subprocess calls to use the specified encoding. 2024-07-30 15:18:51 -03:00
Paul Gauthier (aider)
167abdf851 Remove unused imports in linter.py 2024-07-29 20:29:14 -03:00
Paul Gauthier
5edce8ae1b Add linter output to the dump for debugging 2024-07-29 20:28:43 -03:00
Paul Gauthier (aider)
b44c24678c Refactored flake8 linting to use subprocess module instead of modifying sys.argv and sys.stdout. 2024-06-23 17:07:55 -07:00
Paul Gauthier
66fadadea1 Improved error handling and logging in the linter module. 2024-06-23 17:07:53 -07:00
Paul Gauthier
4d38dfbb3b Run flake8 from our active py env 2024-06-21 17:43:14 -07:00
Paul Gauthier (aider)
bbac4c72cf Update sys.stdout to use io.TextIOWrapper for utf-8 encoding. 2024-06-21 17:26:15 -07:00
Paul Gauthier
13b7c3e043 Added a new method to run flake8 linter with specific fatal errors and capture the results. 2024-06-21 17:26:14 -07:00
Paul Gauthier
92a28a9b52 wip 2024-06-18 09:59:00 -07:00
Paul Gauthier
ad2312ad7b handle missing end_lineno attr #619 2024-05-29 15:55:55 -07:00
Paul Gauthier
27948cafa6 linter should display rel fname 2024-05-20 16:18:01 -07:00
Paul Gauthier
61165164d8 Run flake8 --isolated 2024-05-20 12:38:41 -07:00
Paul Gauthier
57a2c61386 updated lint cmd descriptions 2024-05-20 09:01:22 -07:00
Paul Gauthier
ee516e3958 Added import statement for regular expressions in linter module. 2024-05-20 08:56:42 -07:00
Paul Gauthier
ce5dabd5f1 Removed unused import statement for 're' module. 2024-05-20 08:56:30 -07:00
Paul Gauthier
a115e594c0 Add import statement for 're' module and fix regex pattern in linter.py. 2024-05-20 08:56:21 -07:00
Paul Gauthier
9c28bbc98e Refactored linting process and error handling in commands. 2024-05-20 08:55:49 -07:00
Paul Gauthier
990dda1122 Added empty lines for better readability. 2024-05-19 07:35:27 -07:00
Paul Gauthier
9ee332f5d9 Added options for automatic linting and testing after changes. 2024-05-19 07:34:19 -07:00
Paul Gauthier
5a6e72a64b Updated linting functionality to only run linting without committing. 2024-05-18 21:00:45 -07:00
Paul Gauthier
828e14fd3d Updated Linter to return LintResult if text or lines are present. 2024-05-18 20:48:53 -07:00
Paul Gauthier
1a3ae1fb60 Refactored Linter class to only return LintResult if text is not empty. 2024-05-18 20:48:36 -07:00
Paul Gauthier
553f39a529 Refactored linter to aggregate lint results and return a unified LintResult object. 2024-05-18 20:47:46 -07:00
Paul Gauthier
84edf3039c aider: Add LintResult class to linter.py.
# Aider chat conversation:

USER: create LinkResult

ASSISTANT: To create the `LintResult` class, we need to add it to the `aider/linter.py` file. Here is the *SEARCH/REPLACE* block to add the `LintResult` class:

aider/linter.py
```python
<<<<<<< SEARCH
from pathlib import Path
=======
from pathlib import Path
from dataclasses import dataclass
>>>>>>> REPLACE
```

aider/linter.py
```python
<<<<<<< SEARCH
def lint_python_compile(fname, code):
=======
@dataclass
class LintResult:
    text: str
    lines: list

def lint_python_compile(fname, code):
>>>>>>> REPLACE
```
2024-05-18 20:44:07 -07:00
Paul Gauthier
24e98a4ac2 Refactored linter methods to return LintResult objects. 2024-05-18 20:44:06 -07:00
Paul Gauthier
6f557ace06 Refactored py_lint method to accumulate linting results instead of returning immediately. 2024-05-18 19:55:08 -07:00
Paul Gauthier
e4c1653b2e Fix typo in flake8 command in Linter class. 2024-05-18 19:50:11 -07:00
Paul Gauthier
f2b197a69f Handled FileNotFoundError exception when running flake8 linter. 2024-05-18 19:50:00 -07:00
Paul Gauthier
b0821bb705 Refactored linter to include additional flake8 command for linting. 2024-05-18 19:49:39 -07:00
Paul Gauthier
65495a60a9 Added error fixing instructions and adjusted line numbers for better context in linter output. 2024-05-18 19:43:53 -07:00
Paul Gauthier
f69da2cd86 aider: Fix 'dict_items' object has no attribute 'next' error by using 'next(iter(...))' to iterate over dictionary items in Python 3.
# Aider chat conversation:

USER: Traceback (most recent call last):
  File "<frozen runpy>", line 198, in _run_module_as_main
  File "<frozen runpy>", line 88, in _run_code
  File "/Users/gauthier/Projects/aider/aider/linter.py", line 203, in <module>
    main()
  File "/Users/gauthier/Projects/aider/aider/linter.py", line 197, in main
    errors = linter.lint(file_path)
             ^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/gauthier/Projects/aider/aider/linter.py", line 76, in lint
    return self.run_cmd(cmd, rel_fname, code)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/gauthier/Projects/aider/aider/linter.py", line 57, in run_cmd
    filename, linenums = filenames_linenums.items().next()
                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AttributeError: 'dict_items' object has no attribute 'next'

ASSISTANT: To fix the `AttributeError: 'dict_items' object has no attribute 'next'`, we need to update the code to use the correct method for iterating over dictionary items in Python 3. The `next()` method should be replaced with `next(iter(...))`.

Here is the *SEARCH/REPLACE* block:

aider/linter.py
```python
<<<<<<< SEARCH
        if filenames_linenums:
            filename, linenums = filenames_linenums.items().next()
            res += tree_context(rel_fname, code, linenums)
=======
        if filenames_linenums:
            filename, linenums = next(iter(filenames_linenums.items()))
            res += tree_context(rel_fname, code, linenums)
>>>>>>> REPLACE
```
2024-05-18 19:40:04 -07:00
Paul Gauthier
d8a5108f9e Added functionality to include tree context in linter results. 2024-05-18 19:40:02 -07:00
Paul Gauthier
2e72aabcf4 aider: Accumulated a set of line numbers for each filename in the find_filenames_and_linenums function.
# Aider chat conversation:

USER: for each filename accumulate a set of the linenums it has

ASSISTANT: To accumulate a set of line numbers for each filename, we need to modify the `find_filenames_and_linenums` function. Here is the *SEARCH/REPLACE* block:

aider/linter.py
```python
<<<<<<< SEARCH
    result = []
=======
    result = {}
>>>>>>> REPLACE
```

aider/linter.py
```python
<<<<<<< SEARCH
        result.append((fname, int(linenum)))
=======
        if fname not in result:
            result[fname] = set()
        result[fname].add(int(linenum))
>>>>>>> REPLACE
```
2024-05-18 19:36:41 -07:00
Paul Gauthier
d8f3d155e6 aider: Refactored the code to turn the matches into a list of (filename, linenum) pairs.
# Aider chat conversation:

USER: turn the matches into a list of (filename, linenum) where linenum is int

ASSISTANT: Here is the *SEARCH/REPLACE* block to turn the matches into a list of `(filename, linenum)` where `linenum` is an integer:

aider/linter.py
```python
<<<<<<< SEARCH
    return matches
=======
    result = []
    for match in matches:
        fname, linenum = match.rsplit(':', 1)
        result.append((fname, int(linenum)))
    return result
>>>>>>> REPLACE
```
2024-05-18 19:36:23 -07:00
Paul Gauthier
9e0f20bb9a aider: Refactored the find_filenames_and_linenums function to search for occurrences of <filename>:\d+ in the text and return a list of matches.
# Aider chat conversation:

USER: do the todo

ASSISTANT: To implement the TODO, we need to:

1. Search the text for all occurrences of `<filename>:\d+` where `<filename>` is one of the filenames in the list `fnames`.
2. Make a list of these occurrences.

Here is the *SEARCH/REPLACE* block:

aider/linter.py
```python
<<<<<<< SEARCH
def find_filenames_and_linenums(text, fnames):
    # TODO:
    # search text for all occurrances of <filename>:\d+ and make a list of them
    # where <filename> is one of the filenames in the list `fnames`
    pass
=======
import re

def find_filenames_and_linenums(text, fnames):
    """
    Search text for all occurrences of <filename>:\d+ and make a list of them
    where <filename> is one of the filenames in the list `fnames`.
    """
    pattern = re.compile(r'(\b(?:' + '|'.join(re.escape(fname) for fname in fnames) + r'):\d+\b)')
    matches = pattern.findall(text)
    return matches
>>>>>>> REPLACE
```
2024-05-18 19:35:37 -07:00
Paul Gauthier
ef286f0de6 Refactored the Linter class to use a dynamic command for Python linting and added a placeholder function for finding filenames and line numbers in text. 2024-05-18 19:35:36 -07:00
Paul Gauthier
828a5264b0 Updated linter to display relevant error lines and context. 2024-05-18 19:28:59 -07:00
Paul Gauthier
ee2e633380 aider: Modify run_cmd method to capture both stdout and stderr together using subprocess.Popen.
# Aider chat conversation:

USER: can `check_output` intermingle stdout and stdin like they would be in a terminal?

ASSISTANT: The `subprocess.check_output` function captures the output of the command and returns it as a string. It does not intermingle stdout and stderr like they would be in a terminal. If you need to capture both stdout and stderr together, you can use `subprocess.Popen` with `stdout=subprocess.PIPE` and `stderr=subprocess.STDOUT`.

Would you like me to modify the `run_cmd` method to use `subprocess.Popen` to capture both stdout and stderr together?

USER: yes

ASSISTANT: Here are the changes to modify the `run_cmd` method to use `subprocess.Popen` to capture both stdout and stderr together:

aider/linter.py
```python
<<<<<<< SEARCH
        try:
            subprocess.check_output(cmd, cwd=self.root).decode()
            return  # zero exit status
        except subprocess.CalledProcessError as err:
            errors = err.output.decode()  # non-zero exit status
=======
        process = subprocess.Popen(cmd, cwd=self.root, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
        stdout, _ = process.communicate()
        errors = stdout.decode()
        if process.returncode == 0:
            return  # zero exit status
>>>>>>> REPLACE
```

This change ensures that both stdout and stderr are captured together, similar to how they would be intermingled in a terminal.
2024-05-18 19:22:49 -07:00
Paul Gauthier
c494f507c5 aider: Removed unused import statement for dump from aider/linter.py.
# Aider chat conversation:

USER: # Running: /Users/gauthier/Projects/aider/tmp.sh aider/linter.py

aider/linter.py
aider/linter.py:11:1: F401 'aider.dump.dump' imported but unused
from aider.dump import dump
^

ASSISTANT: To resolve the unused import warning, we need to remove the import statement for `dump` from `aider/linter.py`.

Here is the *SEARCH/REPLACE* block:

aider/linter.py
```python
<<<<<<< SEARCH
from aider.dump import dump
=======
>>>>>>> REPLACE
```
2024-05-18 19:15:49 -07:00
Paul Gauthier
ba46cb6b6c Remove unused import and fix FutureWarning in linter. 2024-05-18 19:15:47 -07:00
Paul Gauthier
901d8a1a2a Set linter command as a string and update the result message format. 2024-05-18 19:14:19 -07:00
Paul Gauthier
f43b352949 Fix string interpolation typo in linter output message. 2024-05-18 19:00:43 -07:00
Paul Gauthier
e516f838f5 aider: Fix import sorting in aider/linter.py to resolve isort failure.
# Aider chat conversation:

USER: # Running: {cmd]
If the output below indicates errors or problems, fix them.
But if the command fixed all the issues itself, don't take further action.

isort....................................................................Failed
- hook id: isort
- files were modified by this hook

Fixing /Users/gauthier/Projects/aider/aider/linter.py

black....................................................................Passed
flake8...................................................................Passed

USER: # Running: {cmd]
If the output below indicates errors or problems, fix them.
But if the command fixed all the issues itself, don't take further action.

isort....................................................................Failed
- hook id: isort
- files were modified by this hook

Fixing /Users/gauthier/Projects/aider/aider/linter.py

black....................................................................Passed
flake8...................................................................Passed

ASSISTANT: To fix the `isort` issues, we need to sort the imports in `aider/linter.py`. Here is the *SEARCH/REPLACE* block to apply the necessary changes:

aider/linter.py
```python
<<<<<<< SEARCH
import os
import subprocess
import sys
import traceback
import warnings
from pathlib import Path

from grep_ast import TreeContext, filename_to_lang

from aider.dump import dump  # noqa: F401

# tree_sitter is throwing a FutureWarning
warnings.simplefilter("ignore", category=FutureWarning)

from tree_sitter_languages import get_parser  # noqa: E402
=======
import os
import subprocess
import sys
import traceback
import warnings
from pathlib import Path

from grep_ast import TreeContext, filename_to_lang
from tree_sitter_languages import get_parser  # noqa: E402

from aider.dump import dump  # noqa: F401

# tree_sitter is throwing a FutureWarning
warnings.simplefilter("ignore", category=FutureWarning)
>>>>>>> REPLACE
```
2024-05-18 18:59:39 -07:00
Paul Gauthier
5959e7990a Return the linting results in the Linter class. 2024-05-18 18:59:37 -07:00
Paul Gauthier
2e6c7a13b2 Add detailed error message when non-zero exit status occurs in Linter. 2024-05-18 18:57:14 -07:00
Paul Gauthier
04084883e8 Added a new command to run the linter on dirty files, fix problems, and then commit. 2024-05-18 18:35:33 -07:00
Paul Gauthier
bc3ed8657e stick with compile() 2024-05-18 17:59:40 -07:00
Paul Gauthier
86facafd09 works 2024-05-18 17:57:35 -07:00
Paul Gauthier
b600e17910 Added traceback information to the linting output. 2024-05-18 17:42:04 -07:00