AIEmailAutomationUtility 0.0.26__py3-none-any.whl → 0.0.27__py3-none-any.whl

AIEmailAutomationUtility/EmailReplyAssistant.py

@@ -95,6 +95,12 @@ class EmailReplyAssistant:
 
     def identify_customer_product_reply_assitant(self, openAI_key, assistant_ID, email_content, subject, prompt):
         try:
+            logger.log(f"the Assistant id is ::: {assistant_ID}")
+            logger.log(f"the Prompt is ::: {prompt}")
+            logger.log(f"the Api key is ::: {openAI_key}")
+            logger.log(f"the email content is ::: {email_content}")
+            logger.log(f"the subject is ::: {subject}")
+
             openAI_response = ""
             client = OpenAI(api_key=openAI_key)
             thread = client.beta.threads.create()
@@ -102,7 +108,8 @@ class EmailReplyAssistant:
             client.beta.threads.messages.create(
                 thread_id=thread.id,
                 role="user",
-                content=f"subject:{subject}\nemail body:{email_content}",
+                # content=f"subject:{subject}\nemail body:{email_content}",
+                content=prompt,
             )
 
             event_handler = EmailReplyAssistant().EventHandler()
@@ -110,7 +117,7 @@ class EmailReplyAssistant:
             with client.beta.threads.runs.stream(
                 thread_id=thread.id,
                 assistant_id=assistant_ID,
-                instructions=prompt,
+                # instructions=prompt,
                 event_handler=event_handler,
             ) as stream:
                 stream.until_done()

AIEmailAutomationUtility/Email_Read.py

@@ -552,7 +552,8 @@ class Email_Read:
             logger.log(f"Exception in writeJsonFile: {msg} \n {trace} \n DataType ::: {type(msg)}")
             raise Exception(msg)
 
-    def log_email_login(self, user_id, email, model_name, login_status, base_dir="EMail_log"):
+    def log_email_login(self, user_id, email, model_name, login_status):
+        base_dir="EMail_log"
         timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
         log_dir = os.path.join(base_dir, user_id)
         os.makedirs(log_dir, exist_ok=True)

AIEmailAutomationUtility/Process_Category.py

@@ -42,16 +42,14 @@ class Process_Category:
         is_html = dataValues.get('is_html')
         import_file = dataValues.get('import_file')
 
-
-        logger.log(f"the json datavalues  of mailare ------------------------ {mail}")
-        logger.log(f"the json datavalues of email_id are ------------------------ {email_id}")
-        logger.log(f"the  category is ------------------------ {category}")
+        customer_determination = None
+        product_determination = None
 
         if category == "Product Enquiry":
             if Model_Name == "OpenAI":
                 action_taken = "Reply email drafted using Open_AI Model"
                 responseMethod, parameters = self.get_JsonArray_values(category, file_JsonArray)
-                logger.log(f"the repsonse method{responseMethod}")
+                logger.log(f"the repsonse method is ::: {responseMethod}")
                 if responseMethod == "Reply_Email_Ai_Assistant":
                     emailreplyassistant = EmailReplyAssistant()
                     openai_Response = emailreplyassistant.Reply_Email_Ai_Assistant(openai_api_key, parameters["Assistant_Id"], openai_Process_Input, subject)
@@ -156,32 +154,39 @@ class Process_Category:
 
             # Step 4: Identify customer from email using AI
             customer_data = self.identify_customer(email_body, subject, Model_Name, openai_api_key, geminiAI_APIKey, localAIURL, parameters["Customer_Assistant_Id"])
-            logger.log(f"Identified customer: {customer_data}")
-            logger.log(f'This is the customer data we are getting ::: {customer_data}')
+            logger.log(f"Identified customer is ::: {customer_data}")
+
+            customer_determination=customer_data
+
             # Extract customer code once
             customer_code = customer_data.get("customer_code", "")
 
             # Step 5: Identify product from email using AI
             products = self.identify_products(email_body, subject, Model_Name, openai_api_key, geminiAI_APIKey, localAIURL, parameters["Product_Assistant_Id"])
-            logger.log(f'this is the products data we are getting ::: {products}')
+            logger.log(f'Identified Products are ::: {products}')
+
+            product_determination=products
 
             db_connection = sqlite3.connect('/home/base/git/ai-email-automation/AI_Email/database/fetchprice.db')
             for product in products:
-                cursor = db_connection.cursor()
-
                 item_no = product.get("item_no", "").strip()
                 make = product.get("make", "").strip()
                 rate = None
                 found_rate = False
 
