dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-29 08:44:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
3131 commits 2 branches 241 tags 264 MiB
Commit graph

3131 commits

This branch
This branch
All branches
Author SHA1 Message Date
Paul Gauthier
8862254fab Updated HISTORY 2023-10-20 09:55:03 -07:00
Paul Gauthier
c450b40e3f copy 2023-10-20 08:44:31 -07:00
Paul Gauthier
4f2fd324f1 copy 2023-10-20 08:32:52 -07:00
Paul Gauthier
4654e81241 Merge branch 'main' into sitter-map 2023-10-20 08:05:33 -07:00
Paul Gauthier
6791bc19c6 added test for --encoding 2023-10-20 08:04:02 -07:00
Paul Gauthier
ac9160ae54 aider: Add --encoding argument and pass it to InputOutput. 
# Aider chat conversation:

USER: add --encoding and pass it to `InputOutput`

ASSISTANT: To add the `--encoding` argument and pass it to `InputOutput`, we need to modify the `aider/main.py` file.

Here are the steps:

1. Add a new argument `--encoding` to the `argparse.ArgumentParser` in the `main` function.
2. Pass the `args.encoding` to the `InputOutput` class instantiation.

Here are the changes:

```python
aider/main.py
<<<<<<< HEAD
    ##########
    other_group = parser.add_argument_group("Other Settings")
    other_group.add_argument(
        "--version",
        action="version",
        version=f"%(prog)s {__version__}",
        help="Show the version number and exit",
    )
    other_group.add_argument(
        "--apply",
        metavar="FILE",
        help="Apply the changes from the given file instead of running the chat (debug)",
    )
    other_group.add_argument(
        "--yes",
        action="store_true",
        help="Always say yes to every confirmation",
        default=None,
    )
    other_group.add_argument(
        "-v",
        "--verbose",
        action="store_true",
        help="Enable verbose output",
        default=False,
    )
    other_group.add_argument(
        "--show-repo-map",
        action="store_true",
        help="Print the repo map and exit (debug)",
        default=False,
    )
    other_group.add_argument(
        "--message",
        "--msg",
        "-m",
        metavar="COMMAND",
        help="Specify a single message to send GPT, process reply then exit (disables chat mode)",
    )
    other_group.add_argument(
        "-c",
        "--config",
        is_config_file=True,
        metavar="CONFIG_FILE",
        help=(
            "Specify the config file (default: search for .aider.conf.yml in git root, cwd"
            " or home directory)"
        ),
    )

    args = parser.parse_args(argv)
=======
    ##########
    other_group = parser.add_argument_group("Other Settings")
    other_group.add_argument(
        "--version",
        action="version",
        version=f"%(prog)s {__version__}",
        help="Show the version number and exit",
    )
    other_group.add_argument(
        "--apply",
        metavar="FILE",
        help="Apply the changes from the given file instead of running the chat (debug)",
    )
    other_group.add_argument(
        "--yes",
        action="store_true",
        help="Always say yes to every confirmation",
        default=None,
    )
    other_group.add_argument(
        "-v",
        "--verbose",
        action="store_true",
        help="Enable verbose output",
        default=False,
    )
    other_group.add_argument(
        "--show-repo-map",
        action="store_true",
        help="Print the repo map and exit (debug)",
        default=False,
    )
    other_group.add_argument(
        "--message",
        "--msg",
        "-m",
        metavar="COMMAND",
        help="Specify a single message to send GPT, process reply then exit (disables chat mode)",
    )
    other_group.add_argument(
        "--encoding",
        default="utf-8",
        help="Specify the encoding for input and output (default: utf-8)",
    )
    other_group.add_argument(
        "-c",
        "--config",
        is_config_file=True,
        metavar="CONFIG_FILE",
        help=(
            "Specify the config file (default: search for .aider.conf.yml in git root, cwd"
            " or home directory)"
        ),
    )

    args = parser.parse_args(argv)
>>>>>>> updated
```

```python
aider/main.py
<<<<<<< HEAD
    io = InputOutput(
        args.pretty,
        args.yes,
        args.input_history_file,
        args.chat_history_file,
        input=input,
        output=output,
        user_input_color=args.user_input_color,
        tool_output_color=args.tool_output_color,
        tool_error_color=args.tool_error_color,
        dry_run=args.dry_run,
    )
=======
    io = InputOutput(
        args.pretty,
        args.yes,
        args.input_history_file,
        args.chat_history_file,
        input=input,
        output=output,
        user_input_color=args.user_input_color,
        tool_output_color=args.tool_output_color,
        tool_error_color=args.tool_error_color,
        dry_run=args.dry_run,
        encoding=args.encoding,
    )
>>>>>>> updated
```

