Merge branch 'master' into default_redux_is_lgx

Author: mmaiers-nmdp

pyard/ard.py

@@ -834,6 +834,7 @@ def expand_mac(self, mac_code: str):
 
         raise InvalidMACError(f"{mac_code} is an invalid MAC.")
 
+    @functools.lru_cache()
     def lookup_mac(self, allelelist_gl: str):
         """
         Finds a MAC code corresponding to
@@ -856,10 +857,18 @@ def lookup_mac(self, allelelist_gl: str):
                 locus = allelelist_gl.split("*")[0]
                 return f"{locus}*{antigen_groups[0]}:{mac_code}"
 
-        # Try the list of first_field:second_field combinations
-        mac_expansion = "/".join(sorted(allele_fields))
+        # Try the given list order first with first_field:second_field combinations
+        mac_expansion = "/".join(allele_fields)
         mac_code = db.alleles_to_mac_code(self.db_connection, mac_expansion)
+        if mac_code:
+            locus = allelelist_gl.split("*")[0]
+            return f"{locus}*{antigen_groups[0]}:{mac_code}"
 
+        # Try the sorted list of first_field:second_field combinations
+        mac_expansion = "/".join(
+            sorted(allele_fields, key=functools.cmp_to_key(self.smart_sort_comparator))
+        )
+        mac_code = db.alleles_to_mac_code(self.db_connection, mac_expansion)
         if mac_code:
             locus = allelelist_gl.split("*")[0]
             return f"{locus}*{antigen_groups[0]}:{mac_code}"

tests/test_pyard.py

@@ -206,8 +206,17 @@ def test_is_null(self):
             self.ard.is_null(allele), msg="MACs shouldn't be called as Nulls"
         )
 
+
     def test_default_redux_is_lgx(self):
         allele = "A*24:BKKPV+A*26:03^B*15:BKNTS+B*15:07"
         lgx_redux = self.ard.redux(allele, "lgx")
         default_redux = self.ard.redux(allele)
         self.assertEqual(lgx_redux, default_redux, msg="Default redux should be lgx")
+
+        
+    def test_mac_is_reversible(self):
+        mac_code = "A*68:AJEBX"
+        expanded_mac = self.ard.expand_mac(mac_code)
+        lookup_mac = self.ard.lookup_mac(expanded_mac)
+        self.assertEqual(mac_code, lookup_mac, msg="MACs should be reversible")
+