Skip to content

Python impl of sha256 + hybrid rendezvous ordering#8866

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
stereosteve merged 1 commit into from
Jul 15, 2024
Merged

Python impl of sha256 + hybrid rendezvous ordering #8866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 33 additions & 14 deletions packages/discovery-provider/src/utils/rendezvous.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,54 @@
from hashlib import sha256
from typing import List

import crc32c

dead_nodes = ["https://content.grassfed.network/"]


# Python equivalent of https://github.com/tysonmote/rendezvous/blob/be0258dbbd3d/rendezvous.go
class RendezvousHash:
def __init__(self, *nodes: str):
self.nodes: List[bytes] = [bytes(node, "utf-8") for node in nodes]
self.nodes: List[str] = [n for n in nodes if n not in dead_nodes]

def add(self, *nodes: str) -> None:
for node in nodes:
self.nodes.append(bytes(node, "utf-8"))
if node not in dead_nodes:
self.nodes.append(node)

def get_nodes(self) -> List[str]:
return self.nodes

def get(self, key: str) -> str:
max_node = max(
(node for node in self.nodes),
default=None,
key=lambda node: self.hash(node, bytes(key, "utf-8")),
)
return max_node.decode("utf-8") if max_node is not None else ""
ranked = self.rank_hybrid(key)
if ranked:
return ranked[0]
return ""

# HashMigration: use rank_sha256 after migration done
def get_n(self, n: int, key: str) -> List[str]:
scores = [(self.hash(node, bytes(key, "utf-8")), node) for node in self.nodes]
return self.rank_hybrid(key)[:n]

def rank_hybrid(self, key: str) -> List[str]:
legacy = self.rank_crc32(2, key)
modern = [h for h in self.rank_sha256(key) if h not in legacy]
hybrid = legacy + modern
return hybrid

def rank_crc32(self, n: int, key: str) -> List[str]:
scores = [(self.hash(node, key), node) for node in self.nodes]
scores.sort(key=lambda x: (-x[0], x[1]))
return [node.decode("utf-8") for _, node in scores[:n]]
return [t[1] for t in scores[:n]]

def get_nodes(self) -> List[str]:
return [node.decode("utf-8") for node in self.nodes]
def rank_sha256(self, key: str) -> List[str]:
tuples = [
(h, sha256((h + key).encode("utf-8")).hexdigest()) for h in self.nodes
]
tuples.sort(key=lambda t: (t[1], t[0]))
return [t[0] for t in tuples]

@staticmethod
def hash(node: bytes, key: bytes) -> int:
combined = key + node
def hash(node: str, key: str) -> int:
combined = (key + node).encode("utf-8")
# Convert to unsigned 32-bit integer to match golang uint32 here: https://github.com/tysonmote/rendezvous/blob/be0258dbbd3d/rendezvous.go#L92
return crc32c.crc32c(combined) & 0xFFFFFFFF
46 changes: 44 additions & 2 deletions packages/discovery-provider/src/utils/rendezvous_unit_test.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ def test_return_top_n_nodes():
nodes = ["node1", "node2", "node3"]
hash_obj = RendezvousHash(*nodes)
key = "test-key"
top2_nodes = hash_obj.get_n(2, key)
top2_nodes = hash_obj.rank_crc32(2, key)
assert len(top2_nodes) == 2
assert all(node in nodes for node in top2_nodes)

Expand DownExpand Up@@ -65,5 +65,47 @@ def test_hash_get(key, expected):
def test_hash_get_n(n, key, expected):
hash_obj = RendezvousHash()
hash_obj.add("a", "b", "c", "d", "e")
got_nodes = hash_obj.get_n(n, key)
got_nodes = hash_obj.rank_crc32(n, key)
assert got_nodes == expected


def test_hybrid():
node_list = "https://creatornode.audius.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius1.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius2.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius8.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius.co,https://creatornode2.audius.co,https://creatornode3.audius.co,https://usermetadata.audius.co,https://audius-content-1.cultur3stake.com,https://audius-content-10.cultur3stake.com,https://audius-content-11.cultur3stake.com,https://audius-content-12.cultur3stake.com,https://audius-content-13.cultur3stake.com,https://audius-content-14.cultur3stake.com,https://audius-content-15.cultur3stake.com,https://audius-content-16.cultur3stake.com,https://audius-content-17.cultur3stake.com,https://audius-content-18.cultur3stake.com,https://audius-content-2.cultur3stake.com,https://audius-content-3.cultur3stake.com,https://audius-content-4.cultur3stake.com,https://audius-content-5.cultur3stake.com,https://audius-content-6.cultur3stake.com,https://audius-content-7.cultur3stake.com,https://audius-content-8.cultur3stake.com,https://audius-content-9.cultur3stake.com,https://cn1.stuffisup.com,https://audius-cn1.tikilabs.com,https://audius.prod.capturealpha.io,https://audius-content-1.figment.io,https://audius-content-10.figment.io,https://audius-content-11.figment.io,https://audius-content-12.figment.io,https://audius-content-13.figment.io,https://audius-content-14.figment.io,https://audius-content-2.figment.io,https://audius-content-3.figment.io,https://audius-content-4.figment.io,https://audius-content-5.figment.io,https://audius-content-6.figment.io,https://audius-content-7.figment.io,https://audius-content-8.figment.io,https://audius-content-9.figment.io,https://blockchange-audius-content-01.bdnodes.net,https://blockchange-audius-content-02.bdnodes.net,https://blockchange-audius-content-03.bdnodes.net,https://blockdaemon-audius-content-01.bdnodes.net,https://blockdaemon-audius-content-02.bdnodes.net,https://blockdaemon-audius-content-03.bdnodes.net,https://blockdaemon-audius-content-04.bdnodes.net,https://blockdaemon-audius-content-05.bdnodes.net,https://blockdaemon-audius-content-06.bdnodes.net,https://blockdaemon-audius-content-07.bdnodes.net,https://blockdaemon-audius-content-08.bdnodes.net,https://blockdaemon-audius-content-09.bdnodes.net,https://content.grassfed.network,https://cn0.mainnet.audiusindex.org,https://cn1.mainnet.audiusindex.org,https://cn2.mainnet.audiusindex.org,https://cn3.mainnet.audiusindex.org,https://cn4.mainnet.audiusindex.org,https://audius-content-1.jollyworld.xyz,https://audius-creator-1.theblueprint.xyz,https://audius-creator-2.theblueprint.xyz,https://audius-creator-3.theblueprint.xyz,https://audius-creator-4.theblueprint.xyz,https://audius-creator-5.theblueprint.xyz,https://audius-creator-6.theblueprint.xyz".split(
","
)
test_cid = "baeaaaiqsedziwknj44jsl5fak6vcbszzjlnl7pqtw2ipnyg7rsh5a2xnql2p2"
hasher = RendezvousHash(*node_list)

# sha256
got = hasher.rank_sha256(test_cid)[:6]
expected = [
"https://blockdaemon-audius-content-09.bdnodes.net",
"https://cn4.mainnet.audiusindex.org",
"https://audius-content-4.figment.io",
"https://cn0.mainnet.audiusindex.org",
"https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud",
"https://blockdaemon-audius-content-07.bdnodes.net",
]
assert got == expected

# crc32 top 2
got = hasher.rank_crc32(2, test_cid)
expected = [
"https://audius-content-15.cultur3stake.com",
"https://audius-content-4.figment.io",
]
assert got == expected

# hybrid
got = hasher.get_n(6, test_cid)
expected = [
# crc32 (top2)
"https://audius-content-15.cultur3stake.com",
"https://audius-content-4.figment.io",
# sha256
"https://blockdaemon-audius-content-09.bdnodes.net",
"https://cn4.mainnet.audiusindex.org",
"https://cn0.mainnet.audiusindex.org",
"https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud",
]
assert got == expected
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Python impl of sha256 + hybrid rendezvous ordering by stereosteve · Pull Request #8866 · AudiusProject/apps · GitHub
Skip to content
Python impl of sha256 + hybrid rendezvous ordering#8866

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

stereosteve
merged 1 commit into

from

Jul 15, 2024
 Merged


Python impl of sha256 + hybrid rendezvous ordering
#8866
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


