oda-data 2.0.3__tar.gz → 2.0.5__tar.gz

{oda_data-2.0.3 → oda_data-2.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: oda_data
-Version: 2.0.3
+Version: 2.0.5
 Summary: A python package to work with Official Development Assistance data from the OECD DAC.
 License: MIT
 Author: Jorge Rivera

{oda_data-2.0.3 → oda_data-2.0.5}/oda_data/indicators/research/policy_markers.py

@@ -100,7 +100,11 @@ def bilateral_policy_marker(
     crs = CRSData(providers=providers, years=years, recipients=recipients)
 
     # Read the data and group by provider and purpose
-    data = crs.read(columns=grouper + [measure], additional_filters=filters)
+    data = crs.read(
+        columns=grouper + [measure],
+        additional_filters=filters,
+        using_bulk_download=True,
+    )
 
     # if marker is not_screened, we need to filter out the screened data
     if marker == "not_screened":

{oda_data-2.0.3 → oda_data-2.0.5}/oda_data/indicators/research/sector_imputations.py

@@ -183,6 +183,7 @@ def spending_by_purpose(
         crs.read(
             columns=grouper + [measure],
             additional_filters=filters,
+            using_bulk_download=True,
         )
         .groupby(grouper, dropna=False, observed=True)[[measure]]
         .sum()
@@ -279,7 +280,11 @@ def core_multilateral_contributions_by_provider(
 
     # Read the data and group by provider and channel
     data = (
-        ms.read(columns=cols + [ODASchema.AMOUNT], additional_filters=filters)
+        ms.read(
+            columns=cols + [ODASchema.AMOUNT],
+            additional_filters=filters,
+            using_bulk_download=True,
+        )
         .groupby(cols, dropna=False, observed=True)[[ODASchema.AMOUNT]]
         .sum()
         .reset_index()

{oda_data-2.0.3 → oda_data-2.0.5}/oda_data/tools/cache.py

@@ -7,6 +7,7 @@ from typing import Any, Dict, Optional
 import pandas as pd
 
 from oda_data.logger import logger
+from oda_data.tools.names.create_mapping import snake_to_pascal
 
 
 def generate_param_hash(filters: list[tuple]) -> str:
@@ -48,6 +49,13 @@ class OnDiskCache:
     ) -> pd.DataFrame | None:
         """Loads a DataFrame from disk if available and not expired."""
         path = self.get_file_path(dataset_name, param_hash)
+        if dataset_name == "MultiSystemData":
+            columns = [snake_to_pascal(col) for col in columns] if columns else columns
+            filters = (
+                [(snake_to_pascal(col), op, val) for col, op, val in filters]
+                if filters
+                else None
+            )
         if not path.exists():
             return None
         if self._is_expired(path):

{oda_data-2.0.3 → oda_data-2.0.5}/oda_data/tools/names/create_mapping.py

@@ -7,6 +7,38 @@ from oda_data.config import ODAPaths
 from oda_data.indicators.common import update_mapping_file
 
 
+def snake_to_pascal(name: str, *, keep_single_letter: bool = False) -> str:
+    """
+    Convert a snake_case string to PascalCase.
+
+    Parameters
+    ----------
+    name : str
+        The snake_case identifier to convert.
+    keep_single_letter : bool, default False
+        If True, preserve the underscore that precedes a 1-letter
+        segment (e.g. 'aid_t' → 'Aid_T').  If False, drop it
+        ('aid_t' → 'AidT').
+
+    Returns
+    -------
+    str
+        The PascalCase version.
+    """
+    parts = name.split("_")
+    if not keep_single_letter:
+        # Simple path: just capitalise everything and join.
+        return "".join(p.capitalize() for p in parts)
+
+    # Preserve “_” before any single-letter trailing part.
+    out: list[str] = []
+    for part in parts:
+        if len(part) == 1 and out:
+            out[-1] = out[-1] + "_" + part.upper()
+        else:
+            out.append(part.capitalize())
+    return "".join(out)
+
 def _code_name(df: pd.DataFrame, code_col: str, name_col: str) -> dict:
     """Return a dictionary mapping code to name."""
     return (

{oda_data-2.0.3 → oda_data-2.0.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "oda_data"
-version = "2.0.3"
+version = "2.0.5"
 description = "A python package to work with Official Development Assistance data from the OECD DAC."
 readme = "README.md"
 authors = [