Make some private methods to public

Author: pbashyal-nmdp

.github/workflows/python-tests.yml

@@ -41,6 +41,6 @@ jobs:
     - name: Run Unit Tests
       run: |
         # When run the first time, it'll build the library
-        python -m unittest tests.unit.test_pyard tests.unit.test_smart_sort
+        pytest
         # When run the second time, it should use the already installed library
-        python -m unittest tests.unit.test_pyard tests.unit.test_smart_sort
+        pytest

pyard/ard.py

@@ -237,7 +237,7 @@ def _redux_allele(
                     )
                     if "/" in twice_redux_allele:
                         return twice_redux_allele
-                    if self._is_valid_allele(twice_redux_allele):
+                    if self.is_valid_allele(twice_redux_allele):
                         return twice_redux_allele
 
         if redux_type == "G" and allele in self.ars_mappings.g_group:
@@ -821,11 +821,11 @@ def _is_valid(self, allele: str) -> bool:
             and not self.is_v2(allele)
             and not self.is_shortnull(allele)
         ):
-            return self._is_valid_allele(allele)
+            return self.is_valid_allele(allele)
 
         return True
 
-    def _is_valid_allele(self, allele):
+    def is_valid_allele(self, allele):
         """
         Is the given allele valid?
 

pyard/ard_refactored.py

@@ -181,7 +181,7 @@ def _redux_allele(
             if allele in self.ars_mappings.p_not_g:
                 not_g_allele = self.ars_mappings.p_not_g[allele]
                 if redux_type == "lg":
-                    return self.allele_reducer._add_lg_suffix(not_g_allele)
+                    return self.allele_reducer.add_lg_suffix(not_g_allele)
                 return not_g_allele
             else:
                 redux_allele = self._redux_allele(allele, redux_type, False)
@@ -280,7 +280,7 @@ def redux(self, glstring: str, redux_type: VALID_REDUCTION_TYPE = "lgx") -> str:
         # Handle MAC
         if self._config["reduce_MAC"] and code.isalpha():
             if self.mac_handler.is_mac(allele):
-                alleles = self.mac_handler._get_alleles(code, loc_antigen)
+                alleles = self.mac_handler.get_alleles(code, loc_antigen)
                 if is_hla_prefix:
                     alleles = [f"HLA-{a}" for a in alleles]
                 return self.redux("/".join(alleles), redux_type)

pyard/handlers/allele_reducer.py

@@ -23,11 +23,11 @@ def reduce_allele(
         strategy = self.strategy_factory.get_strategy(redux_type)
         return strategy.reduce(allele)
 
-    def _add_lg_suffix(self, redux_allele):
+    def add_lg_suffix(self, redux_allele):
         """Add lg suffix to reduced allele - kept for backward compatibility"""
         if "/" in redux_allele:
             return "/".join(
-                [self._add_lg_suffix(allele) for allele in redux_allele.split("/")]
+                [self.add_lg_suffix(allele) for allele in redux_allele.split("/")]
             )
         if self.ard._config["ARS_as_lg"]:
             return redux_allele + "ARS"

pyard/handlers/mac_handler.py

@@ -48,10 +48,10 @@ def expand_mac(self, mac_code: str) -> str:
             if HLA_regex.search(mac_code):
                 locus_antigen = locus_antigen.split("-")[1]
                 return "/".join(
-                    ["HLA-" + a for a in self._get_alleles(code, locus_antigen)]
+                    ["HLA-" + a for a in self.get_alleles(code, locus_antigen)]
                 )
             else:
-                return "/".join(self._get_alleles(code, locus_antigen))
+                return "/".join(self.get_alleles(code, locus_antigen))
         raise InvalidMACError(f"{mac_code} is an invalid MAC.")
 
     def lookup_mac(self, allelelist_gl: str) -> str:
@@ -89,7 +89,7 @@ def lookup_mac(self, allelelist_gl: str) -> str:
 
         raise InvalidMACError(f"{allelelist_gl} does not have a MAC.")
 
-    def _get_alleles(self, code, locus_antigen) -> Iterable[str]:
+    def get_alleles(self, code, locus_antigen) -> Iterable[str]:
         """Get alleles for MAC code"""
         alleles = db.mac_code_to_alleles(self.ard.db_connection, code)