dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-06-01 18:25:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
3995 commits 2 branches 243 tags 267 MiB
Commit graph

3995 commits

This branch
This branch
All branches
Author SHA1 Message Date
Paul Gauthier
b087cd670f Enabled browser-based AI pair programming in Aider. 2024-05-02 10:41:44 -07:00
Paul Gauthier
7c2e9a394c browser blog post 2024-05-02 10:39:33 -07:00
Paul Gauthier
707fb80d87 copy 2024-05-02 09:22:09 -07:00
Paul Gauthier
8a9ba47442 set version to 0.31.1-dev 2024-05-02 09:10:09 -07:00
Paul Gauthier
ec6054a53a version bump to 0.31.0 2024-05-02 09:09:35 -07:00
Paul Gauthier
bd2900495d bump deps to pick up latest litellm 2024-05-02 08:46:16 -07:00
Paul Gauthier
258c466906 copy 2024-05-02 08:31:13 -07:00
Paul Gauthier
1a8ea2f81f added windows setx commands #584 2024-05-02 08:14:24 -07:00
Paul Gauthier
d4c63ca959 Updated the API key environment variable examples in the llms.md documentation. 2024-05-02 08:03:42 -07:00
Paul Gauthier
8800432dd7 aider: Added # Windows: setx versions of all the export commands. 
# Aider chat conversation:

USER: add `# Windows: setx` versions of all the `export` commands, like the first one

ASSISTANT: Here are the changes to add `# Windows: setx` versions of all the `export` commands:

docs/llms.md
<source>markdown
<<<<<<< SEARCH
export ANTHROPIC_API_KEY=<your-key>
=======
export ANTHROPIC_API_KEY=<your-key> # Windows: setx ANTHROPIC_API_KEY <your-key>
>>>>>>> REPLACE
</source>

docs/llms.md
<source>markdown
<<<<<<< SEARCH
export GEMINI_API_KEY=<your-key>
=======
export GEMINI_API_KEY=<your-key> # Windows: setx GEMINI_API_KEY <your-key>
>>>>>>> REPLACE
</source>

docs/llms.md
<source>markdown
<<<<<<< SEARCH
export GROQ_API_KEY=<your-key>
=======
export GROQ_API_KEY=<your-key> # Windows: setx GROQ_API_KEY <your-key>
>>>>>>> REPLACE
</source>

docs/llms.md
<source>markdown
<<<<<<< SEARCH
export COHERE_API_KEY=<your-key>
=======
export COHERE_API_KEY=<your-key> # Windows: setx COHERE_API_KEY <your-key>
>>>>>>> REPLACE
</source>

docs/llms.md
<source>markdown
<<<<<<< SEARCH
export AZURE_API_KEY=<your-key>
export AZURE_API_VERSION=2023-05-15
export AZURE_API_BASE=https://example-endpoint.openai.azure.com
=======
export AZURE_API_KEY=<your-key> # Windows: setx AZURE_API_KEY <your-key>
export AZURE_API_VERSION=2023-05-15 # Windows: setx AZURE_API_VERSION 2023-05-15
export AZURE_API_BASE=https://example-endpoint.openai.azure.com # Windows: setx AZURE_API_BASE https://example-endpoint.openai.azure.com
>>>>>>> REPLACE
</source>

docs/llms.md
<source>markdown
<<<<<<< SEARCH
export OPENROUTER_API_KEY=<your-key>
=======
export OPENROUTER_API_KEY=<your-key> # Windows: setx OPENROUTER_API_KEY <your-key>
>>>>>>> REPLACE
</source>

docs/llms.md
<source>markdown
<<<<<<< SEARCH
export OLLAMA_API_BASE=http://127.0.0.1:11434
=======
export OLLAMA_API_BASE=http://127.0.0.1:11434 # Windows: setx OLLAMA_API_BASE http://127.0.0.1:11434
>>>>>>> REPLACE
</source>

