Skip to content

Commit

Permalink
feat: new rust code
Browse files Browse the repository at this point in the history 
revert unintended change

feat: rust code

fix configuration loading

feat: fix settings (rust)

 fix configuration loading

feat: fix settings (rust)

feat: rust code debugging

feat: rust code debugging

feat: rust code debugging

feat: rust code debugging

feat: rust code debugging

 fix configuration loading

feat: fix settings (rust)

 fix configuration loading

feat: fix settings (rust)

feat: rust code debugging

feat: rust code debugging

feat: rust code debugging

feat: rust code debugging

feat: rust code debugging

feat: new rust code

feat: new rust code
  • Loading branch information
@subotic
subotic committed Feb 22, 2025
1 parent e9dda39 commit 0588df2
Show file tree
Hide file tree
Showing 5 changed files with 118 additions and 220 deletions.
6 changes: 3 additions & 3 deletions python/ark_resolver/ark_url_rust.py → python/src/ark_resolver/ark_url_rust.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from urllib import parse

from ark_resolver.ark_url import ArkUrlException
import ark_resolver.base64url_check_digit as base64url_check_digit_py
import ark_resolver.check_digit as check_digit_py


#################################################################################################
Expand Down Expand Up @@ -228,7 +228,7 @@ def add_check_digit_and_escape(uuid) -> str:
"""
Adds a check digit to a Base64-encoded UUID, and escapes the result.
"""
check_digit = base64url_check_digit_py.calculate_check_digit(uuid)
check_digit = check_digit_py.calculate_check_digit(uuid)
uuid_with_check_digit = uuid + check_digit

# Escape '-' as '=' in the resource ID and check digit, because '-' can be ignored in ARK URLs.
Expand All @@ -242,7 +242,7 @@ def unescape_and_validate_uuid(ark_url, escaped_uuid) -> str:
# '-' is escaped as '=' in the UUID and check digit, because '-' can be ignored in ARK URLs.
unescaped_uuid = escaped_uuid.replace('=', '-')

if not base64url_check_digit_py.is_valid(unescaped_uuid):
if not check_digit_py.is_valid(unescaped_uuid):
raise ArkUrlException(f"Invalid ARK ID: {ark_url}")

return unescaped_uuid[0:-1]
Expand Down
0 python/ark_resolver/health.py → python/src/ark_resolver/health.py
View file
File renamed without changes.
54 changes: 27 additions & 27 deletions python/test/test_ark_url_rust.py → python/tests/test_ark_url_rust.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
import pytest
import _rust

from ark_resolver.ark_url_rust import ArkUrlFormatter, ArkUrlInfo, ArkUrlException
from ark_resolver import ark_url_rust

@pytest.fixture(scope="module")
def settings():
"""Loads settings."""
config_path = "python/ark_resolver/ark-config.ini"
os.environ['ARK_REGISTRY'] = 'python/ark_resolver/ark-registry.ini'
config_path = "python/src/ark_resolver/ark-config.ini"
os.environ['ARK_REGISTRY'] = 'python/src/ark_resolver/ark-registry.ini'
return _rust.load_settings(config_path)

def test_ark_url_formatter(settings):
ark_url_formatter = ArkUrlFormatter(settings)
ark_url_formatter = ark_url_rust.ArkUrlFormatter(settings)
# generate an ARK URL from a resource IRI without a timestamp
resource_iri = "http://rdfh.ch/0001/cmfk1DMHRBiR4-_6HXpEFA"
ark_url = ark_url_formatter.resource_iri_to_ark_url(resource_iri=resource_iri)
Expand All @@ -34,119 +34,119 @@ def test_ark_url_formatter(settings):

def test_ark_url_info_redirect_top_level_object(settings):
# parse and redirect an ARK URL representing the top-level object
ark_url_info = ArkUrlInfo(settings, "ark:/00000/1")
ark_url_info = ark_url_rust.ArkUrlInfo(settings, "ark:/00000/1")
redirect_url = ark_url_info.to_redirect_url()
assert redirect_url == "http://dasch.swiss"