47 changes: 33 additions & 14 deletions
packages/discovery-provider/src/utils/rendezvous.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,35 +1,54 @@
from hashlib import sha256
from typing import List

import crc32c

dead_nodes = ["https://content.grassfed.network/"]


# Python equivalent of https://github.com/tysonmote/rendezvous/blob/be0258dbbd3d/rendezvous.go
class RendezvousHash:
 def __init__(self, *nodes: str):
 self.nodes: List[bytes] = [bytes(node, "utf-8") for node in nodes]
 self.nodes: List[str] = [n for n in nodes if n not in dead_nodes]

 def add(self, *nodes: str) -> None:
 for node in nodes:
 self.nodes.append(bytes(node, "utf-8"))
 if node not in dead_nodes:
 self.nodes.append(node)

 def get_nodes(self) -> List[str]:
 return self.nodes

 def get(self, key: str) -> str:
 max_node = max(
 (node for node in self.nodes),
 default=None,
 key=lambda node: self.hash(node, bytes(key, "utf-8")),
 )
 return max_node.decode("utf-8") if max_node is not None else ""
 ranked = self.rank_hybrid(key)
 if ranked:
 return ranked[0]
 return ""

 # HashMigration: use rank_sha256 after migration done
 def get_n(self, n: int, key: str) -> List[str]:
 scores = [(self.hash(node, bytes(key, "utf-8")), node) for node in self.nodes]
 return self.rank_hybrid(key)[:n]

 def rank_hybrid(self, key: str) -> List[str]:
 legacy = self.rank_crc32(2, key)
 modern = [h for h in self.rank_sha256(key) if h not in legacy]
 hybrid = legacy + modern
 return hybrid

 def rank_crc32(self, n: int, key: str) -> List[str]:
 scores = [(self.hash(node, key), node) for node in self.nodes]
 scores.sort(key=lambda x: (-x[0], x[1]))
 return [node.decode("utf-8") for _, node in scores[:n]]
 return [t[1] for t in scores[:n]]

 def get_nodes(self) -> List[str]:
 return [node.decode("utf-8") for node in self.nodes]
 def rank_sha256(self, key: str) -> List[str]:
 tuples = [
 (h, sha256((h + key).encode("utf-8")).hexdigest()) for h in self.nodes
 ]
 tuples.sort(key=lambda t: (t[1], t[0]))
 return [t[0] for t in tuples]

 @staticmethod
 def hash(node: bytes, key: bytes) -> int:
 combined = key + node
 def hash(node: str, key: str) -> int:
 combined = (key + node).encode("utf-8")
 # Convert to unsigned 32-bit integer to match golang uint32 here: https://github.com/tysonmote/rendezvous/blob/be0258dbbd3d/rendezvous.go#L92
 return crc32c.crc32c(combined) & 0xFFFFFFFF

46 changes: 44 additions & 2 deletions
packages/discovery-provider/src/utils/rendezvous_unit_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ def test_return_top_n_nodes():
 nodes = ["node1", "node2", "node3"]
 hash_obj = RendezvousHash(*nodes)
 key = "test-key"
 top2_nodes = hash_obj.get_n(2, key)
 top2_nodes = hash_obj.rank_crc32(2, key)
 assert len(top2_nodes) == 2
 assert all(node in nodes for node in top2_nodes)

Expand DownExpand Up@@ -65,5 +65,47 @@ def test_hash_get(key, expected):
def test_hash_get_n(n, key, expected):
 hash_obj = RendezvousHash()
 hash_obj.add("a", "b", "c", "d", "e")
 got_nodes = hash_obj.get_n(n, key)
 got_nodes = hash_obj.rank_crc32(n, key)
 assert got_nodes == expected


def test_hybrid():
 node_list = "https://creatornode.audius.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius1.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius2.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius8.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius.co,https://creatornode2.audius.co,https://creatornode3.audius.co,https://usermetadata.audius.co,https://audius-content-1.cultur3stake.com,https://audius-content-10.cultur3stake.com,https://audius-content-11.cultur3stake.com,https://audius-content-12.cultur3stake.com,https://audius-content-13.cultur3stake.com,https://audius-content-14.cultur3stake.com,https://audius-content-15.cultur3stake.com,https://audius-content-16.cultur3stake.com,https://audius-content-17.cultur3stake.com,https://audius-content-18.cultur3stake.com,https://audius-content-2.cultur3stake.com,https://audius-content-3.cultur3stake.com,https://audius-content-4.cultur3stake.com,https://audius-content-5.cultur3stake.com,https://audius-content-6.cultur3stake.com,https://audius-content-7.cultur3stake.com,https://audius-content-8.cultur3stake.com,https://audius-content-9.cultur3stake.com,https://cn1.stuffisup.com,https://audius-cn1.tikilabs.com,https://audius.prod.capturealpha.io,https://audius-content-1.figment.io,https://audius-content-10.figment.io,https://audius-content-11.figment.io,https://audius-content-12.figment.io,https://audius-content-13.figment.io,https://audius-content-14.figment.io,https://audius-content-2.figment.io,https://audius-content-3.figment.io,https://audius-content-4.figment.io,https://audius-content-5.figment.io,https://audius-content-6.figment.io,https://audius-content-7.figment.io,https://audius-content-8.figment.io,https://audius-content-9.figment.io,https://blockchange-audius-content-01.bdnodes.net,https://blockchange-audius-content-02.bdnodes.net,https://blockchange-audius-content-03.bdnodes.net,https://blockdaemon-audius-content-01.bdnodes.net,https://blockdaemon-audius-content-02.bdnodes.net,https://blockdaemon-audius-content-03.bdnodes.net,https://blockdaemon-audius-content-04.bdnodes.net,https://blockdaemon-audius-content-05.bdnodes.net,https://blockdaemon-audius-content-06.bdnodes.net,https://blockdaemon-audius-content-07.bdnodes.net,https://blockdaemon-audius-content-08.bdnodes.net,https://blockdaemon-audius-content-09.bdnodes.net,https://content.grassfed.network,https://cn0.mainnet.audiusindex.org,https://cn1.mainnet.audiusindex.org,https://cn2.mainnet.audiusindex.org,https://cn3.mainnet.audiusindex.org,https://cn4.mainnet.audiusindex.org,https://audius-content-1.jollyworld.xyz,https://audius-creator-1.theblueprint.xyz,https://audius-creator-2.theblueprint.xyz,https://audius-creator-3.theblueprint.xyz,https://audius-creator-4.theblueprint.xyz,https://audius-creator-5.theblueprint.xyz,https://audius-creator-6.theblueprint.xyz".split(
 ","
 )
 test_cid = "baeaaaiqsedziwknj44jsl5fak6vcbszzjlnl7pqtw2ipnyg7rsh5a2xnql2p2"
 hasher = RendezvousHash(*node_list)

 # sha256
 got = hasher.rank_sha256(test_cid)[:6]
 expected = [
 "https://blockdaemon-audius-content-09.bdnodes.net",
 "https://cn4.mainnet.audiusindex.org",
 "https://audius-content-4.figment.io",
 "https://cn0.mainnet.audiusindex.org",
 "https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud",
 "https://blockdaemon-audius-content-07.bdnodes.net",
 ]
 assert got == expected

 # crc32 top 2
 got = hasher.rank_crc32(2, test_cid)
 expected = [
 "https://audius-content-15.cultur3stake.com",
 "https://audius-content-4.figment.io",
 ]
 assert got == expected

 # hybrid
 got = hasher.get_n(6, test_cid)
 expected = [
 # crc32 (top2)
 "https://audius-content-15.cultur3stake.com",
 "https://audius-content-4.figment.io",
 # sha256
 "https://blockdaemon-audius-content-09.bdnodes.net",
 "https://cn4.mainnet.audiusindex.org",
 "https://cn0.mainnet.audiusindex.org",
 "https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud",
 ]
 assert got == expected

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Python impl of sha256 + hybrid rendezvous ordering by stereosteve · Pull Request #8866 · AudiusProject/apps · GitHub
Skip to content
Python impl of sha256 + hybrid rendezvous ordering#8866

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

stereosteve
merged 1 commit into

from

Jul 15, 2024
 Merged


Python impl of sha256 + hybrid rendezvous ordering
#8866
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


