Update zoho_client.py

zoho_client.py

@@ -5,7 +5,7 @@ from utils import normalize_date
 import time
 
 # =====================================================
-#  1. CORE AUTH
+#  1. AUTHENTICATION
 # =====================================================
 def get_headers():
     try:
@@ -16,165 +16,169 @@ def get_headers():
             "grant_type": "refresh_token",
             "redirect_uri": "http://www.google.com"
         }
-        # Short timeout to fail fast if auth is broken
-        resp = requests.post(config.AUTH_URL, data=params, timeout=10)
+        # Added 10s timeout to prevent hanging
+        resp = requests.post(config.AUTH_URL, data=params, timeout=10) 
         if resp.status_code == 200:
             return {"Authorization": f"Zoho-oauthtoken {resp.json().get('access_token')}"}
-        else:
-            print(f"Auth Failed: {resp.text}")
     except Exception as e:
-        print(f"Auth Connection Error: {e}")
+        print(f"Auth Error: {e}")
     return None
 
 # =====================================================
-#  2. CUSTOMER RESOLVER (With Hard Fallback)
+#  2. DIRECT CUSTOMER RESOLVER
 # =====================================================
 def get_customer_id(name, headers):
     """
-    Guarantees a Customer ID is returned.
-    1. Search Specific Name
-    2. Create Specific Name
-    3. Fallback to 'MCP Generic Customer'
+    Strict Logic: Search -> Found? -> Return ID. 
+    Else -> Create -> Return ID.
     """
     if not name or str(name).lower() in ["unknown", "none"]:
         name = "MCP Generic Customer"
 
-    # --- ATTEMPT 1: SEARCH ---
-    print(f"   🔎 Searching for: '{name}'")
+    print(f"   🔎 Searching Zoho for: '{name}'...")
+    
+    # --- STEP 1: SEARCH ---
     search_url = f"{config.API_BASE}/contacts"
+    search_params = {
+        'organization_id': config.ORGANIZATION_ID, 
+        'contact_name_contains': name
+    }
+    
     try:
-        res = requests.get(search_url, headers=headers, params={'organization_id': config.ORGANIZATION_ID, 'contact_name_contains': name})
+        # 10s Timeout
+        res = requests.get(search_url, headers=headers, params=search_params, timeout=10)
+        
         if res.status_code == 200:
             contacts = res.json().get('contacts', [])
-            for c in contacts:
-                # Loose match
-                if name.lower() in c['contact_name'].lower():
-                    return c['contact_id'], "Found Existing"
+            if len(contacts) > 0:
+                # MATCH FOUND!
+                found_id = contacts[0]['contact_id']
+                print(f"   ✅ Found Existing Customer: {contacts[0]['contact_name']} ({found_id})")
+                return found_id
+        else:
+            print(f"   ⚠️ Search API Status: {res.status_code} (Not 200)")
+            
     except Exception as e:
-        print(f"   ⚠️ Search Error: {e}")
+        print(f"   ❌ Search Exception: {e}")
 
-    # --- ATTEMPT 2: CREATE ---
-    print(f"   🆕 Creating: '{name}'")
+    # --- STEP 2: CREATE (Only if Search failed) ---
+    print(f"   🆕 Not found. Creating new customer: '{name}'...")
+    
+    create_payload = {
+        "contact_name": name,
+        "contact_type": "customer"
+    }
+    
     try:
-        payload = {"contact_name": name, "contact_type": "customer"}
-        res = requests.post(f"{config.API_BASE}/contacts?organization_id={config.ORGANIZATION_ID}", headers=headers, json=payload)
+        res = requests.post(search_url, headers=headers, params={'organization_id': config.ORGANIZATION_ID}, json=create_payload, timeout=10)
         
         if res.status_code == 201:
-            return res.json()['contact']['contact_id'], "Created New"
+            new_id = res.json().get('contact', {}).get('contact_id')
+            print(f"   ✅ Created New: {new_id}")
+            return new_id
         
