django-codenerix-email 4.0.35__py2.py3-none-any.whl → 4.0.36__py2.py3-none-any.whl

codenerix_email/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "4.0.35"
+__version__ = "4.0.36"
 
 __authors__ = [
     "Juan Miguel Taboada Godoy <juanmi@juanmitaboada.com>",

codenerix_email/management/commands/email_test.py

@@ -18,7 +18,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import json
 
 from django.core.management.base import BaseCommand
@@ -30,15 +29,6 @@ from codenerix_email.models import EmailMessage, EmailTemplate
 from codenerix_email import __version__
 from django.core.management import CommandError
 
-# Deprecation warning
-if not sys.argv[0].startswith("email"):
-    import logging
-
-    logger = logging.getLogger("codenerix")
-    logger.warning(
-        "WARNING: 'test_email' is DEPRECATED, switch to 'email_test' instead"
-    )
-
 
 class Command(BaseCommand, Debugger):
     # Show this when the user types help

codenerix_email/management/commands/emails_recv.py

@@ -1,4 +1,3 @@
-import sys
 import re
 
 import logging
@@ -28,15 +27,6 @@ import imaplib  # noqa: E402
 from imapclient import IMAPClient  # noqa: E402
 from imapclient.exceptions import LoginError  # noqa: E402
 
-# Deprecation warning
-if not sys.argv[0].startswith("email"):
-    import logging
-
-    logger = logging.getLogger("codenerix")
-    logger.warning(
-        "WARNING: 'recv_emails' is DEPRECATED, switch to 'emails_recv' instead"
-    )
-
 
 class Command(BaseCommand):
     help = "Fetches new emails from the configured IMAP account."

codenerix_email/management/commands/emails_send.py

@@ -18,7 +18,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import time
 
 from django.core.management.base import BaseCommand
@@ -28,15 +27,6 @@ from django.utils import timezone
 from codenerix_lib.debugger import Debugger
 from codenerix_email.models import EmailMessage
 
-# Deprecation warning
-if not sys.argv[0].startswith("email"):
-    import logging
-
-    logger = logging.getLogger("codenerix")
-    logger.warning(
-        "WARNING: 'send_email' is DEPRECATED, switch to 'emails_send' instead"
-    )
-
 
 class Command(BaseCommand, Debugger):
     # Show this when the user types help

codenerix_email/management/commands/recv_emails.py

@@ -1,34 +1,5 @@
 import sys
-import re
 
-import logging
-
-from django.conf import settings
-from django.core.management.base import BaseCommand, CommandError
-from zoneinfo import ZoneInfo
-
-from email import message_from_bytes
-from email.header import decode_header
-from email.message import Message
-from email.parser import HeaderParser
-from typing import Optional
-
-from codenerix_email.models import (
-    EmailMessage,
-    EmailReceived,
-    BOUNCE_SOFT,
-    BOUNCE_HARD,
-)
-
-
-# Silence DEBUG logs from imapclient
-logging.getLogger("imapclient").setLevel(logging.WARNING)
-
-import imaplib  # noqa: E402
-from imapclient import IMAPClient  # noqa: E402
-from imapclient.exceptions import LoginError  # noqa: E402
-
-# Deprecation warning
 if not sys.argv[0].startswith("email"):
     import logging
 
@@ -37,575 +8,4 @@ if not sys.argv[0].startswith("email"):
         "WARNING: 'recv_emails' is DEPRECATED, switch to 'emails_recv' instead"
     )
 