def test_ark_url_info_redirect_project(settings):
# parse and redirect an ARK URL of a project with default project host, i.e. without specified project host
ark_url_info = ArkUrlInfo(settings, "ark:/00000/1/0003")
ark_url_info = ark_url_rust.ArkUrlInfo(settings, "ark:/00000/1/0003")
redirect_url = ark_url_info.to_redirect_url()
assert redirect_url == "http://meta.dasch.swiss/projects/0003"

# parse and redirect an ARK URL of a project with a specific project host
ark_url_info = ArkUrlInfo(settings, "ark:/00000/1/0004")
ark_url_info = ark_url_rust.ArkUrlInfo(settings, "ark:/00000/1/0004")
redirect_url = ark_url_info.to_redirect_url()
assert redirect_url == "http://other-meta.dasch.swiss/projects/0004"

def test_ark_url_info_redirect_resource(settings):
# parse and redirect an ARK URL of a DSP resource without a timestamp
ark_url_info = ArkUrlInfo(settings, "ark:/00000/1/0001/cmfk1DMHRBiR4=_6HXpEFAn")
ark_url_info = ark_url_rust.ArkUrlInfo(settings, "ark:/00000/1/0001/cmfk1DMHRBiR4=_6HXpEFAn")
redirect_url = ark_url_info.to_redirect_url()
assert redirect_url == "http://0.0.0.0:4200/resource/0001/cmfk1DMHRBiR4-_6HXpEFA"

# parse and redirect an ARK URL of a DSP resource with a timestamp with a fractional part
ark_url_info = ArkUrlInfo(settings, "ark:/00000/1/0001/cmfk1DMHRBiR4=_6HXpEFAn.20180604T085622513Z")
ark_url_info = ark_url_rust.ArkUrlInfo(settings, "ark:/00000/1/0001/cmfk1DMHRBiR4=_6HXpEFAn.20180604T085622513Z")
redirect_url = ark_url_info.to_redirect_url()
assert redirect_url == "http://0.0.0.0:4200/resource/0001/cmfk1DMHRBiR4-_6HXpEFA?version=20180604T085622513Z"

# parse and redirect an ARK URL of a DSP resource with a timestamp without a fractional part
ark_url_info = ArkUrlInfo(settings, "ark:/00000/1/0001/cmfk1DMHRBiR4=_6HXpEFAn.20180604T085622Z")
ark_url_info = ark_url_rust.ArkUrlInfo(settings, "ark:/00000/1/0001/cmfk1DMHRBiR4=_6HXpEFAn.20180604T085622Z")
redirect_url = ark_url_info.to_redirect_url()
assert redirect_url == "http://0.0.0.0:4200/resource/0001/cmfk1DMHRBiR4-_6HXpEFA?version=20180604T085622Z"

# parse an ARK URL of a DSP resource without a timestamp and redirect it to a customized location
ark_url_info = ArkUrlInfo(settings, "ark:/00000/1/0005/0_sWRg5jT3S0PLxakX9ffg1")
ark_url_info = ark_url_rust.ArkUrlInfo(settings, "ark:/00000/1/0005/0_sWRg5jT3S0PLxakX9ffg1")
redirect_url = ark_url_info.to_redirect_url()
assert redirect_url == "http://0.0.0.0:4200/resources/0005/0_sWRg5jT3S0PLxakX9ffg"

def test_ark_url_info_redirect_value(settings):
# parse an ARK URL of a DSP value without a timestamp and redirect it to a customized location
ark_url_info = ArkUrlInfo(settings, "ark:/00000/1/0005/SQkTPdHdTzq_gqbwj6QR=AR/=SSbnPK3Q7WWxzBT1UPpRgo")
ark_url_info = ark_url_rust.ArkUrlInfo(settings, "ark:/00000/1/0005/SQkTPdHdTzq_gqbwj6QR=AR/=SSbnPK3Q7WWxzBT1UPpRgo")
redirect_url = ark_url_info.to_redirect_url()
assert redirect_url == "http://0.0.0.0:4200/resources/0005/SQkTPdHdTzq_gqbwj6QR-A/-SSbnPK3Q7WWxzBT1UPpRg"

