simple-module-background-tasks 0.0.35__tar.gz → 0.0.36__tar.gz

{simple_module_background_tasks-0.0.35 → simple_module_background_tasks-0.0.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: simple_module_background_tasks
-Version: 0.0.35
+Version: 0.0.36
 Summary: Celery + Redis task queue with admin UI for monitoring and retrying failed/stuck tasks
 Project-URL: Homepage, https://github.com/antosubash/simple_module_python
 Project-URL: Repository, https://github.com/antosubash/simple_module_python
@@ -23,10 +23,10 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.12
 Requires-Dist: celery[redis]>=5.4
 Requires-Dist: redis>=5
-Requires-Dist: simple-module-core==0.0.35
-Requires-Dist: simple-module-db==0.0.35
-Requires-Dist: simple-module-hosting==0.0.35
-Requires-Dist: simple-module-settings==0.0.35
+Requires-Dist: simple-module-core==0.0.36
+Requires-Dist: simple-module-db==0.0.36
+Requires-Dist: simple-module-hosting==0.0.36
+Requires-Dist: simple-module-settings==0.0.36
 Description-Content-Type: text/markdown
 
 # simple_module_background_tasks

{simple_module_background_tasks-0.0.35 → simple_module_background_tasks-0.0.36}/background_tasks/__init__.py

@@ -5,9 +5,11 @@ from background_tasks.log_context import (
     get_log_context,
     install_log_filter,
 )
+from background_tasks.worker_settings import settings_for
 
 __all__ = [
     "bind_task_context",
     "get_log_context",
     "install_log_filter",
+    "settings_for",
 ]

simple_module_background_tasks-0.0.36/background_tasks/_signal_bus.py

@@ -0,0 +1,61 @@
+"""Bridge from Celery's sync signal thread to the app's async event bus.
+
+Split out of :mod:`.signals` to keep it under the 300-line cap; ``signals``
+re-exports :func:`bind_event_bus` / :func:`unbind_event_bus`.
+"""
+
+from __future__ import annotations
+
+import asyncio
+import logging
+from typing import Any
+
+from simple_module_core.events import EventBus
+
+logger = logging.getLogger("background_tasks.signals")
+
+
+_bus: EventBus | None = None
+_loop: asyncio.AbstractEventLoop | None = None
+
+
+def bind_event_bus(bus: EventBus, loop: asyncio.AbstractEventLoop) -> None:
+    """Bind an event bus + its running loop so signals can publish events.
+
+    Signals fire on the Celery sync thread; `run_coroutine_threadsafe`
+    bridges back to ``loop`` so handlers run on the API event loop
+    regardless of which thread triggered the signal.
+    """
+    global _bus, _loop
+    _bus = bus
+    _loop = loop
+
+
+def unbind_event_bus() -> None:
+    """Drop the bound bus — called from ``on_shutdown`` so tests stay isolated."""
+    global _bus, _loop
+    _bus = None
+    _loop = None
+
+
+def publish_from_signal(event: Any) -> None:
+    """Dispatch ``event`` onto the bound bus without blocking the signal thread."""
+    if _bus is None or _loop is None:
+        return
+    try:
+        future = asyncio.run_coroutine_threadsafe(_bus.publish(event), _loop)
+    except RuntimeError:
+        # Loop has stopped (shutdown race). The DB row is already written.
+        logger.debug("Event bus loop is not running; skipping %s", type(event).__name__)
+        return
+    # Surface subscriber exceptions — run_coroutine_threadsafe otherwise only
+    # logs them when the Future is GC'd, which happens far from the failure.
+    future.add_done_callback(_log_publish_failure)
+
+
+def _log_publish_failure(future: asyncio.Future[Any]) -> None:
+    if future.cancelled():
+        return
+    exc = future.exception()
+    if exc is not None:
+        logger.error("Event publish raised: %s", exc, exc_info=exc)

{simple_module_background_tasks-0.0.35 → simple_module_background_tasks-0.0.36}/background_tasks/constants.py

@@ -102,3 +102,7 @@ INTERNAL_TASK_PURGE_OLD = "background_tasks.purge_old_executions"
 # Harmless round-trip task; only wired into CI smoke tests and local dev —
 # not scheduled, not invoked by other modules.
 DEMO_ECHO_TASK = "background_tasks.demo_echo"
+
+TENANT_ID_MAX_LENGTH = 50
+# Filter value meaning "executions with no tenant" (beat / platform publishes).
+PLATFORM_TENANT_FILTER = "__platform__"

{simple_module_background_tasks-0.0.35 → simple_module_background_tasks-0.0.36}/background_tasks/contracts/schemas.py

@@ -28,6 +28,7 @@ class TaskExecutionListItem(SQLModel):
     task_name: str
     status: TaskStatus
     queue: str
+    tenant_id: str | None = None
     args: list[Any] = []
     kwargs: dict[str, Any] = {}
     retries: int
@@ -49,6 +50,7 @@ class TaskExecutionDetail(SQLModel):
     task_name: str
     status: TaskStatus
     queue: str
+    tenant_id: str | None = None
     args: list[Any] = []
     kwargs: dict[str, Any] = {}
     result: dict[str, Any] | None = None

{simple_module_background_tasks-0.0.35 → simple_module_background_tasks-0.0.36}/background_tasks/endpoints/api_admin.py

@@ -37,6 +37,7 @@ async def list_executions(
     q: str | None = Query(default=None),
     task_name: str | None = Query(default=None, deprecated=True),
     queue: str | None = Query(default=None),
+    tenant_id: str | None = Query(default=None),
     page: int = Query(default=1, ge=1),
     per_page: int = Query(default=20, ge=1, le=200),
     service: BackgroundTaskService = Depends(get_background_task_service),
@@ -50,7 +51,12 @@ async def list_executions(
     existing API callers keep working, and ``q`` wins when both are given.
     """
     return await service.list(
-        status=status, task_name=q or task_name, queue=queue, page=page, per_page=per_page
+        status=status,
+        task_name=q or task_name,
+        queue=queue,
+        tenant_id=tenant_id,
+        page=page,
+        per_page=per_page,
     )
 
 
@@ -74,15 +80,18 @@ async def retry_failed_executions(
     status: TaskStatus | None = Query(default=None),
     task_name: str | None = Query(default=None, alias="q"),
     queue: str | None = Query(default=None),
+    tenant_id: str | None = Query(default=None),
     service: BackgroundTaskService = Depends(get_background_task_service),
 ) -> RetryFailedResult:
     """Re-enqueue every failed or stuck execution the current filter can see.
 
-    Takes the same three filters as the listing — status, search, queue — so
+    Takes the same filters as the listing — status, search, queue, tenant — so
     the sweep covers exactly the rows the operator is looking at and nothing
     else. Capped per call; the response says how many eligible rows are left.
     """
-    return await service.retry_failed(status=status, task_name=task_name, queue=queue)
+    return await service.retry_failed(
+        status=status, task_name=task_name, queue=queue, tenant_id=tenant_id
+    )
 
 
 @router.post(

{simple_module_background_tasks-0.0.35 → simple_module_background_tasks-0.0.36}/background_tasks/endpoints/views.py

@@ -12,6 +12,7 @@ from simple_module_inertia import InertiaResponse
 
 from background_tasks.constants import (
     PERM_VIEW,
+    PLATFORM_TENANT_FILTER,
     TaskStatus,
 )
 from background_tasks.deps import get_background_task_service
@@ -53,6 +54,7 @@ async def index(
     status: TaskStatus | None = Query(default=None),
     task_name: str = Query(default="", alias="q"),
     queue: str = Query(default=""),
+    tenant_id: str = Query(default="", alias="tenant"),
     page: int = Query(default=1),
     service: BackgroundTaskService = Depends(get_background_task_service),
 ) -> InertiaResponse:
@@ -60,22 +62,28 @@ async def index(
         status=status,
         task_name=task_name or None,
         queue=queue or None,
+        tenant_id=tenant_id or None,
         page=page,
         per_page=PER_PAGE,
     )
     # A filtered-empty list says nothing about the fleet, so don't pay to poll
     # it: the screen already knows to blame the filter.
-    unfiltered_and_empty = response.total == 0 and not task_name and not queue and status is None
+    unfiltered_and_empty = (
+        response.total == 0 and not task_name and not queue and not tenant_id and status is None
+    )
 
     async def strip_data() -> tuple[dict[str, int], list[str]]:
         """Everything above the table. Serial: one session, one connection."""
-        counts = await service.status_counts(task_name=task_name or None, queue=queue or None)
+        counts = await service.status_counts(
+            task_name=task_name or None, queue=queue or None, tenant_id=tenant_id or None
+        )
         # The strip's third tile is a windowed throughput reading rather than a
         # status total, so it needs its own count — see `success_count_since`.
         counts["success_24h"] = await service.success_count_since(
             hours=SUCCESS_WINDOW_HOURS,
             task_name=task_name or None,
             queue=queue or None,
+            tenant_id=tenant_id or None,
         )
         # Deliberately unfiltered: the dropdown is how an operator leaves the
         # queue they are in, so it keeps offering the ones they are not in.
@@ -97,6 +105,8 @@ async def index(
                 "success_24h": counts["success_24h"],
             },
             "queues": queues,
+            "tenant_ids": await service.tenant_ids(),
+            "platform_tenant_value": PLATFORM_TENANT_FILTER,
             "worker_presence": presence,
             "pagination": {
                 "page": response.page,
@@ -107,6 +117,7 @@ async def index(
                 "status": status.value if status else "",
                 "task_name": task_name,
                 "queue": queue,
+                "tenant": tenant_id,
             },
         },
     )

{simple_module_background_tasks-0.0.35 → simple_module_background_tasks-0.0.36}/background_tasks/filters.py

@@ -11,7 +11,7 @@ from __future__ import annotations
 from simple_module_db import LIKE_ESCAPE_CHAR, like_contains_pattern
 from sqlalchemy import ColumnElement, select
 
-from background_tasks.constants import RETRYABLE_STATUSES, TaskStatus
+from background_tasks.constants import PLATFORM_TENANT_FILTER, RETRYABLE_STATUSES, TaskStatus
 from background_tasks.models import TaskExecution
 
 Conditions = list[ColumnElement[bool]]
@@ -22,9 +22,19 @@ def execution_filters(
     status: TaskStatus | None = None,
     task_name: str | None = None,
     queue: str | None = None,
+    tenant_id: str | None = None,
 ) -> Conditions:
-    """The three axes the executions screen filters on."""
+    """The axes the executions screen filters on.
+
+    *tenant_id* is a tenant id, or :data:`PLATFORM_TENANT_FILTER` for
+    executions published with no tenant. The screen is platform-wide; tenant is
+    a filter, not a scope.
+    """
     conditions: Conditions = []
+    if tenant_id == PLATFORM_TENANT_FILTER:
+        conditions.append(TaskExecution.tenant_id.is_(None))
+    elif tenant_id:
+        conditions.append(TaskExecution.tenant_id == tenant_id)
     if status is not None:
         conditions.append(TaskExecution.status == status)
     if task_name:
@@ -41,6 +51,7 @@ def bulk_retry_conditions(
     status: TaskStatus | None = None,
     task_name: str | None = None,
     queue: str | None = None,
+    tenant_id: str | None = None,
 ) -> Conditions | None:
     """What the bulk sweep may touch, or ``None`` when it may touch nothing.
 
@@ -64,6 +75,6 @@ def bulk_retry_conditions(
     already_retried = select(child.c.id).where(child.c.retried_from_id == TaskExecution.id).exists()
     return [
         TaskExecution.status.in_(sorted(wanted)),
-        *execution_filters(task_name=task_name, queue=queue),
+        *execution_filters(task_name=task_name, queue=queue, tenant_id=tenant_id),
         ~already_retried,
     ]

{simple_module_background_tasks-0.0.35 → simple_module_background_tasks-0.0.36}/background_tasks/locales/en.json

@@ -26,7 +26,11 @@
     "stuck": "Stuck",
     "queue_label": "Queue:",
     "queue_all": "all",
-    "queue_aria": "Filter by queue"
+    "queue_aria": "Filter by queue",
+    "tenant_label": "Tenant:",
+    "tenant_all": "all",
+    "tenant_platform": "Platform",
+    "tenant_aria": "Filter by tenant"
   },
   "status": {
     "queued": "queued",
@@ -44,7 +48,8 @@
     "queued_at": "Queued",
     "duration": "Duration",
     "actions": "Actions",
-    "retry": "Retry"
+    "retry": "Retry",
+    "tenant": "Tenant"
   },
   "detail": {
     "head_title": "Task detail",
@@ -69,7 +74,8 @@
     "traceback": "Traceback",
     "copy": "Copy",
     "copied": "Copied",
-    "no_traceback": "No traceback recorded."
+    "no_traceback": "No traceback recorded.",
+    "tenant": "Tenant"
   },
   "retry_dialog": {
     "title": "Retry {name}?",

{simple_module_background_tasks-0.0.35 → simple_module_background_tasks-0.0.36}/background_tasks/log_context.py

@@ -10,7 +10,7 @@ Celery signals plus arbitrary domain identifiers via
 from __future__ import annotations
 
 import logging
-from collections.abc import Iterator, Mapping
+from collections.abc import Generator, Mapping
 from contextlib import contextmanager
 from contextvars import ContextVar, Token
 from types import MappingProxyType
@@ -46,7 +46,7 @@ def get_log_context() -> dict[str, Any]:
 
 
 @contextmanager
-def bind_task_context(**identifiers: Any) -> Iterator[None]:
+def bind_task_context(**identifiers: Any) -> Generator[None]:
     """Layer ``identifiers`` onto the current task's log context.
 
     Nests cleanly. Raises ``ValueError`` if any key collides with a

{simple_module_background_tasks-0.0.35 → simple_module_background_tasks-0.0.36}/background_tasks/models.py

@@ -15,6 +15,7 @@ from background_tasks.constants import (
     DEFAULT_QUEUE,
     MODULE_NAME,
     TABLE_TASK_EXECUTION,
+    TENANT_ID_MAX_LENGTH,
     TaskStatus,
 )
 
@@ -48,6 +49,12 @@ class TaskExecution(Base, AuditMixin, table=True):  # ty: ignore[unsupported-bas
     )
     queue: str = Field(default=DEFAULT_QUEUE, max_length=64)
 
+    # The tenant the task was published for; NULL for beat and other platform
+    # publishes. Deliberately not MultiTenantMixin: those rows have no tenant
+    # and strict mode would raise on their insert. The admin screens are
+    # platform-wide and filter on this column.
+    tenant_id: str | None = Field(default=None, index=True, max_length=TENANT_ID_MAX_LENGTH)
+
     args: list[Any] = Field(default_factory=list, sa_column=Column(JSON))
     kwargs: dict[str, Any] = Field(default_factory=dict, sa_column=Column(JSON))
     result: dict[str, Any] | None = Field(default=None, sa_column=Column(JSON))
@@ -79,4 +86,10 @@ class TaskExecution(Base, AuditMixin, table=True):  # ty: ignore[unsupported-bas
             "status",
             "queued_at",
         ),
+        Index(
+            "ix_background_tasks_task_execution_tenant_status_queued",
+            "tenant_id",
+            "status",
+            "queued_at",
+        ),
     )

{simple_module_background_tasks-0.0.35 → simple_module_background_tasks-0.0.36}/background_tasks/module.py

@@ -161,8 +161,9 @@ class BackgroundTasksModule(ModuleBase):
         # SQLite default and silently drop ``TaskExecution`` rows.
         host = app.state.sm.settings
         multi = bool(getattr(host, "multi_tenant", False))
-        set_database_url(host.database_url, tenant_strict=multi)
-        set_default_tenant(None if multi else getattr(host, "default_tenant", "") or None)
+        default_tenant = None if multi else getattr(host, "default_tenant", "") or None
+        set_database_url(host.database_url, tenant_strict=multi, default_tenant=default_tenant)
+        set_default_tenant(default_tenant)
         # build_celery imports `signals` for side effects and runs
         # `autodiscover_tasks` across every installed module.
         services.celery = build_celery(services.settings)

{simple_module_background_tasks-0.0.35 → simple_module_background_tasks-0.0.36}/background_tasks/pages/Index.tsx

@@ -12,7 +12,7 @@ import { type StatusCounts, StatusStrip } from './components/StatusStrip';
 import { TaskFilters } from './components/TaskFilters';
 import { TasksEmptyRow, type WorkerPresence } from './components/TasksEmpty';
 import { WorkerHealthBanner } from './components/WorkerHealthBanner';
-import { QUEUE_ALL, STATUS_ALL, TASK_STATUS, VIEW_BASE } from './constants';
+import { QUEUE_ALL, STATUS_ALL, TASK_STATUS, TENANT_ALL, VIEW_BASE } from './constants';
 import { type Execution, retryAllFailed, retryExecution } from './retry';
 
 interface Pagination {
@@ -25,6 +25,7 @@ interface Filters {
   status: string;
   task_name: string;
   queue: string;
+  tenant: string;
 }
 
 interface Props {
@@ -34,6 +35,10 @@ interface Props {
   status_counts: StatusCounts;
   /** Every queue that has run work, for the dropdown. */
   queues: string[];
+  /** Tenants that have published work, for the dropdown. */
+  tenant_ids: string[];
+  /** Filter value selecting executions with no tenant. */
+  platform_tenant_value: string;
   /** Null unless the unfiltered list came back empty — see the index view. */
   worker_presence: WorkerPresence | null;
 }
@@ -47,6 +52,7 @@ function pushFilters(filters: Filters, page: number): void {
   if (filters.task_name) params.q = filters.task_name;
   if (filters.status && filters.status !== STATUS_ALL) params.status = filters.status;
   if (filters.queue && filters.queue !== QUEUE_ALL) params.queue = filters.queue;
+  if (filters.tenant && filters.tenant !== TENANT_ALL) params.tenant = filters.tenant;
   if (page > 1) params.page = String(page);
   router.get(VIEW_BASE, params, { preserveState: true, preserveScroll: true });
 }
@@ -58,6 +64,8 @@ function Index() {
     filters: initialFilters,
     status_counts: statusCounts,
     queues,
+    tenant_ids: tenantIds,
+    platform_tenant_value: platformTenantValue,
     worker_presence: workerPresence,
   } = usePage<{ props: Props }>().props as unknown as Props;
 
@@ -71,16 +79,21 @@ function Index() {
   const [busy, setBusy] = useState(false);
   const statusValue = initialFilters.status || STATUS_ALL;
   const queueValue = initialFilters.queue || QUEUE_ALL;
+  const tenantValue = initialFilters.tenant || TENANT_ALL;
   // Derived from the server-confirmed filters, not the live `search` input:
   // `workerPresence` reflects the last committed request, so mixing it with
   // unsubmitted local state would flash the wrong empty-state copy during the
   // debounce window between a keystroke and the resulting navigation.
   const isFiltered =
-    !!(initialFilters.task_name ?? '') || statusValue !== STATUS_ALL || queueValue !== QUEUE_ALL;
+    !!(initialFilters.task_name ?? '') ||
+    statusValue !== STATUS_ALL ||
+    queueValue !== QUEUE_ALL ||
+    tenantValue !== TENANT_ALL;
   const filters: Filters = {
     status: statusValue,
     task_name: search,
     queue: queueValue,
+    tenant: tenantValue,
   };
 
   // Work that is supposed to be moving. Counting `running` too is deliberate:
@@ -101,7 +114,7 @@ function Index() {
     // clear, and an armed flag would swallow the user's next keystroke.
     if (search !== '') skipNextDebounceRef.current = true;
     setSearch('');
-    pushFilters({ status: STATUS_ALL, task_name: '', queue: QUEUE_ALL }, 1);
+    pushFilters({ status: STATUS_ALL, task_name: '', queue: QUEUE_ALL, tenant: TENANT_ALL }, 1);
   }
 
   // Debounce search: any change from the server-provided value kicks off a
@@ -113,11 +126,15 @@ function Index() {
     }
     if (search === (initialFilters.task_name ?? '')) return;
     const timeout = setTimeout(
-      () => pushFilters({ status: statusValue, task_name: search, queue: queueValue }, 1),
+      () =>
+        pushFilters(
+          { status: statusValue, task_name: search, queue: queueValue, tenant: tenantValue },
+          1,
+        ),
       300,
     );
     return () => clearTimeout(timeout);
-  }, [search, initialFilters.task_name, statusValue, queueValue]);
+  }, [search, initialFilters.task_name, statusValue, queueValue, tenantValue]);
 
   async function handleRetry() {
     if (!retryTarget) return;
@@ -134,6 +151,7 @@ function Index() {
       status: statusValue,
       taskName: initialFilters.task_name ?? '',
       queue: queueValue,
+      tenant: tenantValue,
     });
     setBusy(false);
     setRetryAllOpen(false);
@@ -188,6 +206,10 @@ function Index() {
           queue={queueValue}
           onQueueChange={(queue) => pushFilters({ ...filters, queue }, 1)}
           queues={queues ?? []}
+          tenant={tenantValue}
+          onTenantChange={(tenant) => pushFilters({ ...filters, tenant }, 1)}
+          tenantIds={tenantIds ?? []}
+          platformTenantValue={platformTenantValue}
         />
 
         <ExecutionsTable

{simple_module_background_tasks-0.0.35 → simple_module_background_tasks-0.0.36}/background_tasks/pages/components/DetailFacts.tsx

@@ -45,6 +45,10 @@ export function DetailFacts({ execution, className }: Props) {
 
   const facts: Fact[] = [
     { label: t(keys.background_tasks.detail.queue), value: execution.queue },
+    {
+      label: t(keys.background_tasks.detail.tenant),
+      value: execution.tenant_id ?? t(keys.background_tasks.filters.tenant_platform),
+    },
     {
       label: t(keys.background_tasks.detail.worker),
       value: execution.worker ? (

{simple_module_background_tasks-0.0.35 → simple_module_background_tasks-0.0.36}/background_tasks/pages/components/ExecutionRow.tsx

@@ -43,6 +43,9 @@ export function ExecutionRow({ execution, canRetry, onRetry }: Props) {
       <TableCell className="hidden text-sm text-muted-foreground md:table-cell">
         {execution.queue}
       </TableCell>
+      <TableCell className="hidden font-mono text-xs text-muted-foreground md:table-cell">
+        {execution.tenant_id ?? t(keys.background_tasks.filters.tenant_platform)}
+      </TableCell>
       <TableCell className="hidden text-sm text-muted-foreground lg:table-cell">
         {ago(execution.queued_at)}
       </TableCell>

{simple_module_background_tasks-0.0.35 → simple_module_background_tasks-0.0.36}/background_tasks/pages/components/ExecutionsTable.tsx

@@ -12,8 +12,8 @@ import type { ReactNode } from 'react';
 import type { Execution } from '../retry';
 import { ExecutionRow } from './ExecutionRow';
 
-/** Task, Status, Queue, Queued, Duration, Actions. */
-export const COLUMN_COUNT = 6;
+/** Task, Status, Queue, Tenant, Queued, Duration, Actions. */
+export const COLUMN_COUNT = 7;
 
 // Same header treatment as the other admin tables (users, audit log, flags).
 const TH = 'text-[11px] font-semibold uppercase tracking-[0.08em] text-muted-foreground';
@@ -63,6 +63,9 @@ export function ExecutionsTable({
             <TableHead className={`${TH} hidden md:table-cell`}>
               {t(keys.background_tasks.table.queue)}
             </TableHead>
+            <TableHead className={`${TH} hidden md:table-cell`}>
+              {t(keys.background_tasks.table.tenant)}
+            </TableHead>
             <TableHead className={`${TH} hidden lg:table-cell`}>
               {t(keys.background_tasks.table.queued_at)}
             </TableHead>

{simple_module_background_tasks-0.0.35 → simple_module_background_tasks-0.0.36}/background_tasks/pages/components/TaskFilters.tsx

@@ -9,7 +9,13 @@ import {
   SelectValue,
 } from '@simple-module-py/ui/components/ui/select';
 import { Search } from 'lucide-react';
-import { QUEUE_ALL, SEGMENT_LABEL_KEY, SEGMENT_STATUSES, STATUS_ALL } from '../constants';
+import {
+  QUEUE_ALL,
+  SEGMENT_LABEL_KEY,
+  SEGMENT_STATUSES,
+  STATUS_ALL,
+  TENANT_ALL,
+} from '../constants';
 
 interface Props {
   search: string;
@@ -22,6 +28,13 @@ interface Props {
   onQueueChange: (next: string) => void;
   /** Every queue that has run work, for the dropdown. */
   queues: string[];
+  /** Active tenant filter, or `TENANT_ALL`. */
+  tenant: string;
+  onTenantChange: (next: string) => void;
+  /** Tenants that have published work, for the dropdown. */
+  tenantIds: string[];
+  /** Filter value selecting executions with no tenant (platform publishes). */
+  platformTenantValue: string;
 }
 
 /**
@@ -40,6 +53,10 @@ export function TaskFilters({
   queue,
   onQueueChange,
   queues,
+  tenant,
+  onTenantChange,
+  tenantIds,
+  platformTenantValue,
 }: Props) {
   const { t } = useT();
   const options = SEGMENT_STATUSES.map((value) => ({
@@ -87,6 +104,30 @@ export function TaskFilters({
             ))}
           </SelectContent>
         </Select>
+        <Select value={tenant || TENANT_ALL} onValueChange={onTenantChange}>
+          <SelectTrigger
+            aria-label={t(keys.background_tasks.filters.tenant_aria)}
+            className="gap-1.5 max-lg:min-h-11"
+          >
+            <span className="text-muted-foreground">
+              {t(keys.background_tasks.filters.tenant_label)}
+            </span>
+            <SelectValue />
+          </SelectTrigger>
+          <SelectContent>
+            <SelectItem value={TENANT_ALL}>
+              {t(keys.background_tasks.filters.tenant_all)}
+            </SelectItem>
+            <SelectItem value={platformTenantValue}>
+              {t(keys.background_tasks.filters.tenant_platform)}
+            </SelectItem>
+            {tenantIds.map((id) => (
+              <SelectItem key={id} value={id} className="font-mono">
+                {id}
+              </SelectItem>
+            ))}
+          </SelectContent>
+        </Select>
       </div>
     </div>
   );

{simple_module_background_tasks-0.0.35 → simple_module_background_tasks-0.0.36}/background_tasks/pages/constants.ts

@@ -95,6 +95,7 @@ export interface TaskDetail {
   task_name: string;
   status: TaskStatus;
   queue: string;
+  tenant_id: string | null;
   args: unknown[];
   kwargs: Record<string, unknown>;
   result: Record<string, unknown> | null;
@@ -192,6 +193,9 @@ export const STATUS_ALL = 'all';
  */
 export const QUEUE_ALL = '__all__';
 
+/** Sentinel for "no tenant filter" in the tenant dropdown. */
+export const TENANT_ALL = '__all__';
+
 /**
  * The four the segmented control offers: everything, plus the three states an
  * operator triages. `pending`, `success`, `revoked` and `retrying` stay

{simple_module_background_tasks-0.0.35 → simple_module_background_tasks-0.0.36}/background_tasks/pages/retry.ts

@@ -4,7 +4,7 @@
 
 import { keys, t } from '@simple-module-py/i18n';
 import { toast } from 'sonner';
-import { API_BASE, QUEUE_ALL, STATUS_ALL, type TaskStatus } from './constants';
+import { API_BASE, QUEUE_ALL, STATUS_ALL, type TaskStatus, TENANT_ALL } from './constants';
 
 export interface Execution {
   id: string;
@@ -12,6 +12,8 @@ export interface Execution {
   task_name: string;
   status: TaskStatus;
   queue: string;
+  /** Tenant that published the task; null for beat / platform publishes. */
+  tenant_id: string | null;
   // Shown by the retry confirm before it re-enqueues them — see the list schema.
   args: unknown[];
   kwargs: Record<string, unknown>;
@@ -63,11 +65,13 @@ export async function retryAllFailed(filters: {
   status: string;
   taskName: string;
   queue: string;
+  tenant: string;
 }): Promise<number | null> {
   const params = new URLSearchParams();
   if (filters.status && filters.status !== STATUS_ALL) params.set('status', filters.status);
   if (filters.taskName) params.set('q', filters.taskName);
   if (filters.queue && filters.queue !== QUEUE_ALL) params.set('queue', filters.queue);
+  if (filters.tenant && filters.tenant !== TENANT_ALL) params.set('tenant_id', filters.tenant);
   const query = params.toString();
   try {
     const res = await fetch(`${API_BASE}/executions/retry-failed${query ? `?${query}` : ''}`, {