Run bigscape v2

bin/install-nplinker-deps

@@ -125,6 +125,7 @@ pip install -q -U pip setuptools
 echo "🔥 Start installing BigScape ..."
     [[ -d BiG-SCAPE ]] || git clone https://github.com/medema-group/BiG-SCAPE.git
     cd BiG-SCAPE
+    git reset --hard
     git config --add advice.detachedHead false  # disable advice
     git config pull.ff only
     git checkout master
@@ -136,6 +137,20 @@ echo "🔥 Start installing BigScape ..."
     chmod 775 Annotated_MIBiG_reference
     ln -sf $LIB_PATH/BiG-SCAPE/bigscape.py $PY_PATH/bin
     cd ..
+    # blob size limit to remove large files left in history
+    [[ -d BiG-SCAPE-v2 ]] || git clone -b dev --filter=blob:limit=10m https://github.com/medema-group/BiG-SCAPE.git BiG-SCAPE-v2
+    cd BiG-SCAPE-v2
+    git config --ad advice.detatchedHead false
+    git checkout 99a4c2e4923bb50e175b2e619c2cee0a14918789 # Commits on Jun 14, 2024
+    pip install click
+    pip install sqlalchemy
+    pip install pyhmmer
+    pip install tqdm
+    chmod 754 bigscape.py
+    ln -sf $LIB_PATH/BiG-SCAPE-v2/bigscape.py $PY_PATH/bin/bigscape-v2.py
+    cd ..
+
+
 echo -e "✅ BigScape installed successfully\n"
 
 #--- Install FastTree (not support Windows, required by BigScape)

nplinker.toml

@@ -0,0 +1,18 @@
+# NPLinker default configurations
+
+[log]
+level = "INFO"
+use_console = true
+
+[mibig]
+to_use = true
+version = "3.1"
+
+[bigscape]
+version = 1
+parameters = "--mibig --clans-off --mix --include_singletons --cutoffs 0.30"
+
+cutoff = "0.30"
+
+[scoring]
+methods = ["metcalf"]

src/nplinker/arranger.py

@@ -282,21 +282,34 @@ def _run_bigscape(self) -> None:
         default BiG-SCAPE directory.
         """
         self.bigscape_running_output_dir.mkdir(exist_ok=True, parents=True)
+
+        version = self.config.bigscape.version
+
         run_bigscape(
             self.antismash_dir,
             self.bigscape_running_output_dir,
             self.config.bigscape.parameters,
+            version,
         )
-        for f in glob(
-            str(
-                self.bigscape_running_output_dir
-                / "network_files"
-                / "*"
-                / "mix"
-                / "mix_clustering_c*.tsv"
+
+        if version == 1:
+            for f in glob(
+                str(
+                    self.bigscape_running_output_dir
+                    / "network_files"
+                    / "*"
+                    / "mix"
+                    / "mix_clustering_c*.tsv"
+                )
+            ):
+                shutil.copy(f, self.bigscape_dir)
+        elif version == 2:
+            shutil.copy(
+                self.bigscape_running_output_dir / "data_sqlite.db",
+                self.bigscape_dir,
             )
-        ):
-            shutil.copy(f, self.bigscape_dir)
+        else:
+            raise ValueError(f"Invalid BiG-SCAPE version: {version}")
 
     def arrange_strain_mappings(self) -> None:
         """Arrange the strain mappings file.

src/nplinker/config.py

@@ -70,6 +70,7 @@ def load_config(config_file: str | PathLike) -> Dynaconf:
     # BigScape
     Validator("bigscape.parameters", required=True, is_type_of=str),
     Validator("bigscape.cutoff", required=True, is_type_of=str),
+    Validator("bigscape.version", required=True, is_type_of=int),
     # Scoring
     ## `scoring.methods` must be a list of strings and must contain at least one of the
     ## supported scoring methods.

src/nplinker/data/nplinker.toml

@@ -43,6 +43,9 @@ version = "3.1"
 
 [bigscape]
 # The parameters to use for running BiG-SCAPE.
+# Version of BiG-SCAPE to run. Make sure to change the parameters property below as well
+# when changing versions.
+version = 1
 # Required bigscape parameters are `--mix`, `--include_singletons` and `--cutoffs`. NPLinker needs
 # them to run the analysis properly.
 # Parameters that must NOT exist: `--inputdir`, `--outputdir`, `--pfam_dir`. NPLinker will
@@ -51,6 +54,8 @@ version = "3.1"
 # `mibig.version` to the version of mibig in bigscape.
 # The default value is "--mibig --clans-off --mix --include_singletons --cutoffs 0.30".
 parameters = "--mibig --clans-off --mix --include_singletons --cutoffs 0.30"
