Updated docs and test data for rubric_dict.

TNL-708

openassessment/assessment/api/student_training.py

@@ -127,7 +127,7 @@ def validate_training_examples(rubric, examples):
         >>> ]
         >>>
         >>> rubric = {
-        >>>     "prompt": "Write an essay!",
+        >>>     "prompts": [{"description": "Write an essay!"}],
         >>>     "criteria": [
         >>>         {
         >>>             "order_num": 0,
@@ -324,7 +324,7 @@ def get_training_example(submission_uuid, rubric, examples):
         {
             'answer': u'Lorem ipsum',
             'rubric': {
-                "prompt": "Write an essay!",
+                "prompts": [{"description": "Write an essay!"}],
                 "criteria": [
                     {
                         "order_num": 0,

openassessment/assessment/serializers/base.py

@@ -245,7 +245,7 @@ def rubric_from_dict(rubric_dict):
     Sample data (one criterion, two options)::
 
         {
-          "prompt": "Create a plan to deliver ora2!",
+          "prompts": [{"description": "Create a plan to deliver ora2!"}],
           "criteria": [
             {
               "order_num": 0,

openassessment/assessment/serializers/training.py

@@ -107,7 +107,7 @@ def deserialize_training_examples(examples, rubric_dict):
         >>> ]
         >>>
         >>> rubric = {
-        >>>     "prompt": "Write an essay!",
+        >>>     "prompts": [{"description": "Write an essay!"}],
         >>>     "criteria": [
         >>>         {
         >>>             "order_num": 0,

openassessment/assessment/test/constants.py

@@ -34,7 +34,7 @@ RUBRIC_OPTIONS = [
 ]
 
 RUBRIC = {
-    'prompt': u"МоъЎ-ↁіск; оѓ, ГЂэ ЩЂаlэ",
+    'prompts': [{"description": u"МоъЎ-ↁіск; оѓ, ГЂэ ЩЂаlэ"}],
     'criteria': [
         {
             "order_num": 0,

openassessment/assessment/test/data/rubric/empty_criteria.json

 {
-  "prompt": "Create a plan to deliver ora2!",
+  "prompts": [{"description": "Create a plan to deliver ora2!"}],
   "criteria": [
   ]
 }

openassessment/assessment/test/data/rubric/empty_options.json

 {
-  "prompt": "Create a plan to deliver ora2!",
+  "prompts": [{"description": "Create a plan to deliver ora2!"}],
   "criteria": [
     {
       "order_num": 0,

openassessment/assessment/test/data/rubric/missing_criteria.json

 {
-  "prompt": "Create a plan to deliver ora2!"
+  "prompts": [{"description": "Create a plan to deliver ora2!"}]
 }

openassessment/assessment/test/data/rubric/missing_options.json

 {
-  "prompt": "Create a plan to deliver ora2!",
+  "prompts": [{"description": "Create a plan to deliver ora2!"}],
   "criteria": [
     {
       "order_num": 0,

openassessment/assessment/test/data/rubric/no_points.json

 {
-  "prompt": "Create a plan to deliver ora2!",
+  "prompts": [{"description": "Create a plan to deliver ora2!"}],
   "criteria": [
     {
       "order_num": 0,

openassessment/assessment/test/data/rubric/project_plan_rubric.json

 {
-  "prompt": "Create a plan to deliver ora2!",
+  "prompts": [{"description": "Create a plan to deliver ora2!"}],
   "criteria": [
     {
       "order_num": 0,

openassessment/assessment/test/data/validate_training_examples.json

 {
     "valid": {
         "rubric": {
-            "prompt": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽",
+            "prompts": [{"description": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽"}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -78,7 +78,7 @@
 
     "missing_options": {
         "rubric": {
-            "prompt": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽",
+            "prompts": [{"description": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽"}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -148,7 +148,7 @@
 
     "extra_options": {
         "rubric": {
-            "prompt": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽",
+            "prompts": [{"description": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽"}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -225,7 +225,7 @@
 
     "missing_and_extra_options": {
         "rubric": {
-            "prompt": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽",
+            "prompts": [{"description": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽"}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -291,7 +291,7 @@
 
     "invalid_option_name": {
         "rubric": {
-            "prompt": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽",
+            "prompts": [{"description": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽"}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -374,7 +374,7 @@
 
     "rubric_missing_options_list": {
         "rubric": {
-            "prompt": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽",
+            "prompts": [{"description": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽"}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -397,7 +397,7 @@
 
     "rubric_missing_criteria_list": {
         "rubric": {
-            "prompt": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽"
+            "prompts": [{"description": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽"}]
         },
         "examples": [
             {
@@ -413,7 +413,7 @@
 
     "example_missing_keys": {
         "rubric": {
-            "prompt": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽",
+            "prompts": [{"description": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽"}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -478,7 +478,7 @@
 
     "feedback_only_criterion": {
         "rubric": {
-            "prompt": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽",
+            "prompts": [{"description": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽"}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -518,7 +518,7 @@
 
     "feedback_only_criterion_extra_score": {
         "rubric": {
-            "prompt": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽",
+            "prompts": [{"description": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽"}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -561,7 +561,7 @@
 
     "feedback_only_all_criteria": {
         "rubric": {
-            "prompt": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽",
+            "prompts": [{"description": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽"}],
             "criteria": [
                 {
                     "order_num": 1,

openassessment/assessment/test/test_ai_models.py

@@ -122,7 +122,7 @@ class AIGradingWorkflowTest(CacheResetTest):
 
         # Create a rubric with a similar structure, but different prompt
         similar_rubric_dict = copy.deepcopy(RUBRIC)
-        similar_rubric_dict['prompt'] = 'Different prompt!'
+        similar_rubric_dict['prompts'] = [{"description": 'Different prompt!'}]
         self.similar_rubric = rubric_from_dict(similar_rubric_dict)
 
     def test_assign_most_recent_classifier_set(self):

openassessment/assessment/test/test_rubric.py

@@ -161,7 +161,7 @@ class RubricHashTest(CacheResetTest):
 
         # Same structure, but different text should have the same structure hash
         altered_rubric = copy.deepcopy(RUBRIC)
-        altered_rubric['prompt'] = 'altered!'
+        altered_rubric['prompts'] = [{"description": 'altered!'}]
         for criterion in altered_rubric['criteria']:
             criterion['prompt'] = 'altered!'
             for option in criterion['options']:

openassessment/management/commands/simulate_ai_grading_error.py

@@ -45,7 +45,7 @@ class Command(BaseCommand):
     ]
 
     RUBRIC = {
-        'prompt': u"Test prompt",
+        'prompts': [{"description": u"Test prompt"}],
         'criteria': [
             {
                 "order_num": 0,