remove multiclass/multilabel separation on modules dicts

Author: voorhs

autointent/modules/__init__.py

@@ -23,38 +23,25 @@ def _create_modules_dict(modules: list[type[T]]) -> dict[str, type[T]]:
 
 REGEX_MODULES: dict[str, type[BaseRegex]] = _create_modules_dict([Regex])
 
-EMBEDDING_MODULES_MULTICLASS: dict[str, type[BaseEmbedding]] = _create_modules_dict(
+EMBEDDING_MODULES: dict[str, type[BaseEmbedding]] = _create_modules_dict(
     [RetrievalAimedEmbedding, LogregAimedEmbedding]
 )
 
-EMBEDDING_MODULES_MULTILABEL: dict[str, type[BaseEmbedding]] = EMBEDDING_MODULES_MULTICLASS
-
-SCORING_MODULES_MULTICLASS: dict[str, type[BaseScorer]] = _create_modules_dict(
+SCORING_MODULES: dict[str, type[BaseScorer]] = _create_modules_dict(
     [
         DNNCScorer,
         KNNScorer,
         LinearScorer,
         DescriptionScorer,
         RerankScorer,
         SklearnScorer,
-    ]
-)
-
-SCORING_MODULES_MULTILABEL: dict[str, type[BaseScorer]] = _create_modules_dict(
-    [
         MLKnnScorer,
-        LinearScorer,
-        DescriptionScorer,
-        SklearnScorer,
-    ],
+    ]
 )
 
-DECISION_MODULES_MULTICLASS: dict[str, type[BaseDecision]] = _create_modules_dict(
-    [ArgmaxDecision, JinoosDecision, ThresholdDecision, TunableDecision],
+DECISION_MODULES: dict[str, type[BaseDecision]] = _create_modules_dict(
+    [ArgmaxDecision, JinoosDecision, ThresholdDecision, TunableDecision, AdaptiveDecision],
 )
 
-DECISION_MODULES_MULTILABEL: dict[str, type[BaseDecision]] = _create_modules_dict(
-    [AdaptiveDecision, ThresholdDecision, TunableDecision],
-)
 
 __all__ = []  # type: ignore[var-annotated]

autointent/nodes/info/_decision.py

@@ -5,7 +5,7 @@
 
 from autointent.custom_types import NodeType
 from autointent.metrics import DECISION_METRICS, DecisionMetricFn
-from autointent.modules import DECISION_MODULES_MULTICLASS, DECISION_MODULES_MULTILABEL
+from autointent.modules import DECISION_MODULES
 from autointent.modules.abc import BaseDecision
 
 from ._base import NodeInfo
@@ -17,7 +17,7 @@ class DecisionNodeInfo(NodeInfo):
     metrics_available: ClassVar[Mapping[str, DecisionMetricFn]] = DECISION_METRICS
 
     modules_available: ClassVar[dict[str, type[BaseDecision]]] = (
-        DECISION_MODULES_MULTICLASS | DECISION_MODULES_MULTILABEL
+        DECISION_MODULES
     )
 
     node_type = NodeType.decision

autointent/nodes/info/_embedding.py

@@ -12,7 +12,7 @@
     RetrievalMetricFn,
     ScoringMetricFn,
 )
-from autointent.modules import EMBEDDING_MODULES_MULTICLASS, EMBEDDING_MODULES_MULTILABEL
+from autointent.modules import EMBEDDING_MODULES
 from autointent.modules.abc import BaseEmbedding
 
 from ._base import NodeInfo
@@ -29,7 +29,7 @@ class EmbeddingNodeInfo(NodeInfo):
     )
 
     modules_available: ClassVar[Mapping[str, type[BaseEmbedding]]] = (
-        EMBEDDING_MODULES_MULTICLASS | EMBEDDING_MODULES_MULTILABEL
+        EMBEDDING_MODULES
     )
 
     node_type = NodeType.embedding

autointent/nodes/info/_scoring.py

@@ -5,7 +5,7 @@
 
 from autointent.custom_types import NodeType
 from autointent.metrics import SCORING_METRICS_MULTICLASS, SCORING_METRICS_MULTILABEL, ScoringMetricFn
-from autointent.modules import SCORING_MODULES_MULTICLASS, SCORING_MODULES_MULTILABEL
+from autointent.modules import SCORING_MODULES
 from autointent.modules.abc import BaseScorer
 
 from ._base import NodeInfo
@@ -17,7 +17,7 @@ class ScoringNodeInfo(NodeInfo):
     metrics_available: ClassVar[Mapping[str, ScoringMetricFn]] = SCORING_METRICS_MULTICLASS | SCORING_METRICS_MULTILABEL
 
     modules_available: ClassVar[Mapping[str, type[BaseScorer]]] = (
-        SCORING_MODULES_MULTICLASS | SCORING_MODULES_MULTILABEL
+        SCORING_MODULES
     )
 
     node_type = NodeType.scoring