47 changes: 33 additions & 14 deletions
packages/discovery-provider/src/utils/rendezvous.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,35 +1,54 @@
from hashlib import sha256
from typing import List

import crc32c

dead_nodes = ["https://content.grassfed.network/"]


# Python equivalent of https://github.com/tysonmote/rendezvous/blob/be0258dbbd3d/rendezvous.go
class RendezvousHash:
 def __init__(self, *nodes: str):
 self.nodes: List[bytes] = [bytes(node, "utf-8") for node in nodes]
 self.nodes: List[str] = [n for n in nodes if n not in dead_nodes]

 def add(self, *nodes: str) -> None:
 for node in nodes:
 self.nodes.append(bytes(node, "utf-8"))
 if node not in dead_nodes:
 self.nodes.append(node)

 def get_nodes(self) -> List[str]:
 return self.nodes

 def get(self, key: str) -> str:
 max_node = max(
 (node for node in self.nodes),
 default=None,
 key=lambda node: self.hash(node, bytes(key, "utf-8")),
 )
 return max_node.decode("utf-8") if max_node is not None else ""
 ranked = self.rank_hybrid(key)
 if ranked:
 return ranked[0]
 return ""

 # HashMigration: use rank_sha256 after migration done
 def get_n(self, n: int, key: str) -> List[str]:
 scores = [(self.hash(node, bytes(key, "utf-8")), node) for node in self.nodes]
 return self.rank_hybrid(key)[:n]

 def rank_hybrid(self, key: str) -> List[str]:
 legacy = self.rank_crc32(2, key)
 modern = [h for h in self.rank_sha256(key) if h not in legacy]
 hybrid = legacy + modern
 return hybrid

 def rank_crc32(self, n: int, key: str) -> List[str]:
 scores = [(self.hash(node, key), node) for node in self.nodes]
 scores.sort(key=lambda x: (-x[0], x[1]))
 return [node.decode("utf-8") for _, node in scores[:n]]
 return [t[1] for t in scores[:n]]

 def get_nodes(self) -> List[str]:
 return [node.decode("utf-8") for node in self.nodes]
 def rank_sha256(self, key: str) -> List[str]:
 tuples = [
 (h, sha256((h + key).encode("utf-8")).hexdigest()) for h in self.nodes
 ]
 tuples.sort(key=lambda t: (t[1], t[0]))
 return [t[0] for t in tuples]

 @staticmethod
 def hash(node: bytes, key: bytes) -> int:
 combined = key + node
 def hash(node: str, key: str) -> int:
 combined = (key + node).encode("utf-8")
 # Convert to unsigned 32-bit integer to match golang uint32 here: https://github.com/tysonmote/rendezvous/blob/be0258dbbd3d/rendezvous.go#L92
 return crc32c.crc32c(combined) & 0xFFFFFFFF

46 changes: 44 additions & 2 deletions
packages/discovery-provider/src/utils/rendezvous_unit_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ def test_return_top_n_nodes():
 nodes = ["node1", "node2", "node3"]
 hash_obj = RendezvousHash(*nodes)
 key = "test-key"
 top2_nodes = hash_obj.get_n(2, key)
 top2_nodes = hash_obj.rank_crc32(2, key)
 assert len(top2_nodes) == 2
 assert all(node in nodes for node in top2_nodes)

Expand DownExpand Up@@ -65,5 +65,47 @@ def test_hash_get(key, expected):
def test_hash_get_n(n, key, expected):
 hash_obj = RendezvousHash()
 hash_obj.add("a", "b", "c", "d", "e")
 got_nodes = hash_obj.get_n(n, key)
 got_nodes = hash_obj.rank_crc32(n, key)
 assert got_nodes == expected


def test_hybrid():
 node_list = "https://creatornode.audius.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius1.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius2.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius8.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius.co,https://creatornode2.audius.co,https://creatornode3.audius.co,https://usermetadata.audius.co,https://audius-content-1.cultur3stake.com,https://audius-content-10.cultur3stake.com,https://audius-content-11.cultur3stake.com,https://audius-content-12.cultur3stake.com,https://audius-content-13.cultur3stake.com,https://audius-content-14.cultur3stake.com,https://audius-content-15.cultur3stake.com,https://audius-content-16.cultur3stake.com,https://audius-content-17.cultur3stake.com,https://audius-content-18.cultur3stake.com,https://audius-content-2.cultur3stake.com,https://audius-content-3.cultur3stake.com,https://audius-content-4.cultur3stake.com,https://audius-content-5.cultur3stake.com,https://audius-content-6.cultur3stake.com,https://audius-content-7.cultur3stake.com,https://audius-content-8.cultur3stake.com,https://audius-content-9.cultur3stake.com,https://cn1.stuffisup.com,https://audius-cn1.tikilabs.com,https://audius.prod.capturealpha.io,https://audius-content-1.figment.io,https://audius-content-10.figment.io,https://audius-content-11.figment.io,https://audius-content-12.figment.io,https://audius-content-13.figment.io,https://audius-content-14.figment.io,https://audius-content-2.figment.io,https://audius-content-3.figment.io,https://audius-content-4.figment.io,https://audius-content-5.figment.io,https://audius-content-6.figment.io,https://audius-content-7.figment.io,https://audius-content-8.figment.io,https://audius-content-9.figment.io,https://blockchange-audius-content-01.bdnodes.net,https://blockchange-audius-content-02.bdnodes.net,https://blockchange-audius-content-03.bdnodes.net,https://blockdaemon-audius-content-01.bdnodes.net,https://blockdaemon-audius-content-02.bdnodes.net,https://blockdaemon-audius-content-03.bdnodes.net,https://blockdaemon-audius-content-04.bdnodes.net,https://blockdaemon-audius-content-05.bdnodes.net,https://blockdaemon-audius-content-06.bdnodes.net,https://blockdaemon-audius-content-07.bdnodes.net,https://blockdaemon-audius-content-08.bdnodes.net,https://blockdaemon-audius-content-09.bdnodes.net,https://content.grassfed.network,https://cn0.mainnet.audiusindex.org,https://cn1.mainnet.audiusindex.org,https://cn2.mainnet.audiusindex.org,https://cn3.mainnet.audiusindex.org,https://cn4.mainnet.audiusindex.org,https://audius-content-1.jollyworld.xyz,https://audius-creator-1.theblueprint.xyz,https://audius-creator-2.theblueprint.xyz,https://audius-creator-3.theblueprint.xyz,https://audius-creator-4.theblueprint.xyz,https://audius-creator-5.theblueprint.xyz,https://audius-creator-6.theblueprint.xyz".split(
 ","
 )
 test_cid = "baeaaaiqsedziwknj44jsl5fak6vcbszzjlnl7pqtw2ipnyg7rsh5a2xnql2p2"
 hasher = RendezvousHash(*node_list)

 # sha256
 got = hasher.rank_sha256(test_cid)[:6]
 expected = [
 "https://blockdaemon-audius-content-09.bdnodes.net",
 "https://cn4.mainnet.audiusindex.org",
 "https://audius-content-4.figment.io",
 "https://cn0.mainnet.audiusindex.org",
 "https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud",
 "https://blockdaemon-audius-content-07.bdnodes.net",
 ]
 assert got == expected

 # crc32 top 2
 got = hasher.rank_crc32(2, test_cid)
 expected = [
 "https://audius-content-15.cultur3stake.com",
 "https://audius-content-4.figment.io",
 ]
 assert got == expected

 # hybrid
 got = hasher.get_n(6, test_cid)
 expected = [
 # crc32 (top2)
 "https://audius-content-15.cultur3stake.com",
 "https://audius-content-4.figment.io",
 # sha256
 "https://blockdaemon-audius-content-09.bdnodes.net",
 "https://cn4.mainnet.audiusindex.org",
 "https://cn0.mainnet.audiusindex.org",
 "https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud",
 ]
 assert got == expected

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Python impl of sha256 + hybrid rendezvous ordering by stereosteve · Pull Request #8866 · AudiusProject/apps · GitHub
Skip to content
Python impl of sha256 + hybrid rendezvous ordering#8866

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

stereosteve
merged 1 commit into

from

Jul 15, 2024
 Merged


