django-botmanager 0.1.14__tar.gz → 0.2.15__tar.gz

{django-botmanager-0.1.14 → django-botmanager-0.2.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: django-botmanager
-Version: 0.1.14
+Version: 0.2.15
 Summary: Async tasks for django
 Home-page: https://github.com/dimoha/django-botmanager
 Author: Dimoha

{django-botmanager-0.1.14 → django-botmanager-0.2.15}/botmanager/admin.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from django.contrib import admin
 from django.utils.html import escape
+from django.utils.translation import gettext_lazy as _
 from botmanager.models import Task
 
 
@@ -28,12 +29,12 @@ class TaskAdmin(admin.ModelAdmin):
         else:
             return None
 
-    error_field.short_description = u"Ошибка"
+    error_field.short_description = _("Ошибка")
     error_field.allow_tags = True
 
     def input_field(self, obj):
         return obj.input
 
-    input_field.short_description = "Вводные данные"
+    input_field.short_description = _("Вводные данные")
 
 admin.site.register(Task, TaskAdmin)

django-botmanager-0.2.15/botmanager/migrations/0011_alter_task_create_dt_alter_task_id.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.1.2 on 2023-06-28 11:19
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('botmanager', '0010_auto_20170531_1321'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='task',
+            name='create_dt',
+            field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='Дата создания задачи'),
+        ),
+        migrations.AlterField(
+            model_name='task',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+    ]

django-botmanager-0.2.15/botmanager/models.py

@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+from django.db import models
+from jsonfield import JSONField
+from datetime import timedelta, datetime
+from django.utils import timezone
+from django.utils.translation import gettext_lazy as _
+
+class Task(models.Model):
+
+    STATUS_NEW = 'NEW'
+    STATUS_IN_PROCESS = 'IN_PROCESS'
+    STATUS_OK = 'OK'
+
+    STATUSES = (
+        (STATUS_NEW, u'В ожидании'),
+        (STATUS_IN_PROCESS, u'Идет загрузка'),
+        (STATUS_OK, u'Данные загружены'),
+    )
+
+    name = models.CharField(max_length=256, verbose_name=_(u'Название'))
+    create_dt = models.DateTimeField(verbose_name=_(u"Дата создания задачи"), default=timezone.now)
+    finish_dt = models.DateTimeField(verbose_name=_(u"Дата завершения"), null=True, blank=True)
+    is_complete = models.BooleanField(verbose_name=_(u"Выполнена"), default=False)
+    is_failed = models.BooleanField(verbose_name=_(u"Аварийное завершение"), default=False)
+    is_persistent = models.BooleanField(verbose_name=_(u"Выполнять пока не завершится успешно"), default=True)
+    in_process = models.BooleanField(verbose_name=_(u"В процессе"), default=False)
+
+    input = JSONField(null=True, blank=True)
+    output = JSONField(null=True, blank=True)
+    last_error = JSONField(null=True, blank=True)
+    extra_params = JSONField(null=True, blank=True)
+
+    last_error_dt = models.DateTimeField(verbose_name=_(u"Дата последнего fail-а"), null=True, blank=True)
+    queue_key = models.CharField(max_length=32, verbose_name=_(u'Ключ группировки задач'))
+    failed_action = models.CharField(max_length=256, verbose_name=_(u'Action, на котором произошла ошибка'), null=True, blank=True)
+    attempt_count = models.SmallIntegerField(verbose_name=_(u'Счетчик попыток'), default=0)
+    last_attempt_dt = models.DateTimeField(verbose_name=_(u"Последняя попытка выполнения"), null=True, blank=True)
+    max_attempt_count = models.IntegerField(
+        verbose_name=_(u"Максимальное кол-во попыток выполнение (если None, то бесконечно)"), null=True, blank=True
+    )
+    attempt_period = models.DurationField(verbose_name=_(u'Период между попытками'), default=timedelta(hours=1))
+    parent = models.ForeignKey('self', verbose_name=_(u'Родительская задача'), null=True, blank=True, related_name='child_tasks', on_delete=models.CASCADE)
+    priority = models.SmallIntegerField(default=0)
+
+    def __unicode__(self):
+        return "Task {0} #{1}".format(self.name, self.id)
+
+    @property
+    def can_execute(self):
+        if not self.is_complete and not self.in_process:
+            if self.is_failed:
+                if self.last_attempt_dt + self.attempt_period > timezone.now():
+                    return False
+                else:
+                    if self.max_attempt_count is None:
+                        return True
+                    else:
+                        if self.attempt_count < self.max_attempt_count:
+                            return True
+                        else:
+                            return False  # надо пофиксить is_complete ?
+            else:
+                return True
+        else:
+            return False
+
+    class Meta:
+        db_table = 'botmanager_task'
+        verbose_name = _(u"Задача для BotManager")
+        verbose_name_plural = _(u"Задачи для BotManager")

