django-periodic-tasks 0.1.0a4__py3-none-any.whl → 0.1.0a5__py3-none-any.whl

django_periodic_tasks/admin.py

@@ -1,5 +1,3 @@
-from typing import Any
-
 from django.contrib import admin
 from django.http import HttpRequest
 
@@ -62,7 +60,7 @@ class ScheduledTaskAdmin(admin.ModelAdmin[ScheduledTask]):
     def has_delete_permission(
         self,
         request: HttpRequest,
-        obj: Any = None,
+        obj: ScheduledTask | None = None,
     ) -> bool:
         if obj is not None and obj.source == ScheduledTask.Source.CODE:
             return False
@@ -79,8 +77,8 @@ class TaskExecutionAdmin(admin.ModelAdmin[TaskExecution]):
     def has_add_permission(self, request: HttpRequest) -> bool:
         return False
 
-    def has_change_permission(self, request: HttpRequest, obj: Any = None) -> bool:
+    def has_change_permission(self, request: HttpRequest, obj: TaskExecution | None = None) -> bool:
         return False
 
-    def has_delete_permission(self, request: HttpRequest, obj: Any = None) -> bool:
+    def has_delete_permission(self, request: HttpRequest, obj: TaskExecution | None = None) -> bool:
         return False

django_periodic_tasks/decorators.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from collections.abc import Callable
-from typing import Any
 import functools
 import logging
 
@@ -10,8 +9,15 @@ from django.utils import timezone
 
 logger = logging.getLogger(__name__)
 
+_exactly_once_funcs: set[Callable[..., object]] = set()
 
-def exactly_once(func: Callable[..., Any]) -> Callable[..., Any]:
+
+def is_exactly_once(func: object) -> bool:
+    """Check whether a function was decorated with ``@exactly_once``."""
+    return func in _exactly_once_funcs
+
+
+def exactly_once[R](func: Callable[..., R]) -> Callable[..., R | None]:
     """Decorator ensuring a scheduled task runs at most once per invocation.
 
     When the scheduler creates a ``TaskExecution`` row and passes its ID via
@@ -27,12 +33,14 @@ def exactly_once(func: Callable[..., Any]) -> Callable[..., Any]:
     """
 
     @functools.wraps(func)
-    def wrapper(*args: Any, **kwargs: Any) -> Any:
-        execution_id: str | None = kwargs.pop("_periodic_tasks_execution_id", None)
+    def wrapper(*args: object, **kwargs: object) -> R | None:
+        raw_execution_id = kwargs.pop("_periodic_tasks_execution_id", None)
 
-        if execution_id is None:
+        if raw_execution_id is None:
             return func(*args, **kwargs)
 
+        execution_id = str(raw_execution_id)
+
         from django_periodic_tasks.models import (
             TaskExecution,  # Avoid AppRegistryNotReady
         )
@@ -55,5 +63,5 @@ def exactly_once(func: Callable[..., Any]) -> Callable[..., Any]:
 
         return result
 
-    wrapper._exactly_once = True  # type: ignore[attr-defined]
+    _exactly_once_funcs.add(wrapper)
     return wrapper

django_periodic_tasks/models.py

@@ -1,9 +1,10 @@
-from typing import Any
+from collections.abc import Iterable
 from zoneinfo import ZoneInfo
 import uuid
 
 from django.core.exceptions import ValidationError
 from django.db import models
+from django.db.models.base import ModelBase
 
 from django_periodic_tasks.cron import compute_next_run_at, validate_cron_expression
 
@@ -87,7 +88,14 @@ class ScheduledTask(models.Model):
         if errors:
             raise ValidationError(errors)
 
-    def save(self, *args: Any, **kwargs: Any) -> None:
+    def save(
+        self,
+        *,
+        force_insert: bool | tuple[ModelBase, ...] = False,
+        force_update: bool = False,
+        using: str | None = None,
+        update_fields: Iterable[str] | None = None,
+    ) -> None:
         original_next_run_at = self.next_run_at
 
         if not self.enabled:
