Update app.py

app.py

@@ -6,15 +6,20 @@ import json
 import requests
 from simple_salesforce import Salesforce
 import urllib.parse
+from dotenv import load_dotenv
+import os
 
 app = Flask(__name__)
 
-# Salesforce Connected App credentials
-SALESFORCE_CONSUMER_KEY = 'your_consumer_key'
-SALESFORCE_CONSUMER_SECRET = 'your_consumer_secret'
-SALESFORCE_REDIRECT_URI = 'http://localhost:5000/oauth/callback'
-SALESFORCE_AUTH_URL = 'https://login.salesforce.com/services/oauth2/authorize'
-SALESFORCE_TOKEN_URL = 'https://login.salesforce.com/services/oauth2/token'
+# Load environment variables
+load_dotenv()
+SALESFORCE_OAUTH_URL = os.getenv('SALESFORCE_OAUTH_URL')
+SF_CLIENT_ID = os.getenv('SF_CLIENT_ID')
+SF_CLIENT_SECRET = os.getenv('SF_CLIENT_SECRET')
+SALESFORCE_REDIRECT_URI = os.getenv('SALESFORCE_REDIRECT_URI')
+SF_USERNAME = os.getenv('SF_USERNAME')
+SF_PASSWORD = os.getenv('SF_PASSWORD')
+SF_DOMAIN = os.getenv('SF_DOMAIN')
 
 # Database connection
 conn = psycopg2.connect(
@@ -37,12 +42,12 @@ instance_url = None
 @app.route('/login')
 def login():
     params = {
-        'client_id': SALESFORCE_CONSUMER_KEY,
+        'client_id': SF_CLIENT_ID,
         'redirect_uri': SALESFORCE_REDIRECT_URI,
         'response_type': 'code',
         'scope': 'api refresh_token'
     }
-    auth_url = f"{SALESFORCE_AUTH_URL}?{urllib.parse.urlencode(params)}"
+    auth_url = f"https://login.salesforce.com/services/oauth2/authorize?{urllib.parse.urlencode(params)}"
     return redirect(auth_url)
 
 @app.route('/oauth/callback')
@@ -54,14 +59,14 @@ def oauth_callback():
     
     data = {
         'grant_type': 'authorization_code',
-        'client_id': SALESFORCE_CONSUMER_KEY,
-        'client_secret': SALESFORCE_CONSUMER_SECRET,
+        'client_id': SF_CLIENT_ID,
+        'client_secret': SF_CLIENT_SECRET,
         'redirect_uri': SALESFORCE_REDIRECT_URI,
         'code': code
     }
-    response = requests.post(SALESFORCE_TOKEN_URL, data=data)
+    response = requests.post(SALESFORCE_OAUTH_URL, data=data)
     if response.status_code != 200:
-        return jsonify({"error": "Failed to obtain access token"}), 500
+        return jsonify({"error": "Failed to obtain access token", "details": response.text}), 500
     
     token_data = response.json()
     access_token = token_data['access_token']
@@ -93,8 +98,8 @@ def upload_contract():
     
     file = request.files['contract']
     text = extract_text_from_pdf(file)
-    if not text:
-        return jsonify({"error": "Failed to extract text from PDF"}), 500
+    if not text or isinstance(text, str) and text.startswith("Error"):
+        return jsonify({"error": "Failed to extract text from PDF", "details": text}), 500
     
     # Extract entities
     entities = ner_pipeline(text)
@@ -121,12 +126,12 @@ def upload_contract():
         conn.commit()
     except Exception as e:
         conn.rollback()
-        return jsonify({"error": str(e)}), 500
+        return jsonify({"error": f"Database error: {str(e)}"}), 500
     
     # Push to Salesforce
     try:
         sf = Salesforce(instance_url=instance_url, session_id=access_token)
-        sf.Contract__c.create({
+        sf_response = sf.Contract__c.create({
             'Content__c': text[:1000],  # Truncate for Salesforce field limit
             'Entities__c': json.dumps(extracted_data),
             'Compliance__c': json.dumps(compliance_results)
@@ -136,6 +141,7 @@ def upload_contract():
     
     return jsonify({
         "contract_id": contract_id,
+        "salesforce_id": sf_response['id'],
         "entities": extracted_data,
         "compliance": compliance_results
     })