django-simpletask5 0.1.4__tar.gz → 0.2.0__tar.gz

{django_simpletask5-0.1.4 → django_simpletask5-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-simpletask5
-Version: 0.1.4
+Version: 0.2.0
 Summary: Lightweight async task execution framework for Django
 Author-email: rRR0VrFP <rrr0vrfp@qq.com>
 Maintainer-email: rRR0VrFP <rrr0vrfp@qq.com>
@@ -177,6 +177,9 @@ DJANGO_SIMPLETASK_CRONJOB_AUTO_SYNC = True  # 是否自动将代码注册的 Cro
 ### 安全
 
 ```python
+# 是否启用 Python/Shell 脚本执行器（默认关闭，开启有安全风险）
+DJANGO_SIMPLETASK_ENABLE_SCRIPT_EXECUTORS = False
+
 # 脚本执行白名单（空列表表示不限制）
 DJANGO_SIMPLETASK_SCRIPT_WHITELIST = ['/path/to/allowed/scripts']
 
@@ -187,6 +190,8 @@ DJANGO_SIMPLETASK_ERROR_MSG_PASSWORD = None  # 错误信息加密密码
 DJANGO_SIMPLETASK_CONTEXT_PASSWORD = None    # 上下文数据加密密码
 ```
 
+> 注意：`DJANGO_SIMPLETASK_ENABLE_SCRIPT_EXECUTORS` 设为 `True` 后，还需为用户/组授予 `django_simpletask5 | Cron job | Can use script executors` 权限，非超级管理员无法创建 Python/Shell 脚本执行器类型的定时任务。
+
 ## 快速开始
 
 ### 1. 定义任务模型
@@ -315,6 +320,23 @@ Worker 消费消息 → 获取分布式锁 → 加载执行器 → 执行并保
 
 ## Releases
 
+### 0.2.0
+
+- **破坏性变更**: 移除 `Task` 模型上的自定义主键，`task_id` 不再是主键字段，改为 `unique=True` 的唯一标识字段。所有 `Task` 子模型将自动获得 Django 默认的自增 `id` 主键。已有数据库需要迁移处理。
+- **统计维度调整**: `TaskExecutionStat` 的统计维度由 `task_model` 改为 `executor_class`，统一覆盖有模型任务和 Cron 定时任务两种场景。对应 API `_update_stats()` 按 `executor_class` 分组聚合。
+- **Admin 优化**: CronJob 列表页移除 `executor_class` 列避免表格撑开；TaskExecutionStat 列表页新增 `executor_class` 列、`created_at` 设为只读修复详情页错误。
+- **测试修复**: 修复 `TransactionTestCase` + `on_commit` 在 SQLite 共享内存连接下因 `TestCase` 残留原子块导致回调不执行的兼容性问题；Redis MQ / RabbitMQ E2E 集成测试全部通过。
+
+### 0.1.5
+
+- **安全加固** — 新增 `DJANGO_SIMPLETASK_ENABLE_SCRIPT_EXECUTORS` 配置项（默认关闭），启用后才可执行 Python/Shell 脚本；新增 `can_use_script_executors` 权限，仅有此权限或超级管理员的用户才能在 Admin 中创建脚本执行器类型的 CronJob
+- **Bug 修复** — 修复 `RetryTimeoutExecutor` 中 lambda 晚绑定导致所有回调引用最后一个记录的问题
+- **Admin 安全** — 操作按钮（立即执行、启用/禁用）从 GET 参数改为 POST 请求，附带 CSRF 保护
+- **性能优化** — `RetryTimeoutExecutor` 改为批量 update + 按 ID 分发消息推送
+- **Admin 增强** — `TaskExecutionAdmin` 新增 `executor_class` 过滤、`error_message` 搜索、批量重试失败任务、批量取消待处理任务
+- **数据索引** — 添加 `(status, expire_time)` 和 `(is_active, next_run_time)` 复合索引；`trigger_event`、`executor_class`、`task_id`、`created_at` 添加单字段索引
+- **代码规范** — `bash_script.py`、`python_script.py`、`simple_request.py` 补充缺失的 logger；移除废弃的 `allow_tags` 属性
+
 ### 0.1.4
 
 - **修复打包** — `pyproject.toml` 添加 `package-data` 配置，打包时包含 locale po/mo 文件，修复 i18n 翻译不生效的问题

{django_simpletask5-0.1.4 → django_simpletask5-0.2.0}/README.md

@@ -138,6 +138,9 @@ DJANGO_SIMPLETASK_CRONJOB_AUTO_SYNC = True  # 是否自动将代码注册的 Cro
 ### 安全
 
 ```python
+# 是否启用 Python/Shell 脚本执行器（默认关闭，开启有安全风险）
+DJANGO_SIMPLETASK_ENABLE_SCRIPT_EXECUTORS = False
+
 # 脚本执行白名单（空列表表示不限制）
 DJANGO_SIMPLETASK_SCRIPT_WHITELIST = ['/path/to/allowed/scripts']
 
@@ -148,6 +151,8 @@ DJANGO_SIMPLETASK_ERROR_MSG_PASSWORD = None  # 错误信息加密密码
 DJANGO_SIMPLETASK_CONTEXT_PASSWORD = None    # 上下文数据加密密码
 ```
 
+> 注意：`DJANGO_SIMPLETASK_ENABLE_SCRIPT_EXECUTORS` 设为 `True` 后，还需为用户/组授予 `django_simpletask5 | Cron job | Can use script executors` 权限，非超级管理员无法创建 Python/Shell 脚本执行器类型的定时任务。
+
 ## 快速开始
 
 ### 1. 定义任务模型
@@ -276,6 +281,23 @@ Worker 消费消息 → 获取分布式锁 → 加载执行器 → 执行并保
 
 ## Releases
 
+### 0.2.0
+
+- **破坏性变更**: 移除 `Task` 模型上的自定义主键，`task_id` 不再是主键字段，改为 `unique=True` 的唯一标识字段。所有 `Task` 子模型将自动获得 Django 默认的自增 `id` 主键。已有数据库需要迁移处理。
+- **统计维度调整**: `TaskExecutionStat` 的统计维度由 `task_model` 改为 `executor_class`，统一覆盖有模型任务和 Cron 定时任务两种场景。对应 API `_update_stats()` 按 `executor_class` 分组聚合。
+- **Admin 优化**: CronJob 列表页移除 `executor_class` 列避免表格撑开；TaskExecutionStat 列表页新增 `executor_class` 列、`created_at` 设为只读修复详情页错误。
+- **测试修复**: 修复 `TransactionTestCase` + `on_commit` 在 SQLite 共享内存连接下因 `TestCase` 残留原子块导致回调不执行的兼容性问题；Redis MQ / RabbitMQ E2E 集成测试全部通过。
+
+### 0.1.5
+
+- **安全加固** — 新增 `DJANGO_SIMPLETASK_ENABLE_SCRIPT_EXECUTORS` 配置项（默认关闭），启用后才可执行 Python/Shell 脚本；新增 `can_use_script_executors` 权限，仅有此权限或超级管理员的用户才能在 Admin 中创建脚本执行器类型的 CronJob
+- **Bug 修复** — 修复 `RetryTimeoutExecutor` 中 lambda 晚绑定导致所有回调引用最后一个记录的问题
+- **Admin 安全** — 操作按钮（立即执行、启用/禁用）从 GET 参数改为 POST 请求，附带 CSRF 保护
+- **性能优化** — `RetryTimeoutExecutor` 改为批量 update + 按 ID 分发消息推送
+- **Admin 增强** — `TaskExecutionAdmin` 新增 `executor_class` 过滤、`error_message` 搜索、批量重试失败任务、批量取消待处理任务
+- **数据索引** — 添加 `(status, expire_time)` 和 `(is_active, next_run_time)` 复合索引；`trigger_event`、`executor_class`、`task_id`、`created_at` 添加单字段索引
+- **代码规范** — `bash_script.py`、`python_script.py`、`simple_request.py` 补充缺失的 logger；移除废弃的 `allow_tags` 属性
+
 ### 0.1.4
 
 - **修复打包** — `pyproject.toml` 添加 `package-data` 配置，打包时包含 locale po/mo 文件，修复 i18n 翻译不生效的问题

{django_simpletask5-0.1.4 → django_simpletask5-0.2.0}/django_simpletask5/admin.py

@@ -2,8 +2,9 @@ import json
 
 from django import forms
 from django.contrib import admin
-from django.http import HttpResponseRedirect
-from django.urls import reverse
+from django.http import HttpResponseRedirect, Http404
+from django.urls import path, reverse
+from django.utils.html import format_html, mark_safe
 from django.utils.translation import gettext_lazy as _
 from django_checkbox_normalize.admin import DjangoCheckboxNormalizeAdmin
 from django_tabbed_changeform_admin.admin import DjangoTabbedChangeformAdmin
@@ -15,6 +16,11 @@ from django_simpletask5.core.executor_scanner import (
     get_executor_schema_map,
 )
 
+SCRIPT_EXECUTOR_CLASSES = {
+    'django_simpletask5.executors.bash_script.BashScriptExecutor',
+    'django_simpletask5.executors.python_script.PythonScriptExecutor',
+}
+
 
 class ExecutorClassWidget(forms.Select):
     def __init__(self, attrs=None):
@@ -58,6 +64,7 @@ class CronJobForm(forms.ModelForm):
     )
 
     def __init__(self, *args, **kwargs):