Python impl of sha256 + hybrid rendezvous ordering
#8866
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


47 changes: 33 additions & 14 deletions
packages/discovery-provider/src/utils/rendezvous.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,35 +1,54 @@
from hashlib import sha256
from typing import List

import crc32c

dead_nodes = ["https://content.grassfed.network/"]


# Python equivalent of https://github.com/tysonmote/rendezvous/blob/be0258dbbd3d/rendezvous.go
class RendezvousHash:
 def __init__(self, *nodes: str):
 self.nodes: List[bytes] = [bytes(node, "utf-8") for node in nodes]
 self.nodes: List[str] = [n for n in nodes if n not in dead_nodes]

 def add(self, *nodes: str) -> None:
 for node in nodes:
 self.nodes.append(bytes(node, "utf-8"))
 if node not in dead_nodes:
 self.nodes.append(node)

 def get_nodes(self) -> List[str]:
 return self.nodes

 def get(self, key: str) -> str:
 max_node = max(
 (node for node in self.nodes),
 default=None,
 key=lambda node: self.hash(node, bytes(key, "utf-8")),
 )
 return max_node.decode("utf-8") if max_node is not None else ""
 ranked = self.rank_hybrid(key)
 if ranked:
 return ranked[0]
 return ""

 # HashMigration: use rank_sha256 after migration done
 def get_n(self, n: int, key: str) -> List[str]:
 scores = [(self.hash(node, bytes(key, "utf-8")), node) for node in self.nodes]
 return self.rank_hybrid(key)[:n]

 def rank_hybrid(self, key: str) -> List[str]:
 legacy = self.rank_crc32(2, key)
 modern = [h for h in self.rank_sha256(key) if h not in legacy]
 hybrid = legacy + modern
 return hybrid

 def rank_crc32(self, n: int, key: str) -> List[str]:
 scores = [(self.hash(node, key), node) for node in self.nodes]
 scores.sort(key=lambda x: (-x[0], x[1]))
 return [node.decode("utf-8") for _, node in scores[:n]]
 return [t[1] for t in scores[:n]]

 def get_nodes(self) -> List[str]:
 return [node.decode("utf-8") for node in self.nodes]
 def rank_sha256(self, key: str) -> List[str]:
 tuples = [
 (h, sha256((h + key).encode("utf-8")).hexdigest()) for h in self.nodes
 ]
 tuples.sort(key=lambda t: (t[1], t[0]))
 return [t[0] for t in tuples]

 @staticmethod
 def hash(node: bytes, key: bytes) -> int:
 combined = key + node
 def hash(node: str, key: str) -> int:
 combined = (key + node).encode("utf-8")
 # Convert to unsigned 32-bit integer to match golang uint32 here: https://github.com/tysonmote/rendezvous/blob/be0258dbbd3d/rendezvous.go#L92
 return crc32c.crc32c(combined) & 0xFFFFFFFF

46 changes: 44 additions & 2 deletions
packages/discovery-provider/src/utils/rendezvous_unit_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ def test_return_top_n_nodes():
 nodes = ["node1", "node2", "node3"]
 hash_obj = RendezvousHash(*nodes)
 key = "test-key"
 top2_nodes = hash_obj.get_n(2, key)
 top2_nodes = hash_obj.rank_crc32(2, key)
 assert len(top2_nodes) == 2
 assert all(node in nodes for node in top2_nodes)

Expand DownExpand Up@@ -65,5 +65,47 @@ def test_hash_get(key, expected):
def test_hash_get_n(n, key, expected):
 hash_obj = RendezvousHash()
 hash_obj.add("a", "b", "c", "d", "e")
 got_nodes = hash_obj.get_n(n, key)
 got_nodes = hash_obj.rank_crc32(n, key)
 assert got_nodes == expected


def test_hybrid():
 node_list = "https://creatornode.audius.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius1.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius2.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius8.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius.co,https://creatornode2.audius.co,https://creatornode3.audius.co,https://usermetadata.audius.co,https://audius-content-1.cultur3stake.com,https://audius-content-10.cultur3stake.com,https://audius-content-11.cultur3stake.com,https://audius-content-12.cultur3stake.com,https://audius-content-13.cultur3stake.com,https://audius-content-14.cultur3stake.com,https://audius-content-15.cultur3stake.com,https://audius-content-16.cultur3stake.com,https://audius-content-17.cultur3stake.com,https://audius-content-18.cultur3stake.com,https://audius-content-2.cultur3stake.com,https://audius-content-3.cultur3stake.com,https://audius-content-4.cultur3stake.com,https://audius-content-5.cultur3stake.com,https://audius-content-6.cultur3stake.com,https://audius-content-7.cultur3stake.com,https://audius-content-8.cultur3stake.com,https://audius-content-9.cultur3stake.com,https://cn1.stuffisup.com,https://audius-cn1.tikilabs.com,https://audius.prod.capturealpha.io,https://audius-content-1.figment.io,https://audius-content-10.figment.io,https://audius-content-11.figment.io,https://audius-content-12.figment.io,https://audius-content-13.figment.io,https://audius-content-14.figment.io,https://audius-content-2.figment.io,https://audius-content-3.figment.io,https://audius-content-4.figment.io,https://audius-content-5.figment.io,https://audius-content-6.figment.io,https://audius-content-7.figment.io,https://audius-content-8.figment.io,https://audius-content-9.figment.io,https://blockchange-audius-content-01.bdnodes.net,https://blockchange-audius-content-02.bdnodes.net,https://blockchange-audius-content-03.bdnodes.net,https://blockdaemon-audius-content-01.bdnodes.net,https://blockdaemon-audius-content-02.bdnodes.net,https://blockdaemon-audius-content-03.bdnodes.net,https://blockdaemon-audius-content-04.bdnodes.net,https://blockdaemon-audius-content-05.bdnodes.net,https://blockdaemon-audius-content-06.bdnodes.net,https://blockdaemon-audius-content-07.bdnodes.net,https://blockdaemon-audius-content-08.bdnodes.net,https://blockdaemon-audius-content-09.bdnodes.net,https://content.grassfed.network,https://cn0.mainnet.audiusindex.org,https://cn1.mainnet.audiusindex.org,https://cn2.mainnet.audiusindex.org,https://cn3.mainnet.audiusindex.org,https://cn4.mainnet.audiusindex.org,https://audius-content-1.jollyworld.xyz,https://audius-creator-1.theblueprint.xyz,https://audius-creator-2.theblueprint.xyz,https://audius-creator-3.theblueprint.xyz,https://audius-creator-4.theblueprint.xyz,https://audius-creator-5.theblueprint.xyz,https://audius-creator-6.theblueprint.xyz".split(
 ","
 )
 test_cid = "baeaaaiqsedziwknj44jsl5fak6vcbszzjlnl7pqtw2ipnyg7rsh5a2xnql2p2"
 hasher = RendezvousHash(*node_list)

 # sha256
 got = hasher.rank_sha256(test_cid)[:6]
 expected = [
 "https://blockdaemon-audius-content-09.bdnodes.net",
 "https://cn4.mainnet.audiusindex.org",
 "https://audius-content-4.figment.io",
 "https://cn0.mainnet.audiusindex.org",
 "https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud",
 "https://blockdaemon-audius-content-07.bdnodes.net",
 ]
 assert got == expected

 # crc32 top 2
 got = hasher.rank_crc32(2, test_cid)
 expected = [
 "https://audius-content-15.cultur3stake.com",
 "https://audius-content-4.figment.io",
 ]
 assert got == expected

 # hybrid
 got = hasher.get_n(6, test_cid)
 expected = [
 # crc32 (top2)
 "https://audius-content-15.cultur3stake.com",
 "https://audius-content-4.figment.io",
 # sha256
 "https://blockdaemon-audius-content-09.bdnodes.net",
 "https://cn4.mainnet.audiusindex.org",
 "https://cn0.mainnet.audiusindex.org",
 "https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud",
 ]
 assert got == expected

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Python impl of sha256 + hybrid rendezvous ordering by stereosteve · Pull Request #8866 · AudiusProject/apps · GitHub
Skip to content
Python impl of sha256 + hybrid rendezvous ordering#8866

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

stereosteve
merged 1 commit into

