Fix merge error

Author: dagardner-nv

python/morpheus/morpheus/stages/preprocess/preprocess_base_stage.py

@@ -19,14 +19,7 @@
 
 from morpheus.config import Config
 from morpheus.messages import ControlMessage
-<<<<<<< HEAD
-from morpheus.messages import MessageBase
-from morpheus.messages import MultiInferenceMessage
-from morpheus.messages import MultiMessage
-from morpheus.pipeline.multi_message_stage import MultiMessageStage
-=======
 from morpheus.pipeline.control_message_stage import ControlMessageStage
->>>>>>> 1d02332d6a6fa57a1198565d036ca646b2c6e50e
 from morpheus.pipeline.stage_schema import StageSchema
 
 
@@ -46,9 +39,6 @@ def __init__(self, c: Config):
 
         self._should_log_timestamps = True
 
-        # only used when not using control message
-        self._fallback_output_type: type[MessageBase] = None
-
     def accepted_types(self) -> typing.Tuple:
         """
         Returns accepted input types for this stage.
@@ -59,8 +49,7 @@ def accepted_types(self) -> typing.Tuple:
     def compute_schema(self, schema: StageSchema):
         schema.output_schema.set_type(ControlMessage)
 
-    def _get_preprocess_fn(
-            self) -> typing.Callable[[ControlMessage], ControlMessage]:
+    def _get_preprocess_fn(self) -> typing.Callable[[ControlMessage], ControlMessage]:
         """
         This method should be implemented by any subclasses with a Python implementation.
         """

tests/examples/ransomware_detection/test_create_features.py

@@ -25,12 +25,7 @@
 from _utils import TEST_DIRS
 from _utils.dataset_manager import DatasetManager
 from morpheus.config import Config
-from morpheus.messages import ControlMessage
-from morpheus.messages.message_meta import AppShieldMessageMeta
-<<<<<<< HEAD
-=======
 from morpheus.pipeline.control_message_stage import ControlMessageStage
->>>>>>> 1d02332d6a6fa57a1198565d036ca646b2c6e50e
 from morpheus.stages.input.appshield_source_stage import AppShieldSourceStage
 
 
@@ -59,10 +54,7 @@ def test_constructor(
                                       n_workers=n_workers,
                                       threads_per_worker=threads_per_worker)
 
-<<<<<<< HEAD
-=======
         assert isinstance(stage, ControlMessageStage)
->>>>>>> 1d02332d6a6fa57a1198565d036ca646b2c6e50e
         assert stage._client is mock_dask_client
         scheduler_info = stage._client.scheduler_info()
         for worker in scheduler_info['workers'].values():

tests/stages/test_filter_detections_stage.py

@@ -140,8 +140,7 @@ def test_filter_slice(config, filter_probs_df):
     mock_control_message = _make_control_message(filter_probs_df, probs)
     output_control_message = fds._controller.filter_slice(mock_control_message)
     assert len(output_control_message) == len(output_multi_response_messages)
-    assert output_control_message[0].payload().get_data().to_numpy().tolist(
-    ) == filter_probs_df.loc[
+    assert output_control_message[0].payload().get_data().to_numpy().tolist() == filter_probs_df.loc[
         1:1, :].to_numpy().tolist()
 
     # Two adjacent rows have a value above the threashold
@@ -156,9 +155,8 @@ def test_filter_slice(config, filter_probs_df):
     mock_control_message = _make_control_message(filter_probs_df, probs)
     output_control_message = fds._controller.filter_slice(mock_control_message)
     assert len(output_control_message) == len(output_multi_response_messages)
-    assert output_control_message[0].payload().get_data().to_numpy().tolist(
-    ) == filter_probs_df.loc[
-        2:3, :]..to_numpy().tolist()
+    assert output_control_message[0].payload().get_data().to_numpy().tolist() == filter_probs_df.loc[
+        2:3, :].to_numpy().tolist()
 
     # Two non-adjacent rows have a value above the threashold
     probs = np.array([

tests/test_add_classifications_stage.py

@@ -24,10 +24,7 @@
 from _utils.dataset_manager import DatasetManager
 from morpheus.config import Config
 from morpheus.messages import ControlMessage
-<<<<<<< HEAD
 from morpheus.messages import TensorMemory
-=======
->>>>>>> 1d02332d6a6fa57a1198565d036ca646b2c6e50e
 from morpheus.messages.message_meta import MessageMeta
 from morpheus.stages.postprocess.add_classifications_stage import AddClassificationsStage