Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/edit code #830

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Feature/edit code #830

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4401368
feat: allow editing of code blocks before execution
ericrallen Oct 8, 2023
e4da237
allow scanning and editing of edited code in non auto_run mode
Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
151 changes: 85 additions & 66 deletions interpreter/terminal_interface/terminal_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,77 +93,96 @@ def terminal_interface(interpreter, message):
active_block.active_line = chunk["active_line"]

# Execution notice

## break_outer_loop var is used to signal another break
## once we exit the following while-loop
break_outer_loop = False
if "executing" in chunk:
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sbendary25:feature/edit-code

if not interpreter.auto_run:
# OI is about to execute code. The user wants to approve this
while True:
if not interpreter.auto_run:
# OI is about to execute code. The user wants to approve this

# End the active block so you can run input() below it
active_block.end()

should_scan_code = False
# End the active block so you can run input() below it
active_block.end()

if not interpreter.safe_mode == "off":
if interpreter.safe_mode == "auto":
should_scan_code = True
elif interpreter.safe_mode == 'ask':
response = input(" Would you like to scan this code? (y/n)\n\n ")
print("") # <- Aesthetic choice
should_scan_code = False

if response.strip().lower() == "y":
if not interpreter.safe_mode == "off":
if interpreter.safe_mode == "auto":
should_scan_code = True

if should_scan_code:
# Get code language and actual code from the chunk
# We need to give these to semgrep when we start our scan
language = chunk["executing"]["language"]
code = chunk["executing"]["code"]

scan_code(code, language, interpreter)

response = input(" Would you like to run this code? (y/n/%edit)\n\n ")
print("") # <- Aesthetic choice

if response.strip().lower() == "%edit":
# open a code editor with this code in a temporary file
# when the user saves and exits, run the code
# Get code language and actual code from the chunk
# We need to give these to our editor to open the file
language = chunk["executing"]["language"]
code = chunk["executing"]["code"]

edited_code = edit_code(code, language, interpreter)

# Get the last message, so we can extend it with the edited code
old_message = interpreter.messages[-1]

# Remove the last message, which is the code we're about to edit
interpreter.messages = interpreter.messages[:-1]

ran_code_block = True
render_cursor = False

active_block.end()

# Add the edited code to the messages
interpreter.messages.append({
**old_message,
"code": edited_code,
})

elif response.strip().lower() == "y":
# Create a new, identical block where the code will actually be run
# Conveniently, the chunk includes everything we need to do this:
active_block = CodeBlock()
active_block.margin_top = False # <- Aesthetic choice
active_block.language = chunk["executing"]["language"]
active_block.code = chunk["executing"]["code"]
else:
# User declined to run code.
interpreter.messages.append({
"role": "user",
"message": "I have declined to run this code."
})
break
elif interpreter.safe_mode == 'ask':
response = input(" Would you like to scan this code? (y/n)\n\n ")
print("") # <- Aesthetic choice

if response.strip().lower() == "y":
should_scan_code = True

if should_scan_code:
# Get code language and actual code from the chunk
# We need to give these to semgrep when we start our scan
language = chunk["executing"]["language"]
code = chunk["executing"]["code"]

scan_code(code, language, interpreter)

response = input(" Would you like to run this code? (y/n/%edit)\n\n ")
print("") # <- Aesthetic choice

if response.strip().lower() == "%edit":
# open a code editor with this code in a temporary file
# when the user saves and exits, run the code
# Get code language and actual code from the chunk
# We need to give these to our editor to open the file
language = chunk["executing"]["language"]
code = chunk["executing"]["code"]

edited_code = edit_code(code, language, interpreter)

# Get the last message, so we can extend it with the edited code
old_message = interpreter.messages[-1]

# Remove the last message, which is the code we're about to edit
interpreter.messages = interpreter.messages[:-1]

ran_code_block = False
render_cursor = False

chunk["executing"]["code"] = edited_code

active_block.end()
active_block = CodeBlock()
active_block.language = chunk["executing"]["language"]
active_block.code = edited_code
active_block.end()

interpreter.messages.append({
**old_message,
"code": edited_code
})


continue

elif response.strip().lower() == "y":
# Create a new, identical block where the code will actually be run
# Conveniently, the chunk includes everything we need to do this:
active_block = CodeBlock()
active_block.margin_top = False # <- Aesthetic choice
active_block.language = chunk["executing"]["language"]
active_block.code = chunk["executing"]["code"]
break
else:
# User declined to run code.
interpreter.messages.append({
"role": "user",
"message": "I have declined to run this code."
})
## need to break twice since goal is to exit nested while-loop
## and parent for-loop and return to interactive input.
break_outer_loop = True
break
if break_outer_loop:
break

# Output
if "output" in chunk:
Expand Down