Merge branch 'remove-s3-bucket-polling' of https://github.com/ssl-hep/ServiceX_frontend into remove-s3-bucket-polling

Author: MattShirley

servicex/query_core.py

@@ -344,7 +344,11 @@ def transform_complete(task: Task):
 
         download_files_task = loop.create_task(
             self.download_files(
-                signed_urls_only, expandable_progress, download_progress, cached_record, begin_at
+                signed_urls_only,
+                expandable_progress,
+                download_progress,
+                cached_record,
+                begin_at,
             )
         )
 
@@ -564,8 +568,7 @@ async def get_signed_url(
                 if self.current_status.files_completed > len(files_seen):
                     new_begin_at = datetime.datetime.now(tz=datetime.timezone.utc)
                     files = await self.servicex.get_transformation_results(
-                        self.current_status.request_id,
-                        begin_at
+                        self.current_status.request_id, begin_at
                     )
                     begin_at = new_begin_at
 

servicex/servicex_adapter.py

@@ -229,7 +229,9 @@ async def delete_transform(self, transform_id=None):
                         f"Failed to delete transform {transform_id} - {msg}"
                     )
 
-    async def get_transformation_results(self, request_id: str, begin_at: datetime.datetime):
+    async def get_transformation_results(
+        self, request_id: str, begin_at: datetime.datetime
+    ):
         headers = await self._get_authorization()
         url = self.url + f"/servicex/transformation/{request_id}/results"
 

tests/test_servicex_dataset.py

@@ -208,13 +208,15 @@ async def test_submit(mocker):
     servicex.submit_transform = AsyncMock()
     servicex.submit_transform.return_value = {"request_id": '123-456-789"'}
 
-    servicex.get_transformation_results = AsyncMock(side_effect=[
-        [{"file-path": file1.filename}],
-        [
-         {"file-path": file1.filename},
-         {"file-path": file2.filename},
-        ],
-    ])
+    servicex.get_transformation_results = AsyncMock(
+        side_effect=[
+            [{"file-path": file1.filename}],
+            [
+                {"file-path": file1.filename},
+                {"file-path": file2.filename},
+            ],
+        ]
+    )
 
     servicex.get_transform_status = AsyncMock()
     servicex.get_transform_status.side_effect = [
@@ -255,17 +257,18 @@ async def test_submit(mocker):
     mock_cache.cache_transform.assert_called_once()
 
 
-
 @pytest.mark.asyncio
 async def test_submit_partial_success(mocker):
     servicex = AsyncMock()
     servicex.submit_transform = AsyncMock()
     servicex.submit_transform.return_value = {"request_id": '123-456-789"'}
 
-    servicex.get_transformation_results = AsyncMock(side_effect=[
-        [{"file-path": file1.filename}],
-        [{"file-path": file1.filename}],
-    ])
+    servicex.get_transformation_results = AsyncMock(
+        side_effect=[
+            [{"file-path": file1.filename}],
+            [{"file-path": file1.filename}],
+        ]
+    )
 
     servicex.get_transform_status = AsyncMock()
     servicex.get_transform_status.side_effect = [
@@ -311,10 +314,9 @@ async def test_use_of_cache(mocker):
     servicex = AsyncMock()
     servicex.submit_transform = AsyncMock()
     servicex.submit_transform.return_value = {"request_id": '123-456-789"'}
-    servicex.get_transformation_results = AsyncMock(return_value=[
-        {"file-path": file1.filename},
-        {"file-path": file2.filename}
-    ])
+    servicex.get_transformation_results = AsyncMock(
+        return_value=[{"file-path": file1.filename}, {"file-path": file2.filename}]
+    )
     servicex.get_transform_status = AsyncMock()
     servicex.get_transform_status.side_effect = [
         transform_status1,
@@ -616,10 +618,9 @@ async def test_use_of_ignore_cache(mocker, servicex):
             transform_status3,
         ]
     )
-    servicex.get_transformation_results = AsyncMock(return_value=[
-        {"file-path": file1.filename},
-        {"file-path": file2.filename}
-    ])
+    servicex.get_transformation_results = AsyncMock(
+        return_value=[{"file-path": file1.filename}, {"file-path": file2.filename}]
+    )
     # Prepare Minio
     mock_minio = AsyncMock()
     mock_minio.get_signed_url = AsyncMock(side_effect=["http://file1", "http://file2"])