naturalness intelligibility context mos

app.py

@@ -140,30 +140,72 @@ with gr.Blocks() as demo:
     )
 
     with gr.Row():
-        mos_A = gr.Dropdown(
-            choices=["None", "1", "2", "3", "4", "5"], 
-            value="None", 
+        naturalness_A = gr.Slider(
+            minimum=1,
+            maximum=5,
+            step=1,
+            value=3,
+            label="Naturalness A"
+        )
+
+        intelligibility_A = gr.Slider(
+            minimum=1,
+            maximum=5,
+            step=1,
+            value=3,
+            label="Intelligibility A"
+        )
+
+        context_A = gr.Slider(
+            minimum=1,
+            maximum=5,
+            step=1,
+            value=3, 
+            label="Context Adequacy A"
+        )
+
+        mos_A = gr.Slider(
+            minimum=1,
+            maximum=5,
+            step=1,
+            value=3,
             label="MOS Audio A"
         )
 
-        context_A = gr.Dropdown(
-            choices=["None", "1", "2", "3", "4", "5"], 
-            value="None", 
-            label="Context Adequacy for audio A"
+    with gr.Row():
+        naturalness_B = gr.Slider(
+            minimum=1,
+            maximum=5,
+            step=1,
+            value=3,
+            label="Naturalness B"
         )
 
-        mos_B = gr.Dropdown(
-            choices=["None", "1", "2", "3", "4", "5"], 
-            value="None", 
-            label="MOS Audio B"
+        intelligibility_B = gr.Slider(
+            minimum=1,
+            maximum=5,
+            step=1,
+            value=3,
+            label="Intelligibility B"
         )
 
-        context_B = gr.Dropdown(
-            choices=["None", "1", "2", "3", "4", "5"], 
-            value="None", 
+        context_B = gr.Slider(
+            minimum=1,
+            maximum=5,
+            step=1,
+            value=3, 
             label="Context Adequacy for audio B"
         )
 
+        mos_B = gr.Slider(
+            minimum=1,
+            maximum=5,
+            step=1,
+            value=3,
+            label="MOS Audio B"
+        )
+
+    with gr.Row():
         preferred_audio = gr.Radio(
             choices=[
                 "Audio A",
@@ -226,10 +268,14 @@ with gr.Blocks() as demo:
             device_type, 
             hidden_models,
             context_selector, 
-            mos_A,
+            naturalness_A,
+            intelligibility_A,
             context_A,
-            mos_B,
+            mos_A,
+            naturalness_B,
+            intelligibility_B,
             context_B,
+            mos_B,
             preferred_audio
         ],
         outputs=status

services/annotation_service.py

@@ -42,10 +42,14 @@ def submit_pair_annotation_hf(
         device_type, 
         hidden_models,
         context,
-        mos_A,
+        naturalness_A,
+        intelligibility_A,
         context_A,
-        mos_B,
+        mos_A,
+        naturalness_B,
+        intelligibility_B,
         context_B,
+        mos_B,
         preferred_audio,
 ):
 
@@ -60,8 +64,10 @@ def submit_pair_annotation_hf(
         "device_type": device_type,
         "context": context,
         "model_name": hidden_models[0],
-        "score": mos_A,
+        "naturalness": naturalness_A,
+        "intelligibility": intelligibility_A,
         "context_score": context_A,
+        "mos": mos_A,
         "preferred_audio": preferred_audio,
         "comparaison_id": short_id,
         "timestamp": datetime.now(UTC).isoformat()
@@ -76,8 +82,10 @@ def submit_pair_annotation_hf(
         "device_type": device_type,
         "context": context,
         "model_name": hidden_models[1],
-        "score": mos_B,
+        "naturalness": naturalness_B,
+        "intelligibility": intelligibility_B,
         "context_score": context_B,
+        "mos": mos_B,
         "preferred_audio": preferred_audio,
         "comparaison_id": short_id,
         "timestamp": datetime.now(UTC).isoformat()
@@ -126,10 +134,14 @@ def submit_pair_annotation(
         device_type, 
         hidden_models,
         context,
-        mos_A,
+        naturalness_A,
+        intelligibility_A,
         context_A,
-        mos_B,
+        mos_A,
+        naturalness_B,
+        intelligibility_B,
         context_B,
+        mos_B,
         preferred_audio,
 ):
    try:
@@ -143,10 +155,14 @@ def submit_pair_annotation(
         device_type, 
         hidden_models,
         context,
-        mos_A,
+        naturalness_A,
+        intelligibility_A,
         context_A,
-        mos_B,
+        mos_A,
+        naturalness_B,
+        intelligibility_B,
         context_B,
+        mos_B,
         preferred_audio,
     )