Skip to content

[PLT-63] Add additional AWS validation #1422

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.

Sign up for GitHub

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 2 commits into from
Feb 20, 2024
Merged

[PLT-63] Add additional AWS validation #1422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0dcdb5
Add additional AWS validation
mnoszczak Feb 19, 2024
596f3d4
Safe code
mnoszczak Feb 20, 2024
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
9 changes: 9 additions & 0 deletions labelbox/schema/dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,11 @@ def convert_field_keys(items):
"DataRow.row_data missing when creating DataRow.")

row_data = args[DataRow.row_data.name]

if isinstance(row_data, str) and row_data.startswith("s3:/"):
raise InvalidQueryError(
"row_data: s3 assets must start with 'https'.")

if not isinstance(row_data, str):
# If the row data is an object, upload as a string
args[DataRow.row_data.name] = json.dumps(row_data)
Expand Down Expand Up @@ -425,6 +430,10 @@ def validate_keys(item):
raise InvalidQueryError(
"`row_data` missing when creating DataRow.")

if isinstance(item.get('row_data'),
str) and item.get('row_data').startswith("s3:/"):
raise InvalidQueryError(
"row_data: s3 assets must start with 'https'.")
invalid_keys = set(item) - {
*{f.name for f in DataRow.fields()}, 'attachments', 'media_type'
}
Expand Down
12 changes: 12 additions & 0 deletions tests/integration/test_data_rows.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,18 @@ def test_get_data_row(data_row, client):
assert client.get_data_row(data_row.uid)


def test_create_invalid_aws_data_row(dataset, client):
with pytest.raises(labelbox.exceptions.InvalidQueryError) as exc:
dataset.create_data_row(row_data="s3://labelbox-public-data/invalid")
assert "s3" in exc.value.message

with pytest.raises(labelbox.exceptions.InvalidQueryError) as exc:
dataset.create_data_rows([{
"row_data": "s3://labelbox-public-data/invalid"
}])
assert "s3" in exc.value.message


def test_lookup_data_rows(client, dataset):
uid = str(uuid.uuid4())
# 1 external id : 1 uid
Expand Down