@@ -95,17 +103,22 @@ class ScheduledTask(models.Model):
         elif self.next_run_at is None:
             self.next_run_at = compute_next_run_at(self.cron_expression, self.timezone)
 
-        raw_update_fields: list[str] | None = kwargs.get("update_fields")
-        if raw_update_fields is not None:
-            fields = set(raw_update_fields)
+        effective_update_fields: list[str] | None = None
+        if update_fields is not None:
+            fields = set(update_fields)
             # Always include updated_at so auto_now fires
             fields.add("updated_at")
             # Include next_run_at if save() modified it
             if self.next_run_at != original_next_run_at:
                 fields.add("next_run_at")
-            kwargs["update_fields"] = list(fields)
-
-        super().save(*args, **kwargs)
+            effective_update_fields = list(fields)
+
+        super().save(
+            force_insert=force_insert,
+            force_update=force_update,
+            using=using,
+            update_fields=effective_update_fields,
+        )
 
 
 class TaskExecution(models.Model):

django_periodic_tasks/registry.py

@@ -1,11 +1,26 @@
 from __future__ import annotations
 
+from collections.abc import Callable
 from dataclasses import dataclass, field
-from typing import Any
+from typing import Protocol
 
 from django_periodic_tasks.cron import validate_cron_expression
 
 
+class TaskLike(Protocol):
+    """Structural type describing the django-tasks ``Task`` interface.
+
+    Used instead of ``Task[..., object]`` because ``Task`` is invariant in its
+    type parameters — a concrete ``Task[[str], None]`` would not satisfy
+    ``Task[..., object]``.  This protocol captures just the attributes the
+    registry needs, so any ``Task[P, T]`` matches regardless of its concrete
+    parameter and return types.
+    """
+
+    @property
+    def module_path(self) -> str: ...
+
+
 @dataclass(frozen=True)
 class ScheduleEntry:
     """An immutable record describing a single scheduled task.
@@ -25,12 +40,12 @@ class ScheduleEntry:
         backend: Task backend name passed to ``task.using()``.
     """
 
-    task: Any
+    task: TaskLike
     cron_expression: str
     name: str
     timezone: str = "UTC"
-    args: list[Any] = field(default_factory=list)
-    kwargs: dict[str, Any] = field(default_factory=dict)
+    args: list[object] = field(default_factory=list)
+    kwargs: dict[str, object] = field(default_factory=dict)
     queue_name: str = "default"
     priority: int = 0
     backend: str = "default"
