Update tools/data_governance_record.py

tools/data_governance_record.py

@@ -6,6 +6,8 @@ from fpdf import FPDF
 from langdetect import detect
 import gradio as gr
 
+from tools.common import prepend_metadata_questions  # ✅ Import helper
+
 # === PDF Export Function ===
 def export_text_to_pdf(text, metadata=None, output_path=None, language="en"):
     if output_path is None:
@@ -23,7 +25,7 @@ def export_text_to_pdf(text, metadata=None, output_path=None, language="en"):
     pdf.cell(0, 15, title, ln=True, align='C')
     pdf.ln(10)
 
-    # Metadata
+    # Metadata block
     if metadata:
         pdf.set_font("Arial", '', 12)
         pdf.set_text_color(90, 90, 90)
@@ -63,11 +65,8 @@ def export_text_to_pdf(text, metadata=None, output_path=None, language="en"):
     return output_path
 
 
-# === Questions ===
-QUESTIONS = [
-    ("organization", "What is the name of your organization?"),
-    ("completed_by", "What is your full name?"),
-    ("role", "What is your role in the organization?"),
+# === Core Questions ===
+BASE_QUESTIONS = [
     ("dataset_description", "Please describe the dataset(s) used."),
     ("data_sources", "What are the sources of the data?"),
     ("data_collection_method", "How was the data collected?"),
@@ -80,6 +79,8 @@ QUESTIONS = [
     ("access_control", "Who has access to the data and under what conditions?")
 ]
 
+QUESTIONS = prepend_metadata_questions(BASE_QUESTIONS)  # ✅ Prepend metadata
+
 def get_questions():
     return QUESTIONS
 
@@ -100,14 +101,14 @@ def run_tool():
             state["step"] += 1
             return next_q, state, None
 
-        # Build content and metadata
-        content = "\n".join([f"- **{label}**: {answers.get(key, '')}" for key, label in QUESTIONS[3:]])
+        content = "\n".join([f"- **{label}**: {answers.get(key, '')}" for key, label in QUESTIONS])
         detected_lang = detect(content)
 
+        # ✅ Extract metadata from prepended fields
         metadata = {
-            "organization": answers.get("organization", "N/A"),
-            "completed_by": answers.get("completed_by", "N/A"),
-            "role": answers.get("role", "N/A"),
+            "organization": answers.get("organization_name", "N/A"),
+            "completed_by": answers.get("user_name", "N/A"),
+            "role": answers.get("user_role", "N/A"),
             "timestamp": datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
         }