pydeflate 2.1.0__py3-none-any.whl → 2.1.2__py3-none-any.whl

pydeflate/__init__.py

@@ -1,5 +1,5 @@
 __author__ = """Jorge Rivera"""
-__version__ = "2.1.0"
+__version__ = "2.1.2"
 
 from pydeflate.deflate.deflators import (
     oecd_dac_deflate,

pydeflate/core/api.py

@@ -176,6 +176,8 @@ class BaseExchange:
             pydeflate_data=self.pydeflate_data,
             entity_column=entity_column,
             ix=self._idx,
+            source_codes=self._idx[-1] == "pydeflate_entity_code",
+            dac=self.exchange_rates.source.name == "DAC",
         )
 
         # store unmatched data
@@ -365,6 +367,9 @@ class BaseDeflate:
             pydeflate_data=self.pydeflate_data,
             entity_column=entity_column,
             ix=self._idx,
+            source_codes=self.use_source_codes,
+            dac=self.exchange_deflator.source.name == "DAC"
+            or self.price_deflator.source.name == "DAC",
         )
 
         # store unmatched data

pydeflate/sources/common.py

@@ -59,7 +59,10 @@ def _match_regex_to_iso3(
     matches = {}
 
     for match in to_match:
-        match_ = country.get_iso3_country_code_fuzzy(match)[0]
+        try:
+            match_ = country.get_iso3_country_code_fuzzy(match)[0]
+        except:
+            match_ = None
         matches[match] = match_
         if match_ is None and match not in additional_mapping:
             logger.debug(f"No ISO3 match found for {match}")

pydeflate/utils.py

@@ -51,21 +51,68 @@ def create_pydeflate_year(
     return data
 
 
+def _use_implied_dac_rates(
+    data: pd.DataFrame,
+    pydeflate_data: pd.DataFrame,
+    ix: list[str],
+    entity_column: str,
+    source_codes: bool,
+) -> pd.DataFrame:
+    """When rates are missing for entities in DAC data, the correct behaviour is to use
+    the DAC overall rates"""
+
+    # Assign the DAC code to a temporary column
+    data.loc[
+        lambda d: ~d[f"temp_{entity_column}"].isin(pydeflate_data[ix[-1]].unique()),
+        f"temp_{entity_column}",
+    ] = (
+        20001 if source_codes else "DAC"
+    )
+
+    # Log the fact that implied rates are being used
+    flag_missing_pydeflate_data(
+        unmatched_data=data.loc[
+            lambda d: ~d[f"{entity_column}"].isin(pydeflate_data[ix[-1]].unique())
+        ],
+        entity_column=entity_column,
+        year_column="pydeflate_year",
+        using_implied=True,
+    )
+
+    return data
+
+
 def merge_user_and_pydeflate_data(
     data: pd.DataFrame,
     pydeflate_data: pd.DataFrame,
     entity_column: str,
     ix: list[str],
+    source_codes: bool = True,
+    dac: bool = False,
 ) -> pd.DataFrame:
-    return data.merge(
+
+    data[f"temp_{entity_column}"] = data[entity_column]
+
+    if dac:
+        data = _use_implied_dac_rates(
+            data=data,
+            pydeflate_data=pydeflate_data,
+            ix=ix,
+            entity_column=entity_column,
+            source_codes=source_codes,
+        )
+
+    df_ = data.merge(
         pydeflate_data,
         how="outer",
-        left_on=["pydeflate_year", entity_column],
+        left_on=["pydeflate_year", f"temp_{entity_column}"],
         right_on=ix,
         suffixes=("", "_pydeflate"),
         indicator=True,
     ).pipe(enforce_pyarrow_types)
 
+    return df_.drop(columns=[f"temp_{entity_column}"])
+
 
 def get_unmatched_pydeflate_data(
     merged_data: pd.DataFrame,
@@ -86,7 +133,10 @@ def get_matched_pydeflate_data(
 
 
 def flag_missing_pydeflate_data(
-    unmatched_data: pd.DataFrame, entity_column: str, year_column: str
+    unmatched_data: pd.DataFrame,
+    entity_column: str,
+    year_column: str,
+    using_implied: bool = False,
 ):
     """Flag data which is present in the input data but missing in pydeflate's data."""
     if unmatched_data.empty:
@@ -102,4 +152,9 @@ def flag_missing_pydeflate_data(
     missing_str = "\n".join(f"{entity}: {years}" for entity, years in missing.items())
 
     # log all missing data
-    logger.info(f"Missing exchange data for:\n{missing_str}")
+    message = (
+        "Using DAC members' rates (given missing data) for:"
+        if using_implied
+        else "Missing exchange data for:"
+    )
+    logger.info(f"{message}\n{missing_str}")

{pydeflate-2.1.0.dist-info → pydeflate-2.1.2.dist-info}/METADATA

@@ -1,26 +1,23 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: pydeflate
-Version: 2.1.0
+Version: 2.1.2
 Summary: Package to convert current prices figures to constant prices and vice versa
 License: MIT
 Author: Jorge Rivera
 Author-email: jorge.rivera@one.org
-Requires-Python: >=3.10,<4.0
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: End Users/Desktop
-Classifier: Intended Audience :: Science/Research
+Requires-Python: >=3.10, <4.0
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: hdx-python-country (>=3.8.1,<4.0.0)
-Requires-Dist: imf-reader (>=1.1.0,<2.0.0)
-Requires-Dist: oda-reader (>=1.0.0,<2.0.0)
-Requires-Dist: pandas (>=2,<3)
-Requires-Dist: pyarrow (>14)
+Requires-Dist: hdx-python-country (>=3.8,<4.0.0)
+Requires-Dist: imf-reader (>=1.2.0,<2.0.0)
+Requires-Dist: oda-reader (>=1.0.5,<2.0.0)
+Requires-Dist: pandas (>=2.2.3,<3.0.0)
+Requires-Dist: pyarrow (>=14.0)
+Requires-Dist: requests (>=2.32.3,<3.0.0)
 Requires-Dist: wbgapi (>=1.0.12,<2.0.0)
 Description-Content-Type: text/markdown
 

{pydeflate-2.1.0.dist-info → pydeflate-2.1.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 pydeflate/.pydeflate_data/README.md,sha256=atNtUL9dD8G184YSd6juFib8TgEQBcSLogiz99APPVs,25
-pydeflate/__init__.py,sha256=1e1NQwoAS1lx5d3w3O_5n7v4NKf3PibDlvCBvsnQZFk,1013
+pydeflate/__init__.py,sha256=LFrWXqC2bHJU0QJSUOUtWPW_YJ3e31Jg54zGXZUt0jc,1013
 pydeflate/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pydeflate/core/api.py,sha256=DATtc-DIo38bziP8S-XLsGn1J709v3vnNYMy5poLx3c,14397
+pydeflate/core/api.py,sha256=mD5zhGlAIvlpT6KcmrHW5rmYwtEq5x2Pqo-jQCQMGpo,14687
 pydeflate/core/deflator.py,sha256=Ax3dmOF3tYRZnkIfFvMMo3SOLgAJHkXSmA-OtIUZkp0,5932
 pydeflate/core/exchange.py,sha256=br6RVgTGa7LW09XemUJZ4Koazf65zuXPQKYKGhS6ROM,8535
 pydeflate/core/source.py,sha256=n603ocgGjthXNcBWwgADkefxWmSFuN77Km9Z0T2zpIg,2027
@@ -14,12 +14,12 @@ pydeflate/pydeflate_config.py,sha256=5s4SLJf5is5XcUgJHDRx4f27pPiaVh0H2BL8w9QjW0k
 pydeflate/settings/emu.json,sha256=BIvbiMUeHUtCESR3sMcBNrS028yp2YraCJdhDJGvAAo,133
 pydeflate/settings/oecd_codes.json,sha256=jAKI1EgQP4rttjoG3Z-44r1tUJrIEzPCZF5V2aboQhE,911
 pydeflate/sources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pydeflate/sources/common.py,sha256=TvoN3jnqn0xXNuxM52vvgSLA5WRGX8PUD-b5YH6S7GE,9882
+pydeflate/sources/common.py,sha256=aQ0p8fOccFZnq93tTmHJbPyF13BJbZep8QP-yzizfcE,9941
 pydeflate/sources/dac.py,sha256=ngFiApGZ_tIQg74ogGVTIbGUA0efnF1SYwfUuqGofOQ,3791
 pydeflate/sources/imf.py,sha256=10vc8xhNJvANb7RDD1WFn9oaZ8g53yUV5LxCQCz6ImM,6337
 pydeflate/sources/world_bank.py,sha256=uMHidFVgEpj1HVUnNhIZV-rV64hsCBV9ZAbYKk6H0Vw,9333
-pydeflate/utils.py,sha256=VFY-xcpnh7wQ1WGxA2sniJmNlzEasRr4UzNWbdBz2C0,2535
-pydeflate-2.1.0.dist-info/LICENSE,sha256=q5tm9mQxwSbV5Ivvjxs7MMqBgan6DM8I4r4irPvmqZM,1075
-pydeflate-2.1.0.dist-info/METADATA,sha256=Ou2ipM2d6xpysEoLxYCvUc9YoNGVCUiIjOs-RWWmYOQ,12582
-pydeflate-2.1.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pydeflate-2.1.0.dist-info/RECORD,,
+pydeflate/utils.py,sha256=tJBd271WzZxVhW9ZMiIRHR0fZWr_MagAYLdmXXaUY3M,3983
+pydeflate-2.1.2.dist-info/LICENSE,sha256=q5tm9mQxwSbV5Ivvjxs7MMqBgan6DM8I4r4irPvmqZM,1075
+pydeflate-2.1.2.dist-info/METADATA,sha256=1uagncn8PNwpR-ID4-S1CC2cv4ybE6AbpDndTjKM6zo,12437
+pydeflate-2.1.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pydeflate-2.1.2.dist-info/RECORD,,

{pydeflate-2.1.0.dist-info → pydeflate-2.1.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 2.1.3
 Root-Is-Purelib: true
 Tag: py3-none-any