Commit graph

1577 commits

Author SHA1 Message Date
Paul Gauthier
2a896daa0c Move back to 0.5.0 2023-06-08 16:24:45 -07:00
Paul Gauthier
419fccfa8a wip 2023-06-08 12:44:41 -07:00
Paul Gauthier
59e8f798d1 aider: Updated aiohttp version constraint in requirements.txt.
# Context:
USER: $ pip install -i https://test.pypi.org/simple/ aider-chat
Looking in indexes: https://test.pypi.org/simple/
Collecting aider-chat
  Downloading a61a5f1941/aider_chat-0.5.3-py3-none-any.whl (42 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 42.0/42.0 kB 614.5 kB/s eta 0:00:00
INFO: pip is looking at multiple versions of aider-chat to determine which version is compatible with other requirements. This could take a while.
  Downloading e8a3663c60/aider_chat-0.5.2-py3-none-any.whl (42 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 42.1/42.1 kB 1.2 MB/s eta 0:00:00
  Downloading f69bb4653a/aider_chat-0.5.1-py3-none-any.whl (42 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 42.1/42.1 kB 1.3 MB/s eta 0:00:00
  Downloading 005ae4324a/aider_chat-0.5.0-py3-none-any.whl (38 kB)
ERROR: Cannot install aider-chat==0.5.0, aider-chat==0.5.1, aider-chat==0.5.2 and aider-chat==0.5.3 because these package versions have conflicting dependencies.

The conflict is caused by:
    aider-chat 0.5.3 depends on aiohttp==3.8.4
    aider-chat 0.5.2 depends on aiohttp==3.8.4
    aider-chat 0.5.1 depends on aiohttp==3.8.4
    aider-chat 0.5.0 depends on aiohttp==3.8.4

To fix this you could try to:
1. loosen the range of package versions you've specified
2. remove package versions to allow pip attempt to solve the dependency conflict

ERROR: ResolutionImpossible: for help visit https://pip.pypa.io/en/latest/topics/dependency-resolution/#dealing-with-dependency-conflicts

ASSISTANT: It seems there is a dependency conflict when trying to install `aider-chat` from TestPyPI. The conflict is caused by the `aiohttp` package version. To resolve this issue, you can try the following steps:

1. Update the `requirements.txt` file to loosen the version constraint for `aiohttp`. For example, you can change it to `aiohttp>=3.8.4` to allow any version greater than or equal to 3.8.4.
2. Update the `setup.py` file to read the updated `requirements.txt` file.
3. Re-upload the package to TestPyPI with the updated dependencies.

Here's the change you need to make in the `requirements.txt` file:

```plaintext

^C KeyboardInterrupt
USER: why is it trying to install multiple versions of aider-chat?
ASSISTANT: The reason pip is looking at multiple versions of `aider-chat` is that it's trying to find a version that is compatible with the other packages and their dependencies in your environment. This process is part of pip's dependency resolution mechanism.

In this case, it seems that all the versions of `aider-chat` have a conflicting dependency on `aiohttp==3.8.4`. To resolve this issue, you can try loosening the version constraint for `aiohttp` in the `requirements.txt` file, as I mentioned in my previous response. This should help pip find a compatible version of `aider-chat` that works with the other packages in your environment.
USER: I added these *read-write* files: requirements.txt
ASSISTANT: Great! Now, let's update the `requirements.txt` file to loosen the version constraint for `aiohttp`. Change the line with `aiohttp==3.8.4` to `aiohttp>=3.8.4`. Here's the change you need to make:

```plaintext
requirements.txt
<<<<<<< ORIGINAL
aiohttp==3.8.4
=======
aiohttp>=3.8.4
>>>>>>> UPDATED
```

After making this change, you can re-upload the package to TestPyPI with the updated dependencies and try installing it again.
2023-06-07 17:15:13 -07:00
Paul Gauthier
1eb9ab1b70 aider: Added regex to remove lines containing bullets with anchor links from long_description in setup.py.
# Context:
USER: also filter out the bullets which are just #anchor links to elsewhere in the readme
ASSISTANT: To filter out the bullets with anchor links in the `long_description` in `setup.py`, you can use a regular expression to remove the lines containing those links. Here's the change you need to make in `setup.py`:

```python
setup.py
<<<<<<< ORIGINAL
import re

with open("README.md", "r", encoding="utf-8") as f:
    long_description = f.read()
    long_description = re.sub(r'\n!\[.*\]\(.*\)', '', long_description)
=======
import re

with open("README.md", "r", encoding="utf-8") as f:
    long_description = f.read()
    long_description = re.sub(r'\n!\[.*\]\(.*\)', '', long_description)
    long_description = re.sub(r'\n- \[.*\]\(#.*\)', '', long_description)
>>>>>>> UPDATED
```

This change adds another `re.sub()` function to remove lines containing bullets with anchor links from the `long_description`.
2023-06-07 17:11:16 -07:00
Paul Gauthier
f8f2eb0f76 aider: Filtered out image links from long_description in setup.py.
# Context:
USER: pypi descriptions don't support markdown image links. filter out images before passing it
ASSISTANT: To filter out image links from the `long_description` in `setup.py`, you can use a regular expression to remove the lines containing image links. Here's the change you need to make in `setup.py`:

```python
setup.py
<<<<<<< ORIGINAL
with open("README.md", "r", encoding="utf-8") as f:
    long_description = f.read()
=======
import re

with open("README.md", "r", encoding="utf-8") as f:
    long_description = f.read()
    long_description = re.sub(r'\n!\[.*\]\(.*\)', '', long_description)
>>>>>>> UPDATED
```

This change imports the `re` module and uses the `re.sub()` function to remove lines containing image links from the `long_description`.
2023-06-07 16:59:35 -07:00
Paul Gauthier
ece1cdd557 aider: Updated the setup.py to use the README.md as the long description source.
# Context:
USER: update the `setup.py` to use README.md as the long description source
ASSISTANT: To update the `setup.py` to use the `README.md` as the long description source, follow these steps:

1. Read the contents of the `README.md` file and store it in a variable.
2. Add the `long_description` and `long_description_content_type` arguments to the `setup()` function.

Here's the updated `setup.py`:

```python
setup.py
<<<<<<< ORIGINAL
from setuptools import find_packages, setup

with open("requirements.txt") as f:
    requirements = f.read().splitlines()

setup(
    name="aider-chat",
    version="0.5.0",
    packages=find_packages(),
    install_requires=requirements,
    entry_points={
        "console_scripts": [
            "aider = aider.main:main",
        ],
    },
)
=======
from setuptools import find_packages, setup

with open("requirements.txt") as f:
    requirements = f.read().splitlines()

with open("README.md", "r", encoding="utf-8") as f:
    long_description = f.read()

setup(
    name="aider-chat",
    version="0.5.0",
    packages=find_packages(),
    install_requires=requirements,
    entry_points={
        "console_scripts": [
            "aider = aider.main:main",
        ],
    },
    long_description=long_description,
    long_description_content_type="text/markdown",
)
>>>>>>> UPDATED
```
2023-06-07 16:56:24 -07:00
Paul Gauthier
d65e782e80 Changed package name aider -> aider-chat 2023-06-07 16:43:46 -07:00
Paul Gauthier
07c5c7f477 Update debugging main in repomap 2023-06-07 14:57:57 -07:00
Paul Gauthier
85a14309ca bump version 2023-06-07 13:53:04 -07:00
Paul Gauthier
587261ef12 added adier/models.py 2023-06-07 13:14:55 -07:00
Paul Gauthier
31c7274639 no bash markup 2023-06-07 13:12:49 -07:00
Paul Gauthier
de9868063b Updated README 2023-06-07 13:11:51 -07:00
Paul Gauthier
9ac8a60f5f Finish support for gpt-4-32k 2023-06-07 12:42:43 -07:00
Paul Gauthier
571896f0bd Added gpt-4-32k 2023-06-07 12:39:56 -07:00
Paul Gauthier
b70f8ea7bc Use models...max_context_tokens 2023-06-07 12:37:10 -07:00
Paul Gauthier
a874d617d3 rename 2023-06-07 12:29:51 -07:00
Paul Gauthier
9cef379abd refac 2023-06-07 12:28:45 -07:00
paul-gauthier
70b981029c
Update README.md 2023-06-07 10:32:12 -07:00
Paul Gauthier
2149eaceab copy 2023-06-07 09:39:28 -07:00
Paul Gauthier
3ab59252c8 copy 2023-06-07 09:38:28 -07:00
Paul Gauthier
68cbd3a968 copy 2023-06-07 09:37:49 -07:00
Paul Gauthier
96104d6281 copy 2023-06-07 09:37:10 -07:00
Paul Gauthier
eb48a0f589 copy 2023-06-07 09:35:32 -07:00
Paul Gauthier
c8216d9687 No need to force show_diffs=True for 3.5 2023-06-06 18:17:39 -07:00
Paul Gauthier
99c86ccddf aider: Updated diff_partial_update function to include 5 lines of context in unified_diff function call.
# Context:
USER: expand the context diff to 5 lines of context
ASSISTANT: To expand the context diff to 5 lines of context, you need to modify the `diff_partial_update` function in the `aider/diffs.py` file. Update the `unified_diff` function call to include the `n` parameter with a value of 5.

Here's the change:

```python
aider/diffs.py
<<<<<<< ORIGINAL
    diff = difflib.unified_diff(lines_orig, lines_updated)
=======
    diff = difflib.unified_diff(lines_orig, lines_updated, n=5)
>>>>>>> UPDATED
```
2023-06-06 18:13:36 -07:00
Paul Gauthier
00f2fb9bf6 copy 2023-06-06 14:05:06 -07:00
Paul Gauthier
74b1bc9f68 copy 2023-06-06 14:04:29 -07:00
Paul Gauthier
1bd321742b copy 2023-06-06 14:02:38 -07:00
Paul Gauthier
34e764bbf5 copy 2023-06-06 13:04:50 -07:00
Paul Gauthier
dbeed906ad copy 2023-06-06 13:04:21 -07:00
Paul Gauthier
4753db6eac copy 2023-06-06 12:50:18 -07:00
Paul Gauthier
261419ae5b copy 2023-06-06 12:49:47 -07:00
Paul Gauthier
7cf952c328 copy 2023-06-06 12:31:42 -07:00
paul-gauthier
eaba38bb5e
Update README.md 2023-06-06 11:40:55 -07:00
Paul Gauthier
70296cb330 copy 2023-06-06 10:56:40 -07:00
Paul Gauthier
b7e7207967 copy 2023-06-06 10:55:28 -07:00
Paul Gauthier
f1a0db0475 copy 2023-06-06 10:51:33 -07:00
Paul Gauthier
9b4a6b7f49 copy 2023-06-06 10:48:50 -07:00
Paul Gauthier
f61e07dc02 copy 2023-06-06 10:48:28 -07:00
Paul Gauthier
18e3a4e202 copy 2023-06-06 08:55:08 -07:00
Paul Gauthier
11e4de3ea7 copy 2023-06-06 08:54:46 -07:00
Paul Gauthier
c314f08d6e copy 2023-06-06 08:51:28 -07:00
Paul Gauthier
ebf4954697 copy 2023-06-06 08:46:25 -07:00
Paul Gauthier
31cf0310d9 copy 2023-06-06 08:45:13 -07:00
Paul Gauthier
1faef90841 copy 2023-06-06 07:29:47 -07:00
Paul Gauthier
16daa3615d copy 2023-06-06 07:29:06 -07:00
Paul Gauthier
de0df5e7b1 fixed bug in check_model_availability 2023-06-06 07:28:12 -07:00
Paul Gauthier
1ceeecddca Updated README for 3.5 2023-06-06 06:45:27 -07:00
Paul Gauthier
8f70f1b251 renamed 2023-06-05 22:34:44 -07:00
Paul Gauthier
05c08b36a7 move cur_messages->done_messages, even with --no-auto-commit 2023-06-05 22:30:52 -07:00