from

Jul 15, 2024
 Merged


Python impl of sha256 + hybrid rendezvous ordering
#8866
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


47 changes: 33 additions & 14 deletions
packages/discovery-provider/src/utils/rendezvous.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,35 +1,54 @@
from hashlib import sha256
from typing import List

import crc32c

dead_nodes = ["https://content.grassfed.network/"]


# Python equivalent of https://github.com/tysonmote/rendezvous/blob/be0258dbbd3d/rendezvous.go
class RendezvousHash:
 def __init__(self, *nodes: str):
 self.nodes: List[bytes] = [bytes(node, "utf-8") for node in nodes]
 self.nodes: List[str] = [n for n in nodes if n not in dead_nodes]

 def add(self, *nodes: str) -> None:
 for node in nodes:
 self.nodes.append(bytes(node, "utf-8"))
 if node not in dead_nodes:
 self.nodes.append(node)

 def get_nodes(self) -> List[str]:
 return self.nodes

 def get(self, key: str) -> str:
 max_node = max(
 (node for node in self.nodes),
 default=None,
 key=lambda node: self.hash(node, bytes(key, "utf-8")),
 )
 return max_node.decode("utf-8") if max_node is not None else ""
 ranked = self.rank_hybrid(key)
 if ranked:
 return ranked[0]
 return ""

 # HashMigration: use rank_sha256 after migration done
 def get_n(self, n: int, key: str) -> List[str]:
 scores = [(self.hash(node, bytes(key, "utf-8")), node) for node in self.nodes]
 return self.rank_hybrid(key)[:n]

 def rank_hybrid(self, key: str) -> List[str]:
 legacy = self.rank_crc32(2, key)
 modern = [h for h in self.rank_sha256(key) if h not in legacy]
 hybrid = legacy + modern
 return hybrid

 def rank_crc32(self, n: int, key: str) -> List[str]:
 scores = [(self.hash(node, key), node) for node in self.nodes]
 scores.sort(key=lambda x: (-x[0], x[1]))
 return [node.decode("utf-8") for _, node in scores[:n]]
 return [t[1] for t in scores[:n]]

 def get_nodes(self) -> List[str]:
 return [node.decode("utf-8") for node in self.nodes]
 def rank_sha256(self, key: str) -> List[str]:
 tuples = [
 (h, sha256((h + key).encode("utf-8")).hexdigest()) for h in self.nodes
 ]
 tuples.sort(key=lambda t: (t[1], t[0]))
 return [t[0] for t in tuples]

 @staticmethod
 def hash(node: bytes, key: bytes) -> int:
 combined = key + node
 def hash(node: str, key: str) -> int:
 combined = (key + node).encode("utf-8")
 # Convert to unsigned 32-bit integer to match golang uint32 here: https://github.com/tysonmote/rendezvous/blob/be0258dbbd3d/rendezvous.go#L92
 return crc32c.crc32c(combined) & 0xFFFFFFFF

46 changes: 44 additions & 2 deletions
packages/discovery-provider/src/utils/rendezvous_unit_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ def test_return_top_n_nodes():
 nodes = ["node1", "node2", "node3"]
 hash_obj = RendezvousHash(*nodes)
 key = "test-key"
 top2_nodes = hash_obj.get_n(2, key)
 top2_nodes = hash_obj.rank_crc32(2, key)
 assert len(top2_nodes) == 2
 assert all(node in nodes for node in top2_nodes)

Expand DownExpand Up@@ -65,5 +65,47 @@ def test_hash_get(key, expected):
def test_hash_get_n(n, key, expected):
 hash_obj = RendezvousHash()
 hash_obj.add("a", "b", "c", "d", "e")
 got_nodes = hash_obj.get_n(n, key)
 got_nodes = hash_obj.rank_crc32(n, key)
 assert got_nodes == expected


def test_hybrid():
 node_list = "https://creatornode.audius.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius1.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius2.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius8.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius.co,https://creatornode2.audius.co,https://creatornode3.audius.co,https://usermetadata.audius.co,https://audius-content-1.cultur3stake.com,https://audius-content-10.cultur3stake.com,https://audius-content-11.cultur3stake.com,https://audius-content-12.cultur3stake.com,https://audius-content-13.cultur3stake.com,https://audius-content-14.cultur3stake.com,https://audius-content-15.cultur3stake.com,https://audius-content-16.cultur3stake.com,https://audius-content-17.cultur3stake.com,https://audius-content-18.cultur3stake.com,https://audius-content-2.cultur3stake.com,https://audius-content-3.cultur3stake.com,https://audius-content-4.cultur3stake.com,https://audius-content-5.cultur3stake.com,https://audius-content-6.cultur3stake.com,https://audius-content-7.cultur3stake.com,https://audius-content-8.cultur3stake.com,https://audius-content-9.cultur3stake.com,https://cn1.stuffisup.com,https://audius-cn1.tikilabs.com,https://audius.prod.capturealpha.io,https://audius-content-1.figment.io,https://audius-content-10.figment.io,https://audius-content-11.figment.io,https://audius-content-12.figment.io,https://audius-content-13.figment.io,https://audius-content-14.figment.io,https://audius-content-2.figment.io,https://audius-content-3.figment.io,https://audius-content-4.figment.io,https://audius-content-5.figment.io,https://audius-content-6.figment.io,https://audius-content-7.figment.io,https://audius-content-8.figment.io,https://audius-content-9.figment.io,https://blockchange-audius-content-01.bdnodes.net,https://blockchange-audius-content-02.bdnodes.net,https://blockchange-audius-content-03.bdnodes.net,https://blockdaemon-audius-content-01.bdnodes.net,https://blockdaemon-audius-content-02.bdnodes.net,https://blockdaemon-audius-content-03.bdnodes.net,https://blockdaemon-audius-content-04.bdnodes.net,https://blockdaemon-audius-content-05.bdnodes.net,https://blockdaemon-audius-content-06.bdnodes.net,https://blockdaemon-audius-content-07.bdnodes.net,https://blockdaemon-audius-content-08.bdnodes.net,https://blockdaemon-audius-content-09.bdnodes.net,https://content.grassfed.network,https://cn0.mainnet.audiusindex.org,https://cn1.mainnet.audiusindex.org,https://cn2.mainnet.audiusindex.org,https://cn3.mainnet.audiusindex.org,https://cn4.mainnet.audiusindex.org,https://audius-content-1.jollyworld.xyz,https://audius-creator-1.theblueprint.xyz,https://audius-creator-2.theblueprint.xyz,https://audius-creator-3.theblueprint.xyz,https://audius-creator-4.theblueprint.xyz,https://audius-creator-5.theblueprint.xyz,https://audius-creator-6.theblueprint.xyz".split(
 ","
 )
 test_cid = "baeaaaiqsedziwknj44jsl5fak6vcbszzjlnl7pqtw2ipnyg7rsh5a2xnql2p2"
 hasher = RendezvousHash(*node_list)

 # sha256
 got = hasher.rank_sha256(test_cid)[:6]
 expected = [
 "https://blockdaemon-audius-content-09.bdnodes.net",
 "https://cn4.mainnet.audiusindex.org",
 "https://audius-content-4.figment.io",
 "https://cn0.mainnet.audiusindex.org",
 "https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud",
 "https://blockdaemon-audius-content-07.bdnodes.net",
 ]
 assert got == expected

 # crc32 top 2
 got = hasher.rank_crc32(2, test_cid)
 expected = [
 "https://audius-content-15.cultur3stake.com",
 "https://audius-content-4.figment.io",
 ]
 assert got == expected

 # hybrid
 got = hasher.get_n(6, test_cid)
 expected = [
 # crc32 (top2)
 "https://audius-content-15.cultur3stake.com",
 "https://audius-content-4.figment.io",
 # sha256
 "https://blockdaemon-audius-content-09.bdnodes.net",
 "https://cn4.mainnet.audiusindex.org",
 "https://cn0.mainnet.audiusindex.org",
 "https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud",
 ]
 assert got == expected

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Python impl of sha256 + hybrid rendezvous ordering by stereosteve · Pull Request #8866 · AudiusProject/apps · GitHub
Skip to content
Python impl of sha256 + hybrid rendezvous ordering#8866

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

