Fixes format of AVID Report credit field; adds optional name field in form; reverts style change

audit_utils.py

@@ -336,6 +336,10 @@ def format_description(indie_label_json):
     text_entry = indie_label_json["text_entry"]
     return f"Title: {title}\nError Type: {error_type}\nSummary/Suggestions: {text_entry}"
 
+# Format the credit field for the report with the current user's username, optional name, and optional email address
+def format_credit(cur_user, name, email):
+    return f"Username: {cur_user}, Name: {name}, Email: {email}"
+
 # Convert indielabel json to AVID json format.
 # See the AVID format in https://avidml.org/avidtools/reference/report
 #
@@ -349,7 +353,7 @@ def format_description(indie_label_json):
 #   user_rating                 personal_model_score    0.92
 #   user_decision               user_decision           "Non-toxic"
 # Note that this is at the individual report level.
-def convert_indie_label_json_to_avid_json(indie_label_json, cur_user, email, sep_selection):
+def convert_indie_label_json_to_avid_json(indie_label_json, cur_user, name, email, sep_selection):
 
     # Setting up the structure with a dict to enable programmatic additions
     avid_json_dict = { 
@@ -398,17 +402,16 @@ def convert_indie_label_json_to_avid_json(indie_label_json, cur_user, email, sep
               "taxonomy_version": "0.2"
             }
           },
-          "credit": "", # Leaving empty so that credit can be assigned
+          "credit": {
+            "lang": "eng", # TODO: Make language selectable
+            "value": "" # Leaving empty so that credit can be assigned
+          },
           "reported_date": "" # Leaving empty so that it can be dynamically filled in
     }
 
-    avid_json_dict["description"] = format_description(indie_label_json)
-    avid_json_dict["reported_date"] = str(date.today())
-    # Assign credit to email if provided, otherwise default to randomly assigned username
-    if email != "":
-        avid_json_dict["credit"] = email
-    else:
-        avid_json_dict["credit"] = cur_user
+    avid_json_dict["description"]["value"] = format_description(indie_label_json)
+    avid_json_dict["reported_date"] = str(date.today())    
+    avid_json_dict["credit"]["value"] = format_credit(cur_user, name, email)
 
     sep_enum = get_sep_enum(sep_selection)
     avid_json_dict["impact"]["avid"]["sep_view"] = [sep_enum]

indie_label_svelte/public/index.html

@@ -9,7 +9,7 @@
 
 	<link rel='icon' type='image/png' href='/favicon.png'>
 	<link rel='stylesheet' href='/global.css'>
-	<link rel='stylesheet' href='/bundle.css'>
+	<link rel='stylesheet' href='/build/bundle.css'>
 	<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
 
 	<link

indie_label_svelte/src/SubmitReportDialog.svelte

@@ -8,6 +8,7 @@
     export let open;
     export let cur_user;
     export let all_reports;
+    let name = "";
     let email = "";
     let all_sep_options = [
         "Accuracy",
@@ -26,6 +27,7 @@
         let req_params = {
             cur_user: cur_user,
             reports: JSON.stringify(all_reports),
+            name: name,
             email: email,
             sep_selection: sep_selection,
         };
@@ -51,7 +53,7 @@
             <!-- Description -->
             <div>
                 <b>When you are ready to send all of your audit reports to the <a href="https://avidml.org/" target="_blank">AI Vulnerability Database</a> (AVID), please fill out the following information.</b>
-                Only your submitted reports will be stored in the database for further analysis. While you can submit reports anonymously, we encourage you to provide your email so that we can contact you if we have any questions.
+                Only your submitted reports will be stored in the database for further analysis. While you can submit reports anonymously, we encourage you to provide your name and/or email so that we can contact you if we have any questions.
             </div>
 
             <!-- Summary of complete reports -->
@@ -79,6 +81,9 @@
                     {/each}
                 </Select>
             </div>
+            <div>
+                <Textfield bind:value={name} label="(Optional) Name" style="width: 90%" />
+            </div>
             <div>
                 <Textfield bind:value={email} label="(Optional) Contact email" style="width: 90%" />
             </div>

server.py

@@ -648,7 +648,7 @@ def get_eligible_reports(reports):
 
 # Submit all reports to AVID
 # Logs the responses
-def submit_reports_to_AVID(reports, cur_user, email, sep_selection, debug=DEBUG):
+def submit_reports_to_AVID(reports, cur_user, name, email, sep_selection, debug=DEBUG):
     # Set up the connection to AVID
     root = os.environ.get('AVID_API_URL')
     api_key = os.environ.get('AVID_API_KEY')
@@ -659,7 +659,7 @@ def submit_reports_to_AVID(reports, cur_user, email, sep_selection, debug=DEBUG)
         print("Num eligible reports:", len(reports))
     
     for r in reports:
-        new_report = utils.convert_indie_label_json_to_avid_json(r, cur_user, email, sep_selection)
+        new_report = utils.convert_indie_label_json_to_avid_json(r, cur_user, name, email, sep_selection)
         url = root + "submit"
         response = requests.post(url, json=json.loads(new_report), headers=key) # The loads ensures type compliance
         uuid = response.json()
@@ -693,6 +693,7 @@ def save_reports(debug=DEBUG):
 @app.route("/submit_avid_report")
 def submit_avid_report():
     cur_user = request.args.get("cur_user")
+    name = request.args.get("name")
     email = request.args.get("email")
     sep_selection = request.args.get("sep_selection")
     reports_json = request.args.get("reports")
@@ -700,7 +701,7 @@ def submit_avid_report():
     reports = json.loads(reports_json)
 
     # Submit reports to AVID
-    submit_reports_to_AVID(reports, cur_user, email, sep_selection)
+    submit_reports_to_AVID(reports, cur_user, name, email, sep_selection)
 
     results = {
         "status": "success",