django-pfx 1.7.3.dev35__tar.gz → 1.7.3.dev39__tar.gz

{django_pfx-1.7.3.dev35 → django_pfx-1.7.3.dev39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.7.3.dev35
+Version: 1.7.3.dev39
 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

{django_pfx-1.7.3.dev35 → django_pfx-1.7.3.dev39}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.7.3.dev35
+Version: 1.7.3.dev39
 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

{django_pfx-1.7.3.dev35 → django_pfx-1.7.3.dev39}/django_pfx.egg-info/SOURCES.txt

@@ -172,6 +172,7 @@ 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/0003_clean_scheduled_tasks.py
+pfx/userjobs/migrations/0004_userjob_summary_url.py
 pfx/userjobs/migrations/__init__.py
 pfx/userjobs/models/__init__.py
 pfx/userjobs/models/user_job.py

{django_pfx-1.7.3.dev35 → django_pfx-1.7.3.dev39}/django_pfx.egg-info/scm_file_list.json

@@ -208,6 +208,7 @@
     "pfx/userjobs/views/user_websocket_consumer.py",
     "pfx/userjobs/views/user_job_view.py",
     "pfx/userjobs/views/user_job_attachment_view.py",
+    "pfx/userjobs/migrations/0004_userjob_summary_url.py",
     "pfx/userjobs/migrations/0002_alter_userjob_options_alter_userjob_auto_queued_and_more.py",
     "pfx/userjobs/migrations/__init__.py",
     "pfx/userjobs/migrations/0003_clean_scheduled_tasks.py",

django_pfx-1.7.3.dev39/django_pfx.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "1.7.2",
+  "distance": 39,
+  "node": "gc2ec9d0f526e77d7a1ec12b66bb48bb0035bff55",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-07-15"
+}

{django_pfx-1.7.3.dev35 → django_pfx-1.7.3.dev39}/pfx/userjobs/locale/fr/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-05-21 16:19+0200\n"
+"POT-Creation-Date: 2026-07-15 18:23+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -77,51 +77,55 @@ msgstr "Statut lu"
 msgid "Summary"
 msgstr "Résumé"
 
-#: models/user_job.py:84
+#: models/user_job.py:85
+msgid "Summary URL"
+msgstr "URL du Résumé"
+
+#: models/user_job.py:86
 msgid "Message"
 msgstr "Message"
 
-#: models/user_job.py:85
+#: models/user_job.py:87
 msgid "Error log"
 msgstr "Journal d’erreur"
 
-#: models/user_job.py:87
+#: models/user_job.py:89
 msgid "Retention period"
 msgstr "Durée de conservation"
 
-#: models/user_job.py:88
+#: models/user_job.py:90
 msgid "Function"
 msgstr "Fonction"
 
-#: models/user_job.py:89
+#: models/user_job.py:91
 msgid "Arguments"
 msgstr "Arguments"
 
-#: models/user_job.py:90
+#: models/user_job.py:92
 msgid "Timeout"
 msgstr "Délai"
 
-#: models/user_job.py:91
+#: models/user_job.py:93
 msgid "Automatically queued"
 msgstr "Mise en file d’attente automatique"
 
-#: models/user_job.py:92
+#: models/user_job.py:94
 msgid "Cluster"
 msgstr "Cluster"
 
-#: models/user_job.py:93
+#: models/user_job.py:95
 msgid "Lock"
 msgstr "Verrou"
 
-#: models/user_job.py:99
+#: models/user_job.py:101
 msgid "User job"
 msgstr "Tâche utilisateur"
 
-#: models/user_job.py:100
+#: models/user_job.py:102
 msgid "User jobs"
 msgstr "Tâches utilisateur"
 
-#: models/user_job.py:169
+#: models/user_job.py:173
 msgid "This operation is already in progress."
 msgstr "Cette opération est déjà en cours."
 
@@ -144,11 +148,10 @@ msgstr "Pièces jointes"
 #: tasks.py:17
 msgid "Timeout exceeds. Our support team has been notified."
 msgstr ""
-"Le délai d’attente est dépassé. "
-"Notre équipe d’assistance en a été informée."
+"Le délai d’attente est dépassé. Notre équipe d’assistance en a été informée."
 
 #: tasks.py:23
 msgid "This job never started. Our support team has been notified."
 msgstr ""
