refactor: adapt to change of stream download in eodag (#100)

`_stream_download_dict` has been changed to `stream_download` in eodag

Author: jlahovnik

stac_fastapi/eodag/extensions/data_download.py

@@ -198,7 +198,7 @@ def get_data(
                 logger.info("Presigned url could not be fetched for %s", asset_name)
 
         try:
-            s = product.downloader._stream_download_dict(
+            s = product.downloader.stream_download(
                 product,
                 auth=auth,
                 asset=asset_name if asset_name != "downloadLink" else None,

tests/conftest.py

@@ -511,19 +511,19 @@ def mock_download(mocker, app):
 
 
 @pytest.fixture(scope="function")
-def mock_base_stream_download_dict(mocker):
+def mock_base_stream_download(mocker):
     """
-    Mocks the `_stream_download_dict` method of the `Download` plugin.
+    Mocks the `stream_download` method of the `Download` plugin.
     """
-    return mocker.patch.object(Download, "_stream_download_dict")
+    return mocker.patch.object(Download, "stream_download")
 
 
 @pytest.fixture(scope="function")
-def mock_http_base_stream_download_dict(mocker):
+def mock_http_base_stream_download(mocker):
     """
-    Mocks the `_stream_download_dict` method of the `Download` plugin.
+    Mocks the `stream_download` method of the `Download` plugin.
     """
-    return mocker.patch.object(HTTPDownload, "_stream_download_dict")
+    return mocker.patch.object(HTTPDownload, "stream_download")
 
 
 @pytest.fixture(scope="function")

tests/test_download.py

@@ -30,10 +30,10 @@
 
 
 async def test_download_item_from_collection_stream(
-    request_valid_raw, defaults, mock_base_stream_download_dict, mock_base_authenticate, stream_response
+    request_valid_raw, defaults, mock_base_stream_download, mock_base_authenticate, stream_response
 ):
     """Download through eodag server catalog should return a valid response"""
-    mock_base_stream_download_dict.return_value = stream_response
+    mock_base_stream_download.return_value = stream_response
 
     resp = await request_valid_raw(f"data/peps/{defaults.collection}/foo/downloadLink")
     assert resp.content == b"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -42,14 +42,14 @@ async def test_download_item_from_collection_stream(
 
 
 async def test_download_item_from_collection_no_stream(
-    request_valid_raw, defaults, mock_download, mock_base_stream_download_dict, mock_base_authenticate, tmp_dir
+    request_valid_raw, defaults, mock_download, mock_base_stream_download, mock_base_authenticate, tmp_dir
 ):
     """Download through eodag server catalog should return a valid response even if streaming is not available"""
     # download should be performed locally then deleted if streaming is not available
     expected_file = tmp_dir / "foo.tar"
     expected_file.touch()
     mock_download.return_value = expected_file
-    mock_base_stream_download_dict.side_effect = NotImplementedError()
+    mock_base_stream_download.side_effect = NotImplementedError()
 
     await request_valid_raw(f"data/peps/{defaults.collection}/foo/downloadLink")
     mock_download.assert_called_once()
@@ -63,7 +63,7 @@ async def test_download_auto_order_whitelist(
     mock_order,
     mock_search,
     defaults,
-    mock_http_base_stream_download_dict,
+    mock_http_base_stream_download,
     stream_response,
 ):
     """Test that the order method is called when downloading a product
@@ -98,7 +98,7 @@ async def test_download_auto_order_whitelist(
     product.register_downloader(downloader=downloader, authenticator=None)
 
     mock_search.return_value = SearchResult([product])
-    mock_http_base_stream_download_dict.return_value = stream_response
+    mock_http_base_stream_download.return_value = stream_response
 
     await request_valid_raw(url, search_result=SearchResult([product]))