Skip to content
Open
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
7 changes: 5 additions & 2 deletions pipeline/src/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,6 @@ def __init__(self, value: Union[str, IRI]):
iri = value.value
else:
iri = value
if not rfc3987.match(iri, rule="IRI"):
raise ValueError("Invalid IRI")
self.value: str = iri

def __eq__(self, other):
Expand All @@ -337,4 +335,9 @@ def _validate(self, ignore=None, seen=None):
failures = defaultdict(list)
if self.value.startswith("file") and "value" not in ignore:
failures["value"].append("IRI points to a local file path")
if not rfc3987.match(self.value, rule="IRI"):
if rfc3987.match(self.value.replace(" ", "%20"), rule="IRI"):
failures["value"].append("Invalid IRI - replace spaces with '%20'")
else:
failures["value"].append("Invalid IRI")
return failures
16 changes: 11 additions & 5 deletions pipeline/tests/test_instantiation.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,17 @@ def test_IRI():
assert not failures
else:
assert failures["value"][0] == "IRI points to a local file path"
invalid_iris = ["/path/to/my/file.txt"]
for value in invalid_iris:
with pytest.raises(ValueError) as exc_info:
iri = IRI(value)
assert exc_info.value.args[0] == "Invalid IRI"
invalid_iris = [
("/path/to/my/file.txt", "Invalid IRI"),
("https://example.com/path with spaces/to/my/file.txt", "Invalid IRI - replace spaces with '%20'"),
("https://data-proxy.ebrains.eu/api/v1/buckets/report%.pdf", "Invalid IRI") # lone '%' not allowed
]
for value, expected_message in invalid_iris:
iri = IRI(value)
assert iri.value == value
failures = iri._validate()
assert len(failures["value"]) == 1
assert failures["value"][0] == expected_message


def test_link():
Expand Down
Loading