Update app.py

app.py

@@ -4,25 +4,26 @@ os.environ["OMP_NUM_THREADS"] = "1"
 import re
 import json
 import datetime as dt
-import csv
-from urllib.parse import urlparse
-import xml.etree.ElementTree as ET
-
-import requests
 import gradio as gr
 from utils import extract_kyc_fields
 
-# ------------------ HARD-CODED SALESFORCE CREDS (as requested) ------------------
+# ------------------ HARD-CODED SALESFORCE CREDS ------------------
 SF_USERNAME = "[email protected]"
 SF_PASSWORD = "Lic@2025"
 SF_SECURITY_TOKEN = "AmmfRcd6IiYaRtSGntBnzNMQU"
-SF_DOMAIN = "login"          # "login" (prod/dev) or "test" (sandbox)
-SF_API_VERSION = "60.0"      # Partner & REST API version
-# -------------------------------------------------------------------------------
+SF_DOMAIN = "login"   # "login" for prod/dev, "test" for sandbox
+# ---------------------------------------------------------------
+
+# simple-salesforce 1.11.6
+from simple_salesforce import Salesforce
+
 
 # ---------- helpers ----------
 def _parse_birthdate(dob_text: str):
-    """Normalize common DOB formats to YYYY-MM-DD (Salesforce Date)."""
+    """
+    Normalize DOB to YYYY-MM-DD for Salesforce Date fields.
+    Supports dd/mm/yyyy, dd-mm-yyyy, dd.mm.yyyy, yyyy-mm-dd, or just YYYY (mapped to mid-year).
+    """
     if not dob_text or dob_text == "Not found":
         return None
     s = dob_text.strip()
@@ -50,146 +51,88 @@ def _parse_birthdate(dob_text: str):
             return dt.date(y, 6, 15).isoformat()
         except ValueError:
             return None
-    return None
-
-
-def _extract_fault(xml_text: str):
-    """Pull faultcode/faultstring out of a SOAP envelope for clearer errors."""
-    try:
-        root = ET.fromstring(xml_text)
-    except Exception:
-        return None, None
-    fc = fs = None
-    for e in root.iter():
-        tag = e.tag.split('}', 1)[-1]
-        if tag == "faultcode": fc = e.text
-        if tag == "faultstring": fs = e.text
-    return fc, fs
-
-
-# ---------- AUTH (SOAP login) ----------
-def soap_login(username, password, token, domain="login", api_version=SF_API_VERSION):
-    """Log in via Partner SOAP. Returns dict with success flag + details."""
-    endpoint = f"https://{domain}.salesforce.com/services/Soap/u/{api_version}"
-    payload = f"""<?xml version="1.0" encoding="utf-8" ?>
-<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xmlns:env="http://schemas.xmlsoap.org/soap/envelope/">
-  <env:Body>
-    <n1:login xmlns:n1="urn:partner.soap.sforce.com">
-      <n1:username>{username}</n1:username>
-      <n1:password>{password}{token}</n1:password>
-    </n1:login>
-  </env:Body>
-</env:Envelope>"""
-    headers = {"Content-Type": "text/xml; charset=UTF-8", "SOAPAction": "login"}
-    r = requests.post(endpoint, data=payload.encode("utf-8"), headers=headers, timeout=30)
-
-    if r.status_code != 200:
-        fc, fs = _extract_fault(r.text)
-        return {
-            "success": False,
-            "status_code": r.status_code,
-            "url": endpoint,
-            "faultcode": fc, "faultstring": fs,
-            "response_text": r.text[:800]
-        }
-
-    try:
-        root = ET.fromstring(r.text)
-    except ET.ParseError as e:
-        return {"success": False, "error": f"SOAP parse error: {e}"}
 
-    sid = srv = None
-    for e in root.iter():
-        tag = e.tag.split('}', 1)[-1]
-        if tag == "sessionId": sid = e.text
-        if tag == "serverUrl": srv = e.text
+    return None
 
-    if not sid or not srv:
-        fc, fs = _extract_fault(r.text)
-        return {"success": False, "error": "SOAP login missing sessionId/serverUrl", "faultcode": fc, "faultstring": fs}
 
