fix: remove useless loops (#8804)

* fix: remove useless loops

* refacto: keep only the manifests for the dates that interest us

* fix: remove more useless loops

---------

Co-authored-by: Olivier Giorgis <[email protected]>

Author: djangoliv

tests/conftest.py

@@ -988,7 +988,7 @@ def mock_summary_groups_request(monkeypatch):
     Mock get_summary_groups()
     """
 
-    def _fetch_summary_groups(start_day, end_day):
+    def _fetch_summary_groups(days):
         tests_folder = os.path.dirname(__file__)
         file_name = "summary_groups.json"
         data_path = os.path.join(tests_folder, "sample_data", file_name)

tests/intermittents_commenter/expected_comment.text

@@ -7,7 +7,7 @@ This is the #1 most frequent failure this week.
 ## Table
 | |**no_variant**|**socketprocess_networking**|**spi-nw**|
 |---|:-:|:-:|:-:|
-|**macosx1015-x86_64/debug**| | |1|
+|**macosx1015-x86_64/debug**| | |1/22|
 
 ## For more details, see:
 https://treeherder.mozilla.org/intermittent-failures/bugdetails?bug=1&startday=2022-05-09&endday=2025-05-10&tree=all

tests/intermittents_commenter/expected_comment_with_5_failures.text

@@ -7,8 +7,8 @@ This is the #1 most frequent failure this week.
 ## Table
 | |**a11y_checks+swgl**|**no_variant**|**socketprocess_networking**|**spi-nw**|**swgl**|
 |---|:-:|:-:|:-:|:-:|:-:|
-|**linux1804-x86_64/debug**| |1| |2| |
-|**macosx1015-x86_64/debug**| | | |2| |
+|**linux1804-x86_64/debug**| |1| |2/92| |
+|**macosx1015-x86_64/debug**| | | |2/22| |
 
 ## For more details, see:
 https://treeherder.mozilla.org/intermittent-failures/bugdetails?bug=1&startday=2022-05-09&endday=2025-05-10&tree=all

treeherder/intermittents_commenter/commenter.py

@@ -78,10 +78,16 @@ def generate_bug_changes(self, startday, endday, alt_startday, alt_endday):
         for bugs whose total number of daily or weekly occurrences meet
         the appropriate threshold) and potentially an updated whiteboard
         or priority status."""
+        days = [startday]
+        if self.weekly_mode:
+            days = [
+                (datetime.strptime(startday, "%Y-%m-%d") + timedelta(days=i)).strftime("%Y-%m-%d")
+                for i in range(7)
+            ]
 
         bug_ids, bugs = self.get_bugs(startday, endday)
         option_collection_map = OptionCollection.objects.get_option_collection_map()
-        bug_map = self.build_bug_map(bugs, option_collection_map, startday, endday)
+        bug_map = self.build_bug_map(bugs, option_collection_map, days)
 
         alt_date_bug_totals = self.get_alt_date_bug_totals(alt_startday, alt_endday, bug_ids)
 
@@ -388,32 +394,26 @@ def get_bug_run_info(self, bug):
             info.build_type = "unknown build"
         return info
 
-    def get_task_labels_and_count(self, manifest, start_day, end_day):
+    def get_task_labels_and_count(self, manifest, days, job_name):
         tasks_and_count = {}
         summary_groups = (
-            fetch.fetch_summary_groups(start_day, end_day)
-            if self.summary_groups is None
-            else self.summary_groups
+            fetch.fetch_summary_groups(days) if self.summary_groups is None else self.summary_groups
         )
-        days = [start_day]
-        if self.weekly_mode:
-            for j in range(6):
-                jj = datetime.strptime(days[-1], "%Y-%m-%d") + timedelta(days=1)
-                days.append(jj.strftime("%Y-%m-%d"))
         for day in days:
             if day not in summary_groups:
                 continue
             all_task_labels = summary_groups[day]["job_type_names"]
             for tasks_by_manifest in summary_groups[day]["manifests"]:
-                for man, tasks in tasks_by_manifest.items():
-                    if manifest == man:
-                        for task_index, _, _, count in tasks:
-                            task_label = all_task_labels[task_index]
+                if manifest in tasks_by_manifest:
+                    for task_index, _, _, count in tasks_by_manifest[manifest]:
+                        task_label = all_task_labels[task_index]
+                        if task_label == job_name:
                             tasks_and_count.setdefault(task_label, 0)
                             tasks_and_count[task_label] += count
-        return tasks_and_count
+                    break
+        return tasks_and_count.get(job_name, 0)
 
-    def build_bug_map(self, bugs, option_collection_map, start_day, end_day):
+    def build_bug_map(self, bugs, option_collection_map, days):
         """Build bug_map
          eg:
         {
@@ -452,15 +452,10 @@ def build_bug_map(self, bugs, option_collection_map, start_day, end_day):
             if test_name:
                 manifest = all_tests[test_name][0]
                 if manifest:
-                    """
-                    # Bug 1972307 - disabled due to no comments
-                    tasks_count = self.get_task_labels_and_count(manifest, start_day, end_day)
                     job_name = bug["job__signature__job_type_name"]
-                    for task_name, count in tasks_count.items():
-                        if task_name == job_name or task_name == job_name.rsplit("-", 1)[0]:
-                            run_count = count
-                            break
-                    """
+                    if len(job_name.rsplit("-", 1)) == 2 and job_name.rsplit("-", 1)[1].isdigit():
+                        job_name = job_name.rsplit("-", 1)[0]
+                    run_count = self.get_task_labels_and_count(manifest, days, job_name)
                     testrun_matrix = (
                         fetch.fetch_testrun_matrix()
                         if self.testrun_matrix is None

treeherder/intermittents_commenter/fetch.py

@@ -24,7 +24,8 @@ def fetch_testrun_matrix():
     return response.json()
 
 
-def fetch_summary_groups(start_day, end_day):
+def fetch_summary_groups(days):
     testrun_info_url = f"{firefoxci_artefact_api_url}/test-run-info.json"
     response = requests.get(testrun_info_url, headers={"User-agent": "mach-test-info/1.0"})
-    return response.json()
+    summary_groups = response.json()
+    return {key: summary_groups[key] for key in days}