pre-commit

Author: justinchiu-cohere

commit0/harness/modal_utils.py

@@ -1,15 +1,15 @@
-""" Modal utility functions
+"""Modal utility functions
 
 A mirror of the docker utility functions.
 """
 
 import modal
 import os
+from pathlib import Path
 
-from commit0.harness.docker_utils import HEREDOC_DELIMITER
 
-
-def create_sandbox(image: modal.Image, nfs: model.NetworkFileSystem) -> modal.Sandbox:
+def create_sandbox(image: modal.Image, nfs: modal.NetworkFileSystem) -> modal.Sandbox:
+    """Create modal sandbox"""
     return modal.Sandbox.create(
         "sleep",
         "infinity",
@@ -20,7 +20,10 @@ def create_sandbox(image: modal.Image, nfs: model.NetworkFileSystem) -> modal.Sa
     )
 
 
-def execute_command(sandbox: modal.Sandbox, command: str, timeout=) -> tuple[str,str]:
+def execute_command(
+    sandbox: modal.Sandbox, command: str, timeout: int = 90
+) -> tuple[str, str]:
+    """Execute command on modal sandbox"""
     process = sandbox.exec("bash", "-c", command)
     stdout = []
     for line in process.stdout:
@@ -31,21 +34,27 @@ def execute_command(sandbox: modal.Sandbox, command: str, timeout=) -> tuple[str
     return "\n".join(stdout), "\n".join(stderr)
 
 
-def copy_file_to_sandbox(sandbox: modal.Sandbox, nfs: modal.NetworkFileSystem, src: Path, dst: Path) -> None:
+def copy_file_to_sandbox(
+    sandbox: modal.Sandbox, nfs: modal.NetworkFileSystem, src: Path, dst: Path
+) -> None:
+    """Copy file to modal sandbox"""
     with src.open("rb") as f:
         nfs.write_file(str(src), f)
     sandbox.exec("bash", "-c", f"cp /vol/{str(src)} {str(dst)}")
 
 
 def copy_from_sandbox(sandbox: modal.Sandbox, src: Path, dst: Path) -> None:
+    """Copy file from sandbox"""
     pass
 
 
 def delete_file_from_sandbox(sandbox: modal.Sandbox, file_path: str) -> None:
+    """Delete file on sandbox"""
     pass
 
 
 def copy_ssh_pubkey_from_sandbox(sandbox: modal.Sandbox) -> None:
+    """Copy SSH public key from sandbox"""
     process = sandbox.exec("bash", "-c", "cat /root/.ssh/id_rsa.pub")
     public_key = "".join([line for line in process.stdout]).strip()
 
@@ -69,4 +78,5 @@ def copy_ssh_pubkey_from_sandbox(sandbox: modal.Sandbox) -> None:
 
 
 def write_to_sandbox(sandbox: modal.Sandbox, data: str, dst: Path) -> None:
+    """Write file to sandbox"""
     pass

commit0/harness/run_pytest_ids.py

@@ -1,7 +1,6 @@
 from datasets import load_dataset
 import docker
 from enum import StrEnum, auto
-import os
 import traceback
 from pathlib import Path
 import logging
@@ -40,7 +39,7 @@ class ExecutionBackend(StrEnum):
 def run_docker(
     spec: Spec, logger: logging.Logger, eval_file: Path, timeout: int, log_dir: Path
 ) -> None:
-    """ Runs the tests in a local docker container.
+    """Runs the tests in a local docker container.
 
     1. Creates docker container.
     2. Copies ssh public key from container to local machine.
@@ -115,7 +114,7 @@ def run_docker(
 def run_modal(
     spec: Spec, logger: logging.Logger, eval_file: Path, timeout: int, log_dir: Path
 ) -> None:
-    """ Runs the tests in a remote Modal container.
+    """Runs the tests in a remote Modal container.
 
     1. Creates modal container.
     2. Copies ssh public key from container to local machine.
@@ -126,11 +125,9 @@ def run_modal(
     import modal
     from commit0.harness.modal_utils import (
         create_sandbox,
-        copy_to_sandbox,
-        copy_from_sandbox,
-        delete_file_from_sandbox,
         copy_ssh_pubkey_from_sandbox,
-        write_to_sandbox,
+        copy_file_to_sandbox,
+        execute_command,
     )
 
     # the image must exist on dockerhub
@@ -147,10 +144,10 @@ def run_modal(
         copy_file_to_sandbox(sandbox, nfs, eval_file, Path("/eval.sh"))
 
         # DBG: check if eval file properly copied
-        print(execute_command("ls /")[0])
+        print(execute_command(sandbox, "ls /")[0])
 
         # execute tests
-        output, error = execute_command("/bin/bash /eval.sh")
+        output, error = execute_command(sandbox, "/bin/bash /eval.sh")
         print(output)
         print(error)
 
@@ -183,7 +180,7 @@ def main(
     backend: str,
     timeout: int,
 ) -> None:
-    """ Runs the pytests for repos in a dataset.
+    """Runs the pytests for repos in a dataset.
 
     Tests are run either locally through docker
     or remotely through Modal.