stereosteve
merged 1 commit into

from

Jul 15, 2024
 Merged


Python impl of sha256 + hybrid rendezvous ordering
#8866
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


47 changes: 33 additions & 14 deletions
packages/discovery-provider/src/utils/rendezvous.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,35 +1,54 @@
from hashlib import sha256
from typing import List

import crc32c

dead_nodes = ["https://content.grassfed.network/"]


# Python equivalent of https://github.com/tysonmote/rendezvous/blob/be0258dbbd3d/rendezvous.go
class RendezvousHash:
 def __init__(self, *nodes: str):
 self.nodes: List[bytes] = [bytes(node, "utf-8") for node in nodes]
 self.nodes: List[str] = [n for n in nodes if n not in dead_nodes]

 def add(self, *nodes: str) -> None:
 for node in nodes:
 self.nodes.append(bytes(node, "utf-8"))
 if node not in dead_nodes:
 self.nodes.append(node)

 def get_nodes(self) -> List[str]:
 return self.nodes

 def get(self, key: str) -> str:
 max_node = max(
 (node for node in self.nodes),
 default=None,
 key=lambda node: self.hash(node, bytes(key, "utf-8")),
 )
 return max_node.decode("utf-8") if max_node is not None else ""
 ranked = self.rank_hybrid(key)
 if ranked:
 return ranked[0]
 return ""

 # HashMigration: use rank_sha256 after migration done
 def get_n(self, n: int, key: str) -> List[str]:
 scores = [(self.hash(node, bytes(key, "utf-8")), node) for node in self.nodes]
 return self.rank_hybrid(key)[:n]

 def rank_hybrid(self, key: str) -> List[str]:
 legacy = self.rank_crc32(2, key)
 modern = [h for h in self.rank_sha256(key) if h not in legacy]
 hybrid = legacy + modern
 return hybrid

 def rank_crc32(self, n: int, key: str) -> List[str]:
 scores = [(self.hash(node, key), node) for node in self.nodes]
 scores.sort(key=lambda x: (-x[0], x[1]))
 return [node.decode("utf-8") for _, node in scores[:n]]
 return [t[1] for t in scores[:n]]

 def get_nodes(self) -> List[str]:
 return [node.decode("utf-8") for node in self.nodes]
 def rank_sha256(self, key: str) -> List[str]:
 tuples = [
 (h, sha256((h + key).encode("utf-8")).hexdigest()) for h in self.nodes
 ]
 tuples.sort(key=lambda t: (t[1], t[0]))
 return [t[0] for t in tuples]

 @staticmethod
 def hash(node: bytes, key: bytes) -> int:
 combined = key + node
 def hash(node: str, key: str) -> int:
 combined = (key + node).encode("utf-8")
 # Convert to unsigned 32-bit integer to match golang uint32 here: https://github.com/tysonmote/rendezvous/blob/be0258dbbd3d/rendezvous.go#L92
 return crc32c.crc32c(combined) & 0xFFFFFFFF

46 changes: 44 additions & 2 deletions
packages/discovery-provider/src/utils/rendezvous_unit_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ def test_return_top_n_nodes():
 nodes = ["node1", "node2", "node3"]
 hash_obj = RendezvousHash(*nodes)
 key = "test-key"
 top2_nodes = hash_obj.get_n(2, key)
 top2_nodes = hash_obj.rank_crc32(2, key)
 assert len(top2_nodes) == 2
 assert all(node in nodes for node in top2_nodes)

Expand DownExpand Up@@ -65,5 +65,47 @@ def test_hash_get(key, expected):
def test_hash_get_n(n, key, expected):
 hash_obj = RendezvousHash()
 hash_obj.add("a", "b", "c", "d", "e")
 got_nodes = hash_obj.get_n(n, key)
 got_nodes = hash_obj.rank_crc32(n, key)
 assert got_nodes == expected


def test_hybrid():
 node_list = "https://creatornode.audius.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius1.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius2.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius8.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius.co,https://creatornode2.audius.co,https://creatornode3.audius.co,https://usermetadata.audius.co,https://audius-content-1.cultur3stake.com,https://audius-content-10.cultur3stake.com,https://audius-content-11.cultur3stake.com,https://audius-content-12.cultur3stake.com,https://audius-content-13.cultur3stake.com,https://audius-content-14.cultur3stake.com,https://audius-content-15.cultur3stake.com,https://audius-content-16.cultur3stake.com,https://audius-content-17.cultur3stake.com,https://audius-content-18.cultur3stake.com,https://audius-content-2.cultur3stake.com,https://audius-content-3.cultur3stake.com,https://audius-content-4.cultur3stake.com,https://audius-content-5.cultur3stake.com,https://audius-content-6.cultur3stake.com,https://audius-content-7.cultur3stake.com,https://audius-content-8.cultur3stake.com,https://audius-content-9.cultur3stake.com,https://cn1.stuffisup.com,https://audius-cn1.tikilabs.com,https://audius.prod.capturealpha.io,https://audius-content-1.figment.io,https://audius-content-10.figment.io,https://audius-content-11.figment.io,https://audius-content-12.figment.io,https://audius-content-13.figment.io,https://audius-content-14.figment.io,https://audius-content-2.figment.io,https://audius-content-3.figment.io,https://audius-content-4.figment.io,https://audius-content-5.figment.io,https://audius-content-6.figment.io,https://audius-content-7.figment.io,https://audius-content-8.figment.io,https://audius-content-9.figment.io,https://blockchange-audius-content-01.bdnodes.net,https://blockchange-audius-content-02.bdnodes.net,https://blockchange-audius-content-03.bdnodes.net,https://blockdaemon-audius-content-01.bdnodes.net,https://blockdaemon-audius-content-02.bdnodes.net,https://blockdaemon-audius-content-03.bdnodes.net,https://blockdaemon-audius-content-04.bdnodes.net,https://blockdaemon-audius-content-05.bdnodes.net,https://blockdaemon-audius-content-06.bdnodes.net,https://blockdaemon-audius-content-07.bdnodes.net,https://blockdaemon-audius-content-08.bdnodes.net,https://blockdaemon-audius-content-09.bdnodes.net,https://content.grassfed.network,https://cn0.mainnet.audiusindex.org,https://cn1.mainnet.audiusindex.org,https://cn2.mainnet.audiusindex.org,https://cn3.mainnet.audiusindex.org,https://cn4.mainnet.audiusindex.org,https://audius-content-1.jollyworld.xyz,https://audius-creator-1.theblueprint.xyz,https://audius-creator-2.theblueprint.xyz,https://audius-creator-3.theblueprint.xyz,https://audius-creator-4.theblueprint.xyz,https://audius-creator-5.theblueprint.xyz,https://audius-creator-6.theblueprint.xyz".split(
 ","
 )
 test_cid = "baeaaaiqsedziwknj44jsl5fak6vcbszzjlnl7pqtw2ipnyg7rsh5a2xnql2p2"
 hasher = RendezvousHash(*node_list)

 # sha256
 got = hasher.rank_sha256(test_cid)[:6]
 expected = [
 "https://blockdaemon-audius-content-09.bdnodes.net",
 "https://cn4.mainnet.audiusindex.org",
 "https://audius-content-4.figment.io",
 "https://cn0.mainnet.audiusindex.org",
 "https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud",
 "https://blockdaemon-audius-content-07.bdnodes.net",
 ]
 assert got == expected

 # crc32 top 2
 got = hasher.rank_crc32(2, test_cid)
 expected = [
 "https://audius-content-15.cultur3stake.com",
 "https://audius-content-4.figment.io",
 ]
 assert got == expected

 # hybrid
 got = hasher.get_n(6, test_cid)
 expected = [
 # crc32 (top2)
 "https://audius-content-15.cultur3stake.com",
 "https://audius-content-4.figment.io",
 # sha256
 "https://blockdaemon-audius-content-09.bdnodes.net",
 "https://cn4.mainnet.audiusindex.org",
 "https://cn0.mainnet.audiusindex.org",
 "https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud",
 ]
 assert got == expected

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Python impl of sha256 + hybrid rendezvous ordering by stereosteve · Pull Request #8866 · AudiusProject/apps · GitHub
Skip to content
Python impl of sha256 + hybrid rendezvous ordering#8866

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

