More comments to address

Author: sfc-gh-jkew

modin/core/storage_formats/pandas/query_compiler_caster.py

@@ -256,7 +256,9 @@ def cast_args(*args: Tuple, **kwargs: Dict) -> Any:
 
         def arg_needs_casting(arg):
             current_qc_type = type(current_qc)
-            return isinstance(arg, BaseQueryCompiler) and not isinstance(arg, current_qc_type)
+            return isinstance(arg, BaseQueryCompiler) and not isinstance(
+                arg, current_qc_type
+            )
 
         def register_query_compilers(arg):
             if not arg_needs_casting(arg):
@@ -270,7 +272,9 @@ def cast_to_qc(arg):
             qc_type = calculator.calculate()
             if qc_type is None or qc_type is type(arg):
                 return arg
-            return qc_type.from_pandas(arg.to_pandas(), data_cls=calculator.result_data_cls())
+            return qc_type.from_pandas(
+                arg.to_pandas(), data_cls=calculator.result_data_cls()
+            )
 
         if isinstance(current_qc, BaseQueryCompiler):
             visit_nested_args(kwargs, register_query_compilers)
@@ -279,19 +283,19 @@ def cast_to_qc(arg):
             args = visit_nested_args(args, cast_to_qc)
             kwargs = visit_nested_args(kwargs, cast_to_qc)
 
-        qc = calculator.calculate()
+        result_qc_type = calculator.calculate()
 
-        if qc is None or qc is type(current_qc):
+        if result_qc_type is None or result_qc_type is type(current_qc):
             return obj(*args, **kwargs)
 
         # we need to cast current_qc to a new query compiler,
         # then lookup the same function on the new query compiler
         # we need to also drop the first argument to the original
         # args since it references self on the original argument
         # call
-        if qc != current_qc:
+        if result_qc_type != current_qc:
             data_cls = current_qc._modin_frame
-            new_qc = qc.from_pandas(current_qc.to_pandas(), data_cls)
+            new_qc = result_qc_type.from_pandas(current_qc.to_pandas(), data_cls)
             obj_new = getattr(new_qc, obj.__name__)
             return obj_new(*args[1:], **kwargs)
 

modin/tests/pandas/native_df_interoperability/test_compiler_caster.py

@@ -25,10 +25,6 @@
 class CloudQC(NativeQueryCompiler):
     "Represents a cloud-hosted query compiler"
 
-    def __init__(self, pandas_frame):
-        self._modin_frame = pandas_frame
-        super().__init__(pandas_frame)
-
     def qc_engine_switch_cost(self, other_qc_cls):
         return {
             CloudQC: QCCoercionCost.COST_ZERO,
@@ -42,10 +38,6 @@ def qc_engine_switch_cost(self, other_qc_cls):
 class ClusterQC(NativeQueryCompiler):
     "Represents a local network cluster query compiler"
 
-    def __init__(self, pandas_frame):
-        self._modin_frame = pandas_frame
-        super().__init__(pandas_frame)
-
     def qc_engine_switch_cost(self, other_qc_cls):
         return {
             CloudQC: QCCoercionCost.COST_MEDIUM,
@@ -59,10 +51,6 @@ def qc_engine_switch_cost(self, other_qc_cls):
 class LocalMachineQC(NativeQueryCompiler):
     "Represents a local machine query compiler"
 
-    def __init__(self, pandas_frame):
-        self._modin_frame = pandas_frame
-        super().__init__(pandas_frame)
-
     def qc_engine_switch_cost(self, other_qc_cls):
         return {
             CloudQC: QCCoercionCost.COST_MEDIUM,
@@ -75,10 +63,6 @@ def qc_engine_switch_cost(self, other_qc_cls):
 class PicoQC(NativeQueryCompiler):
     "Represents a query compiler with very few resources"
 
-    def __init__(self, pandas_frame):
-        self._modin_frame = pandas_frame
-        super().__init__(pandas_frame)
-
     def qc_engine_switch_cost(self, other_qc_cls):
         return {
             CloudQC: QCCoercionCost.COST_LOW,
@@ -91,10 +75,6 @@ def qc_engine_switch_cost(self, other_qc_cls):
 class AdversarialQC(NativeQueryCompiler):
     "Represents a query compiler which returns non-sensical costs"
 
-    def __init__(self, pandas_frame):
-        self._modin_frame = pandas_frame
-        super().__init__(pandas_frame)
-
     def qc_engine_switch_cost(self, other_qc_cls):
         return {
             CloudQC: -1000,
@@ -106,18 +86,10 @@ def qc_engine_switch_cost(self, other_qc_cls):
 class DefaultQC(NativeQueryCompiler):
     "Represents a query compiler with no costing information"
 
-    def __init__(self, pandas_frame):
-        self._modin_frame = pandas_frame
-        super().__init__(pandas_frame)
-
 
 class DefaultQC2(NativeQueryCompiler):
     "Represents a query compiler with no costing information, but different."
 
-    def __init__(self, pandas_frame):
-        self._modin_frame = pandas_frame
-        super().__init__(pandas_frame)
-
 
 @pytest.fixture()
 def cloud_df():