pydeflate 2.0.0__tar.gz → 2.0.1__tar.gz

{pydeflate-2.0.0 → pydeflate-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pydeflate
-Version: 2.0.0
+Version: 2.0.1
 Summary: Package to convert current prices figures to constant prices and vice versa
 License: MIT
 Author: Jorge Rivera

{pydeflate-2.0.0 → pydeflate-2.0.1}/pydeflate/__init__.py

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

{pydeflate-2.0.0 → pydeflate-2.0.1}/pydeflate/core/api.py

@@ -318,9 +318,9 @@ class BaseDeflate:
             pd.Series: Series with combined deflator values.
         """
         return (
-            (10_000 * exchange_rate) / (price_def * exchange_def)
+            (exchange_def * exchange_rate) / price_def
             if self.to_current
-            else (price_def * exchange_def) / (10_000 * exchange_rate)
+            else price_def / (exchange_def * exchange_rate)
         )
 
     def _merge_components(self, df: pd.DataFrame, other: pd.DataFrame):

{pydeflate-2.0.0 → pydeflate-2.0.1}/pydeflate/core/exchange.py

@@ -37,6 +37,8 @@ class Exchange:
             self.exchange_data = self.exchange_rate(
                 self.source_currency, self.target_currency
             )
+            if self.source_currency == "USA":
+                self.exchange_data["pydeflate_EXCHANGE_D"] = 1
 
     def _get_exchange_rate(self, currency):
         """Helper function to fetch exchange rates for a given currency."""
@@ -110,17 +112,17 @@ class Exchange:
             pydeflate_EXCHANGE=lambda d: d.pydeflate_EXCHANGE / d.pydeflate_EXCHANGE_to
         )
 
-        # Drop unnecessary columns
-        merged = merged.drop(columns=merged.filter(regex="_to$").columns, axis=1)
-
         # Compute the exchange rate deflator
         merged = compute_exchange_deflator(
             merged,
-            exchange="pydeflate_EXCHANGE",
+            exchange="pydeflate_EXCHANGE_to",
             year="pydeflate_year",
             grouper=["pydeflate_entity_code", "pydeflate_iso3"],
         )
 
+        # Drop unnecessary columns
+        merged = merged.drop(columns=merged.filter(regex="_to$").columns, axis=1)
+
         return merged
 
     def exchange(

{pydeflate-2.0.0 → pydeflate-2.0.1}/pydeflate/sources/common.py

@@ -207,6 +207,13 @@ def compute_exchange_deflator(
         exchange: str = "EXCHANGE",
         year: str = "year",
     ) -> pd.DataFrame:
+
+        # if needed, clean exchange name
+        if exchange.endswith("_to") or exchange.endswith("_from"):
+            exchange_name = exchange.rsplit("_", 1)[0]
+        else:
+            exchange_name = exchange
+
         # Identify the base year for the deflator
         if measure is not None:
             base_year = identify_base_year(group, measure=measure, year=year)
@@ -222,7 +229,9 @@ def compute_exchange_deflator(
 
         # If base value is found and valid, calculate the deflator
         if base_value.size > 0 and pd.notna(base_value[0]):
-            group[f"{exchange}_D"] = round(100 * group[exchange] / base_value[0], 6)
+            group[f"{exchange_name}_D"] = round(
+                100 * group[exchange] / base_value[0], 6
+            )
 
         return group
 

{pydeflate-2.0.0 → pydeflate-2.0.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pydeflate"
-version = "2.0.0"
+version = "2.0.1"
 description = "Package to convert current prices figures to constant prices and vice versa"
 authors = ["Jorge Rivera <jorge.rivera@one.org>"]
 license = "MIT"