chore: simplify import/exports

freqtrade/optimize/hyperopt/hyperopt_interface.py

@@ -13,9 +13,9 @@ from optuna.samplers import BaseSampler
 from freqtrade.constants import Config
 from freqtrade.exchange import timeframe_to_minutes
 from freqtrade.misc import round_dict
-from freqtrade.optimize.space import SKDecimal
-from freqtrade.optimize.space.optunaspaces import (
+from freqtrade.optimize.space import (
     DimensionProtocol,
+    SKDecimal,
     ft_CategoricalDistribution,
     ft_IntDistribution,
 )

freqtrade/optimize/hyperopt/hyperopt_optimizer.py

@@ -41,9 +41,9 @@ with warnings.catch_warnings():
     # warnings.filterwarnings("ignore", category=ExperimentalWarning)
     import optuna
 
-    from freqtrade.optimize.space.decimalspace import SKDecimal
-    from freqtrade.optimize.space.optunaspaces import (
+    from freqtrade.optimize.space import (
         DimensionProtocol,
+        SKDecimal,
         ft_CategoricalDistribution,
         ft_FloatDistribution,
         ft_IntDistribution,

freqtrade/optimize/space/__init__.py

@@ -1,5 +1,22 @@
-from .decimalspace import SKDecimal  # noqa: F401
-from .optunaspaces import DimensionProtocol as Dimension  # noqa: F401
-from .optunaspaces import ft_CategoricalDistribution as Categorical  # noqa: F401
-from .optunaspaces import ft_FloatDistribution as Real  # noqa: F401
-from .optunaspaces import ft_IntDistribution as Integer  # noqa: F401
+from .decimalspace import SKDecimal
+from .optunaspaces import (
+    DimensionProtocol,
+    ft_CategoricalDistribution,
+    ft_FloatDistribution,
+    ft_IntDistribution,
+)
+
+
+# Alias for the distribution classes
+Dimension = DimensionProtocol
+Categorical = ft_CategoricalDistribution
+Integer = ft_IntDistribution
+Real = ft_FloatDistribution
+
+__all__ = [
+    "Categorical",
+    "Dimension",
+    "Integer",
+    "Real",
+    "SKDecimal",
+]

freqtrade/strategy/parameters.py

@@ -14,8 +14,8 @@ from freqtrade.optimize.hyperopt_tools import HyperoptStateContainer
 
 
 with suppress(ImportError):
-    from freqtrade.optimize.space import SKDecimal
-    from freqtrade.optimize.space.optunaspaces import (
+    from freqtrade.optimize.space import (
+        SKDecimal,
         ft_CategoricalDistribution,
         ft_FloatDistribution,
         ft_IntDistribution,

tests/optimize/test_hyperopt.py

@@ -16,8 +16,7 @@ from freqtrade.optimize.hyperopt import Hyperopt
 from freqtrade.optimize.hyperopt.hyperopt_auto import HyperOptAuto
 from freqtrade.optimize.hyperopt_tools import HyperoptTools
 from freqtrade.optimize.optimize_reports import generate_strategy_stats
-from freqtrade.optimize.space import SKDecimal
-from freqtrade.optimize.space.optunaspaces import ft_IntDistribution
+from freqtrade.optimize.space import SKDecimal, ft_IntDistribution
 from freqtrade.strategy import IntParameter
 from freqtrade.util import dt_utc
 from tests.conftest import (