pyright

Author: justinchiu-cohere

commit0/harness/execution_context.py

@@ -4,14 +4,19 @@
 and HTTP servers.
 """
 
-from abc import ABC
+from abc import ABC, abstractmethod
 import docker
 import logging
 import os
 import modal
 from pathlib import Path
+from typing import Optional, Type
+from types import TracebackType
 
 from commit0.harness.spec import Spec
+from commit0.harness.utils import (
+    EvaluationError,
+)
 from commit0.harness.docker_build import (
     close_logger,
 )
@@ -27,6 +32,7 @@
 
 
 def read_stream(stream: modal.io_streams.StreamReader) -> str:
+    """Read stream"""
     strings = []
     for line in stream:
         strings.append(line)
@@ -53,33 +59,46 @@ def __init__(
         self.timeout = timeout
         self.log_dir = log_dir
 
+    @abstractmethod
     def copy_ssh_pubkey_from_remote(self) -> None:
+        """Copy"""
         raise NotImplementedError
 
+    @abstractmethod
     def copy_to_remote(self, local_path: Path, remote_path: Path) -> None:
+        """Copy"""
         raise NotImplementedError
 
+    @abstractmethod
     def exec_run_with_timeout(self, command: str, timeout: int) -> None:
+        """Exec"""
         raise NotImplementedError
 
+    @abstractmethod
     def exec_run(self, command: str) -> None:
+        """Exec"""
         raise NotImplementedError
 
+    @abstractmethod
     def copy_from_remote(self, remote_path: Path, local_path: Path) -> None:
+        """Copy"""
         raise NotImplementedError
 
+    @abstractmethod
     def delete_file_from_remote(self, remote_path: Path) -> None:
+        """Delete"""
         raise NotImplementedError
 
-    def write_test_output(self, test_output, timed_out):
+    def write_test_output(self, test_output: str, timed_out: bool) -> None:
+        """Write test output"""
         test_output_path = self.log_dir / "test_output.txt"
         with open(test_output_path, "w") as f:
             f.write(test_output)
             if timed_out:
-                f.write(f"\n\nTimeout error: {timeout} seconds exceeded.")
+                f.write(f"\n\nTimeout error: {self.timeout} seconds exceeded.")
                 raise EvaluationError(
                     self.spec.repo,
-                    f"Test timed out after {timeout} seconds.",
+                    f"Test timed out after {self.timeout} seconds.",
                     self.logger,
                 )
 
@@ -95,7 +114,13 @@ def write_test_output(self, test_output, timed_out):
     def __enter__(self):
         return self
 
-    def __exit__(self, exc_type, exc_value, exc_traceback):
+    @abstractmethod
+    def __exit__(
+        self,
+        exctype: Optional[Type[BaseException]],
+        excinst: Optional[BaseException],
+        exctb: Optional[TracebackType],
+    ) -> bool:
         raise NotImplementedError
 
 
@@ -121,26 +146,36 @@ def __init__(
         self.copy_ssh_pubkey_from_remote()
         copy_to_container(self.container, eval_file, Path("/eval.sh"))
 
-
     def copy_ssh_pubkey_from_remote(self) -> None:
+        """Copy"""
         copy_ssh_pubkey_from_container(self.container)
 
     def copy_to_remote(self, local_file: Path, remote_path: Path) -> None:
+        """Copy"""
         copy_to_container(self.container, local_file, remote_path)
 
     def exec_run_with_timeout(self, command: str, timeout: int) -> ():
+        """Exec"""
         return exec_run_with_timeout(self.container, command, timeout)
 
     def exec_run(self, command: str) -> None:
+        """Exec"""
         return self.container.exec_run(command, demux=True)
 
     def copy_from_remote(self, remote_path: Path, local_path: Path) -> None:
+        """Copy"""
         copy_from_container(self.container, remote_path, local_path)
 
     def delete_file_from_remote(self, remote_path: Path) -> None:
+        """Delete"""
         delete_file_from_container(self.container, str(remote_path))
 
-    def __exit__(self, exc_type, exc_value, exc_traceback):
+    def __exit__(
+        self,
+        exctype: Optional[Type[BaseException]],
+        excinst: Optional[BaseException],
+        exctb: Optional[TracebackType],
+    ) -> bool:
         cleanup_container(self.client, self.container, self.logger)
         close_logger(self.logger)
 
@@ -159,22 +194,22 @@ def __init__(
         # the image must exist on dockerhub
         reponame = spec.repo.split("/")[-1]
         image_name = f"wentingzhao/{reponame}"
-        image = (
-            modal.Image.from_registry(image_name)
-            .copy_local_file(eval_file, "/eval.sh")
+        image = modal.Image.from_registry(image_name).copy_local_file(
+            eval_file, "/eval.sh"
         )
 
         self.sandbox = modal.Sandbox.create(
             "sleep",
             "infinity",
             image=image,
             cpu=4.0,
-            timeout=300,
+            timeout=timeout,
         )
 
         self.copy_ssh_pubkey_from_remote()
 
-    def copy_ssh_pubkey_from_remote(self):
+    def copy_ssh_pubkey_from_remote(self) -> None:
+        """Copy ssh pubkey"""
         process = self.sandbox.exec("bash", "-c", "cat /root/.ssh/id_rsa.pub")
         public_key = "".join([line for line in process.stdout]).strip()
 
@@ -197,6 +232,7 @@ def copy_ssh_pubkey_from_remote(self):
                 authorized_keys_file.write(public_key + "\n")
 
     def copy_to_remote(self, local_path: Path, remote_path: Path) -> None:
+        """Copy"""
         tempname = "tmpfile"
         with local_path.open("rb") as f:
             self.nfs.write_file(tempname, f)
@@ -229,9 +265,15 @@ def copy_from_remote(self, remote_path: Path, local_path: Path) -> None:
         with local_path.open("w") as f:
             f.write(output)
 
-    def delete_file_from_remote(src, remote_path):
+    def delete_file_from_remote(self, remote_path: Path) -> None:
+        """Delete"""
         self.sandbox.exec("bash", "-c", f"rm {str(remote_path)}")
 
-    def __exit__(self, exc_type, exc_value, exc_traceback):
+    def __exit__(
+        self,
+        exctype: Optional[Type[BaseException]],
+        excinst: Optional[BaseException],
+        exctb: Optional[TracebackType],
+    ) -> bool:
         self.sandbox.terminate()
         close_logger(self.logger)

commit0/harness/run_pytest_ids.py

@@ -1,18 +1,15 @@
 from datasets import load_dataset
-import docker
 from enum import StrEnum, auto
 import traceback
 from pathlib import Path
-import logging
 
 from typing import Iterator
 from git import Repo
 from commit0.harness.constants import RUN_PYTEST_LOG_DIR, RepoInstance
 from commit0.harness.docker_build import (
-    close_logger,
     setup_logger,
 )
-from commit0.harness.spec import Spec, make_spec
+from commit0.harness.spec import make_spec
 from commit0.harness.utils import (
     EvaluationError,
     extract_test_output,
@@ -109,7 +106,6 @@ def main(
             # f"Check ({logger.log_file}) for more information."
         )
         logger.error(error_msg)
- 
 
     return str(log_dir)