Update app.py

app.py

@@ -150,56 +150,10 @@ 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 update_salesforce(mode, sale_type, product_name, model_name, quantity):
-    # Connect to Salesforce
-    sf = Salesforce(username='your_username', password='your_password', security_token='your_security_token')
-    
-    if mode == 'entry':
-        if sale_type == 'sales':
-            sf.VENKATA_RAMANA_MOTORS__c.update(
-                {'Name': product_name, 'Model__c': model_name, 'Quantity__c': quantity}
-            )
-        elif sale_type == 'non_sales':
-            sf.UNBILLING_DATA__c.update(
-                {'Name': product_name, 'Model__c': model_name, 'TotalQuantity__c': quantity}
-            )
-    
-    elif mode == 'exit':
-        if sale_type == 'sales':
-            # Find the matched product name or model name and update
-            query = f"SELECT Id FROM Inventory_Management__c WHERE Name='{product_name}' OR Model__c='{model_name}'"
-            records = sf.query(query)['records']
-            if records:
-                sf.Inventory_Management__c.update(
-                    records[0]['Id'], {'Quantity_Sold__c': quantity}
-                )
-        elif sale_type == 'non_sales':
-            # Find the matched product name or model name and update
-            query = f"SELECT Id FROM Un_Billable__c WHERE Name='{product_name}' OR Model__c='{model_name}'"
-            records = sf.query(query)['records']
-            if records:
-                sf.Un_Billable__c.update(
-                    records[0]['Id'], {'Sold_Out__c': quantity}
-                )
-
-# 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')
+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:
         sf = Salesforce(
@@ -208,23 +162,21 @@ def interact_with_salesforce(mode, entry_type, quantity, extracted_text):
             security_token=SALESFORCE_SECURITY_TOKEN
         )
 
-        # Determine Salesforce Object and Quantity Field for Entry Mode
+        # Define Salesforce Object & Fields
         object_name = None
-        product_field_name = "Product_Name__c"  # Needs verification
-        model_field_name = "Modal_Name__c"  # Needs verification
+        product_field_name = "Product_Name__c"
+        model_field_name = "Modal_Name__c"
         quantity_field = None
 
         if mode == "Entry":
             if entry_type == "Sales":
                 object_name = "VENKATA_RAMANA_MOTORS__c"
-                quantity_field = "Quantity__c"  # Needs verification
-                product_field_name = "Productname__c"  # Adjusted based on ENTRY Mode fields
-                model_field_name = "Model__c"  # Adjusted based on ENTRY Mode fields
+                quantity_field = "Quantity__c"
             elif entry_type == "Non-Sales":
                 object_name = "UNBILLING_DATA__c"
                 quantity_field = "TotalQuantity__c"
 
-        elif mode == "Exit":  # Exit Mode is working fine, so we don't touch it
+        elif mode == "Exit":  # ✅ Only modify Exit Mode logic
             if entry_type == "Sales":
                 object_name = "Inventory_Management__c"
                 quantity_field = "Quantity_Sold__c"
@@ -233,44 +185,42 @@ def interact_with_salesforce(mode, entry_type, quantity, extracted_text):
                 quantity_field = "Sold_Out__c"
 
         if not object_name or not quantity_field:
-            return "Invalid mode or entry type."
+            return "❌ Invalid mode or entry type."
 
-        # Extract Product Name or Model Name
+        # 🔹 Extract Product Name or Model Name from OCR text
         product_name = match_product_name(extracted_text)
         attributes = extract_attributes(extracted_text)
         model_name = attributes.get("Model Name", "").strip()
 
-        if not product_name and not model_name:
-            return "❌ No product name or model name detected. Please provide a valid product or model."
+        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."
 
-        # Adjust the field names for Entry Mode to match correct fields in Salesforce
-        if mode == "Entry":
-            product_field_name = "Productname__c"  # Adjusted based on ENTRY Mode
-            model_field_name = "Model__c"  # Adjusted based on ENTRY Mode
+            # ✅ 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}'")
 
-        # Build Query to Find Matching Product
-        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}'")
+            query_condition_string = " OR ".join(query_conditions)
 
-        query_condition_string = " OR ".join(query_conditions)
+            query = f"SELECT Id, {quantity_field} FROM {object_name} WHERE {query_condition_string} LIMIT 1"
+            response = sf.query(query)
 
-        query = f"SELECT Id, {quantity_field} FROM {object_name} WHERE {query_condition_string} LIMIT 1"
-        response = sf.query(query)
+            if response["records"]:
+                record_id = response["records"][0]["Id"]
+                existing_quantity = response["records"][0].get(quantity_field, 0)
 
-        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  
 
-            # Update quantity directly
-            updated_quantity = quantity  # Just set the new quantity without adding/subtracting
+                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}."
+            else:
+                return f"❌ No matching product found in {object_name}. Please check the product/model name."
 
-            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}."
-        else:
-            return f"❌ No matching product found in {object_name}. Check field names or product/model data."
+        return "✅ Entry mode unchanged. Data will be processed normally."
 
     except Exception as e:
         return f"❌ Error interacting with Salesforce: {str(e)}"