Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions servicex_analysis_utils/dataset_resolver.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,14 @@


def ds_type_resolver(
ds_name: Union[str, list[str]],
ds_name: Union[str, list[str], int],
) -> Union[dataset.FileList, dataset.Rucio, dataset.XRootD, dataset.CERNOpenData]:
"""Determine the type of dataset based on the input
string and then return the ServiceX dataset object.

Args:
ds_name (str): Name of the dataset to fetch.
ds_name (str, int, list): Name of the dataset to fetch. Can be a URL, Rucio DID,
CERN Open Data ID (as str or int), EOS path, or list of files.

Returns:
dataset: The dataset object
Expand Down Expand Up @@ -71,6 +72,9 @@ def find_scope(name):
if isinstance(ds_name, list):
return dataset.FileList(ds_name)

elif isinstance(ds_name, int):
return dataset.CERNOpenData(ds_name)

elif re.match(r"^https?://", ds_name):
url = ds_name

Expand Down
1 change: 1 addition & 0 deletions tests/test_dataset_resolver.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
("test:data", dataset.Rucio),
("rucio://test:test", dataset.Rucio),
("123", dataset.CERNOpenData),
(123, dataset.CERNOpenData),
("root://eosatlas.cern.ch//eos/", dataset.FileList),
("root://eosatlas.cern.ch//eos/*", dataset.XRootD),
(["root://eosatlas.cern.ch//eos/", "https://test.com"], dataset.FileList),
Expand Down