Please note that the `InputOutput` class should be able to handle the `encoding` argument. If it's not the case, we need to modify the `InputOutput` class as well.
 2023-10-19 20:18:02 -07:00
Paul Gauthier
80c03045ef put universal ctags back into the install instructions until tree-sitter ships in a released version 2023-10-19 17:51:03 -07:00
Paul Gauthier
427dcf67b5 update references to ctags in the docs 2023-10-19 15:49:44 -07:00
Paul Gauthier
3c817e9895 copy 2023-10-19 15:47:45 -07:00
Paul Gauthier
7929e825e7 fixed test 2023-10-19 15:27:51 -07:00
Paul Gauthier
93fd53263e handle encoding 2023-10-19 13:16:53 -07:00
Paul Gauthier
a941c5cb82 cache tags 2023-10-19 13:13:48 -07:00
Paul Gauthier
5b99281d86 refac 2023-10-19 13:10:29 -07:00
Paul Gauthier
ce3099fa8b Fall back to the pygments lexer for refs if tree-sitter only provides defs 2023-10-19 12:54:27 -07:00
Paul Gauthier
eec174fae7 added tags.scm for C 2023-10-19 12:32:44 -07:00
Paul Gauthier
ce8b6523a6 aider: Refactor struct_specifier, function_declarator, type_definition, and enum_specifier to include the definition class in their respective queries. 
# Aider chat conversation:

ASSISTANT: No changes are needed.
 2023-10-19 12:27:24 -07:00
Paul Gauthier
f5a6edb568 Added tree-sitter-c-tags.scm for aider queries. 2023-10-19 12:27:23 -07:00
Paul Gauthier
c7f35b2ce5 add ts credits 2023-10-19 12:25:55 -07:00
Paul Gauthier
551dddd746 handle languages where tree-sitter only has definition tags 2023-10-19 12:25:01 -07:00
Paul Gauthier
056f4affa6 aider: Refactor tree-sitter-cpp-tags.scm to include the ".definition" property in the appropriate places. 
# Aider chat conversation:

ASSISTANT: No changes are needed.
 2023-10-19 11:19:07 -07:00
Paul Gauthier
6d1bd4fa01 Added tree-sitter-cpp-tags.scm for aider queries. 2023-10-19 11:19:05 -07:00
Paul Gauthier
998dedd2c6 Added grep-ast dependency 2023-10-19 10:30:18 -07:00
Paul Gauthier
cb8d9d6a64 Merge branch 'main' into sitter-map 2023-10-19 10:09:22 -07:00
Paul Gauthier
cd30e531be better warnings on files that are missing or not normal 2023-10-19 10:09:16 -07:00
Paul Gauthier
8b87c1291e new repomap article 2023-10-19 09:11:15 -07:00
Paul Gauthier
cba883d4cd fix sorting and whitespace in map 2023-10-19 08:15:28 -07:00
Paul Gauthier
0291a99257 use rel_fname 2023-10-19 08:10:45 -07:00
Paul Gauthier
cff5534fab show_top_of_file_parent_scope 2023-10-19 08:07:59 -07:00
Paul Gauthier
28bce3535a Merge branch 'main' into sitter-map 2023-10-19 08:01:37 -07:00
Paul Gauthier
54742a2d75 Updated HISTORY 2023-10-19 08:01:15 -07:00
Paul Gauthier
25c06940d6 re-enable twine/pypi 2023-10-19 07:09:09 -07:00
Paul Gauthier
02386c16aa setup multi-arch docker images 2023-10-19 07:00:23 -07:00
Paul Gauthier
9750fcd04a copy 2023-10-18 16:28:20 -07:00
Paul Gauthier
4c2125d289 cleanup 2023-10-18 16:18:59 -07:00
Paul Gauthier
2a1255ed07 cleanup 2023-10-18 16:12:07 -07:00
Paul Gauthier
40d702abd1 cleanup 2023-10-18 16:06:12 -07:00
Paul Gauthier
c0375d3328 fix tests; fix off-by-one bug in output of repomap 2023-10-18 15:42:38 -07:00
Paul Gauthier
10b856e0af cleanup 2023-10-18 15:18:12 -07:00
Paul Gauthier
2c98ea4448 Merge branch 'main' into sitter-map 2023-10-18 15:04:55 -07:00
Paul Gauthier
b2b78a98ee Added libportaudio2 to the docker container 2023-10-18 13:38:41 -07:00
Paul Gauthier
49b9034629 Added universal ctags to the docker image 2023-10-18 13:30:49 -07:00
Paul Gauthier
790f7ddee3 make the docker image a bit smaller 2023-10-18 13:26:20 -07:00
Paul Gauthier
ee3f3a44fd aider: Refactored Dockerfile to combine RUN commands, use --no-cache-dir option when installing Python packages, and remove unnecessary pip install --upgrade pip command. 
# Aider chat conversation:

