Remove base metaclass and old decorator names

Author: jcrist

python/cuml/cuml/dask/common/base.py

@@ -20,12 +20,11 @@
 from cuml.dask.common import parts_to_ranks
 from cuml.dask.common.input_utils import DistributedDataHandler
 from cuml.dask.common.utils import get_client, wait_and_raise_from_futures
-from cuml.internals import BaseMetaClass
 from cuml.internals.array import CumlArray
 from cuml.internals.base import Base
 
 
-class BaseEstimator(object, metaclass=BaseMetaClass):
+class BaseEstimator:
     def __init__(self, *, client=None, verbose=False, **kwargs):
         """
         Constructor for distributed estimators.

python/cuml/cuml/internals/__init__.py

@@ -2,17 +2,5 @@
 # SPDX-FileCopyrightText: Copyright (c) 2019-2025, NVIDIA CORPORATION.
 # SPDX-License-Identifier: Apache-2.0
 #
-from cuml.internals.base_helpers import BaseMetaClass, _tags_class_and_instance
-from cuml.internals.constants import CUML_WRAPPED_FLAG
 from cuml.internals.internals import GraphBasedDimRedCallback
-from cuml.internals.outputs import (
-    api_base_fit_transform,
-    api_base_return_any,
-    api_base_return_any_skipall,
-    api_base_return_array,
-    api_base_return_array_skipall,
-    api_return_any,
-    api_return_array,
-    exit_internal_api,
-    reflect,
-)
+from cuml.internals.outputs import exit_internal_api, reflect

python/cuml/cuml/internals/base.py

@@ -18,7 +18,7 @@
 from cuml.internals.outputs import check_output_type
 
 
-class Base(TagsMixin, metaclass=cuml.internals.BaseMetaClass):
+class Base(TagsMixin):
     """
     Base class for all the ML algos. It handles some of the common operations
     across all algos. Every ML algo class exposed at cython level must inherit

python/cuml/cuml/internals/base_helpers.py

@@ -8,7 +8,6 @@
 
 from cuml._thirdparty._sklearn_compat import _to_new_tags
 from cuml.common.doc_utils import generate_docstring
-from cuml.internals.base_helpers import _tags_class_and_instance
 from cuml.internals.outputs import reflect
 
 ###############################################################################
@@ -45,6 +44,34 @@
 }
 
 
+class _tags_class_and_instance:
+    """
+    Decorator for mixins to allow for dynamic and static _get_tags.
+    In general, most methods are either dynamic or static, so this decorator
+    is only meant to be used in the mixins _get_tags.
+    """
+
+    def __init__(self, _class, _instance=None):
+        self._class = _class
+        self._instance = _instance
+
+    def instance_method(self, _instance):
+        """
+        Factory to create a _tags_class_and_instance instance method with
+        the existing class associated.
+        """
+        return _tags_class_and_instance(self._class, _instance)
+
+    def __get__(self, _instance, _class):
+        # if the caller had no instance (i.e. it was a class) or there is no
+        # instance associated we the method we return the class call
+        if _instance is None or self._instance is None:
+            return self._class.__get__(_class, None)
+
+        # otherwise return instance call
+        return self._instance.__get__(_instance, _class)
+
+
 class TagsMixin:
     @_tags_class_and_instance
     def _get_tags(cls):

python/cuml/cuml/internals/constants.py

@@ -11,7 +11,6 @@
 # TODO: Try to resolve circular import that makes this necessary:
 from cuml.internals import input_utils as iu
 from cuml.internals.array_sparse import SparseCumlArray
-from cuml.internals.constants import CUML_WRAPPED_FLAG
 from cuml.internals.global_settings import GlobalSettings
 
 __all__ = (
@@ -353,9 +352,6 @@ def reflect(
             skip=skip,
         )
 
-    # TODO: remove this once auto-decorating is ripped out
-    setattr(func, CUML_WRAPPED_FLAG, True)
-
     sig = inspect.signature(func, follow_wrapped=True)
     has_self = "self" in sig.parameters
 
@@ -437,28 +433,3 @@ def inner(*args, **kwargs):
         return res
 
     return inner
-
-
-def api_return_array(input_arg=default, get_output_type=False):
-    return reflect(array=None if not get_output_type else input_arg)
-
-
-def api_return_any():
-    return reflect(array=None, skip=True)
-
-
-def api_base_return_any():
-    return reflect(reset=True)
-
-
-def api_base_return_array(input_arg=default):
-    return reflect(array="self" if input_arg is None else input_arg)
-
-
-def api_base_fit_transform():
-    return reflect(reset=True)
-
-
-# TODO: investigate and remove these
-api_base_return_any_skipall = api_return_any()
-api_base_return_array_skipall = reflect

python/cuml/cuml/internals/mixins.py

@@ -45,27 +45,30 @@ class DummyTestEstimator(cuml.Base):
     def _set_input(self, X):
         self.input_any_ = X
 
-    @cuml.internals.api_base_return_any()
+    @cuml.internals.reflect(reset=True)
     def store_input(self, X):
         self.input_any_ = X
 
-    @cuml.internals.api_return_any()
+    @cuml.internals.reflect(skip=True)
     def get_input(self):
         return self.input_any_
 
-    # === Standard Functions ===
-    def fit(self, X, convert_dtype=True) -> "DummyTestEstimator":
+    @cuml.internals.reflect(reset=True)
+    def fit(self, X, convert_dtype=True):
         self._set_output_type(X)
         self._set_n_features_in(X)
         return self
 
-    def predict(self, X, convert_dtype=True) -> CumlArray:
+    @cuml.internals.reflect
+    def predict(self, X, convert_dtype=True):
         return X
 
-    def transform(self, X, convert_dtype=False) -> CumlArray:
+    @cuml.internals.reflect
+    def transform(self, X, convert_dtype=False):
         pass
 
-    def fit_transform(self, X, y=None) -> CumlArray:
+    @cuml.internals.reflect
+    def fit_transform(self, X, y=None):
         return self.fit(X).transform(X)
 
 
@@ -280,7 +283,7 @@ def test_return_array(input_arg: str):
     X_in = create_input(input_type_X, input_dtype_X, (10, 10), "F")
     Y_in = create_input(input_type_Y, input_dtype_Y, (10, 10), "F")
 
-    @cuml.internals.api_return_array(input_arg=input_arg, get_output_type=True)
+    @cuml.internals.reflect(array=input_arg)
     def test_func(X, y):
         return X