remove a bunch of stuff

Author: Dylan Huang

eval_protocol/dataset_logger/local_fs_dataset_logger_adapter.py

@@ -8,7 +8,6 @@
 from eval_protocol.common_utils import load_jsonl
 from eval_protocol.dataset_logger.dataset_logger import DatasetLogger
 from eval_protocol.dataset_logger.directory_utils import find_eval_protocol_datasets_dir
-from eval_protocol.singleton_lock import acquire_singleton_lock, release_singleton_lock
 
 if TYPE_CHECKING:
     from eval_protocol.models import EvaluationRow
@@ -40,44 +39,6 @@ def current_jsonl_path(self) -> str:
         """
         return os.path.join(self.datasets_dir, f"{self.current_date}.jsonl")
 
-    def _acquire_file_lock(self, file_path: str, timeout: float = 30.0) -> bool:
-        """
-        Acquire a lock for a specific file using the singleton lock mechanism.
-
-        Args:
-            file_path: Path to the file to lock
-            timeout: Maximum time to wait for lock acquisition in seconds
-
-        Returns:
-            True if lock was acquired, False if timeout occurred
-        """
-        # Create a lock name based on the file path
-        lock_name = f"file_lock_{os.path.basename(file_path)}"
-        base_dir = Path(os.path.dirname(file_path))
-
-        start_time = time.time()
-        while time.time() - start_time < timeout:
-            result = acquire_singleton_lock(base_dir, lock_name)
-            if result is None:
-                # Successfully acquired lock
-                return True
-            else:
-                # Lock is held by another process, wait and retry
-                time.sleep(0.1)
-
-        return False
-
-    def _release_file_lock(self, file_path: str) -> None:
-        """
-        Release the lock for a specific file.
-
-        Args:
-            file_path: Path to the file to unlock
-        """
-        lock_name = f"file_lock_{os.path.basename(file_path)}"
-        base_dir = Path(os.path.dirname(file_path))
-        release_singleton_lock(base_dir, lock_name)
-
     def log(self, row: "EvaluationRow") -> None:
         """Log a row, updating existing row with same ID or appending new row."""
         row_id = row.input_metadata.row_id
@@ -88,35 +49,25 @@ def log(self, row: "EvaluationRow") -> None:
                 if filename.endswith(".jsonl"):
                     file_path = os.path.join(self.datasets_dir, filename)
                     if os.path.exists(file_path):
-                        if self._acquire_file_lock(file_path):
+                        with open(file_path, "r") as f:
+                            lines = f.readlines()
+
+                        # Find the line with matching ID
+                        for i, line in enumerate(lines):
                             try:
-                                with open(file_path, "r") as f:
-                                    lines = f.readlines()
-
-                                # Find the line with matching ID
-                                for i, line in enumerate(lines):
-                                    try:
-                                        line_data = json.loads(line.strip())
-                                        if line_data["input_metadata"]["row_id"] == row_id:
-                                            # Update existing row
-                                            lines[i] = row.model_dump_json(exclude_none=True) + os.linesep
-                                            with open(file_path, "w") as f:
-                                                f.writelines(lines)
-                                            return
-                                    except json.JSONDecodeError:
-                                        continue
-                            finally:
-                                self._release_file_lock(file_path)
+                                line_data = json.loads(line.strip())
+                                if line_data["input_metadata"]["row_id"] == row_id:
+                                    # Update existing row
+                                    lines[i] = row.model_dump_json(exclude_none=True) + os.linesep
+                                    with open(file_path, "w") as f:
+                                        f.writelines(lines)
+                                    return
+                            except json.JSONDecodeError:
+                                continue
 
         # If no existing row found, append new row to current file
-        if self._acquire_file_lock(self.current_jsonl_path):
-            try:
-                with open(self.current_jsonl_path, "a") as f:
-                    f.write(row.model_dump_json(exclude_none=True) + os.linesep)
-            finally:
-                self._release_file_lock(self.current_jsonl_path)
-        else:
-            raise RuntimeError(f"Failed to acquire lock for log file {self.current_jsonl_path}")
+        with open(self.current_jsonl_path, "a") as f:
+            f.write(row.model_dump_json(exclude_none=True) + os.linesep)
 
     def read(self, row_id: Optional[str] = None) -> List["EvaluationRow"]:
         """Read rows from all JSONL files in the datasets directory. Also
@@ -131,18 +82,14 @@ def read(self, row_id: Optional[str] = None) -> List["EvaluationRow"]:
         for filename in os.listdir(self.datasets_dir):
             if filename.endswith(".jsonl"):
                 file_path = os.path.join(self.datasets_dir, filename)
-                if self._acquire_file_lock(file_path):
-                    try:
-                        data = load_jsonl(file_path)
-                        for r in data:
-                            row = EvaluationRow(**r)
-                            if row.input_metadata.row_id not in existing_row_ids:
-                                existing_row_ids.add(row.input_metadata.row_id)
-                            else:
-                                raise ValueError(f"Duplicate Row ID {row.input_metadata.row_id} already exists")
-                            all_rows.append(row)
-                    finally:
-                        self._release_file_lock(file_path)
+                data = load_jsonl(file_path)
+                for r in data:
+                    row = EvaluationRow(**r)
+                    if row.input_metadata.row_id not in existing_row_ids:
+                        existing_row_ids.add(row.input_metadata.row_id)
+                    else:
+                        raise ValueError(f"Duplicate Row ID {row.input_metadata.row_id} already exists")
+                    all_rows.append(row)
 
         if row_id:
             # Filter by row_id if specified