Deal with empty and bad dataset names (#314)

ServiceX no longer returns a *Fatal* error when it is asked to look up a bad dataset name or a dataset name that has zero files.

* Detect a completed transform with no files

Fixes #313
Fixes #312

Author: gordonwatts

servicex/servicex_adaptor.py

@@ -210,6 +210,18 @@ async def get_transform_status(
                     f"Transform status for {request_id}" ' is marked "Fatal".'
                 )
 
+            if (
+                "status" in info
+                and info["status"] == "Complete"
+                and info["files-remaining"] is None
+                and info["files-processed"] == 0
+            ):
+                raise ServiceXFatalTransformException(
+                    f"Transform status for {request_id}"
+                    ' is marked "Complete" but no files were processed. Either the dataset '
+                    "is empty, or the dataset name is invalid."
+                )
+
             files_remaining = self._get_transform_stat(info, "files-remaining")
             files_failed = self._get_transform_stat(info, "files-skipped")
             files_processed = self._get_transform_stat(info, "files-processed")

tests/test_servicex_adaptor.py

@@ -98,6 +98,23 @@ def servicex_status_negative(mocker):
     )
 
 
+@pytest.fixture
+def servicex_no_files(mocker):
+    "Returns a result when there are no files in the dataset"
+    result = {
+        "files-processed": 0,
+        "files-remaining": None,
+        "files-skipped": 0,
+        "request-id": "24e59fa2-e1d7-4831-8c7e-82b2efc7c658",
+        "stats": None,
+        "status": "Complete",
+    }
+    mocker.patch(
+        "aiohttp.ClientSession.get",
+        return_value=ClientSessionMocker(dumps(result), 200),
+    )
+
+
 @pytest.fixture
 def good_submit(mocker):
     client = mocker.MagicMock()
@@ -191,7 +208,6 @@ async def test_status_no_auth(servicex_status_request):
 
 @pytest.mark.asyncio
 async def test_status_fatal_status(servicex_status_fatal):
-
     sa = ServiceXAdaptor("http://localhost:500/sx")
     async with aiohttp.ClientSession() as client:
         with pytest.raises(ServiceXFatalTransformException) as e:
@@ -202,7 +218,6 @@ async def test_status_fatal_status(servicex_status_fatal):
 
 @pytest.mark.asyncio
 async def test_status_negative_status(servicex_status_negative):
-
     sa = ServiceXAdaptor("http://localhost:500/sx")
     async with aiohttp.ClientSession() as client:
         with pytest.raises(ServiceXFatalTransformException) as e:
@@ -211,6 +226,16 @@ async def test_status_negative_status(servicex_status_negative):
         assert "negative" in str(e.value)
 
 
+@pytest.mark.asyncio
+async def test_status_empty(servicex_no_files):
+    sa = ServiceXAdaptor("http://localhost:500/sx")
+    async with aiohttp.ClientSession() as client:
+        with pytest.raises(ServiceXFatalTransformException) as e:
+            await sa.get_transform_status(client, "123-123-123-444")
+
+        assert "empty" in str(e.value)
+
+
 @pytest.mark.asyncio
 async def test_status_with_auth(mocker):
     client = mocker.MagicMock()
@@ -243,7 +268,6 @@ async def test_status_with_auth(mocker):
 
 @pytest.mark.asyncio
 async def test_status_unknown_request(servicex_status_unknown):
-
     sa = ServiceXAdaptor("http://localhost:5000/sx")
     with pytest.raises(ServiceXUnknownRequestID) as e:
         async with aiohttp.ClientSession() as client: