datamaestro-text 2026.2.2__py3-none-any.whl → 2026.2.3__py3-none-any.whl

datamaestro_text/config/gov/nist/trec/adhoc.py

@@ -4,12 +4,12 @@ See [https://trec.nist.gov/data/test_coll.html](https://trec.nist.gov/data/test_
 """
 
 from datamaestro.download import reference
-from datamaestro.download.single import filedownloader, concatdownload
+from datamaestro.download.single import FileDownloader, ConcatDownloader
 from datamaestro.download.links import links
 from datamaestro.stream import TransformList
 from datamaestro.stream.compress import Gunzip
 from datamaestro.stream.lines import Replace, Filter
-from datamaestro.definitions import dataset
+from datamaestro.definitions import Dataset, dataset
 
 from datamaestro_text.data.ir.trec import (
     TipsterCollection,
@@ -19,368 +19,508 @@ from datamaestro_text.data.ir.trec import (
 from datamaestro_text.data.ir import Adhoc
 
 from . import tipster
-from datamaestro_text.config.edu.upenn.ldc.aquaint import aquaint
+from datamaestro_text.config.edu.upenn.ldc.aquaint import Aquaint
 
 
 # --- TREC 1 (1992)
 
 
-@links(
-    "documents",
-    ap88=tipster.ap88.path,
-    ap89=tipster.ap89.path,
-    fr88=tipster.fr88.path,
-    fr89=tipster.fr89.path,
-    wsj87=tipster.wsj87.path,
-    wsj88=tipster.wsj88.path,
-    wsj89=tipster.wsj89.path,
-    wsj90=tipster.wsj90.path,
-    wsj91=tipster.wsj91.path,
-    wsj92=tipster.wsj92.path,
-    ziff1=tipster.ziff1.path,
-    ziff2=tipster.ziff2.path,
-)
-@dataset(TipsterCollection, id="1.documents")
-def trec1_documents(documents):
+@dataset(id=".1.documents")
+class Trec1Documents(Dataset):
     """TREC-1 to TREC-3 documents (TIPSTER volumes 1 and 2)"""
-    return {"path": documents}
-
 
-@filedownloader(
-    "topics.sgml",
-    "http://trec.nist.gov/data/topics_eng/topics.51-100.gz",
-    transforms=TransformList(Gunzip(), Replace(r"Number:(\s+)0", r"Number: \1")),
-)
-@dataset(TrecTopics, id="1.topics", url="")
-def trec1_topics(topics):
-    return {"path": topics, "parts": ["desc"]}
+    DOCUMENTS = links(
+        "documents",
+        ap88=tipster.Ap88,
+        ap89=tipster.Ap89,
+        fr88=tipster.Fr88,
+        fr89=tipster.Fr89,
+        wsj87=tipster.Wsj87,
+        wsj88=tipster.Wsj88,
+        wsj89=tipster.Wsj89,
+        wsj90=tipster.Wsj90,
+        wsj91=tipster.Wsj91,
+        wsj92=tipster.Wsj92,
+        ziff1=tipster.Ziff1,
+        ziff2=tipster.Ziff2,
+    )
+
+    def config(self) -> TipsterCollection:
+        return TipsterCollection.C(path=self.DOCUMENTS.path)
+
+
+@dataset(id=".1.topics", url="")
+class Trec1Topics(Dataset):
+    FILE = FileDownloader(
+        "topics.sgml",
+        "http://trec.nist.gov/data/topics_eng/topics.51-100.gz",
+        transforms=TransformList(Gunzip(), Replace(r"Number:(\s+)0", r"Number: \1")),
+    )
+
+    def config(self) -> TrecTopics:
+        return TrecTopics.C(path=self.FILE.path, parts=["desc"])
+
+
+@dataset(id=".1.assessments")
+class Trec1Assessments(Dataset):
+    FILE = ConcatDownloader(
+        "assessments.qrels",
+        "http://trec.nist.gov/data/qrels_eng/qrels.51-100.disk1.disk2.parts1-5.tar.gz",
+        transforms=TransformList(Gunzip(), Replace(r"Number:(\s+)0", r"Number: \1")),
+    )
+
+    def config(self) -> TrecAdhocAssessments:
+        return TrecAdhocAssessments.C(path=self.FILE.path)
+
+
+@dataset(id=".1")
+class Trec1(Dataset):
+    "Ad-hoc task of TREC 1 (1992)"
 
+    DOCUMENTS = reference(varname="documents", reference=Trec1Documents)
+    TOPICS = reference(varname="topics", reference=Trec1Topics)
+    ASSESSMENTS = reference(varname="assessments", reference=Trec1Assessments)
 
-@concatdownload(
-    "assessments.qrels",
-    "http://trec.nist.gov/data/qrels_eng/qrels.51-100.disk1.disk2.parts1-5.tar.gz",
-    transforms=TransformList(Gunzip(), Replace(r"Number:(\s+)0", r"Number: \1")),
-)
-@dataset(TrecAdhocAssessments, id="1.assessments")
-def trec1_assessments(assessments):
-    return {"path": assessments}
+    def config(self) -> Adhoc:
+        return Adhoc.C(
+            documents=self.DOCUMENTS.prepare(),
+            topics=self.TOPICS.prepare(),
+            assessments=self.ASSESSMENTS.prepare(),
+        )
 
 
-@reference("documents", trec1_documents)
-@reference("topics", trec1_topics)
-@reference("assessments", trec1_assessments)
-@dataset(Adhoc, id="1")
-def trec1(documents, topics, assessments):
-    "Ad-hoc task of TREC 1 (1992)"
-    return {"documents": documents, "topics": topics, "assessments": assessments}
+# --- TREC 2 (1993)
 
 
-# --- TREC 2 (1993)
+@dataset(id=".2.topics")
+class Trec2Topics(Dataset):
+    FILE = FileDownloader(
+        "topics.sgml",
+        "http://trec.nist.gov/data/topics_eng/topics.101-150.gz",
+        transforms=TransformList(Gunzip(), Replace(r"Number:(\s+)0", r"Number: \1")),
+    )
 
+    def config(self) -> TrecTopics:
+        return TrecTopics.C(path=self.FILE.path, parts=["title", "desc"])
 
-@filedownloader(
-    "topics.sgml",
-    "http://trec.nist.gov/data/topics_eng/topics.101-150.gz",
-    transforms=TransformList(Gunzip(), Replace(r"Number:(\s+)0", r"Number: \1")),
-)
-@dataset(TrecTopics, id="2.topics")
-def trec2_topics(topics):
-    return {"path": topics, "parts": ["title", "desc"]}
 
+@dataset(id=".2.assessments")
+class Trec2Assessments(Dataset):
+    FILE = ConcatDownloader(
+        "assessments.qrels",
+        "http://trec.nist.gov/data/qrels_eng/qrels.101-150.disk1.disk2.parts1-5.tar.gz",
+        transforms=TransformList(Gunzip(), Replace(r"Number:(\s+)0", r"Number: \1")),
+    )
 
-@concatdownload(
-    "assessments.qrels",
-    "http://trec.nist.gov/data/qrels_eng/qrels.101-150.disk1.disk2.parts1-5.tar.gz",
-    transforms=TransformList(Gunzip(), Replace(r"Number:(\s+)0", r"Number: \1")),
-)
-@dataset(TrecAdhocAssessments, id="2.assessments")
-def trec2_assessments(assessments):
-    return {"path": assessments}
+    def config(self) -> TrecAdhocAssessments:
+        return TrecAdhocAssessments.C(path=self.FILE.path)
 
 
-@reference("documents", trec1_documents)
-@reference("topics", trec2_topics)
-@reference("assessments", trec2_assessments)
-@dataset(Adhoc, id="2")
-def trec2(documents, topics, assessments):
+@dataset(id=".2")
+class Trec2(Dataset):
     "Ad-hoc task of TREC 2 (1993)"
-    return {"documents": documents, "topics": topics, "assessments": assessments}
+
+    DOCUMENTS = reference(varname="documents", reference=Trec1Documents)
+    TOPICS = reference(varname="topics", reference=Trec2Topics)
+    ASSESSMENTS = reference(varname="assessments", reference=Trec2Assessments)
+
+    def config(self) -> Adhoc:
+        return Adhoc.C(
+            documents=self.DOCUMENTS.prepare(),
+            topics=self.TOPICS.prepare(),
+            assessments=self.ASSESSMENTS.prepare(),
+        )
 
 
 # --- TREC 3 (1994)
 
 
-@filedownloader("topics.sgml", "http://trec.nist.gov/data/topics_eng/topics.151-200.gz")
-@dataset(TrecTopics, id="3.topics")
-def trec3_topics(topics):
-    return {"path": topics, "parts": ["title", "desc"]}
+@dataset(id=".3.topics")
+class Trec3Topics(Dataset):
+    FILE = FileDownloader(
+        "topics.sgml", "http://trec.nist.gov/data/topics_eng/topics.151-200.gz"
+    )
 
+    def config(self) -> TrecTopics:
+        return TrecTopics.C(path=self.FILE.path, parts=["title", "desc"])
 
-@concatdownload(
-    "assessments.qrels",
-    "http://trec.nist.gov/data/qrels_eng/qrels.151-200.201-250.disks1-3.all.tar.gz",
-    transforms=TransformList(Gunzip(), Filter(r"^(1\d\d|200)\s")),
-)
-@dataset(TrecAdhocAssessments, id="3.assessments")
-def trec3_assessments(assessments):
-    return {"path": assessments}
 
+@dataset(id=".3.assessments")
+class Trec3Assessments(Dataset):
+    FILE = ConcatDownloader(
+        "assessments.qrels",
+        "http://trec.nist.gov/data/qrels_eng/qrels.151-200.201-250.disks1-3.all.tar.gz",
+        transforms=TransformList(Gunzip(), Filter(r"^(1\d\d|200)\s")),
+    )
+
+    def config(self) -> TrecAdhocAssessments:
+        return TrecAdhocAssessments.C(path=self.FILE.path)
 
-@reference("documents", trec1_documents)
-@reference("topics", trec3_topics)
-@reference("assessments", trec3_assessments)
-@dataset(Adhoc, id="3")
-def trec3(documents, topics, assessments):
+
+@dataset(id=".3")
+class Trec3(Dataset):
     "Ad-hoc task of TREC 3 (1994)"
-    return {"documents": documents, "topics": topics, "assessments": assessments}
+
+    DOCUMENTS = reference(varname="documents", reference=Trec1Documents)
+    TOPICS = reference(varname="topics", reference=Trec3Topics)
+    ASSESSMENTS = reference(varname="assessments", reference=Trec3Assessments)
+
+    def config(self) -> Adhoc:
+        return Adhoc.C(
+            documents=self.DOCUMENTS.prepare(),
+            topics=self.TOPICS.prepare(),
+            assessments=self.ASSESSMENTS.prepare(),
+        )
 
 
 # --- TREC 4 (1995)
 
 
-@links(
-    "documents",
-    ap88=tipster.ap88.path,
-    ap89=tipster.ap89.path,
-    ap90=tipster.ap90.path,
-    fr88=tipster.fr88.path,
-    sjm1=tipster.sjm1.path,
-    wsj90=tipster.wsj90.path,
-    wsj91=tipster.wsj91.path,
-    wsj92=tipster.wsj92.path,
-    ziff2=tipster.ziff2.path,
-    ziff3=tipster.ziff3.path,
-)
-@dataset(TipsterCollection, id="4.documents")
-def trec4_documents(documents):
+@dataset(id=".4.documents")
+class Trec4Documents(Dataset):
     """TREC-4 documents"""
-    return {"path": documents}
 
+    DOCUMENTS = links(
+        "documents",
+        ap88=tipster.Ap88,
+        ap89=tipster.Ap89,
+        ap90=tipster.Ap90,
+        fr88=tipster.Fr88,
+        sjm1=tipster.Sjm1,
+        wsj90=tipster.Wsj90,
+        wsj91=tipster.Wsj91,
+        wsj92=tipster.Wsj92,
+        ziff2=tipster.Ziff2,
+        ziff3=tipster.Ziff3,
+    )
 
-@filedownloader("topics.sgml", "http://trec.nist.gov/data/topics_eng/topics.201-250.gz")
-@dataset(TrecTopics, id="4.topics")
-def trec4_topics(topics):
-    return {"path": topics, "parts": ["title", "desc"]}
+    def config(self) -> TipsterCollection:
+        return TipsterCollection.C(path=self.DOCUMENTS.path)
 
 
-@concatdownload(
-    "assessments.qrels",
-    "http://trec.nist.gov/data/qrels_eng/qrels.201-250.disk2.disk3.parts1-5.tar.gz",
-)
-@dataset(TrecAdhocAssessments, id="4.assessments")
-def trec4_assessments(assessments):
-    return {"path": assessments}
+@dataset(id=".4.topics")
+class Trec4Topics(Dataset):
+    FILE = FileDownloader(
+        "topics.sgml", "http://trec.nist.gov/data/topics_eng/topics.201-250.gz"
+    )
+
+    def config(self) -> TrecTopics:
+        return TrecTopics.C(path=self.FILE.path, parts=["title", "desc"])
 
 
-@reference("documents", trec4_documents)
-@reference("topics", trec4_topics)
-@reference("assessments", trec4_assessments)
-@dataset(Adhoc, id="4")
-def trec4(documents, topics, assessments):
+@dataset(id=".4.assessments")
+class Trec4Assessments(Dataset):
+    FILE = ConcatDownloader(
+        "assessments.qrels",
+        "http://trec.nist.gov/data/qrels_eng/qrels.201-250.disk2.disk3.parts1-5.tar.gz",
+    )
+
+    def config(self) -> TrecAdhocAssessments:
+        return TrecAdhocAssessments.C(path=self.FILE.path)
+
+
+@dataset(id=".4")
+class Trec4(Dataset):
     "Ad-hoc task of TREC 4 (1995)"
-    return {"documents": documents, "topics": topics, "assessments": assessments}
+
+    DOCUMENTS = reference(varname="documents", reference=Trec4Documents)
+    TOPICS = reference(varname="topics", reference=Trec4Topics)
+    ASSESSMENTS = reference(varname="assessments", reference=Trec4Assessments)
+
+    def config(self) -> Adhoc:
+        return Adhoc.C(
+            documents=self.DOCUMENTS.prepare(),
+            topics=self.TOPICS.prepare(),
+            assessments=self.ASSESSMENTS.prepare(),
+        )
 
 
 # --- TREC 5 (1995)
 
 
-@links(
-    "documents",
-    ap88=tipster.ap88.path,
-    cr1=tipster.cr1.path,
-    fr88=tipster.fr88.path,
-    fr94=tipster.fr94.path,
-    ft1=tipster.ft1.path,
-    wsj90=tipster.wsj90.path,
-    wsj91=tipster.wsj91.path,
-    wsj9=tipster.wsj92.path,
-    ziff2=tipster.ziff2.path,
-)
-@dataset(TipsterCollection, id="5.documents")
-def trec5_documents(documents):
+@dataset(id=".5.documents")
+class Trec5Documents(Dataset):
     """TREC-5 documents"""
-    return {"path": documents}
 
+    DOCUMENTS = links(
+        "documents",
+        ap88=tipster.Ap88,
+        cr1=tipster.Cr1,
+        fr88=tipster.Fr88,
+        fr94=tipster.Fr94,
+        ft1=tipster.Ft1,
+        wsj90=tipster.Wsj90,
+        wsj91=tipster.Wsj91,
+        wsj9=tipster.Wsj92,
+        ziff2=tipster.Ziff2,
+    )
 
-@filedownloader("topics.sgml", "http://trec.nist.gov/data/topics_eng/topics.251-300.gz")
-@dataset(TrecTopics, id="5.topics")
-def trec5_topics(topics):
-    return {"path": topics, "parts": ["title", "desc"]}
+    def config(self) -> TipsterCollection:
+        return TipsterCollection.C(path=self.DOCUMENTS.path)
 
 
-@concatdownload(
-    "assessments.qrels",
-    url="http://trec.nist.gov/data/qrels_eng/qrels.251-300.parts1-5.tar.gz",
-)
-@dataset(TrecAdhocAssessments, id="5.qrels")
-def trec5_assessments(assessments):
-    return {"path": assessments}
+@dataset(id=".5.topics")
+class Trec5Topics(Dataset):
+    FILE = FileDownloader(
+        "topics.sgml", "http://trec.nist.gov/data/topics_eng/topics.251-300.gz"
+    )
+
+    def config(self) -> TrecTopics:
+        return TrecTopics.C(path=self.FILE.path, parts=["title", "desc"])
 
 
-@reference("documents", trec5_documents)
-@reference("topics", trec5_topics)
-@reference("assessments", trec5_assessments)
-@dataset(Adhoc, id="5")
-def trec5(documents, topics, assessments):
+@dataset(id=".5.qrels")
+class Trec5Assessments(Dataset):
+    FILE = ConcatDownloader(
+        "assessments.qrels",
+        url="http://trec.nist.gov/data/qrels_eng/qrels.251-300.parts1-5.tar.gz",
+    )
+
+    def config(self) -> TrecAdhocAssessments:
+        return TrecAdhocAssessments.C(path=self.FILE.path)
+
+
+@dataset(id=".5")
+class Trec5(Dataset):
     "Ad-hoc task of TREC 5 (1996)"
-    return {"documents": documents, "topics": topics, "assessments": assessments}
+
+    DOCUMENTS = reference(varname="documents", reference=Trec5Documents)
+    TOPICS = reference(varname="topics", reference=Trec5Topics)
+    ASSESSMENTS = reference(varname="assessments", reference=Trec5Assessments)
+
+    def config(self) -> Adhoc:
+        return Adhoc.C(
+            documents=self.DOCUMENTS.prepare(),
+            topics=self.TOPICS.prepare(),
+            assessments=self.ASSESSMENTS.prepare(),
+        )
 
 
 # -- TREC 6 (1997)
 
 
-@links(
-    "documents",
-    cr1=tipster.cr1.path,
-    fbis1=tipster.fbis1.path,
-    fr94=tipster.fr94.path,
-    ft1=tipster.ft1.path,
-    la8990=tipster.la8990.path,
-)
-@dataset(TipsterCollection, id="6.documents")
-def trec6_documents(documents):
+@dataset(id=".6.documents")
+class Trec6Documents(Dataset):
     """TREC-5 documents"""
-    return {"path": documents}
 
+    DOCUMENTS = links(
+        "documents",
+        cr1=tipster.Cr1,
+        fbis1=tipster.Fbis1,
+        fr94=tipster.Fr94,
+        ft1=tipster.Ft1,
+        la8990=tipster.La8990,
+    )
 
-@filedownloader("topics.sgml", "http://trec.nist.gov/data/topics_eng/topics.301-350.gz")
-@dataset(TrecTopics, id="6.topics")
-def trec6_topics(topics):
-    return {"path": topics, "parts": ["title", "desc"]}
+    def config(self) -> TipsterCollection:
+        return TipsterCollection.C(path=self.DOCUMENTS.path)
 
 
-@concatdownload(
-    "assessments.qrels",
-    url="http://trec.nist.gov/data/qrels_eng/qrels.trec6.adhoc.parts1-5.tar.gz",
-)
-@dataset(TrecAdhocAssessments, id="6.qrels")
-def trec6_assessments(assessments):
-    return {"path": assessments}
+@dataset(id=".6.topics")
+class Trec6Topics(Dataset):
+    FILE = FileDownloader(
+        "topics.sgml", "http://trec.nist.gov/data/topics_eng/topics.301-350.gz"
+    )
+
+    def config(self) -> TrecTopics:
+        return TrecTopics.C(path=self.FILE.path, parts=["title", "desc"])
 
 
-@reference("documents", trec6_documents)
-@reference("topics", trec6_topics)
-@reference("assessments", trec6_assessments)
-@dataset(Adhoc, id="6")
-def trec6(documents, topics, assessments):
+@dataset(id=".6.qrels")
+class Trec6Assessments(Dataset):
+    FILE = ConcatDownloader(
+        "assessments.qrels",
+        url="http://trec.nist.gov/data/qrels_eng/qrels.trec6.adhoc.parts1-5.tar.gz",
+    )
+
+    def config(self) -> TrecAdhocAssessments:
+        return TrecAdhocAssessments.C(path=self.FILE.path)
+
+
+@dataset(id=".6")
+class Trec6(Dataset):
     "Ad-hoc task of TREC 6 (1997)"
-    return {"documents": documents, "topics": topics, "assessments": assessments}
+
+    DOCUMENTS = reference(varname="documents", reference=Trec6Documents)
+    TOPICS = reference(varname="topics", reference=Trec6Topics)
+    ASSESSMENTS = reference(varname="assessments", reference=Trec6Assessments)
+
+    def config(self) -> Adhoc:
+        return Adhoc.C(
+            documents=self.DOCUMENTS.prepare(),
+            topics=self.TOPICS.prepare(),
+            assessments=self.ASSESSMENTS.prepare(),
+        )
 
 
 # --- TREC 7 (1998)
 
 
-@links(
-    "documents",
-    fbis1=tipster.fbis1.path,
-    fr94=tipster.fr94.path,
-    ft1=tipster.ft1.path,
-    la8990=tipster.la8990.path,
-)
-@dataset(TipsterCollection, id="7.documents")
-def trec7_documents(documents):
+@dataset(id=".7.documents")
+class Trec7Documents(Dataset):
     """TREC-7 documents"""
-    return {"path": documents}
 
+    DOCUMENTS = links(
+        "documents",
+        fbis1=tipster.Fbis1,
+        fr94=tipster.Fr94,
+        ft1=tipster.Ft1,
+        la8990=tipster.La8990,
+    )
 
-@filedownloader("topics.sgml", "http://trec.nist.gov/data/topics_eng/topics.351-400.gz")
-@dataset(TrecTopics, id="7.topics")
-def trec7_topics(topics):
-    return {"path": topics, "parts": ["title", "desc"]}
+    def config(self) -> TipsterCollection:
+        return TipsterCollection.C(path=self.DOCUMENTS.path)
 
 
-@concatdownload(
-    "assessments.qrels",
-    url="http://trec.nist.gov/data/qrels_eng/qrels.trec7.adhoc.parts1-5.tar.gz",
-)
-@dataset(TrecAdhocAssessments, id="7.qrels")
-def trec7_assessments(assessments):
-    return {"path": assessments}
+@dataset(id=".7.topics")
+class Trec7Topics(Dataset):
+    FILE = FileDownloader(
+        "topics.sgml", "http://trec.nist.gov/data/topics_eng/topics.351-400.gz"
+    )
+
+    def config(self) -> TrecTopics:
+        return TrecTopics.C(path=self.FILE.path, parts=["title", "desc"])
 
 
-@reference("documents", trec7_documents)
-@reference("topics", trec7_topics)
-@reference("assessments", trec7_assessments)
-@dataset(Adhoc, id="7")
-def trec7(documents, topics, assessments):
+@dataset(id=".7.qrels")
+class Trec7Assessments(Dataset):
+    FILE = ConcatDownloader(
+        "assessments.qrels",
+        url="http://trec.nist.gov/data/qrels_eng/qrels.trec7.adhoc.parts1-5.tar.gz",
+    )
+
+    def config(self) -> TrecAdhocAssessments:
+        return TrecAdhocAssessments.C(path=self.FILE.path)
+
+
+@dataset(id=".7")
+class Trec7(Dataset):
     "Ad-hoc task of TREC 3 (1994)"
-    return {"documents": documents, "topics": topics, "assessments": assessments}
+
+    DOCUMENTS = reference(varname="documents", reference=Trec7Documents)
+    TOPICS = reference(varname="topics", reference=Trec7Topics)
+    ASSESSMENTS = reference(varname="assessments", reference=Trec7Assessments)
+
+    def config(self) -> Adhoc:
+        return Adhoc.C(
+            documents=self.DOCUMENTS.prepare(),
+            topics=self.TOPICS.prepare(),
+            assessments=self.ASSESSMENTS.prepare(),
+        )
 
 
 # --- TREC 8 (1999)
 
 
-@filedownloader("topics.sgml", "http://trec.nist.gov/data/topics_eng/topics.401-450.gz")
-@dataset(TrecTopics, id="8.topics")
-def trec8_topics(topics):
-    return {"path": topics, "parts": ["title", "desc"]}
+@dataset(id=".8.topics")
+class Trec8Topics(Dataset):
+    FILE = FileDownloader(
+        "topics.sgml", "http://trec.nist.gov/data/topics_eng/topics.401-450.gz"
+    )
 
+    def config(self) -> TrecTopics:
+        return TrecTopics.C(path=self.FILE.path, parts=["title", "desc"])
 
-@concatdownload(
-    "assessments.qrels",
-    url="https://trec.nist.gov/data/qrels_eng/qrels.trec8.adhoc.parts1-5.tar.gz",
-)
-@dataset(TrecAdhocAssessments, id="8.qrels")
-def trec8_assessments(assessments):
-    return {"path": assessments}
+
+@dataset(id=".8.qrels")
+class Trec8Assessments(Dataset):
+    FILE = ConcatDownloader(
+        "assessments.qrels",
+        url="https://trec.nist.gov/data/qrels_eng/qrels.trec8.adhoc.parts1-5.tar.gz",
+    )
+
+    def config(self) -> TrecAdhocAssessments:
+        return TrecAdhocAssessments.C(path=self.FILE.path)
 
 
-@reference("documents", trec7_documents)
-@reference("topics", trec8_topics)
-@reference("assessments", trec8_assessments)
-@dataset(Adhoc, id="8")
-def trec8(documents, topics, assessments):
+@dataset(id=".8")
+class Trec8(Dataset):
     "Ad-hoc task of TREC 8 (1999)"
-    return {"documents": documents, "topics": topics, "assessments": assessments}
+
+    DOCUMENTS = reference(varname="documents", reference=Trec7Documents)
+    TOPICS = reference(varname="topics", reference=Trec8Topics)
+    ASSESSMENTS = reference(varname="assessments", reference=Trec8Assessments)
+
+    def config(self) -> Adhoc:
+        return Adhoc.C(
+            documents=self.DOCUMENTS.prepare(),
+            topics=self.TOPICS.prepare(),
+            assessments=self.ASSESSMENTS.prepare(),
+        )
 
 
 # --- TREC Robust (2004)
 
 
-@filedownloader("topics", "http://trec.nist.gov/data/robust/04.testset.gz")
-@dataset(TrecTopics, id="robust.2004.topics")
-def robust2004_topics(topics):
-    return {"path": topics, "parts": ["title", "desc"]}
+@dataset(id=".robust.2004.topics")
+class Robust2004Topics(Dataset):
+    FILE = FileDownloader("topics", "http://trec.nist.gov/data/robust/04.testset.gz")
 
+    def config(self) -> TrecTopics:
+        return TrecTopics.C(path=self.FILE.path, parts=["title", "desc"])
 
-@filedownloader(
-    "assessments.qrels", "http://trec.nist.gov/data/robust/qrels.robust2004.txt"
-)
-@dataset(TrecAdhocAssessments, id="robust.2004.qrels")
-def robust2004_assessments(assessments):
-    return {"path": assessments}
 
+@dataset(id=".robust.2004.qrels")
+class Robust2004Assessments(Dataset):
+    FILE = FileDownloader(
+        "assessments.qrels", "http://trec.nist.gov/data/robust/qrels.robust2004.txt"
+    )
+
+    def config(self) -> TrecAdhocAssessments:
+        return TrecAdhocAssessments.C(path=self.FILE.path)
 
-@reference("documents", trec7_documents)
-@reference("topics", robust2004_topics)
-@reference("assessments", robust2004_assessments)
-@dataset(Adhoc, id="robust.2004")
-def robust2004(documents, topics, assessments):
+
+@dataset(id=".robust.2004")
+class Robust2004(Dataset):
     "Ad-hoc task of TREC Robust (2004)"
-    return {"documents": documents, "topics": topics, "assessments": assessments}
+
+    DOCUMENTS = reference(varname="documents", reference=Trec7Documents)
+    TOPICS = reference(varname="topics", reference=Robust2004Topics)
+    ASSESSMENTS = reference(varname="assessments", reference=Robust2004Assessments)
+
+    def config(self) -> Adhoc:
+        return Adhoc.C(
+            documents=self.DOCUMENTS.prepare(),
+            topics=self.TOPICS.prepare(),
+            assessments=self.ASSESSMENTS.prepare(),
+        )
 
 
 # --- TREC Robust (2005)
 
 
-@filedownloader("topics", "http://trec.nist.gov/data/robust/05/05.50.topics.txt")
-@dataset(TrecTopics, id="robust.2005.topics")
-def robust2005_topics(topics):
-    return {"path": topics, "parts": ["title", "desc"]}
+@dataset(id=".robust.2005.topics")
+class Robust2005Topics(Dataset):
+    FILE = FileDownloader(
+        "topics", "http://trec.nist.gov/data/robust/05/05.50.topics.txt"
+    )
 
+    def config(self) -> TrecTopics:
+        return TrecTopics.C(path=self.FILE.path, parts=["title", "desc"])
 
-@filedownloader(
-    "assessments.qrels", url="http://trec.nist.gov/data/robust/05/TREC2005.qrels.txt"
-)
-@dataset(TrecAdhocAssessments, id="robust.2005.qrels")
-def robust2005_assessments(assessments):
-    return {"path": assessments}
 
+@dataset(id=".robust.2005.qrels")
+class Robust2005Assessments(Dataset):
+    FILE = FileDownloader(
+        "assessments.qrels",
+        url="http://trec.nist.gov/data/robust/05/TREC2005.qrels.txt",
+    )
 
-@reference("documents", aquaint)
-@reference("topics", robust2005_topics)
-@reference("assessments", robust2005_assessments)
-@dataset(Adhoc, id="robust.2005")
-def robust2005(documents, topics, assessments):
+    def config(self) -> TrecAdhocAssessments:
+        return TrecAdhocAssessments.C(path=self.FILE.path)
+
+
+@dataset(id=".robust.2005")
+class Robust2005(Dataset):
     "Ad-hoc task of TREC Robust (2005)"
-    return {"documents": documents, "topics": topics, "assessments": assessments}
+
+    DOCUMENTS = reference(varname="documents", reference=Aquaint)
+    TOPICS = reference(varname="topics", reference=Robust2005Topics)
+    ASSESSMENTS = reference(varname="assessments", reference=Robust2005Assessments)
+
+    def config(self) -> Adhoc:
+        return Adhoc.C(
+            documents=self.DOCUMENTS.prepare(),
+            topics=self.TOPICS.prepare(),
+            assessments=self.ASSESSMENTS.prepare(),
+        )