diff --git a/fiftyone_devicedetection_onpremise/src/fiftyone_devicedetection_onpremise/constants.py b/fiftyone_devicedetection_onpremise/src/fiftyone_devicedetection_onpremise/constants.py index 704bc80be..6a2fe5fab 100644 --- a/fiftyone_devicedetection_onpremise/src/fiftyone_devicedetection_onpremise/constants.py +++ b/fiftyone_devicedetection_onpremise/src/fiftyone_devicedetection_onpremise/constants.py @@ -36,13 +36,3 @@ 'find a match. This is the number of nodes in the ' 'graph which have been visited.') METHOD_DESCRIPTION = 'The method used to determine the match result.' -HARDCODED_EVIDENCE = { - "GHEV": { - "COOKIE": "cookie.51d_gethighentropyvalues", - "QUERY": "query.51d_gethighentropyvalues", - }, - "SUA": { - "COOKIE": "cookie.51d_structureduseragent", - "QUERY": "query.51d_structureduseragent", - }, -} diff --git a/fiftyone_devicedetection_onpremise/src/fiftyone_devicedetection_onpremise/devicedetection_onpremise.py b/fiftyone_devicedetection_onpremise/src/fiftyone_devicedetection_onpremise/devicedetection_onpremise.py index b4da1ba81..d0dadcb4d 100644 --- a/fiftyone_devicedetection_onpremise/src/fiftyone_devicedetection_onpremise/devicedetection_onpremise.py +++ b/fiftyone_devicedetection_onpremise/src/fiftyone_devicedetection_onpremise/devicedetection_onpremise.py @@ -284,13 +284,6 @@ def init_engine(self): for x in range(evidence_keys.size()): evidence_keys_list.append(evidence_keys.__getitem__(x).lower()) - evidence_keys_list.extend([ - HARDCODED_EVIDENCE["GHEV"]["COOKIE"], - HARDCODED_EVIDENCE["GHEV"]["QUERY"], - HARDCODED_EVIDENCE["SUA"]["COOKIE"], - HARDCODED_EVIDENCE["SUA"]["QUERY"], - ]) - self.evidence_keys_list = evidence_keys_list # Get properties list diff --git a/fiftyone_devicedetection_onpremise/tests/test_devicedetection.py b/fiftyone_devicedetection_onpremise/tests/test_devicedetection.py index eb22b7b5b..252dbd0f2 100644 --- a/fiftyone_devicedetection_onpremise/tests/test_devicedetection.py +++ b/fiftyone_devicedetection_onpremise/tests/test_devicedetection.py @@ -27,8 +27,6 @@ import csv import platform -from fiftyone_devicedetection_onpremise.constants import HARDCODED_EVIDENCE - from fiftyone_devicedetection_onpremise.devicedetection_onpremise_pipelinebuilder import DeviceDetectionOnPremisePipelineBuilder from fiftyone_devicedetection_onpremise.devicedetection_onpremise import DeviceDetectionOnPremise @@ -360,39 +358,6 @@ def test_evidencekey_filter_overrides(self): self.assertTrue(evidence_key_filter.filter_evidence_key( "cookie.51d_profileids")) - def test_evidencekey_filter_hardcoded_keys(self): - """! - Test evidence key filter with hardcoded keys in cookies and query string - """ - - pipeline = DeviceDetectionOnPremisePipelineBuilder( - data_file_path=data_file, usage_sharing=False, licence_keys="").build() - - evidence_key_filter = pipeline.flow_elements[0].get_evidence_key_filter( - ) - self.assertTrue(evidence_key_filter.filter_evidence_key( - HARDCODED_EVIDENCE["GHEV"]["QUERY"])) - self.assertTrue(evidence_key_filter.filter_evidence_key( - HARDCODED_EVIDENCE["GHEV"]["COOKIE"])) - self.assertTrue(evidence_key_filter.filter_evidence_key( - HARDCODED_EVIDENCE["SUA"]["QUERY"])) - self.assertTrue(evidence_key_filter.filter_evidence_key( - HARDCODED_EVIDENCE["SUA"]["COOKIE"])) - - self.assertTrue(evidence_key_filter.filter_evidence_key( - "query.51d_gethighentropyvalues")) - self.assertTrue(evidence_key_filter.filter_evidence_key( - "cookie.51d_gethighentropyvalues")) - self.assertTrue(evidence_key_filter.filter_evidence_key( - "query.51d_structureduseragent")) - self.assertTrue(evidence_key_filter.filter_evidence_key( - "cookie.51d_structureduseragent")) - - self.assertTrue(evidence_key_filter.filter_evidence_key( - "header.user-agent")) - self.assertFalse(evidence_key_filter.filter_evidence_key( - "header.nonexistent")) - def test_profile_overrides(self): """! Test profile overrides