dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-06-10 22:55:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
4453 commits 2 branches 243 tags 278 MiB
Commit graph

1888 commits

Author SHA1 Message Date
Paul Gauthier
f481fba1ca set version to 0.37.1-dev 2024-06-04 10:31:28 -07:00
Paul Gauthier
45c8e82228 version bump to 0.37.0 2024-06-04 10:30:49 -07:00
Paul Gauthier
73c6af8851 aider: Implemented a more flexible approach to handle different microphone sample rates in aider/voice.py. 
# Aider chat conversation:

USER: https://github.com/paul-gauthier/aider/issues/612

https://github.com/paul-gauthier/aider/issues/612:

[Skip to content](#start-of-content)

## Navigation Menu

Toggle navigation

[](https://github.com/)

[Sign
in](/login?return_to=https%3A%2F%2Fgithub.com%2Fpaul-gauthier%2Faider%2Fissues%2F612)

-   Product

    -   [](https://github.com/features/actions)

        Actions

        Automate any workflow

    -   [](https://github.com/features/packages)

        Packages

        Host and manage packages

    -   [](https://github.com/features/security)

        Security

        Find and fix vulnerabilities

    -   [](https://github.com/features/codespaces)

        Codespaces

        Instant dev environments

    -   [](https://github.com/features/copilot)

        GitHub Copilot

        Write better code with AI

    -   [](https://github.com/features/code-review)

        Code review

        Manage code changes

    -   [](https://github.com/features/issues)

        Issues

        Plan and track work

    -   [](https://github.com/features/discussions)

        Discussions

        Collaborate outside of code

    Explore
    -   [All features](https://github.com/features)
    -   [Documentation](https://docs.github.com)
    -   [GitHub Skills](https://skills.github.com)
    -   [Blog](https://github.blog)

-   Solutions

    For
    -   [Enterprise](https://github.com/enterprise)
    -   [Teams](https://github.com/team)
    -   [Startups](https://github.com/enterprise/startups)
    -   [Education](https://education.github.com)

    By Solution
    -   [CI/CD & Automation](https://github.com/solutions/ci-cd)
    -   [DevOps](https://github.com/solutions/devops)
    -   [DevSecOps](https://resources.github.com/devops/fundamentals/devsecops)

    Resources
    -   [Learning Pathways](https://resources.github.com/learn/pathways)
    -   [White papers, Ebooks, Webinars](https://resources.github.com)
    -   [Customer Stories](https://github.com/customer-stories)
    -   [Partners](https://partner.github.com)

-   Open Source

    -   [](/sponsors)

        GitHub Sponsors

        Fund open source developers

    -   [](https://github.com/readme)

        The ReadME Project

        GitHub community articles

    Repositories
    -   [Topics](https://github.com/topics)
    -   [Trending](https://github.com/trending)
    -   [Collections](https://github.com/collections)

-   Enterprise

    -   [](/enterprise)

        Enterprise platform

        AI-powered developer platform

    Available add-ons
    -   [](https://github.com/enterprise/advanced-security)

        Advanced Security

        Enterprise-grade security features

    -   [](/features/copilot#enterprise)

        GitHub Copilot

        Enterprise-grade AI features

    -   [](/premium-support)

        Premium Support

        Enterprise-grade 24/7 support

-   [Pricing](https://github.com/pricing)

Search or jump to\...

# Search code, repositories, users, issues, pull requests\...

Search

Clear

[Search syntax
tips](https://docs.github.com/search-github/github-code-search/understanding-github-code-search-syntax)

# Provide feedback

We read every piece of feedback, and take your input very seriously.

Include my email address so I can be contacted

Cancel

Submit feedback

# Saved searches

## Use saved searches to filter your results more quickly

Name

Query

To see all available qualifiers, see our
[documentation](https://docs.github.com/search-github/github-code-search/understanding-github-code-search-syntax).

Cancel

Create saved search

[Sign
in](/login?return_to=https%3A%2F%2Fgithub.com%2Fpaul-gauthier%2Faider%2Fissues%2F612)

[Sign
up](/signup?ref_cta=Sign+up&ref_loc=header+logged+out&ref_page=%2F%3Cuser-name%3E%2F%3Crepo-name%3E%2Fvoltron%2Fissues_fragments%2Fissue_layout&source=header-repo&source_repo=paul-gauthier%2Faider)

You signed in with another tab or window. [Reload]() to refresh your
session. You signed out in another tab or window. [Reload]() to refresh
your session. You switched accounts on another tab or window. [Reload]()
to refresh your session.

Dismiss alert

{{ message }}

::: {role="main"}

[paul-gauthier](/paul-gauthier) / **[aider](/paul-gauthier/aider)**
Public

-   [Notifications](/login?return_to=%2Fpaul-gauthier%2Faider) You must
    be signed in to change notification settings

-   [Fork 1k](/login?return_to=%2Fpaul-gauthier%2Faider)

-

    [ Star 10.5k](/login?return_to=%2Fpaul-gauthier%2Faider)

-   [Code ](/paul-gauthier/aider)
-   [Issues 57](/paul-gauthier/aider/issues)
-   [Pull requests 14](/paul-gauthier/aider/pulls)
-   [Actions ](/paul-gauthier/aider/actions)
-   [Projects 0](/paul-gauthier/aider/projects)
-   [Security](/paul-gauthier/aider/security)
-   [Insights ](/paul-gauthier/aider/pulse)

Additional navigation options

-   [ Code ](/paul-gauthier/aider)
-   [ Issues ](/paul-gauthier/aider/issues)
-   [ Pull requests ](/paul-gauthier/aider/pulls)
-   [ Actions ](/paul-gauthier/aider/actions)
-   [ Projects ](/paul-gauthier/aider/projects)
-   [ Security ](/paul-gauthier/aider/security)
-   [ Insights ](/paul-gauthier/aider/pulse)

New issue

**Have a question about this project?** Sign up for a free GitHub
account to open an issue and contact its maintainers and the community.

[Sign up for
GitHub](/signup?return_to=%2Fpaul-gauthier%2Faider%2Fissues%2Fnew%2Fchoose)

By clicking "Sign up for GitHub", you agree to our [terms of
service](https://docs.github.com/terms) and [privacy
statement](https://docs.github.com/privacy). We'll occasionally send you
account related emails.

Already on GitHub? [Sign
in](/login?return_to=%2Fpaul-gauthier%2Faider%2Fissues%2Fnew%2Fchoose)
to your account

[Jump to bottom](#issue-comment-box)

# Unsupported Audio Sample Rate #612

Open

[aaronson2012](/aaronson2012) opened this issue May 24, 2024 · 0
comments

Open

# [Unsupported Audio Sample Rate](#top) #612

[aaronson2012](/aaronson2012) opened this issue May 24, 2024 · 0
comments

Labels

[enhancement](/paul-gauthier/aider/labels/enhancement) New feature or
request

## Comments

[](/aaronson2012)

Copy link

###

**[aaronson2012](/aaronson2012)** commented [May 24,
2024](#issue-2314049815)

+-----------------------------------------------------------------------+
| ### Issue                                                             |
|                                                                       |
| aider was crashing when i ran the /voice command and I realized that  |
| my computers microphone did not support a sample rate of 16kHz. It    |
| was an easy fix for me i just changed the sample_rate variable to one |
| my mic supported but this isn\'t a very elegant solution. Could there |
| be a better way so all mics are supported?                            |
|                                                                       |
| ### Version and model info                                            |
|                                                                       |
| Latest verision                                                       |
+-----------------------------------------------------------------------+
|                                                                       |
|                                                                       |
| The text was updated successfully, but these errors were encountered: |
|                                                                       |
|                                                                       |
+-----------------------------------------------------------------------+

All reactions

[paul-gauthier](/paul-gauthier) added the
[enhancement](/paul-gauthier/aider/labels/enhancement) New feature or
request label [Jun 4, 2024](#event-13039727805)

[Sign up for free](/join?source=comment-repo) **to join this
conversation on GitHub**. Already have an account? [Sign in to
comment](/login?return_to=https%3A%2F%2Fgithub.com%2Fpaul-gauthier%2Faider%2Fissues%2F612)

Assignees

No one assigned

Labels

[enhancement](/paul-gauthier/aider/labels/enhancement) New feature or
request

Projects

None yet

Milestone

No milestone

Development

No branches or pull requests

2 participants

:::

## Footer

[](https://github.com) © 2024 GitHub, Inc.

### Footer navigation

-   [Terms](https://docs.github.com/site-policy/github-terms/github-terms-of-service)
-   [Privacy](https://docs.github.com/site-policy/privacy-policies/github-privacy-statement)
-   [Security](https://github.com/security)
-   [Status](https://www.githubstatus.com/)
-   [Docs](https://docs.github.com/)
-   [Contact](https://support.github.com?tags=dotcom-footer)
-   Manage cookies
-   Do not share my personal information

You can't perform that action at this time.

ASSISTANT: Based on the issue description, I believe the following file is most likely to need changes to support different microphone sample rates:

aider/voice.py

This file contains the Voice class which handles recording and transcribing audio. The sample_rate variable is hardcoded in this file.

To make the suggested change, we would need to modify how the sample rate is determined in aider/voice.py.

Please add aider/voice.py to the chat so I can propose the specific code changes needed. Let me know if you would like me to explain my reasoning further or if you have any other questions!

USER: I added these files to the chat: aider/voice.py.

If you need to propose edits to other existing files not already added to the chat, you *MUST* tell the me their full path names and ask me to *add the files to the chat*. End your reply and wait for my approval. You can keep asking if you then decide you need to edit more files.

ASSISTANT: Here are the proposed changes to aider/voice.py to support different microphone sample rates:

aider/voice.py
```python
<<<<<<< SEARCH
        sample_rate = 16000  # 16kHz
=======
        try:
            sample_rate = int(self.sd.query_devices(None, 'input')['default_samplerate'])
        except (TypeError, ValueError):
            sample_rate = 16000  # fallback to 16kHz if unable to query device
>>>>>>> REPLACE
```

This change:

1. Attempts to query the default sample rate of the input device using sounddevice's `query_devices()` function.
2. If successful, it uses that sample rate.
3. If it fails to get a valid sample rate, it falls back to the original 16kHz.

This should allow aider to automatically adapt to the microphone's supported sample rate in most cases, while still having a reasonable fallback.

Let me know if you would like me to explain or modify the changes further.
 2024-06-04 10:27:22 -07:00
Paul Gauthier
ad2312ad7b handle missing end_lineno attr #619 2024-05-29 15:55:55 -07:00
Paul Gauthier
0da01dacb6 ssh 2024-05-29 15:51:29 -07:00
Paul Gauthier
17dcfd94f7 +Only include the files 2024-05-25 18:58:37 -07:00
Paul Gauthier
0e71d262e3 change error message 2024-05-24 13:34:51 -07:00
Paul Gauthier
d48edfcd00 fix missing env 2024-05-24 12:59:48 -07:00
Paul Gauthier
d41bf592a0 Set GIT_EDITOR environment variable only if it is not already set. 2024-05-24 12:43:53 -07:00
Aleksandr Bobrov
231fa46125
Update cmd_commit method signature to accept an optional args parameter. 2024-05-24 14:57:42 +04:00
Aleksandr Bobrov
311ae04314
aider: Fix issue in cmd_commit to set commit_message to None if args does not exist. 
# 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: Understood. If you have any specific instructions or changes you would like to make, please let me know!

USER: in `cmd_commit` issue if args not exist please fix, as leave commit_message as None

ASSISTANT: To fix the issue in `cmd_commit` when `args` does not exist, we need to ensure that `commit_message` is set to `None` if `args` is not provided. Here are the changes:

1. Check if `args` is provided and set `commit_message` to `None` if it is not.

Here is the *SEARCH/REPLACE* block:

aider/commands.py
<source>python
<<<<<<< SEARCH
        commit_message = args.strip()
=======
        commit_message = args.strip() if args else None
>>>>>>> REPLACE
</source>
 2024-05-24 14:52:40 +04:00
Paul Gauthier
52ac35fcd2 restore --show-diffs functionality #607 2024-05-23 14:07:20 -07:00
Paul Gauthier
2ed5e45677 fixed #603 2024-05-23 14:01:45 -07:00
Paul Gauthier
a395d9bb5c fix double lines for confirm_ask 2024-05-23 13:55:53 -07:00
Paul Gauthier
cda9565cae aider: Handle IsADirectoryError when trying to create a file where a directory exists. 
# Aider chat conversation:

USER: https://github.com/paul-gauthier/aider/issues/606

https://github.com/paul-gauthier/aider/issues/606:

[Skip to content](#start-of-content)

## Navigation Menu

Toggle navigation

[](https://github.com/)

[Sign
in](/login?return_to=https%3A%2F%2Fgithub.com%2Fpaul-gauthier%2Faider%2Fissues%2F606)

-   Product

    -   [](https://github.com/features/actions)

        Actions

        Automate any workflow

    -   [](https://github.com/features/packages)

        Packages

        Host and manage packages

    -   [](https://github.com/features/security)

        Security

        Find and fix vulnerabilities

    -   [](https://github.com/features/codespaces)

        Codespaces

        Instant dev environments

    -   [](https://github.com/features/copilot)

        Copilot

        Write better code with AI

    -   [](https://github.com/features/code-review)

        Code review

        Manage code changes

    -   [](https://github.com/features/issues)

        Issues

        Plan and track work

    -   [](https://github.com/features/discussions)

        Discussions

        Collaborate outside of code

    Explore
    -   [All features](https://github.com/features)
    -   [Documentation](https://docs.github.com)
    -   [GitHub Skills](https://skills.github.com)
    -   [Blog](https://github.blog)

-   Solutions

    For
    -   [Enterprise](https://github.com/enterprise)
    -   [Teams](https://github.com/team)
    -   [Startups](https://github.com/enterprise/startups)
    -   [Education](https://education.github.com)

    By Solution
    -   [CI/CD & Automation](https://github.com/solutions/ci-cd)
    -   [DevOps](https://github.com/solutions/devops)
    -   [DevSecOps](https://resources.github.com/devops/fundamentals/devsecops)

    Resources
    -   [Learning Pathways](https://resources.github.com/learn/pathways)
    -   [White papers, Ebooks, Webinars](https://resources.github.com)
    -   [Customer Stories](https://github.com/customer-stories)
    -   [Partners](https://partner.github.com)

-   Open Source

    -   [](https://github.com/sponsors)

        GitHub Sponsors

        Fund open source developers

    -   [](https://github.com/readme)

        The ReadME Project

        GitHub community articles

    Repositories
    -   [Topics](https://github.com/topics)
    -   [Trending](https://github.com/trending)
    -   [Collections](https://github.com/collections)

-   [Pricing](https://github.com/pricing)

Search or jump to\...

# Search code, repositories, users, issues, pull requests\...

Search

Clear

[Search syntax
tips](https://docs.github.com/search-github/github-code-search/understanding-github-code-search-syntax)

# Provide feedback

We read every piece of feedback, and take your input very seriously.

Include my email address so I can be contacted

Cancel

Submit feedback

# Saved searches

## Use saved searches to filter your results more quickly

Name

Query

To see all available qualifiers, see our
[documentation](https://docs.github.com/search-github/github-code-search/understanding-github-code-search-syntax).

Cancel

Create saved search

[Sign
in](/login?return_to=https%3A%2F%2Fgithub.com%2Fpaul-gauthier%2Faider%2Fissues%2F606)

[Sign
up](/signup?ref_cta=Sign+up&ref_loc=header+logged+out&ref_page=%2F%3Cuser-name%3E%2F%3Crepo-name%3E%2Fvoltron%2Fissues_fragments%2Fissue_layout&source=header-repo&source_repo=paul-gauthier%2Faider)

You signed in with another tab or window. [Reload]() to refresh your
session. You signed out in another tab or window. [Reload]() to refresh
your session. You switched accounts on another tab or window. [Reload]()
to refresh your session.

Dismiss alert

{{ message }}

::: {role="main"}

[paul-gauthier](/paul-gauthier) / **[aider](/paul-gauthier/aider)**
Public

-   [Notifications](/login?return_to=%2Fpaul-gauthier%2Faider)

-   [Fork 1k](/login?return_to=%2Fpaul-gauthier%2Faider)

-

    [ Star 10.2k](/login?return_to=%2Fpaul-gauthier%2Faider)

-   [Code ](/paul-gauthier/aider)
-   [Issues 55](/paul-gauthier/aider/issues)
-   [Pull requests 8](/paul-gauthier/aider/pulls)
-   [Actions ](/paul-gauthier/aider/actions)
-   [Projects 0](/paul-gauthier/aider/projects)
-   [Security](/paul-gauthier/aider/security)
-   [Insights ](/paul-gauthier/aider/pulse)

Additional navigation options

-   [ Code ](/paul-gauthier/aider)
-   [ Issues ](/paul-gauthier/aider/issues)
-   [ Pull requests ](/paul-gauthier/aider/pulls)
-   [ Actions ](/paul-gauthier/aider/actions)
-   [ Projects ](/paul-gauthier/aider/projects)
-   [ Security ](/paul-gauthier/aider/security)
-   [ Insights ](/paul-gauthier/aider/pulse)

New issue

**Have a question about this project?** Sign up for a free GitHub
account to open an issue and contact its maintainers and the community.

[Sign up for
GitHub](/signup?return_to=%2Fpaul-gauthier%2Faider%2Fissues%2Fnew%2Fchoose)

By clicking "Sign up for GitHub", you agree to our [terms of
service](https://docs.github.com/terms) and [privacy
statement](https://docs.github.com/privacy). We'll occasionally send you
account related emails.

Already on GitHub? [Sign
in](/login?return_to=%2Fpaul-gauthier%2Faider%2Fissues%2Fnew%2Fchoose)
to your account

[Jump to bottom](#issue-comment-box)

# Trying to create a file where a directory exists causes IsADirectoryError and aider to exit #606

Open

[harleypig](/harleypig) opened this issue May 18, 2024 · 0 comments

Open

# [Trying to create a file where a directory exists causes IsADirectoryError and aider to exit](#top) #606

[harleypig](/harleypig) opened this issue May 18, 2024 · 0 comments

Labels

[bug](/paul-gauthier/aider/labels/bug) Something isn\'t working

## Comments

[](/harleypig)

Copy link

###

**[harleypig](/harleypig)** commented [May 18, 2024](#issue-2304113184)
•

edited

+-----------------------------------------------------------------------+
| ### Issue                                                             |
|                                                                       |
| I wasn\'t thinking and asked aider to create a file with the same     |
| name as a directory and got unexpectedly dumped back to the command   |
| line.                                                                 |
|                                                                       |
|                                                                       |
|                                                                       |
|     $ mkdir -p testoops/oops                                          |
|     $ cd testoops                                                     |
|     $ aider                                                           |
|     Aider v0.35.0                                                     |
|                                                                       |
|     Models: openai/gpt-4o with diff edit format, weak model gpt-      |
| 3.5-turbo                                                             |
|     Git repo: .git with 0 files                                       |
|                                                                       |
|     Repo-map: using 2048 tokens                                       |
|                                                                       |
|     Use /help to see in-chat commands, run with --help to see cm      |
| d line args                                                           |
|     ────────────────────────────────────────────────────────────      |
| ───────────────────────────────────────────────────────────────────── |
|     > Create a text file named './oops' that has 'this wont work      |
| '                                                                     |
|                                                                       |
|     Here is the SEARCH/REPLACE block to create the file ./oops w      |
| ith the content this wont work:                                       |
|                                                                       |
|     ./oops                                                            |
|                                                                       |
|                                                                       |
|                                                                       |
|      <<<<<<< SEARCH                                                   |
|                                                                       |
|      =======                                                          |
|                                                                       |
|      this wont work                                                   |
|                                                                       |
|      >>>>>>> REPLACE                                                  |
|                                                                       |
|                                                                       |
|                                                                       |
|                                                                       |
|                                                                       |
|     Allow edits to ./oops which was not previously added to chat? y   |
|     Committing ./oops before applying edits.                          |
|     Cmd('git') failed due to: exit code(1)                            |
|       cmdline: git commit -m Add                                      |
| ed ./oops file. --no-verify -- /home/harleypig/projects/testoops/oops |
|       stderr: 'error: pathspec '/home/harl                            |
| eypig/projects/testoops/oops' did not match any file(s) known to git' |
|     ────────────────────────────────────────────────────────────      |
| ───────────────────────────────────────────────────────────────────── |
|     Traceback (most recent call last):                                |
|       File "/usr/local/bin/aider", line 8, in <module>                |
|         sys.exit(main())                                              |
|       File "/home/harleypig/.local/share/                             |
| python/lib/python3.10/site-packages/aider/main.py", line 408, in main |
|         coder.run()                                                   |
|       File "/home/harleypig/.local/share/python/lib/p                 |
| ython3.10/site-packages/aider/coders/base_coder.py", line 496, in run |
|         new_user_message = self.run_loop()                            |
|       File "/home/harleypig/.local/share/python/lib/python            |
| 3.10/site-packages/aider/coders/base_coder.py", line 512, in run_loop |
|         inp = self.io.get_input(                                      |
|       File "/home/harleypig/.local/share/pyt                          |
| hon/lib/python3.10/site-packages/aider/io.py", line 210, in get_input |
|         completer_instance = AutoCompleter(                           |
|       File "/home/harleypig/.local/share/p                            |
| ython/lib/python3.10/site-packages/aider/io.py", line 47, in __init__ |
|         with open(fname, "r", encoding=self.encoding) as f:           |
|     IsADirectoryError                                                 |
| : [Errno 21] Is a directory: '/home/harleypig/projects/testoops/oops' |
|                                                                       |
|                                                                       |
|                                                                       |
|                                                                       |
|                                                                       |
|                                                                       |
|                                                                       |
| ### Version and model info                                            |
|                                                                       |
| In example above.                                                     |
+-----------------------------------------------------------------------+
|                                                                       |
|                                                                       |
| The text was updated successfully, but these errors were encountered: |
|                                                                       |
|                                                                       |
+-----------------------------------------------------------------------+

All reactions

[paul-gauthier](/paul-gauthier) added the
[bug](/paul-gauthier/aider/labels/bug) Something isn\'t working label
[May 20, 2024](#event-12868798902)

[Sign up for free](/join?source=comment-repo) **to join this
conversation on GitHub**. Already have an account? [Sign in to
comment](/login?return_to=https%3A%2F%2Fgithub.com%2Fpaul-gauthier%2Faider%2Fissues%2F606)

Assignees

No one assigned

Labels

[bug](/paul-gauthier/aider/labels/bug) Something isn\'t working

Projects

None yet

Milestone

No milestone

Development

No branches or pull requests

2 participants

:::

## Footer

[](https://github.com) © 2024 GitHub, Inc.

### Footer navigation

-   [Terms](https://docs.github.com/site-policy/github-terms/github-terms-of-service)
-   [Privacy](https://docs.github.com/site-policy/privacy-policies/github-privacy-statement)
-   [Security](https://github.com/security)
-   [Status](https://www.githubstatus.com/)
-   [Docs](https://docs.github.com/)
-   [Contact](https://support.github.com?tags=dotcom-footer)
-   Manage cookies
-   Do not share my personal information

You can't perform that action at this time.

ASSISTANT: To address the issue of `IsADirectoryError` when trying to create a file where a directory exists, we need to handle this exception in the relevant part of the code. The most likely file to need changes is `aider/io.py`.

Please add `aider/io.py` to the chat so I can propose the necessary changes.

USER: I added these files to the chat: aider/io.py.

If you need to propose edits to other existing files not already added to the chat, you *MUST* tell the me their full path names and ask me to *add the files to the chat*. End your reply and wait for my approval. You can keep asking if you then decide you need to edit more files.

ASSISTANT: To handle the `IsADirectoryError` when trying to create a file where a directory exists, we need to catch this exception and handle it appropriately in the `get_input` method of the `InputOutput` class in `aider/io.py`.

Here are the changes:

aider/io.py
```python
<<<<<<< SEARCH
            try:
                with open(fname, "r", encoding=self.encoding) as f:
                    content = f.read()
            except (FileNotFoundError, UnicodeDecodeError):
                continue
=======
            try:
                with open(fname, "r", encoding=self.encoding) as f:
                    content = f.read()
            except (FileNotFoundError, UnicodeDecodeError, IsADirectoryError):
                continue
>>>>>>> REPLACE
```

This change will ensure that if the code tries to open a directory as if it were a file, it will catch the `IsADirectoryError` and continue without crashing.
 2024-05-23 13:48:44 -07:00
Paul Gauthier
a4a6066858 handle missing max_map_tokens/max_context_window 2024-05-23 13:46:08 -07:00
Paul Gauthier
6345cd3734 cleanup 2024-05-23 13:43:35 -07:00
Paul Gauthier
fb76895eb1 Merge branch 'main' into swe-bench 2024-05-23 13:36:23 -07:00
Paul Gauthier
a405defcff ask for confirmation 2024-05-22 21:27:59 -07:00
Paul Gauthier
5032adf44b Add the url content 2024-05-22 21:25:34 -07:00
Paul Gauthier
dc8ae596c3 aider: Implement regex to find all URLs in the input string. 
# Aider chat conversation:

USER: do the todo

ASSISTANT: To address the TODO comment, we need to implement a regex to find all URLs in the input string. Here are the changes:

1. Import the `re` module for regular expressions.
2. Implement the `check_for_urls` method to find and process URLs in the input string.

Here are the *SEARCH/REPLACE* blocks:

aider/coders/base_coder.py
```python
<<<<<<< SEARCH
import hashlib
=======
import hashlib
import re
>>>>>>> REPLACE
```

aider/coders/base_coder.py
```python
<<<<<<< SEARCH
        # todo use a regex to find all urls in inp

        return inp
=======
        url_pattern = re.compile(
            r'http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\\(\\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+'
        )
        urls = url_pattern.findall(inp)
        if urls:
            self.io.tool_output(f"Found URLs: {', '.join(urls)}")
        return inp
>>>>>>> REPLACE
```

This will implement the functionality to find all URLs in the input string using a regular expression.
 2024-05-22 21:19:44 -07:00
Paul Gauthier
aca24976a7 Add method to check for URLs in input. 2024-05-22 21:19:43 -07:00
Paul Gauthier
899fc88a14 Merge branch 'main' into swe-bench 2024-05-22 15:01:03 -07:00
Paul Gauthier
2374a2166f set version to 0.36.1-dev 2024-05-22 12:16:33 -07:00
Paul Gauthier
8868caf2b1 version bump to 0.36.0 2024-05-22 12:15:53 -07:00
Paul Gauthier
210679f020 Use the test_cmd by default 2024-05-22 12:05:29 -07:00
Paul Gauthier
56f5e7e10c expand repomap even in smaller context windows 2024-05-21 11:04:18 -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
1effd73e80 Only expand the repomap if we know it will fit into context window 2024-05-20 10:22:57 -07:00
Paul Gauthier
449cbf507f Allow test_cmd to be a callable 2024-05-20 10:22:31 -07:00
Paul Gauthier
fa0aa60c97 Merge branch 'main' into swe-bench 2024-05-20 09:39:29 -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
e758b01fb6 Merge branch 'main' into swe-bench 2024-05-19 15:20:46 -07:00
Paul Gauthier
04539feccb bump deps to get grep-ast 0.3.1 2024-05-19 15:10:57 -07:00
Paul Gauthier
5745657991 ask to fix lint/test 2024-05-19 15:02:16 -07:00
Paul Gauthier
038806f694 max_reflex=3, auto fix lint/test 2024-05-19 14:24:06 -07:00
Paul Gauthier
642be2a8f0 S/R uniq prompt 2024-05-19 14:22:29 -07:00
Paul Gauthier
5641483a3b S/R will replace all matches 2024-05-19 10:31:36 -07:00
Paul Gauthier
ec7af731e0 confirm auto lint and test 2024-05-19 10:26:06 -07:00
Paul Gauthier
cb6e7cabb6 Added lint/test_outcome 2024-05-19 08:13:20 -07:00
Paul Gauthier
41c678da09 +litellm.suppress_debug_info 2024-05-19 07:56:13 -07:00
Paul Gauthier
0b18f3b4ef Add check to skip setting up lint commands if none are provided. 2024-05-19 07:42:39 -07:00
Paul Gauthier
afd827b9d9 aider: Fixed f-string error and added missing blank line before the main function. 
# Aider chat conversation:

USER: # Fix any errors below, if possible.

## Running: flake8 aider/main.py

aider/main.py:195:27: F541 f-string is missing placeholders
aider/main.py:202:1: E302 expected 2 blank lines, found 1

## See relevant lines below marked with █.

aider/main.py:
...⋮...
180│def parse_lint_cmds(lint_cmds, io):
181│    err = False
182│    res = dict()
183│    for lint_cmd in lint_cmds:
184│        pieces = lint_cmd.split(":")
...⋮...
191│        if lang and cmd:
192│            res[lang] = cmd
193│        else:
194│            io.tool_error(f'Unable to parse --lint-cmd "{lint_cmd}"')
195█            io.tool_error(f'The arg should be "language: cmd --args ..."')
196│            io.tool_error('For example: --lint-cmd "python: flake8 --select=E9"')
197│            err = True
198│    if err:
199│        return
200│    return res
201│
202█def main(argv=None, input=None, output=None, force_git_root=None, return_coder=False):
203│    if argv is None:
204│        argv = sys.argv[1:]
205│
...⋮...

ASSISTANT: Here are the necessary changes to fix the flake8 errors:

1. Correct the f-string to not use placeholders when not needed.
2. Add the missing blank line before the `main` function.

aider/main.py
```python
<<<<<<< SEARCH
            io.tool_error(f'The arg should be "language: cmd --args ..."')
=======
            io.tool_error('The arg should be "language: cmd --args ..."')
>>>>>>> REPLACE
```

aider/main.py
```python
<<<<<<< SEARCH
    return res
=======
    return res

>>>>>>> REPLACE
```
 2024-05-19 07:40:54 -07:00
Paul Gauthier
25e44f584b aider: Fixed extra blank lines and added missing whitespace after a comma. 
# Aider chat conversation:

USER: # Fix any errors below, if possible.

## Running: flake8 aider/coders/base_coder.py

aider/coders/base_coder.py:43:1: E303 too many blank lines (3)
aider/coders/base_coder.py:334:17: E231 missing whitespace after ','

## See relevant lines below marked with █.

aider/coders/base_coder.py:
...⋮...
 40│
 41│
 42│
 43█def wrap_fence(name):
 44│    return f"<{name}>", f"</{name}>"
 45│
 46│
 47│class Coder:
 48│    abs_fnames = None
...⋮...
331│                self.io.tool_output(json.dumps(self.functions, indent=4))
332│
333│    def setup_lint_cmds(self, lint_cmds):
334█        for lang,cmd in lint_cmds.items():
335│            self.linter.set_linter(lang, cmd)
336│
337│    def show_announcements(self):
...⋮...

ASSISTANT: Here are the necessary changes to fix the flake8 errors:

1. Remove the extra blank lines before the `wrap_fence` function.
2. Add a missing whitespace after the comma in the `setup_lint_cmds` function.

aider/coders/base_coder.py
```python
<<<<<<< SEARCH
class ExhaustedContextWindow(Exception):
    pass

def wrap_fence(name):
=======
class ExhaustedContextWindow(Exception):
    pass

def wrap_fence(name):
>>>>>>> REPLACE
```

aider/coders/base_coder.py
```python
<<<<<<< SEARCH
        for lang,cmd in lint_cmds.items():
=======
        for lang, cmd in lint_cmds.items():
>>>>>>> REPLACE
```
 2024-05-19 07:40:48 -07:00
Paul Gauthier
9bd78d7ff3 Refactored lint command parsing and setup logic. 2024-05-19 07:40:41 -07:00