-
-class Command(BaseCommand):
-    help = "Fetches new emails from the configured IMAP account."
-
-    def add_arguments(self, parser):
-        # Named (optional) arguments
-        parser.add_argument(
-            "--silent",
-            action="store_true",
-            dest="silent",
-            default=False,
-            help="Enable silent mode",
-        )
-
-        parser.add_argument(
-            "--tracking-id", type=str, help="Tracking ID to filter"
-        )
-        parser.add_argument("--imap-id", type=str, help="IMAP ID to filter")
-        parser.add_argument(
-            "--message-id", type=str, help="Message-ID to filter"
-        )
-        parser.add_argument(
-            "--all", action="store_true", help="Process all emails"
-        )
-        parser.add_argument(
-            "--rewrite", action="store_true", help="Rewrite existing"
-        )
-
-    def handle(self, *args, **options):
-        # Get configuration
-        self.silent = options["silent"]
-        self.verbose = not self.silent
-        self.imap_id = options.get("imap_id")
-        self.message_id = options.get("message_id")
-        self.tracking_id = options.get("tracking_id")
-        self.rewrite = options.get("rewrite", False)
-        self.process_all = options.get("all", False)
-
-        # Show header
-        if self.verbose:
-            self.stdout.write(
-                self.style.SUCCESS("Starting IMAP email synchronization...")
-            )
-
-        # Get configuration from settings
-        host = getattr(settings, "IMAP_EMAIL_HOST", None)
-        port = getattr(settings, "IMAP_EMAIL_PORT", 993)
-        user = getattr(settings, "IMAP_EMAIL_USER", None)
-        password = getattr(settings, "IMAP_EMAIL_PASSWORD", None)
-        ssl = getattr(settings, "IMAP_EMAIL_SSL", True)
-        folder = getattr(settings, "IMAP_EMAIL_INBOX_FOLDER", "INBOX")
-
-        # Verify that IMAP settings are configured
-        if host is not None and port:
-            # Validate configuration
-            if user is None or password is None:
-                if self.silent:
-                    return
-                else:
-                    raise CommandError(
-                        "IMAP user or password not configured. Please set "
-                        "IMAP_EMAIL_USER and IMAP_EMAIL_PASSWORD in settings."
-                    )
-
-            try:
-                # Connect to the IMAP server
-                server = IMAPClient(host, port=port, ssl=ssl)
-            except Exception as e:
-                raise CommandError(
-                    f"Failed to connect to IMAP server ("
-                    f"{host=}, "
-                    f"{port=}, "
-                    f"ssl={ssl and 'yes' or 'no'}"
-                    f"): {e}"
-                ) from e
-
-            try:
-                # Login and select the inbox
-                try:
-                    server.login(user, password)
-                except LoginError as e:
-                    raise CommandError(
-                        f"Failed to login to IMAP server with {user=}: {e}"
-                    ) from e
-
-                if folder:
-                    try:
-                        server.select_folder(folder, readonly=False)
-                    except imaplib.IMAP4.error:
-                        raise CommandError(f"Failed to select inbox {folder=}")
-
-                # Process emails
-                (created_count, overwritten_count) = self.process(server)
-                count = created_count + overwritten_count
-
-                # Show summary
-                if self.verbose:
-                    self.stdout.write(
-                        self.style.SUCCESS(
-                            f"Successfully synchronized {count} emails "
-                            f"(new: {created_count}, "
-                            f"overwritten: {overwritten_count})"
-                        )
-                    )
-
-            except Exception as e:
-                raise
-                self.stderr.write(
-                    self.style.ERROR(
-                        f"An error occurred during synchronization: {e}"
-                    )
-                )
-
-            finally:
-                # Logout from the server
-                try:
-                    server.logout()
-                except Exception:
-                    pass
-
-        elif self.verbose:
-            raise CommandError(
-                "IMAP settings not configured. Please set IMAP_EMAIL_HOST "
-                "and IMAP_EMAIL_PORT in settings."
-            )
-
-    def process(self, server):
-        """
-        Connects to the IMAP server and fetches new emails,
-        saving them as ReceivedEmail objects.
-        """
-
-        # Processed emails count
-        created_count = 0
-        overwrite_count = 0
-
-        # Look up for emails
-        if self.imap_id:
-            # Search by specific IMAP ID
-            try:
-                imap_id = int(self.imap_id)
-            except ValueError:
-                raise CommandError(
-                    f"Invalid IMAP ID '{self.imap_id}'. Must be an integer."
-                )
-            messages_ids = [imap_id]
-            if self.verbose:
-                self.stdout.write(
-                    self.style.SUCCESS(
-                        f"Processing email with IMAP ID {self.imap_id}."
-                    )
-                )
-
-        elif self.message_id:
-            # Search by specific Message-ID
-            messages_ids = server.search(
-                ["HEADER", "Message-ID", self.message_id]
-            )
-            if self.verbose:
-                self.stdout.write(
-                    self.style.SUCCESS(
-                        f"Found {len(messages_ids)} email(s) with "
-                        f"Message-ID {self.message_id}."
-                    )
-                )
-
-        elif self.process_all:
-            # Process all emails
-            messages_ids = server.search(["ALL"])
-            if self.verbose:
-                self.stdout.write(
-                    self.style.SUCCESS(
-                        f"Found {len(messages_ids)} email(s) to process."
-                    )
-                )
-
-        else:
-            # Search by UNSEEN
-            messages_ids = server.search(["UNSEEN"])
-            if self.verbose:
-                self.stdout.write(
-                    self.style.SUCCESS(
-                        f"Found {len(messages_ids)} new email(s) to process."
-                    )
-                )
-
-        # If there are new messages, fetch and process them
-        if messages_ids:
-            # Fetch the full message and internal date
-            fetched_data = server.fetch(
-                messages_ids, ["BODY.PEEK[]", "INTERNALDATE"]
-            )
-
-            # Get the envelope (metadata) and the full body
-            # Use IMAP IDs so identifiers do not change between sessions
-            for imap_id, message_data in fetched_data.items():
-                # Filter out by IMAP ID if specified
-                if self.imap_id and str(imap_id) != self.imap_id:
-                    continue
-
-                # Get the raw email and internal date
-                raw_email = message_data[b"BODY[]"]
-                internal_date_naive = message_data[b"INTERNALDATE"]
-                internal_date = internal_date_naive.replace(
-                    tzinfo=ZoneInfo(settings.TIME_ZONE)
-                )
-
-                # Parse the email
-                msg = message_from_bytes(raw_email)
-
-                # Extract subject, efrom, eto & eid
-                subject, encoding = decode_header(msg["Subject"])[0]
-                if isinstance(subject, bytes):
-                    subject = subject.decode(encoding or "utf-8")
-                efrom = msg.get("From")
-                eto = msg.get("To")
-                eid = msg.get("Message-ID")
-
-                # If we can't get a Message-ID, use the IMAP ID as fallback
-                # to avoid duplicates
-                if not eid:
-                    eid = f"<imapid-{imap_id}@{settings.IMAP_EMAIL_HOST}>"
-
-                # Avoid processing duplicates
-                email_received = EmailReceived.objects.filter(eid=eid).first()
-                if self.rewrite or not email_received:
-                    # Process multipart emails
-                    body_plain = ""
-                    body_html = ""
-                    if msg.is_multipart():
-                        for part in msg.walk():
-                            content_type = part.get_content_type()
-                            if content_type == "text/plain" and not body_plain:
-                                body_plain = part.get_payload(
-                                    decode=True
-                                ).decode(
-                                    part.get_content_charset() or "utf-8",
-                                    "ignore",
-                                )
-                            elif content_type == "text/html" and not body_html:
-                                body_html = part.get_payload(
-                                    decode=True
-                                ).decode(
-                                    part.get_content_charset() or "utf-8",
-                                    "ignore",
-                                )
-                    else:
-                        body_plain = msg.get_payload(decode=True).decode(
-                            msg.get_content_charset() or "utf-8",
-                            "ignore",
-                        )
-
-                    # Logic to associate replies/bounces with sent emails
-                    try:
-                        email_message = None
-
-                        # Locate the tracking ID
-                        tracking_id = self.find_tracking_id(msg)
-
-                        # Filter out by tracking ID if specified
-                        if (
-                            self.tracking_id
-                            and tracking_id != self.tracking_id
-                        ):
-                            continue
-
-                        # If found, try to link to the sent email
-                        if tracking_id:
-                            try:
-                                email_message = EmailMessage.objects.get(
-                                    uuid=tracking_id
-                                )
-                            except EmailMessage.DoesNotExist:
-                                email_message = None
-                                if self.verbose:
-                                    self.stdout.write(
-                                        self.style.WARNING(
-                                            f"Tracking ID {tracking_id} found "
-                                            "but no matching sent email."
-                                        )
-                                    )
-
-                    except Exception as e:
-                        raise CommandError(
-                            "Error while linking email with IMAP ID "
-                            f"{imap_id} to sent email: {e}"
-                        ) from e
-
-                    # Heuristic keywords commonly found in bounce messages
-                    (bounce_type, bounce_reason) = self.analyze_bounce(msg)
-
-                    # Extract all headers into a dictionary
-                    headers = {}
-                    for header, value in msg.items():
-                        decoded_value, encoding = decode_header(value)[0]
-                        if isinstance(decoded_value, bytes):
-                            decoded_value = decoded_value.decode(
-                                encoding or "utf-8", "ignore"
-                            )
-                        headers[header] = decoded_value
-
-                    # Create EmailReceived object if doesn't exist
-                    if not email_received:
-                        overwriting = False
-                        email_received = EmailReceived()
-                    else:
-                        overwriting = True
-
-                    # Populate fields
-                    email_received.imap_id = imap_id
-                    email_received.eid = eid
-                    email_received.efrom = efrom
-                    email_received.eto = eto
-                    email_received.subject = subject
-                    email_received.headers = headers
-                    email_received.body_text = body_plain
-                    email_received.body_html = body_html
-                    email_received.date_received = internal_date
-                    email_received.email = email_message
-                    email_received.bounce_type = bounce_type
-                    email_received.bounce_reason = bounce_reason
-
-                    # Save the received email
-                    email_received.save()
-
-                    # Count created or overwritten
-                    if overwriting:
-                        overwrite_count += 1
-                        verb = "Overwritten"
-                    else:
-                        created_count += 1
-                        verb = "Created"
-
-                    if self.verbose:
-                        msg = (
-                            f"{verb} email with IMAP ID: "
-                            f"{imap_id} (link={tracking_id})"
-                        )
-                        if bounce_type:
-                            bounce_type_str = (
-                                bounce_type == BOUNCE_HARD and "Hard" or "Soft"
-                            )
-                            bounce_reason_str = bounce_reason or "Unknown"
-                            self.stdout.write(
-                                self.style.WARNING(
-                                    f"{msg} "
-                                    f"[{bounce_type_str} bounce, "
-                                    f"reason={bounce_reason_str}]"
-                                )
-                            )
-                        else:
-                            self.stdout.write(self.style.SUCCESS(msg))
-
-                else:
-                    if self.verbose:
-                        self.stdout.write(
-                            self.style.WARNING(
-                                f"Skipping email with IMAP ID: {imap_id} (DUP)"
-                            )
-                        )
-
-                # Mark the message as read
-                # (flag \Seen) avoid reprocessing
-                server.add_flags(imap_id, [b"\\Seen"])
-
-        return (created_count, overwrite_count)
-
-    def find_tracking_id(self, msg: Message) -> str | None:
-        """
-        Searches for the X-Codenerix-Tracking-ID robustly in an email.
-
-        It performs the search in three steps:
-        1. In the main headers of the email.
-        2. In the attached parts that are a complete email (message/rfc822).
-        3. As a last resort, searches the text in the body of the message.
-        """
-
-        # Method 1: Search in main headers (for direct replies)
-        tracking_id = msg.get("X-Codenerix-Tracking-ID", None)
-
-        # Method 2: Search in attached parts (for bounces and forwards)
-        if not tracking_id:
-            # Not found directly in headers
-            # Search in attached parts (for bounces and forwards)
-            if msg.is_multipart():
-                # Iterate through parts
-                for part in msg.walk():
-                    # Get the content type of the part
-                    content_type = part.get_content_type()
-
-                    # We look for an attachment that is itself an email
-                    if content_type == "message/rfc822":
-                        # The payload of this part is the original email
-                        # The payload is a list of messages, take the first one
-                        original_msg_payload = part.get_payload()
-                        if (
-                            isinstance(original_msg_payload, list)
-                            and original_msg_payload
-                        ):
-                            original_msg = original_msg_payload[0]
-                            if isinstance(original_msg, Message):
-                                tracking_id = original_msg.get(
-                                    "X-Codenerix-Tracking-ID"
-                                )
-
-                    elif content_type == "text/rfc822-headers":
-                        # The payload is the raw headers of the original email
-                        headers_payload = part.get_payload(decode=True)
-                        if isinstance(headers_payload, bytes):
-                            # Decode using the specified charset
-                            charset = part.get_content_charset() or "utf-8"
-                            headers_text = headers_payload.decode(
-                                charset, errors="ignore"
-                            )
-
-                            # Parse headers text into a Message object
-                            headers_msg = HeaderParser().parsestr(headers_text)
-                            tracking_id = headers_msg.get(
-                                "X-Codenerix-Tracking-ID"
-                            )
-
-            # Method 3: Search in the body text (fallback)
-            if not tracking_id:
-                # The original email might be quoted as plain text.
-                body_text = ""
-                if msg.is_multipart():
-                    # Concatenate all text/plain parts
-                    for part in msg.walk():
-                        # We only want text/plain parts
-                        if part.get_content_type() == "text/plain":
-                            # Get the decoded payload
-                            payload = part.get_payload(decode=True)
-                            if isinstance(payload, bytes):
-                                # Decode using the specified charset
-                                charset = part.get_content_charset() or "utf-8"
-                                body_text += payload.decode(
-                                    charset, errors="ignore"
-                                )
-                else:
-                    # Single part email, check if it's text/plain
-                    if msg.get_content_type() == "text/plain":
-                        # Get the decoded payload
-                        payload = msg.get_payload(decode=True)
-                        if isinstance(payload, bytes):
-                            # Decode using the specified charset
-                            charset = msg.get_content_charset() or "utf-8"
-                            body_text = payload.decode(
-                                charset, errors="ignore"
-                            )
-
-                # If we have body text, search for the header using regex
-                if body_text:
-                    # We use a regex to find the header in the text
-                    match = re.search(
-                        r"X-Codenerix-Tracking-ID:\s*([a-fA-F0-9\-]{36})",
-                        body_text,
-                    )
-
-                    if match:
-                        # If found, extract the tracking ID
-                        tracking_id = match.group(1).strip()
-
-        # Return the found tracking ID if any
-        return tracking_id
-
-    def analyze_bounce(
-        self, msg: Message
-    ) -> tuple[Optional[str], Optional[str]]:
-        """
-        Analyzes an email to determine if it is a bounce and of what type.
-
-        Returns:
-            A tuple (bounce_type, smtp_code).
-            - bounce_type: BOUNCE_HARD, BOUNCE_SOFT, or None if not a bounce.
-            - bounce_reason: the SMTP status code (e.g., '5.1.1') or None.
-        """
-
-        # Initialize
-        bounce_type: Optional[str] = None
-        bounce_reason: Optional[str] = None
-
-        # Method 1: Look for DSN reports
-        if (
-            msg.get_content_type() == "multipart/report"
-            and msg.get_param("report-type") == "delivery-status"
-        ):
-            # Iterate through parts to find the delivery-status part
-            for part in msg.walk():
-                # We look for the delivery-status part
-                if part.get_content_type() == "message/delivery-status":
-                    # The payload is a list of headers
-                    payload = part.get_payload()
-                    if payload and isinstance(payload, list):
-                        # The first part contains the status headers
-                        status_headers = payload[0]
-                        if isinstance(status_headers, Message):
-                            # Extract Action and Status headers
-                            action = status_headers.get("Action", "").lower()
-                            status_code = status_headers.get("Status", "")
-
-                            # Check if action indicates failure
-                            if action == "failed":
-                                # Determine Hard/Soft by SMTP code (RFC3463)
-                                if status_code.startswith("5."):
-                                    # 5.x.x: permanent failure (hard)
-                                    bounce_type = BOUNCE_HARD
-                                    bounce_reason = status_code
-                                    break
-                                elif status_code.startswith("4."):
-                                    # 4.x.x: temporary failure (soft)
-                                    bounce_type = BOUNCE_SOFT
-                                    bounce_reason = status_code
-                                    break
-                                else:
-                                    # Unknown status, assume hard bounce
-                                    bounce_type = BOUNCE_HARD
-                                    bounce_reason = status_code or "Unknown"
-                                    break
-
-        # Method 2: Some mail servers include headers indicating a bounce
-        if not bounce_type:
-            if msg.get("X-Failed-Recipients"):
-                # Presence of this header usually indicates a hard bounce
-                bounce_type = BOUNCE_HARD
-                bounce_reason = "Unknown (X-Failed-Recipients)"
-
-            else:
-                # Check for Auto-Submitted header
-                if msg.get("Auto-Submitted", "").lower() in (
-                    "auto-replied",
-                    "auto-generated",
-                ):
-                    # It could be a bounce, but also an "Out of Office",
-                    # so we combine it with a keyword search.
-                    subject = msg.get("Subject", "").lower()
-                    bounce_keywords = [
-                        "undeliverable",
-                        "delivery failed",
-                        "failure notice",
-                    ]
-
-                    # If we find bounce keywords in the subject
-                    if any(keyword in subject for keyword in bounce_keywords):
-                        # Assume is a hard bounce
-                        bounce_type = BOUNCE_HARD
-                        bounce_reason = "Unknown (Auto-Submitted + Keyword)"
-
-        # Method 3: keyword search (less reliable)
-        if not bounce_type:
-            # We look for common bounce keywords in the From or Subject headers
-            # We avoid false positives by requiring specific keywords.
-            from_header = msg.get("From", "").lower()
-            subject_header = msg.get("Subject", "").lower()
-
-            if "mailer-daemon@" in from_header or "postmaster@" in from_header:
-                # Common bounce sender addresses
-                bounce_type = BOUNCE_HARD
-                bounce_reason = "Unknown (From Keyword)"
-            else:
-                # Check subject for common bounce keywords
-                bounce_keywords = [
-                    "undelivered",
-                    "delivery error",
-                    "mail delivery failed",
-                ]
-                if any(
-                    keyword in subject_header for keyword in bounce_keywords
-                ):
-                    bounce_type = BOUNCE_HARD
-                    bounce_reason = "Unknown (Subject Keyword)"
-
-        return (bounce_type, bounce_reason)
+from .emails_recv import *  # type: ignore # noqa

