Update app.py

app.py

@@ -5,90 +5,76 @@ from oauth2client.service_account import ServiceAccountCredentials
 from transformers import pipeline
 from twilio.rest import Client
 
-# Authenticate with Google Sheets using YOUR service account
-scope = ["https://spreadsheets.google.com/feeds", 
-         "https://www.googleapis.com/auth/drive",
-         "https://www.googleapis.com/auth/spreadsheets"]
+# Authenticate with Google Sheets
+scope = [
+    "https://www.googleapis.com/auth/spreadsheets",
+    "https://www.googleapis.com/auth/drive"
+]
 
-creds = ServiceAccountCredentials.from_json_keyfile_dict({
+creds_dict = {
     "type": "service_account",
     "project_id": "varahaa-farmers",
     "private_key_id": "f48da20518b3a08df328b6d07006b35472445e5b",
-    "private_key": os.environ["-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcD5El1Uv2gnz0\nK1DO9sVue1Yasq2K70sFnWq61Nw17GHISUjU5ieAuXrt1kAgo+i8DRcCmKaFd93N\newyBWLq0WNW2NSBSZ2VE3jIj3Ihn8tbw+LcfUbDFapGROYR3mx9Oi+uzl7Ksd5ZO\nFcw71CAvbSA+fJeF9FvmNLc4XSgwriQ2jL1CP4mrCKUQZRoKkrTqsLdzAEdiAYkh\nVgaDLEfSWJZW6GSVLK2WH9osR5hhNf6s1Ou15d/mTbtpf5AF7SOWCpF94jeEG4Uj\nzp6jYsDHtG2CfJvhBVMvU36kT5bqdrFMuPrO2MCoISZA7n2iwpFUAta7EPT54ilq\n25INGecdAgMBAAECggEAATgN2ZSFltvYgZIHOE5jsiEt4DcggoGc1iarolllFGiR\noMezwmrGzIloOz1gTrS5hFeRic9nOTg31Spp5bHckQBv/DG5a1U825kKpU6BAjHJ\nua9EllCcqmdDlowcmMi+UxQENPun7OYlOid4dkhJ7YoVAcLD0GWsaelchy6D6xlK\n7iBp97d2L8d2786uTfAHlK9XUyFohdCK0sAjQnp/D6SVzpvLRQcLgshPGam3KXYK\nMSNHXNfoGHU2CTE+ZS/Wd1r6/mmJ47eTPkbEzX2vpZyxAknuImcoQRA1YtcXxwmS\ni4G8MfxuTZSNFROZvod7bQX6GjlnUmJAWfhQlO9ZmQKBgQDQNliQF088MbeZDW6E\nEtoIwf1G81z9cG8z5XqxKCqf7lrpNnoJnMMo/ZgJgUcvAUpeW5NTDuIc4S4btSGA\n89tWrkasg9fRkmcq1mYMx3DSAOvlg9LrGS0lT5k1o2YZcyIQGwtL/0AWRwH9D8t/\ngcqTIEZhRlke0YsuTwwBeUMsGQKBgQC/4QaGSDj51E2qjfY2srWnw5odBJ8haYqK\ntz8mXIh+d5CqJ3o/4K8WFhvs89Bz5/qvYtNtRhaoC6uJli1qw2/tNloPEXhk+lWN\nUhZUcAKDoL8HEwc7qf59njBknfnpmWXTxmCLVTjPf7kNPXlkzhxl0ribvtF3OucK\nD05Z4+GzpQKBgBkR4hn/ZH/38IZSMrNeXbheOzPWy6SMbCdQgzRfhLpbBcE82Pbd\nVDZUSoEiesKzIhQ4bIW8rgcSKe4WIiGXuxo1w7az7UGDoj5rMEBrpy7yA3VQKQ47\nqs7qRaVKtllsHnbX+sU8x6enBxtEUplYtF6ArVi7ErH+QwbhZ62pvyfJAoGBAIWx\nJVmkssYnjaHbXgUIiZeFqziywqmGHvi96yswaA4uAsb70Kr3QycRao2z57cKmFlh\nc0z8+8ZEs1WfJK/x0memaiN7mbZJ0hgwbMySar4J32/vayfAL0iZUsCYbcu8jP18\niEIss/On22kFPzLkhVbQ9r3Vu57mlJomxgHNzLHdAoGANSXCGDIobaKtXJ7oSTx7\nFP6IPWsI1t0hFQlgrbSLm9zPCUnYda3ghqaL9Cl/4vlqx/6qoYomuZ5ZUPSAaCBu\nkC2wpjDZ4DWEZt26f1QB5Xm9ixXNPx16jnZCfDeuOx/VVLLFrmhqTasZfRI/0p4f\n+3MY4KmHmpzG7N00BZBla2U=\n-----END PRIVATE KEY-----\n"],  # Add as secret in HF Space
+    "private_key": os.environ["PRIVATE_KEY"].replace('\\n', '\n'),
     "client_email": "[email protected]",
     "client_id": "113471167964788057428",
     "auth_uri": "https://accounts.google.com/o/oauth2/auth",
     "token_uri": "https://oauth2.googleapis.com/token",
     "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
     "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/huggingface-bot%40varahaa-farmers.iam.gserviceaccount.com"
-}, scope)
+}
 
