Update app.py

app.py

@@ -72,36 +72,13 @@ ATTRIBUTE_MAPPING = {
     "SRnumber": "SRnumber__c",
     "TypeOfEndUse": "TypeOfEndUse__c",
     "Model Name": "Model_Name_Number__c",
-    "coolingmethod": "coolingmethod__c"
+    "coolingmethod": "coolingmethod__c",
+    "H.P.": "H_p__c"
 }
 
 # List of product names to match
 PRODUCT_NAMES = [
-    "Centrifugal mono block pump", "SINGLE PHASE MOTOR STARTER", "EasyPact EZC 100",
-    "Openwell Submersible Pumpset", "Electric Motor", "Self Priming Pump",
-    "Control panel for single phase submersible pumps", "MOTOR", "Submersible pump set",
-    "Fusion submersible pump set", "DCT", "Shock proof water proof", "CG COMMERCIAL MOTORS", "Fusion",
-    "control panel for single phase submerisible pumps",
-    "single phase digital starter dry run and timer panel", "5HP AV1 XL Kirloskar Pump",
-    "Phase stainless steel submersible pump", "Submersible pump", "WB15X",
-    "Vtype self priming pump", "SP SHINE DISC", "havells submersible pump",
-    "Havells open well Submersible pump", "Bertolini pump CK3 90pp",
-    "WPA 772 Water Pump Assy", "bertolini TTL triplex high pressure plunger pumps",
-    "Generic plunger high pressure pump", "Apple Normal, Banana",
-    "Cast Iron KSb centrifugal pump", "5.5kw Water Pump",
-    "KSB reliable i line centrifuged pumps", "Apple Normal, Orange, Banana",
-    "Positive API 6745 hydraulic diaphragm pump", "1/2 inch Fuel Hose Pipe", "Kirloskar Water Pump",
-    "Rotodel motor pump", "PVC Electrical Insulation Materials",
-    "Electric kirloskar domestic water pump", "Electrical Insulation Materials",
-    "sellowell motor pump", "bhupathi submersible pump set",
-    "Flowshine Submersible pump set", "Index submersible pump",
-    "Wintoss Plastic Electric Switch Board", "Electric 18 watt ujagar cooler pump",
-    "Generator Service", "LG WM FHT1207ZWL, LG REF GL-S292RSCY",
-    "Water tank, Filters, Water Pump", "MS Control Submersible Panel",
-    "Centrifugal Monoblock Pumps", "Electric Motor with Pump BodyBlue and White",
-    "Various Repair and Maintenance Parts", "Earthmax Pump",
-    "Water Tank, Filters, Water Pump", "Centrifugal Water Pump for Agriculture",
-    "mono block pumps"
+     "Fusion", "Agroking", "openwell", "CG commercial motors", "Jaguar", "Submersible pumps", "Gaurav"
 ]
 
 # Salesforce credentials
@@ -161,8 +138,11 @@ def interact_with_salesforce(mode, entry_type, quantity, extracted_text):
         # Mapping mode and entry_type to Salesforce object and field
         object_name = None
         field_name = None
-        product_field_name = "Product_Name__c"
-        model_field_name = "Modal_Name__c"  # Correct field for model name
+        field_names = []
+        product_field_name = "Productname__c"
+        model_field_name = "Model__c"
+        stage_field_name = "Stage__c"
+        hp_field_name = "H_p__c"
 
         if mode == "Entry":
             if entry_type == "Sales":
@@ -174,12 +154,12 @@ def interact_with_salesforce(mode, entry_type, quantity, extracted_text):
         elif mode == "Exit":
             if entry_type == "Sales":
                 object_name = "Inventory_Management__c"
-                field_name = "Quantity_Sold__c"
+                field_names = ["Quantity_Sold__c", "soldstock__c"]
             elif entry_type == "Non-Sales":
                 object_name = "Un_Billable__c"
-                field_name = "Sold_Out__c"
+                field_names = ["Sold_Out__c", "soldstock__c"]
 
-        if not object_name or not field_name:
+        if not object_name or (not field_name and not field_names):
             return "Invalid mode or entry type."
 
         # Get valid fields for the specified Salesforce object
@@ -191,6 +171,8 @@ def interact_with_salesforce(mode, entry_type, quantity, extracted_text):
         product_name = match_product_name(extracted_text)
         attributes = extract_attributes(extracted_text)
         model_name = attributes.get("Model Name", "").strip()
+        stage = attributes.get("Stage", "").strip()
+        hp = attributes.get("H.P.", "").strip()
 
         if not product_name:
             return "Product name could not be matched from the extracted text."
@@ -199,20 +181,24 @@ def interact_with_salesforce(mode, entry_type, quantity, extracted_text):
 
         # Handling "Exit" Mode (Updating Records)
         if mode == "Exit":