codenerix_email/management/commands/send_emails.py

@@ -1,248 +1,11 @@
-# -*- coding: utf-8 -*-
-#
-# django-codenerix-email
-#
-# Codenerix GNU
-#
-# Project URL : http://www.codenerix.com
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 import sys
-import time
-
-from django.core.management.base import BaseCommand
-from django.conf import settings
-from django.utils import timezone
 
-from codenerix_lib.debugger import Debugger
-from codenerix_email.models import EmailMessage
-
-# Deprecation warning
 if not sys.argv[0].startswith("email"):
     import logging
 
     logger = logging.getLogger("codenerix")
     logger.warning(
-        "WARNING: 'send_email' is DEPRECATED, switch to 'emails_send' instead"
+        "WARNING: 'send_emails' is DEPRECATED, switch to 'emails_send' instead"
     )
 
-
-class Command(BaseCommand, Debugger):
-    # Show this when the user types help
-    help = "Try to send all emails in the queue"
-
-    def add_arguments(self, parser):
-        # Named (optional) arguments
-        parser.add_argument(
-            "-d",
-            action="store_true",
-            dest="d",
-            default=False,
-            help="Keep the command working forever as a daemon",
-        )
-
-        # Named (optional) arguments
-        parser.add_argument(
-            "--daemon",
-            action="store_true",
-            dest="daemon",
-            default=False,
-            help="Keep the command working forever as a daemon",
-        )
-
-        # Named (optional) arguments
-        parser.add_argument(
-            "-c",
-            action="store_true",
-            dest="c",
-            default=False,
-            help="Clear the sending status to all the Queue",
-        )
-
-        # Named (optional) arguments
-        parser.add_argument(
-            "--clear",
-            action="store_true",
-            dest="clear",
-            default=False,
-            help="Clear the sending status to all the Queue",
-        )
-        # Named (optional) arguments
-        parser.add_argument(
-            "--verbose",
-            action="store_true",
-            dest="verbose",
-            default=False,
-            help="Enable verbose mode",
-        )
-        # Named (optional) arguments
-        parser.add_argument(
-            "--now",
-            action="store_true",
-            dest="now",
-            default=False,
-            help="Send now, do not wait the retry time",
-        )
-        # Named (optional) arguments
-        parser.add_argument(
-            "--all",
-            action="store_true",
-            dest="all",
-            default=False,
-            help="Send all, do not do on buckets",
-        )
-
-    def handle(self, *args, **options):
-        # Get user configuration
-        daemon = bool(options["daemon"] or options["d"])
-        clear = bool(options["clear"] or options["c"])
-        bucket_size = getattr(settings, "CLIENT_EMAIL_BUCKETS", 10)
-        verbose = bool(options.get("verbose", False))
-        sendnow = bool(options.get("now", False))
-        doall = bool(options.get("all", False))
-
-        # Autoconfigure Debugger
-        self.set_name("CODENERIX-EMAIL")
-        self.set_debug()
-
-        # Daemon
-        if verbose:
-            if daemon:
-                self.debug(
-                    "Starting command in DAEMON mode with a "
-                    f"queue of {bucket_size} emails",
-                    color="cyan",
-                )
-            else:
-                self.debug(
-                    "Starting a queue of {} emails".format(bucket_size),
-                    color="blue",
-                )
-
-        # In if requested set sending status for all the list to False
-        if clear:
-            EmailMessage.objects.filter(sending=True).update(sending=False)
-
-        # Get a bunch of emails in the queue
-        connection = None
-
-        # If daemon mode is requested
-        first = True
-        while first or daemon:
-            # Get a bucket of emails
-            emails = EmailMessage.objects.filter(
-                sent=False,
-                sending=False,
-                error=False,
-            )
-
-            # If we do not have to send now we have to wait for the next retry
-            if not sendnow:
-                emails = emails.filter(
-                    next_retry__lte=timezone.now(),
-                )
-
-            # Order emails by priority and next retry
-            emails = emails.order_by("priority", "next_retry")
-
-            # Send in buckets if we are not doing them all
-            if not doall:
-                emails = emails[0 : bucket_size + 1]
-
-            # Check if there are emails to process
-            if emails:
-                # Convert to list
-                list_emails = [x.pk for x in emails]
-
-                # Set sending status for all the list
-                EmailMessage.objects.filter(pk__in=list_emails).update(
-                    sending=True
-                )
-
-                # For each email
-                for email in emails:
-                    if verbose:
-                        self.debug(
-                            "Sending to {}".format(email.eto),
-                            color="white",
-                            tail=False,
-                        )
-
-                    # Check if we have connection
-                    if not connection:
-                        if verbose:
-                            self.debug(
-                                " - Connecting",
-                                color="yellow",
-                                head=False,
-                                tail=False,
-                            )
-                        connection = email.connect()
-
-                    # Send the email
-                    try:
-                        email.send(connection, debug=False)
-                    except Exception as e:
-                        email.sending = False
-                        error = "Exception: {}\n".format(e)
-                        if email.log:
-                            email.log += error
-                        else:
-                            email.log = error
-                        email.save()
-                        self.error(error)
-                    if verbose:
-                        if email.sent:
-                            self.debug(" -> SENT", color="green", head=False)
-                        else:
-                            self.debug(
-                                " -> ERROR",
-                                color="red",
-                                head=False,
-                                tail=False,
-                            )
-                            self.debug(
-                                " ({} retries left)".format(
-                                    getattr(
-                                        settings, "CLIENT_EMAIL_RETRIES", 10
-                                    )
-                                    - email.retries
-                                ),
-                                color="cyan",
-                                head=False,
-                            )
-
-                # Delete all that have been sent
-                if not getattr(settings, "CLIENT_EMAIL_HISTORY", True):
-                    EmailMessage.objects.filter(
-                        pk__in=list_emails, sent=True
-                    ).delete()
-
-            elif daemon:
-                # Sleep for a while
-                try:
-                    time.sleep(10)
-                except KeyboardInterrupt:
-                    self.debug("Exited by user request!", color="green")
-                    break
-
-            elif verbose:
-                # No emails to send
-                self.debug(
-                    "No emails to be sent at this moment in the queue!",
-                    color="green",
-                )
-
-            # This was the first time
-            first = False
+from .emails_send import *  # type: ignore # noqa

