Update app.py

app.py

@@ -149,10 +149,6 @@ def extract_attributes(extracted_text):
 def filter_valid_attributes(attributes, valid_fields):
     return {ATTRIBUTE_MAPPING[key]: value for key, value in attributes.items() if ATTRIBUTE_MAPPING[key] in valid_fields}
 
-#📊  Function to interact with Salesforce based on mode and type
-def filter_valid_attributes(attributes, valid_fields):
-    return {ATTRIBUTE_MAPPING[key]: value for key, value in attributes.items() if ATTRIBUTE_MAPPING[key] in valid_fields}
-
 #📊  Function to interact with Salesforce based on mode and type
 def interact_with_salesforce(mode, entry_type, quantity, extracted_text):
     try:
@@ -162,68 +158,86 @@ def interact_with_salesforce(mode, entry_type, quantity, extracted_text):
             security_token=SALESFORCE_SECURITY_TOKEN
         )
 
-        # Define Salesforce Object & Fields
+        # Mapping mode and entry_type to Salesforce object and field
         object_name = None
-        product_field_name = "Product_Name__c"
-        model_field_name = "Modal_Name__c"
-        quantity_field = None
+        field_name = None
+        product_field_name = "Product_Name__c"  # Correct field for product name in the object
+        model_field_name = "Modal_Name__c"  # Correct field for model name in the object
 
         if mode == "Entry":
             if entry_type == "Sales":
                 object_name = "VENKATA_RAMANA_MOTORS__c"
-                quantity_field = "Quantity__c"
+                field_name = "Quantity__c"
             elif entry_type == "Non-Sales":
                 object_name = "UNBILLING_DATA__c"
-                quantity_field = "TotalQuantity__c"
-
-        elif mode == "Exit":  # ✅ Only modify Exit Mode logic
+                field_name = "TotalQuantity__c"
+        elif mode == "Exit":
             if entry_type == "Sales":
                 object_name = "Inventory_Management__c"
-                quantity_field = "Quantity_Sold__c"
+                product_field_name = "Product_Name__c"
+                model_field_name = "Modal_Name__c"
+                field_name = "Quantity_Sold__c"
             elif entry_type == "Non-Sales":
                 object_name = "Un_Billable__c"
-                quantity_field = "Sold_Out__c"
+                product_field_name = "Product_Name__c"
+                model_field_name = "Model_Name__c"
+                field_name = "Sold_Out__c"
+
+        if not object_name or not field_name:
+            return "Invalid mode or entry type."
 
-        if not object_name or not quantity_field:
-            return "❌ Invalid mode or entry type."
+        # Get valid fields for the specified Salesforce object
+        sf_object = sf.__getattr__(object_name)
+        schema = sf_object.describe()
+        valid_fields = {field["name"] for field in schema["fields"]}
 
-        # 🔹 Extract Product Name or Model Name from OCR text
+        # Extract product name or model number
         product_name = match_product_name(extracted_text)
         attributes = extract_attributes(extracted_text)
-        model_name = attributes.get("Model Name", "").strip()
 
-        if mode == "Exit":
-            if not product_name and not model_name:
-                return "❌ No product name or model name detected. Please provide a valid product or model."
-
-            # ✅ Build Query to Find Matching Product in Exit Mode
-            query_conditions = []
-            if product_name:
-                query_conditions.append(f"{product_field_name} = '{product_name}'")
-            if model_name:
-                query_conditions.append(f"{model_field_name} = '{model_name}'")
+        if not product_name:
+            return "Product name could not be matched from the extracted text."
 
-            query_condition_string = " OR ".join(query_conditions)
+        attributes["Product name"] = product_name
 
-            query = f"SELECT Id, {quantity_field} FROM {object_name} WHERE {query_condition_string} LIMIT 1"
+        if mode == "Exit":
+            query = f"SELECT Id, {field_name} FROM {object_name} WHERE {product_field_name} = '{product_name}' OR {model_field_name} = '{attributes.get('Model Name', '')}' LIMIT 1"
             response = sf.query(query)
 
             if response["records"]:
                 record_id = response["records"][0]["Id"]
-                existing_quantity = response["records"][0].get(quantity_field, 0)
-
-                # ✅ Directly update the quantity (do not add or subtract)
-                updated_quantity = quantity  
-
-                sf.__getattr__(object_name).update(record_id, {quantity_field: updated_quantity})
-                return f"✅ Successfully updated quantity for '{product_name or model_name}' in {object_name}. New {quantity_field}: {updated_quantity}."
+                updated_quantity = quantity  # Overwrite the quantity, don't add
+                sf_object.update(record_id, {field_name: updated_quantity})
+                return f"Updated record for product '{product_name}' in {object_name}. New {field_name}: {updated_quantity}."
             else:
-                return f"❌ No matching product found in {object_name}. Please check the product/model name."
-
-        return "✅ Entry mode unchanged. Data will be processed normally."
+                return f"No matching record found for product '{product_name}' in {object_name}."
+        else:
+            filtered_attributes = filter_valid_attributes(attributes, valid_fields)
+            filtered_attributes[field_name] = quantity
+            sf_object.create(filtered_attributes)
+            return f"✅ Data successfully exported to Salesforce object {object_name}."
 
     except Exception as e:
         return f"❌ Error interacting with Salesforce: {str(e)}"
+
+# Function to pull structured data from Salesforce and display as a table
+def pull_data_from_salesforce():
+    try:
+        sf = Salesforce(
+            username=SALESFORCE_USERNAME,
+            password=SALESFORCE_PASSWORD,
+            security_token=SALESFORCE_SECURITY_TOKEN
+        )
+       
+        query = "SELECT Product_Name__c, Modal_Name__c, Current_Stocks__c FROM Inventory_Management__c LIMIT 100"
+        response = sf.query_all(query)
+       
+        records = response.get("records", [])
+        if not records:
+            return "No data found in Salesforce.", None, None, None
+       
+        df = pd.DataFrame(records)
+        df = df.drop(columns=['attributes'], errors='ignore')
        
         # Rename columns for better readability
         df.rename(columns={