django-qstash 0.1.0__tar.gz → 0.1.1__tar.gz

{django_qstash-0.1.0 → django_qstash-0.1.1}/PKG-INFO

@@ -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 → django_qstash-0.1.1}/pyproject.toml

@@ -6,7 +6,7 @@ requires = [
 
 [project]
 name = "django-qstash"
-version = "0.1.0"
+version = "0.1.1"
 description = "A drop-in replacement for Celery's shared_task with Upstash QStash."
 readme = "README.md"
 license = { file = "LICENSE" }

{django_qstash-0.1.0 → django_qstash-0.1.1}/src/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-0.1.0 → django_qstash-0.1.1}/src/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 → django_qstash-0.1.1}/src/django_qstash.egg-info/PKG-INFO

@@ -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