reorg

Author: wenting-zhao

commit0/harness/docker_build.py

@@ -7,13 +7,13 @@
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from pathlib import Path
 from typing import Any
-import sys
 
 from commit0.harness.constants import (
     BASE_IMAGE_BUILD_DIR,
     REPO_IMAGE_BUILD_DIR,
 )
 from commit0.harness.spec import get_specs_from_dataset
+from commit0.harness.utils import setup_logger, close_logger
 
 ansi_escape = re.compile(r"\x1B\[[0-?]*[ -/]*[@-~]")
 
@@ -33,32 +33,6 @@ def __str__(self):
         )
 
 
-def setup_logger(repo: str, log_file: Path, mode: str = "w") -> logging.Logger:
-    """Used for logging the build process of images and running containers.
-    It writes logs to the log file.
-    """
-    log_file.parent.mkdir(parents=True, exist_ok=True)
-    logger = logging.getLogger(f"{repo}.{log_file.name}")
-    handler = logging.FileHandler(log_file, mode=mode)
-    stdout_handler = logging.StreamHandler(sys.stdout)
-    logger.addHandler(stdout_handler)
-    formatter = logging.Formatter("%(asctime)s - %(levelname)s - %(message)s")
-    handler.setFormatter(formatter)
-    logger.addHandler(handler)
-    logger.setLevel(logging.INFO)
-    logger.propagate = False
-    setattr(logger, "log_file", log_file)
-    return logger
-
-
-def close_logger(logger: logging.Logger) -> None:
-    """Closes all handlers associated with the given logger to prevent too many open files."""
-    # To avoid too many open files
-    for handler in logger.handlers:
-        handler.close()
-        logger.removeHandler(handler)
-
-
 def build_image(
     image_name: str,
     setup_scripts: dict,

commit0/harness/run_pytest_ids.py

@@ -12,14 +12,13 @@
     RUN_PYTEST_LOG_DIR,
     RepoInstance,
 )
-from commit0.harness.docker_build import (
-    setup_logger,
-)
 from commit0.harness.spec import make_spec
 from commit0.harness.utils import (
     EvaluationError,
     get_hash_string,
     generate_patch_between_commits,
+    setup_logger,
+    close_logger,
 )
 from commit0.harness.execution_context import (
     ExecutionBackend,
@@ -133,6 +132,7 @@ def main(
                     f"Test timed out after {timeout} seconds.",
                     logger,
                 )
+        close_logger(logger)
         pytest_exit_code = Path(log_dir / "pytest_exit_code.txt").read_text().strip()
         sys.exit(pytest_exit_code)
     except EvaluationError as e:

commit0/harness/utils.py

@@ -4,6 +4,8 @@
 import logging
 import os
 import time
+import sys
+from pathlib import Path
 from typing import Optional
 
 from fastcore.net import HTTP404NotFoundError, HTTP403ForbiddenError  # type: ignore
@@ -25,6 +27,32 @@ def __str__(self):
         )
 
 
+def setup_logger(repo: str, log_file: Path, mode: str = "w") -> logging.Logger:
+    """Used for logging the build process of images and running containers.
+    It writes logs to the log file.
+    """
+    log_file.parent.mkdir(parents=True, exist_ok=True)
+    logger = logging.getLogger(f"{repo}.{log_file.name}")
+    handler = logging.FileHandler(log_file, mode=mode)
+    stdout_handler = logging.StreamHandler(sys.stdout)
+    logger.addHandler(stdout_handler)
+    formatter = logging.Formatter("%(asctime)s - %(levelname)s - %(message)s")
+    handler.setFormatter(formatter)
+    logger.addHandler(handler)
+    logger.setLevel(logging.INFO)
+    logger.propagate = False
+    setattr(logger, "log_file", log_file)
+    return logger
+
+
+def close_logger(logger: logging.Logger) -> None:
+    """Closes all handlers associated with the given logger to prevent too many open files."""
+    # To avoid too many open files
+    for handler in logger.handlers:
+        handler.close()
+        logger.removeHandler(handler)
+
+
 def get_hash_string(input_string: str) -> str:
     # Create a new SHA-256 hash object
     sha256 = hashlib.sha256()