django-qstash 0.0.6__py3-none-any.whl → 0.0.8__py3-none-any.whl

django_qstash/__init__.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-__version__ = "0.0.6"
+__version__ = "0.0.8"
 
-from .tasks import shared_task
+from django_qstash.app import shared_task
 
 __all__ = ["shared_task"]

django_qstash/app/__init__.py

@@ -0,0 +1,7 @@
+from __future__ import annotations
+
+from .base import AsyncResult
+from .base import QStashTask
+from .decorators import shared_task
+
+__all__ = ["AsyncResult", "QStashTask", "shared_task"]

django_qstash/{tasks.py → app/base.py}

@@ -118,26 +118,3 @@ class AsyncResult:
     @property
     def id(self) -> str:
         return self.task_id
-
-
-def shared_task(
-    func: Callable | None = None,
-    name: str | None = None,
-    deduplicated: bool = False,
-    **options: dict[str, Any],
-) -> QStashTask:
-    """
-    Decorator that mimics Celery's shared_task
-
-    Can be used as:
-        @shared_task
-        def my_task():
-            pass
-
-        @shared_task(name="custom_name", deduplicated=True)
-        def my_task():
-            pass
-    """
-    if func is not None:
-        return QStashTask(func, name=name, deduplicated=deduplicated, **options)
-    return lambda f: QStashTask(f, name=name, deduplicated=deduplicated, **options)

django_qstash/app/decorators.py

@@ -0,0 +1,29 @@
+from __future__ import annotations
+
+from typing import Any
+from typing import Callable
+
+from django_qstash.app.base import QStashTask
+
+
+def shared_task(
+    func: Callable | None = None,
+    name: str | None = None,
+    deduplicated: bool = False,
+    **options: dict[str, Any],
+) -> QStashTask:
+    """
+    Decorator that mimics Celery's shared_task
+
+    Can be used as:
+        @shared_task
+        def my_task():
+            pass
+
+        @shared_task(name="custom_name", deduplicated=True)
+        def my_task():
+            pass
+    """
+    if func is not None:
+        return QStashTask(func, name=name, deduplicated=deduplicated, **options)
+    return lambda f: QStashTask(f, name=name, deduplicated=deduplicated, **options)

django_qstash/discovery/utils.py

