Skip to content

Update audio match logic#11452

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
faridsalau merged 5 commits into from
Feb 24, 2025
Merged

Update audio match logic #11452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
945cb92
Update audio match logic
faridsalau Feb 24, 2025
434959f
Add for seller
faridsalau Feb 24, 2025
1f9a324
Remove code
faridsalau Feb 24, 2025
85d064e
Fix typecheck
faridsalau Feb 24, 2025
801024f
Make shared function
faridsalau Feb 24, 2025
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
5 changes: 2 additions & 3 deletions packages/discovery-provider/integration_tests/challenges/test_audio_matching_challenges.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
from sqlalchemy.sql.expression import or_

from src.challenges.audio_matching_challenge import (
AUDIO_MATCHING_MULTIPLIER,
audio_matching_buyer_challenge_manager,
audio_matching_seller_challenge_manager,
)
Expand DownExpand Up@@ -124,14 +123,14 @@ def test_audio_matching_challenge(app):
.all()
)
assert len(buyer_challenges) == 1
assert buyer_challenges[0][0] == AMOUNT_FIVE * AUDIO_MATCHING_MULTIPLIER
assert buyer_challenges[0][0] == AMOUNT_FIVE * 5
seller_challenges = (
session.query(UserChallenge.amount)
.filter(UserChallenge.user_id == seller_verified.user_id)
.all()
)
assert len(seller_challenges) == 1
assert seller_challenges[0][0] == AMOUNT_FIVE * AUDIO_MATCHING_MULTIPLIER
assert seller_challenges[0][0] == AMOUNT_FIVE * 5

