Merge remote-tracking branch 'upstream/main' into docker-hf

indie_label_svelte/public/global.css

@@ -120,7 +120,7 @@ h6 {
 	font-weight: bold;
 	font-size: 16px;
 	margin-top: 25px;
-	margin-bottom: 25px;
+	margin-bottom: 15px;
 }
 
 .head_6_non_cap {
@@ -204,6 +204,11 @@ table {
 	margin: 60px 0;
 }
 
+.spacing_vert_100_bottom {
+	margin: 0 0 100px 0;
+}
+
+
 .page_title {
 	font-size: 30px;
 	font-weight: bold;

indie_label_svelte/src/HypothesisPanel.svelte

@@ -5,6 +5,7 @@
 
     import Button, { Label } from "@smui/button";
     import Textfield from '@smui/textfield';
+    import Select, { Option } from "@smui/select";
     import { new_evidence } from './stores/new_evidence_store.js';
     import { open_evidence } from './stores/open_evidence_store.js';
     import { topic_chosen } from './stores/cur_topic_store.js';
@@ -50,6 +51,7 @@
     let editTitle = false;
     let editErrorType = false;
     let unfinished_count = 0;
+    let has_complete_report = false;
     
     function setActive(value: string) {
         selected = value;
@@ -91,6 +93,7 @@
         setActive(selected);
         cur_open_evidence = selected["evidence"];
         unfinished_count = all_reports.filter(item => !item.complete_status).length
+        has_complete_report = hasCompleteReport();
         return all_reports;
     }
 
@@ -143,6 +146,8 @@
         const response = await fetch("./save_reports?" + params);
         const text = await response.text();
         const data = JSON.parse(text);
+        
+        has_complete_report = hasCompleteReport();
         return data;
     }
 
@@ -152,6 +157,7 @@
             error_type: "",
             evidence: [],
             text_entry: "",
+            sep_selection: "",
             complete_status: false,
         };
         all_reports = all_reports.concat(new_report);
@@ -178,6 +184,10 @@
         handleSaveReport(); // Auto-save report
     }
 