+                logger.log(f"item no is ::: {item_no}")
+                logger.log(f"make is ::: {make}")
+
                 # Step 1: Get base price from PRICE_LIST
                 query_price = '''
                     SELECT PRICE 
                     FROM PRICE_LIST 
                     WHERE ITEM_NO = ?;
                 '''
+                cursor = db_connection.cursor()
                 cursor.execute(query_price, (item_no,))
                 price_result = cursor.fetchone()
+                cursor.close()
 
                 if price_result:
                     price_raw = price_result[0]
@@ -194,17 +199,16 @@ class Process_Category:
 
                     try:
                         raw_price = float(price_cleaned)
-                        logger.log(f"[0] Base price for item '{item_no}' is {raw_price}")
+                        logger.log(f"Process_Category - Quotation [0] Base price for item '{item_no}' is {raw_price}")
                     except (TypeError, ValueError):
-                        logger.log(f"[0] Invalid raw price for item '{item_no}': {price_result[0]}")
+                        logger.log(f"Process_Category - Quotation [0] Invalid raw price for item '{item_no}': {price_result[0]}")
                         product["rate"] = None
                         continue
                 else:
-                    logger.log(f"[0] No base price found for item '{item_no}'. Skipping...")
-                    product["rate"] = None
+                    logger.log(f"Process_Category - Quotation [0] No base price found for item '{item_no}' .")
+                    product["rate"] = "NA"
                     continue
 
-
                 # Condition 1: Exact match in special_rate_customer_wise
                 query1 = '''
                     SELECT RATE 
@@ -212,13 +216,16 @@ class Process_Category:
                     WHERE ITEM_CODE = ?
                     AND CUSTOMER_CODE = ?;
                 '''
+                cursor = db_connection.cursor()
                 cursor.execute(query1, (item_no, customer_code))
                 result = cursor.fetchone()
+                cursor.close()
 
                 if result:
                     rate = result[0]
                     found_rate = True
-                    logger.log(f"[1] Special Rate for item '{item_no}' and customer '{customer_code}' is {rate}")
+                    logger.log(f"Process_Category - Quotation [1] Special Rate for item '{item_no}' and customer '{customer_code}' is {rate}")
+                    price_pickup_source="SPECIAL_RATE_CUSTOMER_WISE"
 
                 # Condition 2: Customer + Manufacturer discount
                 if not found_rate:
@@ -227,15 +234,18 @@ class Process_Category:
                         FROM CUSTOMER_WISE_DISCOUNT 
                         WHERE CUSTOMER_CODE = ? AND MAKE = ?;
                     '''
+                    cursor = db_connection.cursor()
                     cursor.execute(query2, (customer_code, make))
                     discount_result = cursor.fetchone()
+                    cursor.close()
 
                     if discount_result:
                         discount_percent = discount_result[0]
                         rate = raw_price * (1 - int(discount_percent) / 100)
                         rate = round(rate, 2)
                         found_rate = True
-                        logger.log(f"[2] Discounted rate for '{make}' ({discount_percent}%) on price {raw_price}: {rate}")
+                        logger.log(f"Process_Category - Quotation [2] Discounted rate for '{make}' ({discount_percent}%) on price {raw_price}: {rate}")
+                        price_pickup_source="CUSTOMER_WISE_DISCOUNT"
 
                 # Condition 3: Past Sales most used make
                 if not found_rate:
@@ -248,8 +258,10 @@ class Process_Category:
                         ORDER BY COUNT(*) DESC
                         LIMIT 1;
                     '''
+                    cursor = db_connection.cursor()
                     cursor.execute(query3, (customer_code, item_no))
                     past_sales_result = cursor.fetchone()
+                    cursor.close()
 
                     if past_sales_result:
                         most_common_make, past_discount = past_sales_result
@@ -257,12 +269,11 @@ class Process_Category:
                             rate = raw_price * (1 - int(past_discount) / 100)
                             rate = round(rate, 2)
                             found_rate = True
-                            logger.log(f"[3] Fallback: Most used make '{most_common_make}' for customer '{customer_code}' got {past_discount}% discount. Rate: {rate}")
+                            logger.log(f"Process_Category - Quotation [3] Fallback: Most used make '{most_common_make}' for customer '{customer_code}' got {past_discount}% discount. Rate: {rate}")
+                            price_pickup_source="PAST_SALES"
                         else:
