dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-29 16:54:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refac

Browse source
This commit is contained in:
Paul Gauthier 2024-04-26 14:23:42 -07:00
parent 3f5cdb603c
commit bf55573814
1 changed files with 195 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

381
aider/gui.py
View file

@ -2,64 +2,22 @@
import os import os
import random import random
import sys
from pathlib import Path from pathlib import Path
import streamlit as st import streamlit as st
from aider.coders import Coder from aider.coders import Coder
from aider.dump import dump # noqa: F401 from aider.dump import dump # noqa: F401
from aider.main import main from aider.main import main as cli_main
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
chat_controls = None
diff = Path("aider/tmp.diff").read_text() diff = Path("aider/tmp.diff").read_text()
def mock_tool_output():
global chat_controls
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",
@ -97,166 +55,217 @@ def search(text=None):
return results return results
# selected_value = st_searchbox(search)
@st.cache_resource @st.cache_resource
def get_coder(): def get_coder():
coder = main(return_coder=True) coder = cli_main(return_coder=True)
if isinstance(coder, Coder): if isinstance(coder, Coder):
return coder return coder
raise ValueError() raise ValueError()
coder = get_coder() class GUI:
def announce(self):
lines = self.coder.get_announcements()
lines = " \n".join(lines)
st.info(lines)
def do_sidebar(self):
with st.sidebar:
st.title("Aider")
self.cmds_tab, self.settings_tab = st.tabs(["Commands", "Settings"])
def announce(coder): def do_cmd_tab(self):
lines = coder.get_announcements() with st.expander("Recommended actions", expanded=True):
lines = " \n".join(lines) with st.popover("Create a git repo to track changes"):
st.info(lines) 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.sidebar: with st.expander("Add to the chat", expanded=True):
st.title("Aider") st.multiselect(
cmds_tab, settings_tab = st.tabs(["Commands", "Settings"]) "Files for the LLM to edit",
search(),
with cmds_tab: default=["aider/main.py", "aider/io.py"],
with st.expander("Recommended actions", expanded=True): help=(
with st.popover("Create a git repo to track changes"): "Only add the files that need to be *edited* for the task you are working on."
st.write( " Aider will pull in other code to provide relevant context to the LLM."
"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("Add web page"):
st.markdown("www")
st.text_input("URL?")
with st.popover("Add image"):
st.markdown("Hello World 👋")
st.file_uploader("Image file")
with st.popover("Run shell commands, tests, etc"):
st.markdown(
"Run a shell command and optionally share the output with the LLM. This is a"
" great way to run your program or run tests and have the LLM fix bugs."
)
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("Update your `.gitignore` file"): with st.expander("Tokens and costs", expanded=True):
st.write("It's best to keep aider's internal files out of your git repo.") with st.popover("Show token usage"):
st.button("Add `.aider*` to `.gitignore`", key=random.random(), help="?") st.write("hi")
st.button("Clear chat history")
# 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")
with st.expander("Add to the chat", expanded=True): with st.expander("Git", expanded=False):
st.multiselect( # st.button("Show last diff")
"Files for the LLM to edit", # st.button("Undo last commit")
search(), st.button("Commit any pending changes")
default=["aider/main.py", "aider/io.py"], with st.popover("Run git command"):
help=( st.markdown("## Run git command")
"Only add the files that need to be *edited* for the task you are working on. Aider" st.text_input("git", value="git ")
" will pull in other code to provide relevant context to the LLM." st.button("Run")
), st.selectbox(
) "Recent git commands",
with st.popover("Add web page"): [
st.markdown("www") "git checkout -b experiment",
name = st.text_input("URL?") "git stash",
with st.popover("Add image"): ],
st.markdown("Hello World 👋") )
st.file_uploader("Image file")
with st.popover("Run shell commands, tests, etc"):
st.markdown(
"Run a shell command and optionally share the output with the LLM. This is a great"
" way to run your program or run tests and have the LLM fix bugs."
)
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.expander("Tokens and costs", expanded=True): self.recent_msgs_empty = st.empty()
with st.popover("Show token usage"):
st.write("hi")
st.button("Clear chat history")
# 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")
with st.expander("Git", expanded=False): def do_messages_container(self):
# st.button("Show last diff") self.messages = st.container()
# st.button("Undo last commit")
st.button("Commit any pending changes")
with st.popover("Run git command"):
st.markdown("## Run git command")
name = st.text_input("git", value="git ")
st.button("Run")
st.selectbox(
"Recent git commands",
[
"git checkout -b experiment",
"git stash",
],
)
recent_msgs_empty = st.empty() # stuff a bunch of vertical whitespace at the top
# to get all the chat text to the bottom
self.messages.container(height=1200, border=False)
with self.messages:
self.announce()
with self.recent_msgs_empty:
self.old_prompt = recent_msgs()
for msg in st.session_state.messages:
with self.messages.chat_message(msg["role"]):
st.write(msg["content"])
cost = random.random() * 0.003 + 0.001
st.caption(f"${cost:0.4f}")
def mock_tool_output(self):
messages = """Applied edit to new_program.py"""
# st.info(messages)
if self.chat_controls:
self.chat_controls.empty()
self.chat_controls = st.empty()
with self.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(
"Commit `33a242c`: Added sample python that highlights language features "
f" \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())
def clear_controls(self):
if self.chat_controls:
self.chat_controls.empty()
def init_state(self):
if "messages" not in st.session_state:
st.session_state["messages"] = [{"role": "assistant", "content": "How can I help you?"}]
def __init__(self, coder):
self.coder = coder
self.chat_controls = None
self.init_state()
self.do_sidebar()
with self.cmds_tab:
self.do_cmd_tab()
self.do_messages_container()
with self.messages:
self.mock_tool_output()
self.chat()
def chat(self):
prompt = st.chat_input("Say something", on_submit=self.clear_controls)
# dump(old_prompt, prompt)
if self.old_prompt:
prompt = self.old_prompt
st.session_state.recent_msgs_num += 1
with self.recent_msgs_empty:
# do I need the assignment here?
self.old_prompt = recent_msgs()
if prompt:
self.clear_controls()
st.session_state.messages.append({"role": "user", "content": prompt})
with self.messages.chat_message("user"):
st.write(prompt)
res = self.coder.run(prompt)
st.session_state.messages.append({"role": "assistant", "content": res})
with self.messages.chat_message("assistant"):
st.write(res)
cost = random.random() * 0.003 + 0.001
st.caption(f"${cost:0.4f}")
with self.messages:
self.mock_tool_output()
# chat_tab, settings_tab = st.tabs(["Chat", "Settings"]) def gui_main():
coder = get_coder()
GUI(coder)
messages = st.container() if __name__ == "__main__":
status = gui_main()
# stuff a bunch of vertical whitespace at the top sys.exit(status)
# to get all the chat text to the bottom
messages.container(height=1200, border=False)
with messages:
announce(coder)
with recent_msgs_empty:
old_prompt = recent_msgs()
if "messages" not in st.session_state:
st.session_state["messages"] = [{"role": "assistant", "content": "How can I help you?"}]
for msg in st.session_state.messages:
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:
mock_tool_output()
# inp_empty = st.empty()
def clear_controls():
if chat_controls:
chat_controls.empty()
prompt = st.chat_input("Say something", on_submit=clear_controls)
# dump(old_prompt, prompt)
if old_prompt:
prompt = old_prompt
st.session_state.recent_msgs_num += 1
with recent_msgs_empty:
old_prompt = recent_msgs()
if prompt:
if chat_controls:
chat_controls.empty()
st.session_state.messages.append({"role": "user", "content": prompt})
with messages.chat_message("user"):
st.write(prompt)
res = coder.run(prompt)
st.session_state.messages.append({"role": "assistant", "content": res})
with messages.chat_message("assistant"):
st.write(res)
cost = random.random() * 0.003 + 0.001
st.caption(f"${cost:0.4f}")
with messages:
mock_tool_output()