Merge pull request #35 from ssl-hep/feat/scope-finder-ds-resolver

Add find_scope function to resolve dataset scopes

Author: ArturU043

servicex_analysis_utils/dataset_resolver.py

@@ -45,6 +45,29 @@ def ds_type_resolver(
         dataset: The dataset object
     """
 
+    def find_scope(name):
+
+        scopes = [
+            "mc23_13p6TeV",
+            "mc22_13p6TeV",
+            "mc21_13TeV",
+            "mc20_13TeV",
+            "mc16_13TeV",
+            "mc15_13TeV",
+            "data25_13p6TeV",
+            "data24_13p6TeV",
+            "data23_13p6TeV",
+            "data22_13p6TeV",
+            "data18_13TeV",
+            "data17_13TeV",
+            "data16_13TeV",
+            "data15_13TeV",
+        ]
+        for scope in scopes:
+            if name.startswith(scope):
+                return scope
+        return None
+
     if isinstance(ds_name, list):
         return dataset.FileList(ds_name)
 
@@ -66,6 +89,10 @@ def ds_type_resolver(
     elif ds_name.count(":") == 1 and "/" not in ds_name:
         return dataset.Rucio(ds_name)
 
+    scope = find_scope(ds_name)
+    if scope is not None and "/" not in ds_name:
+        return dataset.Rucio(scope + ":" + ds_name)
+
     elif ds_name.isdigit():
         return dataset.CERNOpenData(int(ds_name))
 

tests/test_dataset_resolver.py

@@ -40,6 +40,8 @@
         ("root://eosatlas.cern.ch//eos/", dataset.FileList),
         ("root://eosatlas.cern.ch//eos/*", dataset.XRootD),
         (["root://eosatlas.cern.ch//eos/", "https://test.com"], dataset.FileList),
+        ("mc20_13TeV_valid_dataset_name", dataset.Rucio),
+        ("data22_13p6TeV_valid_dataset_name", dataset.Rucio),
     ],
 )
 def test_find_dataset(input_ds, expected_type):