docs/llms.md
<source>markdown
<<<<<<< SEARCH
export OPENAI_API_KEY=<your-key>
export OPENAI_API_BASE=https://api.deepseek.com/v1
=======
export OPENAI_API_KEY=<your-key> # Windows: setx OPENAI_API_KEY <your-key>
export OPENAI_API_BASE=https://api.deepseek.com/v1 # Windows: setx OPENAI_API_BASE https://api.deepseek.com/v1
>>>>>>> REPLACE
</source>

docs/llms.md
<source>markdown
<<<<<<< SEARCH
export OPENAI_API_BASE=<your-endpoint-goes-here>

# If your endpoint needs a key
export OPENAI_API_KEY=<your-key>
=======
export OPENAI_API_BASE=<your-endpoint-goes-here> # Windows: setx OPENAI_API_BASE <your-endpoint-goes-here>

# If your endpoint needs a key
export OPENAI_API_KEY=<your-key> # Windows: setx OPENAI_API_KEY <your-key>
>>>>>>> REPLACE
</source>
 2024-05-02 07:52:20 -07:00
Paul Gauthier
3b900a4c59 Prep for windows setx 2024-05-02 07:51:01 -07:00
Paul Gauthier
b8313c5343 added docstrings 2024-05-01 15:14:14 -07:00
Paul Gauthier
e8666d3984 fix wholefile prompt 2024-05-01 15:06:31 -07:00
Paul Gauthier
26d841ccc7 aider: Add --add-host flag to docker run command to allow container to connect to host machine on macOS using host.docker.internal. 
# Aider chat conversation:

USER: when i run `curl http://127.0.0.1:11434` inside the container, it "Couldn't connect to server". i want it to connect to the server running on the host computer on that port. the host is a mac.

ASSISTANT: To allow the Docker container to connect to the host machine on macOS, you can use the special DNS name `host.docker.internal` which resolves to the internal IP address used by the host. This is a feature provided by Docker for Mac to facilitate such connections.

Here's the diff to update the `docker.sh` script to include the `--add-host` flag, which adds an entry to the container's `/etc/hosts` file:

```diff
--- benchmark/docker.sh
+++ benchmark/docker.sh
@@ ... @@
 docker run \
        -it --rm \
        -v `pwd`:/aider \
        -v `pwd`/tmp.benchmarks/.:/benchmarks \
        -e OPENAI_API_KEY=$OPENAI_API_KEY \
        -e HISTFILE=/aider/.bash_history \
        -e AIDER_DOCKER=1 \
        -e AIDER_BENCHMARK_DIR=/benchmarks \
+       --add-host=host.docker.internal:host-gateway \
        --net=host \
        -p 11434:11434 \
        aider-benchmark \
        bash
```

With this change, when you run `curl http://host.docker.internal:11434` inside the container, it should connect to the server running on the host computer on that port.
 2024-05-01 13:54:30 -07:00
Paul Gauthier
71b675d0ef Add network host mode and change port mapping in docker run script. 2024-05-01 13:54:28 -07:00
Paul Gauthier
5e4ac44008 aider: Add port forwarding for the client inside the container to connect to the Ollama server on the host. 
# Aider chat conversation:

USER: add a port fwd so a client inside the contain can connect to the ollama server running on the host

ASSISTANT: To forward a port so that a client inside the container can connect to the Ollama server running on the host, you need to add a `--publish` or `-p` option to the `docker run` command in the `benchmark/docker.sh` script. This option takes the format `host_port:container_port`.

Assuming the Ollama server is running on port 12345 on the host, and you want to use the same port inside the container, the diff would look like this:

```diff
--- benchmark/docker.sh
+++ benchmark/docker.sh
@@ ... @@
 docker run \
        -it --rm \
        -v `pwd`:/aider \
        -v `pwd`/tmp.benchmarks/.:/benchmarks \
        -e OPENAI_API_KEY=$OPENAI_API_KEY \
        -e HISTFILE=/aider/.bash_history \
        -e AIDER_DOCKER=1 \
        -e AIDER_BENCHMARK_DIR=/benchmarks \
+       -p 12345:12345 \
        aider-benchmark \
        bash
```

This change will forward port 12345 from the host to port 12345 in the container, allowing a client inside the container to connect to the Ollama server running on the host machine.
 2024-05-01 13:46:45 -07:00
