dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-25 23:05:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

better

Browse source
This commit is contained in:
Paul Gauthier 2024-04-26 06:11:56 -07:00
parent 6ebfd15a71
commit 7a6bce381e
2 changed files with 253 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

4
aider/coders/wholefile_prompts.py
View file

@ -18,14 +18,14 @@ Once you understand the request you MUST:
You MUST use this *file listing* format: You MUST use this *file listing* format:
path/to/filename.js path/to/filename.js
{fence[0]} {fence[0]}javascript
// entire file content ... // entire file content ...
// ... goes in between // ... goes in between
{fence[1]} {fence[1]}
Every *file listing* MUST use this format: Every *file listing* MUST use this format:
- First line: the filename with any originally provided path - First line: the filename with any originally provided path
- Second line: opening {fence[0]} - Second line: opening {fence[0]} including the code language
- ... entire content of the file ... - ... entire content of the file ...
- Final line: closing {fence[1]} - Final line: closing {fence[1]}

332
aider/gui.py
View file

@ -1,27 +1,70 @@
#!/usr/bin/env python #!/usr/bin/env python
import os import os
import random
import sys import sys
from pathlib import Path from pathlib import Path
from collections import defaultdict
from aider.dump import dump
import streamlit as st import streamlit as st
from st_row_buttons import st_row_buttons
from aider.dump import dump
from aider.coders import Coder
from aider.models import Model
from streamlit_file_browser import st_file_browser from streamlit_file_browser import st_file_browser
from streamlit_searchbox import st_searchbox from streamlit_searchbox import st_searchbox
from st_row_buttons import st_row_buttons
from aider.coders import Coder
from aider.dump import dump
from aider.models import Model
if 'recent_msgs_num' not in st.session_state: if "recent_msgs_num" not in st.session_state:
st.session_state.recent_msgs_num = 0 st.session_state.recent_msgs_num = 0
recent_msgs_label = "Recent chat messages" chat_controls = None
diff = Path("aider/tmp.diff").read_text()
def mock_tool_output():
global chat_controls
messages = """Commit `33a242c`: Added sample python that highlights language features \nApplied edit to new_program.py"""
messages = """Applied edit to new_program.py"""
# st.info(messages)
if chat_controls:
chat_controls.empty()
chat_controls = st.empty()
with chat_controls:
container = st.container()
with container:
# cols = st.columns([0.8,0.2])
# with cols[0]:
# with st.expander(messages):
# diff = Path("aider/tmp.diff").read_text()
# st.code(diff, language="diff")
with st.expander(
f"Commit `33a242c`: Added sample python that highlights language features \n{messages}"
):
# st.info(messages)
st.code(diff, language="diff")
st.button(
"Undo commit `33a242c`",
key=random.random(),
help="wtf?",
)
if False:
st.button("Allow edits to `foobar.py`", key=random.random(), help="??")
st.button("Allow creation of new file `some/new/file.js`", key=random.random())
st.button("Add `baz/foo.py` to the chat", key=random.random())
# st.toggle("Show diffs", key=random.random())
# st.toggle("Undo this commit `33a242c`", key=random.random(), help="?")
# cost = random.random() * 0.003 + 0.001
# st.caption(f"${cost:0.4f} to send the next message", help="# header\n- list\n- list\n")
def recent_msgs(): def recent_msgs():
msgs = [ msgs = [
"write a python program that shows off some python features", "write a python program that shows off some python features",
@ -29,16 +72,20 @@ def recent_msgs():
"refactor the Frobulator.simplify method to be a stand alone function", "refactor the Frobulator.simplify method to be a stand alone function",
"lorem ipsum dolor", "lorem ipsum dolor",
"lorem adipiscing adipiscing et dolore sit elit aliqua dolore ut incididunt", "lorem adipiscing adipiscing et dolore sit elit aliqua dolore ut incididunt",
"sed magna consectetur et quis do magna labore ad elit et elit ad eiusmod sed labore aliqua eiusmod enim ad nostrud\n\namet consectetur magna tempor do enim aliqua enim tempor adipiscing sit et" (
"sed magna consectetur et quis do magna labore ad elit et elit ad eiusmod sed labore"
" aliqua eiusmod enim ad nostrud\n\namet consectetur magna tempor do enim aliqua enim"
" tempor adipiscing sit et"
),
] ]
msgs = 30 * msgs msgs = 30 * msgs
return st.selectbox( return st.selectbox(
recent_msgs_label, "N/A",
msgs, msgs,
placeholder = "Recent chat messages", placeholder="Resend recent chat message",
label_visibility = "collapsed", label_visibility="collapsed",
index = None, index=None,
key=f"recent_msgs_{st.session_state.recent_msgs_num}", key=f"recent_msgs_{st.session_state.recent_msgs_num}",
) )
@ -50,58 +97,156 @@ def search(text=None):
path = os.path.join(root, file) path = os.path.join(root, file)
if not text or text in path: if not text or text in path:
results.append(path) results.append(path)
#dump(results) # dump(results)
return results return results
#selected_value = st_searchbox(search)
# selected_value = st_searchbox(search)
model = Model("gpt-3.5-turbo", weak_model="gpt-3.5-turbo") model = Model("claude-3-haiku-20240307")
fnames = ["greeting.py"] fnames = ["greeting.py"]
coder = Coder.create(main_model=model, fnames=fnames, use_git=False) coder = Coder.create(main_model=model, fnames=fnames, use_git=False, pretty=False)
import random import random
lorem_words = [ lorem_words = [
"lorem", "ipsum", "dolor", "sit", "amet", "consectetur", "lorem",
"adipiscing", "elit", "sed", "do", "eiusmod", "tempor", "ipsum",
"incididunt", "ut", "labore", "et", "dolore", "magna", "dolor",
"aliqua", "enim", "ad", "minim", "veniam", "quis", "nostrud" "sit",
"lorem", "ipsum", "dolor", "sit", "amet", "consectetur", "amet",
"adipiscing", "elit", "sed", "do", "eiusmod", "tempor", "consectetur",
"incididunt", "ut", "labore", "et", "dolore", "magna", "adipiscing",
"aliqua", "enim", "ad", "minim", "veniam", "quis", "nostrud" "elit",
"lorem", "ipsum", "dolor", "sit", "amet", "consectetur", "sed",
"adipiscing", "elit", "sed", "do", "eiusmod", "tempor", "do",
"incididunt", "ut", "labore", "et", "dolore", "magna", "eiusmod",
"aliqua", "enim", "ad", "minim", "veniam", "quis", "nostrud" "tempor",
"lorem", "ipsum", "dolor", "sit", "amet", "consectetur", "incididunt",
"adipiscing", "elit", "sed", "do", "eiusmod", "tempor", "ut",
"incididunt", "ut", "labore", "et", "dolore", "magna", "labore",
"aliqua", "enim", "ad", "minim", "veniam", "quis", "nostrud" "et",
"\n\n", "dolore",
"magna",
"aliqua",
"enim",
"ad",
"minim",
"veniam",
"quis",
"nostrudlorem",
"ipsum",
"dolor",
"sit",
"amet",
"consectetur",
"adipiscing",
"elit",
"sed",
"do",
"eiusmod",
"tempor",
"incididunt",
"ut",
"labore",
"et",
"dolore",
"magna",
"aliqua",
"enim",
"ad",
"minim",
"veniam",
"quis",
"nostrudlorem",
"ipsum",
"dolor",
"sit",
"amet",
"consectetur",
"adipiscing",
"elit",
"sed",
"do",
"eiusmod",
"tempor",
"incididunt",
"ut",
"labore",
"et",
"dolore",
"magna",
"aliqua",
"enim",
"ad",
"minim",
"veniam",
"quis",
"nostrudlorem",
"ipsum",
"dolor",
"sit",
"amet",
"consectetur",
"adipiscing",
"elit",
"sed",
"do",
"eiusmod",
"tempor",
"incididunt",
"ut",
"labore",
"et",
"dolore",
"magna",
"aliqua",
"enim",
"ad",
"minim",
"veniam",
"quis",
"nostrud\n\n",
"\n\n", "\n\n",
"\n\n", "\n\n",
] ]
def generate_lorem_text(min_words=10, max_words=50): def generate_lorem_text(min_words=10, max_words=50):
num_words = random.randint(min_words, max_words) num_words = random.randint(min_words, max_words)
words = random.sample(lorem_words, num_words) words = random.sample(lorem_words, num_words)
return " ".join(words) return " ".join(words)
with st.sidebar: with st.sidebar:
st.header("Aider") st.title("Aider")
cmds_tab, settings_tab = st.tabs(["Commands", "Settings"]) cmds_tab, settings_tab = st.tabs(["Commands", "Settings"])
with cmds_tab: with cmds_tab:
with st.expander("Recommended actions", expanded=True):
with st.popover("Create a git repo to track changes"):
st.write(
"Aider works best when your code is stored in a git repo. \n[See the FAQ for more"
" info](https://aider.chat/docs/faq.html#how-does-aider-use-git)"
)
st.button("Create git repo", key=random.random(), help="?")
with st.popover("Update your `.gitignore` file"):
st.write("It's best to keep aider's internal files out of your git repo.")
st.button("Add `.aider*` to `.gitignore`", key=random.random(), help="?")
with st.expander("Add to the chat", expanded=True): with st.expander("Add to the chat", expanded=True):
st.multiselect( st.multiselect(
"Files for the LLM to edit", "Files for the LLM to edit",
search(), search(),
default=["aider/main.py","aider/io.py"], default=["aider/main.py", "aider/io.py"],
help="Only add the files that need to be *edited* for the task you are working in. Aider will pull in other code to provide relevant context to the LLM.", help=(
"Only add the files that need to be *edited* for the task you are working on. Aider"
" will pull in other code to provide relevant context to the LLM."
),
) )
with st.popover("Add web page"): with st.popover("Add web page"):
st.markdown("www") st.markdown("www")
@ -109,46 +254,62 @@ with cmds_tab:
with st.popover("Add image"): with st.popover("Add image"):
st.markdown("Hello World 👋") st.markdown("Hello World 👋")
st.file_uploader("Image file") st.file_uploader("Image file")
with st.popover("Run shell command"): with st.popover("Run shell commands, tests, etc"):
st.markdown("## Run a shell command and share the output with aider") st.markdown(
name = st.text_input("Cmd") "Run a shell command and optionally share the output with the LLM. This is a great"
st.selectbox("Recent commands", [ " way to run your program or run tests and have the LLM fix bugs."
"my_app.py --doit", )
"my_app.py --cleanup", name = st.text_input("Command:")
]) st.radio(
"Share the command output with the LLM?",
[
"Review the output and decide whether to share",
"Automatically share the output on non-zero exit code (ie, if any tests fail)",
],
)
st.selectbox(
"Recent commands",
[
"my_app.py --doit",
"my_app.py --cleanup",
],
)
with st.popover("Run test command"): with st.expander("Tokens and costs", expanded=True):
st.markdown("Hello World 👋") with st.popover("Show token usage"):
name = st.text_input("Test") st.write("hi")
with st.expander("Costs and context", expanded=True):
st.button("Show token usage")
st.button("Clear chat history") st.button("Clear chat history")
st.metric("Per message context cost", "$0.0013", help="foo") # st.metric("Cost of last message send & reply", "$0.0019", help="foo")
# st.metric("Cost to send next message", "$0.0013", help="foo")
st.metric("Total cost this session", "$0.22") st.metric("Total cost this session", "$0.22")
with st.expander("Git", expanded=False):
with st.expander("Git", expanded=True): # st.button("Show last diff")
st.button("Show last diff") # st.button("Undo last commit")
st.button("Undo last commit") st.button("Commit any pending changes")
st.button("Commit pending changes")
with st.popover("Run git command"): with st.popover("Run git command"):
st.markdown("## Run git command") st.markdown("## Run git command")
name = st.text_input("git", value="git ") name = st.text_input("git", value="git ")
st.button("Run") st.button("Run")
st.selectbox("Recent git commands", [ st.selectbox(
"git checkout -b experiment", "Recent git commands",
"git stash", [
]) "git checkout -b experiment",
"git stash",
],
)
recent_msgs_empty = st.empty()
# chat_tab, settings_tab = st.tabs(["Chat", "Settings"])
#chat_tab, settings_tab = st.tabs(["Chat", "Settings"])
messages = st.container() messages = st.container()
messages.container(height = 1200, border=False)
recent_msgs_empty = st.empty() # stuff a bunch of vertical whitespace at the top
# to get all the chat text to the bottom
messages.container(height=1200, border=False)
with recent_msgs_empty: with recent_msgs_empty:
old_prompt = recent_msgs() old_prompt = recent_msgs()
@ -158,22 +319,24 @@ if "messages" not in st.session_state:
for msg in st.session_state.messages: for msg in st.session_state.messages:
messages.chat_message(msg["role"]).write(msg["content"]) with messages.chat_message(msg["role"]):
st.write(msg["content"])
cost = random.random() * 0.003 + 0.001
st.caption(f"${cost:0.4f}")
_=''' with messages:
with st.expander("Commands"): mock_tool_output()
st.markdown("## Run git command")
name = st.text_input("gitx", value="git ") # inp_empty = st.empty()
st.button("Run it")
st.selectbox("Recent chat commands", [
"git checkout -b experiment",
"git stash",
])
'''
prompt = st.chat_input("Say something") def clear_controls():
dump(old_prompt, prompt) if chat_controls:
chat_controls.empty()
prompt = st.chat_input("Say something", on_submit=clear_controls)
# dump(old_prompt, prompt)
if old_prompt: if old_prompt:
prompt = old_prompt prompt = old_prompt
@ -182,6 +345,8 @@ if old_prompt:
old_prompt = recent_msgs() old_prompt = recent_msgs()
if prompt: if prompt:
if chat_controls:
chat_controls.empty()
st.session_state.messages.append({"role": "user", "content": prompt}) st.session_state.messages.append({"role": "user", "content": prompt})
with messages.chat_message("user"): with messages.chat_message("user"):
@ -190,5 +355,10 @@ if prompt:
res = coder.run(prompt) res = coder.run(prompt)
st.session_state.messages.append({"role": "assistant", "content": res}) st.session_state.messages.append({"role": "assistant", "content": res})
with messages.chat_message("ai"): with messages.chat_message("assistant"):
st.write(res) st.write(res)
cost = random.random() * 0.003 + 0.001
st.caption(f"${cost:0.4f}")
with messages:
mock_tool_output()