{django-botmanager-0.1.14 → django-botmanager-0.2.15}/botmanager/settings.py

@@ -16,24 +16,64 @@ if 'tasks' not in MAIN_CONFIG:
 if 'task_logs_separated' not in MAIN_CONFIG['logs']:
     MAIN_CONFIG['logs']['task_logs_separated'] = False
 if MAIN_CONFIG['logs']['task_logs_separated'] and 'logs_life_hours' not in MAIN_CONFIG['logs']:
-    MAIN_CONFIG['logs']['logs_life_hours'] = 7*24
+    MAIN_CONFIG['logs']['logs_life_hours'] = 7 * 24
 if 'success_tasks_life_hours' not in MAIN_CONFIG['logs']:
-    MAIN_CONFIG['logs']['success_tasks_life_hours'] = 7*24
+    MAIN_CONFIG['logs']['success_tasks_life_hours'] = 7 * 24
 
 DEFAULT_LOG_LEVEL = 'INFO'
 
 if 'dir' in MAIN_CONFIG['logs'] and MAIN_CONFIG['logs']['dir'] is not None:
 
     log_conf = MAIN_CONFIG['logs']
-    max_bytes = log_conf['maxBytes'] if 'maxBytes' in log_conf and log_conf['maxBytes'] else 1024*1024*100
+    max_bytes = log_conf['maxBytes'] if 'maxBytes' in log_conf and log_conf['maxBytes'] else 1024 * 1024 * 100
     backupCount = log_conf['backupCount'] if 'backupCount' in log_conf and log_conf['backupCount'] else 10
     level = log_conf['level'] if 'level' in log_conf and log_conf['level'] else DEFAULT_LOG_LEVEL
     sentry_enabled = log_conf.get('sentry_enabled', False)
 
     handlers = ['console', 'common_errors', 'common']
 
+    handlers_config = {
+        'mail_admins': {
+            'level': 'ERROR',
+            'class': 'django.utils.log.AdminEmailHandler',
+        },
+        'console': {
+            'level': level,
+            'class': 'logging.StreamHandler',
+            'formatter': 'default',
+            'stream': sys.stdout
+        },
+        'common_errors': {
+            'level': 'ERROR',
+            'class': 'logging.handlers.RotatingFileHandler',
+            'filename': os.path.join(log_conf['dir'], 'botmanager_errors.log'),
+            'maxBytes': max_bytes,
+            'formatter': 'default',
+            'encoding': 'utf-8',
+            'backupCount': backupCount,
+        },
+        'common': {
+            'level': level,
+            'class': 'logging.handlers.RotatingFileHandler',
+            'filename': os.path.join(log_conf['dir'], 'botmanager.log'),
+            'maxBytes': max_bytes,
+            'formatter': 'default',
+            'encoding': 'utf-8',
+            'backupCount': backupCount,
+        }
+    }
+
     if sentry_enabled:
