django-pfx 1.7.3.dev4__tar.gz → 1.7.3.dev8__tar.gz

{django_pfx-1.7.3.dev4 → django_pfx-1.7.3.dev8}/.pre-commit-config.yaml

@@ -1,11 +1,11 @@
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
+  - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.3.0
     hooks:
-    -   id: check-yaml
-    -   id: end-of-file-fixer
-    -   id: trailing-whitespace
--   repo: local
+      - id: check-yaml
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+  - repo: local
     hooks:
       - id: flake8
         name: flake8
@@ -13,17 +13,17 @@ repos:
         language: system
         types: [python]
         args: [--config=./setup.cfg]
--   repo: local
+  - repo: local
     hooks:
       - id: isort
         name: isort
         entry: isort
         language: system
         types: [python]
--   repo: local
+  - repo: local
     hooks:
       - id: make-messages
         name: make messages
         entry: ./make_messages
         language: system
-        types: [python]
+        pass_filenames: false

{django_pfx-1.7.3.dev4 → django_pfx-1.7.3.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.7.3.dev4
+Version: 1.7.3.dev8
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com
@@ -37,6 +37,9 @@ Requires-Dist: dill
 Requires-Dist: nh3
 Provides-Extra: otp
 Requires-Dist: pyotp; extra == "otp"
+Provides-Extra: heic-converter
+Requires-Dist: python-magic; extra == "heic-converter"
+Requires-Dist: pillow-heif; extra == "heic-converter"
 Dynamic: license-file
 
 # Django PFX

{django_pfx-1.7.3.dev4 → django_pfx-1.7.3.dev8}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.7.3.dev4
+Version: 1.7.3.dev8
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com
@@ -37,6 +37,9 @@ Requires-Dist: dill
 Requires-Dist: nh3
 Provides-Extra: otp
 Requires-Dist: pyotp; extra == "otp"
+Provides-Extra: heic-converter
+Requires-Dist: python-magic; extra == "heic-converter"
+Requires-Dist: pillow-heif; extra == "heic-converter"
 Dynamic: license-file
 
 # Django PFX

{django_pfx-1.7.3.dev4 → django_pfx-1.7.3.dev8}/django_pfx.egg-info/SOURCES.txt

@@ -33,6 +33,30 @@ doc/source/testing.md
 img/pfx.png
 img/pfx.svg
 pfx/__init__.py
+pfx/emails/__init__.py
+pfx/emails/apps.py
+pfx/emails/exceptions.py
+pfx/emails/shortcuts.py
+pfx/emails/tasks.py
+pfx/emails/urls.py
+pfx/emails/email_backend/__init__.py
+pfx/emails/email_backend/q_mailjet_email_backend.py
+pfx/emails/mailjet/__init__.py
+pfx/emails/mailjet/mailjet.py
+pfx/emails/mailjet/message_result.py
+pfx/emails/migrations/0001_initial.py
+pfx/emails/migrations/0002_alter_email_headers.py
+pfx/emails/migrations/0003_alter_email_options.py
+pfx/emails/migrations/__init__.py
+pfx/emails/models/__init__.py
+pfx/emails/models/email.py
+pfx/emails/providers/__init__.py
+pfx/emails/providers/email_django_q_executor.py
+pfx/emails/templates/emails/base_template.html
+pfx/emails/templates/emails/base_template.txt
+pfx/emails/templates/emails/base_template_subject.txt
+pfx/emails/views/__init__.py
+pfx/emails/views/email_rest_view.py
 pfx/pfxcore/__init__.py
 pfx/pfxcore/apps.py
 pfx/pfxcore/default_settings.py
@@ -73,6 +97,7 @@ pfx/pfxcore/migrations/operations/__init__.py
 pfx/pfxcore/migrations/operations/permissions.py
 pfx/pfxcore/models/__init__.py
 pfx/pfxcore/models/abstract_pfx_base_user.py
+pfx/pfxcore/models/attachment_mixin.py
 pfx/pfxcore/models/cache_mixins.py
 pfx/pfxcore/models/login_ban.py
 pfx/pfxcore/models/mfa_user_mixin.py
@@ -125,8 +150,28 @@ pfx/pfxcore/views/parameters/subset_page_size.py
 pfx/pfxcore/views/parameters/subset_page_subset.py
 pfx/settings/__init__.py
 pfx/settings/dev.py
+pfx/userjobs/__init__.py
+pfx/userjobs/apps.py
+pfx/userjobs/tasks.py
+pfx/userjobs/urls.py
+pfx/userjobs/locale/fr/LC_MESSAGES/django.mo
+pfx/userjobs/locale/fr/LC_MESSAGES/django.po
+pfx/userjobs/migrations/0001_initial.py
+pfx/userjobs/migrations/0002_alter_userjob_options_alter_userjob_auto_queued_and_more.py
+pfx/userjobs/migrations/__init__.py
+pfx/userjobs/models/__init__.py
+pfx/userjobs/models/user_job.py
+pfx/userjobs/models/user_job_attachment.py
+pfx/userjobs/providers/__init__.py
+pfx/userjobs/providers/user_job_django_q_executor.py
+pfx/userjobs/providers/user_job_websocket_channel_provider.py
+pfx/userjobs/views/__init__.py
+pfx/userjobs/views/user_job_attachment_view.py
+pfx/userjobs/views/user_job_view.py
+pfx/userjobs/views/user_websocket_consumer.py
 tests/__init__.py
 tests/apps.py
+tests/channel_group_send_calls.py
 tests/models.py
 tests/urls.py
 tests/views.py
@@ -153,6 +198,10 @@ tests/tests/test_auth_api.py
 tests/tests/test_body_mixin.py
 tests/tests/test_cache.py
 tests/tests/test_client.py
+tests/tests/test_emails_email_api.py
+tests/tests/test_emails_email_model.py
+tests/tests/test_emails_q_mailjet_email_backend.py
+tests/tests/test_emails_send_email_message.py
 tests/tests/test_fields_choices.py
 tests/tests/test_fields_date.py
 tests/tests/test_fields_decimal.py
@@ -172,6 +221,9 @@ tests/tests/test_settings.py
 tests/tests/test_shortcuts.py
 tests/tests/test_timezone_middleware.py
 tests/tests/test_tools.py
+tests/tests/test_user_job_api.py
+tests/tests/test_user_job_messages.py
+tests/tests/test_user_job_model.py
 tests/tests/test_user_queryset.py
 tests/tests/test_view_decorators.py
 tests/tests/test_view_fields.py

{django_pfx-1.7.3.dev4 → django_pfx-1.7.3.dev8}/django_pfx.egg-info/requires.txt

@@ -9,5 +9,9 @@ pytz
 dill
 nh3
 
+[heic-converter]
+python-magic
+pillow-heif
+
 [otp]
 pyotp

{django_pfx-1.7.3.dev4 → django_pfx-1.7.3.dev8}/doc/conf.py

@@ -25,7 +25,9 @@ settings.configure(
         'django.contrib.auth',
         'django.contrib.contenttypes',
         'django.contrib.postgres',
-        'pfx.pfxcore'])
+        'pfx.pfxcore',
+        'pfx.userjobs'],
+    STORAGE_DEFAULT='pfx.pfxcore.storage.LocalStorage')
 django.setup()
 
 