# parse and redirect an ARK URL of a DSP value with a timestamp
ark_url_info = ArkUrlInfo(settings, "ark:/00000/1/0001/cmfk1DMHRBiR4=_6HXpEFAn/pLlW4ODASumZfZFbJdpw1gu.20180604T085622Z")
ark_url_info = ark_url_rust.ArkUrlInfo(settings, "ark:/00000/1/0001/cmfk1DMHRBiR4=_6HXpEFAn/pLlW4ODASumZfZFbJdpw1gu.20180604T085622Z")
redirect_url = ark_url_info.to_redirect_url()
assert redirect_url == "http://0.0.0.0:4200/resource/0001/cmfk1DMHRBiR4-_6HXpEFA/pLlW4ODASumZfZFbJdpw1g?version=20180604T085622Z"

def test_ark_url_info_redirect_salsah_resource(settings):
# parse and redirect a version 1 ARK URL of a PHP-SALSAH resource without a timestamp
ark_url_info = ArkUrlInfo(settings, "ark:/00000/1/0803/751e0b8am")
ark_url_info = ark_url_rust.ArkUrlInfo(settings, "ark:/00000/1/0803/751e0b8am")
redirect_url = ark_url_info.to_redirect_url()
assert redirect_url == "http://data.dasch.swiss/resources/1"

# parse and redirect a version 1 ARK URL of a PHP-SALSAH resource with a timestamp
ark_url_info = ArkUrlInfo(settings, "ark:/00000/1/0803/751e0b8am.20190118T102919Z")
ark_url_info = ark_url_rust.ArkUrlInfo(settings, "ark:/00000/1/0803/751e0b8am.20190118T102919Z")
redirect_url = ark_url_info.to_redirect_url()
assert redirect_url == "http://data.dasch.swiss/resources/1?citdate=20190118"

# parse and redirect a version 0 ARK URL of a PHP-SALSAH resource without a timestamp
ark_url_info = ArkUrlInfo(settings, "ark:/00000/080e-76bb2132d30d6-0")
ark_url_info = ark_url_rust.ArkUrlInfo(settings, "ark:/00000/080e-76bb2132d30d6-0")
redirect_url = ark_url_info.to_redirect_url()
assert redirect_url == "http://data.dasch.swiss/resources/2126045"

# parse and redirect a version 0 ARK URL of a PHP-SALSAH resource with a timestamp
ark_url_info = ArkUrlInfo(settings, "ark:/00000/080e-76bb2132d30d6-0.20190129")
ark_url_info = ark_url_rust.ArkUrlInfo(settings, "ark:/00000/080e-76bb2132d30d6-0.20190129")
redirect_url = ark_url_info.to_redirect_url()
assert redirect_url == "http://data.dasch.swiss/resources/2126045?citdate=20190129"

# parse and redirect a version 0 ARK URL of a PHP-SALSAH resource with a timestamp that's too short
ark_url_info = ArkUrlInfo(settings, "ark:/00000/080e-76bb2132d30d6-0.2019111")
ark_url_info = ark_url_rust.ArkUrlInfo(settings, "ark:/00000/080e-76bb2132d30d6-0.2019111")
redirect_url = ark_url_info.to_redirect_url()
assert redirect_url == "http://data.dasch.swiss/resources/2126045"

def test_ark_url_info_redirect_salsah_project(settings):
# parse and redirect an ARK URL of a project on Salsah with default project host, i.e. without specified project host
ark_url_info = ArkUrlInfo(settings, "ark:/00000/1/0803")
ark_url_info = ark_url_rust.ArkUrlInfo(settings, "ark:/00000/1/0803")
redirect_url = ark_url_info.to_redirect_url()
assert redirect_url == "http://meta.dasch.swiss/projects/0803"

