add cache clearing and testing

src/imf_reader/sdr/__init__.py

@@ -50,3 +50,4 @@
 from imf_reader.sdr.read_interest_rate import fetch_interest_rates
 from imf_reader.sdr.read_exchange_rate import fetch_exchange_rates
 from imf_reader.sdr.read_announcements import fetch_allocations_holdings
+from imf_reader.sdr.clear_cache import clear_cache

src/imf_reader/sdr/clear_cache.py

@@ -0,0 +1,39 @@
+from imf_reader.sdr.read_announcements import (
+    get_holdings_and_allocations_data,
+    get_latest_date,
+)
+from imf_reader.sdr.read_exchange_rate import fetch_exchange_rates
+from imf_reader.sdr.read_interest_rate import fetch_interest_rates
+from imf_reader.config import logger
+
+
+def clear_cache():
+    """Clear the cache for all lru_cache-decorated functions."""
+
+    cleared_caches = 0
+
+    # read_announcements
+    if (
+        get_holdings_and_allocations_data.cache_info().currsize > 0
+        or get_latest_date.cache_info().currsize > 0
+    ):
+        get_holdings_and_allocations_data.cache_clear()
+        get_latest_date.cache_clear()
+        cleared_caches += 1
+        logger.info("Cache cleared - Holdings and allocations")
+
+    # read_exchange_rate
+    if fetch_exchange_rates.cache_info().currsize > 0:
+        fetch_exchange_rates.cache_clear()
+        cleared_caches += 1
+        logger.info("Cache cleared - Exchange rates")
+
+    # read_interest_rate
+    if fetch_interest_rates.cache_info().currsize > 0:
+        fetch_interest_rates.cache_clear()
+        cleared_caches += 1
+        logger.info("Cache cleared - Interest rates")
+
+    if cleared_caches == 0:
+
+        logger.info("Unable to clear cache - No cached data")

src/imf_reader/sdr/read_announcements.py

@@ -12,7 +12,7 @@
 from datetime import datetime
 
 from imf_reader.utils import make_request
-from imf_reader.config import logger, NoDataError
+from imf_reader.config import logger
 
 BASE_URL = "https://www.imf.org/external/np/fin/tad/"
 MAIN_PAGE_URL = "https://www.imf.org/external/np/fin/tad/extsdr1.aspx"
@@ -104,10 +104,3 @@ def fetch_allocations_holdings(date: tuple[int, int] | None = None) -> pd.DataFr
         date = get_latest_date()
 
     return get_holdings_and_allocations_data(*date)
-
-
-def clear_cache():
-    """Clear the cache for all lru_cache-decorated functions."""
-    get_holdings_and_allocations_data.cache_clear()
-    get_latest_date.cache_clear()
-    logger.info("Cache cleared")

src/imf_reader/sdr/read_exchange_rate.py

@@ -119,9 +119,3 @@ def fetch_exchange_rates(unit_basis: Literal["SDR", "USD"] = "SDR") -> pd.DataFr
 
     df = get_exchange_rates_data()
     return parse_data(df, unit_basis)
-
-
-def clear_cache():
-    """Clear the cache for all lru_cache-decorated functions."""
-    fetch_exchange_rates.cache_clear()
-    logger.info("Cache cleared")

src/imf_reader/sdr/read_interest_rate.py

@@ -124,9 +124,3 @@ def fetch_interest_rates() -> pd.DataFrame:
     df = clean_data(df)
 
     return df
-
-
-def clear_cache():
-    """Clear the cache for all lru_cache-decorated functions."""
-    fetch_interest_rates.cache_clear()
-    logger.info("Cache cleared")

tests/test_sdr/test_read_announcements.py

@@ -1,14 +1,14 @@
-from unittest.mock import patch, Mock, MagicMock
+from unittest.mock import patch, Mock
 import pytest
 import pandas as pd
+from imf_reader import sdr
 from imf_reader.sdr.read_announcements import (
     read_tsv,
     clean_df,
     format_date,
     get_holdings_and_allocations_data,
     get_latest_date,
     fetch_allocations_holdings,
-    clear_cache,
     BASE_URL,
     MAIN_PAGE_URL,
 )