codenerix_email/management/commands/test_email.py

@@ -1,36 +1,5 @@
-# -*- coding: utf-8 -*-
-#
-# django-codenerix-email
-#
-# Codenerix GNU
-#
-# Project URL : http://www.codenerix.com
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 import sys
-import json
-
-from django.core.management.base import BaseCommand
-from django.conf import settings
-from django.utils import timezone
-
-from codenerix_lib.debugger import Debugger
-from codenerix_email.models import EmailMessage, EmailTemplate
-from codenerix_email import __version__
-from django.core.management import CommandError
 
-# Deprecation warning
 if not sys.argv[0].startswith("email"):
     import logging
 
@@ -39,146 +8,4 @@ if not sys.argv[0].startswith("email"):
         "WARNING: 'test_email' is DEPRECATED, switch to 'email_test' instead"
     )
 
-
-class Command(BaseCommand, Debugger):
-    # Show this when the user types help
-    help = "Test"
-
-    def add_arguments(self, parser):
-        parser.add_argument(
-            "--email",
-            type=str,
-            help="Email",
-            default=None,
-        )
-        parser.add_argument(
-            "--template",
-            type=str,
-            help="Template CID",
-            default=None,
-        )
-        parser.add_argument(
-            "--context",
-            type=str,
-            help="Context as JSON",
-            default="{}",
-        )
-        parser.add_argument(
-            "--language",
-            type=str,
-            help="Language",
-            default=None,
-        )
-        parser.add_argument(
-            "--stdout",
-            action="store_true",
-            help="Print to stdout",
-            default=False,
-        )
-
-    def handle(self, *args, **options):
-        # Autoconfigure Debugger
-        self.set_name("CODENERIX-EMAIL")
-        self.set_debug()
-
-        # Get arguments
-        email = options["email"]
-        template = options["template"]
-        context_str = options["context"]
-        language = options["language"]
-        stdout = options["stdout"]
-
-        # Read context
-        try:
-            context = json.loads(context_str)
-        except json.JSONDecodeError:
-            raise CommandError(
-                "Context is not a valid JSON string: {}".format(context_str)
-            )
-
-        # If no template is provided, use the default one
-        if template is None:
-            # Get the default template
-            message = """Hello,
-
-This email has been sent using Django Codenerix Email.
-
-Best regards, Codenerix Team
-
---
-Django Codenerix Email v{}
-""".format(
-                __version__
-            )
-
-            def email_message_factory(context, language):
-                email_message = EmailMessage()
-                email_message.subject = "[Codenerix Email] Test"
-                email_message.body = message
-                return email_message
-
-        else:
-            # Get the template
-            try:
-                template = EmailTemplate.objects.get(cid=template)
-            except EmailTemplate.DoesNotExist:
-                raise CommandError(
-                    "Template with CID {} does not exist.".format(template)
-                )
-
-            # Render the template
-            def email_message_factory(context, language):
-                return template.get_email(context, language)
-
-        # If no email is provided, send to all admins
-        if email is None:
-            # Send email to all admins
-            for name, email in settings.ADMINS:
-                email_message = email_message_factory(context, language)
-                email_message.efrom = settings.DEFAULT_FROM_EMAIL
-                email_message.eto = email
-
-                # Prepare message ID info
-                ecid = email_message.uuid.hex
-                edomain = settings.EMAIL_FROM.split("@")[-1]
-                ets = int(timezone.now().timestamp())
-                email_message.headers = {
-                    "Message-ID": f"<{ecid}-{ets}@{edomain}>",
-                    "X-Codenerix-Email": "Test",
-                }
-
-                if stdout:
-                    self.debug(
-                        f"Sending email to {name} <{email}> "
-                        f"with subject: {email_message.subject}:\n"
-                        f"{email_message.body}",
-                        color="white",
-                    )
-                else:
-                    email_message.save()
-                    email_message.send(legacy=False, silent=False)
-        else:
-            # Send email to the specified address
-            email_message = email_message_factory(context, language)
-            email_message.efrom = settings.DEFAULT_FROM_EMAIL
-            email_message.eto = email
-
-            # Prepare message ID info
-            ecid = email_message.uuid.hex
-            edomain = settings.EMAIL_FROM.split("@")[-1]
-            ets = int(timezone.now().timestamp())
-            email_message.headers = {
-                "Message-ID": f"<{ecid}-{ets}@{edomain}>",
-                "X-Codenerix-Email": "Test",
-            }
-
-            if stdout:
-                self.debug(
-                    f"Sending email to <{email}> "
-                    f"with subject: {email_message.subject}:\n"
-                    f"{email_message.body}",
-                    color="white",
-                )
-            else:
-                email_message.save()
-                email_message.send(legacy=False, silent=False)
+from .email_test import *  # type: ignore # noqa

