From 36538cdd6219dcb64b1123a2431509cf515c7025 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Dom=C3=ADnguez?=
 <dominguj@informatik.uni-freiburg.de>
Date: Mon, 2 Oct 2023 09:36:08 +0200
Subject: [PATCH 1/3] Move rule cz-pulsar_alphafold to tools.yml

Put rule cz-pulsar_alphafold under key toolshed.g2.bx.psu.edu/repos/galaxy-australia/alphafold2/alphafold/.* in tools.yml.

Serves as a workaround to fix TPV dry-run.
---
 files/galaxy/tpv/tool_defaults.yml | 8 --------
 files/galaxy/tpv/tools.yml         | 7 +++++++
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/files/galaxy/tpv/tool_defaults.yml b/files/galaxy/tpv/tool_defaults.yml
index 7b8d366fd..b674eb7d1 100644
--- a/files/galaxy/tpv/tool_defaults.yml
+++ b/files/galaxy/tpv/tool_defaults.yml
@@ -42,14 +42,6 @@ tools:
               entity.tpv_tags = entity.tpv_tags.combine(
                   TagSetManager(tags=[pulsar_tag])
               )
-      - id: cz-pulsar_alphafold
-        if: |
-          all((
-              "cz-pulsar" in {tag.value for tag in entity.tpv_tags.tags},
-              tool.id.startswith("toolshed.g2.bx.psu.edu/repos/galaxy-australia/alphafold2/alphafold"),
-              helpers.tool_version_gte(tool, '2.3.1'),
-          ))
-        gpus: 1
 
     rank: |
       final_destinations = helpers.weighted_random_sampling(candidate_destinations)
diff --git a/files/galaxy/tpv/tools.yml b/files/galaxy/tpv/tools.yml
index b6c2ddf97..02c8ec6cd 100644
--- a/files/galaxy/tpv/tools.yml
+++ b/files/galaxy/tpv/tools.yml
@@ -267,6 +267,13 @@ tools:
       - id: model_preset_multimer
         if: job.get_param_values(app).get("model_preset") == "multimer"
         mem: 69
+      - id: cz-pulsar_alphafold
+        if: |
+          (
+              "cz-pulsar" in {tag.value for tag in entity.tpv_tags.tags}
+              and helpers.tool_version_gte(tool, '2.3.1')
+          )
+        gpus: 1
     scheduling:
       require:
         - singularity

From 3c2b4133c7505b3512f28d3ac23a0593ba753ef1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Dom=C3=ADnguez?=
 <dominguj@informatik.uni-freiburg.de>
Date: Mon, 2 Oct 2023 09:41:38 +0200
Subject: [PATCH 2/3] Test if rule cz-pulsar_alphafold works in tools.yml

TPV dry-run should return `submit_request_gpus: '1'`.

This commit must be reverted after having checked the output of TPV dry-run.
---
 files/galaxy/tpv/tools.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/files/galaxy/tpv/tools.yml b/files/galaxy/tpv/tools.yml
index 02c8ec6cd..33a85308e 100644
--- a/files/galaxy/tpv/tools.yml
+++ b/files/galaxy/tpv/tools.yml
@@ -269,10 +269,7 @@ tools:
         mem: 69
       - id: cz-pulsar_alphafold
         if: |
-          (
-              "cz-pulsar" in {tag.value for tag in entity.tpv_tags.tags}
-              and helpers.tool_version_gte(tool, '2.3.1')
-          )
+          True
         gpus: 1
     scheduling:
       require:

From e09c6e2101905409231a98d7f6fcc14d17ee6dde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Dom=C3=ADnguez?=
 <dominguj@informatik.uni-freiburg.de>
Date: Mon, 2 Oct 2023 09:48:50 +0200
Subject: [PATCH 3/3] Revert "Test if rule cz-pulsar_alphafold works in
 tools.yml"

This reverts commit 3c2b4133c7505b3512f28d3ac23a0593ba753ef1.
---
 files/galaxy/tpv/tools.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/files/galaxy/tpv/tools.yml b/files/galaxy/tpv/tools.yml
index 33a85308e..02c8ec6cd 100644
--- a/files/galaxy/tpv/tools.yml
+++ b/files/galaxy/tpv/tools.yml
@@ -269,7 +269,10 @@ tools:
         mem: 69
       - id: cz-pulsar_alphafold
         if: |
-          True
+          (
+              "cz-pulsar" in {tag.value for tag in entity.tpv_tags.tags}
+              and helpers.tool_version_gte(tool, '2.3.1')
+          )
         gpus: 1
     scheduling:
       require: