andre/crewAI
1
0
Fork 0
mirror of https://github.com/crewAIInc/crewAI.git synced 2026-01-09 16:18:30 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #95 from crewAIInc/feat/update-code-interpreter

Browse Source 
feat: Add volume option
This commit is contained in:
João Moura
2024-08-27 07:25:29 -07:00
committed by GitHub
parent 859e6162e8 d146e4a961
commit 91c394ffce
2 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/crewai_tools/tools/code_interpreter_tool/README.md
View File

@@ -27,3 +27,14 @@ Agent(
tools=[CodeInterpreterTool()],
)
```
Or if you need to pass your own Dockerfile just do this
```python
from crewai_tools import CodeInterpreterTool
Agent(
...
tools=[CodeInterpreterTool(user_dockerfile_path="<Dockerfile_path>")],
)
```

40
src/crewai_tools/tools/code_interpreter_tool/code_interpreter_tool.py
View File

@@ -25,7 +25,9 @@ class CodeInterpreterTool(BaseTool):
name: str = "Code Interpreter"
description: str = "Interprets Python3 code strings with a final print statement."
args_schema: Type[BaseModel] = CodeInterpreterSchema
default_image_tag: str = "code-interpreter:latest"
code: Optional[str] = None
user_dockerfile_path: Optional[str] = None
@staticmethod
def _get_installed_package_path():
@@ -34,23 +36,29 @@ class CodeInterpreterTool(BaseTool):
def _verify_docker_image(self) -> None:
"""
Verify if the Docker image is available
Verify if the Docker image is available. Optionally use a user-provided Dockerfile.
"""
image_tag = "code-interpreter:latest"
client = docker.from_env()
try:
client.images.get(image_tag)
client.images.get(self.default_image_tag)
except docker.errors.ImageNotFound:
package_path = self._get_installed_package_path()
dockerfile_path = os.path.join(package_path, "tools/code_interpreter_tool")
if not os.path.exists(dockerfile_path):
raise FileNotFoundError(f"Dockerfile not found in {dockerfile_path}")
if self.user_dockerfile_path and os.path.exists(self.user_dockerfile_path):
dockerfile_path = self.user_dockerfile_path
else:
package_path = self._get_installed_package_path()
dockerfile_path = os.path.join(
package_path, "tools/code_interpreter_tool"
)
if not os.path.exists(dockerfile_path):
raise FileNotFoundError(
f"Dockerfile not found in {dockerfile_path}"
)
client.images.build(
path=dockerfile_path,
tag=image_tag,
tag=self.default_image_tag,
rm=True,
)
@@ -69,13 +77,25 @@ class CodeInterpreterTool(BaseTool):
container.exec_run(f"pip install {library}")
def _init_docker_container(self) -> docker.models.containers.Container:
container_name = "code-interpreter"
client = docker.from_env()
current_path = os.getcwd()
# Check if the container is already running
try:
existing_container = client.containers.get(container_name)
existing_container.stop()
existing_container.remove()
except docker.errors.NotFound:
pass # Container does not exist, no need to remove
return client.containers.run(
"code-interpreter",
self.default_image_tag,
detach=True,
tty=True,
working_dir="/workspace",
name="code-interpreter",
name=container_name,
volumes={current_path: {"bind": "/workspace", "mode": "rw"}}, # type: ignore
)
def run_code_in_docker(self, code: str, libraries_used: List[str]) -> str: