job.task_kwargs is pre-json, treat it as such

Author: jakajancar

procrastinate/contrib/django/admin.py

@@ -9,7 +9,7 @@
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 
-from procrastinate.utils import format_arg
+from procrastinate.utils import ellipsize_middle
 
 from . import models
 
@@ -123,7 +123,7 @@ def pretty_args(self, instance: models.ProcrastinateJob) -> str:
             format_html(
                 "<tr><td>{key}</td><td>{value}</td></tr>",
                 key=key,
-                value=format_arg(value),
+                value=ellipsize_middle(value),
             )
             for key, value in instance.args.items()
         ]

procrastinate/jobs.py

@@ -10,7 +10,7 @@
 from typing_extensions import Literal
 
 from procrastinate import types
-from procrastinate.utils import format_arg
+from procrastinate.utils import ellipsize_middle
 
 if TYPE_CHECKING:
     from procrastinate import manager
@@ -137,7 +137,8 @@ def evolve(self, **kwargs: Any) -> Job:
     @cached_property
     def call_string(self):
         kwargs_string = ", ".join(
-            f"{key}={format_arg(value)}" for key, value in self.task_kwargs.items()
+            f"{key}={ellipsize_middle(repr(value))}"
+            for key, value in self.task_kwargs.items()
         )
         return f"{self.task_name}[{self.id}]({kwargs_string})"
 

procrastinate/utils.py

@@ -5,7 +5,6 @@
 import datetime
 import importlib
 import inspect
-import json
 import logging
 import pathlib
 import sys
@@ -28,7 +27,7 @@
 from asgiref import sync
 
 from procrastinate import exceptions
-from procrastinate.types import JSONValue, TimeDeltaParams
+from procrastinate.types import TimeDeltaParams
 
 T = TypeVar("T")
 U = TypeVar("U")
@@ -332,12 +331,15 @@ def queues_display(queues: Iterable[str] | None) -> str:
         return "all queues"
 
 
-def format_arg(value: JSONValue) -> str:
+def ellipsize_middle(
+    value: str, max_length: int = 100, suffix_length: int = 20, ellipsis: str = "..."
+) -> str:
     """
-    Format a JSON argument value for display in logs and the admin interface.
+    Limits the length of a string to `max_length` by placing `ellipsis` in the middle, preserving `suffix_length` at the end.
     """
+    prefix_length = max_length - len(ellipsis) - suffix_length
 
-    formatted = json.dumps(value)
-    if len(formatted) > 100:
-        formatted = formatted[:77] + "..." + formatted[-20:]
-    return formatted
+    if len(value) > max_length:
+        return value[:prefix_length] + ellipsis + value[-suffix_length:]
+    else:
+        return value