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

Execute python code fix #442

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

Execute python code fix #442

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c7c942
Update exec_python.py
zyzhang1130 Sep 13, 2024
3331fa4
Update exec_python.py
zyzhang1130 Sep 13, 2024
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
28 changes: 16 additions & 12 deletions src/agentscope/service/execute_code/exec_python.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,12 @@ def _sys_execute(

sys_python_guard(maximum_memory_bytes)
output_buffer, error_buffer = io.StringIO(), io.StringIO()
exec_namespace = {} # Create a shared namespace
with timer(timeout), contextlib.redirect_stdout(
output_buffer,
), contextlib.redirect_stderr(error_buffer):
try:
exec(code)
exec(code, exec_namespace, exec_namespace) # Use the namespace
is_success = True
except Exception:
error_buffer.write(traceback.format_exc())
Expand Down Expand Up @@ -245,16 +246,20 @@ def docker_execute(

# Construct the timer context manager code
exec_code_with_timer = (
"import contextlib, signal\nfrom typing import Any, Generator, "
"Optional, Union\n"
"import contextlib, signal\n"
"from typing import Any, Generator, Optional, Union\n"
+ timer_code
+ f"\nwith timer({timeout}):\n "
+ f"\nwith timer({timeout}):\n"
)

# Construct the command to be executed inside the timer context
exec_code_with_timer = f"""{exec_code_with_timer}
exec('''{exec_code}''')
"""
# Add indentation to the exec_code
indented_exec_code = "\n".join(
" " + line for line in exec_code.splitlines()
)

# Construct the complete code to execute
exec_code_with_timer = f"""{exec_code_with_timer}{indented_exec_code}
"""

# Create a temporary file to store the commands to run
code_hash = md5(code.encode()).hexdigest()
Expand Down Expand Up @@ -285,6 +290,8 @@ def docker_execute(
volumes={os.getcwd(): {"bind": "/app", "mode": "rw"}},
working_dir="/app",
detach=True,
network_disabled=False,
mem_limit=maximum_memory_bytes,
)
wait_response = container.wait()
docker_out = container.logs(stdout=True, stderr=False).decode(
Expand Down Expand Up @@ -313,6 +320,7 @@ def docker_execute(
break
except Exception as e:
logger.error(e)
return "", str(e), False
finally:
# Clean up the temporary file
if os.path.exists(file_name):
Expand Down Expand Up @@ -340,10 +348,6 @@ def docker_execute(
)

# Step 2. Execute code and catch Import Error and re-install
run_args = {"image": image_name, "detach": True, "network_disabled": False}
if maximum_memory_bytes is not None:
run_args["mem_limit"] = maximum_memory_bytes

# Try to execute the code and retry if ImportErrors are encountered
output, error, status = docker_execute(code)

Expand Down