oda-data 2.0.4__tar.gz → 2.0.6__tar.gz

{oda_data-2.0.4 → oda_data-2.0.6}/PKG-INFO

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

{oda_data-2.0.4 → oda_data-2.0.6}/oda_data/api/sources.py

@@ -26,6 +26,7 @@ from oda_data.clean_data.validation import (
     check_integers,
     check_strings,
 )
+from oda_data.config import ODAPaths
 from oda_data.logger import logger
 from oda_data.tools.cache import OnDiskCache, generate_param_hash
 
@@ -51,7 +52,7 @@ class Source:
     """
 
     memory_cache = TTLCache(maxsize=20, ttl=6000)
-    disk_cache = OnDiskCache(config.ODAPaths.raw_data, ttl_seconds=86400)
+    disk_cache = OnDiskCache(ODAPaths.raw_data, ttl_seconds=86400)
 
     def __init__(self):
         self.de_providers = None
@@ -91,7 +92,7 @@ class DACSource(Source):
     """
 
     memory_cache = TTLCache(maxsize=20, ttl=6000)
-    disk_cache = OnDiskCache(config.ODAPaths.raw_data, ttl_seconds=86400)
+    disk_cache = OnDiskCache(ODAPaths.raw_data, ttl_seconds=86400)
 
     def __init__(self):
         super().__init__()
@@ -521,7 +522,7 @@ class AidDataSource(Source):
     """
 
     memory_cache = TTLCache(maxsize=20, ttl=6000)
-    disk_cache = OnDiskCache(config.ODAPaths.raw_data, ttl_seconds=86400)
+    disk_cache = OnDiskCache(ODAPaths.raw_data, ttl_seconds=86400)
 
     def __init__(self):
         super().__init__()

{oda_data-2.0.4 → oda_data-2.0.6}/oda_data/indicators/research/sector_imputations.py

@@ -230,7 +230,7 @@ def multilateral_spending_shares_by_channel_and_purpose_smoothed(
         )
     )
 
-    return data.drop(columns=[ODASchema.VALUE])
+    return data.drop(columns=[ODASchema.VALUE, ODASchema.PRICES, ODASchema.CURRENCY])
 
 
 def core_multilateral_contributions_by_provider(
@@ -313,12 +313,7 @@ def _compute_imputations(
     # Merge core contributions with spending shares
     data = multi_spending_shares.merge(
         core_contributions,
-        on=[
-            ODASchema.CHANNEL_CODE,
-            ODASchema.YEAR,
-            ODASchema.CURRENCY,
-            ODASchema.PRICES,
-        ],
+        on=[ODASchema.CHANNEL_CODE, ODASchema.YEAR],
         how="inner",
     )
 

{oda_data-2.0.4 → oda_data-2.0.6}/oda_data/tools/cache.py

@@ -2,11 +2,12 @@ import hashlib
 import json
 import time
 from pathlib import Path
-from typing import Any, Dict, Optional
+from typing import 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.4 → oda_data-2.0.6}/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.4 → oda_data-2.0.6}/pyproject.toml

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