Merge pull request #1111 from TransformerOptimus/email_return_statement

Changes for no receiver address

superagi/tools/email/send_email.py

@@ -61,7 +61,7 @@ def _execute(self, to: str, subject: str, body: str) -> str:
         else:
             send_to_draft = False
 
-        if message["To"] == "[email protected]" or send_to_draft:
+        if send_to_draft:
             draft_folder = self.get_tool_config('EMAIL_DRAFT_FOLDER') or "Drafts"
             imap_server = self.get_tool_config('EMAIL_IMAP_SERVER')
             conn = ImapEmail().imap_open(draft_folder, email_sender, email_password, imap_server)
@@ -72,6 +72,10 @@ def _execute(self, to: str, subject: str, body: str) -> str:
                 str(message).encode("UTF-8")
             )
             return f"Email went to {draft_folder}"
+
+        if message["To"] == "[email protected]":
+            return "Error: Email Not Sent. Enter an Email Address."
+
         else:
             smtp_host = self.get_tool_config('EMAIL_SMTP_HOST')
             smtp_port = self.get_tool_config('EMAIL_SMTP_PORT')

superagi/tools/email/send_email_attachment.py

@@ -116,7 +116,7 @@ def send_email_with_attachment(self, to, subject, body, attachment) -> str:
             send_to_draft = True
         else:
             send_to_draft = False
-        if message["To"] == "[email protected]" or send_to_draft:
+        if send_to_draft:
             draft_folder = self.get_tool_config('EMAIL_DRAFT_FOLDER')
             imap_server = self.get_tool_config('EMAIL_IMAP_SERVER')
             conn = ImapEmail().imap_open(draft_folder, email_sender, email_password, imap_server)
@@ -127,6 +127,10 @@ def send_email_with_attachment(self, to, subject, body, attachment) -> str:
                 str(message).encode("UTF-8")
             )
             return f"Email went to {draft_folder}"
+
+        if message["To"] == "[email protected]":
+            return "Error: Email Not Sent. Enter an Email Address."
+
         else:
             smtp_host = self.get_tool_config('EMAIL_SMTP_HOST')
             smtp_port = self.get_tool_config('EMAIL_SMTP_PORT')