stereosteve
merged 1 commit into

from

Jul 15, 2024
 Merged


Python impl of sha256 + hybrid rendezvous ordering
#8866
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


47 changes: 33 additions & 14 deletions
packages/discovery-provider/src/utils/rendezvous.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,35 +1,54 @@
from hashlib import sha256
from typing import List

import crc32c

dead_nodes = ["https://content.grassfed.network/"]


# Python equivalent of https://github.com/tysonmote/rendezvous/blob/be0258dbbd3d/rendezvous.go
class RendezvousHash:
 def __init__(self, *nodes: str):
 self.nodes: List[bytes] = [bytes(node, "utf-8") for node in nodes]
 self.nodes: List[str] = [n for n in nodes if n not in dead_nodes]

 def add(self, *nodes: str) -> None:
 for node in nodes:
 self.nodes.append(bytes(node, "utf-8"))
 if node not in dead_nodes:
 self.nodes.append(node)

 def get_nodes(self) -> List[str]:
 return self.nodes

 def get(self, key: str) -> str:
 max_node = max(
 (node for node in self.nodes),
 default=None,
 key=lambda node: self.hash(node, bytes(key, "utf-8")),
 )
 return max_node.decode("utf-8") if max_node is not None else ""
 ranked = self.rank_hybrid(key)
 if ranked:
 return ranked[0]
 return ""

 # HashMigration: use rank_sha256 after migration done
 def get_n(self, n: int, key: str) -> List[str]:
 scores = [(self.hash(node, bytes(key, "utf-8")), node) for node in self.nodes]
 return self.rank_hybrid(key)[:n]

 def rank_hybrid(self, key: str) -> List[str]:
 legacy = self.rank_crc32(2, key)
 modern = [h for h in self.rank_sha256(key) if h not in legacy]
 hybrid = legacy + modern
 return hybrid

 def rank_crc32(self, n: int, key: str) -> List[str]:
 scores = [(self.hash(node, key), node) for node in self.nodes]
 scores.sort(key=lambda x: (-x[0], x[1]))
 return [node.decode("utf-8") for _, node in scores[:n]]
 return [t[1] for t in scores[:n]]

 def get_nodes(self) -> List[str]:
 return [node.decode("utf-8") for node in self.nodes]
 def rank_sha256(self, key: str) -> List[str]:
 tuples = [
 (h, sha256((h + key).encode("utf-8")).hexdigest()) for h in self.nodes
 ]
 tuples.sort(key=lambda t: (t[1], t[0]))
 return [t[0] for t in tuples]

 @staticmethod
 def hash(node: bytes, key: bytes) -> int:
 combined = key + node
 def hash(node: str, key: str) -> int:
 combined = (key + node).encode("utf-8")
 # Convert to unsigned 32-bit integer to match golang uint32 here: https://github.com/tysonmote/rendezvous/blob/be0258dbbd3d/rendezvous.go#L92
 return crc32c.crc32c(combined) & 0xFFFFFFFF

46 changes: 44 additions & 2 deletions
packages/discovery-provider/src/utils/rendezvous_unit_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ def test_return_top_n_nodes():
 nodes = ["node1", "node2", "node3"]
 hash_obj = RendezvousHash(*nodes)
 key = "test-key"
 top2_nodes = hash_obj.get_n(2, key)
 top2_nodes = hash_obj.rank_crc32(2, key)
 assert len(top2_nodes) == 2
 assert all(node in nodes for node in top2_nodes)

Expand DownExpand Up@@ -65,5 +65,47 @@ def test_hash_get(key, expected):
def test_hash_get_n(n, key, expected):
 hash_obj = RendezvousHash()
 hash_obj.add("a", "b", "c", "d", "e")
 got_nodes = hash_obj.get_n(n, key)
 got_nodes = hash_obj.rank_crc32(n, key)
 assert got_nodes == expected


def test_hybrid():
 node_list = "https://creatornode.audius.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius1.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius2.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius8.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius.co,https://creatornode2.audius.co,https://creatornode3.audius.co,https://usermetadata.audius.co,https://audius-content-1.cultur3stake.com,https://audius-content-10.cultur3stake.com,https://audius-content-11.cultur3stake.com,https://audius-content-12.cultur3stake.com,https://audius-content-13.cultur3stake.com,https://audius-content-14.cultur3stake.com,https://audius-content-15.cultur3stake.com,https://audius-content-16.cultur3stake.com,https://audius-content-17.cultur3stake.com,https://audius-content-18.cultur3stake.com,https://audius-content-2.cultur3stake.com,https://audius-content-3.cultur3stake.com,https://audius-content-4.cultur3stake.com,https://audius-content-5.cultur3stake.com,https://audius-content-6.cultur3stake.com,https://audius-content-7.cultur3stake.com,https://audius-content-8.cultur3stake.com,https://audius-content-9.cultur3stake.com,https://cn1.stuffisup.com,https://audius-cn1.tikilabs.com,https://audius.prod.capturealpha.io,https://audius-content-1.figment.io,https://audius-content-10.figment.io,https://audius-content-11.figment.io,https://audius-content-12.figment.io,https://audius-content-13.figment.io,https://audius-content-14.figment.io,https://audius-content-2.figment.io,https://audius-content-3.figment.io,https://audius-content-4.figment.io,https://audius-content-5.figment.io,https://audius-content-6.figment.io,https://audius-content-7.figment.io,https://audius-content-8.figment.io,https://audius-content-9.figment.io,https://blockchange-audius-content-01.bdnodes.net,https://blockchange-audius-content-02.bdnodes.net,https://blockchange-audius-content-03.bdnodes.net,https://blockdaemon-audius-content-01.bdnodes.net,https://blockdaemon-audius-content-02.bdnodes.net,https://blockdaemon-audius-content-03.bdnodes.net,https://blockdaemon-audius-content-04.bdnodes.net,https://blockdaemon-audius-content-05.bdnodes.net,https://blockdaemon-audius-content-06.bdnodes.net,https://blockdaemon-audius-content-07.bdnodes.net,https://blockdaemon-audius-content-08.bdnodes.net,https://blockdaemon-audius-content-09.bdnodes.net,https://content.grassfed.network,https://cn0.mainnet.audiusindex.org,https://cn1.mainnet.audiusindex.org,https://cn2.mainnet.audiusindex.org,https://cn3.mainnet.audiusindex.org,https://cn4.mainnet.audiusindex.org,https://audius-content-1.jollyworld.xyz,https://audius-creator-1.theblueprint.xyz,https://audius-creator-2.theblueprint.xyz,https://audius-creator-3.theblueprint.xyz,https://audius-creator-4.theblueprint.xyz,https://audius-creator-5.theblueprint.xyz,https://audius-creator-6.theblueprint.xyz".split(
 ","
 )
 test_cid = "baeaaaiqsedziwknj44jsl5fak6vcbszzjlnl7pqtw2ipnyg7rsh5a2xnql2p2"
 hasher = RendezvousHash(*node_list)

 # sha256
 got = hasher.rank_sha256(test_cid)[:6]
 expected = [
 "https://blockdaemon-audius-content-09.bdnodes.net",
 "https://cn4.mainnet.audiusindex.org",
 "https://audius-content-4.figment.io",
 "https://cn0.mainnet.audiusindex.org",
 "https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud",
 "https://blockdaemon-audius-content-07.bdnodes.net",
 ]
 assert got == expected

 # crc32 top 2
 got = hasher.rank_crc32(2, test_cid)
 expected = [
 "https://audius-content-15.cultur3stake.com",
 "https://audius-content-4.figment.io",
 ]
 assert got == expected

 # hybrid
 got = hasher.get_n(6, test_cid)
 expected = [
 # crc32 (top2)
 "https://audius-content-15.cultur3stake.com",
 "https://audius-content-4.figment.io",
 # sha256
 "https://blockdaemon-audius-content-09.bdnodes.net",
 "https://cn4.mainnet.audiusindex.org",
 "https://cn0.mainnet.audiusindex.org",
 "https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud",
 ]
 assert got == expected

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Python impl of sha256 + hybrid rendezvous ordering by stereosteve · Pull Request #8866 · AudiusProject/apps · GitHub
Skip to content
Python impl of sha256 + hybrid rendezvous ordering#8866

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