-        # If Duplicate (Code 3062), we MUST find it via search now
+        # Handle Duplicate Error (Race Condition)
         if res.json().get('code') == 3062:
-            print("   ⚠️ Duplicate detected. Retrying Search...")
-            return get_customer_id(name, headers) # Recursive retry (Safe because search logic handles it)
-            
-    except Exception as e:
-        print(f"   ⚠️ Create Error: {e}")
-
-    # --- ATTEMPT 3: FALLBACK (The Safety Net) ---
-    if name != "MCP Generic Customer":
-        print("   ❌ Specific Customer Failed. Switching to Generic Fallback.")
-        return get_customer_id("MCP Generic Customer", headers)
-    
-    return None, "Failed Completely"
+            print("   ⚠️ Zoho says Duplicate. Forcing Search on exact name...")
+            # Logic: If we are here, the 'contains' search failed, but it exists.
+            # We assume it exists and we just failed to fetch it. 
+            # We cannot proceed without an ID.
+            return None
 
-# =====================================================
-#  3. DATA CLEANING
-# =====================================================
-def sanitize_lines(raw_items):
-    """Ensures valid line items for Zoho."""
-    clean = []
-    if not raw_items:
-        # Default if extraction failed
-        return [{"name": "Services Rendered", "rate": 0, "quantity": 1}]
-
-    for item in raw_items:
-        name = str(item.get("name") or item.get("description") or "Item")
-        desc = str(item.get("description", ""))
-        
-        try: rate = float(str(item.get("rate", 0)).replace(",", "").replace("$", ""))
-        except: rate = 0.0
+        print(f"   ❌ Creation Failed: {res.text}")
         
-        try: qty = float(str(item.get("quantity", 1)))
-        except: qty = 1.0
-
-        if len(name) > 100:
-            desc = f"{name} \n {desc}"
-            name = name[:95] + "..."
+    except Exception as e:
+        print(f"   ❌ Create Exception: {e}")
 
-        clean.append({
-            "name": name,
-            "description": desc,
-            "rate": rate,
-            "quantity": qty
-        })
-    return clean
+    return None
 
 # =====================================================
-#  4. MAIN PROCESSOR (Invoices Only)
+#  3. INVOICE PUSHER
 # =====================================================
-def process_invoice(ai_data):
-    """
-    Linear Script: Auth -> Customer -> Invoice -> Done.
-    """
-    yield "🔄 Mode: INVOICE ONLY (Simplified)\n"
+def create_invoice(cid, ai_data, headers):
+    print("   📦 Preparing Invoice Payload...")
     
-    # 1. Auth
-    headers = get_headers()
-    if not headers: 
-        yield "❌ Critical: Authentication Failed."
-        return
-
-    # 2. Customer
-    cust_name = ai_data.get('data', {}).get('vendor_name', 'Unknown')
-    yield f"⌛ Resolving Customer: {cust_name}..."
+    # 1. Process Line Items (Handle 0 items case)
+    raw_items = ai_data.get('line_items', [])
+    clean_items = []
     
-    cid, status = get_customer_id(cust_name, headers)
+    if raw_items:
+        for item in raw_items:
+            clean_items.append({
+                "name": str(item.get("name", "Service"))[:100], # Limit 100 chars
+                "rate": float(item.get("rate", 0)),
+                "quantity": float(item.get("quantity", 1))
+            })
     
-    if not cid:
-        yield "🛑 Critical: Could not find or create ANY customer (even fallback)."
-        return
-    yield f"   -> {status} (ID: {cid})\n"
+    # Fallback if list is empty
+    if not clean_items:
+        print("   ⚠️ No items found. Using Default 'Services Rendered' Item.")
+        clean_items = [{
+            "name": "Services Rendered",
+            "description": "Auto-generated from document total",
+            "rate": float(ai_data.get("total", 0)),
+            "quantity": 1
+        }]
 