{django_pfx-1.7.3.dev4 → django_pfx-1.7.3.dev8}/make_messages

@@ -1,3 +1,4 @@
 #!/usr/bin/env bash
 (cd pfx/pfxcore && django-admin makemessages -a)
+(cd pfx/userjobs && django-admin makemessages -a)
 (cd tests && django-admin makemessages -a)

django_pfx-1.7.3.dev8/pfx/emails/__init__.py

@@ -0,0 +1 @@
+from .apps import EmailsConfig

django_pfx-1.7.3.dev8/pfx/emails/apps.py

@@ -0,0 +1,14 @@
+from django.apps import AppConfig
+from django.db.models.signals import post_migrate
+
+
+class EmailsConfig(AppConfig):
+    name = 'pfx.emails'
+    default = True
+
+    def ready(self):
+        from pfx.emails.models.email import get_executor
+        executor = get_executor()
+        executor.validate_setup()
+        post_migrate.connect(executor.register_periodic_tasks, sender=self)
+        super().ready()

django_pfx-1.7.3.dev8/pfx/emails/email_backend/__init__.py

@@ -0,0 +1 @@
+from .q_mailjet_email_backend import QMailjetEmailBackend

django_pfx-1.7.3.dev8/pfx/emails/email_backend/q_mailjet_email_backend.py