@@ -44,13 +59,13 @@ class ScheduleRegistry:
 
     def register(
         self,
-        task: Any,
+        task: TaskLike,
         *,
         cron: str,
         name: str,
         timezone: str = "UTC",
-        args: list[Any] | None = None,
-        kwargs: dict[str, Any] | None = None,
+        args: list[object] | None = None,
+        kwargs: dict[str, object] | None = None,
         queue_name: str = "default",
         priority: int = 0,
         backend: str = "default",
@@ -95,13 +110,18 @@ class ScheduleRegistry:
 schedule_registry = ScheduleRegistry()
 
 
-def scheduled_task(
+def scheduled_task[T: TaskLike](
     *,
     cron: str,
     name: str | None = None,
     registry: ScheduleRegistry | None = None,
-    **kwargs: Any,
-) -> Any:
+    timezone: str = "UTC",
+    args: list[object] | None = None,
+    kwargs: dict[str, object] | None = None,
+    queue_name: str = "default",
+    priority: int = 0,
+    backend: str = "default",
+) -> Callable[[T], T]:
     """Decorator that registers a django-tasks ``Task`` with the schedule registry.
 
     Apply this decorator **after** ``@task()`` to register the task for periodic
@@ -117,15 +137,28 @@ def scheduled_task(
         name: Unique schedule name. Defaults to the task's ``module_path``.
         registry: An alternate ``ScheduleRegistry`` instance (defaults to the
             global ``schedule_registry``).
-        **kwargs: Extra options forwarded to
-            :meth:`ScheduleRegistry.register` (``timezone``, ``args``,
-            ``kwargs``, ``queue_name``, ``priority``, ``backend``).
+        timezone: IANA timezone for cron matching (default ``"UTC"``).
+        args: Positional arguments for ``task.enqueue()``.
+        kwargs: Keyword arguments for ``task.enqueue()``.
+        queue_name: Queue name for ``task.using()``.
+        priority: Priority for ``task.using()``.
+        backend: Backend name for ``task.using()``.
     """
     target_registry = registry or schedule_registry
 
-    def decorator(task_obj: Any) -> Any:
+    def decorator(task_obj: T) -> T:
         actual_name = name or task_obj.module_path
-        target_registry.register(task_obj, cron=cron, name=actual_name, **kwargs)
+        target_registry.register(
+            task_obj,
+            cron=cron,
+            name=actual_name,
+            timezone=timezone,
+            args=args,
+            kwargs=kwargs,
+            queue_name=queue_name,
+            priority=priority,
+            backend=backend,
+        )
         return task_obj
 
     return decorator

django_periodic_tasks/scheduler.py

@@ -7,6 +7,7 @@ from django.db.models import F
 from django.utils import timezone
 
 from django_periodic_tasks.cron import compute_next_run_at
+from django_periodic_tasks.decorators import is_exactly_once
 from django_periodic_tasks.models import ScheduledTask, TaskExecution
 from django_periodic_tasks.sync import sync_code_schedules
 from django_periodic_tasks.task_resolver import resolve_task
@@ -106,9 +107,7 @@ class PeriodicTaskScheduler(threading.Thread):
             backend=st.backend,
         )
 
-        is_exactly_once = getattr(task_obj.func, "_exactly_once", False)
-
-        if is_exactly_once:
+        if is_exactly_once(task_obj.func):
             execution = TaskExecution.objects.create(scheduled_task=st)
             enqueue_kwargs = {**st.kwargs, "_periodic_tasks_execution_id": str(execution.id)}
 

django_periodic_tasks/task_resolver.py

@@ -1,10 +1,9 @@
 from importlib import import_module
-from typing import Any
 
 from django_tasks.base import Task
 
 