+creds = ServiceAccountCredentials.from_json_keyfile_dict(creds_dict, scope)
 client = gspread.authorize(creds)
-sheet = client.open("Varahaa Farmer Verification").sheet1  # Your exact sheet name
+sheet = client.open("Varahaa Farmer Verification").sheet1
 
-# Initialize Twilio for WhatsApp
+# Initialize Twilio
 twilio_client = Client(os.environ["ACf8b3539472179ac15fb46939a02bb802"], os.environ["297cffb015681887dade0d42180332b9"])
 
 # Load NLP model
-qa_pipeline = pipeline("question-answering", model="bert-large-uncased-whole-word-masking-finetuned-squad")
+qa_pipeline = pipeline("question-answering", model="bert-base-uncased")
 
 def get_farmer_data(phone):
     try:
-        cell = sheet.find(phone)
-        return sheet.row_values(cell.row)
+        return sheet.find(phone)
     except:
         return None
 
 def verify_farmer(phone, query):
     farmer = get_farmer_data(phone)
     if not farmer:
-        return "Farmer not found in registry"
+        return "Farmer not found"
     
-    # Map columns from your sheet structure:
-    # [Phone, Name, SurveyDone, Address, FarmArea, Ownership, Signature, PaddyMethod, Residue, WheatTillage]
+    row = sheet.row_values(farmer.row)
     if "name" in query.lower():
-        return f"✅ Name Verified: {farmer[1]}"
+        return f"Name: {row[1]}"
     elif "survey" in query.lower():
-        return f"Survey Status: {'✅ Completed' if farmer[2]=='Yes' else '❌ Pending'}"
+        return f"Survey: {row[2]}"
     elif "area" in query.lower():
-        return f"Registered Farm Area: {farmer[4]} acres"
-    elif "ownership" in query.lower():
-        return f"Ownership Status: {farmer[5]}"
-    elif "signature" in query.lower():
-        return f"Digital Signature: {'✅ Verified' if farmer[6]=='Yes' else '❌ Missing'}"
+        return f"Farm Area: {row[4]} acres"
     else:
-        return "Ask about: name, survey, area, ownership, signature"
+        return "Available queries: name, survey, area"
 
 def send_questionnaire(phone):
     try:
         message = twilio_client.messages.create(
-            body="🌾 Varahaa Farmer Verification Questionnaire:\n\n"
-                 "1. Is your farm area correct?\n"
-                 "2. Has field staff completed survey?\n"
-                 "3. Need ownership details updated?\n"
-                 "Reply with answers separated by commas",
-            from_='whatsapp:+14155238886',  # Twilio sandbox
+            body="🌾 Please verify your details:\n1. Is your name correct?\n2. Farm area?",
+            from_='whatsapp:+14155238886',
             to=f'whatsapp:{phone}'
         )
-        return "✅ Questionnaire sent via WhatsApp!"
+        return "Questionnaire sent!"
     except Exception as e:
-        return f"❌ Error: {str(e)}"
+        return f"Error: {str(e)}"
 
-with gr.Blocks(theme=gr.themes.Soft()) as demo:
-    gr.Markdown("# 🌱 Varahaa Farmer Verification")
-    
-    with gr.Row():
-        phone = gr.Textbox(label="Farmer's WhatsApp Number", placeholder="+91XXXXXXXXXX")
-        query = gr.Dropdown(["Name Verification", "Survey Status", "Farm Area", 
-                           "Ownership Check", "Signature Status"], label="Select Query")
-    
-    output = gr.Textbox(label="Verification Result", interactive=False)
-    
-    with gr.Row():
-        verify_btn = gr.Button("Verify Details", variant="primary")
-        questionnaire_btn = gr.Button("Send Questionnaire", variant="secondary")
+with gr.Blocks() as demo:
+    gr.Markdown("# Varahaa Farmer Verification")
+    phone = gr.Textbox(label="Phone Number")
+    query = gr.Dropdown(["Name Check", "Survey Status", "Farm Area"], label="Select Query")
+    output = gr.Textbox(label="Result")
+    verify_btn = gr.Button("Verify")
+    send_btn = gr.Button("Send Questionnaire")
     
     verify_btn.click(fn=verify_farmer, inputs=[phone, query], outputs=output)
-    questionnaire_btn.click(fn=send_questionnaire, inputs=phone, outputs=output)
+    send_btn.click(fn=send_questionnaire, inputs=phone, outputs=output)
 
 demo.launch()