-
Notifications
You must be signed in to change notification settings - Fork 264
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
Fix: Error handling for forward() to only take one pandas dataframe #1382
Open
duanduanzhou
wants to merge
2
commits into
georgia-tech-db:staging
Choose a base branch
from
duanduanzhou:staging
base: staging
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 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 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 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,81 @@ | ||
# coding=utf-8 | ||
# Copyright 2018-2023 EvaDB | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
|
||
# coding=utf-8 | ||
# Copyright 2018-2022 EVA | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
import numpy as np | ||
import pandas as pd | ||
from thefuzz import fuzz | ||
|
||
from evadb.catalog.catalog_type import NdArrayType | ||
from evadb.functions.abstract.abstract_function import AbstractFunction | ||
from evadb.functions.decorators.decorators import forward, setup | ||
from evadb.functions.decorators.io_descriptors.data_types import PandasDataframe | ||
|
||
|
||
class FuzzDistance(AbstractFunction): | ||
@setup(cacheable=False, function_type="FeatureExtraction", batchable=False) | ||
def setup(self): | ||
pass | ||
|
||
@property | ||
def name(self) -> str: | ||
return "FuzzDistance" | ||
|
||
@forward( | ||
input_signatures=[ | ||
PandasDataframe( | ||
columns=["data1", "data2"], | ||
column_types=[NdArrayType.STR, NdArrayType.STR], | ||
column_shapes=[(1), (1)], | ||
), | ||
# Incorrectly tries to use multiple DataFrames | ||
PandasDataframe( | ||
columns=["data3", "data4"], | ||
column_types=[NdArrayType.STR, NdArrayType.STR], | ||
column_shapes=[(1), (1)], | ||
), | ||
], | ||
output_signatures=[ | ||
PandasDataframe( | ||
columns=["distance"], | ||
column_types=[NdArrayType.FLOAT32], | ||
column_shapes=[(1)], | ||
) | ||
], | ||
) | ||
def forward(self, df: pd.DataFrame) -> pd.DataFrame: | ||
def _forward(row: pd.Series) -> np.ndarray: | ||
data1 = row.iloc[0] | ||
data2 = row.iloc[1] | ||
distance = fuzz.ratio(data1, data2) | ||
return distance | ||
|
||
ret = pd.DataFrame() | ||
ret["distance"] = df.apply(_forward, axis=1) | ||
return ret |
This file contains 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 |
---|---|---|
|
@@ -322,6 +322,22 @@ def test_should_raise_if_function_file_is_modified(self): | |
# with self.assertRaises(AssertionError): | ||
execute_query_fetch_all(self.evadb, select_query) | ||
|
||
def test_should_raise_error_for_multiple_dataframes(self): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let's move this to the short integration tests. |
||
# Checks for an error when multiple dataframes are used | ||
create_function_query = """ | ||
CREATE FUNCTION IF NOT EXISTS FuzzDistance | ||
IMPL 'evadb/functions/test_bad_fuzzyjoin_udf.py' | ||
""" | ||
# Expect ExecutorError | ||
with self.assertRaises(ExecutorError) as cm: | ||
execute_query_fetch_all( | ||
self.evadb, create_function_query, do_not_print_exceptions=True | ||
) | ||
|
||
# Check if the expected error message is in the exception | ||
expected_error_msg = "forward() only takes one pandas dataframe as input." | ||
self.assertIn(expected_error_msg, str(cm.exception)) | ||
|
||
def test_create_function_with_decorators(self): | ||
execute_query_fetch_all( | ||
self.evadb, "DROP FUNCTION IF EXISTS DummyObjectDetectorDecorators;" | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We do not need to create a separate file for this function under
evadb/functions
, since this is not a valid function.We can directly define this function in the integration test file.