-"Cette tâche n’a jamais été lancée. "
-"Notre équipe d’assistance en a été informée."
+"Cette tâche n’a jamais été lancée. Notre équipe d’assistance en a été "
+"informée."

django_pfx-1.7.3.dev39/pfx/userjobs/migrations/0003_clean_scheduled_tasks.py

@@ -0,0 +1,28 @@
+# Generated by Django 5.2.14 on 2026-06-03 08:39
+# flake8: noqa
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('userjobs', '0002_alter_userjob_options_alter_userjob_auto_queued_and_more'),
+    ]
+
+    operations = [
+        migrations.RunSQL(
+            r"""
+            do $$
+            begin
+                if exists (
+                    select 1
+                    from information_schema.tables
+                    where table_name = 'django_q_schedule'
+                ) then
+                    delete from django_q_schedule
+                    where func ~ 'pfx\.userjobs\..*';
+                end if;
+            end $$;
+            """,
+            reverse_sql=migrations.RunSQL.noop,
+        )
+    ]

django_pfx-1.7.3.dev39/pfx/userjobs/migrations/0004_userjob_summary_url.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.2.30 on 2026-07-15 08:25
+# flake8: noqa
+
+from django.db import migrations
+
+import pfx.pfxcore.models.not_null_fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('userjobs', '0003_clean_scheduled_tasks'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userjob',
+            name='summary_url',
+            field=pfx.pfxcore.models.not_null_fields.NotNullCharField(blank=True, max_length=250, verbose_name='Summary URL'),
+        ),
+    ]

{django_pfx-1.7.3.dev35 → django_pfx-1.7.3.dev39}/pfx/userjobs/models/user_job.py

@@ -81,6 +81,8 @@ class UserJob(PFXModelMixin, models.Model):
     read_status = NotNullCharField(
         _("Read status"), max_length=32, choices=STATUS, blank=True)
     summary = NotNullCharField(_("Summary"), max_length=250, blank=True)
+    summary_url = NotNullCharField(
+        _("Summary URL"), max_length=250, blank=True)
     message = NotNullTextField(verbose_name=_("Message"), blank=True)
     stacktrace = NotNullTextField(_("Error log"), blank=True)
     shelf_life = MinutesDurationField(
@@ -145,10 +147,12 @@ class UserJob(PFXModelMixin, models.Model):
         self.ended_at = timezone.now()
         self.status = result and result.get('status') or UserJob.STATUS_DONE
         self.summary = result and result.get('summary')
+        self.summary_url = result and result.get('summary_url')
         self.message = result and result.get('message')
         self.stacktrace = result and result.get('stacktrace')
         self.save(update_fields=[
-            'ended_at', 'status', 'summary', 'message', 'stacktrace'])
+            'ended_at', 'status', 'summary', 'summary_url',
+            'message', 'stacktrace'])
 
     def failed(self, exception=None, summary=None):
         if exception:

{django_pfx-1.7.3.dev35 → django_pfx-1.7.3.dev39}/pfx/userjobs/views/user_job_view.py

