improvements suggested by @scarlehoff

Author: andrpie

src/pinefarm/external/interface.py

@@ -42,14 +42,14 @@ def __init__(
         runcards_path=None,
         output_folder=None,
         print_comparison=True,
-        run_without_grids=False,
+        postrun_without_grids=False,
     ):
         self.name = name
         self.theory = theory
         self.pdf = pdf
         self.timestamp = timestamp
         self._print_comparison = print_comparison
-        self._run_without_grids = run_without_grids
+        self._postrun_without_grids = postrun_without_grids
         if runcards_path is None:
             self._runcards_path = configs.configs["paths"]["runcards"]
         else:
@@ -189,7 +189,7 @@ def postprocess(self):
         else:
             grids = list(self.dest.glob("*.pineappl*"))
 
-        if not grids and not self._run_without_grids:
+        if not grids and not self._postrun_without_grids:
             raise ValueError("Tried to run postprocessing in a folder with no grids?")
 
         os.environ["PINECARD"] = self.source.as_posix()

src/pinefarm/external/plough.py

@@ -16,38 +16,34 @@
 
 
 class Plough(interface.External):
-    """Interface provider."""
+    """Interface to download grids directly from ploughshare."""
 
     def __init__(self, pinecard, theorycard, *args, **kwargs):
-        super().__init__(pinecard, theorycard, *args, **kwargs)
+        super().__init__(
+            pinecard,
+            theorycard,
+            *args,
+            print_comparison=False,
+            postrun_without_grids=True,
+            **kwargs,
+        )
         self.ps_link = self.source / PLOUGHSHARE_LINK_FILENAME
         self.link = self.ps_link.read_text()
 
         self.filename = self.link.rsplit("/")[-1]
         self.dir_name = self.filename.rsplit(".", 1)[0]
         self.tarball = self.dest / self.filename
-        self._print_comparison = False
-        self._run_without_grids = True
 
     def run(self):
         """Download and extract the .tgz file."""
         print("Downloading from ploughshare...")
-        try:
-            self.download_to_dest()
-            if self.tarball.exists():
-                print(f"Grids successfully downloaded to {self.tarball}")
-            else:
-                raise FileNotFoundError(
-                    f"{self.tarball} not found but the download didn't seem to fail?"
-                )
-        except Exception as e:
-            raise FileNotFoundError(f"{self.tarball} could not be downloaded!") from e
+        self.download_to_dest()
         print("Extracting files...")
         self.extract_tarball()
         print(f"Grids successfully extracted to {self.dest}")
 
     def results(self):
-        """Results are collected and compared at the pineappl (script) level."""
+        """Do nothing."""
         pass
 
     def collect_versions(self):
@@ -60,16 +56,26 @@ def generate_pineappl(self):
 
     def download_to_dest(self):
         """Download the file to the output folder."""
-        urllib.request.urlretrieve(self.link, self.dest / self.filename)
+        try:
+            urllib.request.urlretrieve(self.link, self.dest / self.filename)
+            if self.tarball.exists():
+                print(f"Grids successfully downloaded to {self.tarball}")
+            else:
+                raise FileNotFoundError(
+                    f"{self.tarball} not found but the download didn't seem to fail?"
+                )
+        except Exception as e:
+            raise FileNotFoundError(f"{self.tarball} could not be downloaded!") from e
 
     def extract_tarball(self):
         """Extract the contents."""
         with tarfile.open(self.tarball, "r:*") as tf:
             tf.extractall(self.dest)
         self.grids_dir = self.dest / self.dir_name / GRIDS_TMP
         grids_list = sorted(os.listdir(self.grids_dir))
-        for i, grid in enumerate(grids_list):
-            extension = grid.split(".", 2)[2]
-            os.rename(self.grids_dir / grid, self.dest / f"grid_{i}.{extension}")
+        for grid in grids_list:
+            grid_num, extension = grid.split(".", 2)[1:]
+            grid_num = grid_num[-3:]
+            os.rename(self.grids_dir / grid, self.dest / f"grid_{grid_num}.{extension}")
         shutil.rmtree(self.dest / self.dir_name)
         self.tarball.unlink()