Update app.py

app.py

@@ -2,7 +2,7 @@ import gradio as gr
 import pandas as pd
 import os
 import time
-from typing import List, Union, Dict, Any
+from typing import List, Union, Dict, Any, Tuple
 
 # =================================================================
 # CONFIGURATION AND LANGUAGE DEFINITIONS
@@ -11,7 +11,8 @@ from typing import List, Union, Dict, Any
 # Setting a dummy CSV path for demonstration. In a real scenario, this would save the data.
 CSV_FILENAME = f"survey_data_{int(time.time())}.csv"
 # The number of data points expected by the function signature
-EXPECTED_COUNT = 126
+EXPECTED_COUNT = 126 # Total inputs expected by Gradio click event
+EXPECTED_DATA_COUNT = EXPECTED_COUNT - 1 # 125 data inputs, plus 1 state input
 
 # --- Shared Choices (French Only) ---
 FREQ_FR = ["Jamais", "Rarement", "Parfois", "Souvent"]
@@ -168,7 +169,7 @@ prat_cult_freq_components = [
 ]
 prat_nature = gr.Radio(label=LANG["PRAT_NATURE_LABEL"], choices=["Oui", "Non", "Parfois"])
 
-# FIX APPLIED: Used gr.Number instead of gr.Textbox(type="number")
+# Used gr.Number instead of gr.Textbox(type="number")
 platform_components = [
     gr.Number(label=f"Heures/jour pour {platform}", placeholder="0.5, 1, 2...", minimum=0, step=0.5) for platform in PLATFORM_CHOICES
 ]
@@ -199,25 +200,30 @@ open_alternatives = gr.Textbox(label=LANG["OPEN_ALTERNATIVES_LABEL"], placeholde
 open_motivations = gr.Textbox(label=LANG["OPEN_MOTIVATIONS_LABEL"], lines=3)
 
 # =================================================================
-# DUMMY PROCESSING FUNCTION
+# DUMMY PROCESSING FUNCTION - ADJUSTED SIGNATURE
 # =================================================================
 
-def process_survey(*all_inputs: Any) -> str:
+# The function now expects 125 positional arguments (*data_inputs) followed by the state (lang_state_value)
+def process_survey(*data_inputs: Any, lang_state_value: str) -> str:
     """
-    A dummy function to stand in for the actual process_survey in app(2).py.
-    It checks if the correct number of inputs (126) was received.
+    A dummy function to stand in for the actual process_survey.
+    It checks if the correct number of inputs (125 data + 1 state) was received.
     """
-    if len(all_inputs) != EXPECTED_COUNT:
-        return f"Erreur: Le nombre d'entrées reçues est incorrect ({len(all_inputs)} au lieu de {EXPECTED_COUNT}). Veuillez vérifier la structure."
+    
+    # Check if the number of data inputs matches the expected count (125)
+    if len(data_inputs) != EXPECTED_DATA_COUNT:
+        return f"Erreur: Le nombre d'entrées reçues est incorrect ({len(data_inputs) + 1} au lieu de {EXPECTED_COUNT}). Veuillez vérifier la structure."
 
-    # The first element is the hidden language state ('FR')
-    data_values = list(all_inputs[1:]) 
+    # data_values is the list of 125 data inputs
+    data_values = list(data_inputs) 
+    
+    # The language is now explicitly captured by lang_state_value
+    language = lang_state_value 
 
     # In a real scenario, the data would be collected, transformed, and saved here.
-    # data_row = pd.DataFrame([data_values], columns=COLUMN_NAMES)
-    # data_row.to_csv(CSV_FILENAME, mode='a', header=not os.path.exists(CSV_FILENAME), index=False)
+    # Note: data_values is the list of survey responses (125 items)
 
-    return f"✨ Succès ! Le questionnaire a été soumis avec {len(data_values)} réponses. (Données non sauvegardées dans cette démo)."
+    return f"✨ Succès ! Le questionnaire a été soumis avec {len(data_values)} réponses en langue '{language}'. (Données non sauvegardées dans cette démo)."
 
 # =================================================================
 # GRADIO UI & LOGIC
@@ -270,9 +276,8 @@ def update_visibility_space6(knows_practices):
     }
 
 