-def resolve_task(task_path: str) -> Task[..., Any]:
+def resolve_task(task_path: str) -> Task[..., object]:
     """Import and return a django-tasks Task object from its dotted module path.
 
     The task_path should be a dotted path like "myapp.tasks.my_task".

{django_periodic_tasks-0.1.0a4.dist-info → django_periodic_tasks-0.1.0a5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-periodic-tasks
-Version: 0.1.0a4
+Version: 0.1.0a5
 Summary: Periodic/cron task scheduling for django-tasks. Backend-agnostic replacement for celery-beat.
 Project-URL: Homepage, https://gitlab.com/thelabnyc/django-periodic-tasks
 Project-URL: Repository, https://gitlab.com/thelabnyc/django-periodic-tasks

{django_periodic_tasks-0.1.0a4.dist-info → django_periodic_tasks-0.1.0a5.dist-info}/RECORD

@@ -1,14 +1,14 @@
 django_periodic_tasks/__init__.py,sha256=5cgybxXwf98hZnNAOX6DYHeeYuwzC9jgwJZU0XGUOeQ,316
-django_periodic_tasks/admin.py,sha256=87o6_Z-f79ZhdAoTpFWdVhV9rZQQb-k17FGR_phHPuw,2373
+django_periodic_tasks/admin.py,sha256=-a7CcvAvh8W2SW7MwNqtlM_-qb9W0MCbLPqOOVMKnDE,2400
 django_periodic_tasks/apps.py,sha256=KezRzFjYSleKustuoiG0KhFy5N2uUgmi8qrx5bqcN6k,1159
 django_periodic_tasks/cron.py,sha256=PHVlX_YyzALgpYYBqWkKdvEm0uE0lnBTM5TUDcYLfS0,1332
-django_periodic_tasks/decorators.py,sha256=GhkNUqlPubUj6ZhS4Nf1FsTUMZaihNyD8wrTFOzbiKU,2024
-django_periodic_tasks/models.py,sha256=qJEwSnBJ-L54qr0Dl9gvHWZ0h6k2H6x5nMS7f9O2L3k,5199
+django_periodic_tasks/decorators.py,sha256=oxabqjO7ZzvhOuUCzR4J9gIq2cu1gV-8R5f7tNfAiro,2248
+django_periodic_tasks/models.py,sha256=EbTMPfvzy7i39mL69sTO8DnhCRtXVWRAn0jD0iPUJPg,5561
 django_periodic_tasks/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-django_periodic_tasks/registry.py,sha256=sS897SBu1RP7JVQDNkMZQfahhCU_9ZpV6qHmdwvKiik,4532
-django_periodic_tasks/scheduler.py,sha256=zl-LsAmO9Io2rZG1P4WrG-is3yGxAX0430Dmd0zVEBs,7600
+django_periodic_tasks/registry.py,sha256=itczcfG_PlKsUz4pA6vDwge2OL0jth7NAI0cm6IDGiY,5665
+django_periodic_tasks/scheduler.py,sha256=BlsfdnF1qBULR5wk5WcODEQpZcXI5OHCBso1rsgYQcU,7602
 django_periodic_tasks/sync.py,sha256=EfvcZlP5-199uxIMwJRdCnXzObQohHLYR4W819d5i5k,2118
-django_periodic_tasks/task_resolver.py,sha256=OMlH3s9b4rerLOItm3KdazWLZPiSTbjHTZlWpd9qt_8,684
+django_periodic_tasks/task_resolver.py,sha256=SFKRZe-bkKmcfS1r698ZbGb8VqECeTPUr8d7gH9B6PQ,664
 django_periodic_tasks/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_periodic_tasks/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_periodic_tasks/management/commands/run_scheduler.py,sha256=kCVBi10KLHb_8iqizT3mlfW_cuQOLpsrF-VowdXkkAM,2194
@@ -16,7 +16,7 @@ django_periodic_tasks/migrations/0001_initial.py,sha256=h_AfdKIG9f-XmDZiqR_zzgtr
 django_periodic_tasks/migrations/0002_remove_redundant_next_run_at_db_index.py,sha256=RPWdcpU7wkQd-47oLbr14q6JgfyaqfOkys2o8KmocoU,412
 django_periodic_tasks/migrations/0003_add_task_execution.py,sha256=3cZrhQmBR2oIaIkTeMYGoztuPyO6rdh84wOlex5fUzs,1235
 django_periodic_tasks/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-django_periodic_tasks-0.1.0a4.dist-info/METADATA,sha256=0aD4pQZ-mAo_GND1sIcVqZAo04zUUNWO1xujJMA61tU,1505
-django_periodic_tasks-0.1.0a4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-django_periodic_tasks-0.1.0a4.dist-info/licenses/LICENSE,sha256=XdK5EYewCzTpCGUgHO6aUH6TlvzAdvQrtv1Xacd7OIQ,738
-django_periodic_tasks-0.1.0a4.dist-info/RECORD,,
+django_periodic_tasks-0.1.0a5.dist-info/METADATA,sha256=Jaa4P-GL8T9NwcwT6yNoBwQ_HtG_YuNH_H3DgxU0Rh4,1505
+django_periodic_tasks-0.1.0a5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+django_periodic_tasks-0.1.0a5.dist-info/licenses/LICENSE,sha256=XdK5EYewCzTpCGUgHO6aUH6TlvzAdvQrtv1Xacd7OIQ,738
+django_periodic_tasks-0.1.0a5.dist-info/RECORD,,