django-codenerix-email 4.0.4__tar.gz → 4.0.6__tar.gz

{django-codenerix-email-4.0.4/django_codenerix_email.egg-info → django-codenerix-email-4.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-codenerix-email
-Version: 4.0.4
+Version: 4.0.6
 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.4 → django-codenerix-email-4.0.6}/codenerix_email/__init__.py

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

{django-codenerix-email-4.0.4 → django-codenerix-email-4.0.6}/codenerix_email/forms.py

@@ -32,53 +32,71 @@ class EmailTemplateForm(GenModelForm):
         exclude = []
 
     def __groups__(self):
-        return [(_(u'Details'), 12,
-            ['cid', 3],
-            ['efrom', 9],
-        )
+        return [
+            (
+                _("Details"),
+                12,
+                ["cid", 3],
+                ["efrom", 9],
+            )
         ]
 
     @staticmethod
     def __groups_details__():
-        return [(_(u'Details'), 12,
-            ['cid', 3],
-            ['efrom', 9],)
+        return [
+            (
+                _("Details"),
+                12,
+                ["cid", 3],
+                ["efrom", 9],
+            )
         ]
 
 
 class EmailMessageForm(GenModelForm):
     class Meta:
         model = EmailMessage
-        exclude = ['sending','log']
+        exclude = ["sending", "log"]
 
     def __groups__(self):
-        return [(_(u'Details'), 12,
-            ['efrom', 2],
-            ['eto', 2],
-            ['subject', 4],
-            ['priority', 1],
-            ['sent', 1],
-            ['error', 1],
-            ['retries', 1],
-            ['body', 12],
-        )
+        return [
+            (
+                _("Details"),
+                12,
+                ["efrom", 2],
+                ["eto", 2],
+                ["subject", 4],
+                ["priority", 1],
+                ["sent", 1],
+                ["error", 1],
+                ["retries", 1],
+                ["body", 12],
+            )
         ]
 
     @staticmethod
     def __groups_details__():
-        return [(_(u'Details'), 6,
-            ['efrom', 3],
-            ['eto', 3],
-            ['subject', 3],
-            ['priority', 3],
-            ['sending', 3],
-            ['sent', 3],
-            ['error', 3],
-            ['retries', 3],
-            ['log', 3],
-        ),(_(u'Body'), 6,
-            ['body', 3],
-        )
+        return [
+            (
+                _("Details"),
+                6,
+                ["uuid", 3],
+                ["efrom", 3],
+                ["eto", 3],
+                ["subject", 3],
+                ["priority", 3],
+                ["sending", 3],
+                ["sent", 3],
+                ["error", 3],
+                ["retries", 3],
+                ["opened", 3],
+                ["log", 3],
+            ),
+            (
+                _("Body"),
+                6,
+                ["body", 3],
+            ),
         ]
 
 
@@ -86,7 +104,9 @@ for info in MODELS:
     field = info[0]
     model = info[1]
     for lang_code in settings.LANGUAGES_DATABASES:
-        query = "from codenerix_email.models import {}Text{}\n".format(model, lang_code)
+        query = "from codenerix_email.models import {}Text{}\n".format(
+            model, lang_code
+        )
         exec(query)
         query = """
 class {model}TextForm{lang}(GenModelForm):\n
@@ -106,4 +126,12 @@ class {model}TextForm{lang}(GenModelForm):\n
                 ['subject', 12],
                 ['body', 12],
                 )]\n"""
-        exec(query.format(model=model, lang=lang_code, languages="'{}'".format("','".join(settings.LANGUAGES_DATABASES))))
+        exec(
+            query.format(
+                model=model,
+                lang=lang_code,
+                languages="'{}'".format(
+                    "','".join(settings.LANGUAGES_DATABASES)
+                ),
+            )
+        )

{django-codenerix-email-4.0.4 → django-codenerix-email-4.0.6}/codenerix_email/management/commands/send_emails.py

@@ -24,7 +24,7 @@ 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_lib.debugger import Debugger
 from codenerix_email.models import EmailMessage
 
 
@@ -36,32 +36,40 @@ class Command(BaseCommand, Debugger):
     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')
+        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')
+        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')
+        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')
+        parser.add_argument(
+            "--clear",
+            action="store_true",
+            dest="clear",
+            default=False,
+            help="Clear the sending status to all the Queue",
+        )
 
     def handle(self, *args, **options):
 
@@ -70,13 +78,21 @@ class Command(BaseCommand, Debugger):
         self.set_debug()
 
         # 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)
+        daemon = bool(options["daemon"] or options["d"])
+        clear = bool(options["clear"] or options["c"])
+        BUCKET_SIZE = getattr(settings, "CLIENT_EMAIL_BUCKETS", 10)
         if daemon:
-            self.debug("Starting command in DAEMON mode with a queue of {} emails".format(BUCKET_SIZE), color='cyan')
+            self.debug(
+                "Starting command in DAEMON mode with a queue of {} emails".format(
+                    BUCKET_SIZE
+                ),
+                color="cyan",
+            )
         else:
-            self.debug("Starting a queue of {} emails".format(BUCKET_SIZE), color='blue')
+            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:
@@ -90,7 +106,12 @@ class Command(BaseCommand, Debugger):
         while first or daemon:
 
             # Get a bucket of emails
-            emails = EmailMessage.objects.filter(sent=False, sending=False, error=False, next_retry__lte=timezone.now()).order_by('priority', 'next_retry')[0:BUCKET_SIZE+1]
+            emails = EmailMessage.objects.filter(
+                sent=False,
+                sending=False,
+                error=False,
+                next_retry__lte=timezone.now(),
+            ).order_by("priority", "next_retry")[0 : BUCKET_SIZE + 1]
 
             # Check if there are emails to process
             if emails:
@@ -99,15 +120,26 @@ class Command(BaseCommand, Debugger):
                 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)
+                EmailMessage.objects.filter(pk__in=list_emails).update(
+                    sending=True
+                )
 
                 # For each email
                 for email in emails:
-                    self.debug("Sending to {}".format(email.eto), color='white', tail=False)
+                    self.debug(
+                        "Sending to {}".format(email.eto),
+                        color="white",
+                        tail=False,
+                    )
 
                     # Check if we have connection
                     if not connection:
-                        self.debug(" - Connecting", color='yellow', head=False, tail=False)
+                        self.debug(
+                            " - Connecting",
+                            color="yellow",
+                            head=False,
+                            tail=False,
+                        )
                         connection = email.connect()
 
                     # Send the email
@@ -123,14 +155,25 @@ class Command(BaseCommand, Debugger):
                         email.save()
                         self.error(error)
                     if email.sent:
-                        self.debug(" -> SENT", color='green', head=False)
+                        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)
+                        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()
+                if not getattr(settings, "CLIENT_EMAIL_HISTORY", True):
+                    EmailMessage.objects.filter(
+                        pk__in=list_emails, sent=True
+                    ).delete()
 
             elif daemon:
 
@@ -138,12 +181,15 @@ class Command(BaseCommand, Debugger):
                 try:
                     time.sleep(10)
                 except KeyboardInterrupt:
-                    self.debug("Exited by user request!", color='green')
+                    self.debug("Exited by user request!", color="green")
                     break
 
             else:
                 # No emails to send
-                self.debug("No emails to be sent at this moment in the queue!", color='green')
+                self.debug(
+                    "No emails to be sent at this moment in the queue!",
+                    color="green",
+                )
 
             # This was the first time
             first = False

{django-codenerix-email-4.0.4 → django-codenerix-email-4.0.6}/codenerix_email/management/commands/test_email.py

@@ -22,7 +22,7 @@
 from django.core.management.base import BaseCommand
 from django.conf import settings
 
-from codenerix.lib.debugger import Debugger
+from codenerix_lib.debugger import Debugger
 from codenerix_email.models import EmailMessage
 from codenerix_email import __version__
 
@@ -31,26 +31,28 @@ class Command(BaseCommand, Debugger):
 
     # Show this when the user types help
     help = "Test"
-    
+
     def handle(self, *args, **options):
-        
+
         # Autoconfigure Debugger
         self.set_name("CODENERIX-EMAIL")
         self.set_debug()
 
-        message = '''Hello,
+        message = """Hello,
 
 this email has been sent using Django Codenerix Email.
 
 Best regards, Codenerix Team
 
 --
-Django Codenerix Email v{}'''.format(__version__)
+Django Codenerix Email v{}""".format(
+            __version__
+        )
 
         for name, email in settings.ADMINS:
             email_message = EmailMessage()
             email_message.efrom = settings.DEFAULT_FROM_EMAIL
             email_message.eto = email
-            email_message.subject = '[Codenerix Email] Test'
+            email_message.subject = "[Codenerix Email] Test"
             email_message.body = message
             email_message.send(legacy=False, silent=False)

django-codenerix-email-4.0.6/codenerix_email/migrations/0009_emailmessage_opened_emailmessage_uuid.py

@@ -0,0 +1,44 @@
+# Generated by Django 5.0.4 on 2024-05-22 11:41
+
+import uuid
+from django.db import migrations, models
+
+
+def create_uuid(apps, schema_editor):
+    EmailMessage = apps.get_model("codenerix_email", "EmailMessage")
+    for email_message in EmailMessage.objects.all():
+        email_message.uuid = uuid.uuid4()
+        email_message.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("codenerix_email", "0008_auto_20171201_0928"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="emailmessage",
+            name="opened",
+            field=models.DateTimeField(
+                blank=True, default=None, null=True, verbose_name="Opened"
+            ),
+        ),
+        migrations.AddField(
+            model_name="emailmessage",
+            name="uuid",
+            field=models.UUIDField(blank=True, null=True),
+        ),
+        migrations.RunPython(create_uuid),
+        migrations.AlterField(
+            model_name="emailmessage",
+            name="uuid",
+            field=models.UUIDField(
+                default=uuid.uuid4,
+                editable=False,
+                unique=True,
+                verbose_name="UUID",
+            ),
+        ),
+    ]

{django-codenerix-email-4.0.4 → django-codenerix-email-4.0.6}/codenerix_email/models.py

@@ -21,6 +21,7 @@
 import re
 import ssl
 import smtplib
+from uuid import uuid4
 
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
@@ -29,13 +30,24 @@ from django.template import Context, Template
 from django.core.exceptions import ValidationError
 from django.conf import settings
 
-from codenerix.models import CodenerixModel
+from codenerix.models import CodenerixModel  # type: ignore
 from codenerix_lib.debugger import Debugger
-from codenerix.lib.genmail import EmailMessage as EM, get_connection
-from codenerix.fields import WysiwygAngularField
+from codenerix.lib.genmail import (  # type: ignore # noqa: N817
+    EmailMessage as EM,
+    get_connection,
+)
+from codenerix.fields import WysiwygAngularField  # type: ignore
 
 
 class EmailMessage(CodenerixModel, Debugger):
+    uuid = models.UUIDField(
+        _("UUID"),
+        unique=True,
+        default=uuid4,
+        editable=False,
+        null=False,
+        blank=False,
+    )
     efrom = models.EmailField(_("From"), blank=False, null=False)
     eto = models.EmailField(_("To"), blank=False, null=False)
     subject = models.CharField(
@@ -59,6 +71,9 @@ class EmailMessage(CodenerixModel, Debugger):
     )
     next_retry = models.DateTimeField(_("Next retry"), auto_now_add=True)
     log = models.TextField(_("Log"), blank=True, null=True)
+    opened = models.DateTimeField(
+        _("Opened"), null=True, blank=True, default=None
+    )
 
     def __fields__(self, info):
         fields = []
@@ -66,7 +81,9 @@ class EmailMessage(CodenerixModel, Debugger):
         fields.append(("error", None, 100))
         fields.append(("sent", _("Send"), 100))
         fields.append(("priority", _("Priority"), 100))
+        fields.append(("uuid", _("UUID"), 100))
         fields.append(("created", _("Created"), 100))
+        fields.append(("opened", _("Opened"), 100))
         fields.append(("efrom", _("From"), 100))
         fields.append(("eto", _("To"), 100))
         fields.append(("subject", _("Subject"), 100))
@@ -78,6 +95,10 @@ class EmailMessage(CodenerixModel, Debugger):
     def __unicode__(self):
         return "{} ({})".format(self.eto, self.pk)
 
+    def set_opened(self):
+        self.opened = timezone.now()
+        self.save()
+
     def connect(self, legacy=False):
         """
         This class will return a connection instance, you can disconnect it with connection.close()
@@ -309,6 +330,7 @@ class EmailTemplate(CodenerixModel):
             lang = settings.LANGUAGES_DATABASES[0].lower()
 
         e = EmailMessage()
+        context["__emsg__uuid__"] = e.uuid
         e.subject = Template(getattr(self, lang).subject).render(
             Context(context)
         )

{django-codenerix-email-4.0.4 → django-codenerix-email-4.0.6}/codenerix_email/static/codenerix_email/partials/emailmessages_rows.html

@@ -5,7 +5,9 @@
     <span ng-if='row.error' alt='{{data.meta.gentranslate.notsent}}' title='{{data.meta.gentranslate.notsent}}' codenerix-html-compile="false|codenerix"></span>
 </td>
 <td>{{row.priority|codenerix}}</td>
+<td>{{row.uuid|codenerix}}</td>
 <td>{{row.created|codenerix}}</td>
+<td>{{row.opened|codenerix}}</td>
 <td>{{row.efrom|codenerix}}</td>
 <td>{{row.eto|codenerix}}</td>
 <td>{{row.subject|codenerix}}</td>

django-codenerix-email-4.0.6/codenerix_email/urls_frontend.py

@@ -0,0 +1,31 @@
+# -*- 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.
+
+from django.urls import re_path
+from codenerix_email.views import EmailFollow
+
+
+urlpatterns = [
+    re_path(
+        r"^flw/(?P<uuid_ext>.*)$",
+        EmailFollow.as_view(),
+        name="CDNX_email_follow",
+    ),
+]

{django-codenerix-email-4.0.4 → django-codenerix-email-4.0.6}/codenerix_email/views.py

@@ -18,14 +18,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Optional, Tuple, List, Dict, Any
+import base64
 
+from typing import Optional, Tuple, List, Dict
+from django.http import HttpResponse
+from django.views.generic import View
+
+from django.shortcuts import get_object_or_404
 from django.utils.translation import gettext as _
 from django.conf import settings
-from django.http import HttpRequest
+from django.http import HttpRequest, Http404
 
-from codenerix.multiforms import MultiForm
-from codenerix.views import (
+from codenerix.multiforms import MultiForm  # type: ignore
+from codenerix.views import (  # type: ignore
     GenList,
     GenCreate,
     GenCreateModal,
@@ -70,6 +75,38 @@ for info in MODELS:
         )
 
 
+# ############################################
+# EmailFollow
+class EmailFollow(View):
+    def get(self, request, *args, **kwargs):
+
+        # Get uuid from email
+        uid = kwargs.get("uuid_ext", None)
+
+        if uid:
+
+            # Get email message or return 404
+            email_message = get_object_or_404(EmailMessage, uuid=uid)
+
+            # Set email message as opened
+            if not email_message.opened:
+                email_message.set_opened()
+            email_message.set_opened()
+
+            # Return an image of 1x1 pixel
+            return HttpResponse(
+                base64.b64decode(
+                    "R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=="
+                ),
+                content_type="image/gif",
+            )
+
+        else:
+
+            # Return 404
+            raise Http404
+
+
 # ############################################
 # EmailTemplate
 class EmailTemplateList(GenList):

{django-codenerix-email-4.0.4 → django-codenerix-email-4.0.6/django_codenerix_email.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-codenerix-email
-Version: 4.0.4
+Version: 4.0.6
 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.4 → django-codenerix-email-4.0.6}/django_codenerix_email.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ codenerix_email/apps.py
 codenerix_email/forms.py
 codenerix_email/models.py
 codenerix_email/urls.py
+codenerix_email/urls_frontend.py
 codenerix_email/views.py
 codenerix_email/management/__init__.py
 codenerix_email/management/__pycache__/__init__.cpython-310.pyc
@@ -25,6 +26,7 @@ codenerix_email/migrations/0005_emailmessage_retries.py
 codenerix_email/migrations/0006_emailmessage_error.py
 codenerix_email/migrations/0007_emailmessage_next_retry.py
 codenerix_email/migrations/0008_auto_20171201_0928.py
+codenerix_email/migrations/0009_emailmessage_opened_emailmessage_uuid.py
 codenerix_email/migrations/__init__.py
 codenerix_email/migrations/__pycache__/0001_initial.cpython-310.pyc
 codenerix_email/migrations/__pycache__/0001_initial.cpython-311.pyc
@@ -58,6 +60,9 @@ codenerix_email/migrations/__pycache__/0008_auto_20171201_0928.cpython-310.pyc
 codenerix_email/migrations/__pycache__/0008_auto_20171201_0928.cpython-311.pyc
 codenerix_email/migrations/__pycache__/0008_auto_20171201_0928.cpython-35.pyc
 codenerix_email/migrations/__pycache__/0008_auto_20171201_0928.cpython-39.pyc
+codenerix_email/migrations/__pycache__/0009_delete_emailtemplatetexten.cpython-311.pyc
+codenerix_email/migrations/__pycache__/0009_emailmessage_opened_emailmessage_uuid.cpython-311.pyc
+codenerix_email/migrations/__pycache__/0010_emailmessage_opened_emailmessage_uuid_and_more.cpython-311.pyc
 codenerix_email/migrations/__pycache__/__init__.cpython-310.pyc
 codenerix_email/migrations/__pycache__/__init__.cpython-311.pyc
 codenerix_email/migrations/__pycache__/__init__.cpython-35.pyc