-# Define all 126 components that the `process_survey` function expects.
-ALL_INPUT_COMPONENTS = [
-    lang_state,
+# Define the 125 DATA components (excluding the state component)
+DATA_INPUT_COMPONENTS = [
     # TAB 1 - Contact & Lieux (22 components used)
     enqueteur_id, approach_answer, refusal_reason, refusal_reason_other, contact_later, firstname,
     space1, space2a_1, space2a_2, space2a_3, space2b,
@@ -296,22 +301,27 @@ ALL_INPUT_COMPONENTS = [
     open_non_institutionnel, open_alternatives, open_motivations,
 ]
 
-# Total components defined: 87. Pad with placeholders to reach 126.
-MISSING_COMPONENTS = [gr.Textbox(label=f"Placeholder_{i}", visible=False) for i in range(EXPECTED_COUNT - len(ALL_INPUT_COMPONENTS))]
-ALL_INPUT_COMPONENTS.extend(MISSING_COMPONENTS)
+# Pad with placeholders to reach the total expected data count (125)
+MISSING_COMPONENTS = [gr.Textbox(label=f"Placeholder_{i}", visible=False) for i in range(EXPECTED_DATA_COUNT - len(DATA_INPUT_COMPONENTS))]
+DATA_INPUT_COMPONENTS.extend(MISSING_COMPONENTS)
+
+# The list of inputs passed to the submit button: 125 Data Components followed by 1 State Component
+SUBMIT_INPUT_COMPONENTS = DATA_INPUT_COMPONENTS + [lang_state]
 
 
 with gr.Blocks(title=LANG["TITLE"], css=".gradio-container { max-width: 1200px; }") as demo:
     gr.Markdown(f"## {LANG['TITLE']}")
     gr.Markdown(LANG["INTRO_TEXT"])
 
-    output_message = gr.Markdown("---", elem_id="output_message") # Added elem_id for reset JS
+    output_message = gr.Markdown("---", elem_id="output_message") 
 
     with gr.Row():
         # Global Inputs
         enqueteur_id.render()
 
     with gr.Tabs():
+        # ... UI elements rendered as before ...
+
         # =================================================================
         # TAB 1: Contact & Lieux Fréquentés
         # =================================================================
@@ -456,18 +466,18 @@ with gr.Blocks(title=LANG["TITLE"], css=".gradio-container { max-width: 1200px;
         submit_btn = gr.Button(LANG["SUBMIT_BUTTON"], variant="primary")
         reset_btn = gr.Button(LANG["RESET_BUTTON"])
 
-    # FIX APPLIED HERE: Unpacking the ALL_INPUT_COMPONENTS list to pass inputs individually.
+    # FIX APPLIED HERE: The inputs are now 125 data components, followed by the single lang_state component.
     submit_btn.click(
         fn=process_survey,
-        inputs=[*ALL_INPUT_COMPONENTS], 
+        inputs=SUBMIT_INPUT_COMPONENTS, 
         outputs=output_message
     )
 
-    # Already fixed: Changed '_js' to 'js'
+    # The reset outputs still need to be the 125 data components
     reset_btn.click(
-        fn=lambda: [None] * len(ALL_INPUT_COMPONENTS[1:]),
+        fn=lambda: [None] * EXPECTED_DATA_COUNT,
         inputs=[],
-        outputs=ALL_INPUT_COMPONENTS[1:],
+        outputs=DATA_INPUT_COMPONENTS,
         # Reset the output message too using JavaScript
         js="() => { document.getElementById('output_message').innerHTML = '---'; }"
     )