django-simpletask5 0.2.1__tar.gz → 0.2.3__tar.gz

{django_simpletask5-0.2.1 → django_simpletask5-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-simpletask5
-Version: 0.2.1
+Version: 0.2.3
 Summary: Lightweight async task execution framework for Django
 Author-email: rRR0VrFP <rrr0vrfp@qq.com>
 Maintainer-email: rRR0VrFP <rrr0vrfp@qq.com>
@@ -29,6 +29,7 @@ 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: django-static-fontawesome>=5.0.2
 Requires-Dist: cryptography>=48.0.0
 Requires-Dist: croniter>=6.2.2
 Requires-Dist: requests>=2.34.2
@@ -135,6 +136,19 @@ DJANGO_SIMPLETASK_RABBITMQ_PASSWORD = 'guest'
 
 ### 分布式锁
 
+默认使用 Django 缓存中的 Redis 连接，只需配置好 Django 的 `CACHES`：
+
+```python
+CACHES = {
+    'default': {
+        'BACKEND': 'django_redis.cache.RedisCache',
+        'LOCATION': 'redis://127.0.0.1:6379/1',
+    },
+}
+```
+
+如需自定义锁引擎或连接参数：
+
 ```python
 DJANGO_SIMPLETASK_LOCK_CONFIG = {
     'global_lock_engine_class': 'globallock.redis_global_lock.RedisGlobalLock',
@@ -150,8 +164,8 @@ DJANGO_SIMPLETASK_LOCK_TIMEOUT = 600  # 锁超时时间（秒）
 ### 队列路由
 
 ```python
-DJANGO_SIMPLETASK_DEFAULT_QUEUE = 'django_simpletask5.queue.default'          # 默认队列
-DJANGO_SIMPLETASK_HIGH_PRIORITY_QUEUE = 'django_simpletask5.queue.high_priority'  # 高优先级队列
+DJANGO_SIMPLETASK_DEFAULT_QUEUE = 'myproject:django-simpletask5:queue:default'          # 默认队列
+DJANGO_SIMPLETASK_HIGH_PRIORITY_QUEUE = 'myproject:django-simpletask5:queue:high_priority'  # 高优先级队列
 ```
 
 ### 执行与重试
@@ -296,6 +310,31 @@ order = OrderTask.objects.get(order_id='ORD-001')
 order.trigger('refund', extra_context={'refund_amount': '50.00'})
 ```
 
+### 6. 抑制异步消息
+
+创建或更新 Task 时，可通过 `_skip_publish` 机制禁止触发 RabbitMQ 消息通知，不会创建 `TaskExecution` 也不发送异步消息。提供四种使用方式：
+
+```python
+# 方式一：设置实例属性
+order = OrderTask(order_id='ORD-001', customer_name='Test', amount=Decimal('100.00'))
+order._skip_publish = True
+order.save()
+
+# 方式二：调用 skip_publish() 方法（支持链式调用）
+order.skip_publish().save()
+
+# 方式三：save 时传入 skip_publish=True
+order.save(skip_publish=True)
+
+# 方式四：构造或 create 时直接传入（推荐）
+OrderTask.objects.create(
+    order_id='ORD-001', customer_name='Test', amount=Decimal('100.00'),
+    skip_publish=True,
+)
+```
+
+`_skip_publish` 是临时实例属性，不会持久化到数据库，后续正常操作不受影响。
+
 ## Cron 任务
 
 ### 在代码中定义 Cron 任务
@@ -329,6 +368,8 @@ python manage.py django_simpletask_sync_cronjobs
 
 同步后，用户可以在 Django Admin 中查看和修改 Cron 任务，被手动修改过的任务不会在后续同步中被覆盖（`is_modified_by_user` 标记保护）。
 
+> 注意：cron 表达式按 Django 的 `TIME_ZONE` 设置对应的本地时间解释。`USE_TZ=True` 时仍以本地时间计算触发时刻（存储为 UTC），例如 `TIME_ZONE = 'Asia/Shanghai'` 下 `30 14 * * *` 表示每天 14:30 本地时间触发。
+
 ## 内置执行器
 
 | 执行器 | 说明 |
@@ -353,6 +394,27 @@ Worker 消费消息 → 获取分布式锁 → 加载执行器 → 执行并保
 
 ## Releases
 
+### 0.2.3
+
+- **Cron 时区修复** — cron 表达式改为按 Django `TIME_ZONE` 配置的本地时间解释，不再固定按 UTC 计算。`USE_TZ=True` 时使用 `timezone.localtime(now())` 作为 croniter 基准时间，非 UTC 时区下定时任务不再偏移；`USE_TZ=False` 保持原有本地时间行为不变
+
+### 0.2.2
+
+- **抑制异步消息** — 新增 `_skip_publish` 机制，创建/更新/删除 Task 时可通过 `skip_publish()` 方法、`save(skip_publish=True)`、构造时传入 `skip_publish=True` 等方式禁止触发 RabbitMQ 消息通知
+- **批量创建触发异步消息** — `TaskQuerySet` + `TaskManager` 接管 `bulk_create`，批量创建 Task 后自动生成 TaskExecution 并推送 MQ；子类覆盖 `objects` 时发出警告提示
+- **分布式锁默认引擎** — 默认使用 `DjangoRedisGlobalLock`，复用 Django `CACHES['default']` 配置（需为 Redis 缓存），无需手动配置 `DJANGO_SIMPLETASK_LOCK_CONFIG`
+- **Redis key 命名统一** — 所有 Redis key 格式规范为 `{项目前缀}:django-simpletask5:{用途}:{id}`，项目前缀从 `ROOT_URLCONF` 自动提取，也可通过 `DJANGO_SIMPLETASK_KEY_PREFIX` 显式覆盖
+- **CronJob 管理增强** — 新增 `app_label` 字段（自动检测），列表页展示并支持过滤
+- **内置 CronJob 重命名** — Status Check → Task Timeout Detection，Retry Timeout → Retry Failed Tasks，Ping/Pong → Health Check 等
+- **Dashboard 重做** — 新增今日失败卡片，成功率按 90%/80% 分绿色/橙色/红色三级，卡片颜色统一使用 info 蓝色
+- **Pending/Running 显示修复** — 改为展示 `pending / running` 双值而非仅 pending
+- **成功率显示优化** — `(22/25)` 与 `88%` 同行显示，字号缩小颜色淡化，高度对齐
+- **Redis 不可达降级** — Worker 数量显示 `-` 而非 `0`，区分无数据与异常
+- **按钮优化** — 改用 Font Awesome 图标，统一 `min-width` 对齐，title 改为中文描述
+- **翻译补充** — 补充 Run/Activate/Deactivate 及所有内置 CronJob 名称的中文翻译
+- **新增依赖** — `django-static-fontawesome` 用于按钮图标
+- **示例应用** — 示例 cronjobs 模块在 AppConfig.ready() 中导入确保注册生效
+
 ### 0.2.1
 
 - **拒绝回退机制** — 新增 `RejectException`，执行器可抛出该异常拒绝当前任务，消息自动重新入队等待下次调度，不消耗重试次数

{django_simpletask5-0.2.1 → django_simpletask5-0.2.3}/README.md

@@ -96,6 +96,19 @@ DJANGO_SIMPLETASK_RABBITMQ_PASSWORD = 'guest'
 
 ### 分布式锁
 
+默认使用 Django 缓存中的 Redis 连接，只需配置好 Django 的 `CACHES`：
+
+```python
+CACHES = {
+    'default': {
+        'BACKEND': 'django_redis.cache.RedisCache',
+        'LOCATION': 'redis://127.0.0.1:6379/1',
+    },
+}
+```
+
+如需自定义锁引擎或连接参数：
+
 ```python
 DJANGO_SIMPLETASK_LOCK_CONFIG = {
     'global_lock_engine_class': 'globallock.redis_global_lock.RedisGlobalLock',
@@ -111,8 +124,8 @@ DJANGO_SIMPLETASK_LOCK_TIMEOUT = 600  # 锁超时时间（秒）
 ### 队列路由
 
 ```python
-DJANGO_SIMPLETASK_DEFAULT_QUEUE = 'django_simpletask5.queue.default'          # 默认队列
-DJANGO_SIMPLETASK_HIGH_PRIORITY_QUEUE = 'django_simpletask5.queue.high_priority'  # 高优先级队列
+DJANGO_SIMPLETASK_DEFAULT_QUEUE = 'myproject:django-simpletask5:queue:default'          # 默认队列
+DJANGO_SIMPLETASK_HIGH_PRIORITY_QUEUE = 'myproject:django-simpletask5:queue:high_priority'  # 高优先级队列
 ```
 
 ### 执行与重试
@@ -257,6 +270,31 @@ order = OrderTask.objects.get(order_id='ORD-001')
 order.trigger('refund', extra_context={'refund_amount': '50.00'})
 ```
 
+### 6. 抑制异步消息
+
+创建或更新 Task 时，可通过 `_skip_publish` 机制禁止触发 RabbitMQ 消息通知，不会创建 `TaskExecution` 也不发送异步消息。提供四种使用方式：
+
+```python
+# 方式一：设置实例属性
+order = OrderTask(order_id='ORD-001', customer_name='Test', amount=Decimal('100.00'))
+order._skip_publish = True
+order.save()
+
+# 方式二：调用 skip_publish() 方法（支持链式调用）
+order.skip_publish().save()
+
+# 方式三：save 时传入 skip_publish=True
+order.save(skip_publish=True)
+
+# 方式四：构造或 create 时直接传入（推荐）
+OrderTask.objects.create(
+    order_id='ORD-001', customer_name='Test', amount=Decimal('100.00'),
+    skip_publish=True,
+)
+```
+
+`_skip_publish` 是临时实例属性，不会持久化到数据库，后续正常操作不受影响。
+
 ## Cron 任务
 
 ### 在代码中定义 Cron 任务
@@ -290,6 +328,8 @@ python manage.py django_simpletask_sync_cronjobs
 
 同步后，用户可以在 Django Admin 中查看和修改 Cron 任务，被手动修改过的任务不会在后续同步中被覆盖（`is_modified_by_user` 标记保护）。
 
+> 注意：cron 表达式按 Django 的 `TIME_ZONE` 设置对应的本地时间解释。`USE_TZ=True` 时仍以本地时间计算触发时刻（存储为 UTC），例如 `TIME_ZONE = 'Asia/Shanghai'` 下 `30 14 * * *` 表示每天 14:30 本地时间触发。
+
 ## 内置执行器
 
 | 执行器 | 说明 |
@@ -314,6 +354,27 @@ Worker 消费消息 → 获取分布式锁 → 加载执行器 → 执行并保
 
 ## Releases
 
+### 0.2.3
+
+- **Cron 时区修复** — cron 表达式改为按 Django `TIME_ZONE` 配置的本地时间解释，不再固定按 UTC 计算。`USE_TZ=True` 时使用 `timezone.localtime(now())` 作为 croniter 基准时间，非 UTC 时区下定时任务不再偏移；`USE_TZ=False` 保持原有本地时间行为不变
+
+### 0.2.2
+
+- **抑制异步消息** — 新增 `_skip_publish` 机制，创建/更新/删除 Task 时可通过 `skip_publish()` 方法、`save(skip_publish=True)`、构造时传入 `skip_publish=True` 等方式禁止触发 RabbitMQ 消息通知
+- **批量创建触发异步消息** — `TaskQuerySet` + `TaskManager` 接管 `bulk_create`，批量创建 Task 后自动生成 TaskExecution 并推送 MQ；子类覆盖 `objects` 时发出警告提示
+- **分布式锁默认引擎** — 默认使用 `DjangoRedisGlobalLock`，复用 Django `CACHES['default']` 配置（需为 Redis 缓存），无需手动配置 `DJANGO_SIMPLETASK_LOCK_CONFIG`
+- **Redis key 命名统一** — 所有 Redis key 格式规范为 `{项目前缀}:django-simpletask5:{用途}:{id}`，项目前缀从 `ROOT_URLCONF` 自动提取，也可通过 `DJANGO_SIMPLETASK_KEY_PREFIX` 显式覆盖
+- **CronJob 管理增强** — 新增 `app_label` 字段（自动检测），列表页展示并支持过滤
+- **内置 CronJob 重命名** — Status Check → Task Timeout Detection，Retry Timeout → Retry Failed Tasks，Ping/Pong → Health Check 等
+- **Dashboard 重做** — 新增今日失败卡片，成功率按 90%/80% 分绿色/橙色/红色三级，卡片颜色统一使用 info 蓝色
+- **Pending/Running 显示修复** — 改为展示 `pending / running` 双值而非仅 pending
+- **成功率显示优化** — `(22/25)` 与 `88%` 同行显示，字号缩小颜色淡化，高度对齐
+- **Redis 不可达降级** — Worker 数量显示 `-` 而非 `0`，区分无数据与异常
+- **按钮优化** — 改用 Font Awesome 图标，统一 `min-width` 对齐，title 改为中文描述
+- **翻译补充** — 补充 Run/Activate/Deactivate 及所有内置 CronJob 名称的中文翻译
+- **新增依赖** — `django-static-fontawesome` 用于按钮图标
+- **示例应用** — 示例 cronjobs 模块在 AppConfig.ready() 中导入确保注册生效
+
 ### 0.2.1
 
 - **拒绝回退机制** — 新增 `RejectException`，执行器可抛出该异常拒绝当前任务，消息自动重新入队等待下次调度，不消耗重试次数

{django_simpletask5-0.2.1 → django_simpletask5-0.2.3}/django_simpletask5/__init__.py

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

{django_simpletask5-0.2.1 → django_simpletask5-0.2.3}/django_simpletask5/admin.py

@@ -3,6 +3,7 @@ import json
 from django import forms
 from django.contrib import admin
 from django.http import HttpResponseRedirect, Http404
+from django.middleware.csrf import get_token
 from django.urls import path, reverse
 from django.utils.html import format_html, mark_safe
 from django.utils.translation import gettext_lazy as _
@@ -225,6 +226,7 @@ class CronJobAdmin(DjangoCheckboxNormalizeAdmin, DjangoTabbedChangeformAdmin):
     form = CronJobForm
     list_display = [
         "display_name",
+        "app_label",
         "cron_expression",
         "is_active",
         "is_modified_by_user",
@@ -232,9 +234,14 @@ class CronJobAdmin(DjangoCheckboxNormalizeAdmin, DjangoTabbedChangeformAdmin):
         "action_buttons",
     ]
     readonly_fields = ["created_at", "updated_at"]
-    list_filter = ["is_active", "is_modified_by_user"]
+    list_filter = ["is_active", "is_modified_by_user", "app_label"]
     search_fields = ["display_name", "uid", "executor_class"]
 
+    class Media:
+        css = {
+            "all": ("fontawesome/css/all.min.css",),
+        }
+
     fieldsets = [
         (None, {
             "fields": ["uid", "display_name", "executor_class", "cron_expression", "description", "created_at", "updated_at"],
@@ -261,6 +268,10 @@ class CronJobAdmin(DjangoCheckboxNormalizeAdmin, DjangoTabbedChangeformAdmin):
     def get_queryset(self, request):
         return super().get_queryset(request)
 
+    def changelist_view(self, request, extra_context=None):
+        self._admin_request = request
+        return super().changelist_view(request, extra_context=extra_context)
+
     def get_urls(self):
         urls = super().get_urls()
         custom_urls = [
@@ -311,39 +322,45 @@ class CronJobAdmin(DjangoCheckboxNormalizeAdmin, DjangoTabbedChangeformAdmin):
             reverse('admin:django_simpletask5_cronjob_changelist')
         )
 
+    _btn_base = "padding:3px 8px;border-radius:3px;border:none;cursor:pointer;margin-right:4px;font-size:12px;min-width:68px"
+
+    def _csrf_token_input(self):
+        token = get_token(self._admin_request) if hasattr(self, '_admin_request') else ''
+        return f'<input type="hidden" name="csrfmiddlewaretoken" value="{token}">'
+
     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 }}"'
+        csrf_input = self._csrf_token_input()
 
         buttons = []
         buttons.append(
             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>'
+            f'{csrf_input}'
+            f'<button type="submit" style="background:#17a2b8;color:#fff;{self._btn_base}" title="{_("Click to run this cronjob")}">'
+            f'<i class="fas fa-play"></i> {_("Run")}</button></form>'
         )
         if obj.is_active:
             btn_style = "background:#ffc107;color:#000"
-            btn_title = _("Deactivate")
-            btn_icon = "ri-pause-line"
+            btn_title = _("Click to deactivate this cronjob")
+            btn_icon = "fas fa-pause"
             btn_label = _("Deactivate")
         else:
             btn_style = "background:#28a745;color:#fff"
-            btn_title = _("Activate")
-            btn_icon = "ri-play-circle-line"
+            btn_title = _("Click to activate this cronjob")
+            btn_icon = "fas fa-play-circle"
             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'{csrf_input}'
+            f'<button type="submit" style="{btn_style};{self._btn_base}" 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="{_("Delete")}">'
-            f'<i class="ri-delete-bin-line"></i> {_("Delete")}</a>'
+            f'<a class="button" style="background:#dc3545;color:#fff;padding:3px 8px;border-radius:3px;text-decoration:none;margin-right:4px;font-size:12px;min-width:68px;display:inline-block;text-align:center" '
+            f'href="{delete_url}" title="{_("Click to delete this cronjob")}">'
+            f'<i class="fas fa-trash"></i> {_("Delete")}</a>'
         )
         return mark_safe(''.join(buttons))
 

{django_simpletask5-0.2.1 → django_simpletask5-0.2.3}/django_simpletask5/core/cronjob_registry.py

@@ -10,7 +10,17 @@ logger = logging.getLogger(__name__)
 _CRONJOB_REGISTRY = {}
 
 
-def register_cronjob(uid, display_name, cron_expression, executor_class, context=None, description='', is_active=True):
+def register_cronjob(uid, display_name, cron_expression, executor_class, context=None, description='', is_active=True, app_label=''):
+    if not app_label:
+        import inspect
+        frame = inspect.currentframe()
+        try:
+            caller_frame = frame.f_back
+            caller_module = inspect.getmodule(caller_frame)
+            if caller_module and caller_module.__name__:
+                app_label = caller_module.__name__.split('.')[0]
+        finally:
+            del frame
     _CRONJOB_REGISTRY[uid] = {
         'display_name': display_name,
         'cron_expression': cron_expression,
@@ -18,6 +28,7 @@ def register_cronjob(uid, display_name, cron_expression, executor_class, context
         'context': json.dumps(context) if context else None,
         'description': description,
         'is_active': is_active,
+        'app_label': app_label,
     }
 
 
@@ -27,7 +38,8 @@ def _compute_next_run_time(cron_expression, base=None):
     except ImportError:
         return None
     if base is None:
-        base = timezone.now()
+        now = timezone.now()
+        base = timezone.localtime(now) if timezone.is_aware(now) else now
     try:
         cron = croniter(cron_expression, base)
         return cron.get_next(datetime)
@@ -56,6 +68,7 @@ def sync_cronjobs():
                 cronjob.context = config.get('context')
                 cronjob.description = config.get('description', '')
                 cronjob.is_active = config.get('is_active', True)
+                cronjob.app_label = config.get('app_label', '')
                 if cronjob.next_run_time is None:
                     cronjob.next_run_time = _compute_next_run_time(config['cron_expression'])
                 cronjob.save()
@@ -68,6 +81,7 @@ def sync_cronjobs():
                 context=config.get('context'),
                 description=config.get('description', ''),
                 is_active=config.get('is_active', True),
+                app_label=config.get('app_label', ''),
                 is_modified_by_user=False,
                 next_run_time=_compute_next_run_time(config['cron_expression']),
             )
@@ -80,35 +94,35 @@ def register_builtin_cronjobs():
 
     register_cronjob(
         uid='simpletask_status_check',
-        display_name=_('Status Check'),
+        display_name=_('Task Timeout Detection'),
         cron_expression='* * * * *',
         executor_class='django_simpletask5.executors.status_check.StatusCheckExecutor',
         description='Scan long-running pending/running tasks and mark them as timeout',
     )
     register_cronjob(
         uid='simpletask_retry_timeout',
-        display_name=_('Retry Timeout'),
+        display_name=_('Retry Failed Tasks'),
         cron_expression='* * * * *',
         executor_class='django_simpletask5.executors.retry_timeout.RetryTimeoutExecutor',
         description='Retry timeout tasks that still have retry attempts remaining',
     )
     register_cronjob(
         uid='simpletask_archive',
-        display_name=_('Archive'),
+        display_name=_('Execution Archive'),
         cron_expression='0 2 * * *',
         executor_class='django_simpletask5.executors.archive.ArchiveExecutor',
         description='Archive previous day TaskExecution records',
     )
     register_cronjob(
         uid='simpletask_purge_expired',
-        display_name=_('Purge Expired'),
+        display_name=_('Purge Expired Records'),
         cron_expression='0 3 * * *',
         executor_class='django_simpletask5.executors.archive.PurgeExpiredExecutor',
         description='Purge expired TaskExecution records beyond retention days',
     )
     register_cronjob(
         uid='simpletask_ping_pong',
-        display_name=_('Ping / Pong'),
+        display_name=_('Health Check'),
         cron_expression='* * * * *',
         executor_class='django_simpletask5.executors.ping_pong.PingPongExecutor',
         description='Ping pong health check',

{django_simpletask5-0.2.1 → django_simpletask5-0.2.3}/django_simpletask5/core/defaults.py

@@ -1,7 +1,22 @@
 from django.conf import settings
 
+
+def _compute_key_prefix() -> str:
+    custom = getattr(settings, 'DJANGO_SIMPLETASK_KEY_PREFIX', None)
+    if custom is not None:
+        return custom
+    root_urlconf = getattr(settings, 'ROOT_URLCONF', None)
+    if root_urlconf:
+        return root_urlconf.split('.')[0]
+    return 'default'
+
+
+DJANGO_SIMPLETASK_KEY_PREFIX = _compute_key_prefix()
+
 DJANGO_SIMPLETASK_LOCK_TIMEOUT = getattr(settings, 'DJANGO_SIMPLETASK_LOCK_TIMEOUT', 600)
+DJANGO_SIMPLETASK_LOCK_RENEW_INTERVAL = getattr(settings, 'DJANGO_SIMPLETASK_LOCK_RENEW_INTERVAL', 60)
 
+DJANGO_SIMPLETASK_SHUTDOWN_TIMEOUT = getattr(settings, 'DJANGO_SIMPLETASK_SHUTDOWN_TIMEOUT', 30)
 DJANGO_SIMPLETASK_DEFAULT_MAX_RETRIES = getattr(settings, 'DJANGO_SIMPLETASK_DEFAULT_MAX_RETRIES', 3)
 DJANGO_SIMPLETASK_DEFAULT_TIMEOUT_SECONDS = getattr(settings, 'DJANGO_SIMPLETASK_DEFAULT_TIMEOUT_SECONDS', 600)
 DJANGO_SIMPLETASK_DEFAULT_PICKUP_TIMEOUT_SECONDS = getattr(settings, 'DJANGO_SIMPLETASK_DEFAULT_PICKUP_TIMEOUT_SECONDS', 3600)
@@ -12,8 +27,8 @@ DJANGO_SIMPLETASK_ARCHIVE_RETENTION_DAYS = getattr(settings, 'DJANGO_SIMPLETASK_
 
 DJANGO_SIMPLETASK_CRONJOB_AUTO_SYNC = getattr(settings, 'DJANGO_SIMPLETASK_CRONJOB_AUTO_SYNC', True)
 
-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_DEFAULT_QUEUE = getattr(settings, 'DJANGO_SIMPLETASK_DEFAULT_QUEUE', f'{DJANGO_SIMPLETASK_KEY_PREFIX}:django-simpletask5:queue:default')
+DJANGO_SIMPLETASK_HIGH_PRIORITY_QUEUE = getattr(settings, 'DJANGO_SIMPLETASK_HIGH_PRIORITY_QUEUE', f'{DJANGO_SIMPLETASK_KEY_PREFIX}: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_simpletask5-0.2.3/django_simpletask5/core/lock.py

@@ -0,0 +1,22 @@
+import logging
+
+from django.conf import settings
+
+logger = logging.getLogger(__name__)
+
+
+def _default_lock_config():
+    return {
+        'global_lock_engine_class': 'globallock.django_redis_global_lock.DjangoRedisGlobalLock',
+        'global_lock_engine_options': {
+            'redis-cache-name': 'default',
+        },
+    }
+
+
+def get_lock_manager():
+    from globallock import GlobalLockManager
+    config = getattr(settings, 'DJANGO_SIMPLETASK_LOCK_CONFIG', None)
+    if config is None:
+        config = _default_lock_config()
+    return GlobalLockManager(config)

{django_simpletask5-0.2.1 → django_simpletask5-0.2.3}/django_simpletask5/core/message_queue.py

@@ -1,5 +1,6 @@
 import logging
 import socket
+import time
 
 from django.conf import settings
 from kombu import Connection, Exchange, Queue, Producer, Consumer
@@ -53,32 +54,29 @@ class KombuQueue:
                     retry=True,
                 )
 
-    def consume(self, queue_name, callback, auto_ack=True):
-        retry_delay = 1
-        while not self._stopped:
-            try:
-                with Connection(_get_broker_url()) as conn:
-                    conn.connect()
-                    queue = Queue(queue_name, self._exchange, routing_key=queue_name, durable=True)
+    def consume(self, queue_name, callback, auto_ack=True, poll_callback=None, poll_interval=60):
+        with Connection(_get_broker_url()) as conn:
+            conn.connect()
+            queue = Queue(queue_name, self._exchange, routing_key=queue_name, durable=True)
 
-                    with Consumer(
-                        conn,
-                        queues=[queue],
-                        callbacks=[lambda body, msg: self._on_message(body, msg, callback, auto_ack)],
-                        accept=['json'],
-                    ):
-                        retry_delay = 1
-                        while not self._stopped:
-                            try:
-                                conn.drain_events(timeout=0.5)
-                            except socket.timeout:
-                                continue
-            except Exception as e:
-                if not self._stopped:
-                    logger.debug('Consumer connection lost: %s, reconnecting in %ss...', e, retry_delay)
-                    import time as _time
-                    _time.sleep(retry_delay)
-                    retry_delay = min(retry_delay * 2, 10)
+            with Consumer(
+                conn,
+                queues=[queue],
+                callbacks=[lambda body, msg: self._on_message(body, msg, callback, auto_ack)],
+                accept=['json'],
+            ):
+                last_poll = time.time()
+                while not self._stopped:
+                    try:
+                        conn.drain_events(timeout=0.5)
+                    except socket.timeout:
+                        pass
+                    if poll_callback and time.time() - last_poll >= poll_interval:
+                        try:
+                            poll_callback()
+                        except Exception:
+                            logger.exception('Poll callback failed')
+                        last_poll = time.time()
 
     @staticmethod
     def _on_message(body, message, callback, auto_ack):

{django_simpletask5-0.2.1 → django_simpletask5-0.2.3}/django_simpletask5/core/publisher.py

@@ -33,6 +33,8 @@ def _resolve_pickup_timeout_seconds(executor_class_path: str) -> int:
 
 
 def create_and_publish(task, trigger_event, extra_context=None):
+    if getattr(task, '_skip_publish', False):
+        return None
     executor_class_path = task.get_executor_class_path(event=trigger_event)
     queue_name = task.get_queue_name(event=trigger_event)
 
@@ -63,6 +65,51 @@ def create_and_publish(task, trigger_event, extra_context=None):
     return execution
 
 
+def bulk_create_and_publish(tasks, trigger_event, extra_context=None):
+    executions = []
+    for task in tasks:
+        if getattr(task, '_skip_publish', False):
+            continue
+        executor_class_path = task.get_executor_class_path(event=trigger_event)
+        queue_name = task.get_queue_name(event=trigger_event)
+
+        context = {
+            'task_id': str(task.task_id),
+            'trigger_event': trigger_event,
+            'data': _model_to_dict(task),
+        }
+        if extra_context:
+            context.update(extra_context)
+
+        serialized_context = _serialize_context(context)
+
+        execution = TaskExecution(
+            task_id=task.task_id,
+            task_model=task._meta.label,
+            trigger_event=trigger_event,
+            executor_class=executor_class_path,
+            status='pending',
+            timeout_seconds=_resolve_timeout_seconds(executor_class_path),
+            pickup_timeout_seconds=_resolve_pickup_timeout_seconds(executor_class_path),
+            context=json.dumps(serialized_context, default=str) if serialized_context else None,
+        )
+        executions.append((execution, queue_name))
+
+    if not executions:
+        return []
+
+    TaskExecution.objects.bulk_create([e for e, _ in executions])
+
+    transaction.on_commit(lambda: _bulk_publish(executions))
+
+    return [e for e, _ in executions]
+
+
+def _bulk_publish(executions):
+    for execution, routing_key in executions:
+        _publish_message(execution, routing_key=routing_key)
+
+
 def _publish_message(execution, routing_key=None):
     message = {
         'execution_id': str(execution.execution_id),

{django_simpletask5-0.2.1 → django_simpletask5-0.2.3}/django_simpletask5/core/worker_registry.py

@@ -46,11 +46,13 @@ def _safe_redis_call(fn, default=None, log_level=logging.WARNING):
 
 
 def _worker_key(pid, tid):
-    return f'simpletask:worker:{pid}.{tid}'
+    from django_simpletask5.core.defaults import DJANGO_SIMPLETASK_KEY_PREFIX
+    return f'{DJANGO_SIMPLETASK_KEY_PREFIX}:django-simpletask5:worker:{pid}:{tid}'
 
 
 def _workers_pattern():
-    return 'simpletask:worker:*'
+    from django_simpletask5.core.defaults import DJANGO_SIMPLETASK_KEY_PREFIX
+    return f'{DJANGO_SIMPLETASK_KEY_PREFIX}:django-simpletask5:worker:*'
 
 
 def register_worker(queue_name, services=None, pid=None, tid=None):
@@ -133,4 +135,5 @@ def get_worker_stats():
         'by_queue': by_queue,
         'by_status': by_status,
         'workers': workers,
+        'redis_available': not _REDIS_UNAVAILABLE,
     }