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

Author: MattShirley

servicex/servicex_adapter.py

@@ -264,7 +264,9 @@ async def get_transformation_results(
                 for result in data.get("results", []):
                     file = ServiceXFile(
                         filename=result["file-path"].replace("/", ":"),
-                        created_at=datetime.datetime.fromisoformat(result["created_at"]),
+                        created_at=datetime.datetime.fromisoformat(
+                            result["created_at"]
+                        ),
                     )
                     response.append(file)
                 return response

tests/test_dataset.py

@@ -130,8 +130,14 @@ async def test_download_files(python_dataset):
     python_dataset.servicex = AsyncMock()
     python_dataset.servicex.get_transformation_results = AsyncMock()
     python_dataset.servicex.get_transformation_results.return_value = [
-        ServiceXFile(filename="file1.txt", created_at=datetime.datetime.now(datetime.timezone.utc)),
-        ServiceXFile(filename="file2.txt", created_at=datetime.datetime.now(datetime.timezone.utc)),
+        ServiceXFile(
+            filename="file1.txt",
+            created_at=datetime.datetime.now(datetime.timezone.utc),
+        ),
+        ServiceXFile(
+            filename="file2.txt",
+            created_at=datetime.datetime.now(datetime.timezone.utc),
+        ),
     ]
 
     minio_mock.download_file.return_value = Path("/path/to/downloaded_file")
@@ -165,8 +171,14 @@ async def test_download_files_with_signed_urls(python_dataset):
     python_dataset.servicex = AsyncMock()
     python_dataset.servicex.get_transformation_results = AsyncMock()
     python_dataset.servicex.get_transformation_results.return_value = [
-        ServiceXFile(filename="file1.txt", created_at=datetime.datetime.now(datetime.timezone.utc)),
-        ServiceXFile(filename="file2.txt", created_at=datetime.datetime.now(datetime.timezone.utc)),
+        ServiceXFile(
+            filename="file1.txt",
+            created_at=datetime.datetime.now(datetime.timezone.utc),
+        ),
+        ServiceXFile(
+            filename="file2.txt",
+            created_at=datetime.datetime.now(datetime.timezone.utc),
+        ),
     ]
 
     python_dataset.minio_polling_interval = 0

tests/test_servicex_adapter.py

@@ -29,6 +29,7 @@
 import tempfile
 import time
 import datetime
+from unittest import result
 from unittest.mock import patch, AsyncMock
 
 import httpx
@@ -512,10 +513,18 @@ async def test_get_transformation_results_success(get, servicex):
     get.return_value.__aenter__.return_value.json = AsyncMock(
         return_value={
             "results": [
-                {"file-path": "file1.txt", "created_at":
-                    datetime.datetime.now(datetime.timezone.utc).isoformat()},
-                {"file-path": "file2.txt", "created_at":
-                    datetime.datetime.now(datetime.timezone.utc).isoformat()},
+                {
+                    "file-path": "file1.txt",
+                    "created_at": datetime.datetime.now(
+                        datetime.timezone.utc
+                    ).isoformat(),
+                },
+                {
+                    "file-path": "file2.txt",
+                    "created_at": datetime.datetime.now(
+                        datetime.timezone.utc
+                    ).isoformat(),
+                },
             ]
         }
     )

tests/test_servicex_dataset.py

@@ -210,15 +210,26 @@ 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=[
-        [
-            ServiceXFile(filename="file1", created_at=datetime.datetime.now(datetime.timezone.utc)),
-        ],
-        [
-            ServiceXFile(filename="file1", created_at=datetime.datetime.now(datetime.timezone.utc)),
-            ServiceXFile(filename="file2", created_at=datetime.datetime.now(datetime.timezone.utc)),
+    servicex.get_transformation_results = AsyncMock(
+        side_effect=[
+            [
+                ServiceXFile(
+                    filename="file1",
+                    created_at=datetime.datetime.now(datetime.timezone.utc),
+                ),
+            ],
+            [
+                ServiceXFile(
+                    filename="file1",
+                    created_at=datetime.datetime.now(datetime.timezone.utc),
+                ),
+                ServiceXFile(
+                    filename="file2",
+                    created_at=datetime.datetime.now(datetime.timezone.utc),
+                ),
+            ],
         ]
-    ])
+    )
     servicex.get_transform_status = AsyncMock()
     servicex.get_transform_status.side_effect = [
         transform_status1,
@@ -263,14 +274,22 @@ 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=[
-        [
-            ServiceXFile(filename="file1", created_at=datetime.datetime.now(datetime.timezone.utc)),
-        ],
-        [
-            ServiceXFile(filename="file1", created_at=datetime.datetime.now(datetime.timezone.utc)),
+    servicex.get_transformation_results = AsyncMock(
+        side_effect=[
+            [
+                ServiceXFile(
+                    filename="file1",
+                    created_at=datetime.datetime.now(datetime.timezone.utc),
+                ),
+            ],
+            [
+                ServiceXFile(
+                    filename="file1",
+                    created_at=datetime.datetime.now(datetime.timezone.utc),
+                ),
+            ],
         ]
-    ])
+    )
 
     servicex.get_transform_status = AsyncMock()
     servicex.get_transform_status.side_effect = [
@@ -318,8 +337,14 @@ async def test_use_of_cache(mocker):
     servicex.submit_transform.return_value = {"request_id": '123-456-789"'}
     servicex.get_transformation_results = AsyncMock()
     servicex.get_transformation_results.return_value = [
-        ServiceXFile(filename="file1.txt", created_at=datetime.datetime.now(datetime.timezone.utc)),
-        ServiceXFile(filename="file2.txt", created_at=datetime.datetime.now(datetime.timezone.utc)),
+        ServiceXFile(
+            filename="file1.txt",
+            created_at=datetime.datetime.now(datetime.timezone.utc),
+        ),
+        ServiceXFile(
+            filename="file2.txt",
+            created_at=datetime.datetime.now(datetime.timezone.utc),
+        ),
     ]
     servicex.get_transform_status = AsyncMock()
     servicex.get_transform_status.side_effect = [
@@ -624,8 +649,14 @@ async def test_use_of_ignore_cache(mocker, servicex):
     )
     servicex.get_transformation_results = AsyncMock()
     servicex.get_transformation_results.return_value = [
-        ServiceXFile(filename="file1.txt", created_at=datetime.datetime.now(datetime.timezone.utc)),
-        ServiceXFile(filename="file2.txt", created_at=datetime.datetime.now(datetime.timezone.utc)),
+        ServiceXFile(
+            filename="file1.txt",
+            created_at=datetime.datetime.now(datetime.timezone.utc),
+        ),
+        ServiceXFile(
+            filename="file2.txt",
+            created_at=datetime.datetime.now(datetime.timezone.utc),
+        ),
     ]
     # Prepare Minio
     mock_minio = AsyncMock()