normalize how the extra requirement decorators are done

pyterrier/anserini/__init__.py

@@ -1,4 +1,4 @@
-from pyterrier.anserini.java import is_installed, set_version, required, J
+from pyterrier.anserini.java import is_installed, set_version, pyserini_required, J
 from pyterrier.anserini.retriever import AnseriniBatchRetrieve
 
-__all__ = ['is_installed', 'set_version', 'required', 'AnseriniBatchRetrieve', 'J']
+__all__ = ['is_installed', 'set_version', 'pyserini_required', 'AnseriniBatchRetrieve', 'J']

pyterrier/anserini/java.py

@@ -71,18 +71,15 @@ def set_version(version: str):
 
 
 @pt.utils.pre_invocation_decorator
-def required(fn: Callable):
+def pyserini_required(fn: Callable):
     """
-    Requires pyserini to be installed (raises error if not installed). If the JVM has not yet been started, it runs
-    pt.java.init(), too, similar to pt.java.required().
+    Requires pyserini to be installed (raises error if not installed).
 
     Can be used as a function/class @decorator. When used as a class decorator, it
     is applied to all methods defined by the class.
     """
     if not is_installed():
         raise RuntimeError('pyserini required to use pyterrier.anserini. `pip install pyserini` and try again.')
-    if not pt.java.started():
-        pt.java.init()
 
 
 J = pt.java.JavaClasses(

pyterrier/anserini/retriever.py

@@ -1,10 +1,11 @@
 from warnings import warn
 import pandas as pd
 import pyterrier as pt
-from pyterrier.anserini.java import required
+from pyterrier.anserini.java import pyserini_required
 
 
-@required
+@pyserini_required
+@pt.java.required
 class AnseriniBatchRetrieve(pt.Transformer):
     """
         Allows retrieval from an Anserini index. To use this class, you must first enable anserini using `pt.anserini.enable()`.

pyterrier/terrier/rewrite.py

@@ -350,6 +350,7 @@ def __init__(self, *args, **kwargs):
         kwargs["qemodel"] = "KL"
         super().__init__(*args, **kwargs)
 
+@prf_required
 @pt.java.required
 class RM3(QueryExpansion):
     '''
@@ -376,7 +377,6 @@ class RM3(QueryExpansion):
                         )
  
     '''
-    @prf_required
     def __init__(self, *args, fb_terms=10, fb_docs=3, fb_lambda=0.6, **kwargs):
         """
         Args:
@@ -408,6 +408,7 @@ def transform(self, queries_and_docs):
         self.qe.fbDocs = self.fb_docs
         return super().transform(queries_and_docs)
 
+@prf_required
 @pt.java.required
 class AxiomaticQE(QueryExpansion):
     '''
@@ -422,7 +423,6 @@ class AxiomaticQE(QueryExpansion):
          - fb_terms(int): number of feedback terms. Defaults to 10
          - fb_docs(int): number of feedback documents. Defaults to 3
     '''
-    @prf_required
     def __init__(self, *args, fb_terms=10, fb_docs=3, **kwargs):
         """
         Args: