From 152807e47da84866cd1810a3a8b7dd99f0b4c7e7 Mon Sep 17 00:00:00 2001 From: Uma Annamalai Date: Tue, 19 Sep 2023 13:26:37 -0700 Subject: [PATCH] Revert Update all scikitlearn tests with enabled settings override. --- tests/agent_features/conftest.py | 1 + tests/agent_features/test_ml_events.py | 13 +++---------- tests/mlmodel_sklearn/conftest.py | 3 +++ .../mlmodel_sklearn/test_calibration_models.py | 8 -------- tests/mlmodel_sklearn/test_cluster_models.py | 9 --------- tests/mlmodel_sklearn/test_compose_models.py | 8 -------- tests/mlmodel_sklearn/test_covariance_models.py | 8 -------- .../test_cross_decomposition_models.py | 8 -------- .../test_discriminant_analysis_models.py | 8 -------- tests/mlmodel_sklearn/test_dummy_models.py | 8 -------- tests/mlmodel_sklearn/test_ensemble_models.py | 12 +----------- .../test_feature_selection_models.py | 10 ---------- .../test_gaussian_process_models.py | 9 --------- tests/mlmodel_sklearn/test_inference_events.py | 13 ------------- .../mlmodel_sklearn/test_kernel_ridge_models.py | 9 --------- tests/mlmodel_sklearn/test_linear_models.py | 10 ---------- tests/mlmodel_sklearn/test_metric_scorers.py | 17 +---------------- tests/mlmodel_sklearn/test_mixture_models.py | 8 -------- tests/mlmodel_sklearn/test_ml_model.py | 17 +---------------- .../test_model_selection_models.py | 9 --------- tests/mlmodel_sklearn/test_multiclass_models.py | 9 --------- .../mlmodel_sklearn/test_multioutput_models.py | 9 --------- .../mlmodel_sklearn/test_naive_bayes_models.py | 9 --------- tests/mlmodel_sklearn/test_neighbors_models.py | 9 --------- .../test_neural_network_models.py | 8 -------- tests/mlmodel_sklearn/test_pipeline_models.py | 8 -------- tests/mlmodel_sklearn/test_prediction_stats.py | 9 --------- .../test_semi_supervised_models.py | 9 --------- tests/mlmodel_sklearn/test_svm_models.py | 8 -------- tests/mlmodel_sklearn/test_tree_models.py | 9 --------- 30 files changed, 10 insertions(+), 265 deletions(-) diff --git a/tests/agent_features/conftest.py b/tests/agent_features/conftest.py index 57263238be..bd6aa6c2ab 100644 --- a/tests/agent_features/conftest.py +++ b/tests/agent_features/conftest.py @@ -30,6 +30,7 @@ "debug.record_transaction_failure": True, "debug.log_autorum_middleware": True, "agent_limits.errors_per_harvest": 100, + "ml_insights_events.enabled": True } collector_agent_registration = collector_agent_registration_fixture( diff --git a/tests/agent_features/test_ml_events.py b/tests/agent_features/test_ml_events.py index 5c5ae2fcc2..5720224bbe 100644 --- a/tests/agent_features/test_ml_events.py +++ b/tests/agent_features/test_ml_events.py @@ -57,7 +57,6 @@ def core_app(collector_agent_registration): return app._agent.application(app.name) -@override_application_settings({"ml_insights_events.enabled": True}) @validate_ml_event_payload( [{"foo": "bar", "real_agent_id": "1234567", "event.domain": "newrelic.ml_events", "event.name": "InferenceEvent"}] ) @@ -71,7 +70,6 @@ def _test(): core_app.harvest() -@override_application_settings({"ml_insights_events.enabled": True}) @validate_ml_event_payload( [{"foo": "bar", "real_agent_id": "1234567", "event.domain": "newrelic.ml_events", "event.name": "InferenceEvent"}] ) @@ -85,7 +83,6 @@ def _test(): core_app.harvest() -@override_application_settings({"ml_insights_events.enabled": True}) @pytest.mark.parametrize( "params,expected", [ @@ -105,7 +102,6 @@ def _test(): _test() -@override_application_settings({"ml_insights_events.enabled": True}) @pytest.mark.parametrize( "params,expected", [ @@ -125,7 +121,6 @@ def _test(): _test() -@override_application_settings({"ml_insights_events.enabled": True}) @reset_core_stats_engine() @validate_ml_event_count(count=0) @background_task() @@ -133,7 +128,6 @@ def test_record_ml_event_inside_transaction_bad_event_type(): record_ml_event("!@#$%^&*()", {"foo": "bar"}) -@override_application_settings({"ml_insights_events.enabled": True}) @reset_core_stats_engine() @validate_ml_event_count(count=0) def test_record_ml_event_outside_transaction_bad_event_type(): @@ -141,7 +135,6 @@ def test_record_ml_event_outside_transaction_bad_event_type(): record_ml_event("!@#$%^&*()", {"foo": "bar"}, application=app) -@override_application_settings({"ml_insights_events.enabled": True}) @reset_core_stats_engine() @validate_ml_event_count(count=0) @background_task() @@ -149,7 +142,6 @@ def test_record_ml_event_inside_transaction_params_not_a_dict(): record_ml_event("ParamsListEvent", ["not", "a", "dict"]) -@override_application_settings({"ml_insights_events.enabled": True}) @reset_core_stats_engine() @validate_ml_event_count(count=0) def test_record_ml_event_outside_transaction_params_not_a_dict(): @@ -159,7 +151,7 @@ def test_record_ml_event_outside_transaction_params_not_a_dict(): # Tests for ML Events configuration settings - +@override_application_settings({"ml_insights_events.enabled": False}) @reset_core_stats_engine() @validate_ml_event_count(count=0) @background_task() @@ -174,6 +166,7 @@ def test_ml_event_settings_check_ml_insights_disabled(): # event_type and attribute processing. +@override_application_settings({"ml_insights_events.enabled": False}) @reset_core_stats_engine() @function_not_called("newrelic.api.transaction", "create_custom_event") @background_task() @@ -181,6 +174,7 @@ def test_transaction_create_ml_event_not_called(): record_ml_event("FooEvent", {"foo": "bar"}) +@override_application_settings({"ml_insights_events.enabled": False}) @reset_core_stats_engine() @function_not_called("newrelic.core.application", "create_custom_event") @background_task() @@ -189,7 +183,6 @@ def test_application_create_ml_event_not_called(): record_ml_event("FooEvent", {"foo": "bar"}, application=app) -@override_application_settings({"ml_insights_events.enabled": True}) @pytest.fixture(scope="module", autouse=True, params=["protobuf", "json"]) def otlp_content_encoding(request): if six.PY2 and request.param == "protobuf": diff --git a/tests/mlmodel_sklearn/conftest.py b/tests/mlmodel_sklearn/conftest.py index 86884320f5..d91eb549a0 100644 --- a/tests/mlmodel_sklearn/conftest.py +++ b/tests/mlmodel_sklearn/conftest.py @@ -23,6 +23,9 @@ "transaction_tracer.stack_trace_threshold": 0.0, "debug.log_data_collector_payloads": True, "debug.record_transaction_failure": True, + "machine_learning.enabled": True, + "machine_learning.inference_events_value.enabled": True, + "ml_insights_events.enabled": True } collector_agent_registration = collector_agent_registration_fixture( app_name="Python Agent Test (mlmodel_sklearn)", diff --git a/tests/mlmodel_sklearn/test_calibration_models.py b/tests/mlmodel_sklearn/test_calibration_models.py index b08be8ad86..39ac34cb23 100644 --- a/tests/mlmodel_sklearn/test_calibration_models.py +++ b/tests/mlmodel_sklearn/test_calibration_models.py @@ -13,7 +13,6 @@ # limitations under the License. import pytest -from testing_support.fixtures import override_application_settings from testing_support.validators.validate_transaction_metrics import ( validate_transaction_metrics, ) @@ -21,14 +20,7 @@ from newrelic.api.background_task import background_task from newrelic.packages import six -enabled_settings = { - "machine_learning.enabled": True, - "machine_learning.inference_events_value.enabled": True, - "ml_insights_events.enabled": True -} - -@override_application_settings(enabled_settings) def test_model_methods_wrapped_in_function_trace(calibration_model_name, run_calibration_model): expected_scoped_metrics = { "CalibratedClassifierCV": [ diff --git a/tests/mlmodel_sklearn/test_cluster_models.py b/tests/mlmodel_sklearn/test_cluster_models.py index 2c96c8ebee..906995c222 100644 --- a/tests/mlmodel_sklearn/test_cluster_models.py +++ b/tests/mlmodel_sklearn/test_cluster_models.py @@ -14,7 +14,6 @@ import pytest from sklearn import __version__ # noqa: this is needed for get_package_version -from testing_support.fixtures import override_application_settings from testing_support.validators.validate_transaction_metrics import ( validate_transaction_metrics, ) @@ -25,14 +24,7 @@ SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split("."))) -enabled_settings = { - "machine_learning.enabled": True, - "machine_learning.inference_events_value.enabled": True, - "ml_insights_events.enabled": True -} - -@override_application_settings(enabled_settings) @pytest.mark.parametrize( "cluster_model_name", [ @@ -123,7 +115,6 @@ def _test(): _test() -@override_application_settings(enabled_settings) @pytest.mark.skipif(SKLEARN_VERSION < (1, 1, 0), reason="Requires sklearn > 1.1") @pytest.mark.parametrize( "cluster_model_name", diff --git a/tests/mlmodel_sklearn/test_compose_models.py b/tests/mlmodel_sklearn/test_compose_models.py index 4e40a037d2..eab076fc3c 100644 --- a/tests/mlmodel_sklearn/test_compose_models.py +++ b/tests/mlmodel_sklearn/test_compose_models.py @@ -15,7 +15,6 @@ import pytest from sklearn.linear_model import LinearRegression from sklearn.preprocessing import Normalizer -from testing_support.fixtures import override_application_settings from testing_support.validators.validate_transaction_metrics import ( validate_transaction_metrics, ) @@ -23,14 +22,7 @@ from newrelic.api.background_task import background_task from newrelic.packages import six -enabled_settings = { - "machine_learning.enabled": True, - "machine_learning.inference_events_value.enabled": True, - "ml_insights_events.enabled": True -} - -@override_application_settings(enabled_settings) @pytest.mark.parametrize( "compose_model_name", [ diff --git a/tests/mlmodel_sklearn/test_covariance_models.py b/tests/mlmodel_sklearn/test_covariance_models.py index 9c3f241355..afa5c31c20 100644 --- a/tests/mlmodel_sklearn/test_covariance_models.py +++ b/tests/mlmodel_sklearn/test_covariance_models.py @@ -13,7 +13,6 @@ # limitations under the License. import pytest -from testing_support.fixtures import override_application_settings from testing_support.validators.validate_transaction_metrics import ( validate_transaction_metrics, ) @@ -21,14 +20,7 @@ from newrelic.api.background_task import background_task from newrelic.packages import six -enabled_settings = { - "machine_learning.enabled": True, - "machine_learning.inference_events_value.enabled": True, - "ml_insights_events.enabled": True -} - -@override_application_settings(enabled_settings) @pytest.mark.parametrize( "covariance_model_name", [ diff --git a/tests/mlmodel_sklearn/test_cross_decomposition_models.py b/tests/mlmodel_sklearn/test_cross_decomposition_models.py index b351ddbab1..6a053350f7 100644 --- a/tests/mlmodel_sklearn/test_cross_decomposition_models.py +++ b/tests/mlmodel_sklearn/test_cross_decomposition_models.py @@ -13,7 +13,6 @@ # limitations under the License. import pytest -from testing_support.fixtures import override_application_settings from testing_support.validators.validate_transaction_metrics import ( validate_transaction_metrics, ) @@ -21,14 +20,7 @@ from newrelic.api.background_task import background_task from newrelic.packages import six -enabled_settings = { - "machine_learning.enabled": True, - "machine_learning.inference_events_value.enabled": True, - "ml_insights_events.enabled": True -} - -@override_application_settings(enabled_settings) @pytest.mark.parametrize( "cross_decomposition_model_name", [ diff --git a/tests/mlmodel_sklearn/test_discriminant_analysis_models.py b/tests/mlmodel_sklearn/test_discriminant_analysis_models.py index 0ba92fce96..de11826962 100644 --- a/tests/mlmodel_sklearn/test_discriminant_analysis_models.py +++ b/tests/mlmodel_sklearn/test_discriminant_analysis_models.py @@ -13,7 +13,6 @@ # limitations under the License. import pytest -from testing_support.fixtures import override_application_settings from testing_support.validators.validate_transaction_metrics import ( validate_transaction_metrics, ) @@ -21,14 +20,7 @@ from newrelic.api.background_task import background_task from newrelic.packages import six -enabled_settings = { - "machine_learning.enabled": True, - "machine_learning.inference_events_value.enabled": True, - "ml_insights_events.enabled": True -} - -@override_application_settings(enabled_settings) @pytest.mark.parametrize( "discriminant_analysis_model_name", [ diff --git a/tests/mlmodel_sklearn/test_dummy_models.py b/tests/mlmodel_sklearn/test_dummy_models.py index ba6b9f916d..d1059add13 100644 --- a/tests/mlmodel_sklearn/test_dummy_models.py +++ b/tests/mlmodel_sklearn/test_dummy_models.py @@ -14,7 +14,6 @@ import pytest from sklearn import __init__ # noqa: needed for get_package_version -from testing_support.fixtures import override_application_settings from testing_support.validators.validate_transaction_metrics import ( validate_transaction_metrics, ) @@ -25,14 +24,7 @@ SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split("."))) -enabled_settings = { - "machine_learning.enabled": True, - "machine_learning.inference_events_value.enabled": True, - "ml_insights_events.enabled": True -} - -@override_application_settings(enabled_settings) @pytest.mark.parametrize( "dummy_model_name", [ diff --git a/tests/mlmodel_sklearn/test_ensemble_models.py b/tests/mlmodel_sklearn/test_ensemble_models.py index 580a905055..37b4ab362a 100644 --- a/tests/mlmodel_sklearn/test_ensemble_models.py +++ b/tests/mlmodel_sklearn/test_ensemble_models.py @@ -14,7 +14,6 @@ import pytest from sklearn.ensemble import RandomForestClassifier, RandomForestRegressor -from testing_support.fixtures import override_application_settings from testing_support.validators.validate_transaction_metrics import ( validate_transaction_metrics, ) @@ -25,14 +24,6 @@ SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split("."))) -enabled_settings = { - "machine_learning.enabled": True, - "machine_learning.inference_events_value.enabled": True, - "ml_insights_events.enabled": True -} - - -@override_application_settings(enabled_settings) @pytest.mark.parametrize( "ensemble_model_name", [ @@ -149,7 +140,6 @@ def _test(): _test() -@override_application_settings(enabled_settings) @pytest.mark.skipif(SKLEARN_VERSION < (1, 0, 0) or SKLEARN_VERSION >= (1, 1, 0), reason="Requires 1.0 <= sklearn < 1.1") @pytest.mark.parametrize( "ensemble_model_name", @@ -206,7 +196,7 @@ def _test(): _test() -@override_application_settings(enabled_settings) + @pytest.mark.skipif(SKLEARN_VERSION < (1, 1, 0), reason="Requires sklearn >= 1.1") @pytest.mark.parametrize( "ensemble_model_name", diff --git a/tests/mlmodel_sklearn/test_feature_selection_models.py b/tests/mlmodel_sklearn/test_feature_selection_models.py index abc0fcd601..dd8fe360dc 100644 --- a/tests/mlmodel_sklearn/test_feature_selection_models.py +++ b/tests/mlmodel_sklearn/test_feature_selection_models.py @@ -14,7 +14,6 @@ import pytest from sklearn.ensemble import AdaBoostClassifier -from testing_support.fixtures import override_application_settings from testing_support.validators.validate_transaction_metrics import ( validate_transaction_metrics, ) @@ -25,14 +24,6 @@ SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split("."))) -enabled_settings = { - "machine_learning.enabled": True, - "machine_learning.inference_events_value.enabled": True, - "ml_insights_events.enabled": True -} - - -@override_application_settings(enabled_settings) @pytest.mark.parametrize( "feature_selection_model_name", [ @@ -81,7 +72,6 @@ def _test(): _test() -@override_application_settings(enabled_settings) @pytest.mark.skipif(SKLEARN_VERSION < (1, 0, 0), reason="Requires sklearn >= 1.0") @pytest.mark.parametrize( "feature_selection_model_name", diff --git a/tests/mlmodel_sklearn/test_gaussian_process_models.py b/tests/mlmodel_sklearn/test_gaussian_process_models.py index 4c47dc2a7d..1649360a12 100644 --- a/tests/mlmodel_sklearn/test_gaussian_process_models.py +++ b/tests/mlmodel_sklearn/test_gaussian_process_models.py @@ -13,7 +13,6 @@ # limitations under the License. import pytest -from testing_support.fixtures import override_application_settings from testing_support.validators.validate_transaction_metrics import ( validate_transaction_metrics, ) @@ -21,14 +20,6 @@ from newrelic.api.background_task import background_task from newrelic.packages import six -enabled_settings = { - "machine_learning.enabled": True, - "machine_learning.inference_events_value.enabled": True, - "ml_insights_events.enabled": True -} - - -@override_application_settings(enabled_settings) @pytest.mark.parametrize( "gaussian_process_model_name", [ diff --git a/tests/mlmodel_sklearn/test_inference_events.py b/tests/mlmodel_sklearn/test_inference_events.py index ee3c328db3..0a3677019b 100644 --- a/tests/mlmodel_sklearn/test_inference_events.py +++ b/tests/mlmodel_sklearn/test_inference_events.py @@ -42,14 +42,7 @@ ), ] -enabled_settings = { - "machine_learning.enabled": True, - "machine_learning.inference_events_value.enabled": True, - "ml_insights_events.enabled": True -} - -@override_application_settings(enabled_settings) @reset_core_stats_engine() def test_pandas_df_categorical_feature_event(): @validate_ml_events(pandas_df_category_recorded_custom_events) @@ -90,7 +83,6 @@ def _test(): ] -@override_application_settings(enabled_settings) @reset_core_stats_engine() def test_pandas_df_bool_feature_event(): @validate_ml_events(pandas_df_bool_recorded_custom_events) @@ -130,7 +122,6 @@ def _test(): ] -@override_application_settings(enabled_settings) @reset_core_stats_engine() def test_pandas_df_float_feature_event(): @validate_ml_events(pandas_df_float_recorded_custom_events) @@ -170,7 +161,6 @@ def _test(): ] -@override_application_settings(enabled_settings) @reset_core_stats_engine() def test_int_list(): @validate_ml_events(int_list_recorded_custom_events) @@ -209,7 +199,6 @@ def _test(): ] -@override_application_settings(enabled_settings) @reset_core_stats_engine() def test_numpy_int_array(): @validate_ml_events(numpy_int_recorded_custom_events) @@ -261,7 +250,6 @@ def _test(): ] -@override_application_settings(enabled_settings) @reset_core_stats_engine() def test_numpy_str_array_multiple_features(): @validate_ml_events(numpy_str_recorded_custom_events) @@ -424,7 +412,6 @@ def _test(): ] -@override_application_settings(enabled_settings) @reset_core_stats_engine() def test_custom_event_count_multilabel_output(): @validate_ml_events(multilabel_output_label_events) diff --git a/tests/mlmodel_sklearn/test_kernel_ridge_models.py b/tests/mlmodel_sklearn/test_kernel_ridge_models.py index 8b7f9178da..95e999601f 100644 --- a/tests/mlmodel_sklearn/test_kernel_ridge_models.py +++ b/tests/mlmodel_sklearn/test_kernel_ridge_models.py @@ -13,7 +13,6 @@ # limitations under the License. import pytest -from testing_support.fixtures import override_application_settings from testing_support.validators.validate_transaction_metrics import ( validate_transaction_metrics, ) @@ -21,14 +20,6 @@ from newrelic.api.background_task import background_task from newrelic.packages import six -enabled_settings = { - "machine_learning.enabled": True, - "machine_learning.inference_events_value.enabled": True, - "ml_insights_events.enabled": True -} - - -@override_application_settings(enabled_settings) @pytest.mark.parametrize( "kernel_ridge_model_name", [ diff --git a/tests/mlmodel_sklearn/test_linear_models.py b/tests/mlmodel_sklearn/test_linear_models.py index cb8ec30b0d..c44ac141d7 100644 --- a/tests/mlmodel_sklearn/test_linear_models.py +++ b/tests/mlmodel_sklearn/test_linear_models.py @@ -13,7 +13,6 @@ # limitations under the License. import pytest -from testing_support.fixtures import override_application_settings from testing_support.validators.validate_transaction_metrics import ( validate_transaction_metrics, ) @@ -24,14 +23,6 @@ SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split("."))) -enabled_settings = { - "machine_learning.enabled": True, - "machine_learning.inference_events_value.enabled": True, - "ml_insights_events.enabled": True -} - - -@override_application_settings(enabled_settings) @pytest.mark.parametrize( "linear_model_name", [ @@ -237,7 +228,6 @@ def _test(): _test() -@override_application_settings(enabled_settings) @pytest.mark.skipif(SKLEARN_VERSION < (1, 1, 0), reason="Requires sklearn >= v1.1") @pytest.mark.parametrize( "linear_model_name", diff --git a/tests/mlmodel_sklearn/test_metric_scorers.py b/tests/mlmodel_sklearn/test_metric_scorers.py index bda87df4ff..f53b57fe07 100644 --- a/tests/mlmodel_sklearn/test_metric_scorers.py +++ b/tests/mlmodel_sklearn/test_metric_scorers.py @@ -14,22 +14,11 @@ import numpy as np import pytest -from testing_support.fixtures import ( - validate_attributes, - override_application_settings -) +from testing_support.fixtures import validate_attributes from newrelic.api.background_task import background_task from newrelic.hooks.mlmodel_sklearn import PredictReturnTypeProxy -enabled_settings = { - "machine_learning.enabled": True, - "machine_learning.inference_events_value.enabled": True, - "ml_insights_events.enabled": True -} - - -@override_application_settings(enabled_settings) @pytest.mark.parametrize( "metric_scorer_name", ( @@ -51,7 +40,6 @@ def _test(): _test() -@override_application_settings(enabled_settings) @pytest.mark.parametrize( "metric_scorer_name", ( @@ -79,7 +67,6 @@ def _test(): _test() -@override_application_settings(enabled_settings) @pytest.mark.parametrize( "metric_scorer_name,kwargs", [ @@ -103,7 +90,6 @@ def _test(): _test() -@override_application_settings(enabled_settings) @pytest.mark.parametrize( "metric_scorer_name", [ @@ -130,7 +116,6 @@ def _test(): _test() -@override_application_settings(enabled_settings) @pytest.mark.parametrize("data", (np.array([0, 1]), "foo", 1, 1.0, True, [0, 1], {"foo": "bar"}, (0, 1), np.str_("F"))) def test_PredictReturnTypeProxy(data): wrapped_data = PredictReturnTypeProxy(data, "ModelName", 0) diff --git a/tests/mlmodel_sklearn/test_mixture_models.py b/tests/mlmodel_sklearn/test_mixture_models.py index 9e55fdb0c6..7ef8381265 100644 --- a/tests/mlmodel_sklearn/test_mixture_models.py +++ b/tests/mlmodel_sklearn/test_mixture_models.py @@ -13,7 +13,6 @@ # limitations under the License. import pytest -from testing_support.fixtures import override_application_settings from testing_support.validators.validate_transaction_metrics import ( validate_transaction_metrics, ) @@ -21,14 +20,7 @@ from newrelic.api.background_task import background_task from newrelic.packages import six -enabled_settings = { - "machine_learning.enabled": True, - "machine_learning.inference_events_value.enabled": True, - "ml_insights_events.enabled": True -} - -@override_application_settings(enabled_settings) @pytest.mark.parametrize( "mixture_model_name", [ diff --git a/tests/mlmodel_sklearn/test_ml_model.py b/tests/mlmodel_sklearn/test_ml_model.py index 4c8e418206..e9170a9c3d 100644 --- a/tests/mlmodel_sklearn/test_ml_model.py +++ b/tests/mlmodel_sklearn/test_ml_model.py @@ -15,10 +15,7 @@ import logging import pandas -from testing_support.fixtures import ( - override_application_settings, - reset_core_stats_engine -) +from testing_support.fixtures import reset_core_stats_engine from testing_support.validators.validate_ml_event_count import validate_ml_event_count from testing_support.validators.validate_ml_events import validate_ml_events @@ -101,14 +98,7 @@ def predict(self, X, check_input=True): ), ] -enabled_settings = { - "machine_learning.enabled": True, - "machine_learning.inference_events_value.enabled": True, - "ml_insights_events.enabled": True -} - -@override_application_settings(enabled_settings) @reset_core_stats_engine() def test_custom_model_int_list_no_features_and_labels(): @validate_ml_event_count(count=1) @@ -147,7 +137,6 @@ def _test(): ), ] -@override_application_settings(enabled_settings) @reset_core_stats_engine() def test_custom_model_int_list_with_metadata(): @validate_ml_event_count(count=1) @@ -191,7 +180,6 @@ def _test(): ] -@override_application_settings(enabled_settings) @reset_core_stats_engine() def test_wrapper_attrs_custom_model_pandas_df(): @validate_ml_event_count(count=1) @@ -233,7 +221,6 @@ def _test(): ] -@override_application_settings(enabled_settings) @reset_core_stats_engine() def test_wrapper_attrs_builtin_model(): @validate_ml_event_count(count=1) @@ -281,7 +268,6 @@ def _test(): ] -@override_application_settings(enabled_settings) @reset_core_stats_engine() def test_wrapper_mismatched_features_and_labels_df(): @validate_ml_event_count(count=1) @@ -327,7 +313,6 @@ def _test(): ] -@override_application_settings(enabled_settings) @reset_core_stats_engine() def test_wrapper_mismatched_features_and_labels_np_array(): @validate_ml_events(numpy_str_mismatched_custom_events) diff --git a/tests/mlmodel_sklearn/test_model_selection_models.py b/tests/mlmodel_sklearn/test_model_selection_models.py index 357e83574d..e209705162 100644 --- a/tests/mlmodel_sklearn/test_model_selection_models.py +++ b/tests/mlmodel_sklearn/test_model_selection_models.py @@ -14,7 +14,6 @@ import pytest from sklearn.ensemble import AdaBoostClassifier -from testing_support.fixtures import override_application_settings from testing_support.validators.validate_transaction_metrics import ( validate_transaction_metrics, ) @@ -22,14 +21,6 @@ from newrelic.api.background_task import background_task from newrelic.packages import six -enabled_settings = { - "machine_learning.enabled": True, - "machine_learning.inference_events_value.enabled": True, - "ml_insights_events.enabled": True -} - - -@override_application_settings(enabled_settings) @pytest.mark.parametrize( "model_selection_model_name", [ diff --git a/tests/mlmodel_sklearn/test_multiclass_models.py b/tests/mlmodel_sklearn/test_multiclass_models.py index d5b2d2f5a7..e6273e29a3 100644 --- a/tests/mlmodel_sklearn/test_multiclass_models.py +++ b/tests/mlmodel_sklearn/test_multiclass_models.py @@ -14,7 +14,6 @@ import pytest from sklearn.ensemble import AdaBoostClassifier -from testing_support.fixtures import override_application_settings from testing_support.validators.validate_transaction_metrics import ( validate_transaction_metrics, ) @@ -22,14 +21,6 @@ from newrelic.api.background_task import background_task from newrelic.packages import six -enabled_settings = { - "machine_learning.enabled": True, - "machine_learning.inference_events_value.enabled": True, - "ml_insights_events.enabled": True -} - - -@override_application_settings(enabled_settings) @pytest.mark.parametrize( "multiclass_model_name", [ diff --git a/tests/mlmodel_sklearn/test_multioutput_models.py b/tests/mlmodel_sklearn/test_multioutput_models.py index 45796acad2..392328f281 100644 --- a/tests/mlmodel_sklearn/test_multioutput_models.py +++ b/tests/mlmodel_sklearn/test_multioutput_models.py @@ -15,7 +15,6 @@ import pytest from sklearn import __init__ # noqa: Needed for get_package_version from sklearn.ensemble import AdaBoostClassifier -from testing_support.fixtures import override_application_settings from testing_support.validators.validate_transaction_metrics import ( validate_transaction_metrics, ) @@ -26,14 +25,7 @@ SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split("."))) -enabled_settings = { - "machine_learning.enabled": True, - "machine_learning.inference_events_value.enabled": True, - "ml_insights_events.enabled": True -} - -@override_application_settings(enabled_settings) # Python 2 will not allow instantiation of abstract class # (abstract method is __init__ here) @pytest.mark.skipif(SKLEARN_VERSION >= (1, 0, 0) or six.PY2, reason="Requires sklearn < 1.0 and Python3") @@ -69,7 +61,6 @@ def _test(): _test() -@override_application_settings(enabled_settings) @pytest.mark.parametrize( "multioutput_model_name", [ diff --git a/tests/mlmodel_sklearn/test_naive_bayes_models.py b/tests/mlmodel_sklearn/test_naive_bayes_models.py index e3f36f4f6d..22dc6db1b4 100644 --- a/tests/mlmodel_sklearn/test_naive_bayes_models.py +++ b/tests/mlmodel_sklearn/test_naive_bayes_models.py @@ -14,7 +14,6 @@ import pytest from sklearn import __init__ # noqa: needed for get_package_version -from testing_support.fixtures import override_application_settings from testing_support.validators.validate_transaction_metrics import ( validate_transaction_metrics, ) @@ -25,14 +24,7 @@ SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split("."))) -enabled_settings = { - "machine_learning.enabled": True, - "machine_learning.inference_events_value.enabled": True, - "ml_insights_events.enabled": True -} - -@override_application_settings(enabled_settings) @pytest.mark.skipif(SKLEARN_VERSION < (1, 0, 0), reason="Requires sklearn >= 1.0") @pytest.mark.parametrize( "naive_bayes_model_name", @@ -68,7 +60,6 @@ def _test(): _test() -@override_application_settings(enabled_settings) @pytest.mark.parametrize( "naive_bayes_model_name", [ diff --git a/tests/mlmodel_sklearn/test_neighbors_models.py b/tests/mlmodel_sklearn/test_neighbors_models.py index a0281d2d70..53a5211571 100644 --- a/tests/mlmodel_sklearn/test_neighbors_models.py +++ b/tests/mlmodel_sklearn/test_neighbors_models.py @@ -14,7 +14,6 @@ import pytest from sklearn.neighbors import __init__ # noqa: Needed for get_package_version -from testing_support.fixtures import override_application_settings from testing_support.validators.validate_transaction_metrics import ( validate_transaction_metrics, ) @@ -25,14 +24,7 @@ SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split("."))) -enabled_settings = { - "machine_learning.enabled": True, - "machine_learning.inference_events_value.enabled": True, - "ml_insights_events.enabled": True -} - -@override_application_settings(enabled_settings) @pytest.mark.parametrize( "neighbors_model_name", [ @@ -101,7 +93,6 @@ def _test(): _test() -@override_application_settings(enabled_settings) @pytest.mark.skipif(SKLEARN_VERSION < (1, 0, 0), reason="Requires sklearn >= 1.0") @pytest.mark.parametrize( "neighbors_model_name", diff --git a/tests/mlmodel_sklearn/test_neural_network_models.py b/tests/mlmodel_sklearn/test_neural_network_models.py index 4398d46a57..468bfb4b9d 100644 --- a/tests/mlmodel_sklearn/test_neural_network_models.py +++ b/tests/mlmodel_sklearn/test_neural_network_models.py @@ -13,7 +13,6 @@ # limitations under the License. import pytest -from testing_support.fixtures import override_application_settings from testing_support.validators.validate_transaction_metrics import ( validate_transaction_metrics, ) @@ -24,14 +23,7 @@ SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split("."))) -enabled_settings = { - "machine_learning.enabled": True, - "machine_learning.inference_events_value.enabled": True, - "ml_insights_events.enabled": True -} - -@override_application_settings(enabled_settings) @pytest.mark.parametrize( "neural_network_model_name", [ diff --git a/tests/mlmodel_sklearn/test_pipeline_models.py b/tests/mlmodel_sklearn/test_pipeline_models.py index c69708445b..ac9b918f4f 100644 --- a/tests/mlmodel_sklearn/test_pipeline_models.py +++ b/tests/mlmodel_sklearn/test_pipeline_models.py @@ -16,7 +16,6 @@ from sklearn.decomposition import TruncatedSVD from sklearn.preprocessing import StandardScaler from sklearn.svm import SVC -from testing_support.fixtures import override_application_settings from testing_support.validators.validate_transaction_metrics import ( validate_transaction_metrics, ) @@ -27,14 +26,7 @@ SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split("."))) -enabled_settings = { - "machine_learning.enabled": True, - "machine_learning.inference_events_value.enabled": True, - "ml_insights_events.enabled": True -} - -@override_application_settings(enabled_settings) @pytest.mark.parametrize( "pipeline_model_name", [ diff --git a/tests/mlmodel_sklearn/test_prediction_stats.py b/tests/mlmodel_sklearn/test_prediction_stats.py index 1f978093bc..5538119e7e 100644 --- a/tests/mlmodel_sklearn/test_prediction_stats.py +++ b/tests/mlmodel_sklearn/test_prediction_stats.py @@ -17,7 +17,6 @@ import numpy as np import pandas as pd import pytest -from testing_support.fixtures import override_application_settings from testing_support.validators.validate_transaction_metrics import ( validate_transaction_metrics, ) @@ -37,14 +36,7 @@ def force_uuid(monkeypatch): {("modelName", "DummyClassifier"), ("prediction_id", ML_METRIC_FORCED_UUID), ("model_version", "0.0.0")} ) -enabled_settings = { - "machine_learning.enabled": True, - "machine_learning.inference_events_value.enabled": True, - "ml_insights_events.enabled": True -} - -@override_application_settings(enabled_settings) @pytest.mark.parametrize( "x_train,y_train,x_test,metrics", [ @@ -472,7 +464,6 @@ def _test(): ) -@override_application_settings(enabled_settings) def test_prediction_stats_multilabel_output(force_uuid): expected_transaction_name = "test_prediction_stats:test_prediction_stats_multilabel_output.._test" stats = ["Mean", "Percentile25", "Percentile50", "Percentile75", "StandardDeviation", "Min", "Max", "Count"] diff --git a/tests/mlmodel_sklearn/test_semi_supervised_models.py b/tests/mlmodel_sklearn/test_semi_supervised_models.py index 9a28fa5986..f4069f75bd 100644 --- a/tests/mlmodel_sklearn/test_semi_supervised_models.py +++ b/tests/mlmodel_sklearn/test_semi_supervised_models.py @@ -14,7 +14,6 @@ import pytest from sklearn.ensemble import AdaBoostClassifier -from testing_support.fixtures import override_application_settings from testing_support.validators.validate_transaction_metrics import ( validate_transaction_metrics, ) @@ -25,14 +24,7 @@ SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split("."))) -enabled_settings = { - "machine_learning.enabled": True, - "machine_learning.inference_events_value.enabled": True, - "ml_insights_events.enabled": True -} - -@override_application_settings(enabled_settings) @pytest.mark.parametrize( "semi_supervised_model_name", [ @@ -73,7 +65,6 @@ def _test(): _test() -@override_application_settings(enabled_settings) @pytest.mark.skipif(SKLEARN_VERSION < (1, 0, 0), reason="Requires sklearn <= 1.0") @pytest.mark.parametrize( "semi_supervised_model_name", diff --git a/tests/mlmodel_sklearn/test_svm_models.py b/tests/mlmodel_sklearn/test_svm_models.py index 42498130e4..fe95f2f465 100644 --- a/tests/mlmodel_sklearn/test_svm_models.py +++ b/tests/mlmodel_sklearn/test_svm_models.py @@ -13,7 +13,6 @@ # limitations under the License. import pytest -from testing_support.fixtures import override_application_settings from testing_support.validators.validate_transaction_metrics import ( validate_transaction_metrics, ) @@ -24,14 +23,7 @@ SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split("."))) -enabled_settings = { - "machine_learning.enabled": True, - "machine_learning.inference_events_value.enabled": True, - "ml_insights_events.enabled": True -} - -@override_application_settings(enabled_settings) @pytest.mark.parametrize( "svm_model_name", [ diff --git a/tests/mlmodel_sklearn/test_tree_models.py b/tests/mlmodel_sklearn/test_tree_models.py index 94c6c496ec..b30b7e2eac 100644 --- a/tests/mlmodel_sklearn/test_tree_models.py +++ b/tests/mlmodel_sklearn/test_tree_models.py @@ -13,7 +13,6 @@ # limitations under the License. import pytest -from testing_support.fixtures import override_application_settings from testing_support.validators.validate_transaction_metrics import ( validate_transaction_metrics, ) @@ -21,12 +20,6 @@ from newrelic.api.background_task import background_task from newrelic.packages import six -enabled_settings = { - "machine_learning.enabled": True, - "machine_learning.inference_events_value.enabled": True, - "ml_insights_events.enabled": True -} - def test_model_methods_wrapped_in_function_trace(tree_model_name, run_tree_model): # Note: in the following expected metrics, predict and predict_proba are called by @@ -64,7 +57,6 @@ def test_model_methods_wrapped_in_function_trace(tree_model_name, run_tree_model else "test_tree_models:_test" ) - @override_application_settings(enabled_settings) @validate_transaction_metrics( expected_transaction_name, scoped_metrics=expected_scoped_metrics[tree_model_name], @@ -112,7 +104,6 @@ def test_multiple_calls_to_model_methods(tree_model_name, run_tree_model): "test_tree_models:test_multiple_calls_to_model_methods.._test" if six.PY3 else "test_tree_models:_test" ) - @override_application_settings(enabled_settings) @validate_transaction_metrics( expected_transaction_name, scoped_metrics=expected_scoped_metrics[tree_model_name],