-            # Query should only match exact product name or exact model name
+            # Query should only match exact product name, model name, stage, or hp
             query_conditions = []
             if model_name:
                 query_conditions.append(f"{model_field_name} = '{model_name}'")
+            if stage:
+                query_conditions.append(f"{stage_field_name} = '{stage}'")
+            if hp:
+                query_conditions.append(f"{hp_field_name} = '{hp}'")
             query_conditions.append(f"{product_field_name} = '{product_name}'")
 
-            query = f"SELECT Id, {field_name} FROM {object_name} WHERE {' OR '.join(query_conditions)} LIMIT 1"
+            query = f"SELECT Id, {', '.join(field_names)} FROM {object_name} WHERE {' OR '.join(query_conditions)} LIMIT 1"
             response = sf.query(query)
 
             if response["records"]:
                 record_id = response["records"][0]["Id"]
-                updated_quantity = quantity  # Overwrite the quantity
-                sf_object.update(record_id, {field_name: updated_quantity})
-                return f"✅ Updated record for product '{product_name}' ({model_name}) in {object_name}. New {field_name}: {updated_quantity}."
+                updated_fields = {field: quantity for field in field_names}
+                sf_object.update(record_id, updated_fields)
+                return f"✅ Updated record for product '{product_name}' ({model_name}) in {object_name}. Updated fields: {updated_fields}."
             else:
                 return f"❌ No matching record found for product '{product_name}' ({model_name}) in {object_name}."
 
@@ -225,6 +211,7 @@ def interact_with_salesforce(mode, entry_type, quantity, extracted_text):
 
     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:
@@ -234,21 +221,29 @@ def pull_data_from_salesforce():
             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)
+        query_inventory = "SELECT Product_Name__c,  Current_Stocks__c, soldstock__c FROM Inventory_Management__c LIMIT 100"
+        query_unbillable = "SELECT Product_Name__c,  Current_Stock__c, soldstock__c FROM Un_Billable__c LIMIT 100"
+        
+        response_inventory = sf.query_all(query_inventory)
+        response_unbillable = sf.query_all(query_unbillable)
        
-        records = response.get("records", [])
-        if not records:
+        records_inventory = response_inventory.get("records", [])
+        records_unbillable = response_unbillable.get("records", [])
+        
+        if not records_inventory and not records_unbillable:
             return "No data found in Salesforce.", None, None, None
-       
+        
+        records = records_inventory + records_unbillable
         df = pd.DataFrame(records)
         df = df.drop(columns=['attributes'], errors='ignore')
        
         # Rename columns for better readability
         df.rename(columns={
             "Product_Name__c": "Product Name",
-            "Modal_Name__c": "Model Name",
-            "Current_Stocks__c": "Current Stocks"
+            "Modal_Name__c": "Model Name (Inventory)",
+            "Model_Name__c": "Model Name (Unbillable)",
+            "Current_Stocks__c": "Current Stocks",
+            "soldstock__c": "Sold Stock"
         }, inplace=True)
        
         excel_path = "salesforce_data.xlsx"
@@ -294,7 +289,7 @@ def app():
         gr.Interface(
             fn=process_image,
             inputs=[
-                gr.Image(type="numpy", label="📄 Upload Image"),
+                gr.Image(type="numpy", label="📄ᴜᴘʟᴏᴀᴅ ɪᴍᴀɢᴇ"),
                 gr.Dropdown(label="📌 Mode", choices=["Entry", "Exit"], value="Entry"),
                 gr.Radio(label="📦 Entry Type", choices=["Sales", "Non-Sales"], value="Sales"),
                 gr.Number(label="🔢 Quantity", value=1, interactive=True),
@@ -303,8 +298,8 @@ def app():
                 gr.Text(label="📝 Extracted Image Data"),
                 gr.Text(label="🚀 Result")
             ],
-            title="🏢 Inventory Management",
-            description="📦 Inventory Management System"
+            title="🏢 𝑽𝑬𝑵𝑲𝑨𝑻𝑨𝑹𝑨𝑴𝑨𝑵𝑨 𝑴𝑶𝑻𝑶𝑹𝑺",
+            description="📦 𝐈𝐍𝐕𝐄𝐍𝐓𝐎𝐑𝐘 𝐌𝐀𝐍𝐀𝐆𝐄𝐌𝐄𝐍𝐓"
         ),
         gr.Interface(
             fn=pull_data_from_salesforce,
@@ -321,5 +316,4 @@ def app():
     ], ["📥 OCR Processing", "📊 Salesforce Data Export"])
 
 if __name__ == "__main__":
-    app().launch(share=True)
-
+    app().launch(share=True)