oda-data 2.3.2__tar.gz → 2.4.1__tar.gz

{oda_data-2.3.2 → oda_data-2.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: oda-data
-Version: 2.3.2
+Version: 2.4.1
 Summary: A python package to work with Official Development Assistance data from the OECD DAC.
 Author: Jorge Rivera, Miguel Haro Ruiz
 Author-email: Jorge Rivera <jorge.rivera@one.org>, Miguel Haro Ruiz <miguel.haroruiz@one.org>
@@ -18,7 +18,7 @@ Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: cachetools>=6.2.0
 Requires-Dist: filelock>=3.20.0
-Requires-Dist: oda-reader>=1.3.1
+Requires-Dist: oda-reader>=1.4.1
 Requires-Dist: pandas[excel,parquet,performance]>=2.2.0
 Requires-Dist: pydeflate>=2.3.3
 Requires-Dist: reader>=3.18

{oda_data-2.3.2 → oda_data-2.4.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "oda_data"
-version = "2.3.2"
+version = "2.4.1"
 description = "A python package to work with Official Development Assistance data from the OECD DAC."
 requires-python = ">=3.11"
 
@@ -28,7 +28,7 @@ classifiers = [
 dependencies = [
     "cachetools>=6.2.0",
     "filelock>=3.20.0",
-    "oda-reader>=1.3.1",
+    "oda-reader>=1.4.1",
     "pandas[excel,parquet,performance]>=2.2.0",
     "pydeflate>=2.3.3",
     "reader>=3.18",

{oda_data-2.3.2 → oda_data-2.4.1}/src/oda_data/api/oecd.py

@@ -120,6 +120,8 @@ class OECDClient:
             for col in columns:
                 if source == "CRS":
                     continue
+                if self.use_bulk_download and source == "DAC2A":
+                    continue
                 to_filter = []
                 for measure in self.measure:
                     to_filter.append(get_measure_filter(source, measure))

{oda_data-2.3.2 → oda_data-2.4.1}/src/oda_data/api/sources.py

@@ -5,6 +5,7 @@ from pathlib import Path
 
 import pandas as pd
 from oda_reader import (
+    bulk_download_dac2a,
     download_crs,
     download_dac1,
     download_dac2a,
@@ -561,7 +562,7 @@ class DAC2AData(DACSource):
 
         def fetcher(target_path: Path):
             logger.info("Downloading DAC2A bulk data")
-            df = download_dac2a()  # No filters = full dataset
+            df = bulk_download_dac2a()  # No filters = full dataset
             df = df.pipe(clean_raw_df)  # Clean column names before caching
             logger.info("Writing DAC2A bulk data to cache")
             df.to_parquet(target_path)

{oda_data-2.3.2 → oda_data-2.4.1}/src/oda_data/clean_data/schema.py

@@ -141,6 +141,7 @@ class ODASchema:
     KEYWORDS: str = "keywords"
     BUDGET_IDENTIFIER: str = "budget_ident"
     PSI_GRANT_EQ_USD: str = "usd_psi_gr_eq_memo"
+    DATA_TYPE_CODE: str = "data_type_code"
 
 
 CORE_CRS_MAPPING: dict[str, str] = {
@@ -433,6 +434,9 @@ CRS_MAPPING: dict[str, str] = CORE_CRS_MAPPING | {
     "climate_mitigation": ODASchema.MITIGATION,
     "budget_ident": ODASchema.BUDGET_IDENTIFIER,
     "usd_psi_gr_eq_memo": ODASchema.PSI_GRANT_EQ_USD,
+    "datatype_code": ODASchema.DATA_TYPE_CODE,
+    "donor": ODASchema.PROVIDER_NAME,
+    "recipient": ODASchema.RECIPIENT_NAME,
 }