{django_codenerix_email-4.0.35.dist-info → django_codenerix_email-4.0.36.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-codenerix-email
-Version: 4.0.35
+Version: 4.0.36
 Summary: Codenerix Email is a module that enables CODENERIX to set send emails in a general manner.
 Home-page: https://github.com/codenerix/django-codenerix-email
 Author: Juan Miguel Taboada Godoy <juanmi@juanmitaboada.com>, Juan Soler Ruiz <soleronline@gmail.com>

{django_codenerix_email-4.0.35.dist-info → django_codenerix_email-4.0.36.dist-info}/RECORD

@@ -1,4 +1,4 @@
-codenerix_email/__init__.py,sha256=aqCRJ0xgtc7E3Ql9fYCsLEo4p-pMITa-D9LKQCuhnNo,149
+codenerix_email/__init__.py,sha256=jSnbkwb7yLhUUQ_5XYdtPahUTqy4qyDhY4I89pNo1P0,149
 codenerix_email/admin.py,sha256=w259UKFk_opGEl6PJjYHXWAHQ_8emgqmiixKT5Rid4A,1180
 codenerix_email/apps.py,sha256=WXqu1XQibDDyCvvQYt2JbTK4GIpW8BNv5DCbRJS2mmk,149
 codenerix_email/forms.py,sha256=38byLGxg1MOLAY1kAYChxYZj64tSgyfRvDcSbIOdV0I,5521
@@ -827,8 +827,8 @@ codenerix_email/.mypy_cache/3.10/zoneinfo/_common.data.json,sha256=e4xbNKL_yQ5h5
 codenerix_email/.mypy_cache/3.10/zoneinfo/_common.meta.json,sha256=5K19XWobpSjKwiv7bZFZRcxsEfoh7b-FhYcmqB-2Iic,1737
 codenerix_email/.mypy_cache/3.10/zoneinfo/_tzpath.data.json,sha256=CFx7Q1XfUhhuNX69prkxyirG8rfvEDCNgEHWQigKC_A,5632
 codenerix_email/.mypy_cache/3.10/zoneinfo/_tzpath.meta.json,sha256=d1HJ_xFBI1orlZSVhH0gHWLI-dJG3zY-ZOlctOl62yU,1765
-codenerix_email/__pycache__/__init__.cpython-310.pyc,sha256=Sq5FOgkgx3zOEtAjCNOIlXtD0lb96C_KrdSvT2UtZA0,313
-codenerix_email/__pycache__/__init__.cpython-311.pyc,sha256=zDkK7LZsQ9OHEfqGbRyF68_QZn1r1Q0V1zE4XMsDiPk,337
+codenerix_email/__pycache__/__init__.cpython-310.pyc,sha256=_4f3J5XdU0j52LgeGDjFTjpk0xy205v8xQ-OXamh4Uw,313
+codenerix_email/__pycache__/__init__.cpython-311.pyc,sha256=VJN7jdoI4Q1zVQ_yQG9k1SqUHuDaT8RrsDbwJD1-iaI,337
 codenerix_email/__pycache__/__init__.cpython-35.pyc,sha256=dl9lYAgrokJptUj3JAhiqTlX7d_CbncOxZeTc1USc88,308
 codenerix_email/__pycache__/__init__.cpython-37.pyc,sha256=5d1CeFU5DrfnwrRpvSw1bHvLN9hoHXjUA3ln3rXCDo8,306
 codenerix_email/__pycache__/__init__.cpython-39.pyc,sha256=0c6KWU_eOTlF5l9fNWv8l41b0LcfVQNUsqDvJTv2YyU,300
@@ -843,8 +843,8 @@ codenerix_email/__pycache__/forms.cpython-310.pyc,sha256=-oq5NlQGH7VkMUUMB4lXmBo
 codenerix_email/__pycache__/forms.cpython-311.pyc,sha256=zNvq_Xc_bdUsG59tq9OWUiy5hoyZ035z4E5fEovr4NE,5854
 codenerix_email/__pycache__/forms.cpython-35.pyc,sha256=z1aCJ2d8yyKJMuf5aVz0mGE6Nqi9bjU7HyDZPKxpUWc,3233
 codenerix_email/__pycache__/forms.cpython-39.pyc,sha256=NORLA0i3bmWx-mUn3wh3JtObuR7UYKZemSU6Cl5gHM8,2988
-codenerix_email/__pycache__/models.cpython-310.pyc,sha256=L3f8aE3uhDm7R0tBfGFojEi-ueYkHoPIxaAaoDd-0ls,18271
-codenerix_email/__pycache__/models.cpython-311.pyc,sha256=5UAVckTk83Psun4_RV_MCfG4UCcSoj435IEZ0ialb3A,37032
+codenerix_email/__pycache__/models.cpython-310.pyc,sha256=mGqvUrM4y9R0Rj_zCjrVQPLAs67eIjktc7LDslTJrMo,18271
+codenerix_email/__pycache__/models.cpython-311.pyc,sha256=82FmyGqoonmz3JH91BClUvlTjIn43F3HB53lzq2-T38,37135
 codenerix_email/__pycache__/models.cpython-35.pyc,sha256=oGheSKlh8Ttc6bB-qZ1JY5_6RySM9M6GY5-GCATxfes,9481
 codenerix_email/__pycache__/models.cpython-39.pyc,sha256=ugyNNDG3k6rqsunwlcUIWADaLNvJ8snCgQwMZu9Ahac,8849
 codenerix_email/__pycache__/test_settings.cpython-310.pyc,sha256=HH5CsPxLlq7_jW4ZCGBc1KzcV4HNQcI6YTh0wcz_F0w,715
@@ -867,12 +867,12 @@ codenerix_email/management/__pycache__/__init__.cpython-311.pyc,sha256=OtPcxwWjt
 codenerix_email/management/__pycache__/__init__.cpython-35.pyc,sha256=sBoEWs6zdI0al-7t1deW9SE_Ln2RNDl2LyIiOO9gfRA,160
 codenerix_email/management/__pycache__/__init__.cpython-39.pyc,sha256=uPXklfliVd3b8pLOJQT9ZeKcqmJMrGychvt68BsPulY,168
 codenerix_email/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-codenerix_email/management/commands/email_test.py,sha256=byeqE_-woEkml_PoQxwr9zp0XfCruOYAoVfJBIkQr24,5847
-codenerix_email/management/commands/emails_recv.py,sha256=kzSdVPFsuy8_FH8PkEP41IU3-dD114q1NkUGVeLAzfs,25141
-codenerix_email/management/commands/emails_send.py,sha256=qH87OgRH1rPMYbcm0Q6Pgyf38YGXgYhhcFP0Jvkeps8,8187
-codenerix_email/management/commands/recv_emails.py,sha256=kzSdVPFsuy8_FH8PkEP41IU3-dD114q1NkUGVeLAzfs,25141
-codenerix_email/management/commands/send_emails.py,sha256=qH87OgRH1rPMYbcm0Q6Pgyf38YGXgYhhcFP0Jvkeps8,8187
-codenerix_email/management/commands/test_email.py,sha256=byeqE_-woEkml_PoQxwr9zp0XfCruOYAoVfJBIkQr24,5847
+codenerix_email/management/commands/email_test.py,sha256=SPsiq0s48sEX_G3piNHq-c1gDOH800H2zTvM19ei2LY,5605
+codenerix_email/management/commands/emails_recv.py,sha256=RsUfv5s0XMReQ1Y0LjfLp-LJ4F7nFX2z_T1-QAAWcYY,24897
+codenerix_email/management/commands/emails_send.py,sha256=scCFklro4WVMYm-1ataSjUMsPT-Ie5u_DdA55CQcTCQ,7944
+codenerix_email/management/commands/recv_emails.py,sha256=aXmhdXlamiNxRpMIDSKBXUBhkOcwi5l_Pme7jSQUCME,273
+codenerix_email/management/commands/send_emails.py,sha256=a1MnpvZKAEFdXNfmI5oFUkVxy4PZ1AjaJS6GH90zeD0,273
+codenerix_email/management/commands/test_email.py,sha256=ZRAQ7vlPVAtrulaDC7yWeY_IZlgACIdgSiZdhiwCcn0,270
 codenerix_email/management/commands/.mypy_cache/.gitignore,sha256=amnaZw0RUw038PDP3HvtMLeOpkNOJPenMgi5guKdMiw,34
 codenerix_email/management/commands/.mypy_cache/CACHEDIR.TAG,sha256=8cE6_FVTWMkDOw8fMKqhd_6IvaQPS4okWYQA1UeHatw,190
 codenerix_email/management/commands/.mypy_cache/3.10/@plugins_snapshot.json,sha256=RBNvo1WzZ4oRRq0W9-hknpT7T8If536DEMBg9hyq_4o,2
@@ -1612,11 +1612,14 @@ codenerix_email/management/commands/.mypy_cache/3.10/zoneinfo/_tzpath.data.json,
 codenerix_email/management/commands/.mypy_cache/3.10/zoneinfo/_tzpath.meta.json,sha256=OYk8PQ7lBy8EhzEZ-wVPBdLbz4UN_aH6SEappc-kQnI,1765
 codenerix_email/management/commands/__pycache__/__init__.cpython-310.pyc,sha256=3-VfdLuaiBIg4KTIy7GETYTt2-AbfCU0vlH6fFZx7_M,189
 codenerix_email/management/commands/__pycache__/__init__.cpython-311.pyc,sha256=yiqmtIhQMYXWx7g7XT-mvQNgGu_X2ymasWvVxIqPsBE,211
+codenerix_email/management/commands/__pycache__/email_test.cpython-311.pyc,sha256=ql-fe6qem8jGQCu-7Wm3ZCEvzOiVMsCdy0IxOyGnJbo,5946
+codenerix_email/management/commands/__pycache__/emails_recv.cpython-311.pyc,sha256=yhLzihKfS8KIBdf_WKNYaRuCpP5Lhv57Ui5eue0_hnk,20952
+codenerix_email/management/commands/__pycache__/emails_send.cpython-311.pyc,sha256=XSOhv92hH9G4Z9juLmXFTOLCS-oggZBA2TFyKIsxmd8,6868
 codenerix_email/management/commands/__pycache__/recv_emails.cpython-310.pyc,sha256=qzj8puxw6pRAz_ptltybySs2mybOwdoZ8LB7Fw8YMGc,9897
-codenerix_email/management/commands/__pycache__/recv_emails.cpython-311.pyc,sha256=LBMH_iYJ9A60KPpUpDzfW_RZgRRdm-aklGpdDPp36TI,20952
-codenerix_email/management/commands/__pycache__/send_emails.cpython-311.pyc,sha256=DjQ_opoCdF-yWwjsXgsNU0QRwB5lFpD57AiJkBvK6K4,7259
+codenerix_email/management/commands/__pycache__/recv_emails.cpython-311.pyc,sha256=YJoyWZ8Ax_ej7u9_YKjtru8BN8bKlMuvqNiTsLoWYUw,643
+codenerix_email/management/commands/__pycache__/send_emails.cpython-311.pyc,sha256=lqi8IebQlAUlOkceIp7QSYs1FyNYPG0znfxkPZm5guE,643
 codenerix_email/management/commands/__pycache__/test_email.cpython-310.pyc,sha256=5X7qBWFWs7AsNgTo1DyQE0zi5gtLxiFIcwdnboZIUSg,3154
-codenerix_email/management/commands/__pycache__/test_email.cpython-311.pyc,sha256=fhnAA80N3Tv4sdbJQXG7MswXmlfvl9aEZFd7Uyqsoi4,6334
+codenerix_email/management/commands/__pycache__/test_email.cpython-311.pyc,sha256=pfqrykd9U6f9Droyne64rkSfGIqQauTADCEKsYXgsiQ,639
 codenerix_email/migrations/0001_initial.py,sha256=bu1RU_FLeGKBjAXvOPHLUj2Ej9Ibns9PvE1CTVJf6qU,5816
 codenerix_email/migrations/0002_auto_20170502_1043.py,sha256=-zoc4RuZFXJA1Fw8ECCVqAg-PYfku3yxdtYNyXPI3LM,2369
 codenerix_email/migrations/0003_auto_20170921_1206.py,sha256=ncVdyZJ616vQpllGdaPbFS0n9qKfDP-TuVA5HkbPf4I,656
@@ -1684,8 +1687,8 @@ codenerix_email/migrations/__pycache__/__init__.cpython-35.pyc,sha256=2g70xiMW6o
 codenerix_email/migrations/__pycache__/__init__.cpython-39.pyc,sha256=qNj2NH0YvoWPnCKxkVZPsEFsbM05y7t1njMskNISdVQ,168
 codenerix_email/static/codenerix_email/emailmessages_rows.html,sha256=NyZpKPSHAAIywJX2ncS0H2bkqOVtMUwAdbYmkC4dKmk,2202
 codenerix_email/static/codenerix_email/emailreceiveds_rows.html,sha256=k7-Qe7Y9mrKRJXl69aVe5hHUvGdyrLbMoh9gkpyCG2U,1976
-django_codenerix_email-4.0.35.dist-info/LICENSE,sha256=IXMIpi75XsrJt1Sznt4EftT9c_4X0C9eqK4tHhH8H48,11339
-django_codenerix_email-4.0.35.dist-info/METADATA,sha256=45BPU_K_ExxR_MIzqgqDZLQhrIje8tkLuxMid-HCjZA,2676
-django_codenerix_email-4.0.35.dist-info/WHEEL,sha256=z9j0xAa_JmUKMpmz72K0ZGALSM_n-wQVmGbleXx2VHg,110
-django_codenerix_email-4.0.35.dist-info/top_level.txt,sha256=lljSA0iKE_UBEM5gIrGQwioC_i8Jjnp-aR1LFElENgw,16
-django_codenerix_email-4.0.35.dist-info/RECORD,,
+django_codenerix_email-4.0.36.dist-info/LICENSE,sha256=IXMIpi75XsrJt1Sznt4EftT9c_4X0C9eqK4tHhH8H48,11339
+django_codenerix_email-4.0.36.dist-info/METADATA,sha256=BKIq8MArguzQgECY3LS2lyBk6jWzRfdy1OcEKhqBKVE,2676
+django_codenerix_email-4.0.36.dist-info/WHEEL,sha256=z9j0xAa_JmUKMpmz72K0ZGALSM_n-wQVmGbleXx2VHg,110
+django_codenerix_email-4.0.36.dist-info/top_level.txt,sha256=lljSA0iKE_UBEM5gIrGQwioC_i8Jjnp-aR1LFElENgw,16
+django_codenerix_email-4.0.36.dist-info/RECORD,,