@@ -0,0 +1,96 @@
+import base64
+import email.utils
+import logging
+from email.mime.base import MIMEBase
+
+from django.core.mail import EmailMultiAlternatives
+from django.core.mail.backends.base import BaseEmailBackend
+
+from pfx.emails.models import get_email_model
+from pfx.emails.shortcuts import default_mail_from, default_reply_to
+
+
+def getaddresses(fieldvalues):
+    return email.utils.getaddresses(fieldvalues, strict=False)
+
+
+class QMailjetEmailBackend(BaseEmailBackend):
+
+    def send_messages(self, email_messages):
+        cnt = 0
+        for message in email_messages:
+            self.create_mail(message)
+            cnt += 1
+        return cnt
+
+    def create_extra_values(self, message):
+        return {}
+
+    def create_mail(self, message):
+        if not message.from_email:
+            mail_from = default_mail_from()
+        else:
+            mail_from = self.mail_dict(*getaddresses(
+                [message.from_email])[0])
+
+        parts = {}
+        if isinstance(message, EmailMultiAlternatives):
+            html_content = None
+            for content, mt in message.alternatives:
+                if mt == 'text/html':
+                    html_content = content
+            parts['text_part'] = message.body
+            parts['html_part'] = html_content
+        elif message.content_subtype == "html":
+            parts['html_part'] = message.body
+        else:
+            parts['text_part'] = message.body
+
+        attachments = []
+        for msg_att in message.attachments:
+            if isinstance(msg_att, MIMEBase):
+                filename = msg_att.get_filename()
+                content_type = msg_att.get_content_type()
+                content = msg_att.get_payload(decode=True)
+            else:
+                filename, content, content_type = msg_att
+            if isinstance(content, str):
+                content = content.encode('utf-8')
+            attachments.append({
+                'ContentType': content_type,
+                'Filename': filename,
+                'Base64Content': base64.b64encode(content).decode('utf-8')})
+
+        headers = message.extra_headers
+        reply_to = default_reply_to()
+        if message.reply_to:
+            headers["Reply-To"] = ', '.join(message.reply_to)
+        elif not headers.get("Reply-To") and reply_to:
+            headers["Reply-To"] = reply_to
+
+        email = get_email_model()(
+            mail_from=mail_from,
+            mail_to=[
+                self.mail_dict(*e) for e in getaddresses(message.to)],
+            mail_cc=[
+                self.mail_dict(*e) for e in getaddresses(message.cc)],
+            mail_bcc=[
+                self.mail_dict(*e) for e in getaddresses(message.bcc)],
+            subject=message.subject,
+            headers=headers,
+            attachments=attachments,
+            send_mode=getattr(message, 'send_mode', 'auto_async'),
+            **parts,
+            **self.create_extra_values(message))
+        email.full_clean()
+        email.save()
+
+    @staticmethod
+    def mail_dict(name, mail):
+        res = {'Email': mail}
+        if name:
+            res['Name'] = name
+        return res
+
+
+logger = logging.getLogger(__name__)

django_pfx-1.7.3.dev8/pfx/emails/exceptions.py

@@ -0,0 +1,2 @@
+class HasRunningTaskException(Exception):
+    pass

django_pfx-1.7.3.dev8/pfx/emails/mailjet/__init__.py

@@ -0,0 +1,2 @@
+from .mailjet import *
+from .message_result import *

django_pfx-1.7.3.dev8/pfx/emails/mailjet/mailjet.py

@@ -0,0 +1,18 @@
+from django.conf import settings
+
+
+def Mailjet(version='v3'):
+    try:
+        from mailjet_rest.client import Client
+    except Exception as e:
+        raise RuntimeError(
+            "mailjet_rest library missing.") from e
+
+    key_public = getattr(settings, 'PFX_MJ_APIKEY_PUBLIC', None)
+    key_private = getattr(settings, 'PFX_MJ_APIKEY_PRIVATE', None)
+    try:
+        return Client(auth=(key_public, key_private), version=version)
+    except Exception as e:
+        raise RuntimeError(
+            "Invalid PFX_MJ_APIKEY_PUBLIC and/or "
+            "PFX_MJ_APIKEY_PRIVATE settings") from e

