Use custom classproperty

Author: Scienfitz

baybe/acquisition/__init__.py

@@ -13,8 +13,6 @@
     qSimpleRegret,
     qUpperConfidenceBound,
 )
-from baybe.acquisition.adapter import AdapterModel
-from baybe.acquisition.partial import PartialAcquisitionFunction
 
 EI = ExpectedImprovement
 qEI = qExpectedImprovement
@@ -55,8 +53,4 @@
     "PI",
     "qPI",
     "qSR",
-    # -----------------------------
-    # Helpers
-    "AdapterModel",
-    "PartialAcquisitionFunction",
 ]

baybe/acquisition/base.py

@@ -10,16 +10,14 @@
 import pandas as pd
 from attrs import define
 
-from baybe.acquisition.adapter import AdapterModel
 from baybe.serialization.core import (
     converter,
     get_base_structure_hook,
     unstructure_base,
 )
 from baybe.serialization.mixin import SerialMixin
 from baybe.surrogates.base import Surrogate
-from baybe.utils.basic import filter_attributes
-from baybe.utils.dataframe import to_tensor
+from baybe.utils.basic import classproperty, filter_attributes
 
 
 @define(frozen=True)
@@ -29,8 +27,7 @@ class AcquisitionFunction(ABC, SerialMixin):
     _abbreviation: ClassVar[str]
     """An alternative name for type resolution."""
 
-    @classmethod
-    @property
+    @classproperty
     def is_mc(cls) -> bool:
         """Flag indicating whether this is a Monte-Carlo acquisition function."""
         return cls._abbreviation.startswith("q")
@@ -44,6 +41,9 @@ def to_botorch(
         """Create the botorch-ready representation of the function."""
         import botorch.acquisition as botorch_analytical_acqf
 
+        from baybe.acquisition.adapter import AdapterModel
+        from baybe.utils.dataframe import to_tensor
+
         acqf_cls = getattr(botorch_analytical_acqf, self.__class__.__name__)
         fields_dict = filter_attributes(object=self, callable_=acqf_cls.__init__)
 

baybe/utils/basic.py

@@ -128,3 +128,18 @@ def filter_attributes(
         for p in params
         if (p not in ignore) and hasattr(object, p)
     }
+
+
+class classproperty:
+    """A decorator to make class properties.
+
+    A class property combines the characteristics of @property and @classmethod. The
+    simple chaining of these two existing decorators is deprecated and causes mypy
+    issues.
+    """
+
+    def __init__(self, fn: Callable) -> None:
+        self.fn = fn
+
+    def __get__(self, _, cl: type):
+        return self.fn(cl)