hdx-python-country 4.1.1__tar.gz → 4.1.2__tar.gz

{hdx_python_country-4.1.1 → hdx_python_country-4.1.2}/.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 default_language_version:
-  python: python3.13
+  python: python3
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks

{hdx_python_country-4.1.1 → hdx_python_country-4.1.2}/PKG-INFO

@@ -1,8 +1,10 @@
 Metadata-Version: 2.4
 Name: hdx-python-country
-Version: 4.1.1
+Version: 4.1.2
 Summary: HDX Python country code and exchange rate (fx) utilities
 Project-URL: Homepage, https://github.com/OCHA-DAP/hdx-python-country
+Project-URL: Repository, https://github.com/OCHA-DAP/hdx-python-country
+Project-URL: Issues, https://github.com/OCHA-DAP/hdx-python-country/issues
 Author: Michael Rans
 License: MIT
 License-File: LICENSE
@@ -25,7 +27,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.10
-Requires-Dist: hdx-python-utilities<5,>=4.0.4
+Requires-Dist: hdx-python-utilities<5,>=4.1.2
 Requires-Dist: tenacity
 Provides-Extra: docs
 Requires-Dist: mkapi; extra == 'docs'

{hdx_python_country-4.1.1 → hdx_python_country-4.1.2}/pyproject.toml

@@ -36,7 +36,7 @@ dynamic = ["version"]
 requires-python = ">=3.10"
 
 dependencies = [
-    "hdx-python-utilities>=4.0.4,<5",
+    "hdx-python-utilities>=4.1.2,<5",
     "tenacity",
 ]
 
