Replace deprecated abstractproperty with @property + @abstractmethod

ax/core/base_trial.py

@@ -8,7 +8,7 @@
 
 from __future__ import annotations
 
-from abc import ABC, abstractmethod, abstractproperty
+from abc import ABC, abstractmethod
 from collections.abc import Callable
 from copy import deepcopy
 from datetime import datetime, timedelta
@@ -133,19 +133,22 @@ def __init__(
         # might be getting deployed to.
         self._properties: dict[str, Any] = {}
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def arms(self) -> list[Arm]:
         """All arms associated with this trial."""
         pass
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def arms_by_name(self) -> dict[str, Arm]:
         """A mapping of from arm names, to all arms associated with
         this trial.
         """
         pass
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def abandoned_arms(self) -> list[Arm]:
         """All abandoned arms, associated with this trial."""
         pass
@@ -473,7 +476,8 @@ def active_arms(self) -> list[Arm]:
         """All non abandoned arms associated with this trial."""
         return [arm for arm in self.arms if arm not in self.abandoned_arms]
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def generator_runs(self) -> list[GeneratorRun]:
         """All generator runs associated with this trial."""
         pass

ax/core/parameter.py

@@ -9,7 +9,7 @@
 from __future__ import annotations
 
 import math
-from abc import ABCMeta, abstractmethod, abstractproperty
+from abc import ABCMeta, abstractmethod
 from copy import deepcopy
 from enum import Enum
 from logging import Logger
@@ -283,7 +283,8 @@ def _base_repr(self) -> str:
 
         return ret_val
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def domain_repr(self) -> str:
         """Returns a string representation of the domain."""
         pass

ax/storage/registry_bundle.py

@@ -7,7 +7,7 @@
 
 from __future__ import annotations
 
-from abc import ABC, abstractproperty
+from abc import ABC, abstractmethod
 from collections import ChainMap
 from collections.abc import Callable
 from functools import cached_property
@@ -129,15 +129,18 @@ def class_encoder_registry(self) -> dict[type, Callable[[Any], dict[str, Any]]]:
     def class_decoder_registry(self) -> dict[str, Callable[[dict[str, Any]], Any]]:
         return self._json_class_decoder_registry
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def sqa_config(self) -> SQAConfig:
         pass
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def encoder(self) -> Encoder:
         pass
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def decoder(self) -> Decoder:
         pass
 

ax/utils/common/result.py

@@ -8,7 +8,7 @@
 from __future__ import annotations
 
 import traceback
-from abc import ABC, abstractmethod, abstractproperty
+from abc import ABC, abstractmethod
 from collections.abc import Callable
 from functools import reduce
 from typing import Any, cast, Generic, NoReturn, TypeVar
@@ -35,15 +35,18 @@ def is_ok(self) -> bool:
     def is_err(self) -> bool:
         pass
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def ok(self) -> T | None:
         pass
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def err(self) -> E | None:
         pass
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def value(self) -> T | E:
         pass