Merge pull request #107 from boxine/update-req

Cleanup requirements and update them

Author: flbraun

huey_monitor/tqdm.py

@@ -2,6 +2,7 @@
 
 from django.core.exceptions import ValidationError
 from django.utils import timezone
+from django.utils.text import Truncator
 from huey.api import Task
 
 from huey_monitor.constants import TASK_MODEL_DESC_MAX_LENGTH
@@ -50,10 +51,12 @@ def __init__(self,
         if len(self.desc) > TASK_MODEL_DESC_MAX_LENGTH:
             # We call .update() that will not validate the data, so a overlong
             # description will raise a database error and maybe a user doesn't know
-            # what's happen ;)
-            raise ValidationError(
-                'Process info description overlong: %(desc)r',
-                params={'desc': self.desc},
+            # what's happen -> Just crop it.
+            self.desc = Truncator(self.desc).chars(TASK_MODEL_DESC_MAX_LENGTH)
+            logger.warning(
+                'Process info description %r has been cropped maximum allowed %i characters',
+                self.desc,
+                TASK_MODEL_DESC_MAX_LENGTH,
             )
 
         TaskModel.objects.filter(task_id=task.id).update(

huey_monitor_tests/tests/test_tqdm.py

@@ -1,4 +1,5 @@
 import datetime
+import logging
 import time
 from pathlib import Path
 from unittest import mock
@@ -162,8 +163,7 @@ def test_process_description_overlong(self):
 
         # Test with current max length:
         max_length = TaskModel._meta.get_field('desc').max_length
-        assert max_length == TASK_MODEL_DESC_MAX_LENGTH
-        assert max_length == 128
+        assert max_length == TASK_MODEL_DESC_MAX_LENGTH == 128
 
         max_length_txt = 'X' * max_length
         overlong_txt = 'Y' * (max_length + 1)
@@ -183,7 +183,12 @@ def test_process_description_overlong(self):
             )
         ]
 
-        # Overlong description should be cut:
-        msg = f'["Process info description overlong: \'{overlong_txt}\'"]'
-        with self.assertRaisesMessage(ValidationError, msg):
+        # Overlong description will be cut:
+        with self.assertLogs('huey_monitor.tqdm', level=logging.WARNING) as logs:
             ProcessInfo(task, desc=overlong_txt, total=999)
+            instance = TaskModel.objects.get()
+            assert len(instance.desc) == TASK_MODEL_DESC_MAX_LENGTH == 128
+
+        assert len(logs.output) == 1
+        log_line = logs.output[0]
+        assert "YYYYY…' has been cropped maximum allowed 128 characters" in log_line