-                            logger.log(f"[3] Fallback: Invalid price for item '{item_no}'")
-                    else:
-                        logger.log(f"[3] No past sales data for item '{item_no}' and customer '{customer_code}'")
-
+                            logger.log(f"Process_Category - Quotation [3] Fallback: Invalid price for item '{item_no}'")
+                   
                 # Condition 4: Manufacturer General Discount
                 if not found_rate:
                     query4 = '''
@@ -270,20 +281,27 @@ class Process_Category:
                         FROM MANUFACTURE_WISE_GENERAL_DISCOUNT 
                         WHERE MAKE = ?;
                     '''
+                    cursor = db_connection.cursor()
                     cursor.execute(query4, (make,))
                     general_discount_result = cursor.fetchone()
+                    cursor.close()
 
                     if general_discount_result:
                         general_discount_percent = general_discount_result[0]
                         rate = raw_price * (1 - int(general_discount_percent) / 100)
                         rate = round(rate, 2)
                         found_rate = True
-                        logger.log(f"[4] General Discount for '{make}' ({general_discount_percent}%) on price {raw_price}: {rate}")
-                    else:
-                        logger.log(f"[4] No applicable discount found for item '{item_no}'")
+                        logger.log(f"Process_Category - Quotation [4] General Discount for '{make}' ({general_discount_percent}%) on price {raw_price}: {rate}")
+                        price_pickup_source="MANUFACTURE_WISE_GENERAL_DISCOUNT"
+                                   
+                #Condition 5: Fallback to raw_price if no discount applied
+                if not found_rate:
+                    rate = raw_price
+                    logger.log(f"Process_Category - Quotation [5] No discounts applied. Using base price for item '{item_no}': {rate}")
+                    price_pickup_source="PRICE_LIST"
 
                 product["rate"] = rate
-                cursor.close()
+                product["Price Pickup Source"]=price_pickup_source 
 
             db_connection.close()
 
@@ -311,8 +329,6 @@ class Process_Category:
 
             csv_data_status = status
             csv_data_response = response
-            # csv_data_status = "status"
-            # csv_data_response = "response"
             logger.log(f"Quotation email sent to {sender_email_addr}")
 
         elif category == "Others" and import_file == True:
@@ -325,7 +341,7 @@ class Process_Category:
             csv_data_response = f""
 
             logger.log(f"Marking email as UNREAD. ")
-            logger.log(f"email_id: {email_id}, type: {type(email_id)}")
+            # print(f"email_id: {email_id}, type: {type(email_id)}")
             mail.store(email_id, '-FLAGS', '\\Seen')
             mail.create(LABEL)
             mail.copy(email_id, LABEL)
@@ -335,7 +351,7 @@ class Process_Category:
 
         current_timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
         filename = f'{uid}{current_timestamp}'