-    parsed = urlparse(srv)
-    instance_url = f"{parsed.scheme}://{parsed.netloc}"
-    return {"success": True, "instance_url": instance_url, "access_token": sid}
+def sf_login():
+    """
+    Login with simple-salesforce (v1.11.6). If creds are invalid or API is blocked,
+    Salesforce will raise here. We'll surface the raw error to the UI.
+    """
+    sf = Salesforce(
+        username=SF_USERNAME,
+        password=SF_PASSWORD,
+        security_token=SF_SECURITY_TOKEN,
+        domain=SF_DOMAIN,
+    )
+    # Lightweight check so bad auth is surfaced immediately
+    sf.query("SELECT Id FROM User LIMIT 1")
+    return sf
 
 
-def rest_create(instance_url: str, access_token: str, object_api: str, payload: dict, api_version=SF_API_VERSION):
-    """Create a record via REST. Returns dict with success flag + details."""
-    url = f"{instance_url}/services/data/v{api_version}/sobjects/{object_api}"
-    headers = {"Authorization": f"Bearer {access_token}", "Content-Type": "application/json"}
-    r = requests.post(url, headers=headers, data=json.dumps(payload), timeout=30)
+def sf_create_kyc_via_session(sf, payload: dict):
+    """
+    Use the same authenticated session from simple-salesforce to POST directly
+    to the REST sObject endpoint. This avoids the SDK's create() wrapper and
+    the 'SalesforceError.__init__() missing ...' TypeError you've been seeing.
+    """
+    # In simple-salesforce 1.11.6, base_url ends with `/services/data/vXX.X/`
+    url = f"{sf.base_url}sobjects/KYC_Record__c"
+    resp = sf.session.post(url, json=payload, headers=sf.headers, timeout=30)
 
     try:
-        body = r.json()
+        body = resp.json()
     except Exception:
         body = None
 
-    if 200 <= r.status_code < 300:
+    if 200 <= resp.status_code < 300:
         rec_id = body.get("id") if isinstance(body, dict) else None
-        return {"success": True, "id": rec_id, "status_code": r.status_code, "url": url, "response_json": body}
-    return {"success": False, "status_code": r.status_code, "url": url, "response_json": body, "response_text": r.text}
-
-
-# ---------- Build payload + push (and always export CSV) ----------
-CSV_HEADERS = [
-    "Aadhaar_Number__c", "Aadhaar_Name__c", "Aadhaar_DOB__c",
-    "PAN_Number__c", "Pan_Name__c", "Pan_DOB__c"
-]
-
-def build_kyc_row(ocr_results: dict):
-    """Map OCR results to your KYC_Record__c fields."""
-    a = ocr_results.get("aadhaar") or {}
-    p = ocr_results.get("pan") or {}
+        return {
+            "success": True,
+            "id": rec_id,
+            "status_code": resp.status_code,
+            "url": url,
+            "response_json": body
+        }
 
+    # Return *raw* details (no SDK exception wrapper involved)
     return {
-        "Aadhaar_Number__c": a.get("aadhaar_number") if (a.get("card_type") == "AADHAAR") else None,
-        "Aadhaar_Name__c":   a.get("name") if (a.get("card_type") == "AADHAAR") else None,
-        "Aadhaar_DOB__c":    _parse_birthdate(a.get("dob")) if (a.get("card_type") == "AADHAAR") else None,
-        "PAN_Number__c":     p.get("pan_number") if (p.get("card_type") == "PAN") else None,
-        "Pan_Name__c":       p.get("name") if (p.get("card_type") == "PAN") else None,
-        "Pan_DOB__c":        _parse_birthdate(p.get("dob")) if (p.get("card_type") == "PAN") else None,
+        "success": False,
+        "status_code": resp.status_code,
+        "url": url,
+        "response_json": body,
+        "response_text": resp.text,
     }
 
-def write_csv(row: dict, path: str):
-    """Write a single-row CSV with your exact field API names."""
-    os.makedirs(os.path.dirname(path), exist_ok=True)
-    with open(path, "w", newline="", encoding="utf-8") as f:
-        w = csv.DictWriter(f, fieldnames=CSV_HEADERS)
-        w.writeheader()
-        # Keep only the headers in order; missing keys become empty.
-        cleaned = {k: (row.get(k) or "") for k in CSV_HEADERS}
-        w.writerow(cleaned)
-    return path
 
-
-def push_kyc_record(ocr_results: dict):
+def build_payload(ocr_results: dict):
     """
-    Try API push (SOAP login + REST create). Return detailed result.
-    If API login is blocked (INVALID_LOGIN), you'll still have the CSV file from write_csv().
+    Map OCR outputs to your Salesforce fields on KYC_Record__c.
+    Fields:
+      Aadhaar_Number__c, Aadhaar_Name__c, Aadhaar_DOB__c (Date)
+      PAN_Number__c,    Pan_Name__c,     Pan_DOB__c     (Date)
     """