+        self.request = kwargs.pop('request', None)
         super().__init__(*args, **kwargs)
         if self.instance and self.instance.pk:
             self.fields['uid'].disabled = True
@@ -75,6 +82,16 @@ class CronJobForm(forms.ModelForm):
             except Exception:
                 pass
 
+    def clean_executor_class(self):
+        executor_class = self.cleaned_data.get("executor_class", "")
+        if executor_class in SCRIPT_EXECUTOR_CLASSES:
+            if self.request and not (self.request.user.is_superuser or self.request.user.has_perm('django_simpletask5.can_use_script_executors')):
+                raise forms.ValidationError(
+                    _('You do not have permission to use script executors (Python/Shell). '
+                      'Only superusers and users with the "can_use_script_executors" permission can do so.')
+                )
+        return executor_class
+
     def clean_context(self):
         raw = self.cleaned_data.get("context")
         if not raw:
@@ -125,7 +142,6 @@ class TaskExecutionAdmin(DjangoCheckboxNormalizeAdmin, DjangoTabbedChangeformAdm
 
     @admin.display(description=_("Execution ID"))
     def short_execution_id(self, obj):
-        from django.utils.html import format_html
         full = str(obj.execution_id)
         short = full[:8]
         copied_text = _("Copied!")
@@ -136,8 +152,8 @@ class TaskExecutionAdmin(DjangoCheckboxNormalizeAdmin, DjangoTabbedChangeformAdm
             'setTimeout(function(){{t.textContent=o;}},800);}}.bind(this)).catch(function(){{}})">{}</span>',
             full, full, copied_text, short
         )
-    list_filter = ["status", "trigger_event", "created_at"]
-    search_fields = ["execution_id", "task_id", "executor_class"]
+    list_filter = ["status", "trigger_event", "executor_class", "created_at"]
+    search_fields = ["execution_id", "task_id", "executor_class", "error_message"]
     readonly_fields = [
         "execution_id", "task_id", "task_model", "trigger_event", "executor_class", "status",
         "result", "error_message", "context", "total_tasks_count", "done_tasks_count",
@@ -145,6 +161,7 @@ class TaskExecutionAdmin(DjangoCheckboxNormalizeAdmin, DjangoTabbedChangeformAdm
         "started_at", "finished_at", "created_at", "updated_at",
     ]
     ordering = ["-created_at"]
+    actions = ["retry_selected", "cancel_selected"]
 
     def has_add_permission(self, request):
         return False
@@ -185,6 +202,23 @@ class TaskExecutionAdmin(DjangoCheckboxNormalizeAdmin, DjangoTabbedChangeformAdm
     def retry_info(self, obj):
         return f"{obj.retry_count}/{obj.max_retries}"
 
+    @admin.action(description=_("Retry selected failed tasks"))
+    def retry_selected(self, request, queryset):
+        from django_simpletask5.core.publisher import _publish_message
+        count = 0
+        for exec_record in queryset.filter(status__in=['failed', 'timeout']):
+            exec_record.status = 'retry'
+            exec_record.retry_count += 1
+            exec_record.save(update_fields=['status', 'retry_count', 'updated_at'])
+            _publish_message(exec_record)
+            count += 1
+        self.message_user(request, _("%d execution(s) have been re-queued.") % count)
+
+    @admin.action(description=_("Cancel selected pending tasks"))
+    def cancel_selected(self, request, queryset):
+        updated = queryset.filter(status='pending').update(status='failed')
+        self.message_user(request, _("%d execution(s) have been cancelled.") % updated)
+
 
 @admin.register(CronJob)
 class CronJobAdmin(DjangoCheckboxNormalizeAdmin, DjangoTabbedChangeformAdmin):
@@ -192,7 +226,6 @@ class CronJobAdmin(DjangoCheckboxNormalizeAdmin, DjangoTabbedChangeformAdmin):
     list_display = [
         "display_name",
         "cron_expression",
-        "executor_class",
         "is_active",
         "is_modified_by_user",
         "updated_at",
@@ -228,62 +261,102 @@ class CronJobAdmin(DjangoCheckboxNormalizeAdmin, DjangoTabbedChangeformAdmin):
     def get_queryset(self, request):
         return super().get_queryset(request)
 
-    def action_buttons(self, obj):
-        from django.utils.html import format_html
-        from django.urls import reverse
+    def get_urls(self):
+        urls = super().get_urls()
+        custom_urls = [
+            path(
+                '<path:object_id>/run/',
+                self.admin_site.admin_view(self._run_cronjob_view),
+                name='django_simpletask5_cronjob_run',
+            ),
+            path(
+                '<path:object_id>/toggle-active/',
+                self.admin_site.admin_view(self._toggle_active_view),
+                name='django_simpletask5_cronjob_toggle_active',
+            ),
+        ]
+        return custom_urls + urls
 
-        changelist_url = reverse('admin:django_simpletask5_cronjob_changelist')
+    def _run_cronjob_view(self, request, object_id):
+        if request.method != 'POST':
+            return HttpResponseRedirect(
+                reverse('admin:django_simpletask5_cronjob_changelist')
+            )
+        try:
+            cronjob = CronJob.objects.get(pk=object_id)
+            from django_simpletask5.management.commands.django_simpletask_crontab import Command as CrontabCommand
+            cmd = CrontabCommand()
+            cmd._trigger_cronjob(cronjob)
+            self.message_user(request, _('Cronjob "%s" triggered.') % cronjob.display_name)
+        except CronJob.DoesNotExist:
+            raise Http404()
+        return HttpResponseRedirect(
+            reverse('admin:django_simpletask5_cronjob_changelist')
+        )
+
+    def _toggle_active_view(self, request, object_id):
+        if request.method != 'POST':
+            return HttpResponseRedirect(
+                reverse('admin:django_simpletask5_cronjob_changelist')
+            )
+        try:
+            cronjob = CronJob.objects.get(pk=object_id)
+            cronjob.is_active = not cronjob.is_active
+            cronjob.save(update_fields=['is_active'])
+            status = _('activated') if cronjob.is_active else _('deactivated')
+            self.message_user(request, _('Cronjob "%s" %s.') % (cronjob.display_name, status))
+        except CronJob.DoesNotExist:
+            raise Http404()
+        return HttpResponseRedirect(
+            reverse('admin:django_simpletask5_cronjob_changelist')
+        )
+
+    def action_buttons(self, obj):
+        run_url = reverse('admin:django_simpletask5_cronjob_run', args=[obj.pk])
+        toggle_url = reverse('admin:django_simpletask5_cronjob_toggle_active', args=[obj.pk])
+        csrf_token = '"{{ csrf_token }}"'
 
         buttons = []
         buttons.append(
-            f'<a class="button" style="background:#17a2b8;color:#fff;padding:3px 8px;border-radius:3px;text-decoration:none;margin-right:4px;font-size:12px" '
-            f'href="{changelist_url}?action=run&id={obj.pk}" title="立即执行">'
-            f'<i class="ri-play-line"></i> 执行</a>'
+            f'<form style="display:inline" method="post" action="{run_url}">'
+            f'<input type="hidden" name="csrfmiddlewaretoken" value={csrf_token}>'
+            f'<button type="submit" style="background:#17a2b8;color:#fff;padding:3px 8px;border-radius:3px;border:none;cursor:pointer;margin-right:4px;font-size:12px" title="{_("Execute now")}">'
+            f'<i class="ri-play-line"></i> {_("Run")}</button></form>'
         )
         if obj.is_active:
-            buttons.append(
-                f'<a class="button" style="background:#ffc107;color:#000;padding:3px 8px;border-radius:3px;text-decoration:none;margin-right:4px;font-size:12px" '
-                f'href="{changelist_url}?action=toggle-active&id={obj.pk}" title="禁用">'
-                f'<i class="ri-pause-line"></i> 禁用</a>'
-            )
+            btn_style = "background:#ffc107;color:#000"
+            btn_title = _("Deactivate")
+            btn_icon = "ri-pause-line"
+            btn_label = _("Deactivate")
         else:
-            buttons.append(
-                f'<a class="button" style="background:#28a745;color:#fff;padding:3px 8px;border-radius:3px;text-decoration:none;margin-right:4px;font-size:12px" '
-                f'href="{changelist_url}?action=toggle-active&id={obj.pk}" title="启用">'
-                f'<i class="ri-play-circle-line"></i> 启用</a>'
-            )
+            btn_style = "background:#28a745;color:#fff"
+            btn_title = _("Activate")
+            btn_icon = "ri-play-circle-line"
+            btn_label = _("Activate")
+        buttons.append(
+            f'<form style="display:inline" method="post" action="{toggle_url}">'
+            f'<input type="hidden" name="csrfmiddlewaretoken" value={csrf_token}>'
+            f'<button type="submit" style="{btn_style};padding:3px 8px;border-radius:3px;border:none;cursor:pointer;margin-right:4px;font-size:12px" title="{btn_title}">'
+            f'<i class="{btn_icon}"></i> {btn_label}</button></form>'
+        )
         delete_url = reverse('admin:django_simpletask5_cronjob_delete', args=[obj.pk])
         buttons.append(
             f'<a class="button" style="background:#dc3545;color:#fff;padding:3px 8px;border-radius:3px;text-decoration:none;margin-right:4px;font-size:12px" '
-            f'href="{delete_url}" title="删除">'
-            f'<i class="ri-delete-bin-line"></i> 删除</a>'
+            f'href="{delete_url}" title="{_("Delete")}">'
+            f'<i class="ri-delete-bin-line"></i> {_("Delete")}</a>'
         )
-        return format_html(''.join(buttons))
+        return mark_safe(''.join(buttons))
 
-    action_buttons.short_description = _("操作")
-    action_buttons.allow_tags = True
+    action_buttons.short_description = _("Actions")
 
-    def changelist_view(self, request, extra_context=None):
-        action = request.GET.get('action')
-        object_id = request.GET.get('id')
-        if action and object_id:
-            from django_simpletask5.models import CronJob
-            try:
-                cronjob = CronJob.objects.get(pk=object_id)
-                if action == 'run':
-                    from django_simpletask5.management.commands.django_simpletask_crontab import Command as CrontabCommand
-                    cmd = CrontabCommand()
-                    cmd._trigger_cronjob(cronjob)
-                    self.message_user(request, f'Cronjob "{cronjob.display_name}" triggered.')
-                elif action == 'toggle-active':
-                    cronjob.is_active = not cronjob.is_active
-                    cronjob.save(update_fields=['is_active'])
-                    status = 'activated' if cronjob.is_active else 'deactivated'
-                    self.message_user(request, f'Cronjob "{cronjob.display_name}" {status}.')
-            except CronJob.DoesNotExist:
-                self.message_user(request, f'Cronjob not found.', level='ERROR')
-            return HttpResponseRedirect(request.path)
-        return super().changelist_view(request, extra_context=extra_context)
+    def get_form(self, request, obj=None, change=False, **kwargs):
+        form_class = super().get_form(request, obj=obj, change=change, **kwargs)
+
+        class _CronJobFormWithRequest(form_class):
+            def __init__(self, *args, **kwargs):
+                kwargs['request'] = request
+                super().__init__(*args, **kwargs)
+        return _CronJobFormWithRequest
 
     def save_model(self, request, obj, form, change):
         if change:
@@ -344,6 +417,7 @@ class CronJobAdmin(DjangoCheckboxNormalizeAdmin, DjangoTabbedChangeformAdmin):
 class TaskExecutionStatAdmin(DjangoCheckboxNormalizeAdmin, DjangoTabbedChangeformAdmin):
     list_display = [
         "date",
+        "executor_class",
         "trigger_event",
         "total_count",
         "success_count",
@@ -351,11 +425,12 @@ class TaskExecutionStatAdmin(DjangoCheckboxNormalizeAdmin, DjangoTabbedChangefor
         "avg_duration_seconds",
     ]
     list_filter = ["date", "trigger_event"]
+    readonly_fields = ["created_at"]
     ordering = ["-date"]
 
     fieldsets = [
         (None, {
-            "fields": ["date", "task_model", "trigger_event", "created_at"],
+            "fields": ["date", "executor_class", "trigger_event", "created_at"],
             "classes": ["tab-basic"],
         }),
         (None, {

{django_simpletask5-0.1.4 → django_simpletask5-0.2.0}/django_simpletask5/core/defaults.py

@@ -14,6 +14,7 @@ DJANGO_SIMPLETASK_CRONJOB_AUTO_SYNC = getattr(settings, 'DJANGO_SIMPLETASK_CRONJ
 DJANGO_SIMPLETASK_DEFAULT_QUEUE = getattr(settings, 'DJANGO_SIMPLETASK_DEFAULT_QUEUE', 'django_simpletask5.queue.default')
 DJANGO_SIMPLETASK_HIGH_PRIORITY_QUEUE = getattr(settings, 'DJANGO_SIMPLETASK_HIGH_PRIORITY_QUEUE', 'django_simpletask5.queue.high_priority')
 
+DJANGO_SIMPLETASK_ENABLE_SCRIPT_EXECUTORS = getattr(settings, 'DJANGO_SIMPLETASK_ENABLE_SCRIPT_EXECUTORS', False)
 DJANGO_SIMPLETASK_SCRIPT_WHITELIST = getattr(settings, 'DJANGO_SIMPLETASK_SCRIPT_WHITELIST', [])
 
 DJANGO_SIMPLETASK_FIELD_CIPHER_CLASS = getattr(settings, 'DJANGO_SIMPLETASK_FIELD_CIPHER_CLASS', None)

{django_simpletask5-0.1.4 → django_simpletask5-0.2.0}/django_simpletask5/core/publisher.py

@@ -1,7 +1,9 @@
 import json
 import logging
+import time
 
 from django.db import transaction
+from django.utils import timezone
 
 from django_simpletask5.models import TaskExecution
 from django_simpletask5.core.defaults import DJANGO_SIMPLETASK_DEFAULT_QUEUE, DJANGO_SIMPLETASK_DEFAULT_TIMEOUT_SECONDS
@@ -58,16 +60,33 @@ def _publish_message(execution, routing_key=None):
         'executor_class': execution.executor_class,
     }
 
+    from django_simpletask5.core.message_queue import get_message_queue
+
+    for attempt in range(1, 4):
+        try:
+            mq = get_message_queue()
+            mq.publish(
+                routing_key=routing_key or DJANGO_SIMPLETASK_DEFAULT_QUEUE,
+                message=message,
+            )
+            logger.debug('Published message for execution %s', execution.execution_id)
+            return
+        except Exception:
+            if attempt < 3:
+                logger.warning('Publish attempt %d/3 failed for execution %s, retrying...', attempt, execution.execution_id)
+                time.sleep(1)
+            else:
+                logger.exception('Failed to publish message for execution %s after 3 attempts', execution.execution_id)
+
     try:
-        from django_simpletask5.core.message_queue import get_message_queue
-        mq = get_message_queue()
-        mq.publish(
-            routing_key=routing_key or DJANGO_SIMPLETASK_DEFAULT_QUEUE,
-            message=message,
-        )
-        logger.debug('Published message for execution %s', execution.execution_id)
+        execution.refresh_from_db()
+        if execution.status not in ('success', 'failed', 'timeout'):
+            execution.status = 'failed'
+            execution.error_message = 'Failed to publish message to queue after 3 attempts'
+            execution.finished_at = timezone.now()
+            execution.save(update_fields=['status', 'error_message', 'finished_at', 'updated_at'])
     except Exception:
-        logger.exception('Failed to publish message for execution %s', execution.execution_id)
+        logger.exception('Failed to mark execution %s as failed after publish failure', execution.execution_id)
 
 
 def _serialize_context(context):

{django_simpletask5-0.1.4 → django_simpletask5-0.2.0}/django_simpletask5/core/worker_registry.py

@@ -12,6 +12,7 @@ logger = logging.getLogger(__name__)
 WORKER_TTL = 300
 
 _REDIS_UNAVAILABLE = False
+_redis_lock = threading.Lock()
 
 
 def _get_redis_client():
@@ -30,17 +31,18 @@ def _get_redis_client():
 
 def _safe_redis_call(fn, default=None, log_level=logging.WARNING):
     global _REDIS_UNAVAILABLE
-    try:
-        result = fn()
-        if _REDIS_UNAVAILABLE:
-            _REDIS_UNAVAILABLE = False
-            logger.info('Redis connection restored')
-        return result
-    except Exception as e:
-        if not _REDIS_UNAVAILABLE:
-            _REDIS_UNAVAILABLE = True
-            logger.log(log_level, 'Redis operation failed: %s', e)
-        return default
+    with _redis_lock:
+        try:
+            result = fn()
+            if _REDIS_UNAVAILABLE:
+                _REDIS_UNAVAILABLE = False
+                logger.info('Redis connection restored')
+            return result
+        except Exception as e:
+            if not _REDIS_UNAVAILABLE:
+                _REDIS_UNAVAILABLE = True
+                logger.log(log_level, 'Redis operation failed: %s', e)
+            return default
 
 
 def _worker_key(pid, tid):

{django_simpletask5-0.1.4 → django_simpletask5-0.2.0}/django_simpletask5/executors/bash_script.py

@@ -1,4 +1,5 @@
 import json
+import logging
 import os
 import subprocess
 
@@ -7,6 +8,8 @@ from django.conf import settings
 from django_simpletask5.models import TaskExecution
 from django_simpletask5.executors.base import BaseExecutor
 
+logger = logging.getLogger(__name__)
+
 
 class BashScriptExecutor(BaseExecutor):
     @classmethod
@@ -19,6 +22,11 @@ class BashScriptExecutor(BaseExecutor):
         ]
 
     def execute(self, execution: TaskExecution, task=None) -> str | None:
+        if not getattr(settings, 'DJANGO_SIMPLETASK_ENABLE_SCRIPT_EXECUTORS', False):
+            raise RuntimeError(
+                'Script executors are disabled. Set DJANGO_SIMPLETASK_ENABLE_SCRIPT_EXECUTORS = True in settings to enable.'
+            )
+
         params = execution.get_context_dict()
         script = params.get('script', '')
         script_path = params.get('script_path', '')
@@ -31,12 +39,12 @@ class BashScriptExecutor(BaseExecutor):
                 abs_path = os.path.abspath(script_path)
                 allowed = any(abs_path.startswith(os.path.abspath(p)) for p in script_whitelist)
                 if not allowed:
-                    raise Exception('Script path not in whitelist')
+                    raise RuntimeError('Script path not in whitelist')
             with open(script_path, 'r') as f:
                 script = f.read()
 
         if not script:
-            raise Exception('No script provided')
+            raise RuntimeError('No script provided')
 
         cmd = ['bash', '-c', script] + list(args)
         merged_env = os.environ.copy()
@@ -51,7 +59,7 @@ class BashScriptExecutor(BaseExecutor):
         )
 
         if result.returncode != 0:
-            raise Exception(result.stderr[:2000])
+            raise RuntimeError(result.stderr[:2000])
 
         return json.dumps({
             'stdout': result.stdout[:2000],

{django_simpletask5-0.1.4 → django_simpletask5-0.2.0}/django_simpletask5/executors/python_script.py

@@ -1,4 +1,5 @@
 import json
+import logging
 import os
 
 from django.conf import settings
@@ -6,6 +7,8 @@ from django.conf import settings
 from django_simpletask5.models import TaskExecution
 from django_simpletask5.executors.base import BaseExecutor
 
+logger = logging.getLogger(__name__)
+
 
 class PythonScriptExecutor(BaseExecutor):
     @classmethod
@@ -17,6 +20,11 @@ class PythonScriptExecutor(BaseExecutor):
         ]
 
     def execute(self, execution: TaskExecution, task=None) -> str | None:
+        if not getattr(settings, 'DJANGO_SIMPLETASK_ENABLE_SCRIPT_EXECUTORS', False):
+            raise RuntimeError(
+                'Script executors are disabled. Set DJANGO_SIMPLETASK_ENABLE_SCRIPT_EXECUTORS = True in settings to enable.'
+            )
+
         params = execution.get_context_dict()
         script = params.get('script', '')
         script_path = params.get('script_path', '')
@@ -28,12 +36,12 @@ class PythonScriptExecutor(BaseExecutor):
                 abs_path = os.path.abspath(script_path)
                 allowed = any(abs_path.startswith(os.path.abspath(p)) for p in script_whitelist)
                 if not allowed:
-                    raise Exception('Script path not in whitelist')
+                    raise RuntimeError('Script path not in whitelist')
             with open(script_path, 'r') as f:
                 script = f.read()
 
         if not script:
-            raise Exception('No script provided')
+            raise RuntimeError('No script provided')
 
         context = execution.get_context_dict()
         local_vars = {'args': args, 'execution': execution, 'context': context}

django_simpletask5-0.2.0/django_simpletask5/executors/retry_timeout.py

@@ -0,0 +1,47 @@
+import json
+import logging
+
+from django.db import models, transaction
+
+from django_simpletask5.models import TaskExecution
+from django_simpletask5.executors.base import BaseExecutor
+
+
+def _publish_message_by_id(execution_id):
+    from django_simpletask5.core.publisher import _publish_message
+    try:
+        exec_record = TaskExecution.objects.get(pk=execution_id)
+        _publish_message(exec_record)
+    except TaskExecution.DoesNotExist:
+        logger.warning('Execution %s not found for retry publish', execution_id)
+
+logger = logging.getLogger(__name__)
+
+
+class RetryTimeoutExecutor(BaseExecutor):
+    def execute(self, execution: TaskExecution, task=None) -> str | None:
+        retryable = TaskExecution.objects.filter(
+            status='timeout',
+            retry_count__lt=models.F('max_retries'),
+        )
+        ids = list(retryable.values_list('pk', flat=True))
+
+        if not ids:
+            return json.dumps({'retried': 0, 'success': True})
+
+        TaskExecution.objects.filter(pk__in=ids).update(
+            status='retry',
+            retry_count=models.F('retry_count') + 1,
+        )
+
+        from django_simpletask5.core.publisher import _publish_message
+        from functools import partial
+        for exec_id in ids:
+            transaction.on_commit(
+                partial(_publish_message_by_id, exec_id)
+            )
+
+        return json.dumps({
+            'retried': len(ids),
+            'success': True,
+        })

{django_simpletask5-0.1.4 → django_simpletask5-0.2.0}/django_simpletask5/executors/simple_request.py

@@ -1,10 +1,13 @@
 import json
+import logging
 
 import requests
 
 from django_simpletask5.models import TaskExecution
 from django_simpletask5.executors.base import BaseExecutor
 
+logger = logging.getLogger(__name__)
+
 
 class SimpleRequestExecutor(BaseExecutor):
     @classmethod

{django_simpletask5-0.1.4 → django_simpletask5-0.2.0}/django_simpletask5/management/commands/django_simpletask_executor.py

@@ -8,7 +8,7 @@ import time
 from datetime import timedelta
 
 from django.core.management.base import BaseCommand
-from django.db import close_old_connections
+from django.db import close_old_connections, OperationalError, InterfaceError
 from django.utils import timezone
 
 from django_simpletask5.models import TaskExecution
@@ -97,6 +97,8 @@ class ExecutorWorker:
 
         close_old_connections()
 
+        execution = None
+        execution_id = None
         try:
             body = json.loads(message) if isinstance(message, (str, bytes)) else message
             execution_id = body.get('execution_id')
@@ -192,9 +194,23 @@ class ExecutorWorker:
                         'finished_at', 'updated_at',
                     ])
 
+        except (OperationalError, InterfaceError) as e:
+            close_old_connections()
+            logger.warning('Transient database error processing message %s: %s', execution_id, e)
+            return False
         except Exception as e:
             close_old_connections()
-            logger.exception('Error processing message: %s', e)
+            logger.exception('Unexpected error processing message: %s', e)
+            if execution is not None and execution.pk:
+                try:
+                    execution.refresh_from_db()
+                    if execution.status not in ('success', 'failed', 'timeout'):
+                        execution.status = 'failed'
+                        execution.error_message = 'Fatal: %s' % str(e)
+                        execution.finished_at = timezone.now()
+                        execution.save(update_fields=['status', 'error_message', 'finished_at', 'updated_at'])
+                except Exception:
+                    pass
         return True
 
     def _publish_retry(self, execution):

django_simpletask5-0.2.0/django_simpletask5/migrations/0006_alter_cronjob_options_alter_taskexecution_created_at_and_more.py

@@ -0,0 +1,67 @@
+# Generated by Django 5.2.14 on 2026-06-17 12:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("django_simpletask5", "0005_alter_cronjob_is_modified_by_user_help"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="cronjob",
+            options={
+                "ordering": ["display_name"],
+                "permissions": [
+                    (
+                        "can_use_script_executors",
+                        "Can use script executors (Python/Shell)",
+                    )
+                ],
+                "verbose_name": "Cron job",
+                "verbose_name_plural": "Cron jobs",
+            },
+        ),
+        migrations.AlterField(
+            model_name="taskexecution",
+            name="created_at",
+            field=models.DateTimeField(
+                auto_now_add=True, db_index=True, verbose_name="Created at"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="taskexecution",
+            name="executor_class",
+            field=models.CharField(
+                db_index=True, max_length=512, verbose_name="Executor class"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="taskexecution",
+            name="task_id",
+            field=models.UUIDField(
+                blank=True, db_index=True, null=True, verbose_name="Task ID"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="taskexecution",
+            name="trigger_event",
+            field=models.CharField(
+                db_index=True, max_length=64, verbose_name="Trigger event"
+            ),
+        ),
+        migrations.AddIndex(
+            model_name="cronjob",
+            index=models.Index(
+                fields=["is_active", "next_run_time"], name="idx_cronjob_active_nextrun"
+            ),
+        ),
+        migrations.AddIndex(
+            model_name="taskexecution",
+            index=models.Index(
+                fields=["status", "expire_time"], name="idx_exec_status_expire"
+            ),
+        ),
+    ]

django_simpletask5-0.2.0/django_simpletask5/migrations/0007_rename_task_model_to_executor_class_in_stat.py

@@ -0,0 +1,34 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("django_simpletask5", "0006_alter_cronjob_options_alter_taskexecution_created_at_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name="taskexecutionstat",
+            unique_together=set(),
+        ),
+        migrations.RemoveField(
+            model_name="taskexecutionstat",
+            name="task_model",
+        ),
+        migrations.AddField(
+            model_name="taskexecutionstat",
+            name="executor_class",
+            field=models.CharField(
+                default="",
+                max_length=512,
+                db_index=True,
+                verbose_name="Executor class",
+            ),
+            preserve_default=False,
+        ),
+        migrations.AlterUniqueTogether(
+            name="taskexecutionstat",
+            unique_together={("date", "executor_class", "trigger_event")},
+        ),
+    ]

{django_simpletask5-0.1.4 → django_simpletask5-0.2.0}/django_simpletask5/models.py

@@ -27,7 +27,7 @@ def _safe_text_field(password_key, **kwargs):
 
 
 class Task(models.Model):
-    task_id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
+    task_id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True)
 
     class Meta:
         abstract = True
@@ -108,10 +108,10 @@ class TaskExecution(models.Model):
     ]
 
     execution_id = models.UUIDField(verbose_name=_('Execution ID'), primary_key=True, default=uuid.uuid4, editable=False)
-    task_id = models.UUIDField(verbose_name=_('Task ID'), null=True, blank=True)
+    task_id = models.UUIDField(verbose_name=_('Task ID'), null=True, blank=True, db_index=True)
     task_model = models.CharField(verbose_name=_('Task model'), max_length=256, null=True, blank=True, help_text='app_label.ModelName')
-    trigger_event = models.CharField(verbose_name=_('Trigger event'), max_length=64)
-    executor_class = models.CharField(verbose_name=_('Executor class'), max_length=512)
+    trigger_event = models.CharField(verbose_name=_('Trigger event'), max_length=64, db_index=True)
+    executor_class = models.CharField(verbose_name=_('Executor class'), max_length=512, db_index=True)
     status = models.CharField(verbose_name=_('Status'), max_length=32, choices=STATUS_CHOICES, default='pending', db_index=True)
     result = _safe_text_field('DJANGO_SIMPLETASK_RESULT_PASSWORD', verbose_name=_('Result'), null=True, blank=True)
     total_tasks_count = models.IntegerField(verbose_name=_('Total tasks count'), null=True, blank=True)
@@ -123,7 +123,7 @@ class TaskExecution(models.Model):
     expire_time = models.DateTimeField(verbose_name=_('Expire time'), null=True, blank=True, db_index=True)
     started_at = models.DateTimeField(verbose_name=_('Started at'), null=True, blank=True)
     finished_at = models.DateTimeField(verbose_name=_('Finished at'), null=True, blank=True)
-    created_at = models.DateTimeField(verbose_name=_('Created at'), auto_now_add=True)
+    created_at = models.DateTimeField(verbose_name=_('Created at'), auto_now_add=True, db_index=True)
     updated_at = models.DateTimeField(verbose_name=_('Updated at'), auto_now=True)
     context = _safe_text_field('DJANGO_SIMPLETASK_CONTEXT_PASSWORD', verbose_name=_('Context'), null=True, blank=True)
 
@@ -132,6 +132,9 @@ class TaskExecution(models.Model):
         verbose_name = _('Task execution')
         verbose_name_plural = _('Task executions')
         ordering = ['-created_at']
+        indexes = [
+            models.Index(fields=['status', 'expire_time'], name='idx_exec_status_expire'),
+        ]
 
     def __str__(self):
         return f'{_("TaskExecution")}({self.execution_id}, {self.trigger_event}, {self.get_status_display()})'
@@ -227,6 +230,12 @@ class CronJob(models.Model):
         verbose_name = _('Cron job')
         verbose_name_plural = _('Cron jobs')
         ordering = ['display_name']
+        permissions = [
+            ('can_use_script_executors', _('Can use script executors (Python/Shell)')),
+        ]
+        indexes = [
+            models.Index(fields=['is_active', 'next_run_time'], name='idx_cronjob_active_nextrun'),
+        ]
 
     def save(self, *args, **kwargs):
         if self.cron_expression and (
@@ -276,7 +285,7 @@ class TaskExecutionArchive(models.Model):
 
 class TaskExecutionStat(models.Model):
     date = models.DateField(verbose_name=_('Date'))
-    task_model = models.CharField(verbose_name=_('Task model'), max_length=256, blank=True, default='', help_text='app_label.ModelName')
+    executor_class = models.CharField(verbose_name=_('Executor class'), max_length=512, db_index=True)
     trigger_event = models.CharField(verbose_name=_('Trigger event'), max_length=64)
     total_count = models.IntegerField(verbose_name=_('Total count'), default=0)
     success_count = models.IntegerField(verbose_name=_('Success count'), default=0)
@@ -289,8 +298,8 @@ class TaskExecutionStat(models.Model):
         db_table = 'django_simpletask5_stat'
         verbose_name = _('Task execution stat')
         verbose_name_plural = _('Task execution stats')
-        unique_together = [('date', 'task_model', 'trigger_event')]
+        unique_together = [('date', 'executor_class', 'trigger_event')]
         ordering = ['-date', 'trigger_event']
 
     def __str__(self):
-        return f'Stat({self.date}, {self.trigger_event})'
+        return f'Stat({self.date}, {self.executor_class}, {self.trigger_event})'

{django_simpletask5-0.1.4 → django_simpletask5-0.2.0}/django_simpletask5/services/archive.py

@@ -192,7 +192,7 @@ def delete_archive_file(archive_date):
 def _update_stats(records, stat_date):
     from django_simpletask5.models import TaskExecutionStat
 
-    stats = records.values('trigger_event', 'task_model').annotate(
+    stats = records.values('trigger_event', 'executor_class').annotate(
         total=Count('execution_id'),
         success_count=Count('execution_id', filter=Q(status='success')),
         failed_count=Count('execution_id', filter=Q(status='failed')),
@@ -202,7 +202,7 @@ def _update_stats(records, stat_date):
     for stat in stats:
         duration_avg = records.filter(
             trigger_event=stat['trigger_event'],
-            task_model=stat['task_model'],
+            executor_class=stat['executor_class'],
             started_at__isnull=False,
             finished_at__isnull=False,
         ).aggregate(
@@ -215,7 +215,7 @@ def _update_stats(records, stat_date):
 
         TaskExecutionStat.objects.update_or_create(
             date=stat_date,
-            task_model=stat.get('task_model') or '',
+            executor_class=stat['executor_class'],
             trigger_event=stat['trigger_event'],
             defaults={
                 'total_count': stat['total'],

{django_simpletask5-0.1.4 → django_simpletask5-0.2.0}/django_simpletask5.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-simpletask5
-Version: 0.1.4
+Version: 0.2.0
 Summary: Lightweight async task execution framework for Django
 Author-email: rRR0VrFP <rrr0vrfp@qq.com>
 Maintainer-email: rRR0VrFP <rrr0vrfp@qq.com>
@@ -177,6 +177,9 @@ DJANGO_SIMPLETASK_CRONJOB_AUTO_SYNC = True  # 是否自动将代码注册的 Cro
 ### 安全
 
 ```python
+# 是否启用 Python/Shell 脚本执行器（默认关闭，开启有安全风险）
+DJANGO_SIMPLETASK_ENABLE_SCRIPT_EXECUTORS = False
+
 # 脚本执行白名单（空列表表示不限制）
 DJANGO_SIMPLETASK_SCRIPT_WHITELIST = ['/path/to/allowed/scripts']
 
@@ -187,6 +190,8 @@ DJANGO_SIMPLETASK_ERROR_MSG_PASSWORD = None  # 错误信息加密密码
 DJANGO_SIMPLETASK_CONTEXT_PASSWORD = None    # 上下文数据加密密码
 ```
 
+> 注意：`DJANGO_SIMPLETASK_ENABLE_SCRIPT_EXECUTORS` 设为 `True` 后，还需为用户/组授予 `django_simpletask5 | Cron job | Can use script executors` 权限，非超级管理员无法创建 Python/Shell 脚本执行器类型的定时任务。
+
 ## 快速开始
 
 ### 1. 定义任务模型
@@ -315,6 +320,23 @@ Worker 消费消息 → 获取分布式锁 → 加载执行器 → 执行并保
 
 ## Releases
 
+### 0.2.0
+
+- **破坏性变更**: 移除 `Task` 模型上的自定义主键，`task_id` 不再是主键字段，改为 `unique=True` 的唯一标识字段。所有 `Task` 子模型将自动获得 Django 默认的自增 `id` 主键。已有数据库需要迁移处理。
+- **统计维度调整**: `TaskExecutionStat` 的统计维度由 `task_model` 改为 `executor_class`，统一覆盖有模型任务和 Cron 定时任务两种场景。对应 API `_update_stats()` 按 `executor_class` 分组聚合。
+- **Admin 优化**: CronJob 列表页移除 `executor_class` 列避免表格撑开；TaskExecutionStat 列表页新增 `executor_class` 列、`created_at` 设为只读修复详情页错误。
+- **测试修复**: 修复 `TransactionTestCase` + `on_commit` 在 SQLite 共享内存连接下因 `TestCase` 残留原子块导致回调不执行的兼容性问题；Redis MQ / RabbitMQ E2E 集成测试全部通过。
+
+### 0.1.5
+
+- **安全加固** — 新增 `DJANGO_SIMPLETASK_ENABLE_SCRIPT_EXECUTORS` 配置项（默认关闭），启用后才可执行 Python/Shell 脚本；新增 `can_use_script_executors` 权限，仅有此权限或超级管理员的用户才能在 Admin 中创建脚本执行器类型的 CronJob
+- **Bug 修复** — 修复 `RetryTimeoutExecutor` 中 lambda 晚绑定导致所有回调引用最后一个记录的问题
+- **Admin 安全** — 操作按钮（立即执行、启用/禁用）从 GET 参数改为 POST 请求，附带 CSRF 保护
+- **性能优化** — `RetryTimeoutExecutor` 改为批量 update + 按 ID 分发消息推送
+- **Admin 增强** — `TaskExecutionAdmin` 新增 `executor_class` 过滤、`error_message` 搜索、批量重试失败任务、批量取消待处理任务
+- **数据索引** — 添加 `(status, expire_time)` 和 `(is_active, next_run_time)` 复合索引；`trigger_event`、`executor_class`、`task_id`、`created_at` 添加单字段索引
+- **代码规范** — `bash_script.py`、`python_script.py`、`simple_request.py` 补充缺失的 logger；移除废弃的 `allow_tags` 属性
+
 ### 0.1.4
 
 - **修复打包** — `pyproject.toml` 添加 `package-data` 配置，打包时包含 locale po/mo 文件，修复 i18n 翻译不生效的问题

{django_simpletask5-0.1.4 → django_simpletask5-0.2.0}/django_simpletask5.egg-info/SOURCES.txt

@@ -43,6 +43,8 @@ django_simpletask5/migrations/0002_taskexecution_done_tasks_count_and_more.py
 django_simpletask5/migrations/0003_alter_cronjob_options_remove_cronjob_name_and_more.py
 django_simpletask5/migrations/0004_alter_cronjob_is_modified_by_user.py
 django_simpletask5/migrations/0005_alter_cronjob_is_modified_by_user_help.py
+django_simpletask5/migrations/0006_alter_cronjob_options_alter_taskexecution_created_at_and_more.py
+django_simpletask5/migrations/0007_rename_task_model_to_executor_class_in_stat.py
 django_simpletask5/migrations/__init__.py
 django_simpletask5/services/__init__.py
 django_simpletask5/services/archive.py

{django_simpletask5-0.1.4 → django_simpletask5-0.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "django-simpletask5"
-version = "0.1.4"
+version = "0.2.0"
 description = "Lightweight async task execution framework for Django"
 readme = "README.md"
 license = {text = "MIT"}

django_simpletask5-0.1.4/django_simpletask5/executors/retry_timeout.py

@@ -1,32 +0,0 @@
-import json
-import logging
-
-from django.db import models, transaction
-
-from django_simpletask5.models import TaskExecution
-from django_simpletask5.executors.base import BaseExecutor
-
-logger = logging.getLogger(__name__)
-
-
-class RetryTimeoutExecutor(BaseExecutor):
-    def execute(self, execution: TaskExecution, task=None) -> str | None:
-        retryable = TaskExecution.objects.filter(
-            status='timeout',
-            retry_count__lt=models.F('max_retries'),
-        )
-
-        count = 0
-        for exec_record in retryable:
-            exec_record.status = 'retry'
-            exec_record.retry_count += 1
-            exec_record.save(update_fields=['status', 'retry_count', 'updated_at'])
-
-            from django_simpletask5.core.publisher import _publish_message
-            transaction.on_commit(lambda: _publish_message(exec_record))
-            count += 1
-
-        return json.dumps({
-            'retried': count,
-            'success': True,
-        })