From 62a175a2435ce402f40d836b6367525d69cc53a5 Mon Sep 17 00:00:00 2001
From: allegroai <>
Date: Fri, 26 Nov 2021 16:39:32 +0200
Subject: [PATCH] Fix TriggerScheduler on Dataset change (issue #491)

---
 clearml/automation/trigger.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/clearml/automation/trigger.py b/clearml/automation/trigger.py
index b8ce3cb1..aa2f5757 100644
--- a/clearml/automation/trigger.py
+++ b/clearml/automation/trigger.py
@@ -89,11 +89,16 @@ class DatasetTrigger(BaseTrigger):
 
     def build_query(self, ref_time):
         query = super(DatasetTrigger, self).build_query(ref_time)
-        if self.on_publish:
-            query.update({'status': ['published']})
+        query.update({
+            'system_tags': list(set(query.get('system_tags', []) + ['dataset'])),
+            'task_types': list(set(query.get('task_types', []) + [str(Task.TaskTypes.data_processing)])),
+            'status': ['published' if self.on_publish else 'completed']
+        })
+
         if self.on_archive:
             system_tags = list(set(query.get('system_tags', []) + ['archived']))
             query.update({'system_tags': system_tags})
+            
         return query