@@ -34,9 +34,9 @@ class TestReadAnnouncements:
     """Tests functions in the read_announcements module."""
 
     @pytest.fixture(autouse=True)
-    def clear_cache(self):
+    def auto_clear_cache(self):
         """Clear cache before each test."""
-        clear_cache()
+        sdr.clear_cache()
 
     @patch("pandas.read_csv")
     def test_read_tsv_success(self, mock_read_csv):

tests/test_sdr/test_read_exchange_rate.py

@@ -2,15 +2,15 @@
 import pytest
 import requests
 import pandas as pd
+from imf_reader import sdr
 from imf_reader.sdr.read_exchange_rate import (
     preprocess_data,
     fetch_exchange_rates,
     get_exchange_rates_data,
     extract_exchange_series,
     extract_dates_series,
     parse_data,
-    BASE_URL,
-    clear_cache,
+    BASE_URL
 )
 
 
@@ -32,9 +32,9 @@ def input_df():
 class TestExchangeRateModule:
 
     @pytest.fixture(autouse=True)
-    def clear_cache(self):
+    def auto_clear_cache(self):
         """Clear cache before each test."""
-        clear_cache()
+        sdr.clear_cache()
 
     @patch("requests.post")
     def test_get_exchange_rates_data_success(self, mock_post):
@@ -207,37 +207,4 @@ def test_fetch_exchange_rates(self, mock_parse_data, mock_get_data, input_df):
             mock_get_data.assert_called_once()
             mock_parse_data.assert_called_once_with(mock_get_data.return_value, "USD")
             pd.testing.assert_frame_equal(result, expected_df)
-            mock_logger.assert_called_once_with("Fetching exchange rate data")
-
-    @patch("imf_reader.sdr.read_exchange_rate.parse_data")
-    def test_cache_clear(input_df, mock_parse_data):
-        """
-        Test cache clearing behavior.
-        """
-        with patch(
-            "imf_reader.sdr.read_exchange_rate.get_exchange_rates_data"
-        ) as mock_get_data:
-            # Simulate get_exchange_rates_data returning the input fixture
-            mock_get_data.return_value = input_df
-            mock_parse_data.return_value = pd.DataFrame(
-                {"date": pd.to_datetime(["2023-11-30"]), "exchange_rate": [0.123]}
-            )
-
-            # First call - populates the cache
-            result_1 = fetch_exchange_rates("USD")
-            assert mock_get_data.call_count == 1
-
-            # Second call - returns from cache
-            result_2 = fetch_exchange_rates("USD")
-            assert mock_get_data.call_count == 1  # Still cached
-
-            # Clear the cache
-            clear_cache()
-
-            # Third call - should re-execute
-            result_3 = fetch_exchange_rates("USD")
-            assert mock_get_data.call_count == 2  # Function re-executed
-
-            # Verify results are consistent
-            pd.testing.assert_frame_equal(result_1, result_2)
-            pd.testing.assert_frame_equal(result_1, result_3)
+            mock_logger.assert_called_once_with("Fetching exchange rate data")

tests/test_sdr/test_read_interest_rate.py

@@ -2,16 +2,15 @@
 import pandas as pd
 import requests
 from unittest.mock import patch, MagicMock, ANY
-from io import BytesIO
+from imf_reader import sdr
 from imf_reader.sdr.read_interest_rate import (
     BASE_URL,
     get_interest_rates_data,
     preprocess_data,
     _filter_data,
     _format_data,
     clean_data,
-    fetch_interest_rates,
-    clear_cache,
+    fetch_interest_rates
 )
 
 
@@ -37,9 +36,9 @@ def input_df():
 class TestReadInterestRate:
 
     @pytest.fixture(autouse=True)
-    def clear_cache(self):
+    def auto_clear_cache(self):
         """Clear cache before each test."""
-        clear_cache()
+        sdr.clear_cache()
 
     @patch("requests.post")
     def test_get_interest_rates_data(self, mock_post):