django_pfx-1.7.3.dev8/pfx/emails/mailjet/message_result.py

@@ -0,0 +1,32 @@
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class Event:
+    def __init__(self, json):
+        self.json = json
+
+    @property
+    def status(self):
+        return self.json.get("Status", 'unknown')
+
+    @property
+    def is_permanent(self):
+        return self.status == 'sent' or self.json.get("StatePermanent")
+
+
+class Message:
+    def __init__(self, json):
+        self.json = json
+
+    @property
+    def event(self):
+        events = self.json.get('Data', [])
+        return Event(events and "Status" in events[0] and events[0] or {})
+
+
+class MessageResult(Message):
+    def __init__(self, result):
+        super().__init__(result.json())
+        self.status_code = result.status_code

django_pfx-1.7.3.dev8/pfx/emails/migrations/0001_initial.py

@@ -0,0 +1,47 @@
+# Generated by Django 4.2.30 on 2026-05-27 09:11
+# flake8: noqa
+
+from django.db import migrations, models
+
+import pfx.emails.shortcuts
+import pfx.pfxcore.models.not_null_fields
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Email',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('send_date', models.DateTimeField(auto_now_add=True, null=True, verbose_name='Send date')),
+                ('mail_from', models.JSONField(default=pfx.emails.shortcuts.default_mail_from, verbose_name='Mail From')),
+                ('mail_to', models.JSONField(default=list, verbose_name='Mail To')),
+                ('mail_cc', models.JSONField(blank=True, default=list, verbose_name='Mail Cc')),
+                ('mail_bcc', models.JSONField(blank=True, default=list, verbose_name='Mail Bcc')),
+                ('subject', models.CharField(max_length=255, verbose_name='Subject')),
+                ('text_part', pfx.pfxcore.models.not_null_fields.NotNullTextField(blank=True, verbose_name='Text Part')),
+                ('html_part', pfx.pfxcore.models.not_null_fields.NotNullTextField(blank=True, verbose_name='HTML Part')),
+                ('headers', models.JSONField(default=dict, verbose_name='Headers')),
+                ('attachments', models.JSONField(blank=True, default=list, verbose_name='Attachments')),
+                ('status', models.CharField(choices=[('to_send', 'To send'), ('sending', 'Sending'), ('sent', 'Sent'), ('delivered', 'Delivered'), ('delivery_error', 'Delivery Error'), ('error', 'Error'), ('error_retry', 'Error Retry'), ('blocked', 'Blocked')], db_index=True, default='to_send', max_length=32, verbose_name='Status')),
+                ('status_code', models.IntegerField(blank=True, null=True, verbose_name='HTTP Status Code')),
+                ('errors', models.JSONField(blank=True, null=True, verbose_name='Errors')),
+                ('send_mode', models.CharField(choices=[('manual', 'Manual'), ('auto', 'Auto'), ('auto_async', 'Auto Async')], db_index=True, default='auto_async', max_length=32, verbose_name='Send Mode')),
+                ('delete_delivered', models.BooleanField(default=True, verbose_name='Delete Delivered')),
+                ('send_task_id', models.CharField(blank=True, max_length=255, null=True, unique=True, verbose_name='Send Task Id')),
+                ('retry_count', models.IntegerField(default=0, verbose_name='Retry count')),
+            ],
+            options={
+                'verbose_name': 'Email',
+                'verbose_name_plural': 'Emails',
+                'db_table': 'emails_email',
+                'ordering': ['send_date'],
+            },
+        ),
+    ]

django_pfx-1.7.3.dev8/pfx/emails/migrations/0002_alter_email_headers.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.30 on 2026-06-01 00:26
+# flake8: noqa
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('emails', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='email',
+            name='headers',
+            field=models.JSONField(blank=True, default=dict, verbose_name='Headers'),
+        ),
+    ]

django_pfx-1.7.3.dev8/pfx/emails/migrations/0003_alter_email_options.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.30 on 2026-06-01 00:58
+# flake8: noqa
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('emails', '0002_alter_email_headers'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='email',
+            options={},
+        ),
+    ]

django_pfx-1.7.3.dev8/pfx/emails/models/__init__.py

@@ -0,0 +1 @@
+from .email import AbstractEmail, Email, get_email_model