hdx-python-pipelineutils 0.0.6__tar.gz → 0.0.7__tar.gz

{hdx_python_pipelineutils-0.0.6 → hdx_python_pipelineutils-0.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: hdx-python-pipelineutils
-Version: 0.0.6
+Version: 0.0.7
 Summary: HDX Python Pipeline Utilities
 Project-URL: Homepage, https://github.com/OCHA-DAP/hdx-python-pipelineutils
 Author-email: Michael Rans <rans@email.com>

{hdx_python_pipelineutils-0.0.6 → hdx_python_pipelineutils-0.0.7}/src/hdx/pipelineutils/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.0.6'
-__version_tuple__ = version_tuple = (0, 0, 6)
+__version__ = version = '0.0.7'
+__version_tuple__ = version_tuple = (0, 0, 7)
 
 __commit_id__ = commit_id = None

{hdx_python_pipelineutils-0.0.6 → hdx_python_pipelineutils-0.0.7}/src/hdx/pipelineutils/hapi_admins.py

@@ -38,11 +38,29 @@ def complete_admins(
             warnings.append(f"PCode unknown {adm_code}->''")
             return ""
 
+    def get_pcode_from_names(level: int) -> str | None:
+        # Exact matching only, so that a wrong parent does not scope the
+        # child lookup to the wrong area
+        pcode = None
+        for j in range(level + 1):
+            if adm_codes[j] in admins[j].pcodes:
+                pcode = adm_codes[j]
+            elif provider_adm_names[j]:
+                pcode, _ = admins[j].get_pcode(
+                    countryiso3,
+                    provider_adm_names[j],
+                    parent=pcode,
+                    fuzzy_match=False,
+                )
+            else:
+                pcode = None
+        return pcode
+
     for i, provider_adm_name in reversed(list(enumerate(provider_adm_names))):
         adm_code = adm_codes[i]
         parent = admins[i].pcode_to_parent.get(adm_code)
         if not parent and i > 0:
-            parent = adm_codes[i - 1]
+            parent = adm_codes[i - 1] or get_pcode_from_names(i - 1) or ""
         if not provider_adm_name:
             provider_adm_name = ""
             provider_adm_names[i] = ""

{hdx_python_pipelineutils-0.0.6 → hdx_python_pipelineutils-0.0.7}/src/hdx/pipelineutils/sector_configuration.yaml

@@ -45,6 +45,7 @@ initial_lookup:
   camp coordination and camp management: "CCM"
   camp coordination camp management: "CCM"
   cash: "Cash"
+  cash multi sectoriel: "Cash"
   cash transfers: "Cash"
   cccm: "CCM"
   ccs: "CCM"

{hdx_python_pipelineutils-0.0.6 → hdx_python_pipelineutils-0.0.7}/tests/test_hapi_admins.py

@@ -96,6 +96,17 @@ class TestAdmins:
         assert adm_level == 2
         assert warnings == []
 
+        provider_adm_names = ["Kabul", "Qara Bagh"]
+        adm_codes = ["", ""]
+        adm_names = ["", ""]
+        adm_level, warnings = complete_admins(
+            admins, countryiso3, provider_adm_names, adm_codes, adm_names
+        )
+        assert adm_codes == ["AF01", "AF0114"]
+        assert adm_names == ["Kabul", "Qara Bagh"]
+        assert adm_level == 2
+        assert warnings == []
+
         provider_adm_names = ["Kabal", "Paghman"]
         adm_codes = ["AF01", ""]
         adm_names = ["", ""]

{hdx_python_pipelineutils-0.0.6 → hdx_python_pipelineutils-0.0.7}/tests/test_lookup.py

@@ -7,6 +7,8 @@ class TestLookup:
         sector = Sector()
         assert sector.get_code("child protection") == "PRO-CPN"
         assert sector.get_code("gestion des sites daccueil temporaires") == "SHL"
+        assert sector.get_code("Cash multi-sectoriel") == "Cash"
+        assert sector.get_code("Abris et Non vivres") == "SHL"
         assert "Intersectoral" in sector.get_code_to_name()
         assert sector.get_name("PRO-MIN") == "Mine Action"
         assert sector.get_name("xxx") is None