+    function hasCompleteReport() {
+        return all_reports.some(item => item.complete_status && (item.evidence.length > 0) && (item.text_entry != "") && (item.sep_selection));
+    }
+
     // Error type
     let error_type_options = [
         {
@@ -208,6 +218,14 @@
         editErrorType = false;
 	}
 
+    // SEP selection
+    let all_sep_options = [
+        "Accuracy",
+        "Bias/Discrimination",
+        "Adversarial Example",
+        "Other",
+    ];
+
     let promise_submit = Promise.resolve(null);
     function handleSubmitReport() {
         promise_submit = submitReport();
@@ -412,7 +430,7 @@
                                     {/key}
                                 </div>
 
-                                <div class="spacing_vert_60">
+                                <div class="spacing_vert_40">
                                     <div class="head_6">
                                         <b>Summary/Suggestions</b>
                                     </div>
@@ -432,10 +450,25 @@
 
                                 <div class="spacing_vert_40">
                                     <div class="head_6">
-                                        <b>Mark report as complete?</b>
+                                        <b>Audit Category</b>
+                                    </div>
+                                    <div>
+                                        <Select bind:value={selected["sep_selection"]} label="Audit category" style="width: 90%">
+                                            {#each all_sep_options as opt}
+                                                <Option value={opt}>{opt}</Option>
+                                            {/each}
+                                        </Select>
+                                    </div>
+                                </div>
+
+                                <div class="spacing_vert_100_bottom">
+                                    <div>
+                                        <span class="head_6"><b>Mark report as complete?</b></span>
                                         <FormField>
                                             <Checkbox checked={selected["complete_status"]} on:change={handleMarkComplete} />
                                         </FormField>
+                                        <br>
+                                        <p>Reports must be marked as complete and include all fields before they can be sent to AVID below.</p>
                                     </div>
                                     
                                 </div>
@@ -478,13 +511,17 @@
                     <Label>Save</Label>
                 </Button>
 
+                {#key has_complete_report}
                 <Button 
                     on:click={handleSubmitReport} 
                     variant="outlined"
                     color="secondary"
+                    disabled={!has_complete_report}
                 >
                     <Label>Send to AVID</Label>
                 </Button>
+                {/key}
+
 
                 <div>
                     <span style="color: grey"><i>Last saved:

indie_label_svelte/src/SubmitReportDialog.svelte

@@ -2,7 +2,6 @@
     import Dialog, { Title, Content, Actions } from "@smui/dialog";
     import Button, { Label } from "@smui/button";
     import Textfield from "@smui/textfield";
-    import Select, { Option } from "@smui/select";
     import CircularProgress from '@smui/circular-progress';
 
     export let open;
@@ -10,13 +9,6 @@
     export let all_reports;
     let name = "";
     let email = "";
-    let all_sep_options = [
-        "Accuracy",
-        "Bias/Discrimination",
-        "Adversarial Example",
-        "Other",
-    ];
-    let sep_selection = "";
 
     let promise_submit = Promise.resolve(null);
     function handleSubmitReport() {
@@ -29,7 +21,6 @@
             reports: JSON.stringify(all_reports),
             name: name,
             email: email,
-            sep_selection: sep_selection,
         };
 
 		let params = new URLSearchParams(req_params).toString();
@@ -58,15 +49,16 @@
 
             <!-- Summary of complete reports -->
             <div>
-                <p><b>Summary of Reports to Send</b> (Reports that include evidence and are marked as complete)</p>
+                <p><b>Summary of Reports to Send</b> (Reports that include all fields and are marked as complete)</p>
                 <ul>
                     {#each all_reports as report}
-                        {#if report["complete_status"] && (report["evidence"].length > 0)}
+                        {#if report["complete_status"] && (report["evidence"].length > 0) && (report["text_entry"] != "") && (report["sep_selection"])}
                             <li>{report["title"]}</li>
                             <ul>
                                 <li>Error Type: {report["error_type"]}</li>
                                 <li>Evidence: Includes {report["evidence"].length} example{(report["evidence"].length > 1) ? 's' : ''}</li>
                                 <li>Summary/Suggestions: {report["text_entry"]}</li>
+                                <li>Audit Category: {report["sep_selection"] || ''}</li>
                             </ul>
                         {/if}
                     {/each}
@@ -74,13 +66,6 @@
             </div>
 
             <!-- Form fields -->
-            <div>
-                <Select bind:value={sep_selection} label="Audit category" style="width: 90%">
-                    {#each all_sep_options as opt}
-                        <Option value={opt}>{opt}</Option>
-                    {/each}
-                </Select>
-            </div>
             <div>
                 <Textfield bind:value={name} label="(Optional) Name" style="width: 90%" />
             </div>

server.py

@@ -426,6 +426,7 @@ def get_reports():
                     "error_type": "",
                     "evidence": [],
                     "text_entry": "",
+                    "sep_selection": "",
                     "complete_status": False,
                 }
             ]
@@ -446,6 +447,7 @@ def get_fixed_scaffold():
             "error_type": "System is under-sensitive",
             "evidence": [],
             "text_entry": "",
+            "sep_selection": "",
             "complete_status": False,
         },
         {
@@ -453,6 +455,7 @@ def get_fixed_scaffold():
             "error_type": "System is over-sensitive",
             "evidence": [],
             "text_entry": "",
+            "sep_selection": "",
             "complete_status": False,
         },
         {
@@ -460,6 +463,7 @@ def get_fixed_scaffold():
             "error_type": "System is under-sensitive",
             "evidence": [],
             "text_entry": "",
+            "sep_selection": "",
             "complete_status": False,
         },
         {
@@ -467,6 +471,7 @@ def get_fixed_scaffold():
             "error_type": "System is over-sensitive",
             "evidence": [],
             "text_entry": "",
+            "sep_selection": "",
             "complete_status": False,
         },
         {
@@ -474,6 +479,7 @@ def get_fixed_scaffold():
             "error_type": "System is under-sensitive",
             "evidence": [],
             "text_entry": "",
+            "sep_selection": "",
             "complete_status": False,
         },
     ]
@@ -484,6 +490,7 @@ def get_empty_report(title, error_type):
             "error_type": error_type,
             "evidence": [],
             "text_entry": "",
+            "sep_selection": "",
             "complete_status": False,
         }
 
@@ -494,6 +501,7 @@ def get_tutorial_scaffold():
             "error_type": "System is over-sensitive",
             "evidence": [],
             "text_entry": "",
+            "sep_selection": "",
             "complete_status": False,
         },
     ] 
@@ -606,6 +614,7 @@ def get_prompts_scaffold():
             "error_type": "System is over-sensitive",
             "evidence": [],
             "text_entry": "",
+            "sep_selection": "",
             "complete_status": False,
         },
         {
@@ -613,6 +622,7 @@ def get_prompts_scaffold():
             "error_type": "System is under-sensitive",
             "evidence": [],
             "text_entry": "",
+            "sep_selection": "",
             "complete_status": False,
         },
         {
@@ -620,6 +630,7 @@ def get_prompts_scaffold():
             "error_type": "",
             "evidence": [],
             "text_entry": "",
+            "sep_selection": "",
             "complete_status": False,
         },
         {
@@ -627,6 +638,7 @@ def get_prompts_scaffold():
             "error_type": "",
             "evidence": [],
             "text_entry": "",
+            "sep_selection": "",
             "complete_status": False,
         },
         {
@@ -634,6 +646,7 @@ def get_prompts_scaffold():
             "error_type": "",
             "evidence": [],
             "text_entry": "",
+            "sep_selection": "",
             "complete_status": False,
         },
     ]
@@ -648,7 +661,7 @@ def get_eligible_reports(reports):
 
 # Submit all reports to AVID
 # Logs the responses
-def submit_reports_to_AVID(reports, cur_user, name, email, sep_selection, debug=DEBUG):
+def submit_reports_to_AVID(reports, cur_user, name, email, debug=DEBUG):
     # Set up the connection to AVID
     root = os.environ.get('AVID_API_URL')
     api_key = os.environ.get('AVID_API_KEY')
@@ -659,6 +672,7 @@ def submit_reports_to_AVID(reports, cur_user, name, email, sep_selection, debug=
         print("Num eligible reports:", len(reports))
     
     for r in reports:
+        sep_selection = r["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
@@ -695,13 +709,12 @@ 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")
 
     reports = json.loads(reports_json)
 
     # Submit reports to AVID
-    submit_reports_to_AVID(reports, cur_user, name, email, sep_selection)
+    submit_reports_to_AVID(reports, cur_user, name, email)
 
     results = {
         "status": "success",