-        handlers.append('sentry')
+        try:
+            import raven
+
+            handlers.append('sentry')
+            handlers_config['sentry'] = {
+                'level': 'ERROR',
+                'class': 'raven.contrib.django.raven_compat.handlers.SentryHandler',
+            }
+        except ImportError:
+            raise ImportError('module "raven" not installed')
 
     if 'mail_admins' in log_conf and log_conf['mail_admins']:
         handlers.append('mail_admins')
@@ -46,40 +86,7 @@ if 'dir' in MAIN_CONFIG['logs'] and MAIN_CONFIG['logs']['dir'] is not None:
                 'format': '%(asctime)s - %(processName)s - %(levelname)s - %(message)s'
             }
         },
-        'handlers': {
-            'sentry': {
-                'level': 'ERROR',
-                'class': 'raven.contrib.django.raven_compat.handlers.SentryHandler',
-            },
-            'mail_admins': {
-                'level': 'ERROR',
-                'class': 'django.utils.log.AdminEmailHandler',
-            },
-            'console': {
-                'level': level,
-                'class': 'logging.StreamHandler',
-                'formatter': 'default',
-                'stream': sys.stdout
-            },
-            'common_errors': {
-                'level': 'ERROR',
-                'class': 'logging.handlers.RotatingFileHandler',
-                'filename': os.path.join(log_conf['dir'], 'botmanager_errors.log'),
-                'maxBytes': max_bytes,
-                'formatter': 'default',
-                'encoding': 'utf-8',
-                'backupCount': backupCount,
-            },
-            'common': {
-                'level': level,
-                'class': 'logging.handlers.RotatingFileHandler',
-                'filename': os.path.join(log_conf['dir'], 'botmanager.log'),
-                'maxBytes': max_bytes,
-                'formatter': 'default',
-                'encoding': 'utf-8',
-                'backupCount': backupCount,
-            }
-        },
+        'handlers': handlers_config,
         'loggers': {
             'default': {
                 'handlers': handlers,
@@ -88,5 +95,6 @@ if 'dir' in MAIN_CONFIG['logs'] and MAIN_CONFIG['logs']['dir'] is not None:
             },
         }
     }
+
 else:
     TASKS_LOGGING = None

{django-botmanager-0.1.14 → django-botmanager-0.2.15}/django_botmanager.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: django-botmanager
-Version: 0.1.14
+Version: 0.2.15
 Summary: Async tasks for django
 Home-page: https://github.com/dimoha/django-botmanager
 Author: Dimoha

{django-botmanager-0.1.14 → django-botmanager-0.2.15}/django_botmanager.egg-info/SOURCES.txt

@@ -20,9 +20,11 @@ botmanager/migrations/0007_task_is_persistent.py
 botmanager/migrations/0008_auto_20170331_1752.py
 botmanager/migrations/0009_task_extra_params.py
 botmanager/migrations/0010_auto_20170531_1321.py
+botmanager/migrations/0011_alter_task_create_dt_alter_task_id.py
 botmanager/migrations/__init__.py
 django_botmanager.egg-info/PKG-INFO
 django_botmanager.egg-info/SOURCES.txt
 django_botmanager.egg-info/dependency_links.txt
+django_botmanager.egg-info/pbr.json
 django_botmanager.egg-info/requires.txt
 django_botmanager.egg-info/top_level.txt

django-botmanager-0.2.15/django_botmanager.egg-info/pbr.json

@@ -0,0 +1 @@
+{"is_release": false, "git_version": "52264f9"}

{django-botmanager-0.1.14 → django-botmanager-0.2.15}/django_botmanager.egg-info/requires.txt

@@ -1,3 +1,3 @@
 setproctitle==1.1.10
-jsonfield==1.0.3
+jsonfield==3.1.0
 psutil==5.8.0

{django-botmanager-0.1.14 → django-botmanager-0.2.15}/setup.py

