From 80d299cb28e85c9b9c78740950f54d6e187b374c Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Sun, 28 Apr 2024 14:30:05 -0700 Subject: [PATCH 01/12] favicon --- assets/favicon-32x32.png | Bin 0 -> 1891 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 assets/favicon-32x32.png diff --git a/assets/favicon-32x32.png b/assets/favicon-32x32.png new file mode 100644 index 0000000000000000000000000000000000000000..0a921307c2fbd8589bd06da0b33545e084162d8d GIT binary patch literal 1891 zcmZ{ldpOe#8^?b?zu7d0VU9fx%ekIt$swoOY+@~P7)GgSPL<=Va!7s?QarDfLr9uX zM6nv?d?=Ji2c8m9p~w{Vu0P*D-s`^Z`+HsA@BO*%KkxJIZqD-Pjc5P> zPl@7ww+vD;V-pgVB!UPfx)K54cDC$Vp!DyM>Eh`M00~9_0H*@LcZmhh0Kf@60L(G~ zz_tJY)T4_Zc-Tt<3)8jw2k3M zzI{Xdm z{wJhNv`_BW?rv*H?VGyFf0E|YYFd?#`MGrrvQ7X7z(Dlj@|&KaU85xIs$Pnj`EmtJPb7c2RvD(&Us+Tt996m?9!a5 z1NDoinys1)x6BfXUl_UZrel(KK{vB`N+O$u2(m`r%$#o7@dL=({;CiHji!43k|QL% zCKb&(#@YsFR%U=ZIo#{`Yi;_W8Pjg%3$_mq<}D(8>RP^uzTHy2P8ZLGh0;v4KU%F$ z#_28?tA{?M&-U9W*gytMN$RW*Zz z9W;?Pk~+kQ!_v>mq>$RjLiF6T14A(EpZ`u{~T{Z;1DB^o=6il?p}WmkUOca~b?QsFM6;-$crcQGiA;l|sMjQbDa5N}Do z#z}f}lbRYYrMHe3rTJ;(BUNgYEw;#UOz-D`ba7I6owpo8<%pi=C;9pfWd^1TQaRcT zXx5cY6E>RbS=lOjA#8O%8V7n111eN#$j>>Qg(NpKVJokO`=J`WE?3jQSV|s!2wJZ& znBi_BKGKPbnvHUD%)8@yC1XqTw@e$=$W-fdOpi`CiPw9i*;WUb|01btKgt;Z1y>j1nX= zb~&p}KQZ_3st)r|*K>8dl%c#f3I%%DYL?4h3wcHqcEUkAp z&v%8psx_dUMue$vl;5njB9)E%o|WV@IW)g^%rMw5;895L2j}z~ZBp97?@PLaZ#)06 zs&Lvc}k&G3&ztexWp)BY<}DS{hohT0uw1OA4QYGp;~t z%GGwHYh>>Br5{#YtR1hw78&oh!n`056Z|y8K_vc6t zsY^AC;7Uq}6Y+0FCe-ghie|FsDEB5-u9>qS%|($ z{(QWb5?N7}zz@I&3}z0oMcX)E!A7Yy(!?5T(C&Jgzq6f7X;b+W?9|Zs{ApIfnQ-Qt z(rQ=LgFvxY3Cd;nB z; Date: Sun, 28 Apr 2024 14:36:06 -0700 Subject: [PATCH 02/12] Added favicon to html --- _layouts/default.html | 1 + 1 file changed, 1 insertion(+) diff --git a/_layouts/default.html b/_layouts/default.html index 8c3201301..c5f256faf 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -11,6 +11,7 @@ + {% include head-custom.html %} From 9008789e84e6f592bbabca1dafb4f22cfe64dc5f Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Sun, 28 Apr 2024 15:32:46 -0700 Subject: [PATCH 03/12] added new template --- .github/ISSUE_TEMPLATE/issue.yml | 34 ++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/issue.yml diff --git a/.github/ISSUE_TEMPLATE/issue.yml b/.github/ISSUE_TEMPLATE/issue.yml new file mode 100644 index 000000000..650b4467d --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue.yml @@ -0,0 +1,34 @@ +name: Question or bug repot +description: Submit a question or bug report to help us improve aider +labels: +body: + - type: markdown + attributes: + - type: textarea + attributes: + label: Issue + description: Please describe your problem or question. + validations: + required: true + value: | + When asking questions or reporting issues, it is very helpful if you can include: + + - Aider version + - Model being used (`gpt-4-xxx`, etc) + - Other switches or config settings that are active + + The easiest way to do this is just just copy & paste the announcement lines that aider prints when you launch it, like these: + + ``` + Aider v0.21.2-dev + Model: gpt-4-0613 using diff edit format + Git repo: .git with 134 files + Repo-map: using 1024 tokens + Use /help to see in-chat commands, run with --help to see cmd line args + ``` + - type: textarea + attributes: + label: Version and model info + description: Please include the aider version, model name and other config/switches in effect. + validations: + required: false \ No newline at end of file From 58b5a379430bf19d5309e1fdb89b589feb1c6d6a Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Sun, 28 Apr 2024 15:34:59 -0700 Subject: [PATCH 04/12] fix --- .github/ISSUE_TEMPLATE/issue.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/issue.yml b/.github/ISSUE_TEMPLATE/issue.yml index 650b4467d..fad178f72 100644 --- a/.github/ISSUE_TEMPLATE/issue.yml +++ b/.github/ISSUE_TEMPLATE/issue.yml @@ -1,15 +1,15 @@ name: Question or bug repot description: Submit a question or bug report to help us improve aider -labels: +labels: [] body: - - type: markdown - attributes: - type: textarea attributes: label: Issue description: Please describe your problem or question. validations: required: true + - type: markdown + attributes: value: | When asking questions or reporting issues, it is very helpful if you can include: From 2a116eac6d3327da4ab1e9328223b3c4317daaae Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Sun, 28 Apr 2024 15:36:43 -0700 Subject: [PATCH 05/12] copy --- .github/ISSUE_TEMPLATE/issue.yml | 2 +- .github/ISSUE_TEMPLATE/new_issue.md | 24 ------------------------ 2 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/new_issue.md diff --git a/.github/ISSUE_TEMPLATE/issue.yml b/.github/ISSUE_TEMPLATE/issue.yml index fad178f72..a965cc14f 100644 --- a/.github/ISSUE_TEMPLATE/issue.yml +++ b/.github/ISSUE_TEMPLATE/issue.yml @@ -1,4 +1,4 @@ -name: Question or bug repot +name: Question or bug report description: Submit a question or bug report to help us improve aider labels: [] body: diff --git a/.github/ISSUE_TEMPLATE/new_issue.md b/.github/ISSUE_TEMPLATE/new_issue.md deleted file mode 100644 index 7f525dc47..000000000 --- a/.github/ISSUE_TEMPLATE/new_issue.md +++ /dev/null @@ -1,24 +0,0 @@ ---- -name: New issue -about: Ask a question or report a bug -title: '' -labels: '' -assignees: '' - ---- - -When asking questions or reporting issues, it is very helpful if you can include: - -- Aider version -- Model being used (`gpt-4-xxx`, etc) -- Other switches or config settings that are active - -The easiest way to do this is just just copy & paste the announcement lines that aider prints when you launch it, like these: - -``` -Aider v0.21.2-dev -Model: gpt-4-0613 using diff edit format -Git repo: .git with 134 files -Repo-map: using 1024 tokens -Use /help to see in-chat commands, run with --help to see cmd line args -``` From 7114eb55b0ded2e10d8646921dcdef8208c6c8f5 Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Sun, 28 Apr 2024 15:39:03 -0700 Subject: [PATCH 06/12] copy --- .github/ISSUE_TEMPLATE/issue.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/issue.yml b/.github/ISSUE_TEMPLATE/issue.yml index a965cc14f..2d1f17305 100644 --- a/.github/ISSUE_TEMPLATE/issue.yml +++ b/.github/ISSUE_TEMPLATE/issue.yml @@ -8,9 +8,11 @@ body: description: Please describe your problem or question. validations: required: true - - type: markdown + - type: textarea attributes: - value: | + label: Version and model info + description: Please include the aider version, model name and other config/switches in effect. + placeholder: | When asking questions or reporting issues, it is very helpful if you can include: - Aider version @@ -26,9 +28,5 @@ body: Repo-map: using 1024 tokens Use /help to see in-chat commands, run with --help to see cmd line args ``` - - type: textarea - attributes: - label: Version and model info - description: Please include the aider version, model name and other config/switches in effect. validations: required: false \ No newline at end of file From 0689d89e87813703d0e5ec83eeaff7f333b6d55c Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Sun, 28 Apr 2024 15:41:10 -0700 Subject: [PATCH 07/12] copy --- .github/ISSUE_TEMPLATE/issue.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/issue.yml b/.github/ISSUE_TEMPLATE/issue.yml index 2d1f17305..680f65ff1 100644 --- a/.github/ISSUE_TEMPLATE/issue.yml +++ b/.github/ISSUE_TEMPLATE/issue.yml @@ -13,20 +13,11 @@ body: label: Version and model info description: Please include the aider version, model name and other config/switches in effect. placeholder: | - When asking questions or reporting issues, it is very helpful if you can include: - - - Aider version - - Model being used (`gpt-4-xxx`, etc) - - Other switches or config settings that are active - - The easiest way to do this is just just copy & paste the announcement lines that aider prints when you launch it, like these: - - ``` + Please include aider version, model being used (`gpt-4-xxx`, etc) and any other switches or config settings that are active. Just copy & paste these lines from aider's output: + Aider v0.21.2-dev Model: gpt-4-0613 using diff edit format Git repo: .git with 134 files Repo-map: using 1024 tokens - Use /help to see in-chat commands, run with --help to see cmd line args - ``` validations: required: false \ No newline at end of file From b2acaae882698c09aba0020720a060f86f33eea0 Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Sun, 28 Apr 2024 15:42:41 -0700 Subject: [PATCH 08/12] copy --- .github/ISSUE_TEMPLATE/issue.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/issue.yml b/.github/ISSUE_TEMPLATE/issue.yml index 680f65ff1..097fbc102 100644 --- a/.github/ISSUE_TEMPLATE/issue.yml +++ b/.github/ISSUE_TEMPLATE/issue.yml @@ -11,10 +11,8 @@ body: - type: textarea attributes: label: Version and model info - description: Please include the aider version, model name and other config/switches in effect. - placeholder: | - Please include aider version, model being used (`gpt-4-xxx`, etc) and any other switches or config settings that are active. Just copy & paste these lines from aider's output: - + description: Please include aider version, model being used (`gpt-4-xxx`, etc) and any other switches or config settings that are active. + placeholder: | Aider v0.21.2-dev Model: gpt-4-0613 using diff edit format Git repo: .git with 134 files From 821dd1e18af0b72c30482207c7c4d18b81ee237c Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Sun, 28 Apr 2024 17:08:17 -0700 Subject: [PATCH 09/12] copy --- docs/llms.md | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/docs/llms.md b/docs/llms.md index b85dc3ede..861e39bf9 100644 --- a/docs/llms.md +++ b/docs/llms.md @@ -224,16 +224,26 @@ when working with models that aider is not familiar with. Aider can connect to local Ollama models. ``` +# Pull the model +ollama pull + # Start your ollama server ollama serve # In another terminal window: export OLLAMA_API_BASE=http://127.0.0.1:11434 aider --model ollama/ -``` -The Llama3 70B model works well with aider. -Give aider the `--edit-format diff` switch if you're working with it. +### +# +# llama3:70b works very well with aider +# +ollama pull llama3:70b +ollama serve +# ...in another terminal window: +export OLLAMA_API_BASE=http://127.0.0.1:11434 +aider --model ollama/llama3:70b +``` Also see the [model warnings](#model-warnings) section for information on warnings which will occur From f8b51ea2df6f8b8908dec7f4eeffffd6294e0738 Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Sun, 28 Apr 2024 17:12:23 -0700 Subject: [PATCH 10/12] copy --- docs/llms.md | 76 +++++++++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 34 deletions(-) diff --git a/docs/llms.md b/docs/llms.md index 861e39bf9..e531c7a1d 100644 --- a/docs/llms.md +++ b/docs/llms.md @@ -42,8 +42,8 @@ So you should expect that models which are less capable than GPT-3.5 may struggl - [Cohere](#cohere) - [Azure](#azure) - [OpenRouter](#openrouter) -- [OpenAI compatible APIs](#openai-compatible-apis) - [Ollama](#ollama) +- [OpenAI compatible APIs](#openai-compatible-apis) - [Other LLMs](#other-llms) - [Model warnings](#model-warnings) - [Editing format](#editing-format) @@ -190,9 +190,6 @@ You'll need an [OpenRouter API key](https://openrouter.ai/keys). pip install aider-chat export OPENROUTER_API_KEY= -# Llama3 70B instruct -aider --model openrouter/meta-llama/llama-3-70b-instruct - # Or any other open router model aider --model openrouter// @@ -200,6 +197,47 @@ aider --model openrouter// aider --models openrouter/ ``` +In particular, Llama3 70B works well with aider: + +``` +# Llama3 70B instruct +aider --model openrouter/meta-llama/llama-3-70b-instruct +``` + + +## Ollama + +Aider can connect to local Ollama models. + +``` +# Pull the model +ollama pull + +# Start your ollama server +ollama serve + +# In another terminal window +export OLLAMA_API_BASE=http://127.0.0.1:11434 +aider --model ollama/ +``` + +In particular, `llama3:70b` works very well with aider + + +``` +ollama pull llama3:70b +ollama serve + +# ...in another terminal window... +export OLLAMA_API_BASE=http://127.0.0.1:11434 +aider --model ollama/llama3:70b +``` + +Also see the [model warnings](#model-warnings) +section for information on warnings which will occur +when working with models that aider is not familiar with. + + ## OpenAI compatible APIs Aider can connect to any LLM which is accessible via an OpenAI compatible API endpoint. @@ -219,36 +257,6 @@ See the [model warnings](#model-warnings) section for information on warnings which will occur when working with models that aider is not familiar with. -## Ollama - -Aider can connect to local Ollama models. - -``` -# Pull the model -ollama pull - -# Start your ollama server -ollama serve - -# In another terminal window: -export OLLAMA_API_BASE=http://127.0.0.1:11434 -aider --model ollama/ - -### -# -# llama3:70b works very well with aider -# -ollama pull llama3:70b -ollama serve -# ...in another terminal window: -export OLLAMA_API_BASE=http://127.0.0.1:11434 -aider --model ollama/llama3:70b -``` - -Also see the [model warnings](#model-warnings) -section for information on warnings which will occur -when working with models that aider is not familiar with. - ## Other LLMs Aider uses the [litellm](https://docs.litellm.ai/docs/providers) package From dd9da6ef6a62a836638306540dce2ec37b03292e Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Sun, 28 Apr 2024 17:31:30 -0700 Subject: [PATCH 11/12] copy --- docs/llms.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/llms.md b/docs/llms.md index e531c7a1d..b95cc471e 100644 --- a/docs/llms.md +++ b/docs/llms.md @@ -197,7 +197,7 @@ aider --model openrouter// aider --models openrouter/ ``` -In particular, Llama3 70B works well with aider: +In particular, Llama3 70B works well with aider, at low cost: ``` # Llama3 70B instruct @@ -221,7 +221,7 @@ export OLLAMA_API_BASE=http://127.0.0.1:11434 aider --model ollama/ ``` -In particular, `llama3:70b` works very well with aider +In particular, `llama3:70b` works very well with aider: ``` From 8a9005eed19417c59aa9432436ea8cb5e04bbb11 Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Sun, 28 Apr 2024 17:36:58 -0700 Subject: [PATCH 12/12] copy --- docs/llms.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/llms.md b/docs/llms.md index b95cc471e..d1adf0149 100644 --- a/docs/llms.md +++ b/docs/llms.md @@ -200,7 +200,8 @@ aider --models openrouter/ In particular, Llama3 70B works well with aider, at low cost: ``` -# Llama3 70B instruct +pip install aider-chat +export OPENROUTER_API_KEY= aider --model openrouter/meta-llama/llama-3-70b-instruct ``` @@ -217,6 +218,7 @@ ollama pull ollama serve # In another terminal window +pip install aider-chat export OLLAMA_API_BASE=http://127.0.0.1:11434 aider --model ollama/ ```