-    # 1) Build payload for REST
-    payload = build_kyc_row(ocr_results)
-    payload = {k: v for k, v in payload.items() if v not in (None, "")}
-
-    # 2) Try SOAP login on preferred domain, then alternate
-    primary = soap_login(SF_USERNAME, SF_PASSWORD, SF_SECURITY_TOKEN, SF_DOMAIN)
-    if not primary.get("success"):
-        alt_domain = "test" if SF_DOMAIN == "login" else "login"
-        alternate = soap_login(SF_USERNAME, SF_PASSWORD, SF_SECURITY_TOKEN, alt_domain)
-        return {"success": False, "auth": {"primary": primary, "alternate": alternate}}
-
-    # 3) Create record via REST
-    instance_url = primary["instance_url"]
-    access_token = primary["access_token"]
-    created = rest_create(instance_url, access_token, "KYC_Record__c", payload)
-    created["auth_used"] = {"domain": SF_DOMAIN}
-    return created
+    a = (ocr_results.get("aadhaar") or {})
+    p = (ocr_results.get("pan") or {})
+
+    payload = {
+        "Aadhaar_Number__c": a.get("aadhaar_number") if a.get("card_type") == "AADHAAR" else None,
+        "Aadhaar_Name__c":   a.get("name")           if a.get("card_type") == "AADHAAR" else None,
+        "Aadhaar_DOB__c":    _parse_birthdate(a.get("dob")) if a.get("card_type") == "AADHAAR" else None,
+        "PAN_Number__c":     p.get("pan_number")     if p.get("card_type") == "PAN" else None,
+        "Pan_Name__c":       p.get("name")           if p.get("card_type") == "PAN" else None,
+        "Pan_DOB__c":        _parse_birthdate(p.get("dob")) if p.get("card_type") == "PAN" else None,
+    }
+    # Drop Nones so we don't try to set blanks on required fields
+    return {k: v for k, v in payload.items() if v is not None}
 
 
 # ---------- Gradio callback ----------
 def process_documents(aadhaar_file, pan_file, push_to_sf):
+    """
+    OCR both uploads; optionally push one KYC_Record__c via simple-salesforce session POST.
+    """
     results = {"aadhaar": None, "pan": None}
 
     if not aadhaar_file and not pan_file:
@@ -213,17 +156,22 @@ def process_documents(aadhaar_file, pan_file, push_to_sf):
         except Exception as e:
             results["pan"] = {"error": f"PAN OCR failed: {str(e)}", "card_type": "UNKNOWN"}
 
-    # Always export CSV (works even if API login is blocked)
-    csv_row = build_kyc_row(results)
-    csv_path = write_csv(csv_row, "/mnt/data/KYC_Record_upload.csv")
-
-    output = {"ocr": results, "csv_file": csv_path}
+    output = {"ocr": results}
 
     if push_to_sf:
-        push_res = push_kyc_record(results)
-        output["salesforce"] = {"pushed": push_res.get("success", False), **push_res}
+        payload = build_payload(results)
+        try:
+            sf = sf_login()
+            created = sf_create_kyc_via_session(sf, payload)
+            output["salesforce"] = {"pushed": created.get("success", False), **created}
+        except Exception as e:
+            # Any auth/connection error shown plainly (not wrapped by SDK)
+            output["salesforce"] = {
+                "pushed": False,
+                "error": {"type": e.__class__.__name__, "message": str(e)}
+            }
 
-    return output, csv_path
+    return output
 
 
 # ---------- UI ----------
@@ -231,9 +179,7 @@ with gr.Blocks(title="Smart KYC OCR → Salesforce (KYC_Record__c)") as demo:
     gr.Markdown(
         """
         # 🧾 Smart KYC OCR → Salesforce
-        Upload **Aadhaar** and **PAN** separately.  
-        Click **Extract KYC Info** to get OCR + CSV (for Data Import Wizard).  
-        Optionally, toggle **Push to Salesforce** (API) — may fail on free/Essentials orgs.
+        Upload **Aadhaar** and **PAN** in separate boxes, then (optional) push one **KYC_Record__c**.
         """
     )
 
@@ -243,16 +189,15 @@ with gr.Blocks(title="Smart KYC OCR → Salesforce (KYC_Record__c)") as demo:
         with gr.Column(scale=1):
             pan_uploader = gr.File(label="📤 PAN Upload", file_types=[".jpg", ".jpeg", ".png"])
 
-    push_to_sf = gr.Checkbox(label="Push to Salesforce via API (create KYC_Record__c)", value=False)
-    submit_btn = gr.Button("🔍 Extract KYC Info", variant="primary")
+    push_to_sf = gr.Checkbox(label="Push to Salesforce (create KYC_Record__c)", value=False)
 
-    output_json = gr.JSON(label="📋 Output (OCR + Salesforce/Diagnostics)")
-    csv_download = gr.File(label="⬇️ CSV for Data Import Wizard")
+    submit_btn = gr.Button("🔍 Extract KYC Info", variant="primary")
+    output_json = gr.JSON(label="📋 Output (OCR + Salesforce)")
 
     submit_btn.click(
         fn=process_documents,
         inputs=[aadhaar_uploader, pan_uploader, push_to_sf],
-        outputs=[output_json, csv_download],
+        outputs=output_json,
     )
 
 if __name__ == "__main__":