# parse and redirect an ARK URL of a project on Salsah with a specific project host
ark_url_info = ArkUrlInfo(settings, "ark:/00000/1/0006")
ark_url_info = ark_url_rust.ArkUrlInfo(settings, "ark:/00000/1/0006")
redirect_url = ark_url_info.to_redirect_url()
assert redirect_url == "http://other-meta.dasch.swiss/projects/0006"

def test_ark_url_info_redirect_salsah_ark(settings):
# parse and redirect a version 0 ARK URL of a PHP-SALSAH resource which is on DSP (migrated from salsah to DSP) without a timestamp
ark_url_info = ArkUrlInfo(settings, "ark:/00000/0002-779b9990a0c3f-6e")
ark_url_info = ark_url_rust.ArkUrlInfo(settings, "ark:/00000/0002-779b9990a0c3f-6e")
redirect_url = ark_url_info.to_redirect_url()
assert redirect_url == "http://0.0.0.0:4200/resource/0002/Ef9heHjPWDS7dMR_gGax2Q"

# parse and redirect a version 0 ARK URL of a PHP-SALSAH resource which is on DSP (migrated from salsah to DSP) with a timestamp
ark_url_info = ArkUrlInfo(settings, "ark:/00000/0002-779b9990a0c3f-6e.20190129")
ark_url_info = ark_url_rust.ArkUrlInfo(settings, "ark:/00000/0002-779b9990a0c3f-6e.20190129")
redirect_url = ark_url_info.to_redirect_url()
assert redirect_url == "http://0.0.0.0:4200/resource/0002/Ef9heHjPWDS7dMR_gGax2Q?version=20190129"

def test_conversion_to_resource_iri_with_ark_version_0(settings):
# convert a version 0 ARK URL to a DSP resource IRI
ark_url_info = ArkUrlInfo(settings, "ark:/00000/0002-751e0b8a-6.2021519")
ark_url_info = ark_url_rust.ArkUrlInfo(settings, "ark:/00000/0002-751e0b8a-6.2021519")
resource_iri = ark_url_info.to_resource_iri()
assert resource_iri == "http://rdfh.ch/0002/70aWaB2kWsuiN6ujYgM0ZQ"

def test_conversion_to_resource_iri_with_ark_version_1(settings):
# convert a version 1 ARK URL to a DSP resource IRI
ark_url_info = ArkUrlInfo(settings, "ark:/00000/1/0002/0_sWRg5jT3S0PLxakX9ffg1.20210712T074927466631Z")
ark_url_info = ark_url_rust.ArkUrlInfo(settings, "ark:/00000/1/0002/0_sWRg5jT3S0PLxakX9ffg1.20210712T074927466631Z")
resource_iri = ark_url_info.to_resource_iri()
assert resource_iri == "http://rdfh.ch/0002/0_sWRg5jT3S0PLxakX9ffg"

def test_reject_ark_with_wrong_digit(settings):
# reject an ARK URL that doesn't pass check digit validation
rejected = False
try:
ArkUrlInfo(settings, "ark:/00000/1/0001/cmfk1DMHRBir4=_6HXpEFAn")
except ArkUrlException:
ark_url_rust.ArkUrlInfo(settings, "ark:/00000/1/0001/cmfk1DMHRBir4=_6HXpEFAn")
except ark_url_rust.ArkUrlException:
rejected = True
assert rejected

Expand All @@ -156,7 +156,7 @@ def test_ark_url_settings(settings):
assert settings.ark_config.get("ArkInternalHost") == "0.0.0.0"
assert settings.ark_config.get("ArkInternalPort") == "3336"
assert settings.ark_config.get("ArkHttpsProxy") == "true"
assert settings.default_config.get("TopLevelObjectUrl") == "http://dasch.swiss"
assert settings.get_default_config("TopLevelObjectUrl") == "http://dasch.swiss"
assert settings.get_default_config("TopLevelObjectUrl") == "http://dasch.swiss"
assert settings.get_default_config("ProjectHost") == "meta.dasch.swiss"
assert settings.get_project_config("0003").get("ProjectHost") == "meta.dasch.swiss"
Expand Down
Loading

0 comments on commit 0588df2

Please sign in to comment.