From f8d1b6463a8a7695c07d12a55282ace52aeba3fa Mon Sep 17 00:00:00 2001 From: Anuradha Karuppiah Date: Mon, 14 Oct 2024 18:12:30 +0000 Subject: [PATCH 1/2] Move tests common to python/morpheus Signed-off-by: Anuradha Karuppiah --- tests/{ => morpheus}/common/test_determine_file_type.py | 0 tests/{ => morpheus}/common/test_fiber_queue.py | 0 tests/{ => morpheus}/common/test_http_server.py | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename tests/{ => morpheus}/common/test_determine_file_type.py (100%) rename tests/{ => morpheus}/common/test_fiber_queue.py (100%) rename tests/{ => morpheus}/common/test_http_server.py (100%) diff --git a/tests/common/test_determine_file_type.py b/tests/morpheus/common/test_determine_file_type.py similarity index 100% rename from tests/common/test_determine_file_type.py rename to tests/morpheus/common/test_determine_file_type.py diff --git a/tests/common/test_fiber_queue.py b/tests/morpheus/common/test_fiber_queue.py similarity index 100% rename from tests/common/test_fiber_queue.py rename to tests/morpheus/common/test_fiber_queue.py diff --git a/tests/common/test_http_server.py b/tests/morpheus/common/test_http_server.py similarity index 100% rename from tests/common/test_http_server.py rename to tests/morpheus/common/test_http_server.py From c609a35842f7d2d60d4df296608d088934e94503 Mon Sep 17 00:00:00 2001 From: Anuradha Karuppiah Date: Mon, 14 Oct 2024 18:46:46 +0000 Subject: [PATCH 2/2] Fix CI checks failures Signed-off-by: Anuradha Karuppiah --- examples/ransomware_detection/stages/create_features.py | 5 +++-- examples/ransomware_detection/stages/preprocessing.py | 3 ++- tests/examples/ransomware_detection/test_create_features.py | 3 +-- tests/examples/ransomware_detection/test_preprocessing.py | 3 +-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/ransomware_detection/stages/create_features.py b/examples/ransomware_detection/stages/create_features.py index 6ced675d0f..862747d9a6 100644 --- a/examples/ransomware_detection/stages/create_features.py +++ b/examples/ransomware_detection/stages/create_features.py @@ -19,8 +19,6 @@ from dask.distributed import Client -from common.data_models import FeatureConfig # pylint: disable=no-name-in-module -from common.feature_extractor import FeatureExtractor # pylint: disable=no-name-in-module from morpheus.cli.register_stage import register_stage from morpheus.config import Config from morpheus.config import PipelineModes @@ -28,6 +26,9 @@ from morpheus.pipeline.control_message_stage import ControlMessageStage from morpheus.stages.input.appshield_source_stage import AppShieldMessageMeta +from common.data_models import FeatureConfig # pylint: disable=no-name-in-module # isort: skip +from common.feature_extractor import FeatureExtractor # pylint: disable=no-name-in-module # isort: skip + @register_stage("create-features", modes=[PipelineModes.FIL]) class CreateFeaturesRWStage(ControlMessageStage): diff --git a/examples/ransomware_detection/stages/preprocessing.py b/examples/ransomware_detection/stages/preprocessing.py index ed38b94690..3715f92425 100644 --- a/examples/ransomware_detection/stages/preprocessing.py +++ b/examples/ransomware_detection/stages/preprocessing.py @@ -19,7 +19,6 @@ import pandas as pd import morpheus._lib.messages as _messages -from common.data_models import SnapshotData # pylint: disable=no-name-in-module from morpheus.cli.register_stage import register_stage from morpheus.common import TypeId from morpheus.config import Config @@ -27,6 +26,8 @@ from morpheus.messages import ControlMessage from morpheus.stages.preprocess.preprocess_base_stage import PreprocessBaseStage +from common.data_models import SnapshotData # pylint: disable=no-name-in-module #isort:skip + @register_stage("ransomware-preprocess", modes=[PipelineModes.FIL]) class PreprocessingRWStage(PreprocessBaseStage): diff --git a/tests/examples/ransomware_detection/test_create_features.py b/tests/examples/ransomware_detection/test_create_features.py index 64e1defe98..29c06efdc1 100644 --- a/tests/examples/ransomware_detection/test_create_features.py +++ b/tests/examples/ransomware_detection/test_create_features.py @@ -43,10 +43,9 @@ def test_constructor( rwd_conf: dict, interested_plugins: typing.List[str]): mock_dask_client.return_value = mock_dask_client - from stages.create_features import CreateFeaturesRWStage - from common.data_models import FeatureConfig from common.feature_extractor import FeatureExtractor + from stages.create_features import CreateFeaturesRWStage n_workers = 12 threads_per_worker = 8 diff --git a/tests/examples/ransomware_detection/test_preprocessing.py b/tests/examples/ransomware_detection/test_preprocessing.py index 55f2584146..ad9d3b74eb 100644 --- a/tests/examples/ransomware_detection/test_preprocessing.py +++ b/tests/examples/ransomware_detection/test_preprocessing.py @@ -116,9 +116,8 @@ def test_rollover_pending_snapshots_empty_results(self, assert len(stage._snapshot_dict) == 0 def test_merge_curr_and_prev_snapshots(self, config: Config, rwd_conf: dict, dataset_pandas: DatasetManager): - from stages.preprocessing import PreprocessingRWStage - from common.data_models import SnapshotData + from stages.preprocessing import PreprocessingRWStage snapshot_ids = [5, 8, 10, 13] source_pid_process = "123_test.exe"