ASSISTANT: Yes, there are a few more things we can do to clean up the Dockerfile:

1. We can combine the `RUN` commands into a single command to reduce the number of layers in the Docker image. This can make the image smaller and faster to build.

2. We can use the `--no-cache-dir` option when installing Python packages with pip. This will prevent pip from caching downloaded packages, which can save space in the Docker image.

3. We can remove the `pip install --upgrade pip` command. The Python Docker images are regularly updated, so the version of pip included in the image is usually fairly recent.

Here's how we can make these changes:

```dockerfile
docker/Dockerfile
<<<<<<< HEAD
FROM python:3.10-slim
RUN apt-get update && apt-get install -y git && rm -rf /var/lib/apt/lists/*
COPY . /aider
RUN pip install --upgrade pip && pip install /aider && rm -rf /aider
WORKDIR /app
ENTRYPOINT ["aider"]
=======
FROM python:3.10-slim
RUN apt-get update && apt-get install -y git && rm -rf /var/lib/apt/lists/* && \
    pip install --no-cache-dir /aider && rm -rf /aider
WORKDIR /app
ENTRYPOINT ["aider"]
>>>>>>> updated
```

Please note that these changes will make the Docker image smaller and faster to build, but they won't affect the functionality of the application.
 2023-10-18 13:19:22 -07:00
Paul Gauthier
a6a49b13bb Remove the /aider directory after installing the package. 2023-10-18 13:19:21 -07:00
Paul Gauthier
8561bfde33 copy 2023-10-18 13:13:42 -07:00
Paul Gauthier
a4cd4ac65f Updated HISTORY 2023-10-18 13:09:59 -07:00
Paul Gauthier
88e42a124b copy 2023-10-18 12:47:26 -07:00
Paul Gauthier
dffeaac4d9 Added --commit command #283 2023-10-18 12:45:51 -07:00
Paul Gauthier
3f2dfa24ee aider: Add a --commit arg that commits all pending changes with a suitable commit message. 
# Aider chat conversation:

USER: Add a --commit arg that will commit all pending changes with a suitable commit message

ASSISTANT: To add a `--commit` argument, we need to modify the `aider/main.py` file. Specifically, we will add a new argument to the `git_group` argument group in the `main` function.

Here is the proposed change:

```python
aider/main.py
<<<<<<< HEAD
    git_group.add_argument(
        "--dry-run",
        action=argparse.BooleanOptionalAction,
        default=False,
        help="Enable/disable performing a dry run without modifying files (default: False)",
    )
=======
    git_group.add_argument(
        "--dry-run",
        action=argparse.BooleanOptionalAction,
        default=False,
        help="Enable/disable performing a dry run without modifying files (default: False)",
    )
    git_group.add_argument(
        "--commit",
        action="store_true",
        help="Commit all pending changes with a suitable commit message",
        default=False,
    )
>>>>>>> updated
```

This change adds a new `--commit` argument that, when used, will trigger the commit of all pending changes. The default value is `False`, meaning that if the argument is not provided, no commit will be made. The help text provides a brief explanation of what the argument does.

After adding this argument, you will need to implement the functionality to commit changes when this argument is used. This will likely involve modifying the `GitRepo` class in the `aider/repo.py` file, but since that file is read-only, I can't provide the specific changes here.
 2023-10-18 12:44:11 -07:00
Paul Gauthier
5756812938 Adopt subprocess.run(shell=True) for /git 2023-10-18 12:37:39 -07:00