Merge pull request #32 from hCaptcha/josiah-allow-simple

allow unnested floats for min_difficulty
hCaptcha · Mar 10, 2020 · b679ced · b679ced
2 parents e023184 + 31028a2
commit b679ced
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/basemodels/manifest.py b/basemodels/manifest.py
@@ -228,7 +228,7 @@ def validate_groundtruth(self, data, value):
     # Configuration id -- XXX LEGACY
     confcalc_configuration_id = StringType(required=False)
 
-    restricted_audience = DictType(ListType(DictType(DictType(FloatType))))
+    restricted_audience = DictType(UnionType([FloatType, ListType(DictType(DictType(FloatType)))]))
 
     def validate_taskdata_uri(self, data, value):
         if data.get('taskdata') and len(data.get('taskdata')) > 0 and data.get('taskdata_uri'):

diff --git a/test.py b/test.py
@@ -217,7 +217,8 @@ def test_restricted_audience(self):
                 "minimum_client_confidence": {
                     "score": 0.9
                 }
-            }]
+            }],
+            "min_difficulty": 2,
         }
         manifest.validate()
         self.assertTrue("restricted_audience" in manifest.to_primitive())
@@ -231,6 +232,7 @@ def test_restricted_audience(self):
         self.assertEqual(
             0.9,
             manifest.to_primitive()["restricted_audience"]["lang"][0]["en-us"]["score"])
+        self.assertEqual(2, manifest.to_primitive()["restricted_audience"]["min_difficulty"])
 
     def test_realistic_multi_challenge_example(self):
         """ validates a realistic multi_challenge manifest """