paul-gauthier
e922732f0a
Update HISTORY.md 2024-05-01 12:48:20 -07:00
Paul Gauthier
f4b1797998 put filename back outside fences 2024-05-01 11:59:23 -07:00
Paul Gauthier
5ed9e8cb6d Merge remote-tracking branch 'origin/main' 2024-05-01 11:08:42 -07:00
Paul Gauthier
2f589ee379 upgraded dependencies 2024-05-01 10:46:20 -07:00
Paul Gauthier
e76d1c0cfa accepts_multi_system_msgs -> reminder_as_sys_msg 2024-05-01 10:30:41 -07:00
Paul Gauthier
31b7ed3660 Merge branch 'main' into gemini-editblock-and-examples 2024-05-01 10:27:09 -07:00
Paul Gauthier
862c0dd0d7 stronger code base switch prompt 2024-05-01 09:40:47 -07:00
Paul Gauthier
1403d19aa7 Added example messages to wholefile edit format 2024-05-01 09:34:40 -07:00
Paul Gauthier
2c0dff52d3 asking for code language in whole edit format confuses some models 2024-05-01 09:17:29 -07:00
Paul Gauthier
484f7e44c0 Updated HISTORY 2024-05-01 09:17:07 -07:00
Paul Gauthier
0185e02a92 updated favicon paths 2024-05-01 09:14:53 -07:00
Paul Gauthier
0fb08896e3 Merge branch 'main' into gemini-editblock-and-examples 2024-05-01 09:02:08 -07:00
paul-gauthier
5ea1c5df0b
Merge pull request #581 from paul-gauthier/switch-model 
New /model command to switch models, /models to search them
 2024-05-01 07:11:16 -07:00
Paul Gauthier
7fd3b8aeee Tell the AI we are switching code bases 2024-04-30 20:51:24 -07:00
Paul Gauthier
d51cada163 make the examples part of the chat 2024-04-30 20:45:49 -07:00
Paul Gauthier
22d90d70c6 prompt copy 2024-04-30 20:24:53 -07:00
Paul Gauthier
256a9a454c move cloning into Coder.create, summarize chat history if edit format changes 2024-04-30 17:31:58 -07:00
Paul Gauthier
665b9044c8 added autocomplete for model names 2024-04-30 16:29:10 -07:00
Paul Gauthier
8e9a00006b carry conversation history to switched model 2024-04-30 16:25:47 -07:00
Paul Gauthier
304856fc60 roughed in model switch 2024-04-30 16:22:13 -07:00
Paul Gauthier
050d35790e added /models cmd 2024-04-30 16:02:38 -07:00
Paul Gauthier
e610e5bd0a Handle existing dirnames with [globby] chars, with test #195 2024-04-30 15:50:24 -07:00
Paul Gauthier
a3a4d87a0c treat litellm.exceptions.BadRequestError as a 400 error and do not retry 2024-04-30 15:40:28 -07:00
Paul Gauthier
3469e04eb8 Do exp backoff for litellm.exceptions.ServiceUnavailableError #580 2024-04-30 15:34:01 -07:00
Paul Gauthier
7b14d77e9e Don't retry on gemini RECITATION error 2024-04-30 14:40:15 -07:00
Paul Gauthier
d38a38f0dd implemented accepts_multi_system_msgs 2024-04-30 07:57:29 -07:00
Paul Gauthier
2d16ee16ac Make lazy prompt configurable 2024-04-30 07:45:16 -07:00
Paul Gauthier
65dccb6205 Merge branch 'main' into gemini-editblock 2024-04-29 20:42:52 -07:00
Paul Gauthier
d6783636c5 copy 2024-04-29 20:42:44 -07:00
Paul Gauthier
178af4a327 copy 2024-04-29 13:17:40 -07:00
Paul Gauthier
e88ea7793b copy 2024-04-29 12:56:41 -07:00
Paul Gauthier
e668803f82 added deepseek docs 2024-04-29 12:35:57 -07:00
Paul Gauthier
c07f7931f2 Merge branch 'main' into gui 2024-04-29 11:27:49 -07:00
Paul Gauthier
4b87f2b40f updated icons 2024-04-29 11:00:23 -07:00