Update app.py

app.py

@@ -51,8 +51,10 @@ load_dotenv()
 # langfuse analytics
 from langfuse.callback import CallbackHandler
 
+#forcefully stop the agent execution
 import concurrent.futures
 
+from tabulate import tabulate
 
 # Define global variables for managing the thread and future
 executor = concurrent.futures.ThreadPoolExecutor(max_workers=1)
@@ -270,7 +272,7 @@ def send_email_with_attachment_mailjet(recipient_email, subject, body, attachmen
           "To": [
             {
               "Email": recipient_email,
-              "Name": "Lakshmi"
+              "Name": ""
             }
           ],
           "Subject": subject,
@@ -280,7 +282,7 @@ def send_email_with_attachment_mailjet(recipient_email, subject, body, attachmen
                 "Attachments": [
                     {
                         "ContentType": "image/png",  # Replace with the correct MIME type of your image
-                        "Filename": "your_image_name.png",  # Name of the image as it will appear in the email
+                        "Filename": "inventory_report.png",  # Name of the image as it will appear in the email
                         "Base64Content": attachment_path  # Base64-encoded image content
                     }
                 ]
@@ -303,41 +305,6 @@ def send_email_with_attachment_mailjet(recipient_email, subject, body, attachmen
 #smtp lib
 def send_email_with_attachment(recipient_email, subject, body, attachment_path):
     try:
-        from fastapi import FastAPI
-       
-        from fastapi_mail import FastMail, MessageSchema, ConnectionConfig, MessageType
-        from pydantic import EmailStr, BaseModel
-
-        """
-        
-        conf = ConnectionConfig(
-            MAIL_USERNAME = "redmind",
-            MAIL_PASSWORD = "jymzapycraiheubg",
-            MAIL_FROM = "[email protected]",
-            MAIL_PORT = 2525,
-            MAIL_SERVER = "smtp.gmail.com",
-            MAIL_FROM_NAME="redmind",
-            MAIL_STARTTLS = True,
-            MAIL_SSL_TLS = False,
-            USE_CREDENTIALS = True,
-            VALIDATE_CERTS = True
-        )
-        
-        html = <p>Hi this test mail, thanks for using Fastapi-mail</p> 
-        
-        message = MessageSchema(
-            subject="Fastapi-Mail module",
-            recipients=[recipient_email],
-            body=html,
-            subtype=MessageType.html)
-        print(message)
-        fm = FastMail(conf)
-        await fm.send_message(message)
-        print("message sent")
-        
-"""
-
-
         sender_email = os.getenv("EMAIL_SENDER")
         sender_password = os.getenv("EMAIL_PASSWORD")
         # Create a multipart message
@@ -349,40 +316,31 @@ def send_email_with_attachment(recipient_email, subject, body, attachment_path):
         msg.attach(MIMEText(body, 'plain'))
         # Open the file to be sent
         attachment = open(attachment_path, "rb")
-        #print("Attached the image")
+        # print("Attached the image")
         # Instance of MIMEBase and named as p
         part = MIMEBase('application', 'octet-stream')
-    
+
         # To change the payload into encoded form
         part.set_payload((attachment).read())
-    
+
         # Encode into base64
         encoders.encode_base64(part)
-    
+
         part.add_header('Content-Disposition', f"attachment; filename= {attachment_path}")
-    
+
         # Attach the instance 'part' to instance 'msg'
         msg.attach(part)
-        # Set up the SSL context
-        context = ssl.create_default_context()
-        
-        # Send the email
-        try:
-            with smtplib.SMTP_SSL("smtp.gmail.com", 2525, context=context) as server:
-                server.login(sender_email, sender_password)
-                server.sendmail(sender_email, recipient_email, msg)
-            print("Email sent successfully")
-        except Exception as e:
-            print(f"Error occurred: {str(e)}")
-        server = smtplib.SMTP('smtp.gmail.com', 2525)
+
+        server = smtplib.SMTP('smtp.gmail.com', 587)
         server.starttls()
         server.login(sender_email, sender_password)
         text = msg.as_string()
         server.sendmail(sender_email, recipient_email, text)
         server.quit()
+
     except Exception as error:
         print(f"An error occurred: {error}")
-   
+
     # return 1
 
 
@@ -399,14 +357,7 @@ def make_api_request(url, params):
         print(f"An error occurred: {err}")
 
 
-
-
-
 def inventory_report(question):
-    #print(question)
-
-
-
     # Split the question to extract warehouse name, user question, and optional email
     if question.count(":") > 0:
         parts = question.split(":", 2)
@@ -432,8 +383,6 @@ def inventory_report(question):
 
     data1 = make_api_request(apis[1]["url"], apis[1]["params"])
 
-    from tabulate import tabulate
-
     headers = ["S.No", "Warehouse Code", "Warehouse Name", "Customer Code", "Customer Name", "Item Code", "Item Name",
                "Currency", "EAN", "UOM", "Quantity", "Gross Weight", "Volume", "Total Value"]
     table_data = []
@@ -558,6 +507,7 @@ max_iterations = 5
 iterations = 0
 
 def handle_query(user_question, chatbot, audio=None):
+
     """
     Function to handle the processing of user input with `AgentExecutor.invoke()`.
     """
@@ -570,7 +520,7 @@ def handle_query(user_question, chatbot, audio=None):
         return "A query is already being processed. Please stop it before starting a new one."
     print(user_question)
     # Start the processing in a new thread
-    future = executor.submit(answer_question_test, user_question, chatbot)
+    future = executor.submit(answer_question_thread, user_question, chatbot)
     
     # Periodically check if future is done
     while not future.done():
@@ -604,7 +554,8 @@ def stop_processing(chatbot):
     chatbot.append((user_question, "Sorry, we encountered an error while processing your request. Please try after some time."))
     return gr.update(value=chatbot)
 
-def answer_question_test(user_question, chatbot, audio=None):
+# This function is for agent executor invoke with the option of stop
+def answer_question_thread(user_question, chatbot, audio=None):
      
     global iterations
     iterations = 0
@@ -846,16 +797,6 @@ def handle_dislike(data: gr.LikeData):
 def update_message(request: gr.Request):
     return f"<h2 style=' font-family: Calibri;'>Welcome, {request.username}</h4>"
 
-def stop_agent():
-    """
-    Stops the agent process if it is still running.
-    """
-    global process
-    if process and process.is_alive():
-        process.terminate()  # Terminate the process forcefully
-        process.join()  # Ensure the process is properly terminated
-        return "Agent execution stopped."
-    return "No active process to stop."
 
 # CSS for styling the buttons and other elements
 css = """
@@ -931,11 +872,12 @@ with gr.Blocks(css=css, theme=gr.themes.Soft()) as demo:
             with gr.Row():
                 button = gr.Button("Submit", elem_id="submit",elem_classes="gr-button")
                 # Button to stop the current processing
-                stop_button = gr.Button("Stop Processing")
-                stop_button.click(stop_processing, [chatbot],[chatbot])
+                stop_button = gr.Button("Stop", elem_classes="gr-button")
+
+    stop_button.click(stop_processing, [chatbot],[chatbot])
 
-    button.click(answer_question, [message, chatbot], [chatbot])
-    message.submit(answer_question, [message, chatbot], [chatbot])
+    button.click(handle_query, [message, chatbot], [chatbot])
+    message.submit(handle_query, [message, chatbot], [chatbot])
     message.submit(lambda x: gr.update(value=""), None, [message], queue=False)
     button.click(lambda x: gr.update(value=''), [], [message])
 
@@ -945,9 +887,9 @@ with gr.Blocks(css=css, theme=gr.themes.Soft()) as demo:
 
     #sample_button.click(answer_question, [sample_button, chatbot], [chatbot])
     sample_button.click(handle_query, [sample_button, chatbot], [chatbot])
-    sample_button1.click(answer_question, [sample_button1, chatbot], [chatbot])
-    sample_button2.click(answer_question, [sample_button2, chatbot], [chatbot])
-    sample_button3.click(answer_question, [sample_button3, chatbot], [chatbot])
-    sample_button4.click(answer_question, [sample_button4, chatbot], [chatbot])
+    sample_button1.click(handle_query, [sample_button1, chatbot], [chatbot])
+    sample_button2.click(handle_query, [sample_button2, chatbot], [chatbot])
+    sample_button3.click(handle_query, [sample_button3, chatbot], [chatbot])
+    sample_button4.click(handle_query, [sample_button4, chatbot], [chatbot])
 
 demo.launch(auth=[("lakshmi", "redmind"), ("arun", "redmind")])