# Test: unverified sellers don't get challenges
bus.dispatch(
Expand Down
84 changes: 69 additions & 15 deletions packages/discovery-provider/src/challenges/audio_matching_challenge.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
from typing import Dict, Optional, Tuple
import logging
from typing import Dict, List, Optional, Tuple

from sqlalchemy.orm.session import Session

from src.challenges.challenge import ChallengeManager, ChallengeUpdater
from src.challenges.challenge import (
ChallengeManager,
ChallengeUpdater,
FullEventMetadata,
)
from src.models.rewards.challenge import Challenge
from src.models.rewards.user_challenge import UserChallenge
from src.models.users.user import User
from src.utils.config import shared_config

env = shared_config["discprov"]["env"]

AUDIO_MATCHING_MULTIPLIER = 1

if env == "stage" or env == "dev":
AUDIO_MATCHING_MULTIPLIER = 5
logger = logging.getLogger(__name__)


def generate_audio_matching_specifier(user_id: int, extra: Dict) -> str:
Expand All@@ -33,21 +34,64 @@ def does_user_exist_with_verification_status(
return bool(user)


def get_challenge_amount(session: Session, challenge_id: str) -> Optional[int]:
"""Get the amount from the Challenge model for a given challenge_id"""
challenge = session.query(Challenge).filter(Challenge.id == challenge_id).first()
if not challenge:
return None
return int(challenge.amount)


def update_audio_matching_user_challenges(
session: Session,
event: str,
user_challenges: List[UserChallenge],
step_count: Optional[int],
event_metadatas: List[FullEventMetadata],
starting_block: Optional[int],
):
"""
Shared implementation for updating audio matching user challenges.
Updates the challenge amount based on metadata and marks challenges as complete.
"""
challenge_id = user_challenges[0].challenge_id
challenge_amount = get_challenge_amount(session, challenge_id)

if not challenge_amount:
return

for idx, user_challenge in enumerate(user_challenges):
metadata = event_metadatas[idx]
if metadata and "amount" in metadata["extra"]:
user_challenge.amount = challenge_amount * metadata["extra"]["amount"]
user_challenge.is_complete = True


class AudioMatchingBuyerChallengeUpdater(ChallengeUpdater):
def generate_specifier(self, session: Session, user_id: int, extra: Dict) -> str:
return generate_audio_matching_specifier(user_id, extra)

def should_create_new_challenge(
self, session, event: str, user_id: int, extra: Dict
) -> bool:
# Apply 5x multiplier to the amount before creating the challenge
if "amount" in extra:
extra["amount"] = extra["amount"] * AUDIO_MATCHING_MULTIPLIER
return True

def should_show_challenge_for_user(self, session: Session, user_id: int) -> bool:
return True

def update_user_challenges(
self,
session: Session,
event: str,
user_challenges: List[UserChallenge],
step_count: Optional[int],
event_metadatas: List[FullEventMetadata],
starting_block: Optional[int],
):
update_audio_matching_user_challenges(
session, event, user_challenges, step_count, event_metadatas, starting_block
)


class AudioMatchingSellerChallengeUpdater(ChallengeUpdater):
def generate_specifier(self, session: Session, user_id: int, extra: Dict) -> str:
Expand All@@ -56,14 +100,24 @@ def generate_specifier(self, session: Session, user_id: int, extra: Dict) -> str
def should_create_new_challenge(
self, session, event: str, user_id: int, extra: Dict
) -> bool:
# Apply 5x multiplier to the amount before creating the challenge
if "amount" in extra:
extra["amount"] = extra["amount"] * AUDIO_MATCHING_MULTIPLIER
return does_user_exist_with_verification_status(session, user_id, True)

def should_show_challenge_for_user(self, session: Session, user_id: int) -> bool:
return does_user_exist_with_verification_status(session, user_id, True)

def update_user_challenges(
self,
session: Session,
event: str,
user_challenges: List[UserChallenge],
step_count: Optional[int],
event_metadatas: List[FullEventMetadata],
starting_block: Optional[int],
):
update_audio_matching_user_challenges(
session, event, user_challenges, step_count, event_metadatas, starting_block
)


audio_matching_buyer_challenge_manager = ChallengeManager(
"b", AudioMatchingBuyerChallengeUpdater()
Expand Down
, '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" + '
Update audio match logic by faridsalau · Pull Request #11452 · AudiusProject/apps · GitHub
Skip to content
Update audio match logic#11452

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

faridsalau
merged 5 commits into

from

Feb 24, 2025
 Merged


Update audio match logic
#11452
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
945cb92

Update audio match logic


faridsalau Feb 24, 2025
434959f

Add for seller


faridsalau Feb 24, 2025
1f9a324

Remove code


faridsalau Feb 24, 2025
85d064e

Fix typecheck


faridsalau Feb 24, 2025
801024f

Make shared function


faridsalau Feb 24, 2025

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


5 changes: 2 additions & 3 deletions
packages/discovery-provider/integration_tests/challenges/test_audio_matching_challenges.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
from sqlalchemy.sql.expression import or_

from src.challenges.audio_matching_challenge import (
 AUDIO_MATCHING_MULTIPLIER,
 audio_matching_buyer_challenge_manager,
 audio_matching_seller_challenge_manager,
)
Expand DownExpand Up@@ -124,14 +123,14 @@ def test_audio_matching_challenge(app):
 .all()
 )
 assert len(buyer_challenges) == 1
 assert buyer_challenges[0][0] == AMOUNT_FIVE * AUDIO_MATCHING_MULTIPLIER
 assert buyer_challenges[0][0] == AMOUNT_FIVE * 5
 seller_challenges = (
 session.query(UserChallenge.amount)
 .filter(UserChallenge.user_id == seller_verified.user_id)
 .all()
 )
 assert len(seller_challenges) == 1
 assert seller_challenges[0][0] == AMOUNT_FIVE * AUDIO_MATCHING_MULTIPLIER
 assert seller_challenges[0][0] == AMOUNT_FIVE * 5

 # Test: unverified sellers don't get challenges
 bus.dispatch(
Expand Down

84 changes: 69 additions & 15 deletions
packages/discovery-provider/src/challenges/audio_matching_challenge.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
from typing import Dict, Optional, Tuple
import logging
from typing import Dict, List, Optional, Tuple

from sqlalchemy.orm.session import Session

from src.challenges.challenge import ChallengeManager, ChallengeUpdater
from src.challenges.challenge import (
 ChallengeManager,
 ChallengeUpdater,
 FullEventMetadata,
)
from src.models.rewards.challenge import Challenge
from src.models.rewards.user_challenge import UserChallenge
from src.models.users.user import User
from src.utils.config import shared_config

env = shared_config["discprov"]["env"]

AUDIO_MATCHING_MULTIPLIER = 1

if env == "stage" or env == "dev":
 AUDIO_MATCHING_MULTIPLIER = 5
logger = logging.getLogger(__name__)


def generate_audio_matching_specifier(user_id: int, extra: Dict) -> str:
Expand All@@ -33,21 +34,64 @@ def does_user_exist_with_verification_status(
 return bool(user)


def get_challenge_amount(session: Session, challenge_id: str) -> Optional[int]:
 """Get the amount from the Challenge model for a given challenge_id"""
 challenge = session.query(Challenge).filter(Challenge.id == challenge_id).first()
 if not challenge:
 return None
 return int(challenge.amount)


def update_audio_matching_user_challenges(
 session: Session,
 event: str,
 user_challenges: List[UserChallenge],
 step_count: Optional[int],
 event_metadatas: List[FullEventMetadata],
 starting_block: Optional[int],
):
 """
 Shared implementation for updating audio matching user challenges.
 Updates the challenge amount based on metadata and marks challenges as complete.
 """
 challenge_id = user_challenges[0].challenge_id
 challenge_amount = get_challenge_amount(session, challenge_id)

 if not challenge_amount:
 return

 for idx, user_challenge in enumerate(user_challenges):
 metadata = event_metadatas[idx]
 if metadata and "amount" in metadata["extra"]:
 user_challenge.amount = challenge_amount * metadata["extra"]["amount"]
 user_challenge.is_complete = True


class AudioMatchingBuyerChallengeUpdater(ChallengeUpdater):
 def generate_specifier(self, session: Session, user_id: int, extra: Dict) -> str:
 return generate_audio_matching_specifier(user_id, extra)

 def should_create_new_challenge(
 self, session, event: str, user_id: int, extra: Dict
 ) -> bool:
 # Apply 5x multiplier to the amount before creating the challenge
 if "amount" in extra:
 extra["amount"] = extra["amount"] * AUDIO_MATCHING_MULTIPLIER
 return True

 def should_show_challenge_for_user(self, session: Session, user_id: int) -> bool:
 return True

 def update_user_challenges(
 self,
 session: Session,
 event: str,
 user_challenges: List[UserChallenge],
 step_count: Optional[int],
 event_metadatas: List[FullEventMetadata],
 starting_block: Optional[int],
 ):
 update_audio_matching_user_challenges(
 session, event, user_challenges, step_count, event_metadatas, starting_block
 )


class AudioMatchingSellerChallengeUpdater(ChallengeUpdater):
 def generate_specifier(self, session: Session, user_id: int, extra: Dict) -> str:
Expand All@@ -56,14 +100,24 @@ def generate_specifier(self, session: Session, user_id: int, extra: Dict) -> str
 def should_create_new_challenge(
 self, session, event: str, user_id: int, extra: Dict
 ) -> bool:
 # Apply 5x multiplier to the amount before creating the challenge
 if "amount" in extra:
 extra["amount"] = extra["amount"] * AUDIO_MATCHING_MULTIPLIER
 return does_user_exist_with_verification_status(session, user_id, True)

 def should_show_challenge_for_user(self, session: Session, user_id: int) -> bool:
 return does_user_exist_with_verification_status(session, user_id, True)

 def update_user_challenges(
 self,
 session: Session,
 event: str,
 user_challenges: List[UserChallenge],
 step_count: Optional[int],
 event_metadatas: List[FullEventMetadata],
 starting_block: Optional[int],
 ):
 update_audio_matching_user_challenges(
 session, event, user_challenges, step_count, event_metadatas, starting_block
 )


audio_matching_buyer_challenge_manager = ChallengeManager(
 "b", AudioMatchingBuyerChallengeUpdater()
Expand Down

, '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('^' + ".*" + '
Update audio match logic by faridsalau · Pull Request #11452 · AudiusProject/apps · GitHub
Skip to content
Update audio match logic#11452

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

faridsalau
merged 5 commits into

from

Feb 24, 2025
 Merged


Update audio match logic
#11452
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
945cb92

Update audio match logic


faridsalau Feb 24, 2025
434959f

Add for seller


faridsalau Feb 24, 2025
1f9a324

Remove code


faridsalau Feb 24, 2025
85d064e

Fix typecheck


faridsalau Feb 24, 2025
801024f

Make shared function


faridsalau Feb 24, 2025

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


5 changes: 2 additions & 3 deletions
packages/discovery-provider/integration_tests/challenges/test_audio_matching_challenges.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
from sqlalchemy.sql.expression import or_

from src.challenges.audio_matching_challenge import (
 AUDIO_MATCHING_MULTIPLIER,
 audio_matching_buyer_challenge_manager,
 audio_matching_seller_challenge_manager,
)
Expand DownExpand Up@@ -124,14 +123,14 @@ def test_audio_matching_challenge(app):
 .all()
 )
 assert len(buyer_challenges) == 1
 assert buyer_challenges[0][0] == AMOUNT_FIVE * AUDIO_MATCHING_MULTIPLIER
 assert buyer_challenges[0][0] == AMOUNT_FIVE * 5
 seller_challenges = (
 session.query(UserChallenge.amount)
 .filter(UserChallenge.user_id == seller_verified.user_id)
 .all()
 )
 assert len(seller_challenges) == 1
 assert seller_challenges[0][0] == AMOUNT_FIVE * AUDIO_MATCHING_MULTIPLIER
 assert seller_challenges[0][0] == AMOUNT_FIVE * 5

 # Test: unverified sellers don't get challenges
 bus.dispatch(
Expand Down

84 changes: 69 additions & 15 deletions
packages/discovery-provider/src/challenges/audio_matching_challenge.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
from typing import Dict, Optional, Tuple
import logging
from typing import Dict, List, Optional, Tuple

from sqlalchemy.orm.session import Session

from src.challenges.challenge import ChallengeManager, ChallengeUpdater
from src.challenges.challenge import (
 ChallengeManager,
 ChallengeUpdater,
 FullEventMetadata,
)
from src.models.rewards.challenge import Challenge
from src.models.rewards.user_challenge import UserChallenge
from src.models.users.user import User
from src.utils.config import shared_config

env = shared_config["discprov"]["env"]

AUDIO_MATCHING_MULTIPLIER = 1

if env == "stage" or env == "dev":
 AUDIO_MATCHING_MULTIPLIER = 5
logger = logging.getLogger(__name__)


def generate_audio_matching_specifier(user_id: int, extra: Dict) -> str:
Expand All@@ -33,21 +34,64 @@ def does_user_exist_with_verification_status(
 return bool(user)


def get_challenge_amount(session: Session, challenge_id: str) -> Optional[int]:
 """Get the amount from the Challenge model for a given challenge_id"""
 challenge = session.query(Challenge).filter(Challenge.id == challenge_id).first()
 if not challenge:
 return None
 return int(challenge.amount)


def update_audio_matching_user_challenges(
 session: Session,
 event: str,
 user_challenges: List[UserChallenge],
 step_count: Optional[int],
 event_metadatas: List[FullEventMetadata],
 starting_block: Optional[int],
):
 """
 Shared implementation for updating audio matching user challenges.
 Updates the challenge amount based on metadata and marks challenges as complete.
 """
 challenge_id = user_challenges[0].challenge_id
 challenge_amount = get_challenge_amount(session, challenge_id)

 if not challenge_amount:
 return

 for idx, user_challenge in enumerate(user_challenges):
 metadata = event_metadatas[idx]
 if metadata and "amount" in metadata["extra"]:
 user_challenge.amount = challenge_amount * metadata["extra"]["amount"]
 user_challenge.is_complete = True


class AudioMatchingBuyerChallengeUpdater(ChallengeUpdater):
 def generate_specifier(self, session: Session, user_id: int, extra: Dict) -> str:
 return generate_audio_matching_specifier(user_id, extra)

 def should_create_new_challenge(
 self, session, event: str, user_id: int, extra: Dict
 ) -> bool:
 # Apply 5x multiplier to the amount before creating the challenge
 if "amount" in extra:
 extra["amount"] = extra["amount"] * AUDIO_MATCHING_MULTIPLIER
 return True

 def should_show_challenge_for_user(self, session: Session, user_id: int) -> bool:
 return True

 def update_user_challenges(
 self,
 session: Session,
 event: str,
 user_challenges: List[UserChallenge],
 step_count: Optional[int],
 event_metadatas: List[FullEventMetadata],
 starting_block: Optional[int],
 ):
 update_audio_matching_user_challenges(
 session, event, user_challenges, step_count, event_metadatas, starting_block
 )


class AudioMatchingSellerChallengeUpdater(ChallengeUpdater):
 def generate_specifier(self, session: Session, user_id: int, extra: Dict) -> str:
Expand All@@ -56,14 +100,24 @@ def generate_specifier(self, session: Session, user_id: int, extra: Dict) -> str
 def should_create_new_challenge(
 self, session, event: str, user_id: int, extra: Dict
 ) -> bool:
 # Apply 5x multiplier to the amount before creating the challenge
 if "amount" in extra:
 extra["amount"] = extra["amount"] * AUDIO_MATCHING_MULTIPLIER
 return does_user_exist_with_verification_status(session, user_id, True)

 def should_show_challenge_for_user(self, session: Session, user_id: int) -> bool:
 return does_user_exist_with_verification_status(session, user_id, True)

 def update_user_challenges(
 self,
 session: Session,
 event: str,
 user_challenges: List[UserChallenge],
 step_count: Optional[int],
 event_metadatas: List[FullEventMetadata],
 starting_block: Optional[int],
 ):
 update_audio_matching_user_challenges(
 session, event, user_challenges, step_count, event_metadatas, starting_block
 )


audio_matching_buyer_challenge_manager = ChallengeManager(
 "b", AudioMatchingBuyerChallengeUpdater()
Expand Down

, '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('^' + ".*" + '
Update audio match logic by faridsalau · Pull Request #11452 · AudiusProject/apps · GitHub
Skip to content
Update audio match logic#11452

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

faridsalau
merged 5 commits into

from

Feb 24, 2025
 Merged


Update audio match logic
#11452
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
945cb92

Update audio match logic


faridsalau Feb 24, 2025
434959f

Add for seller


faridsalau Feb 24, 2025
1f9a324

Remove code


faridsalau Feb 24, 2025
85d064e

Fix typecheck


faridsalau Feb 24, 2025
801024f

Make shared function


faridsalau Feb 24, 2025

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


5 changes: 2 additions & 3 deletions
packages/discovery-provider/integration_tests/challenges/test_audio_matching_challenges.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
from sqlalchemy.sql.expression import or_

from src.challenges.audio_matching_challenge import (
 AUDIO_MATCHING_MULTIPLIER,
 audio_matching_buyer_challenge_manager,
 audio_matching_seller_challenge_manager,
)
Expand DownExpand Up@@ -124,14 +123,14 @@ def test_audio_matching_challenge(app):
 .all()
 )
 assert len(buyer_challenges) == 1
 assert buyer_challenges[0][0] == AMOUNT_FIVE * AUDIO_MATCHING_MULTIPLIER
 assert buyer_challenges[0][0] == AMOUNT_FIVE * 5
 seller_challenges = (
 session.query(UserChallenge.amount)
 .filter(UserChallenge.user_id == seller_verified.user_id)
 .all()
 )
 assert len(seller_challenges) == 1
 assert seller_challenges[0][0] == AMOUNT_FIVE * AUDIO_MATCHING_MULTIPLIER
 assert seller_challenges[0][0] == AMOUNT_FIVE * 5

 # Test: unverified sellers don't get challenges
 bus.dispatch(
Expand Down

84 changes: 69 additions & 15 deletions
packages/discovery-provider/src/challenges/audio_matching_challenge.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
from typing import Dict, Optional, Tuple
import logging
from typing import Dict, List, Optional, Tuple

from sqlalchemy.orm.session import Session

from src.challenges.challenge import ChallengeManager, ChallengeUpdater
from src.challenges.challenge import (
 ChallengeManager,
 ChallengeUpdater,
 FullEventMetadata,
)
from src.models.rewards.challenge import Challenge
from src.models.rewards.user_challenge import UserChallenge
from src.models.users.user import User
from src.utils.config import shared_config

env = shared_config["discprov"]["env"]

AUDIO_MATCHING_MULTIPLIER = 1

if env == "stage" or env == "dev":
 AUDIO_MATCHING_MULTIPLIER = 5
logger = logging.getLogger(__name__)


def generate_audio_matching_specifier(user_id: int, extra: Dict) -> str:
Expand All@@ -33,21 +34,64 @@ def does_user_exist_with_verification_status(
 return bool(user)


def get_challenge_amount(session: Session, challenge_id: str) -> Optional[int]:
 """Get the amount from the Challenge model for a given challenge_id"""
 challenge = session.query(Challenge).filter(Challenge.id == challenge_id).first()
 if not challenge:
 return None
 return int(challenge.amount)


def update_audio_matching_user_challenges(
 session: Session,
 event: str,
 user_challenges: List[UserChallenge],
 step_count: Optional[int],
 event_metadatas: List[FullEventMetadata],
 starting_block: Optional[int],
):
 """
 Shared implementation for updating audio matching user challenges.
 Updates the challenge amount based on metadata and marks challenges as complete.
 """
 challenge_id = user_challenges[0].challenge_id
 challenge_amount = get_challenge_amount(session, challenge_id)

 if not challenge_amount:
 return

 for idx, user_challenge in enumerate(user_challenges):
 metadata = event_metadatas[idx]
 if metadata and "amount" in metadata["extra"]:
 user_challenge.amount = challenge_amount * metadata["extra"]["amount"]
 user_challenge.is_complete = True


class AudioMatchingBuyerChallengeUpdater(ChallengeUpdater):
 def generate_specifier(self, session: Session, user_id: int, extra: Dict) -> str:
 return generate_audio_matching_specifier(user_id, extra)

 def should_create_new_challenge(
 self, session, event: str, user_id: int, extra: Dict
 ) -> bool:
 # Apply 5x multiplier to the amount before creating the challenge
 if "amount" in extra:
 extra["amount"] = extra["amount"] * AUDIO_MATCHING_MULTIPLIER
 return True

 def should_show_challenge_for_user(self, session: Session, user_id: int) -> bool:
 return True

 def update_user_challenges(
 self,
 session: Session,
 event: str,
 user_challenges: List[UserChallenge],
 step_count: Optional[int],
 event_metadatas: List[FullEventMetadata],
 starting_block: Optional[int],
 ):
 update_audio_matching_user_challenges(
 session, event, user_challenges, step_count, event_metadatas, starting_block
 )


class AudioMatchingSellerChallengeUpdater(ChallengeUpdater):
 def generate_specifier(self, session: Session, user_id: int, extra: Dict) -> str:
Expand All@@ -56,14 +100,24 @@ def generate_specifier(self, session: Session, user_id: int, extra: Dict) -> str
 def should_create_new_challenge(
 self, session, event: str, user_id: int, extra: Dict
 ) -> bool:
 # Apply 5x multiplier to the amount before creating the challenge
 if "amount" in extra:
 extra["amount"] = extra["amount"] * AUDIO_MATCHING_MULTIPLIER
 return does_user_exist_with_verification_status(session, user_id, True)

 def should_show_challenge_for_user(self, session: Session, user_id: int) -> bool:
 return does_user_exist_with_verification_status(session, user_id, True)

 def update_user_challenges(
 self,
 session: Session,
 event: str,
 user_challenges: List[UserChallenge],
 step_count: Optional[int],
 event_metadatas: List[FullEventMetadata],
 starting_block: Optional[int],
 ):
 update_audio_matching_user_challenges(
 session, event, user_challenges, step_count, event_metadatas, starting_block
 )


audio_matching_buyer_challenge_manager = ChallengeManager(
 "b", AudioMatchingBuyerChallengeUpdater()
Expand Down

, '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" + '
Update audio match logic by faridsalau · Pull Request #11452 · AudiusProject/apps · GitHub
Skip to content
Update audio match logic#11452

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

faridsalau
merged 5 commits into

from

Feb 24, 2025
 Merged


Update audio match logic
#11452
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
945cb92

Update audio match logic


faridsalau Feb 24, 2025
434959f

Add for seller


faridsalau Feb 24, 2025
1f9a324

Remove code


faridsalau Feb 24, 2025
85d064e

Fix typecheck


faridsalau Feb 24, 2025
801024f

Make shared function


faridsalau Feb 24, 2025

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


5 changes: 2 additions & 3 deletions
packages/discovery-provider/integration_tests/challenges/test_audio_matching_challenges.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
from sqlalchemy.sql.expression import or_

from src.challenges.audio_matching_challenge import (
 AUDIO_MATCHING_MULTIPLIER,
 audio_matching_buyer_challenge_manager,
 audio_matching_seller_challenge_manager,
)
Expand DownExpand Up@@ -124,14 +123,14 @@ def test_audio_matching_challenge(app):
 .all()
 )
 assert len(buyer_challenges) == 1
 assert buyer_challenges[0][0] == AMOUNT_FIVE * AUDIO_MATCHING_MULTIPLIER
 assert buyer_challenges[0][0] == AMOUNT_FIVE * 5
 seller_challenges = (
 session.query(UserChallenge.amount)
 .filter(UserChallenge.user_id == seller_verified.user_id)
 .all()
 )
 assert len(seller_challenges) == 1
 assert seller_challenges[0][0] == AMOUNT_FIVE * AUDIO_MATCHING_MULTIPLIER
 assert seller_challenges[0][0] == AMOUNT_FIVE * 5

 # Test: unverified sellers don't get challenges
 bus.dispatch(
Expand Down

84 changes: 69 additions & 15 deletions
packages/discovery-provider/src/challenges/audio_matching_challenge.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
from typing import Dict, Optional, Tuple
import logging
from typing import Dict, List, Optional, Tuple

from sqlalchemy.orm.session import Session

from src.challenges.challenge import ChallengeManager, ChallengeUpdater
from src.challenges.challenge import (
 ChallengeManager,
 ChallengeUpdater,
 FullEventMetadata,
)
from src.models.rewards.challenge import Challenge
from src.models.rewards.user_challenge import UserChallenge
from src.models.users.user import User
from src.utils.config import shared_config

env = shared_config["discprov"]["env"]

AUDIO_MATCHING_MULTIPLIER = 1

if env == "stage" or env == "dev":
 AUDIO_MATCHING_MULTIPLIER = 5
logger = logging.getLogger(__name__)


def generate_audio_matching_specifier(user_id: int, extra: Dict) -> str:
Expand All@@ -33,21 +34,64 @@ def does_user_exist_with_verification_status(
 return bool(user)


def get_challenge_amount(session: Session, challenge_id: str) -> Optional[int]:
 """Get the amount from the Challenge model for a given challenge_id"""
 challenge = session.query(Challenge).filter(Challenge.id == challenge_id).first()
 if not challenge:
 return None
 return int(challenge.amount)


def update_audio_matching_user_challenges(
 session: Session,
 event: str,
 user_challenges: List[UserChallenge],
 step_count: Optional[int],
 event_metadatas: List[FullEventMetadata],
 starting_block: Optional[int],
):
 """
 Shared implementation for updating audio matching user challenges.
 Updates the challenge amount based on metadata and marks challenges as complete.
 """
 challenge_id = user_challenges[0].challenge_id
 challenge_amount = get_challenge_amount(session, challenge_id)

 if not challenge_amount:
 return

 for idx, user_challenge in enumerate(user_challenges):
 metadata = event_metadatas[idx]
 if metadata and "amount" in metadata["extra"]:
 user_challenge.amount = challenge_amount * metadata["extra"]["amount"]
 user_challenge.is_complete = True


class AudioMatchingBuyerChallengeUpdater(ChallengeUpdater):
 def generate_specifier(self, session: Session, user_id: int, extra: Dict) -> str:
 return generate_audio_matching_specifier(user_id, extra)

 def should_create_new_challenge(
 self, session, event: str, user_id: int, extra: Dict
 ) -> bool:
 # Apply 5x multiplier to the amount before creating the challenge
 if "amount" in extra:
 extra["amount"] = extra["amount"] * AUDIO_MATCHING_MULTIPLIER
 return True

 def should_show_challenge_for_user(self, session: Session, user_id: int) -> bool:
 return True

 def update_user_challenges(
 self,
 session: Session,
 event: str,
 user_challenges: List[UserChallenge],
 step_count: Optional[int],
 event_metadatas: List[FullEventMetadata],
 starting_block: Optional[int],
 ):
 update_audio_matching_user_challenges(
 session, event, user_challenges, step_count, event_metadatas, starting_block
 )


class AudioMatchingSellerChallengeUpdater(ChallengeUpdater):
 def generate_specifier(self, session: Session, user_id: int, extra: Dict) -> str:
Expand All@@ -56,14 +100,24 @@ def generate_specifier(self, session: Session, user_id: int, extra: Dict) -> str
 def should_create_new_challenge(
 self, session, event: str, user_id: int, extra: Dict
 ) -> bool:
 # Apply 5x multiplier to the amount before creating the challenge
 if "amount" in extra:
 extra["amount"] = extra["amount"] * AUDIO_MATCHING_MULTIPLIER
 return does_user_exist_with_verification_status(session, user_id, True)

 def should_show_challenge_for_user(self, session: Session, user_id: int) -> bool:
 return does_user_exist_with_verification_status(session, user_id, True)

 def update_user_challenges(
 self,
 session: Session,
 event: str,
 user_challenges: List[UserChallenge],
 step_count: Optional[int],
 event_metadatas: List[FullEventMetadata],
 starting_block: Optional[int],
 ):
 update_audio_matching_user_challenges(
 session, event, user_challenges, step_count, event_metadatas, starting_block
 )


audio_matching_buyer_challenge_manager = ChallengeManager(
 "b", AudioMatchingBuyerChallengeUpdater()
Expand Down

, '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('^' + ".*" + '
Update audio match logic by faridsalau · Pull Request #11452 · AudiusProject/apps · GitHub
Skip to content
Update audio match logic#11452

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

faridsalau
merged 5 commits into

from

Feb 24, 2025
 Merged


Update audio match logic
#11452
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
945cb92

Update audio match logic


faridsalau Feb 24, 2025
434959f

Add for seller


faridsalau Feb 24, 2025
1f9a324

Remove code


faridsalau Feb 24, 2025
85d064e

Fix typecheck


faridsalau Feb 24, 2025
801024f

Make shared function


faridsalau Feb 24, 2025

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


5 changes: 2 additions & 3 deletions
packages/discovery-provider/integration_tests/challenges/test_audio_matching_challenges.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
from sqlalchemy.sql.expression import or_

from src.challenges.audio_matching_challenge import (
 AUDIO_MATCHING_MULTIPLIER,
 audio_matching_buyer_challenge_manager,
 audio_matching_seller_challenge_manager,
)
Expand DownExpand Up@@ -124,14 +123,14 @@ def test_audio_matching_challenge(app):
 .all()
 )
 assert len(buyer_challenges) == 1
 assert buyer_challenges[0][0] == AMOUNT_FIVE * AUDIO_MATCHING_MULTIPLIER
 assert buyer_challenges[0][0] == AMOUNT_FIVE * 5
 seller_challenges = (
 session.query(UserChallenge.amount)
 .filter(UserChallenge.user_id == seller_verified.user_id)
 .all()
 )
 assert len(seller_challenges) == 1
 assert seller_challenges[0][0] == AMOUNT_FIVE * AUDIO_MATCHING_MULTIPLIER
 assert seller_challenges[0][0] == AMOUNT_FIVE * 5

 # Test: unverified sellers don't get challenges
 bus.dispatch(
Expand Down

84 changes: 69 additions & 15 deletions
packages/discovery-provider/src/challenges/audio_matching_challenge.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
from typing import Dict, Optional, Tuple
import logging
from typing import Dict, List, Optional, Tuple

from sqlalchemy.orm.session import Session

from src.challenges.challenge import ChallengeManager, ChallengeUpdater
from src.challenges.challenge import (
 ChallengeManager,
 ChallengeUpdater,
 FullEventMetadata,
)
from src.models.rewards.challenge import Challenge
from src.models.rewards.user_challenge import UserChallenge
from src.models.users.user import User
from src.utils.config import shared_config

env = shared_config["discprov"]["env"]

AUDIO_MATCHING_MULTIPLIER = 1

if env == "stage" or env == "dev":
 AUDIO_MATCHING_MULTIPLIER = 5
logger = logging.getLogger(__name__)


def generate_audio_matching_specifier(user_id: int, extra: Dict) -> str:
Expand All@@ -33,21 +34,64 @@ def does_user_exist_with_verification_status(
 return bool(user)


def get_challenge_amount(session: Session, challenge_id: str) -> Optional[int]:
 """Get the amount from the Challenge model for a given challenge_id"""
 challenge = session.query(Challenge).filter(Challenge.id == challenge_id).first()
 if not challenge:
 return None
 return int(challenge.amount)


def update_audio_matching_user_challenges(
 session: Session,
 event: str,
 user_challenges: List[UserChallenge],
 step_count: Optional[int],
 event_metadatas: List[FullEventMetadata],
 starting_block: Optional[int],
):
 """
 Shared implementation for updating audio matching user challenges.
 Updates the challenge amount based on metadata and marks challenges as complete.
 """
 challenge_id = user_challenges[0].challenge_id
 challenge_amount = get_challenge_amount(session, challenge_id)

 if not challenge_amount:
 return

 for idx, user_challenge in enumerate(user_challenges):
 metadata = event_metadatas[idx]
 if metadata and "amount" in metadata["extra"]:
 user_challenge.amount = challenge_amount * metadata["extra"]["amount"]
 user_challenge.is_complete = True


class AudioMatchingBuyerChallengeUpdater(ChallengeUpdater):
 def generate_specifier(self, session: Session, user_id: int, extra: Dict) -> str:
 return generate_audio_matching_specifier(user_id, extra)

 def should_create_new_challenge(
 self, session, event: str, user_id: int, extra: Dict
 ) -> bool:
 # Apply 5x multiplier to the amount before creating the challenge
 if "amount" in extra:
 extra["amount"] = extra["amount"] * AUDIO_MATCHING_MULTIPLIER
 return True

 def should_show_challenge_for_user(self, session: Session, user_id: int) -> bool:
 return True

 def update_user_challenges(
 self,
 session: Session,
 event: str,
 user_challenges: List[UserChallenge],
 step_count: Optional[int],
 event_metadatas: List[FullEventMetadata],
 starting_block: Optional[int],
 ):
 update_audio_matching_user_challenges(
 session, event, user_challenges, step_count, event_metadatas, starting_block
 )


class AudioMatchingSellerChallengeUpdater(ChallengeUpdater):
 def generate_specifier(self, session: Session, user_id: int, extra: Dict) -> str:
Expand All@@ -56,14 +100,24 @@ def generate_specifier(self, session: Session, user_id: int, extra: Dict) -> str
 def should_create_new_challenge(
 self, session, event: str, user_id: int, extra: Dict
 ) -> bool:
 # Apply 5x multiplier to the amount before creating the challenge
 if "amount" in extra:
 extra["amount"] = extra["amount"] * AUDIO_MATCHING_MULTIPLIER
 return does_user_exist_with_verification_status(session, user_id, True)

 def should_show_challenge_for_user(self, session: Session, user_id: int) -> bool:
 return does_user_exist_with_verification_status(session, user_id, True)

 def update_user_challenges(
 self,
 session: Session,
 event: str,
 user_challenges: List[UserChallenge],
 step_count: Optional[int],
 event_metadatas: List[FullEventMetadata],
 starting_block: Optional[int],
 ):
 update_audio_matching_user_challenges(
 session, event, user_challenges, step_count, event_metadatas, starting_block
 )


audio_matching_buyer_challenge_manager = ChallengeManager(
 "b", AudioMatchingBuyerChallengeUpdater()
Expand Down

, '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('^' + ".*" + '
Update audio match logic by faridsalau · Pull Request #11452 · AudiusProject/apps · GitHub
Skip to content
Update audio match logic#11452

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

faridsalau
merged 5 commits into

from

Feb 24, 2025
 Merged


Update audio match logic
#11452
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
945cb92

Update audio match logic


faridsalau Feb 24, 2025
434959f

Add for seller


faridsalau Feb 24, 2025
1f9a324

Remove code


faridsalau Feb 24, 2025
85d064e

Fix typecheck


faridsalau Feb 24, 2025
801024f

Make shared function


faridsalau Feb 24, 2025

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


5 changes: 2 additions & 3 deletions
packages/discovery-provider/integration_tests/challenges/test_audio_matching_challenges.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
from sqlalchemy.sql.expression import or_

from src.challenges.audio_matching_challenge import (
 AUDIO_MATCHING_MULTIPLIER,
 audio_matching_buyer_challenge_manager,
 audio_matching_seller_challenge_manager,
)
Expand DownExpand Up@@ -124,14 +123,14 @@ def test_audio_matching_challenge(app):
 .all()
 )
 assert len(buyer_challenges) == 1
 assert buyer_challenges[0][0] == AMOUNT_FIVE * AUDIO_MATCHING_MULTIPLIER
 assert buyer_challenges[0][0] == AMOUNT_FIVE * 5
 seller_challenges = (
 session.query(UserChallenge.amount)
 .filter(UserChallenge.user_id == seller_verified.user_id)
 .all()
 )
 assert len(seller_challenges) == 1
 assert seller_challenges[0][0] == AMOUNT_FIVE * AUDIO_MATCHING_MULTIPLIER
 assert seller_challenges[0][0] == AMOUNT_FIVE * 5

 # Test: unverified sellers don't get challenges
 bus.dispatch(
Expand Down

84 changes: 69 additions & 15 deletions
packages/discovery-provider/src/challenges/audio_matching_challenge.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
from typing import Dict, Optional, Tuple
import logging
from typing import Dict, List, Optional, Tuple

from sqlalchemy.orm.session import Session

from src.challenges.challenge import ChallengeManager, ChallengeUpdater
from src.challenges.challenge import (
 ChallengeManager,
 ChallengeUpdater,
 FullEventMetadata,
)
from src.models.rewards.challenge import Challenge
from src.models.rewards.user_challenge import UserChallenge
from src.models.users.user import User
from src.utils.config import shared_config

env = shared_config["discprov"]["env"]

AUDIO_MATCHING_MULTIPLIER = 1

if env == "stage" or env == "dev":
 AUDIO_MATCHING_MULTIPLIER = 5
logger = logging.getLogger(__name__)


def generate_audio_matching_specifier(user_id: int, extra: Dict) -> str:
Expand All@@ -33,21 +34,64 @@ def does_user_exist_with_verification_status(
 return bool(user)


def get_challenge_amount(session: Session, challenge_id: str) -> Optional[int]:
 """Get the amount from the Challenge model for a given challenge_id"""
 challenge = session.query(Challenge).filter(Challenge.id == challenge_id).first()
 if not challenge:
 return None
 return int(challenge.amount)


def update_audio_matching_user_challenges(
 session: Session,
 event: str,
 user_challenges: List[UserChallenge],
 step_count: Optional[int],
 event_metadatas: List[FullEventMetadata],
 starting_block: Optional[int],
):
 """
 Shared implementation for updating audio matching user challenges.
 Updates the challenge amount based on metadata and marks challenges as complete.
 """
 challenge_id = user_challenges[0].challenge_id
 challenge_amount = get_challenge_amount(session, challenge_id)

 if not challenge_amount:
 return

 for idx, user_challenge in enumerate(user_challenges):
 metadata = event_metadatas[idx]
 if metadata and "amount" in metadata["extra"]:
 user_challenge.amount = challenge_amount * metadata["extra"]["amount"]
 user_challenge.is_complete = True


class AudioMatchingBuyerChallengeUpdater(ChallengeUpdater):
 def generate_specifier(self, session: Session, user_id: int, extra: Dict) -> str:
 return generate_audio_matching_specifier(user_id, extra)

 def should_create_new_challenge(
 self, session, event: str, user_id: int, extra: Dict
 ) -> bool:
 # Apply 5x multiplier to the amount before creating the challenge
 if "amount" in extra:
 extra["amount"] = extra["amount"] * AUDIO_MATCHING_MULTIPLIER
 return True

 def should_show_challenge_for_user(self, session: Session, user_id: int) -> bool:
 return True

 def update_user_challenges(
 self,
 session: Session,
 event: str,
 user_challenges: List[UserChallenge],
 step_count: Optional[int],
 event_metadatas: List[FullEventMetadata],
 starting_block: Optional[int],
 ):
 update_audio_matching_user_challenges(
 session, event, user_challenges, step_count, event_metadatas, starting_block
 )


class AudioMatchingSellerChallengeUpdater(ChallengeUpdater):
 def generate_specifier(self, session: Session, user_id: int, extra: Dict) -> str:
Expand All@@ -56,14 +100,24 @@ def generate_specifier(self, session: Session, user_id: int, extra: Dict) -> str
 def should_create_new_challenge(
 self, session, event: str, user_id: int, extra: Dict
 ) -> bool:
 # Apply 5x multiplier to the amount before creating the challenge
 if "amount" in extra:
 extra["amount"] = extra["amount"] * AUDIO_MATCHING_MULTIPLIER
 return does_user_exist_with_verification_status(session, user_id, True)

 def should_show_challenge_for_user(self, session: Session, user_id: int) -> bool:
 return does_user_exist_with_verification_status(session, user_id, True)

 def update_user_challenges(
 self,
 session: Session,
 event: str,
 user_challenges: List[UserChallenge],
 step_count: Optional[int],
 event_metadatas: List[FullEventMetadata],
 starting_block: Optional[int],
 ):
 update_audio_matching_user_challenges(
 session, event, user_challenges, step_count, event_metadatas, starting_block
 )


audio_matching_buyer_challenge_manager = ChallengeManager(
 "b", AudioMatchingBuyerChallengeUpdater()
Expand Down

, '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); }
})();
})();
Update audio match logic by faridsalau · Pull Request #11452 · AudiusProject/apps · GitHub
Skip to content
Update audio match logic#11452

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

faridsalau
merged 5 commits into

from

Feb 24, 2025
 Merged


Update audio match logic
#11452
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
945cb92

Update audio match logic


faridsalau Feb 24, 2025
434959f

Add for seller


faridsalau Feb 24, 2025
1f9a324

Remove code


faridsalau Feb 24, 2025
85d064e

Fix typecheck


faridsalau Feb 24, 2025
801024f

Make shared function


faridsalau Feb 24, 2025

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


5 changes: 2 additions & 3 deletions
packages/discovery-provider/integration_tests/challenges/test_audio_matching_challenges.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
from sqlalchemy.sql.expression import or_

from src.challenges.audio_matching_challenge import (
 AUDIO_MATCHING_MULTIPLIER,
 audio_matching_buyer_challenge_manager,
 audio_matching_seller_challenge_manager,
)
Expand DownExpand Up@@ -124,14 +123,14 @@ def test_audio_matching_challenge(app):
 .all()
 )
 assert len(buyer_challenges) == 1
 assert buyer_challenges[0][0] == AMOUNT_FIVE * AUDIO_MATCHING_MULTIPLIER
 assert buyer_challenges[0][0] == AMOUNT_FIVE * 5
 seller_challenges = (
 session.query(UserChallenge.amount)
 .filter(UserChallenge.user_id == seller_verified.user_id)
 .all()
 )
 assert len(seller_challenges) == 1
 assert seller_challenges[0][0] == AMOUNT_FIVE * AUDIO_MATCHING_MULTIPLIER
 assert seller_challenges[0][0] == AMOUNT_FIVE * 5

 # Test: unverified sellers don't get challenges
 bus.dispatch(
Expand Down

84 changes: 69 additions & 15 deletions
packages/discovery-provider/src/challenges/audio_matching_challenge.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
from typing import Dict, Optional, Tuple
import logging
from typing import Dict, List, Optional, Tuple

from sqlalchemy.orm.session import Session

from src.challenges.challenge import ChallengeManager, ChallengeUpdater
from src.challenges.challenge import (
 ChallengeManager,
 ChallengeUpdater,
 FullEventMetadata,
)
from src.models.rewards.challenge import Challenge
from src.models.rewards.user_challenge import UserChallenge
from src.models.users.user import User
from src.utils.config import shared_config

env = shared_config["discprov"]["env"]

AUDIO_MATCHING_MULTIPLIER = 1

if env == "stage" or env == "dev":
 AUDIO_MATCHING_MULTIPLIER = 5
logger = logging.getLogger(__name__)


def generate_audio_matching_specifier(user_id: int, extra: Dict) -> str:
Expand All@@ -33,21 +34,64 @@ def does_user_exist_with_verification_status(
 return bool(user)


def get_challenge_amount(session: Session, challenge_id: str) -> Optional[int]:
 """Get the amount from the Challenge model for a given challenge_id"""
 challenge = session.query(Challenge).filter(Challenge.id == challenge_id).first()
 if not challenge:
 return None
 return int(challenge.amount)


def update_audio_matching_user_challenges(
 session: Session,
 event: str,
 user_challenges: List[UserChallenge],
 step_count: Optional[int],
 event_metadatas: List[FullEventMetadata],
 starting_block: Optional[int],
):
 """
 Shared implementation for updating audio matching user challenges.
 Updates the challenge amount based on metadata and marks challenges as complete.
 """
 challenge_id = user_challenges[0].challenge_id
 challenge_amount = get_challenge_amount(session, challenge_id)

 if not challenge_amount:
 return

 for idx, user_challenge in enumerate(user_challenges):
 metadata = event_metadatas[idx]
 if metadata and "amount" in metadata["extra"]:
 user_challenge.amount = challenge_amount * metadata["extra"]["amount"]
 user_challenge.is_complete = True


class AudioMatchingBuyerChallengeUpdater(ChallengeUpdater):
 def generate_specifier(self, session: Session, user_id: int, extra: Dict) -> str:
 return generate_audio_matching_specifier(user_id, extra)

 def should_create_new_challenge(
 self, session, event: str, user_id: int, extra: Dict
 ) -> bool:
 # Apply 5x multiplier to the amount before creating the challenge
 if "amount" in extra:
 extra["amount"] = extra["amount"] * AUDIO_MATCHING_MULTIPLIER
 return True

 def should_show_challenge_for_user(self, session: Session, user_id: int) -> bool:
 return True

 def update_user_challenges(
 self,
 session: Session,
 event: str,
 user_challenges: List[UserChallenge],
 step_count: Optional[int],
 event_metadatas: List[FullEventMetadata],
 starting_block: Optional[int],
 ):
 update_audio_matching_user_challenges(
 session, event, user_challenges, step_count, event_metadatas, starting_block
 )


class AudioMatchingSellerChallengeUpdater(ChallengeUpdater):
 def generate_specifier(self, session: Session, user_id: int, extra: Dict) -> str:
Expand All@@ -56,14 +100,24 @@ def generate_specifier(self, session: Session, user_id: int, extra: Dict) -> str
 def should_create_new_challenge(
 self, session, event: str, user_id: int, extra: Dict
 ) -> bool:
 # Apply 5x multiplier to the amount before creating the challenge
 if "amount" in extra:
 extra["amount"] = extra["amount"] * AUDIO_MATCHING_MULTIPLIER
 return does_user_exist_with_verification_status(session, user_id, True)

 def should_show_challenge_for_user(self, session: Session, user_id: int) -> bool:
 return does_user_exist_with_verification_status(session, user_id, True)

 def update_user_challenges(
 self,
 session: Session,
 event: str,
 user_challenges: List[UserChallenge],
 step_count: Optional[int],
 event_metadatas: List[FullEventMetadata],
 starting_block: Optional[int],
 ):
 update_audio_matching_user_challenges(
 session, event, user_challenges, step_count, event_metadatas, starting_block
 )


audio_matching_buyer_challenge_manager = ChallengeManager(
 "b", AudioMatchingBuyerChallengeUpdater()
Expand Down