@@ -53,6 +53,8 @@ dev = [
 
 [project.urls]
 Homepage = "https://github.com/OCHA-DAP/hdx-python-country"
+Repository = "https://github.com/OCHA-DAP/hdx-python-country"
+Issues = "https://github.com/OCHA-DAP/hdx-python-country/issues"
 
 # ----------------------------------------------------------------------------
 # Hatchling (Build & Versioning)

hdx_python_country-4.1.2/src/hdx/location/_version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '4.1.2'
+__version_tuple__ = version_tuple = (4, 1, 2)
+
+__commit_id__ = commit_id = None

{hdx_python_country-4.1.1 → hdx_python_country-4.1.2}/src/hdx/location/wfp_api.py

@@ -1,4 +1,5 @@
 import logging
+from os import getenv
 from pathlib import Path
 from typing import Any
 
@@ -27,9 +28,10 @@ class WFPAPI:
         retriever: Retrieve object for interacting with WFP API
     """
 
-    token_url = "https://api.wfp.org/token"
-    base_url = "https://api.wfp.org/vam-data-bridges/6.0.0/"
-    scope = "gefs_geoless-items-countries_get vamdatabridges_commodities-list_get vamdatabridges_commodityunits-list_get vamdatabridges_marketprices-alps_get vamdatabridges_commodities-categories-list_get vamdatabridges_commodityunits-conversion-list_get vamdatabridges_marketprices-priceweekly_get vamdatabridges_markets-geojsonlist_get vamdatabridges_marketprices-pricemonthly_get vamdatabridges_markets-list_get vamdatabridges_currency-list_get vamdatabridges_currency-usdindirectquotation_get"
+    token_url = "https://login.microsoftonline.com/462ad9ae-d7d9-4206-b874-71b1e079776f/oauth2/v2.0/token"
+    base_url = "https://gateway.api.wfp.org/vam-data-bridges/v2/"
+    scope = "api://wfp-api-mediation-service/.default"
+    grant_type = "client_credentials"
     default_retry_params = {
         "retry": retry_if_exception_type(DownloadError),
         "after": after_log(logger, logging.INFO),
@@ -39,10 +41,20 @@ class WFPAPI:
         self,
         token_downloader: Download,
         retriever: Retrieve,
+        wfp_key: str | None = None,
+        wfp_secret: str | None = None,
     ):
         self.token_downloader = token_downloader
         self.retriever = retriever
         self.retry_params = {"attempts": 1, "wait": 1}
+        if wfp_key:
+            self._wfp_key = wfp_key
+        else:
+            self._wfp_key = getenv("WFP_KEY")
+        if wfp_secret:
+            self._wfp_secret = wfp_secret
+        else:
+            self._wfp_secret = getenv("WFP_SECRET")
 
     def get_retry_params(self) -> dict:
         return self.retry_params
@@ -57,8 +69,10 @@ class WFPAPI:
             self.token_url,
             post=True,
             parameters={
-                "grant_type": "client_credentials",
+                "grant_type": self.grant_type,
                 "scope": self.scope,
+                "client_id": self._wfp_key,
+                "client_secret": self._wfp_secret,
             },
         )
         bearer_token = self.token_downloader.get_json()["access_token"]
@@ -146,7 +160,7 @@ class WFPAPI:
                 else:
                     filename = f"{base_filename}_{countryiso3}_{page}.json"
                     log = f"{base_filename} for {countryiso3} page {page}"
-                    page_parameters["CountryCode"] = countryiso3
+                    page_parameters["countryCode"] = countryiso3
                 try:
                     json = self.retrieve(url, filename, log, page_parameters)
                 except FileNotFoundError:

{hdx_python_country-4.1.1 → hdx_python_country-4.1.2}/tests/fixtures/fixtures-download-global-pcode-lengths.csv

@@ -1,98 +1,69 @@
-Location,Country Length,Admin 1 Length,Admin 2 Length,Admin 3 Length,Admin 4 Length,Admin 5 Length
+Location,Country Length,Admin 1 Length,Admin 2 Length,Admin 3 Length,Admin 4 Length,Admin 5 Length
 AFG,2,2,2,,,
 AGO,2,2,3,3,,
-ALB,2,2,2,2,,
 ARE,2,2,,,,
-ARG,2,3,3,,,
-ARM,2,2,1,3,,
-ATG,2,2,,,,
+ARM,2,2,1,,,
 AZE,2,8,,,,
 BDI,3,3,3,,,
 BEN,2,2,2,,,
-BES,3,1,,,,
 BFA,2,2,2,2,,
-BGD,2,2,2,2,2,
+BGD,2,2,2,4,,
 BGR,2,3,3,,,
 BLR,2,3,3,,,
 BLZ,2,2,,,,
-BMU,2,2,1,,,
 BOL,2,2,2,2,,
-BRA,2,2,5,,,
-BRB,2,2,,,,
 BTN,2,3,2,,,
-BWA,2,2,2,2,,
-CAF,2,2,1,1,2,
+CAF,2,2,1,,,
 CHL,2,2,1,2,,
-CHN,2,3,3,,,
 CIV,2,2,2,2,,
 CMR,2,3,3,3,,
-COD,2,2,2,,,
+COD,2,2,2,4,,
 COG,2,2,2,,,
-COL,2,2,3,,,
+COL,2,2,3,2|3,,
 COM,2,1,1,1,,
 CPV,2,2,2,,,
 CRI,2,1,2,2,,
 CUB,2,2,2,,,
-CUW,2,2,,,,
-CYM,2,2,,,,
-DJI,2,2,2,,,
-DMA,2,2,,,,
 DOM,2,2,2,2,2,
 DZA,2,3,3,,,
 ECU,2,2,2,2,,
-EGY,2,2,2,,,
+EGY,2,2,2,2,,
 ERI,2,1,2,,,
 ESH,2,2,,,,
 ETH,2,2,2,2,,
-FJI,2,1,2,2,,
-FSM,2,1,2,,,
-GAB,3,3,3,,,
 GEO,2,2,2,,,
 GHA,2,2,2,,,
 GIN,2,3,3,2,,
-GLP,2,2,2,,,
 GMB,2,2,2,2,,
 GNB,2,2,2,,,
 GNQ,2,3,3,,,
 GRD,2,2,,,,
 GTM,2,2,2,,,
-GUF,2,1,3,,,
-GUY,2,2,2,,,
 HND,2,2,2,,,
 HTI,2,2,2,3,,
 HUN,2,3,3,,,
-IDN,2,2,2,3,,
+IDN,2,2,2,3,3,
 IRN,2,3,3,,,
 IRQ,2,3,3,3,,
-JAM,2,2,3,,,
-KAZ,3,3,3,,,
+JAM,2,2,2,2,,
 KEN,2,3,3,,,
-KGZ,2,11,0,0,,
+KGZ,2,11,,,,
 KHM,2,2,2,2,,
-KIR,2,1,2,,,
-KNA,2,2,,,,
 KWT,2,2,,,,
 LAO,2,2,2,,,
-LBN,2,1,1,1,,
+LBN,2,1,1,,,
 LBR,2,2,2,,,
 LBY,2,2,2,,,
-LCA,2,2,9,,,
 LKA,2,1,1,2,3,
-LSO,2,1,2,,,
-MAR,2,3,3,7,1,
+MAR,2,3,3,,,
 MDA,2,3,,,,
-MDG,2,2,7|3,-1|3,3,
-MDV,2,3,3,3,,
+MDV,2,3,3,,,
 MEX,2,2,3,,,
-MHL,2,2,2,,,
-MLI,2,2,2,2,,
-MMR,3,3,4,-1,3,3
+MLI,2,2,2,,,
+MMR,3,3,4,,3,3
 MNG,2,2,2,,,
 MOZ,2,2,2,2,,
-MRT,2,2,1,2,,
-MSR,2,2,,,,
-MTQ,2,2,2,,,
-MUS,2,2,,,,
+MRT,2,2,1,,,
 MWI,2,1,2,2,,
 MYS,2,2,2,,,
 NAM,2,2,2,,,
@@ -107,51 +78,34 @@ PER,2,2,2,2,,
 PHL,2,2,3,2,3,
 PNG,2,2,2,2,,
 POL,2,3,3,,,
-PRI,2,2,,,,
 PRK,2,2,2,,,
-PRY,2,2,2,,,
 PSE,2,2,2,,,
-QAT,3,3,3,,,
+QAT,3,3,3,3,,
 ROU,2,3,3,,,
-RUS,2,3,3,,,
-RWA,2,1,1,2,2,
 SAU,2,2,,,,
 SDN,2,2,3,,,
 SEN,2,2,2,2,,
-SLB,2,2,4,4,,
 SLE,2,2,2,2,2,
-SLV,2,2,2,,,
+SLV,2,2,3,3,,
 SOM,2,2,2,,,
 SSD,2,2,2,2,,
-STP,2,2,2,,,
-SUR,2,2,2,,,
 SVK,2,3,3,,,
 SWZ,2,1,2,,,
 SXM,2,1,,,,
-SYC,2,1,1,4,,
 SYR,2,2,2,2,,
-TCA,2,1,2,,,
-TCD,2,2,2,2,,
+TCD,3,2,2,,,
 TGO,2,2,2,2,,
 THA,2,2,2,2,,
-TJK,0,7,0,,,
 TLS,2,2,2,2,,
-TON,2,1,1,2,,
-TTO,2,2,,,,
 TUN,2,1,1,2,2,
-TUR,3,3,3,3,3,
-TZA,2,2,2,3|4,,
+TUR,3,3,3,,,
 UGA,2,1,3,2,2,
 UKR,2,2,2,3,3,
-URY,2,2,3,,,
-UZB,2,2,3,,,
-VCT,2,1,2,,,
+VCT,2,1,,,,
 VEN,2,2,2,2,,
-VGB,2,2,,,,
-VIR,2,3,5,,,
-VNM,2,3,2,,,
+VNM,2,2,,,,
 VUT,2,2,3,,,
-YEM,2,2,2,2,,
+YEM,2,2,2,,,
 ZAF,2,1,2,1,3,
 ZMB,2,3,3,3,3,
 ZWE,2,2,2,2,,