Fixes Scrapinghub jobs.list Method Called with Incorrect Filter Param…

…eter
scrapinghub · May 6, 2024 · 9a7c456 · 9a7c456
1 parent f0d8ea5
commit 9a7c456
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/spidermon/contrib/scrapy/monitors/monitors.py b/spidermon/contrib/scrapy/monitors/monitors.py
@@ -569,7 +569,7 @@ def _get_jobs(self, states, number_of_jobs):
                 start=start,
                 state=states,
                 count=count,
-                filters=dict(has_tag=tags) if tags else None,
+                has_tag=tags or None,
             )
             total_jobs.extend(current_jobs)
 
@@ -584,7 +584,7 @@ def _get_jobs(self, states, number_of_jobs):
 
     def _get_tags_to_filter(self):
         """
-        Return the intersect of the desired tags to filter and
+        Return a list of tags with the intersection of the desired tags to filter and
         the ones from the current job.
         """
         desired_tags = self.crawler.settings.getlist(SPIDERMON_JOBS_COMPARISON_TAGS)
@@ -596,7 +596,7 @@ def _get_tags_to_filter(self):
             return {}
 
         tags_to_filter = set(desired_tags) & set(current_tags)
-        return sorted(tags_to_filter)
+        return list(sorted(tags_to_filter))
 
     def get_threshold(self):
         number_of_jobs = self.crawler.settings.getint(SPIDERMON_JOBS_COMPARISON)

diff --git a/tests/contrib/scrapy/monitors/test_jobs_comparison_monitor.py b/tests/contrib/scrapy/monitors/test_jobs_comparison_monitor.py
@@ -197,7 +197,7 @@ def test_arguments_passed_to_zyte_client(
             state=list(states),
             # Count goes from pending number of jobs up to 1000
             count=min(number_of_jobs - n * 1000, 1000),
-            filters={"has_tag": list(tags)},
+            has_tag=list(tags),
         )
         # One call to api every 1000 expected jobs
         for n in range(0, math.ceil(number_of_jobs / 1000))