simplify key_list

Author: Lotram

bugwarrior/db.py

@@ -1,4 +1,4 @@
-from collections.abc import Iterable, Iterator
+from collections.abc import Collection, Iterable, Iterator
 import itertools
 import json
 import logging
@@ -50,13 +50,13 @@ def hamdist(str1: str, str2: str) -> int:
 
 
 def get_managed_task_uuids(
-    tw: TaskWarriorShellout, key_list: dict[str, list[str]]
+    tw: TaskWarriorShellout, unique_key_sets: Iterable[Collection[str]]
 ) -> set[str]:
     expected_task_ids = set()
-    for keys in key_list.values():
+    for unique_keys in unique_key_sets:
         tasks = tw.filter_tasks(
             {
-                'and': [('%s.any' % key, None) for key in keys],
+                'and': [('%s.any' % key, None) for key in unique_keys],
                 'or': [('status', 'pending'), ('status', 'waiting')],
             }
         )
@@ -65,21 +65,25 @@ def get_managed_task_uuids(
     return expected_task_ids
 
 
-def make_unique_identifier(keys: dict[str, list[str]], issue: dict[str, Any]) -> str:
+def make_unique_identifier(
+    unique_key_sets: Iterable[Collection[str]], issue: dict[str, Any]
+) -> str:
     """For a given issue, make an identifier from its unique keys.
 
     This is not the same as the taskwarrior uuid, which is assigned
     only once the task is created.
     """
-    for service, key_list in keys.items():
-        if all([key in issue for key in key_list]):
-            subset = {key: issue[key] for key in key_list}
+    for unique_keys in unique_key_sets:
+        if all(key in issue for key in unique_keys):
+            subset = {key: issue[key] for key in unique_keys}
             return json.dumps(subset, sort_keys=True)
     raise RuntimeError("Could not determine unique identifier for %s" % issue)
 
 
 def find_taskwarrior_uuid(
-    tw: TaskWarriorShellout, keys: dict[str, list[str]], issue: dict[str, Any]
+    tw: TaskWarriorShellout,
+    unique_key_sets: Iterable[Collection[str]],
+    issue: dict[str, Any],
 ) -> str:
     """For a given issue issue, find its local taskwarrior UUID.
 
@@ -116,11 +120,11 @@ def find_taskwarrior_uuid(
 
     possibilities = set()
 
-    for service, key_list in keys.items():
-        if any([key in issue for key in key_list]):
+    for unique_keys in unique_key_sets:
+        if any(key in issue for key in unique_keys):
             results = tw.filter_tasks(
                 {
-                    'and': [("%s.is" % key, issue[key]) for key in key_list],
+                    'and': [("%s.is" % key, issue[key]) for key in unique_keys],
                     'or': [
                         ('status', 'pending'),
                         ('status', 'waiting'),
@@ -136,7 +140,7 @@ def find_taskwarrior_uuid(
                 r['status'] == 'completed' for r in results
             ):
                 for r in results[1:]:
-                    for k in key_list:
+                    for k in unique_keys:
                         if r[k] != results[0][k]:
                             break
                 else:
@@ -265,7 +269,7 @@ def synchronize(
     dry_run: bool = False,
 ) -> None:
     services = [service_config.service for service_config in conf.service_configs]
-    key_list = build_key_list(services)
+    unique_key_sets = build_unique_key_sets(services)
     uda_list = build_uda_config_overrides(services)
 
     if uda_list:
@@ -300,7 +304,7 @@ def synchronize(
             continue
 
         # De-duplicate issues coming in
-        unique_identifier = make_unique_identifier(key_list, issue)
+        unique_identifier = make_unique_identifier(unique_key_sets, issue)
         if unique_identifier in issue_map:
             log.debug(f"Merging tags and skipping. Seen {unique_identifier} of {issue}")
             # Merge and deduplicate tags.
@@ -333,7 +337,9 @@ def synchronize(
         service_config = successful_config_map[issue.pop('target')]
 
         try:
-            existing_taskwarrior_uuid = find_taskwarrior_uuid(tw, key_list, issue)
+            existing_taskwarrior_uuid = find_taskwarrior_uuid(
+                tw, unique_key_sets, issue
+            )
         except MultipleMatches as e:
             log.exception("Multiple matches: %s", str(e))
         except NotFound:  # Create new task
@@ -423,7 +429,7 @@ def synchronize(
     log.debug(f'Closing tasks for succeeding services: {list(successful_config_map)}.')
     succeeded_service_task_uuids = get_managed_task_uuids(
         tw,
-        build_key_list(
+        build_unique_key_sets(
             service_config.service for service_config in successful_config_map.values()
         ),
     )
@@ -470,10 +476,8 @@ def synchronize(
             )
 
 
-def build_key_list(services: Iterable[str]) -> dict[str, list[str]]:
-    return {
-        service: get_service(service).ISSUE_CLASS.UNIQUE_KEY for service in services
-    }
+def build_unique_key_sets(services: Iterable[str]) -> set[tuple[str, ...]]:
+    return {get_service(service).ISSUE_CLASS.UNIQUE_KEY for service in services}
 
 
 def get_defined_udas_as_strings(conf: "Config") -> Iterator[str]: