Remove extract_file_size function

Author: TheByronHimes

src/ghga_connector/core/downloading/api_calls.py

@@ -30,11 +30,7 @@
 
 from .structs import RetryResponse, UrlAndHeaders
 
-__all__ = [
-    "DownloadClient",
-    "extract_download_url",
-    "extract_file_size",
-]
+__all__ = ["DownloadClient", "extract_download_url"]
 
 DrsObject = dict[str, Any]
 
@@ -280,8 +276,6 @@ def _handle_drs_object_response(
             file_id = url.rsplit("/", 1)[1]
             raise exceptions.FileNotRegisteredError(file_id=file_id)
         case _:
-            # this includes 404 because the file's existence should be verified
-            #  earlier when getting the file envelope
             raise exceptions.BadResponseCodeError(url=url, response_code=status_code)
 
 
@@ -296,16 +290,3 @@ def extract_download_url(drs_object: DrsObject) -> str:
         if access_method["type"] == "s3":
             return access_method["access_url"]["url"]
     raise exceptions.NoS3AccessMethodError(file_id=drs_object["id"])
-
-
-def extract_file_size(drs_object: DrsObject) -> int:
-    """Extract the file size from a DRS Object
-
-    Raises:
-        NoS3AccessMethodError: If the DRS object doesn't have an S3 access method.
-    """
-    access_methods = drs_object["access_methods"]
-    for access_method in access_methods:
-        if access_method["type"] == "s3":
-            return drs_object["size"]
-    raise exceptions.NoS3AccessMethodError(file_id=drs_object["id"])

src/ghga_connector/core/downloading/batch_processing.py

@@ -21,13 +21,10 @@
 from ghga_connector import exceptions
 from ghga_connector.config import Config, get_download_api_url
 from ghga_connector.constants import C4GH
-from ghga_connector.core import (
-    CLIMessageDisplay,
-    WorkPackageClient,
-)
+from ghga_connector.core import CLIMessageDisplay, WorkPackageClient
 from ghga_connector.core.api_calls import is_service_healthy
 
-from .api_calls import DownloadClient, extract_file_size
+from .api_calls import DownloadClient
 from .structs import RetryResponse
 
 
@@ -181,7 +178,7 @@ async def _check_file_is_in_download_bucket(self, file_id: str) -> None:
 
         # File is staged and ready for download - add FileInfo instance to dict.
         #  Also, response is a DRS object -- get file size from it
-        file_size = extract_file_size(drs_object=response)
+        file_size = response["size"]
         del self._unstaged_retry_times[file_id]
         self._staged_files.append(
             FileInfo(