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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-simpletask5
-Version: 0.1.2
+Version: 0.1.4
 Summary: Lightweight async task execution framework for Django
 Author-email: rRR0VrFP <rrr0vrfp@qq.com>
 Maintainer-email: rRR0VrFP <rrr0vrfp@qq.com>
@@ -27,6 +27,8 @@ Requires-Dist: globallock>=0.1.4
 Requires-Dist: django-safe-fields>=0.2.3
 Requires-Dist: django-app-requires>=0.3.6
 Requires-Dist: django-admin-dashboards>=0.1.1
+Requires-Dist: django-checkbox-normalize>=0.2.2
+Requires-Dist: django-tabbed-changeform-admin>=0.1.9
 Requires-Dist: cryptography>=48.0.0
 Requires-Dist: croniter>=6.2.2
 Requires-Dist: requests>=2.34.2
@@ -104,6 +106,87 @@ DJANGO_SIMPLETASK_LOCK_CONFIG = {
 python manage.py migrate django_simpletask5
 ```
 
+## 配置说明
+
+所有配置项均为可选，设有合理的默认值。以下按功能分类说明。
+
+### 消息队列（MQ）
+
+默认使用内存队列（`memory://`），适合开发调试。生产环境建议切换为 RabbitMQ 或 Redis。
+
+```python
+# 方式一：直接指定完整 Broker URL（优先级最高）
+DJANGO_SIMPLETASK_BROKER_URL = 'amqp://guest:guest@127.0.0.1:5672//'
+
+# 方式二：分别指定类型和连接参数
+DJANGO_SIMPLETASK_MESSAGE_QUEUE_TYPE = 'rabbitmq'  # 'memory' | 'rabbitmq' | 'redis'
+DJANGO_SIMPLETASK_RABBITMQ_HOST = '127.0.0.1'
+DJANGO_SIMPLETASK_RABBITMQ_PORT = 5672
+DJANGO_SIMPLETASK_RABBITMQ_USER = 'guest'
+DJANGO_SIMPLETASK_RABBITMQ_PASSWORD = 'guest'
+
+# Redis 作为 MQ 时：
+# DJANGO_SIMPLETASK_MESSAGE_QUEUE_TYPE = 'redis'
+# DJANGO_SIMPLETASK_REDIS_MQ_HOST = '127.0.0.1'
+# DJANGO_SIMPLETASK_REDIS_MQ_PORT = 6379
+# DJANGO_SIMPLETASK_REDIS_MQ_DB = 0
+```
+
+### 分布式锁
+
+```python
+DJANGO_SIMPLETASK_LOCK_CONFIG = {
+    'global_lock_engine_class': 'globallock.redis_global_lock.RedisGlobalLock',
+    'global_lock_engine_options': {
+        'host': '127.0.0.1',
+        'port': 6379,
+        'db': 0,
+    },
+}
+DJANGO_SIMPLETASK_LOCK_TIMEOUT = 600  # 锁超时时间（秒）
+```
+
+### 队列路由
+
+```python
+DJANGO_SIMPLETASK_DEFAULT_QUEUE = 'django_simpletask5.queue.default'          # 默认队列
+DJANGO_SIMPLETASK_HIGH_PRIORITY_QUEUE = 'django_simpletask5.queue.high_priority'  # 高优先级队列
+```
+
+### 执行与重试
+
+```python
+DJANGO_SIMPLETASK_DEFAULT_MAX_RETRIES = 3        # 默认最大重试次数
+DJANGO_SIMPLETASK_DEFAULT_TIMEOUT_SECONDS = 600  # 默认执行超时时间（秒）
+```
+
+### 归档
+
+```python
+DJANGO_SIMPLETASK_ARCHIVE_PATH = 'django_simpletask5_archives'  # 归档文件存储子目录
+DJANGO_SIMPLETASK_ARCHIVE_SALT = 'django-simpletask5-archive'   # 归档加密盐值（结合 SECRET_KEY 派生 AES 密钥）
+DJANGO_SIMPLETASK_ARCHIVE_RETENTION_DAYS = 7                    # 归档保留天数
+```
+
+### Cron
+
+```python
+DJANGO_SIMPLETASK_CRONJOB_AUTO_SYNC = True  # 是否自动将代码注册的 Cron 同步到数据库
+```
+
+### 安全
+
+```python
+# 脚本执行白名单（空列表表示不限制）
+DJANGO_SIMPLETASK_SCRIPT_WHITELIST = ['/path/to/allowed/scripts']
+
+# 自定义字段加密（默认使用 django-safe-fields 的默认加密）
+DJANGO_SIMPLETASK_FIELD_CIPHER_CLASS = None                              # 自定义加密器类
+DJANGO_SIMPLETASK_RESULT_PASSWORD = None     # 执行结果加密密码
+DJANGO_SIMPLETASK_ERROR_MSG_PASSWORD = None  # 错误信息加密密码
+DJANGO_SIMPLETASK_CONTEXT_PASSWORD = None    # 上下文数据加密密码
+```
+
 ## 快速开始
 
 ### 1. 定义任务模型
@@ -232,6 +315,27 @@ Worker 消费消息 → 获取分布式锁 → 加载执行器 → 执行并保
 
 ## Releases
 
+### 0.1.4
+
+- **修复打包** — `pyproject.toml` 添加 `package-data` 配置，打包时包含 locale po/mo 文件，修复 i18n 翻译不生效的问题
+- **补充依赖** — `requirements.txt` 和 `pyproject.toml` 添加缺失的 `django-checkbox-normalize`、`django-tabbed-changeform-admin` 依赖
+- **完善文档** — README 新增完整配置说明章节，涵盖消息队列（MQ）、分布式锁、队列路由、归档、Cron、安全等全部配置项
+
+### 0.1.3
+
+- **Admin 界面大升级** — 集成 Tabbed ChangeForm 分页签展示字段，CronJob 后台支持直接执行/启用/禁用操作；TaskExecution 列表优化，execution_id 显示前8字符并支持点击复制，重试次数合并显示，全局字段中文翻译
+- **归档管理增强** — 新增 `django_simpletask_archive` 管理命令，支持手动触发归档与过期清理；PurgeExpiredExecutor 定期自动清理过期记录；保留天数可配置；采用流式 AES-GCM 加密，大文件归档更高效
+- **Dashboard 修复** — 卡片链接使用 `reverse` 正确跳转，无执行数据时成功率显示 `-`
+- **超时检测优化** — 模型新增 `expire_time` 字段，超时判定更准确高效
+
+### 0.1.2
+
+- **修复**: 修复 Transaction-Message 排序竞态条件，使用 `transaction.on_commit` 确保消息在事务提交后才发送到队列
+
+### 0.1.1
+
+- **修复**: 修复 `DjangoSimpletask5Config` 缺少 `ready()` 方法导致信号监听未注册的问题
+
 ### 0.1.0
 
 这是 django-simpletask5 的首个正式版本。核心功能包括：
@@ -246,14 +350,6 @@ Worker 消费消息 → 获取分布式锁 → 加载执行器 → 执行并保
 - **Worker 注册中心** — 基于 Redis 的 Worker 心跳与状态追踪
 - **Django Admin 集成** — 完整的后台管理界面与仪表盘
 
-### 0.1.2
-
-- **修复**: 修复 Transaction-Message 排序竞态条件，使用 `transaction.on_commit` 确保消息在事务提交后才发送到队列
-
-### 0.1.1
-
-- **修复**: 修复 `DjangoSimpletask5Config` 缺少 `ready()` 方法导致信号监听未注册的问题
-
 ## 许可证
 
 MIT

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

@@ -67,6 +67,87 @@ DJANGO_SIMPLETASK_LOCK_CONFIG = {
 python manage.py migrate django_simpletask5
 ```
 
+## 配置说明
+
+所有配置项均为可选，设有合理的默认值。以下按功能分类说明。
+
+### 消息队列（MQ）
+
+默认使用内存队列（`memory://`），适合开发调试。生产环境建议切换为 RabbitMQ 或 Redis。
+
+```python
+# 方式一：直接指定完整 Broker URL（优先级最高）
+DJANGO_SIMPLETASK_BROKER_URL = 'amqp://guest:guest@127.0.0.1:5672//'
+
+# 方式二：分别指定类型和连接参数
+DJANGO_SIMPLETASK_MESSAGE_QUEUE_TYPE = 'rabbitmq'  # 'memory' | 'rabbitmq' | 'redis'
+DJANGO_SIMPLETASK_RABBITMQ_HOST = '127.0.0.1'
+DJANGO_SIMPLETASK_RABBITMQ_PORT = 5672
+DJANGO_SIMPLETASK_RABBITMQ_USER = 'guest'
+DJANGO_SIMPLETASK_RABBITMQ_PASSWORD = 'guest'
+
+# Redis 作为 MQ 时：
+# DJANGO_SIMPLETASK_MESSAGE_QUEUE_TYPE = 'redis'
+# DJANGO_SIMPLETASK_REDIS_MQ_HOST = '127.0.0.1'
+# DJANGO_SIMPLETASK_REDIS_MQ_PORT = 6379
+# DJANGO_SIMPLETASK_REDIS_MQ_DB = 0
+```
+
+### 分布式锁
+
+```python
+DJANGO_SIMPLETASK_LOCK_CONFIG = {
+    'global_lock_engine_class': 'globallock.redis_global_lock.RedisGlobalLock',
+    'global_lock_engine_options': {
+        'host': '127.0.0.1',
+        'port': 6379,
+        'db': 0,
+    },
+}
+DJANGO_SIMPLETASK_LOCK_TIMEOUT = 600  # 锁超时时间（秒）
+```
+
+### 队列路由
+
+```python
+DJANGO_SIMPLETASK_DEFAULT_QUEUE = 'django_simpletask5.queue.default'          # 默认队列
+DJANGO_SIMPLETASK_HIGH_PRIORITY_QUEUE = 'django_simpletask5.queue.high_priority'  # 高优先级队列
+```
+
+### 执行与重试
+
+```python
+DJANGO_SIMPLETASK_DEFAULT_MAX_RETRIES = 3        # 默认最大重试次数
+DJANGO_SIMPLETASK_DEFAULT_TIMEOUT_SECONDS = 600  # 默认执行超时时间（秒）
+```
+
+### 归档
+
+```python
+DJANGO_SIMPLETASK_ARCHIVE_PATH = 'django_simpletask5_archives'  # 归档文件存储子目录
+DJANGO_SIMPLETASK_ARCHIVE_SALT = 'django-simpletask5-archive'   # 归档加密盐值（结合 SECRET_KEY 派生 AES 密钥）
+DJANGO_SIMPLETASK_ARCHIVE_RETENTION_DAYS = 7                    # 归档保留天数
+```
+
+### Cron
+
+```python
+DJANGO_SIMPLETASK_CRONJOB_AUTO_SYNC = True  # 是否自动将代码注册的 Cron 同步到数据库
+```
+
+### 安全
+
+```python
+# 脚本执行白名单（空列表表示不限制）
+DJANGO_SIMPLETASK_SCRIPT_WHITELIST = ['/path/to/allowed/scripts']
+
+# 自定义字段加密（默认使用 django-safe-fields 的默认加密）
+DJANGO_SIMPLETASK_FIELD_CIPHER_CLASS = None                              # 自定义加密器类
+DJANGO_SIMPLETASK_RESULT_PASSWORD = None     # 执行结果加密密码
+DJANGO_SIMPLETASK_ERROR_MSG_PASSWORD = None  # 错误信息加密密码
+DJANGO_SIMPLETASK_CONTEXT_PASSWORD = None    # 上下文数据加密密码
+```
+
 ## 快速开始
 
 ### 1. 定义任务模型
@@ -195,6 +276,27 @@ Worker 消费消息 → 获取分布式锁 → 加载执行器 → 执行并保
 
 ## Releases
 
+### 0.1.4
+
+- **修复打包** — `pyproject.toml` 添加 `package-data` 配置，打包时包含 locale po/mo 文件，修复 i18n 翻译不生效的问题
+- **补充依赖** — `requirements.txt` 和 `pyproject.toml` 添加缺失的 `django-checkbox-normalize`、`django-tabbed-changeform-admin` 依赖
+- **完善文档** — README 新增完整配置说明章节，涵盖消息队列（MQ）、分布式锁、队列路由、归档、Cron、安全等全部配置项
+
+### 0.1.3
+
+- **Admin 界面大升级** — 集成 Tabbed ChangeForm 分页签展示字段，CronJob 后台支持直接执行/启用/禁用操作；TaskExecution 列表优化，execution_id 显示前8字符并支持点击复制，重试次数合并显示，全局字段中文翻译
+- **归档管理增强** — 新增 `django_simpletask_archive` 管理命令，支持手动触发归档与过期清理；PurgeExpiredExecutor 定期自动清理过期记录；保留天数可配置；采用流式 AES-GCM 加密，大文件归档更高效
+- **Dashboard 修复** — 卡片链接使用 `reverse` 正确跳转，无执行数据时成功率显示 `-`
+- **超时检测优化** — 模型新增 `expire_time` 字段，超时判定更准确高效
+
+### 0.1.2
+
+- **修复**: 修复 Transaction-Message 排序竞态条件，使用 `transaction.on_commit` 确保消息在事务提交后才发送到队列
+
+### 0.1.1
+
+- **修复**: 修复 `DjangoSimpletask5Config` 缺少 `ready()` 方法导致信号监听未注册的问题
+
 ### 0.1.0
 
 这是 django-simpletask5 的首个正式版本。核心功能包括：
@@ -209,14 +311,6 @@ Worker 消费消息 → 获取分布式锁 → 加载执行器 → 执行并保
 - **Worker 注册中心** — 基于 Redis 的 Worker 心跳与状态追踪
 - **Django Admin 集成** — 完整的后台管理界面与仪表盘
 
-### 0.1.2
-
-- **修复**: 修复 Transaction-Message 排序竞态条件，使用 `transaction.on_commit` 确保消息在事务提交后才发送到队列
-
-### 0.1.1
-
-- **修复**: 修复 `DjangoSimpletask5Config` 缺少 `ready()` 方法导致信号监听未注册的问题
-
 ## 许可证
 
 MIT

{django_simpletask5-0.1.2 → django_simpletask5-0.1.4}/django_simpletask5/__init__.py

@@ -3,5 +3,7 @@ default_app_config = 'django_simpletask5.apps.DjangoSimpletask5Config'
 app_requires = [
     'django_admin_dashboards',
     'django_safe_fields',
+    'django_tabbed_changeform_admin',
+    'django_checkbox_normalize',
 ]
 

django_simpletask5-0.1.4/django_simpletask5/admin.py

@@ -0,0 +1,388 @@
+import json
+
+from django import forms
+from django.contrib import admin
+from django.http import HttpResponseRedirect
+from django.urls import reverse
+from django.utils.translation import gettext_lazy as _
+from django_checkbox_normalize.admin import DjangoCheckboxNormalizeAdmin
+from django_tabbed_changeform_admin.admin import DjangoTabbedChangeformAdmin
+
+
+from django_simpletask5.models import TaskExecution, CronJob, TaskExecutionStat, TaskExecutionArchive
+from django_simpletask5.core.executor_scanner import (
+    get_executor_choices,
+    get_executor_schema_map,
+)
+
+
+class ExecutorClassWidget(forms.Select):
+    def __init__(self, attrs=None):
+        schema_map = get_executor_schema_map()
+        choices = [("", "---------")]
+        for group_name, items in get_executor_choices():
+            group_choices = [(v, v) for v, _ in items]
+            choices.append((group_name, group_choices))
+        attrs = attrs or {}
+        attrs.setdefault("class", "select2-executor")
+        attrs.setdefault("style", "width: 600px;")
+        attrs["data-schemas"] = json.dumps(schema_map, ensure_ascii=False)
+        super().__init__(attrs=attrs, choices=choices)
+
+
+class CronJobForm(forms.ModelForm):
+    uid = forms.CharField(
+        label=_("UID"),
+        required=True,
+        widget=forms.TextInput(attrs={'style': 'width: 600px;'}),
+    )
+    display_name = forms.CharField(
+        label=_("Name"),
+        required=False,
+        widget=forms.TextInput(attrs={'style': 'width: 600px;'}),
+    )
+    executor_class = forms.CharField(
+        label=_("Executor class"),
+        widget=ExecutorClassWidget(),
+    )
+    context = forms.CharField(
+        label=_("Context"),
+        required=False,
+        widget=forms.Textarea(
+            attrs={
+                "rows": 8,
+                "style": "width: 600px; font-family: monospace;",
+            }
+        ),
+        help_text=_("Supports JSON or YAML format. YAML is more concise and compatible with JSON standard format."),
+    )
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if self.instance and self.instance.pk:
+            self.fields['uid'].disabled = True
+        if self.instance and self.instance.pk and self.instance.context:
+            try:
+                parsed = json.loads(self.instance.context)
+                import yaml
+
+                self.initial["context"] = yaml.dump(
+                    parsed,
+                    default_flow_style=False,
+                    allow_unicode=True,
+                    sort_keys=False,
+                ).strip()
+            except Exception:
+                pass
+
+    def clean_context(self):
+        raw = self.cleaned_data.get("context")
+        if not raw:
+            return None
+        try:
+            parsed = json.loads(raw)
+            return json.dumps(parsed, ensure_ascii=False)
+        except json.JSONDecodeError:
+            pass
+        try:
+            import yaml
+
+            parsed = yaml.safe_load(raw)
+            if parsed is None:
+                return None
+            return json.dumps(parsed, ensure_ascii=False)
+        except Exception:
+            raise forms.ValidationError(_("Invalid parameter format. Please use JSON or YAML format."))
+
+    class Meta:
+        model = CronJob
+        fields = "__all__"
+
+    class Media:
+        css = {
+            "all": ["admin/css/vendor/select2/select2.min.css"],
+        }
+        js = [
+            "admin/js/vendor/jquery/jquery.min.js",
+            "admin/js/vendor/select2/select2.full.min.js",
+            "django_simpletask5/js/select2_executor.js",
+            "admin/js/jquery.init.js",
+        ]
+
+
+@admin.register(TaskExecution)
+class TaskExecutionAdmin(DjangoCheckboxNormalizeAdmin, DjangoTabbedChangeformAdmin):
+    list_display = [
+        "executor_class",
+        "short_execution_id",
+        "trigger_event",
+        "status",
+        "retry_info",
+        "created_at",
+    ]
+
+    list_display_links = ["executor_class"]
+
+    @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!")
+        return format_html(
+            '<span style="cursor:pointer;border-bottom:1px dashed #999;"'
+            ' title="{}" onclick="navigator.clipboard.writeText(\'{}\').then(function(){{'
+            'var t=this;var o=t.textContent;t.textContent=\'{}\';'
+            '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"]
+    readonly_fields = [
+        "execution_id", "task_id", "task_model", "trigger_event", "executor_class", "status",
+        "result", "error_message", "context", "total_tasks_count", "done_tasks_count",
+        "retry_count", "max_retries", "timeout_seconds", "expire_time",
+        "started_at", "finished_at", "created_at", "updated_at",
+    ]
+    ordering = ["-created_at"]
+
+    def has_add_permission(self, request):
+        return False
+
+    def has_delete_permission(self, request, obj=None):
+        return False
+
+    def changeform_view(self, request, object_id=None, form_url="", extra_context=None):
+        extra_context = extra_context or {}
+        extra_context["show_save"] = False
+        extra_context["show_save_and_continue"] = False
+        extra_context["show_save_and_add_another"] = False
+        extra_context["show_delete_link"] = False
+        return super().changeform_view(request, object_id, form_url, extra_context)
+
+    fieldsets = [
+        (None, {
+            "fields": ["execution_id", "task_id", "task_model", "trigger_event", "executor_class", "status", "created_at", "updated_at"],
+            "classes": ["tab-basic"],
+        }),
+        (None, {
+            "fields": ["result", "error_message", "context", "total_tasks_count", "done_tasks_count", "started_at", "finished_at"],
+            "classes": ["tab-data"],
+        }),
+        (None, {
+            "fields": ["retry_count", "max_retries", "timeout_seconds", "expire_time"],
+            "classes": ["tab-retry"],
+        }),
+    ]
+
+    tabs = [
+        (_("Basic Info"), ["tab-basic"]),
+        (_("Execution Data"), ["tab-data"]),
+        (_("Retry & Timeout"), ["tab-retry"]),
+    ]
+
+    @admin.display(description=_("Retry"))
+    def retry_info(self, obj):
+        return f"{obj.retry_count}/{obj.max_retries}"
+
+
+@admin.register(CronJob)
+class CronJobAdmin(DjangoCheckboxNormalizeAdmin, DjangoTabbedChangeformAdmin):
+    form = CronJobForm
+    list_display = [
+        "display_name",
+        "cron_expression",
+        "executor_class",
+        "is_active",
+        "is_modified_by_user",
+        "updated_at",
+        "action_buttons",
+    ]
+    readonly_fields = ["created_at", "updated_at"]
+    list_filter = ["is_active", "is_modified_by_user"]
+    search_fields = ["display_name", "uid", "executor_class"]
+
+    fieldsets = [
+        (None, {
+            "fields": ["uid", "display_name", "executor_class", "cron_expression", "description", "created_at", "updated_at"],
+            "classes": ["tab-basic"],
+        }),
+        (None, {
+            "fields": ["is_active", "context", "is_modified_by_user", "next_run_time"],
+            "classes": ["tab-advanced"],
+        }),
+    ]
+
+    tabs = [
+        (_("Basic Config"), ["tab-basic"]),
+        (_("Advanced Settings"), ["tab-advanced"]),
+    ]
+    actions = [
+        "reset_from_code",
+        "mark_as_modified",
+        "unmark_as_modified",
+        "activate_cronjobs",
+        "deactivate_cronjobs",
+    ]
+
+    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
+
+        changelist_url = reverse('admin:django_simpletask5_cronjob_changelist')
+
+        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>'
+        )
+        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>'
+            )
+        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>'
+            )
+        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>'
+        )
+        return format_html(''.join(buttons))
+
+    action_buttons.short_description = _("操作")
+    action_buttons.allow_tags = True
+
+    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 save_model(self, request, obj, form, change):
+        if change:
+            SUBSTANTIVE_FIELDS = {"cron_expression", "executor_class", "context", "description", "display_name", "is_active"}
+            changed = set(form.changed_data)
+            if changed & SUBSTANTIVE_FIELDS:
+                obj.is_modified_by_user = True
+        super().save_model(request, obj, form, change)
+
+    def save_related(self, request, form, formsets, change):
+        super().save_related(request, form, formsets, change)
+
+    def reset_from_code(self, request, queryset):
+        from django_simpletask5.core.cronjob_registry import _CRONJOB_REGISTRY
+
+        updated = 0
+        for cronjob in queryset:
+            if cronjob.uid in _CRONJOB_REGISTRY:
+                registered = _CRONJOB_REGISTRY[cronjob.uid]
+                cronjob.display_name = registered.get("display_name", "")
+                cronjob.cron_expression = registered["cron_expression"]
+                cronjob.executor_class = registered["executor_class"]
+                cronjob.context = registered.get("context")
+                cronjob.description = registered.get("description", "")
+                cronjob.is_modified_by_user = False
+                cronjob.save()
+                updated += 1
+        self.message_user(request, f"{updated} cronjob(s) reset from code definitions.")
+
+    reset_from_code.short_description = _("Reset from code definitions")
+
+    def mark_as_modified(self, request, queryset):
+        updated = queryset.update(is_modified_by_user=True)
+        self.message_user(request, f"{updated} cronjob(s) marked as user-modified.")
+
+    mark_as_modified.short_description = _("Mark as user-modified")
+
+    def unmark_as_modified(self, request, queryset):
+        updated = queryset.update(is_modified_by_user=False)
+        self.message_user(request, f"{updated} cronjob(s) unmarked as user-modified.")
+
+    unmark_as_modified.short_description = _("Unmark as user-modified")
+
+    def activate_cronjobs(self, request, queryset):
+        updated = queryset.update(is_active=True)
+        self.message_user(request, f"{updated} cronjob(s) activated.")
+
+    activate_cronjobs.short_description = _("Activate selected tasks")
+
+    def deactivate_cronjobs(self, request, queryset):
+        updated = queryset.update(is_active=False)
+        self.message_user(request, f"{updated} cronjob(s) deactivated.")
+
+    deactivate_cronjobs.short_description = _("Deactivate selected tasks")
+
+
+@admin.register(TaskExecutionStat)
+class TaskExecutionStatAdmin(DjangoCheckboxNormalizeAdmin, DjangoTabbedChangeformAdmin):
+    list_display = [
+        "date",
+        "trigger_event",
+        "total_count",
+        "success_count",
+        "failed_count",
+        "avg_duration_seconds",
+    ]
+    list_filter = ["date", "trigger_event"]
+    ordering = ["-date"]
+
+    fieldsets = [
+        (None, {
+            "fields": ["date", "task_model", "trigger_event", "created_at"],
+            "classes": ["tab-basic"],
+        }),
+        (None, {
+            "fields": ["total_count", "success_count", "failed_count", "timeout_count", "avg_duration_seconds"],
+            "classes": ["tab-stats"],
+        }),
+    ]
+
+    tabs = [
+        (_("Basic Info"), ["tab-basic"]),
+        (_("Statistics"), ["tab-stats"]),
+    ]
+
+
+@admin.register(TaskExecutionArchive)
+class TaskExecutionArchiveAdmin(DjangoCheckboxNormalizeAdmin, DjangoTabbedChangeformAdmin):
+    list_display = ["archive_date", "created_at"]
+    readonly_fields = ["archive_date", "file", "created_at"]
+    ordering = ["-archive_date"]
+
+    fieldsets = [
+        (None, {
+            "fields": ["archive_date", "file", "created_at"],
+            "classes": ["tab-basic"],
+        }),
+    ]
+
+    tabs = [
+        (_("Basic Info"), ["tab-basic"]),
+    ]

{django_simpletask5-0.1.2 → django_simpletask5-0.1.4}/django_simpletask5/apps.py

@@ -9,3 +9,5 @@ class DjangoSimpletask5Config(AppConfig):
 
     def ready(self):
         import django_simpletask5.core.signals  # noqa
+        from django_simpletask5.core.cronjob_registry import register_builtin_cronjobs
+        register_builtin_cronjobs()