@@ -33,7 +33,8 @@ class UserJobRestView(
 
     model = UserJob
     fields = readonly_fields(
-        'name', 'user', 'status', 'summary', 'message', 'attachments',
+        'name', 'user', 'status', 'summary', 'summary_url',
+        'message', 'attachments',
         'created_at', 'started_at', 'ended_at') + ['read_status']
 
     filters = [

{django_pfx-1.7.3.dev35 → django_pfx-1.7.3.dev39}/tests/tests/test_user_job_api.py

@@ -19,7 +19,13 @@ logger = logging.getLogger(__name__)
 
 
 def test_job_success(job, text):
-    return dict(message=f"{text}: I’m successful!")
+    return dict(summary=f"{text}: I’m successful!")
+
+
+def test_job_url(job, text):
+    return dict(
+        summary=f"{text}: I’m successful!",
+        summary_url="/summary")
 
 
 def test_job_file(job, text):
@@ -29,7 +35,7 @@ def test_job_file(job, text):
     att.file = UserJobAttachment._meta.get_field('file').upload(
         att, b'File content', "test.txt")
     att.save()
-    return dict(message=f"{text}: I’m successful!")
+    return dict(summary=f"{text}: I’m successful!")
 
 
 @override_settings(
@@ -93,7 +99,7 @@ class TestUserJobApi(TestAssertMixin, TestCase):
         self.assertEqual(set(item.keys()), {
             'pk', 'resource_name', 'resource_api', 'name',
             'user', 'status', 'read_status', 'created_at', 'started_at',
-            'ended_at', 'summary', 'message', 'attachments'})
+            'ended_at', 'summary', 'summary_url', 'message', 'attachments'})
         self.assertJE(item, 'resource_name', "Test job 3")
         self.assertJE(item, 'user.pk', self.user1.pk)
         self.assertJE(item, 'status.value', 'done')
@@ -267,12 +273,40 @@ class TestUserJobApi(TestAssertMixin, TestCase):
         self.assertEqual(self.get_json(response).keys(), {
             'pk', 'resource_name', 'resource_api', 'name',
             'user', 'status', 'read_status', 'created_at', 'started_at',
-            'ended_at', 'summary', 'message', 'meta', 'attachments'})
+            'ended_at', 'summary', 'summary_url', 'message', 'meta',
+            'attachments'})
+        self.assertJE(response, 'resource_name', "Test job 1")
+        self.assertJE(response, 'user.pk', self.user1.pk)
+        self.assertJE(response, 'status.value', 'done')
+        self.assertJE(response, 'read_status', None)
+        self.assertJE(response, 'summary', 'Hello: I’m successful!')
+        self.assertJE(response, 'summary_url', "")
+        self.assertSize(response, 'attachments', 0)
+
+    def test_get_detail_summary_url(self):
+        job = UserJob.objects.create(
+            name="Test job 1",
+            user=self.user1,
+            func=f'{__name__}.test_job_url',
+            args=["Hello"],
+            timeout=300)
+
+        self.client.login(username=self.user1.username)
+
+        response = self.client.get(f'/api/user-jobs/user-jobs/{job.pk}')
+        self.assertRC(response, 200)
+        # Check technical fields are not sent
+        self.assertEqual(self.get_json(response).keys(), {
+            'pk', 'resource_name', 'resource_api', 'name',
+            'user', 'status', 'read_status', 'created_at', 'started_at',
+            'ended_at', 'summary', 'summary_url', 'message', 'meta',
+            'attachments'})
         self.assertJE(response, 'resource_name', "Test job 1")
         self.assertJE(response, 'user.pk', self.user1.pk)
         self.assertJE(response, 'status.value', 'done')
         self.assertJE(response, 'read_status', None)
-        self.assertJE(response, 'message', 'Hello: I’m successful!')
+        self.assertJE(response, 'summary', 'Hello: I’m successful!')
+        self.assertJE(response, 'summary_url', '/summary')
         self.assertSize(response, 'attachments', 0)
 
     def test_get_detail_attachment(self):
@@ -291,12 +325,13 @@ class TestUserJobApi(TestAssertMixin, TestCase):
         self.assertEqual(self.get_json(response).keys(), {
             'pk', 'resource_name', 'resource_api', 'name',
             'user', 'status', 'read_status', 'created_at', 'started_at',
-            'ended_at', 'summary', 'message', 'meta', 'attachments'})
+            'ended_at', 'summary', 'summary_url',
+            'message', 'meta', 'attachments'})
         self.assertJE(response, 'resource_name', "Test job 1")
         self.assertJE(response, 'user.pk', self.user1.pk)
         self.assertJE(response, 'status.value', 'done')
         self.assertJE(response, 'read_status', None)
-        self.assertJE(response, 'message', 'Hello: I’m successful!')
+        self.assertJE(response, 'summary', 'Hello: I’m successful!')
         self.assertSize(response, 'attachments', 1)
         self.assertJE(response, 'attachments.@0.resource_name', "test.txt")
         self.assertJE(response, 'attachments.@0.file.name', "test.txt")

django_pfx-1.7.3.dev35/django_pfx.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "1.7.2",
-  "distance": 35,
-  "node": "gd7bce9634adc6a4594cbaad209c36133aba3e845",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-07-14"
-}

django_pfx-1.7.3.dev35/pfx/userjobs/migrations/0003_clean_scheduled_tasks.py

@@ -1,15 +0,0 @@
-# Generated by Django 5.2.14 on 2026-06-03 08:39
-# flake8: noqa
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('userjobs', '0002_alter_userjob_options_alter_userjob_auto_queued_and_more'),
-    ]
-
-    operations = [
-        migrations.RunSQL(
-            "delete from django_q_schedule where func ~ 'pfx\.userjobs\..*';", "")
-    ]