sawz/last30days-skill
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "feat: make default fun level actually surface comedy (#272)" (#273)

Browse Source 
This reverts commit bad1d312ef.

Co-authored-by: Matt Van Horn <455140+mvanhorn@users.noreply.github.com>
This commit is contained in:
Matt Van Horn
2026-04-17 08:39:56 -04:00
committed by GitHub
parent bad1d312ef
commit 371f62a403
5 changed files with 36 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_render_v3.py
+4 -113
View File
@@ -387,124 +387,15 @@ class RenderBestTakesCompactTests(unittest.TestCase):
text = render.render_compact(report)
self.assertNotIn("## Best Takes", text)
def test_best_takes_with_1_high_fun_candidate(self):
"""Best Takes section appears even with only 1 candidate above threshold.
The single-gem floor means a single viral quote is enough to show the block,
which is essential for the default medium level on most research topics.
"""
def test_no_best_takes_with_1_high_fun_candidate(self):
"""No Best Takes section when only 1 candidate above threshold."""
candidates = [
self._make_candidate("c1", fun_score=80),
self._make_candidate("c2", fun_score=40),
self._make_candidate("c2", fun_score=50),
]
report = self._make_report_with_candidates(candidates)
text = render.render_compact(report)
self.assertIn("## Best Takes", text)
self.assertIn("(fun:80)", text)
def test_best_takes_renders_above_clusters(self):
"""Best Takes section appears before the Ranked Evidence Clusters header."""
candidates = [
self._make_candidate("c1", fun_score=85),
self._make_candidate("c2", fun_score=75),
]
report = self._make_report_with_candidates(candidates)
text = render.render_compact(report)
self.assertLess(text.index("## Best Takes"), text.index("## Ranked Evidence Clusters"))
def test_comment_level_gem_appears_in_best_takes(self):
"""A high-fun top_comment on a low-fun parent candidate still qualifies."""
item = schema.SourceItem(
item_id="item-c1",
source="reddit",
title="Post c1",
body="Body.",
url="https://reddit.com/r/test/comments/c1/",
container="test",
published_at="2026-03-15",
date_confidence="high",
engagement={"score": 300, "num_comments": 30},
metadata={
"top_comments": [{
"body": "WHAT?! I reached my monthly limit just reading this post",
"excerpt": "WHAT?! I reached my monthly limit just reading this post",
"score": 2304,
"fun_score": 88.0,
}],
},
)
candidate = schema.Candidate(
candidate_id="c1",
item_id="item-c1",
source="reddit",
title="Post c1",
url="https://reddit.com/r/test/comments/c1/",
snippet="",
subquery_labels=["primary"],
native_ranks={"primary:reddit": 1},
local_relevance=0.9,
freshness=90,
engagement=88,
source_quality=1.0,
rrf_score=0.02,
rerank_score=92,
final_score=90,
sources=["reddit"],
source_items=[item],
fun_score=35.0, # parent below threshold
)
report = self._make_report_with_candidates([candidate])
text = render.render_compact(report)
self.assertIn("## Best Takes", text)
self.assertIn("WHAT?! I reached my monthly limit", text)
self.assertIn("2,304", text)
self.assertIn("r/test", text)
self.assertIn('in "Post c1"', text)
def test_comment_and_candidate_gems_sorted_by_fun_score(self):
"""Higher fun score comes first, regardless of whether it's a candidate or a comment."""
item = schema.SourceItem(
item_id="item-c1",
source="reddit",
title="Post c1",
body="Body.",
url="https://reddit.com/r/test/comments/c1/",
container="test",
engagement={"score": 100},
metadata={
"top_comments": [{
"body": "higher-ranked comment",
"score": 800,
"fun_score": 90.0,
}],
},
)
comment_candidate = schema.Candidate(
candidate_id="cc",
item_id="item-c1",
source="reddit",
title="Parent thread title",
url="https://reddit.com/r/test/comments/c1/",
snippet="",
subquery_labels=["primary"],
native_ranks={"primary:reddit": 1},
local_relevance=0.9,
freshness=90,
engagement=10,
source_quality=1.0,
rrf_score=0.02,
sources=["reddit"],
source_items=[item],
fun_score=30.0,
)
lower_candidate = self._make_candidate("cl", fun_score=70)
report = self._make_report_with_candidates([comment_candidate, lower_candidate])
text = render.render_compact(report)
comment_pos = text.find("higher-ranked comment")
lower_pos = text.find("(fun:70)")
self.assertNotEqual(comment_pos, -1)
self.assertNotEqual(lower_pos, -1)
self.assertLess(comment_pos, lower_pos)
self.assertNotIn("## Best Takes", text)
if __name__ == "__main__":
tests/test_rerank_fun.py
+1 -92
View File
@@ -9,12 +9,7 @@ SCRIPTS_DIR = Path(__file__).parent.parent / "scripts"
sys.path.insert(0, str(SCRIPTS_DIR))
from lib import schema
from lib.rerank import (
_apply_fun_fallback,
_apply_single_fun_fallback,
_extract_comment_text,
_score_comments_per_candidate,
)
from lib.rerank import _apply_single_fun_fallback, _extract_comment_text
def _make_candidate(
@@ -22,12 +17,10 @@ def _make_candidate(
snippet: str = "",
engagement: float | None = 0.0,
top_comments: list[dict] | None = None,
parent_raw_engagement: int | None = None,
) -> schema.Candidate:
"""Build a minimal Candidate with optional source_items carrying top_comments."""
source_items = []
if top_comments is not None:
item_engagement = {"score": parent_raw_engagement} if parent_raw_engagement is not None else {}
source_items.append(
schema.SourceItem(
item_id="si-1",
@@ -35,7 +28,6 @@ def _make_candidate(
title=title,
body="",
url="https://reddit.com/r/test/1",
engagement=item_engagement,
metadata={"top_comments": top_comments},
)
)
@@ -120,89 +112,6 @@ class TestFunFallbackCommentText:
assert candidate.fun_explanation == "heuristic-fallback"
class TestScoreCommentsPerCandidate:
"""Per-comment fun scoring: high-ratio viral comments outrank absolute-high comments on dominant threads."""
def test_high_ratio_comment_outranks_low_ratio(self):
"""A 2304-upvote comment on a 300-upvote parent should score higher than
a 400-upvote comment on a 3400-upvote parent (high ratio = viral wit)."""
viral = _make_candidate(
parent_raw_engagement=300,
top_comments=[{"body": "WHAT?! I reached my monthly limit just reading this post", "score": 2304}],
)
average = _make_candidate(
parent_raw_engagement=3400,
top_comments=[{"body": "we can't trust benchmarks anymore and need to re-run them", "score": 400}],
)
_score_comments_per_candidate(viral)
_score_comments_per_candidate(average)
viral_score = viral.source_items[0].metadata["top_comments"][0]["fun_score"]
average_score = average.source_items[0].metadata["top_comments"][0]["fun_score"]
assert viral_score > average_score
def test_2304_upvote_comment_on_small_parent_crosses_medium_threshold(self):
"""The exact Opus 4.7 case: the comment should score >= 55 (medium threshold)."""
candidate = _make_candidate(
parent_raw_engagement=300,
top_comments=[{
"body": "WHAT?! I reached my monthly limit just reading this post",
"score": 2304,
}],
)
_score_comments_per_candidate(candidate)
comment = candidate.source_items[0].metadata["top_comments"][0]
assert comment["fun_score"] >= 55.0
def test_reddit_excerpt_field_also_works(self):
"""Reddit uses 'excerpt' not 'body'. The scorer must handle that."""
candidate = _make_candidate(
parent_raw_engagement=100,
top_comments=[{"excerpt": "bruh this is gold", "score": 500}],
)
_score_comments_per_candidate(candidate)
comment = candidate.source_items[0].metadata["top_comments"][0]
assert "fun_score" in comment
assert comment["fun_score"] > 0
def test_no_parent_upvotes_does_not_crash(self):
"""A candidate without parent engagement still scores comments via the absolute-upvote fallback."""
candidate = _make_candidate(
parent_raw_engagement=None,
top_comments=[{"body": "lmao", "score": 200}],
)
_score_comments_per_candidate(candidate)
comment = candidate.source_items[0].metadata["top_comments"][0]
assert "fun_score" in comment
def test_malformed_comments_skipped(self):
"""Non-dict entries and missing-body entries are skipped without raising."""
candidate = _make_candidate(
parent_raw_engagement=500,
top_comments=[
"not a dict", # malformed, still counts toward the top-3 window
{"body": "", "score": 10}, # empty body within window
{"body": "valid", "score": 50}, # valid within window
],
)
_score_comments_per_candidate(candidate)
comments = candidate.source_items[0].metadata["top_comments"]
# Only the valid one gets a fun_score
valid = [c for c in comments if isinstance(c, dict) and c.get("fun_score") is not None]
assert len(valid) == 1
assert valid[0]["body"] == "valid"
def test_score_comments_runs_after_fallback(self):
"""_apply_fun_fallback wires in comment scoring automatically."""
candidate = _make_candidate(
parent_raw_engagement=300,
top_comments=[{"body": "bro what 😭", "score": 1500}],
)
_apply_fun_fallback([candidate])
comment = candidate.source_items[0].metadata["top_comments"][0]
assert "fun_score" in comment
assert candidate.fun_score is not None
class TestExtractCommentText:
"""Verify _extract_comment_text handles edge cases."""