diff --git a/servicex/func_adl/func_adl_dataset_group.py b/servicex/func_adl/func_adl_dataset_group.py deleted file mode 100644 index f5d5cd66..00000000 --- a/servicex/func_adl/func_adl_dataset_group.py +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright (c) 2022, 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. -from __future__ import annotations -from func_adl.object_stream import S - -from typing import Union, Callable, Iterable -import ast -from servicex import DatasetGroup - -from servicex.func_adl.func_adl_dataset import T - - -class FuncADLDatasetGroup(DatasetGroup): - def SelectMany( - self, func: Union[str, ast.Lambda, Callable[[T], Iterable[S]]] - ) -> FuncADLDatasetGroup: - self.datasets = [dataset.SelectMany(func) for dataset in self.datasets] - return self - - def Select( - self, func: Union[str, ast.Lambda, Callable[[T], Iterable[S]]] - ) -> FuncADLDatasetGroup: - self.datasets = [dataset.Select(func) for dataset in self.datasets] - return self - - def Where( - self, func: Union[str, ast.Lambda, Callable[[T], Iterable[S]]] - ) -> FuncADLDatasetGroup: - self.datasets = [dataset.Where(func) for dataset in self.datasets] - return self diff --git a/servicex/func_adl/util.py b/servicex/func_adl/util.py index 4f139309..5b527547 100644 --- a/servicex/func_adl/util.py +++ b/servicex/func_adl/util.py @@ -29,12 +29,6 @@ from typing import Optional, cast -class FuncADLServerException (Exception): - 'Thrown when an exception happens contacting the server' - def __init__(self, msg): - Exception.__init__(self, msg) - - def has_tuple(a: ast.AST) -> bool: """Determine if this query used tuples in its final result