django-qstash 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

django_qstash/__init__.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-__version__ = "0.1.0"
+__version__ = "0.1.1"
 
 from django_qstash.app import shared_task
 from django_qstash.app import stashed_task

django_qstash/results/services.py

@@ -12,14 +12,31 @@ from django_qstash.db.models import TaskStatus
 logger = logging.getLogger(__name__)
 
 
-def function_result_to_json(result: Any) -> str:
-    """Convert a function result to a JSON string"""
-    try:
-        data = {"result": result}
-        return json.dumps(data)
-    except Exception as e:
-        logger.exception("Failed to convert function result to JSON: %s", str(e))
+def function_result_to_dict(result: Any) -> dict | None:
+    """
+    Convert a task result to a Python dict for the result JSONField.
+
+    Args:
+        result: Any Python value to be converted
+
+    Returns:
+        dict: A dictionary representation of the result
+        None: If the input is None
+    """
+    if result is None:
         return None
+    elif isinstance(result, dict):
+        return result
+    elif isinstance(result, str):
+        try:
+            parsed = json.loads(result)
+            if isinstance(parsed, dict):
+                return parsed
+            return {"result": parsed}
+        except json.JSONDecodeError as e:
+            logger.info("Task result is not a JSON string: %s", str(e))
+            return {"result": result}
+    return {"result": result}
 
 
 def store_task_result(
@@ -44,7 +61,7 @@ def store_task_result(
             task_name=task_name,
             status=status,
             date_done=timezone.now(),
-            result=function_result_to_json(result),
+            result=function_result_to_dict(result),
             traceback=traceback,
             args=args,
             kwargs=kwargs,

{django_qstash-0.1.0.dist-info → django_qstash-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: django-qstash
-Version: 0.1.0
+Version: 0.1.1
 Summary: A drop-in replacement for Celery's shared_task with Upstash QStash.
 Author-email: Justin Mitchel <justin@codingforentrepreneurs.com>
 Project-URL: Changelog, https://github.com/jmitchel3/django-qstash

{django_qstash-0.1.0.dist-info → django_qstash-0.1.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-django_qstash/__init__.py,sha256=CgcGg1NNYz4b34ZlFtkp9A57qyWPBIamm6m3PNRObmE,187
+django_qstash/__init__.py,sha256=I0hIqZOy7-YAHc5SHRlQxXlnOQf5rwI0GkiJBmyvSas,187
 django_qstash/callbacks.py,sha256=IQ-D8sPlSRuREZ1zwkRyd2GtxfmrJJh2x4jLd39rZCE,813
 django_qstash/client.py,sha256=9xO4iwR62PkEQhzC92yKRlzqEIF5Yi0HpYc88v_drsI,612
 django_qstash/cron.py,sha256=13OzTMGXFgjNEXjs2Et20WGZYtW9lKlu79BjbRySnVc,716
@@ -27,7 +27,7 @@ django_qstash/results/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 django_qstash/results/admin.py,sha256=Vr1O6E7vucSnkZ1PwHQ7RYkwOxiX4WHPAKaA7L8Cn-4,580
 django_qstash/results/apps.py,sha256=4me4cg5yeoeSJTphkHYzGMJUfGucT47FNIUMYu5gmIo,275
 django_qstash/results/models.py,sha256=AV7-nVEMq-Xt2QVY6D7NQc4_3E7v-6NA2xngTU8DfXA,1062
-django_qstash/results/services.py,sha256=vax0nsH9VO8nWTbS1Ki762-w-15ADeWSN6Sohpx7Dlg,1590
+django_qstash/results/services.py,sha256=150IP9A_93bm6wZQjRqAmMyBvyigSlUXTca14DpqAxQ,2069
 django_qstash/results/tasks.py,sha256=kd49OOZyOg6OG3RSyywtZPtpGaPlycY2OXl1BXaoxVM,2746
 django_qstash/results/migrations/0001_initial.py,sha256=A90SKgWmBf4SIJYG1Jh6-b_81Ia1zIzGj3Bfl1O4-kg,1902
 django_qstash/results/migrations/0002_taskresult_function_path_alter_taskresult_status_and_more.py,sha256=FevtPlzkKHjRD1tcnXskigY5jr2X3gYv7KE2TcdEAxU,1374
@@ -46,7 +46,7 @@ django_qstash/schedules/migrations/0001_initial.py,sha256=66cA8xnJV3h7QgzCaOiv-N
 django_qstash/schedules/migrations/0002_taskschedule_updated_at.py,sha256=6hZO0a9P2ZpOROkk7O5UXBhahghU0QfxZl4E-c3HKGw,459
 django_qstash/schedules/migrations/0003_alter_taskschedule_cron.py,sha256=oBW_FcvosKsa0l_l3eVDRIZli5K1wQaN_DJjamVe23s,826
 django_qstash/schedules/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-django_qstash-0.1.0.dist-info/METADATA,sha256=CJN-yK9a_FTT4HMR9BOlEJRuHZIUYQYEiVeKUnOmFJA,21263
-django_qstash-0.1.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-django_qstash-0.1.0.dist-info/top_level.txt,sha256=AlV3WSK1A0ZvKuCLsINtIJhJW8zo7SEB-D3_RAjZ0hI,14
-django_qstash-0.1.0.dist-info/RECORD,,
+django_qstash-0.1.1.dist-info/METADATA,sha256=2CrKOZTyZRapVWDBHFW9-mrxON_VOmzZQuEZDHaywz4,21263
+django_qstash-0.1.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+django_qstash-0.1.1.dist-info/top_level.txt,sha256=AlV3WSK1A0ZvKuCLsINtIJhJW8zo7SEB-D3_RAjZ0hI,14
+django_qstash-0.1.1.dist-info/RECORD,,