@@ -3,14 +3,14 @@ from setuptools import setup, find_packages
 
 setup(
     name='django-botmanager',
-    version='0.1.14',
+    version='0.2.15',
     description='Async tasks for django',
     author='Dimoha',
     author_email='dimoha@controlstyle.ru',
     url='https://github.com/dimoha/django-botmanager',
     install_requires=[
         "setproctitle==1.1.10",
-        "jsonfield==1.0.3",
+        "jsonfield==3.1.0",
         "psutil==5.8.0"
     ],
     packages=find_packages(),

django-botmanager-0.1.14/botmanager/models.py

@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-from django.db import models
-from jsonfield import JSONField
-from datetime import timedelta, datetime
-from django.utils import timezone
-
-
-class Task(models.Model):
-
-    STATUS_NEW = 'NEW'
-    STATUS_IN_PROCESS = 'IN_PROCESS'
-    STATUS_OK = 'OK'
-
-    STATUSES = (
-        (STATUS_NEW, u'В ожидании'),
-        (STATUS_IN_PROCESS, u'Идет загрузка'),
-        (STATUS_OK, u'Данные загружены'),
-    )
-
-    name = models.CharField(max_length=256, verbose_name=u'Название')
-    create_dt = models.DateTimeField(verbose_name=u"Дата создания задачи", auto_now_add=True)
-    finish_dt = models.DateTimeField(verbose_name=u"Дата завершения", null=True, blank=True)
-    is_complete = models.BooleanField(verbose_name=u"Выполнена", default=False)
-    is_failed = models.BooleanField(verbose_name=u"Аварийное завершение", default=False)
-    is_persistent = models.BooleanField(verbose_name=u"Выполнять пока не завершится успешно", default=True)
-    in_process = models.BooleanField(verbose_name=u"В процессе", default=False)
-
-    input = JSONField(null=True, blank=True)
-    output = JSONField(null=True, blank=True)
-    last_error = JSONField(null=True, blank=True)
-    extra_params = JSONField(null=True, blank=True)
-
-    last_error_dt = models.DateTimeField(verbose_name=u"Дата последнего fail-а", null=True, blank=True)
-    queue_key = models.CharField(max_length=32, verbose_name=u'Ключ группировки задач')
-    failed_action = models.CharField(max_length=256, verbose_name=u'Action, на котором произошла ошибка', null=True, blank=True)
-    attempt_count = models.SmallIntegerField(verbose_name=u'Счетчик попыток', default=0)
-    last_attempt_dt = models.DateTimeField(verbose_name=u"Последняя попытка выполнения", null=True, blank=True)
-    max_attempt_count = models.IntegerField(
-        verbose_name=u"Максимальное кол-во попыток выполнение (если None, то бесконечно)", null=True, blank=True
-    )
-    attempt_period = models.DurationField(verbose_name=u'Период между попытками', default=timedelta(hours=1))
-    parent = models.ForeignKey('self', verbose_name=u'Родительская задача', null=True, blank=True, related_name='child_tasks', on_delete=models.CASCADE)
-    priority = models.SmallIntegerField(default=0)
-
-    def __unicode__(self):
-        return "Task {0} #{1}".format(self.name, self.id)
-
-    @property
-    def can_execute(self):
-        if not self.is_complete and not self.in_process:
-            if self.is_failed:
-                if self.last_attempt_dt + self.attempt_period > timezone.now():
-                    return False
-                else:
-                    if self.max_attempt_count is None:
-                        return True
-                    else:
-                        if self.attempt_count < self.max_attempt_count:
-                            return True
-                        else:
-                            return False  # надо пофиксить is_complete ?
-            else:
-                return True
-        else:
-            return False
-
-    class Meta:
-        db_table = 'botmanager_task'
-        verbose_name = u"Задача для BotManager"
-        verbose_name_plural = u"Задачи для BotManager"