-
Notifications
You must be signed in to change notification settings - Fork 0
Added ds_type_resolver function #27
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
5043c88
Added base ds_type_resolver function, by removing the local parts of …
RogerJanusiak c96ef84
Updated function and added test
RogerJanusiak 3951209
Fixed typing
RogerJanusiak a1927ae
Ran black
RogerJanusiak 71ad048
Ran black on test
RogerJanusiak b23ce91
Rank black on init, thought it ran on all files
RogerJanusiak 2b21ce7
Removed unused variable
RogerJanusiak File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
# Copyright (c) 2025, IRIS-HEP | ||
# All rights reserved. | ||
# | ||
# Redistribution and use in source and binary forms, with or without | ||
# modification, are permitted provided that the following conditions are met: | ||
# | ||
# * Redistributions of source code must retain the above copyright notice, this | ||
# list of conditions and the following disclaimer. | ||
# | ||
# * Redistributions in binary form must reproduce the above copyright notice, | ||
# this list of conditions and the following disclaimer in the documentation | ||
# and/or other materials provided with the distribution. | ||
# | ||
# * Neither the name of the copyright holder nor the names of its | ||
# contributors may be used to endorse or promote products derived from | ||
# this software without specific prior written permission. | ||
# | ||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE | ||
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | ||
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | ||
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
import re | ||
from typing import Union | ||
from urllib.parse import urlparse | ||
|
||
from servicex import dataset | ||
|
||
|
||
def ds_type_resolver( | ||
ds_name: Union[str, list[str]], | ||
) -> 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. | ||
|
||
Returns: | ||
dataset: The dataset object | ||
""" | ||
|
||
if isinstance(ds_name, list): | ||
return dataset.FileList(ds_name) | ||
|
||
elif re.match(r"^https?://", ds_name): | ||
url = ds_name | ||
|
||
parsed_url = urlparse(url) | ||
if "cernbox.cern.ch" in parsed_url.netloc and parsed_url.path.startswith( | ||
"/files/spaces" | ||
): | ||
url = f"root://eospublic.cern.ch{parsed_url.path[13:]}" | ||
|
||
return dataset.FileList([url]) | ||
|
||
elif re.match(r"^rucio://", ds_name): | ||
did = ds_name[8:] | ||
ArturU043 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
return dataset.Rucio(did) | ||
|
||
elif ds_name.count(":") == 1 and "/" not in ds_name: | ||
ArturU043 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
return dataset.Rucio(ds_name) | ||
|
||
elif ds_name.isdigit(): | ||
return dataset.CERNOpenData(int(ds_name)) | ||
|
||
elif ds_name.startswith("root://") and ds_name.endswith("*"): | ||
return dataset.XRootD(ds_name) | ||
|
||
elif re.match(r"^root://", ds_name): | ||
return dataset.FileList(ds_name) | ||
|
||
raise RuntimeError( | ||
f"Unable to find the type of input provided for dataset: {ds_name}" | ||
) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
# Copyright (c) 2025, IRIS-HEP | ||
# All rights reserved. | ||
# | ||
# Redistribution and use in source and binary forms, with or without | ||
# modification, are permitted provided that the following conditions are met: | ||
# | ||
# * Redistributions of source code must retain the above copyright notice, this | ||
# list of conditions and the following disclaimer. | ||
# | ||
# * Redistributions in binary form must reproduce the above copyright notice, | ||
# this list of conditions and the following disclaimer in the documentation | ||
# and/or other materials provided with the distribution. | ||
# | ||
# * Neither the name of the copyright holder nor the names of its | ||
# contributors may be used to endorse or promote products derived from | ||
# this software without specific prior written permission. | ||
# | ||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE | ||
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | ||
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | ||
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
import pytest | ||
from servicex_analysis_utils import ds_type_resolver | ||
from servicex import dataset | ||
|
||
|
||
@pytest.mark.parametrize( | ||
"input_ds, expected_type", | ||
[ | ||
("https://test.com", dataset.FileList), | ||
("test:data", dataset.Rucio), | ||
("rucio://test:test", dataset.Rucio), | ||
("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), | ||
], | ||
) | ||
def test_find_dataset(input_ds, expected_type): | ||
dataset = ds_type_resolver(input_ds) | ||
assert isinstance(dataset, expected_type) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.