pydeflate 2.0.0__py3-none-any.whl → 2.0.2__py3-none-any.whl

pydeflate/__init__.py

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

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/core/exchange.py

@@ -110,17 +110,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/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.dist-info → pydeflate-2.0.2.dist-info}/METADATA

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

{pydeflate-2.0.0.dist-info → pydeflate-2.0.2.dist-info}/RECORD

@@ -1,9 +1,9 @@
 pydeflate/.pydeflate_data/README.md,sha256=atNtUL9dD8G184YSd6juFib8TgEQBcSLogiz99APPVs,25
-pydeflate/__init__.py,sha256=i6sHAqjE6qoEc4l1Gy1w7PN6BVhR61RqVBpn3BSDrSc,975
+pydeflate/__init__.py,sha256=ucS093TzuhZ6Gxr-GQ4KCMU6RY0vqCZjemGukpcc_kM,975
 pydeflate/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pydeflate/core/api.py,sha256=1MzGu8xLgbUWksy_IMBuK_HgyPLSFawMgLLJsNKJSok,14351
+pydeflate/core/api.py,sha256=-MpFRtn9H99B72M_m3-dwQe9zp0gUkBJJhMaG8iDcBU,14329
 pydeflate/core/deflator.py,sha256=Ax3dmOF3tYRZnkIfFvMMo3SOLgAJHkXSmA-OtIUZkp0,5932
-pydeflate/core/exchange.py,sha256=chPqAo_MjEcwb49GVBlTu0s8ZhFchnjtZVCYsvVp_d0,8532
+pydeflate/core/exchange.py,sha256=br6RVgTGa7LW09XemUJZ4Koazf65zuXPQKYKGhS6ROM,8535
 pydeflate/core/source.py,sha256=tIN9fAPhhE-6C5Ye608qTMQblm3yva7u5p1nJwepXm4,1724
 pydeflate/deflate/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pydeflate/deflate/deflators.py,sha256=hyLFoX46BAn5m8gTLjw-TFv3x3W6CTQmvmUvq5a_cio,7768
@@ -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=Ot0AKeQx2M7juID8qvFFpiPcCJNR9UzrpYLonTcHyCQ,9630
+pydeflate/sources/common.py,sha256=ctSL2JQ_6kVSSGkh7UphU98G-HTJL0s8JvSMic-EGnY,9881
 pydeflate/sources/dac.py,sha256=ngFiApGZ_tIQg74ogGVTIbGUA0efnF1SYwfUuqGofOQ,3791
 pydeflate/sources/imf.py,sha256=10vc8xhNJvANb7RDD1WFn9oaZ8g53yUV5LxCQCz6ImM,6337
 pydeflate/sources/world_bank.py,sha256=YxQgUUDMXlPArIfvYJTjNIAU5_I_OeUYDzc7NtTq9EA,6288
 pydeflate/utils.py,sha256=sfocGBQook3S7gvutCFovknyCv0cV37MHPJB-EMIumQ,2321
-pydeflate-2.0.0.dist-info/LICENSE,sha256=q5tm9mQxwSbV5Ivvjxs7MMqBgan6DM8I4r4irPvmqZM,1075
-pydeflate-2.0.0.dist-info/METADATA,sha256=MxV_NdB1JYX3or3k1EoMS5nDuY2dItSNHgZVCJIrq_o,12582
-pydeflate-2.0.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pydeflate-2.0.0.dist-info/RECORD,,
+pydeflate-2.0.2.dist-info/LICENSE,sha256=q5tm9mQxwSbV5Ivvjxs7MMqBgan6DM8I4r4irPvmqZM,1075
+pydeflate-2.0.2.dist-info/METADATA,sha256=myZ1BRAU-zIm3N4uLXUslMJuyGFQNWmGmCcIqldOCf8,12582
+pydeflate-2.0.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+pydeflate-2.0.2.dist-info/RECORD,,