stereosteve
merged 1 commit into

from

Jul 15, 2024
 Merged


Python impl of sha256 + hybrid rendezvous ordering
#8866
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


47 changes: 33 additions & 14 deletions
packages/discovery-provider/src/utils/rendezvous.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,35 +1,54 @@
from hashlib import sha256
from typing import List

import crc32c

dead_nodes = ["https://content.grassfed.network/"]


# Python equivalent of https://github.com/tysonmote/rendezvous/blob/be0258dbbd3d/rendezvous.go
class RendezvousHash:
 def __init__(self, *nodes: str):
 self.nodes: List[bytes] = [bytes(node, "utf-8") for node in nodes]
 self.nodes: List[str] = [n for n in nodes if n not in dead_nodes]

 def add(self, *nodes: str) -> None:
 for node in nodes:
 self.nodes.append(bytes(node, "utf-8"))
 if node not in dead_nodes:
 self.nodes.append(node)

 def get_nodes(self) -> List[str]:
 return self.nodes

 def get(self, key: str) -> str:
 max_node = max(
 (node for node in self.nodes),
 default=None,
 key=lambda node: self.hash(node, bytes(key, "utf-8")),
 )
 return max_node.decode("utf-8") if max_node is not None else ""
 ranked = self.rank_hybrid(key)
 if ranked:
 return ranked[0]
 return ""

 # HashMigration: use rank_sha256 after migration done
 def get_n(self, n: int, key: str) -> List[str]:
 scores = [(self.hash(node, bytes(key, "utf-8")), node) for node in self.nodes]
 return self.rank_hybrid(key)[:n]

 def rank_hybrid(self, key: str) -> List[str]:
 legacy = self.rank_crc32(2, key)
 modern = [h for h in self.rank_sha256(key) if h not in legacy]
 hybrid = legacy + modern
 return hybrid

 def rank_crc32(self, n: int, key: str) -> List[str]:
 scores = [(self.hash(node, key), node) for node in self.nodes]
 scores.sort(key=lambda x: (-x[0], x[1]))
 return [node.decode("utf-8") for _, node in scores[:n]]
 return [t[1] for t in scores[:n]]

 def get_nodes(self) -> List[str]:
 return [node.decode("utf-8") for node in self.nodes]
 def rank_sha256(self, key: str) -> List[str]:
 tuples = [
 (h, sha256((h + key).encode("utf-8")).hexdigest()) for h in self.nodes
 ]
 tuples.sort(key=lambda t: (t[1], t[0]))
 return [t[0] for t in tuples]

 @staticmethod
 def hash(node: bytes, key: bytes) -> int:
 combined = key + node
 def hash(node: str, key: str) -> int:
 combined = (key + node).encode("utf-8")
 # Convert to unsigned 32-bit integer to match golang uint32 here: https://github.com/tysonmote/rendezvous/blob/be0258dbbd3d/rendezvous.go#L92
 return crc32c.crc32c(combined) & 0xFFFFFFFF

46 changes: 44 additions & 2 deletions
packages/discovery-provider/src/utils/rendezvous_unit_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ def test_return_top_n_nodes():
 nodes = ["node1", "node2", "node3"]
 hash_obj = RendezvousHash(*nodes)
 key = "test-key"
 top2_nodes = hash_obj.get_n(2, key)
 top2_nodes = hash_obj.rank_crc32(2, key)
 assert len(top2_nodes) == 2
 assert all(node in nodes for node in top2_nodes)

Expand DownExpand Up@@ -65,5 +65,47 @@ def test_hash_get(key, expected):
def test_hash_get_n(n, key, expected):
 hash_obj = RendezvousHash()
 hash_obj.add("a", "b", "c", "d", "e")
 got_nodes = hash_obj.get_n(n, key)
 got_nodes = hash_obj.rank_crc32(n, key)
 assert got_nodes == expected


def test_hybrid():
 node_list = "https://creatornode.audius.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius1.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius2.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius8.prod-eks-ap-northeast-1.staked.cloud,https://creatornode.audius.co,https://creatornode2.audius.co,https://creatornode3.audius.co,https://usermetadata.audius.co,https://audius-content-1.cultur3stake.com,https://audius-content-10.cultur3stake.com,https://audius-content-11.cultur3stake.com,https://audius-content-12.cultur3stake.com,https://audius-content-13.cultur3stake.com,https://audius-content-14.cultur3stake.com,https://audius-content-15.cultur3stake.com,https://audius-content-16.cultur3stake.com,https://audius-content-17.cultur3stake.com,https://audius-content-18.cultur3stake.com,https://audius-content-2.cultur3stake.com,https://audius-content-3.cultur3stake.com,https://audius-content-4.cultur3stake.com,https://audius-content-5.cultur3stake.com,https://audius-content-6.cultur3stake.com,https://audius-content-7.cultur3stake.com,https://audius-content-8.cultur3stake.com,https://audius-content-9.cultur3stake.com,https://cn1.stuffisup.com,https://audius-cn1.tikilabs.com,https://audius.prod.capturealpha.io,https://audius-content-1.figment.io,https://audius-content-10.figment.io,https://audius-content-11.figment.io,https://audius-content-12.figment.io,https://audius-content-13.figment.io,https://audius-content-14.figment.io,https://audius-content-2.figment.io,https://audius-content-3.figment.io,https://audius-content-4.figment.io,https://audius-content-5.figment.io,https://audius-content-6.figment.io,https://audius-content-7.figment.io,https://audius-content-8.figment.io,https://audius-content-9.figment.io,https://blockchange-audius-content-01.bdnodes.net,https://blockchange-audius-content-02.bdnodes.net,https://blockchange-audius-content-03.bdnodes.net,https://blockdaemon-audius-content-01.bdnodes.net,https://blockdaemon-audius-content-02.bdnodes.net,https://blockdaemon-audius-content-03.bdnodes.net,https://blockdaemon-audius-content-04.bdnodes.net,https://blockdaemon-audius-content-05.bdnodes.net,https://blockdaemon-audius-content-06.bdnodes.net,https://blockdaemon-audius-content-07.bdnodes.net,https://blockdaemon-audius-content-08.bdnodes.net,https://blockdaemon-audius-content-09.bdnodes.net,https://content.grassfed.network,https://cn0.mainnet.audiusindex.org,https://cn1.mainnet.audiusindex.org,https://cn2.mainnet.audiusindex.org,https://cn3.mainnet.audiusindex.org,https://cn4.mainnet.audiusindex.org,https://audius-content-1.jollyworld.xyz,https://audius-creator-1.theblueprint.xyz,https://audius-creator-2.theblueprint.xyz,https://audius-creator-3.theblueprint.xyz,https://audius-creator-4.theblueprint.xyz,https://audius-creator-5.theblueprint.xyz,https://audius-creator-6.theblueprint.xyz".split(
 ","
 )
 test_cid = "baeaaaiqsedziwknj44jsl5fak6vcbszzjlnl7pqtw2ipnyg7rsh5a2xnql2p2"
 hasher = RendezvousHash(*node_list)

 # sha256
 got = hasher.rank_sha256(test_cid)[:6]
 expected = [
 "https://blockdaemon-audius-content-09.bdnodes.net",
 "https://cn4.mainnet.audiusindex.org",
 "https://audius-content-4.figment.io",
 "https://cn0.mainnet.audiusindex.org",
 "https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud",
 "https://blockdaemon-audius-content-07.bdnodes.net",
 ]
 assert got == expected

 # crc32 top 2
 got = hasher.rank_crc32(2, test_cid)
 expected = [
 "https://audius-content-15.cultur3stake.com",
 "https://audius-content-4.figment.io",
 ]
 assert got == expected

 # hybrid
 got = hasher.get_n(6, test_cid)
 expected = [
 # crc32 (top2)
 "https://audius-content-15.cultur3stake.com",
 "https://audius-content-4.figment.io",
 # sha256
 "https://blockdaemon-audius-content-09.bdnodes.net",
 "https://cn4.mainnet.audiusindex.org",
 "https://cn0.mainnet.audiusindex.org",
 "https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud",
 ]
 assert got == expected