-    # 3. Prepare Payload
-    raw_data = ai_data.get('data', {})
+    # 2. Build Payload
     payload = {
         "customer_id": cid,
-        "date": normalize_date(raw_data.get('date')),
-        "line_items": sanitize_lines(raw_data.get('line_items')),
+        "date": normalize_date(ai_data.get("date")),
+        "invoice_number": ai_data.get("reference_number") or f"INV-{int(time.time())}",
+        "line_items": clean_items,
         "status": "draft"
     }
-    
-    # Invoice Number
-    ref_num = raw_data.get("reference_number") or f"INV-{int(time.time())}"
-    payload["invoice_number"] = ref_num
 
-    # 4. Send to Zoho
-    yield "🚀 Sending Invoice..."
+    # 3. Send
     url = f"{config.API_BASE}/invoices?organization_id={config.ORGANIZATION_ID}"
-    
     try:
-        resp = requests.post(url, headers=headers, json=payload)
+        print("   🚀 Sending Invoice to Zoho...")
+        res = requests.post(url, headers=headers, json=payload, timeout=15)
         
-        # Retry if Auto-Numbering is On (Code 4097)
-        if resp.status_code != 201 and resp.json().get('code') == 4097:
-            yield "\n⚠️ Auto-Numbering is ON. Retrying without Invoice Number..."
-            del payload["invoice_number"]
-            resp = requests.post(url, headers=headers, json=payload)
-
-        # Final Result
-        if resp.status_code == 201:
-            inv = resp.json().get('invoice', {})
-            yield f"\n✅ SUCCESS! Invoice Created.\nNumber: {inv.get('invoice_number')}\nID: {inv.get('invoice_id')}"
-        else:
-            yield f"\n❌ Zoho Error: {resp.text}"
-            
+        # Auto-Number Retry
+        if res.status_code != 201 and res.json().get('code') == 4097:
+            print("   ⚠️ Auto-Numbering active. Removing ID and Retrying...")
+            del payload['invoice_number']
+            res = requests.post(url, headers=headers, json=payload, timeout=15)
+
+        if res.status_code == 201:
+            inv = res.json().get('invoice', {})
+            return f"✅ SUCCESS! Invoice Created.\nNumber: {inv.get('invoice_number')}\nLink: https://books.zoho.in/app/{config.ORGANIZATION_ID}#/invoices/{inv.get('invoice_id')}"
+        
+        return f"❌ Zoho Error: {res.text}"
+
     except Exception as e:
-        yield f"\n❌ System Error: {e}"
+        return f"❌ Connection Error: {e}"
 
 # =====================================================
-#  5. APP BRIDGE
+#  4. MAIN EXECUTOR
 # =====================================================
 def route_and_execute(ai_output):
-    # Ignore doc_type, force Invoice logic
-    for log in process_invoice(ai_output):
-        yield log
+    # 1. Get Auth
+    headers = get_headers()
+    if not headers:
+        yield "❌ Auth Failed. Check Credentials."
+        return
+
+    # 2. Get Data
+    data = ai_output.get('data', {})
+    vendor_name = data.get('vendor_name')
+    
+    yield f"🔄 Processing Invoice for: {vendor_name}\n"
+
+    # 3. Get Customer ID
+    cid = get_customer_id(vendor_name, headers)
+    
+    if not cid:
+        # HARD FALLBACK: If name search fails, try generic
+        yield "   ⚠️ Specific customer failed. Trying 'Generic' fallback...\n"
+        cid = get_customer_id("MCP Generic Customer", headers)
+        if not cid:
+            yield "🛑 Critical: Could not find/create any customer."
+            return
+
+    yield f"   -> Customer ID: {cid}\n"
+
+    # 4. Create Invoice
+    result = create_invoice(cid, data, headers)
+    yield result