mirror of
https://github.com/django-q2/django-q2.git
synced 2026-10-02 18:48:11 +08:00
feat: add ru locale and improve translations (#320)
* Add ru locale * fix * fix: remove duplicate * Add field labels and continue ru locale * fix: Add ru gettext for queue columns, short result column, and OrmQ field labels * fix: locale paths in translation files * chore: format code with ruff * chore: format code with ruff * fix: correct time_taken usage in admin Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update django_q/locale/de/LC_MESSAGES/django.po Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update django_q/locale/tr/LC_MESSAGES/django.po Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * fix: clear fuzzy markers --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
Islam Asabaev
+149
-30
@@ -5,7 +5,6 @@ from keyword import iskeyword
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.db import models
|
||||
from django.db.models import Q
|
||||
from django.template.defaultfilters import truncatechars
|
||||
from django.urls import reverse
|
||||
from django.utils import timezone
|
||||
from django.utils.functional import cached_property
|
||||
@@ -24,19 +23,86 @@ from .utils import get_func_repr
|
||||
|
||||
|
||||
class Task(models.Model):
|
||||
id = models.CharField(max_length=32, primary_key=True, editable=False)
|
||||
name = models.CharField(max_length=100, editable=False)
|
||||
func = models.CharField(max_length=256)
|
||||
hook = models.CharField(max_length=256, null=True)
|
||||
args = PickledObjectField(null=True, protocol=-1)
|
||||
kwargs = PickledObjectField(null=True, protocol=-1)
|
||||
result = PickledObjectField(null=True, protocol=-1)
|
||||
group = models.CharField(max_length=100, editable=False, null=True)
|
||||
cluster = models.CharField(max_length=100, default=None, null=True, blank=True)
|
||||
started = models.DateTimeField(editable=False)
|
||||
stopped = models.DateTimeField(editable=False)
|
||||
success = models.BooleanField(default=True, editable=False)
|
||||
attempt_count = models.IntegerField(default=0)
|
||||
id = models.CharField(
|
||||
max_length=32,
|
||||
primary_key=True,
|
||||
editable=False,
|
||||
verbose_name=_("Task id"),
|
||||
help_text=_("32-character task identifier."),
|
||||
)
|
||||
name = models.CharField(
|
||||
max_length=100,
|
||||
editable=False,
|
||||
verbose_name=_("Name"),
|
||||
help_text=_("Optional human-readable name for lookup and display."),
|
||||
)
|
||||
func = models.CharField(
|
||||
max_length=256,
|
||||
verbose_name=_("Function"),
|
||||
help_text=_("Dotted import path to the callable, e.g. myapp.tasks.job."),
|
||||
)
|
||||
hook = models.CharField(
|
||||
max_length=256,
|
||||
null=True,
|
||||
verbose_name=_("Hook"),
|
||||
help_text=_(
|
||||
"Optional dotted path to a callback that receives the task result."
|
||||
),
|
||||
)
|
||||
args = PickledObjectField(
|
||||
null=True,
|
||||
protocol=-1,
|
||||
verbose_name=_("Arguments"),
|
||||
help_text=_("Pickled positional arguments (tuple)."),
|
||||
)
|
||||
kwargs = PickledObjectField(
|
||||
null=True,
|
||||
protocol=-1,
|
||||
verbose_name=_("Keyword arguments"),
|
||||
help_text=_("Pickled keyword arguments (dict)."),
|
||||
)
|
||||
result = PickledObjectField(
|
||||
null=True,
|
||||
protocol=-1,
|
||||
verbose_name=_("Result"),
|
||||
help_text=_("Pickled return value or error payload."),
|
||||
)
|
||||
group = models.CharField(
|
||||
max_length=100,
|
||||
editable=False,
|
||||
null=True,
|
||||
verbose_name=_("Group"),
|
||||
help_text=_("Optional group id to aggregate related tasks."),
|
||||
)
|
||||
cluster = models.CharField(
|
||||
max_length=100,
|
||||
default=None,
|
||||
null=True,
|
||||
blank=True,
|
||||
verbose_name=_("Cluster"),
|
||||
help_text=_("Name of the cluster that executed this task."),
|
||||
)
|
||||
started = models.DateTimeField(
|
||||
editable=False,
|
||||
verbose_name=_("Started at"),
|
||||
help_text=_("When the worker started executing the task."),
|
||||
)
|
||||
stopped = models.DateTimeField(
|
||||
editable=False,
|
||||
verbose_name=_("Stopped at"),
|
||||
help_text=_("When the worker finished (success or failure)."),
|
||||
)
|
||||
success = models.BooleanField(
|
||||
default=True,
|
||||
editable=False,
|
||||
verbose_name=_("Success"),
|
||||
help_text=_("False if the task raised an exception or timed out."),
|
||||
)
|
||||
attempt_count = models.IntegerField(
|
||||
default=0,
|
||||
verbose_name=_("Attempt count"),
|
||||
help_text=_("How many times execution was attempted."),
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def get_result(task_id):
|
||||
@@ -100,15 +166,13 @@ class Task(models.Model):
|
||||
def time_taken(self):
|
||||
return (self.stopped - self.started).total_seconds()
|
||||
|
||||
@property
|
||||
def short_result(self):
|
||||
return truncatechars(self.result, 100)
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.name or self.id}"
|
||||
|
||||
class Meta:
|
||||
app_label = "django_q"
|
||||
verbose_name = _("Task")
|
||||
verbose_name_plural = _("Tasks")
|
||||
ordering = ["-stopped"]
|
||||
indexes = [
|
||||
models.Index(
|
||||
@@ -166,17 +230,36 @@ def validate_kwarg(value):
|
||||
|
||||
|
||||
class Schedule(models.Model):
|
||||
name = models.CharField(max_length=100, null=True, blank=True)
|
||||
func = models.CharField(max_length=256, help_text="e.g. module.tasks.function")
|
||||
name = models.CharField(
|
||||
max_length=100,
|
||||
null=True,
|
||||
blank=True,
|
||||
verbose_name=_("Name"),
|
||||
help_text=_("Optional label to identify this schedule in the admin."),
|
||||
)
|
||||
func = models.CharField(
|
||||
max_length=256,
|
||||
verbose_name=_("Function"),
|
||||
help_text=_("e.g. module.tasks.function"),
|
||||
)
|
||||
hook = models.CharField(
|
||||
max_length=256,
|
||||
null=True,
|
||||
blank=True,
|
||||
help_text="e.g. module.tasks.result_function",
|
||||
verbose_name=_("Hook"),
|
||||
help_text=_("e.g. module.tasks.result_function"),
|
||||
)
|
||||
args = models.TextField(
|
||||
null=True,
|
||||
blank=True,
|
||||
verbose_name=_("Arguments"),
|
||||
help_text=_("e.g. 1, 2, 'John'"),
|
||||
)
|
||||
args = models.TextField(null=True, blank=True, help_text=_("e.g. 1, 2, 'John'"))
|
||||
kwargs = models.TextField(
|
||||
null=True, blank=True, help_text=_("e.g. x=1, y=2, name='John'")
|
||||
null=True,
|
||||
blank=True,
|
||||
verbose_name=_("Keyword arguments"),
|
||||
help_text=_("e.g. x=1, y=2, name='John'"),
|
||||
)
|
||||
ONCE = "O"
|
||||
MINUTES = "I"
|
||||
@@ -203,30 +286,48 @@ class Schedule(models.Model):
|
||||
(CRON, _("Cron")),
|
||||
)
|
||||
schedule_type = models.CharField(
|
||||
max_length=2, choices=TYPE, default=TYPE[0][0], verbose_name=_("Schedule Type")
|
||||
max_length=2,
|
||||
choices=TYPE,
|
||||
default=TYPE[0][0],
|
||||
verbose_name=_("Schedule Type"),
|
||||
help_text=_("How often this task should be enqueued."),
|
||||
)
|
||||
minutes = models.PositiveSmallIntegerField(
|
||||
null=True, blank=True, help_text=_("Number of minutes for the Minutes type")
|
||||
null=True,
|
||||
blank=True,
|
||||
verbose_name=_("Minutes"),
|
||||
help_text=_("Number of minutes for the Minutes type"),
|
||||
)
|
||||
repeats = models.IntegerField(
|
||||
default=-1, verbose_name=_("Repeats"), help_text=_("n = n times, -1 = forever")
|
||||
)
|
||||
next_run = models.DateTimeField(
|
||||
verbose_name=_("Next Run"), default=timezone.now, null=True
|
||||
verbose_name=_("Next Run"),
|
||||
help_text=_("When this schedule runs next (stored in UTC)."),
|
||||
default=timezone.now,
|
||||
null=True,
|
||||
)
|
||||
cron = models.CharField(
|
||||
max_length=100,
|
||||
null=True,
|
||||
blank=True,
|
||||
validators=[validate_cron],
|
||||
verbose_name=_("Cron"),
|
||||
help_text=_("Cron expression"),
|
||||
)
|
||||
task = models.CharField(max_length=100, null=True, editable=False)
|
||||
task = models.CharField(
|
||||
max_length=100,
|
||||
null=True,
|
||||
editable=False,
|
||||
verbose_name=_("Last task id"),
|
||||
help_text=_("Id of the last task spawned from this schedule (read-only)."),
|
||||
)
|
||||
cluster = models.CharField(
|
||||
max_length=100,
|
||||
default=None,
|
||||
null=True,
|
||||
blank=True,
|
||||
verbose_name=_("Cluster"),
|
||||
help_text=_("Name of the target cluster"),
|
||||
)
|
||||
intended_date_kwarg = models.CharField(
|
||||
@@ -234,6 +335,7 @@ class Schedule(models.Model):
|
||||
null=True,
|
||||
blank=True,
|
||||
validators=[validate_kwarg],
|
||||
verbose_name=_("Intended date kwarg"),
|
||||
help_text=_("Name of kwarg to pass intended schedule date"),
|
||||
)
|
||||
|
||||
@@ -321,10 +423,19 @@ class Schedule(models.Model):
|
||||
|
||||
|
||||
class OrmQ(models.Model):
|
||||
key = models.CharField(max_length=100, help_text=_("Name of the target cluster"))
|
||||
payload = models.TextField()
|
||||
key = models.CharField(
|
||||
max_length=100,
|
||||
verbose_name=_("Cluster key"),
|
||||
help_text=_("Name of the target cluster"),
|
||||
)
|
||||
payload = models.TextField(
|
||||
verbose_name=_("Payload"),
|
||||
help_text=_("Signed serialized task package (do not edit manually)."),
|
||||
)
|
||||
lock = models.DateTimeField(
|
||||
null=True, help_text=_("Prevent any cluster from pulling until")
|
||||
null=True,
|
||||
verbose_name=_("Lock until"),
|
||||
help_text=_("Prevent any cluster from pulling until"),
|
||||
)
|
||||
|
||||
@cached_property
|
||||
@@ -356,6 +467,14 @@ class OrmQ(models.Model):
|
||||
exclude = {"id", "name", "group", "func", "args", "kwargs"}
|
||||
return {k: v for k, v in self.task.items() if k not in exclude}
|
||||
|
||||
func.short_description = _("Function")
|
||||
task_id.short_description = _("Task id")
|
||||
name.short_description = _("Name")
|
||||
group.short_description = _("Group")
|
||||
args.short_description = _("Arguments")
|
||||
kwargs.short_description = _("Keyword arguments")
|
||||
q_options.short_description = _("Queue options")
|
||||
|
||||
class Meta:
|
||||
app_label = "django_q"
|
||||
verbose_name = _("Queued task")
|
||||
|
||||
Reference in New Issue
Block a user