Add policyUUIDs to text scan endpoint

Also rename deprecated config field internally to policy

Author: evanfuller

nightfall/api.py

@@ -84,18 +84,51 @@ def scan_text(self, texts: List[str], detection_rules: Optional[List[DetectionRu
         if not detection_rule_uuids and not detection_rules:
             raise NightfallUserError("at least one of detection_rule_uuids or detection_rules required", 40001)
 
-        config = {}
+        policy = {}
         if detection_rule_uuids:
-            config["detectionRuleUUIDs"] = detection_rule_uuids
+            policy["detectionRuleUUIDs"] = detection_rule_uuids
         if detection_rules:
-            config["detectionRules"] = [d.as_dict() for d in detection_rules]
+            policy["detectionRules"] = [d.as_dict() for d in detection_rules]
         if context_bytes:
-            config["contextBytes"] = context_bytes
+            policy["contextBytes"] = context_bytes
         if default_redaction_config:
-            config["defaultRedactionConfig"] = default_redaction_config.as_dict()
+            policy["defaultRedactionConfig"] = default_redaction_config.as_dict()
         request_body = {
             "payload": texts,
-            "config": config
+            "policy": policy
+        }
+        response = self._scan_text_v3(request_body)
+
+        _validate_response(response, 200)
+
+        parsed_response = response.json()
+
+        findings = [[Finding.from_dict(f) for f in item_findings] for item_findings in parsed_response["findings"]]
+        return findings, parsed_response.get("redactedPayload")
+
+
+    def scan_text_with_policies(self, texts: List[str], policy_uuids: List[str] = None) ->\
+            Tuple[List[List[Finding]], List[str]]:
+        """Scan text with Nightfall.
+
+        This method takes the specified config and then makes
+        one or more requests to the Nightfall API for scanning.
+        The maximum supported length of policy_uuids is currently 1.
+
+        :param texts: List of strings to scan.
+        :type texts: List[str]
+        :param policy_uuids: List of policy UUIDs to scan each text with.
+            These can be created in the Nightfall UI.
+        :type policy_uuids: List[str] or None
+        :returns: list of findings, list of redacted input texts
+        """
+
+        if not policy_uuids:
+            raise NightfallUserError("policy_uuids may not be empty", 40001)
+
+        request_body = {
+            "payload": texts,
+            "policyUUIDs": policy_uuids
         }
         response = self._scan_text_v3(request_body)
 

tests/test_api.py

@@ -224,7 +224,7 @@ def test_scan_text():
             [
                 "4916-6734-7572-5015 is my credit card number, 489-36-8350 ssn"
             ],
-        "config":
+        "policy":
             {
                 "detectionRules":
                     [
@@ -332,6 +332,90 @@ def test_scan_text():
     assert len(redactions) == 1
     assert redactions[0] == "491👀-👀👀👀👀-👀👀👀👀-👀👀👀👀 is my credit card number, [REDACTED] ssn"
 
+@responses.activate
+def test_scan_text_with_policies():
+    nightfall = Nightfall("NF-NOT_REAL")
+    responses.add(responses.POST, 'https://api.nightfall.ai/v3/scan',
+                  json={
+                      "findings":
+                          [
+                              [
+                                  {
+                                      "finding": "4916-6734-7572-5015",
+                                      "redactedFinding": "491👀-👀👀👀👀-👀👀👀👀-👀👀👀👀",
+                                      "afterContext": " is my cre",
+                                      "detector":
+                                          {
+                                              "name": "Credit Card Number",
+                                              "uuid": "74c1815e-c0c3-4df5-8b1e-6cf98864a454"
+                                          },
+                                      "confidence": "VERY_LIKELY",
+                                      "location":
+                                          {
+                                              "byteRange":
+                                                  {
+                                                      "start": 0,
+                                                      "end": 19
+                                                  },
+                                              "codepointRange":
+                                                  {
+                                                      "start": 0,
+                                                      "end": 19
+                                                  }
+                                          },
+                                      "redactedLocation":
+                                          {
+                                              "byteRange":
+                                                  {
+                                                      "start": 0,
+                                                      "end": 19
+                                                  },
+                                              "codepointRange":
+                                                  {
+                                                      "start": 0,
+                                                      "end": 19
+                                                  }
+                                          },
+                                      "matchedDetectionRuleUUIDs":
+                                          ["0d8efd7b-b87a-478b-984e-9cf5534a46bc"],
+                                      "matchedDetectionRules":
+                                          []
+                                  },
+                              ]
+                          ],
+                      "redactedPayload":
+                          [
+                              "491👀-👀👀👀👀-👀👀👀👀-👀👀👀👀 is my credit card number, [REDACTED] ssn"
+                          ]
+                  })
+    result, redactions = nightfall.scan_text_with_policies(
+        ["4916-6734-7572-5015 is my credit card number, 489-36-8350 ssn"],
+        ["2388f83f-cd31-4689-971b-4ee94f798281"]
+    )
+
+    assert len(responses.calls) == 1
+    assert responses.calls[0].request.headers.get("Authorization") == "Bearer NF-NOT_REAL"
+    assert json.loads(responses.calls[0].request.body) == {
+        "payload":
+            [
+                "4916-6734-7572-5015 is my credit card number, 489-36-8350 ssn"
+            ],
+        "policyUUIDs": ["2388f83f-cd31-4689-971b-4ee94f798281"]
+    }
+
+    assert len(result) == 1
+    assert len(result[0]) == 1
+    assert result[0][0] == Finding(
+        "4916-6734-7572-5015",
+        '491👀-👀👀👀👀-👀👀👀👀-👀👀👀👀',
+        None, " is my cre",
+        "Credit Card Number",
+        result[0][0].detector_uuid,
+        Confidence.VERY_LIKELY,
+        Range(0, 19), Range(0, 19), "",
+        ["0d8efd7b-b87a-478b-984e-9cf5534a46bc"], [])
+    assert len(redactions) == 1
+    assert redactions[0] == "491👀-👀👀👀👀-👀👀👀👀-👀👀👀👀 is my credit card number, [REDACTED] ssn"
 
 def test_scan_text_no_detection_rules():
     nightfall = Nightfall("NF-NOT_REAL")