@@ -32,7 +32,7 @@ def discover_tasks() -> list[tuple[str, str]]:
             ('other_app.tasks.custom_task', 'special_name')
         ]
     """
-    from django_qstash.tasks import QStashTask
+    from django_qstash.app import QStashTask
 
     discovered_tasks = []
     packages = []
@@ -71,7 +71,7 @@ def discover_tasks() -> list[tuple[str, str]]:
                     if attr.name == attr_name:
                         label = value
                     else:
-                        label = f"{attr.name} ({value})"
+                        label = f"{attr.name} ({package}.tasks)"
                     discovered_tasks.append((value, label))
         except Exception as e:
             warnings.warn(

django_qstash/management/commands/clear_stale_results.py

@@ -1,11 +1,9 @@
 from __future__ import annotations
 
-from datetime import timedelta
-
-from django.apps import apps
 from django.conf import settings
 from django.core.management.base import BaseCommand
-from django.utils import timezone
+
+from django_qstash.results.tasks import clear_stale_results_task
 
 DJANGO_QSTASH_RESULT_TTL = getattr(settings, "DJANGO_QSTASH_RESULT_TTL", 604800)
 
@@ -25,37 +23,20 @@ class Command(BaseCommand):
             type=int,
             help="The number of seconds ago to clear results for",
         )
+        parser.add_argument(
+            "--delay", action="store_true", help="Offload request using django_qstash"
+        )
 
     def handle(self, *args, **options):
+        delay = options["delay"]
         no_input = options["no_input"]
         since = options.get("since") or DJANGO_QSTASH_RESULT_TTL
-        cutoff_date = timezone.now() - timedelta(seconds=since)
-        try:
-            TaskResult = apps.get_model("django_qstash_results", "TaskResult")
-        except LookupError:
-            self.stdout.write(
-                self.style.ERROR(
-                    "Django QStash Results not installed.\nAdd `django_qstash.results` to INSTALLED_APPS and run migrations."
-                )
+        user_confirm = not no_input
+        if not delay:
+            clear_stale_results_task(
+                since=since, user_confirm=user_confirm, stdout=self.stdout
+            )
+        else:
+            clear_stale_results_task.delay(
+                since=since, user_confirm=user_confirm, stdout=self.stdout
             )
-            return
-        to_delete = TaskResult.objects.filter(date_done__lt=cutoff_date)
-
-        if not to_delete.exists():
-            self.stdout.write("No stale Django QStash task results found")
-            return
-
-        # use input to confirm  deletion
-        self.stdout.write(
-            f"Deleting {to_delete.count()} task results older than {cutoff_date} ({DJANGO_QSTASH_RESULT_TTL} seconds)"
-        )
-        if not no_input:
-            if input("Are you sure? (y/n): ") != "y":
-                self.stdout.write("Skipping deletion")
-                return
-
-        deleted_count, _ = to_delete.delete()
-
-        self.stdout.write(
-            self.style.SUCCESS(f"Successfully deleted {deleted_count} stale results.")
-        )

django_qstash/management/commands/task_schedules.py

@@ -7,7 +7,8 @@ from django.apps import apps
 from django.core.management.base import BaseCommand
 from django.db import models
 
-from django_qstash.schedules.client import QStashScheduleClient
+from django_qstash.callbacks import get_callback_url
+from django_qstash.client import qstash_client
 
 logger = logging.getLogger(__name__)
 
@@ -28,6 +29,11 @@ class Command(BaseCommand):
             action="store_true",
             help="Sync schedules from QStash to local database",
         )
+        parser.add_argument(
+            "--no-input",
+            action="store_true",
+            help="Do not ask for confirmation",
+        )
 
     def get_task_schedule_model(self) -> models.Model | None:
         """Get the TaskSchedule model if available."""
@@ -40,13 +46,10 @@ class Command(BaseCommand):
                     "Add `django_qstash.schedules` to INSTALLED_APPS and run migrations."
                 )
             )
-            return None
 
     def sync_schedules(self, schedules: list) -> None:
         """Sync remote schedules to local database."""
         TaskSchedule = self.get_task_schedule_model()
-        if not TaskSchedule:
-            return
 
         for schedule in schedules:
             try:
@@ -72,6 +75,7 @@ class Command(BaseCommand):
                 logger.exception("Failed to sync schedule %s", schedule.schedule_id)
 
     def handle(self, *args, **options) -> None:
+        auto_confirm = options.get("no_input")
         if not (options.get("sync") or options.get("list")):
             self.stdout.write(
                 self.style.ERROR("Please specify either --list or --sync option")
@@ -79,9 +83,8 @@ class Command(BaseCommand):
             return
 
         try:
-            client = QStashScheduleClient()
-            destination = client._get_callback_url()
-            schedules = client.list_schedules()
+            destination = get_callback_url()
+            schedules = qstash_client.schedule.list()
 
             self.stdout.write(
                 self.style.SUCCESS(
@@ -105,8 +108,9 @@ class Command(BaseCommand):
 
             if options.get("sync"):
                 user_input = input("Do you want to sync remote schedules? (y/n): ")
-                if user_input.lower() == "y":
+                if user_input.lower() == "y" or auto_confirm:
                     self.sync_schedules(schedules)
-
+                else:
+                    self.stdout.write(self.style.ERROR("Sync cancelled"))
         except Exception as e:
             self.stdout.write(self.style.ERROR(f"An error occurred: {str(e)}"))

django_qstash/results/tasks.py

@@ -0,0 +1,67 @@
+from __future__ import annotations
+
+import logging
+from datetime import timedelta
+
+from django.apps import apps
+from django.conf import settings
+from django.utils import timezone
+
+from django_qstash import shared_task
+
+DJANGO_QSTASH_RESULT_TTL = getattr(settings, "DJANGO_QSTASH_RESULT_TTL", 604800)
+
+logger = logging.getLogger(__name__)
+
+
+@shared_task(name="Cleanup Task Results")
+def clear_stale_results_task(
+    since=None, stdout=None, user_confirm=False, *args, **options
+):
+    delta_seconds = since or DJANGO_QSTASH_RESULT_TTL
+    cutoff_date = timezone.now() - timedelta(seconds=delta_seconds)
+    TaskResult = None
+    try:
+        TaskResult = apps.get_model("django_qstash_results", "TaskResult")
+    except LookupError as e:
+        msg = "Django QStash Results not installed.\nAdd `django_qstash.results` to INSTALLED_APPS and run migrations."
+        if stdout is not None:
+            stdout.write(msg)
+        logger.exception(msg)
+        raise e
+    qs_to_delete = TaskResult.objects.filter(date_done__lt=cutoff_date)
+
+    if user_confirm:
+        user_input = input("Are you sure? (Y/n): ")
+        if f"{user_input}".lower() != "y":
+            msg = "Skipping deletion"
+            if stdout is not None:
+                stdout.write(msg)
+            logger.info(msg)
+            return
+
+    if not qs_to_delete.exists():
+        msg = "No stale Django QStash task results found"
+        if stdout is not None:
+            stdout.write(msg)
+        else:
+            logger.info(msg)
+        return
+    delete_msg = f"Deleting {qs_to_delete.count()} task results older than {cutoff_date} ({DJANGO_QSTASH_RESULT_TTL} seconds)"
+    if stdout is not None:
+        stdout.write(delete_msg)
+    else:
+        logger.info(delete_msg)
+    try:
+        deleted_count, _ = qs_to_delete.delete()
+        msg = f"Successfully deleted {deleted_count} stale results."
+        if stdout is not None:
+            stdout.write(msg)
+        else:
+            logger.info(msg)
+    except Exception as e:
+        msg = f"Error deleting stale results: {e}"
+        if stdout is not None:
+            stdout.write(msg)
+        logger.exception(msg)
+        raise e

{django_qstash-0.0.6.dist-info → django_qstash-0.0.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-qstash
-Version: 0.0.6
+Version: 0.0.8
 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.0.6.dist-info → django_qstash-0.0.8.dist-info}/RECORD

@@ -1,25 +1,29 @@
-django_qstash/__init__.py,sha256=tJP5kMnVYbo-kh6JTf-vZXbCVBgWEAACqQLZBVU-XwE,117
+django_qstash/__init__.py,sha256=NkydB5VW3zGO7c9-nveE0LELDPNix3lLQIZxWDeFBtI,128
 django_qstash/callbacks.py,sha256=VG5tGdNzAmUEh7NlpghrxhWvnpRNXZucWmWwxaemw0M,530
 django_qstash/client.py,sha256=cgHf-g6lDAltY_Vt6GUVJNY2JSz1czBOHL-WVkkLs2M,149
 django_qstash/exceptions.py,sha256=pH6kKRJFIVFkDHUJQ9yRWmtGdBBSXpNAwMSFuNzMgPw,392
 django_qstash/handlers.py,sha256=mmm8TJOqV3j1rQXooNOa128gtmALXFNCAaDZ5xwIcuw,4950
 django_qstash/settings.py,sha256=YvpXMo1AdIWvbotISWJmhg0vrW3A3UQ4BieNzMfRC7Y,524
-django_qstash/tasks.py,sha256=VYv7m0Uz1v8kPBegGHam5AH0Hcc-n53BZz3IdQcAqsk,4462
 django_qstash/utils.py,sha256=wrTU30cobO2di18BNEFtKD4ih2euf7eQNpg6p6TkQ1Y,1185
 django_qstash/views.py,sha256=H32f_jGnlwOTO0YG9znNo2b-GRYZ8TM-Wt0T62SGdXM,639
+django_qstash/app/__init__.py,sha256=353w1JyvIinkr3aHjyT7I01utFM56lrgIjSSfqtJkA4,187
+django_qstash/app/base.py,sha256=gM7GIJh_omZcxbmsrwAEadA-N6EuUJbPzh0CflOIVRg,3864
+django_qstash/app/decorators.py,sha256=Gn0TAxUHfS4fKUdKdArvHeWlxrRvj9_NOVnC1a6pGTQ,732
 django_qstash/discovery/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_qstash/discovery/fields.py,sha256=qZDKMpl6VMRJL0FkGwXkeN_rcCT32cupDaXJOz-bFzs,1226
 django_qstash/discovery/models.py,sha256=9ml9lTKEqEKx2uqYvejZw_BjdnowgFOPE7rYNt_8E9A,685
-django_qstash/discovery/utils.py,sha256=k-QfOGElehCM7tV5v0FJAfwKqJWjez4xFf2RUyxIgP0,3218
+django_qstash/discovery/utils.py,sha256=NxX6Y-Hd_AALgeESUW8AbIHReYPpbntvZjhlbrXTYnw,3224
 django_qstash/discovery/validators.py,sha256=NNCf7ltW--sTw0w8FWwTp-4PtiS35U6DITEApx-D7X4,645
+django_qstash/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_qstash/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-django_qstash/management/commands/clear_stale_results.py,sha256=stHCnvC1ER_rZXKUK-YVUgazC2q04eGIHjo_BrPSDEI,2096
-django_qstash/management/commands/task_schedules.py,sha256=fEiQsF9Qqihns4QxOsyhto6xuX_8FFfZUAO9AcibNrY,4056
+django_qstash/management/commands/clear_stale_results.py,sha256=mxXXqIy6pnvsN8JVE0xe3mypqtkaZbpqdBjpox-MDik,1402
+django_qstash/management/commands/task_schedules.py,sha256=b9lJ1vjQKHyGzWAo9csGwE_oaKfgcSC8bPFLt9Ry6WE,4278
 django_qstash/results/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_qstash/results/admin.py,sha256=q9fn3lfn0gviMfiimYij0wBCYww7FxyrOfGPr1NvntA,434
 django_qstash/results/apps.py,sha256=4me4cg5yeoeSJTphkHYzGMJUfGucT47FNIUMYu5gmIo,275
 django_qstash/results/models.py,sha256=aEiAhGJOuLRtjibUw6xdQqUt3eYKLqY2as4I4QSrF5U,1047
 django_qstash/results/services.py,sha256=HvNp5D1tQ__nz4LVUTAGxuyLl_dnlBps4pJ6E9HD2kA,991
+django_qstash/results/tasks.py,sha256=NETuiREwCKfajWKCnnB5iAsHoSsvBIThf805_wpzjbw,2166
 django_qstash/results/migrations/0001_initial.py,sha256=A90SKgWmBf4SIJYG1Jh6-b_81Ia1zIzGj3Bfl1O4-kg,1902
 django_qstash/results/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_qstash/schedules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -35,7 +39,7 @@ django_qstash/schedules/validators.py,sha256=i8IEjnRVk-iysmqvT_kbPYpxTKCQWoX9P1J
 django_qstash/schedules/migrations/0001_initial.py,sha256=66cA8xnJV3h7QgzCaOiv-Nu3Xl9IdZQPgQKhxyW3bs4,4516
 django_qstash/schedules/migrations/0002_taskschedule_updated_at.py,sha256=6hZO0a9P2ZpOROkk7O5UXBhahghU0QfxZl4E-c3HKGw,459
 django_qstash/schedules/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-django_qstash-0.0.6.dist-info/METADATA,sha256=QZpplPyuJi7GL0siOVCYAgdprf_LRzMbZuLvAertPZY,12307
-django_qstash-0.0.6.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-django_qstash-0.0.6.dist-info/top_level.txt,sha256=AlV3WSK1A0ZvKuCLsINtIJhJW8zo7SEB-D3_RAjZ0hI,14
-django_qstash-0.0.6.dist-info/RECORD,,
+django_qstash-0.0.8.dist-info/METADATA,sha256=bK9_Xyk6YmMJZO1FF3L3mZTuOlXkUIU7azMroDV6IQY,12307
+django_qstash-0.0.8.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+django_qstash-0.0.8.dist-info/top_level.txt,sha256=AlV3WSK1A0ZvKuCLsINtIJhJW8zo7SEB-D3_RAjZ0hI,14
+django_qstash-0.0.8.dist-info/RECORD,,