-        logger.log(f"the file name is  ---------------- {filename}")
+        logger.log(f"The file name for csv and eml is ::: {filename}")
         self.store_email_details_to_csv(
             email_id=f'{uid}{current_timestamp}',
             to_email=parseaddr(to_email_addr)[1],
@@ -349,7 +365,9 @@ class Process_Category:
             user_id=user_id,
             status=csv_data_status,
             response=csv_data_response,
-            current_timestamp=current_timestamp
+            current_timestamp=current_timestamp,
+            customer_determination=customer_determination,
+            product_determination=product_determination,
         )
         self.store_email_as_eml(
             uid=f'{uid}{current_timestamp}',
@@ -460,10 +478,10 @@ class Process_Category:
         logger.log("Inside identify_customer")        
         
         if model_type == "OpenAI":
-            prompt = f"""Identify the customer code, customer name in json format from the following email {email_body} and received from {subject}. Do not include any instruction as the output will be directly in a program."""
+            prompt = f"""/* Identify the most likely customer code, customer name from the following email using the file attached in assistant. Use various key information's such as sender name, organisation, address, email id to determine the customer. If customer not available in the data return the name and NA as code. Return the data in json format. Always return 1 row. Do not include any instruction as the output will be directly in a program. */ /n {email_body}"""
             emailreplyassistant = EmailReplyAssistant()
             ai_result = emailreplyassistant.identify_customer_product_reply_assitant(openai_api_key, assistant_id, email_body, subject, prompt)
-
+         
         elif model_type == "GeminiAI": 
             prompt = f"""Identify the customer code, customer name in json format from the following email {email_body} and received from {subject}. Do not include any instruction as the output will be directly in a program."""
             ai_result = self.identify_customer_product_GeminiAI(gemini_api_key, email_body, prompt)
@@ -490,11 +508,7 @@ class Process_Category:
         logger.log("Inside identify_products")    
         
         if model_type == "OpenAI":
-            prompt = f"""
-                Can you give me price information of all products in following format requested_description, item_no, make, description, price, price unit, inventory unit for following items in strictly in JSON String format {email_body}. 
-                If there is one product or multiple should return in list. 
-                Do not include any instruction as the output will be directly in a program.
-                """
+            prompt = f"""/* Extract complete item pricing information from the following mixed-format email content. The email may contain a combination of:- descriptive product listings- tabular structured price info- semi-structured lines with HSN, quantity, material, etc. Give me price in INR and information of all items in following format requested_description, item_no, make, description, price, price unit, inventory unit strictly in JSON format. If the item is not available in the assistant files return requested description from email data and rest of the columns as NA. Do not include any instruction as the output will be directly in a program. */ /n {email_body}. """
             emailreplyassistant = EmailReplyAssistant()
             ai_result = emailreplyassistant.identify_customer_product_reply_assitant(openai_api_key, assistant_id, email_body, subject, prompt)
 
@@ -539,7 +553,7 @@ class Process_Category:
                 Customer Code: {customer.get('customer_code', '')}  
 
                 {product_table}  
-                product_table must contain only price column even if it is none(set it as -).
+                product_table must contain price column, if it is none(set it as -).
                 Original Email Subject: {subject}  
 
                 Return only the following JSON String format:
@@ -750,7 +764,7 @@ class Process_Category:
             logger.log(f"Error with Gemini AI detection/generation: {str(e)}")
             return {"success": "Failed", "message": f"Error with Gemini AI detection/generation: {str(e)}"}
         
-    def store_email_details_to_csv(self, email_id, to_email, from_email, cc_email, subject, body, email_type, action_performed, filename, user_id,status,response,current_timestamp):
+    def store_email_details_to_csv(self, email_id, to_email, from_email, cc_email, subject, body, email_type, action_performed, filename, user_id,status,response,current_timestamp,customer_determination,product_determination):
         """
         Stores the extracted email details to a CSV file inside 'Mail_log/mail_log_user_id' folder
         with the name user_id.csv.
@@ -765,28 +779,55 @@ class Process_Category:
         os.makedirs(user_folder, exist_ok=True)
 
         filename = filename.lstrip()
-        logger.log(f"filename ::: [{filename}]")
         full_csv_path = os.path.join(user_folder, f"{filename}.csv")
-        logger.log(f"full_csv_path ::: {full_csv_path}")
 
-        # Prepare the data to write
-        csv_data = [{
+        if email_type=="Quotation":
+            csv_data = [{
             'to': to_email,
             'from': from_email,
             'cc': cc_email,
             'subject': subject,
             'body': body.replace('\n', ' ').replace('\r', ''),
             'Category': email_type,
-            'Action performed': action_performed,
+            'Action Performed': action_performed,
             'unique_id': email_id,
             'timestamp': current_timestamp,
             'status of mail draft': status,
-            'Response generated':response
+            'Response Generated':response,
+            'Customer Determination':customer_determination,
+            'Product Determination':product_determination,
         }]
+        else:
+            csv_data = [{
+                'to': to_email,
+                'from': from_email,
+                'cc': cc_email,
+                'subject': subject,
+                'body': body.replace('\n', ' ').replace('\r', ''),
+                'Category': email_type,
+                'Action Performed': action_performed,
+                'unique_id': email_id,
+                'timestamp': current_timestamp,
+                'status of mail draft': status,
+                'Response Generated':response
+            }]
         
         # Write to CSV file (user_id.csv)
         with open(full_csv_path, 'a', newline='', encoding='utf-8') as csvfile:
-            fieldnames = ['to', 'from', 'cc', 'timestamp', 'subject', 'body', 'Category', 'Action performed', 'unique_id','status of mail draft','Response generated']
+            if email_type == "Quotation":
+                fieldnames = [
+                    'to', 'from', 'cc', 'timestamp', 'subject', 'body',
+                    'Category', 'Action Performed', 'unique_id',
+                    'status of mail draft', 'Response Generated',
+                    'Customer Determination', 'Product Determination'
+                ]
+            else:
+                fieldnames = [
+                    'to', 'from', 'cc', 'timestamp', 'subject', 'body',
+                    'Category', 'Action Performed', 'unique_id',
+                    'status of mail draft', 'Response Generated'
+                ]
+
             writer = csv.DictWriter(csvfile, fieldnames=fieldnames)
             
             # If the file is empty, write the header

{AIEmailAutomationUtility-0.0.26.dist-info → AIEmailAutomationUtility-0.0.27.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: AIEmailAutomationUtility
-Version: 0.0.26
-Summary: Resolve the issue of email and excel file uploading on orders
+Version: 0.0.27
+Summary: Added 3 more parameters in the right panel of quotation email utilty
 Author: Proteus Technology PVT. LTD.
 Author-email: <apps@baseinformation.com>
 Keywords: python,first package
@@ -13,4 +13,4 @@ Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Microsoft :: Windows
 License-File: LICENCE.txt
 
-Resolve the issue of email and excel file uploading on orders
+Added 3 more parameters in the right panel of quotation email utilty

{AIEmailAutomationUtility-0.0.26.dist-info → AIEmailAutomationUtility-0.0.27.dist-info}/RECORD

@@ -1,15 +1,15 @@
-AIEmailAutomationUtility/EmailReplyAssistant.py,sha256=oRobM6C1AwiRA3lQ2Sh51m-FaH2PpbUEidbkOG7O9Ww,6339
+AIEmailAutomationUtility/EmailReplyAssistant.py,sha256=R_wJna3-ITsVxQEccryhM93T_Nf_Oxo8DXnS-sDN8VE,6679
 AIEmailAutomationUtility/Email_Classification.py,sha256=Ar0g4Ff8HOT7xICktd3nP_C_vCyeY-xCpUjVCVRWAyc,9417
 AIEmailAutomationUtility/Email_DocumentUploader.py,sha256=YJu4tuTHr0K-5vuds9gZfj-Hwsgm4MuAOP39Lmu_t98,3219
 AIEmailAutomationUtility/Email_Draft.py,sha256=DcyBeDaE8CReKHnHxLiz-o2tDxuUgwy91c4k0qhQbVw,7749
-AIEmailAutomationUtility/Email_Read.py,sha256=UJDHdsr5RN_GG5OsOvUKbKziaw0a-kR3TT0iUv0oRmI,27795
+AIEmailAutomationUtility/Email_Read.py,sha256=pRqc9295r_qqdfWIFJFG2XH9J-VlvO1E0yP3iv_cRV4,27802
 AIEmailAutomationUtility/Email_Upload_Document.py,sha256=3bdkxfDlwoeRp-46KPw2Gs1dqBhEIoA1yE5GCudpdV8,1320
-AIEmailAutomationUtility/Process_Category.py,sha256=EojfyGAN7U6NIBqinikJIauEgzz-ZQhHpzcjNr1No9M,41234
+AIEmailAutomationUtility/Process_Category.py,sha256=4Zrc1RaKMCK5oPYo1NfsBp1ba1G-6kMIsV0P3TLATwc,43771
 AIEmailAutomationUtility/Save_Draft.py,sha256=yzLgFN14I_lXE6qL0I3tKNduvcnWdbsY9i2mKdTtio4,5348
 AIEmailAutomationUtility/Save_Transaction.py,sha256=Gg1w6hhzHmEFjsuzYvkq-3-EsWReetjLHsYSv5YIGgM,3816
 AIEmailAutomationUtility/__init__.py,sha256=Jad3IdPRsVMeLqEEh-FbCrc1lE2tzJO2DTG5Hgmxh5g,391
-AIEmailAutomationUtility-0.0.26.dist-info/LICENCE.txt,sha256=2qX9IkEUBx0VJp1Vh9O2dsRwE-IpYId0lXDyn7OVsJ8,1073
-AIEmailAutomationUtility-0.0.26.dist-info/METADATA,sha256=8n0W1uGzS7F2kkzHYPYi32axicmcCOapZ-LK8ql7fKs,623
-AIEmailAutomationUtility-0.0.26.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-AIEmailAutomationUtility-0.0.26.dist-info/top_level.txt,sha256=3jTWrTUblVkaP7mpwY2UBSnrlfot5Ykpfsehyke-Uzw,25
-AIEmailAutomationUtility-0.0.26.dist-info/RECORD,,
+AIEmailAutomationUtility-0.0.27.dist-info/LICENCE.txt,sha256=2qX9IkEUBx0VJp1Vh9O2dsRwE-IpYId0lXDyn7OVsJ8,1073
+AIEmailAutomationUtility-0.0.27.dist-info/METADATA,sha256=J9vR4Pa5JSL6iAWD1yZeEYBcgTGDzMimpejMr8gLKw4,637
+AIEmailAutomationUtility-0.0.27.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+AIEmailAutomationUtility-0.0.27.dist-info/top_level.txt,sha256=3jTWrTUblVkaP7mpwY2UBSnrlfot5Ykpfsehyke-Uzw,25
+AIEmailAutomationUtility-0.0.27.dist-info/RECORD,,