fixed all errors

Author: wenting-zhao

commit0/__main__.py

@@ -4,14 +4,19 @@
 import copy
 import sys
 import hydra
+from hydra.core.config_store import ConfigStore
+from commit0.configs.config_class import Commit0Config
 
 
 def main() -> None:
     command = sys.argv[1]
+    # type check config values
+    cs = ConfigStore.instance()
+    cs.store(name="base", node=Commit0Config)
     # have hydra to ignore all command-line arguments
     sys_argv = copy.deepcopy(sys.argv)
     sys.argv = [sys.argv[0]]
-    hydra.initialize(version_base=None, config_path="../configs")
+    hydra.initialize(version_base=None, config_path="configs")
     config = hydra.compose(config_name="base")
     # after hydra gets all configs, put command-line arguments back
     sys.argv = sys_argv
@@ -21,7 +26,9 @@ def main() -> None:
             config.dataset_name, config.dataset_split, config.base_dir
         )
     elif command == "build":
-        commit0.harness.build.main(config.dataset_name, config.dataset_split)
+        commit0.harness.build.main(
+            config.dataset_name, config.dataset_split, config.num_workers
+        )
     elif command == "test":
         repo = sys.argv[2]
         test_ids = sys.argv[3]

commit0/configs/__init__.py

@@ -0,0 +1,18 @@
+defaults:
+  - _self_
+
+# shared in all steps
+dataset_name: wentingzhao/commit0_docstring
+dataset_split: test
+
+# clone related
+base_dir: repos/
+
+# build related
+build: all
+num_workers: 8
+
+# test related
+backend: local
+branch: ai
+timeout: 1_800

commit0/configs/base.yaml

@@ -0,0 +1,24 @@
+from dataclasses import dataclass
+from typing import Literal
+
+
+@dataclass
+class Commit0Config:
+    # shared in all steps
+    dataset_name: str
+    dataset_split: str
+
+    # clone related
+    base_dir: str
+
+    # build related
+    # which repo to build, all or one repo
+    build: str
+    num_workers: int
+
+    # test related
+    backend: str
+    # which branch to work on
+    branch: str
+    # timeout for running pytest
+    timeout: int

commit0/configs/config_class.py

@@ -14,15 +14,15 @@
 logger = logging.getLogger(__name__)
 
 
-def main(dataset_name: str, dataset_split: str) -> None:
+def main(dataset_name: str, dataset_split: str, num_workers: int) -> None:
     dataset: Iterator[RepoInstance] = load_dataset(dataset_name, split=dataset_split)  # type: ignore
     specs = []
     for example in dataset:
         spec = make_spec(example)
         specs.append(spec)
 
     client = docker.from_env()
-    build_repo_images(client, specs)
+    build_repo_images(client, specs, num_workers)
     logger.info("Done building docker images")
 
 

commit0/harness/build.py

@@ -385,20 +385,20 @@ def exec_run_with_timeout(
     # Local variables to store the result of executing the command
     exec_result = ""
     exec_id = None
-    exception = None
     timed_out = False
 
     # Wrapper function to run the command
     def run_command() -> None:
-        nonlocal exec_result, exec_id, exception
+        nonlocal exec_result, exec_id
         try:
-            exec_id = container.client.api.exec_create(container=container.id, cmd=cmd)["Id"]
-            exec_stream = container.client.api.exec_start(exec_id=exec_id, stream=True)
+            exec_id = container.client.api.exec_create(container=container.id, cmd=cmd)[  # pyright: ignore
+                "Id"
+            ]
+            exec_stream = container.client.api.exec_start(exec_id=exec_id, stream=True)  # pyright: ignore
             for chunk in exec_stream:
                 exec_result += chunk.decode("utf-8", errors="replace")
-        except Exception as e:
-            print(e)
-            exception = e
+        except docker.errors.APIError as e:
+            raise Exception(f"Container {container.id} cannot execute {cmd}.\n{str(e)}")
 
     # Start the command in a separate thread
     thread = threading.Thread(target=run_command)
@@ -409,7 +409,7 @@ def run_command() -> None:
     # If the thread is still alive, the command timed out
     if thread.is_alive():
         if exec_id is not None:
-            exec_pid = container.client.api.exec_inspect(exec_id=exec_id)["Pid"]
+            exec_pid = container.client.api.exec_inspect(exec_id=exec_id)["Pid"]  # pyright: ignore
             container.exec_run(f"kill -TERM {exec_pid}", detach=True)
         timed_out = True
     end_time = time.time()