+# for version 2, use the following parameters string:
+# parameters = "--mibig_version 3.1 --include_singletons --gcf_cutoffs 0.30"
 # Which bigscape cutoff to use for NPLinker analysis.
 # There might be multiple cutoffs in bigscape output.
 # Note that this value must be a string.

src/nplinker/genomics/bigscape/runbigscape.py

@@ -15,22 +15,65 @@ def run_bigscape(
     antismash_path: str | PathLike,
     output_path: str | PathLike,
     extra_params: str,
-):
-    bigscape_py_path = "bigscape.py"
-    logger.info(
-        f'run_bigscape: input="{antismash_path}", output="{output_path}", extra_params={extra_params}"'
-    )
+    version: int = 1,
+) -> bool:
+    """Runs BiG-SCAPE to cluster BGCs.
+
+    The behavior of this function is slightly different depending on the version of
+    BiG-SCAPE that is set to run using the configuration file.
+    Mostly this means a different set of parameters is used between the two versions.
+
+    The AntiSMASH output directory should be a directory that contains GBK files.
+    The directory can contain subdirectories, in which case BiG-SCAPE will search
+    recursively for GBK files.
+
+    By default, only GBK Files with "cluster" or "region" in the filename are
+    accepted. GBK Files with "final" in the filename are excluded.
+
+    Args:
+        antismash_path: Path to the antismash output directory.
+        output_path: Path to the output directory where BiG-SCAPE will write its results.
+        extra_params: Additional parameters to pass to BiG-SCAPE.
+        version: The version of BiG-SCAPE to run. Can be 1 or 2.
+
+    Returns:
+        True if BiG-SCAPE ran successfully, False otherwise.
+    """
+    # switch to correct version of BiG-SCAPE
+    if version == 1:
+        bigscape_py_path = "bigscape.py"
+    elif version == 2:
+        bigscape_py_path = "bigscape-v2.py"
+    else:
+        raise ValueError("Unexpected BiG-SCAPE version number specified")
 
     try:
         subprocess.run([bigscape_py_path, "-h"], capture_output=True, check=True)
     except Exception as e:
-        raise Exception(f"Failed to find/run bigscape.py (path={bigscape_py_path}, err={e})") from e
+        raise FileNotFoundError(
+            f"Failed to find/run bigscape.py (path={bigscape_py_path}, err={e})"
+        ) from e
 
     if not os.path.exists(antismash_path):
-        raise Exception(f'antismash_path "{antismash_path}" does not exist!')
+        raise FileNotFoundError(f'antismash_path "{antismash_path}" does not exist!')
 
-    # configure the IO-related parameters, including pfam_dir
-    args = [bigscape_py_path, "-i", antismash_path, "-o", output_path, "--pfam_dir", PFAM_PATH]
+    logger.info(f"Running BiG-SCAPE version {version}")
+    logger.info(
+        f'run_bigscape: input="{antismash_path}", output="{output_path}", extra_params={extra_params}"'
+    )
+
+    # assemble arguments. first argument is the python file
+    args = [bigscape_py_path]
+
+    # version 2 points to specific Pfam file, version 1 points to directory
+    # version 2 also requires the cluster subcommand
+    if version == 1:
+        args.extend(["--pfam_dir", PFAM_PATH])
+    elif version == 2:
+        args.extend(["cluster", "--pfam_path", os.path.join(PFAM_PATH, "Pfam-A.hmm")])
+
+    # add input and output paths. these are unchanged
+    args.extend(["-i", str(antismash_path), "-o", str(output_path)])
 
     # append the user supplied params, if any
     if len(extra_params) > 0:
@@ -39,9 +82,13 @@ def run_bigscape(
     logger.info(f"BiG-SCAPE command: {args}")
     result = subprocess.run(args, stdout=sys.stdout, stderr=sys.stderr, check=True)
     logger.info(f"BiG-SCAPE completed with return code {result.returncode}")
-    # use subprocess.CompletedProcess.check_returncode() to test if the BiG-SCAPE
-    # process exited successfully. This throws an exception for non-zero returncodes
-    # which will indicate to the PODPDownloader module that something went wrong.
-    result.check_returncode()
 
-    return True
+    # return true on any non-error return code
+    if result.returncode == 0:
+        return True
+
+    # otherwise log details and raise a runtime error
+    logger.error(f"BiG-SCAPE failed with return code {result.returncode}")
+    logger.error(f"output: {str(result.stdout)}")
+
+    raise RuntimeError(f"Failed to run BiG-SCAPE with error code {result.returncode}")

src/nplinker/nplinker_default.toml

@@ -9,7 +9,9 @@ to_use = true
 version = "3.1"
 
 [bigscape]
+version = 1
 parameters = "--mibig --clans-off --mix --include_singletons --cutoffs 0.30"
+
 cutoff = "0.30"
 
 [scoring]