a7a2b4efa4
Backend
- Per-chat album scope for Immich commands (search/latest/memory/...): new
allowed_album_ids on CommandTrackerListener, threaded listener/page kwargs
through ProviderCommandHandler.handle; PATCH listener-scope endpoint.
- /search and /find accept a trailing page number; Immich client search_smart
/ search_metadata take a page param.
- Immich person-asset lookup switched from removed GET /api/people/{id}/assets
to POST /api/search/metadata with personIds (fixes /person command and
auto_organize rules silently returning zero candidates on Immich 1.106+).
- Auto_organize rule now sets the target album's thumbnail to the first added
image when missing (falls back to any asset type); failures do not fail the
rule. add_assets_to_album surfaces the Immich error body on non-2xx.
- EventLog.user_id / action_id / action_name columns with defensive migration
+ backfill. Status query filters by user_id directly; Immich/webhook paths
emit user_id explicitly. action_runner writes an action_success/partial/
failed event on each non-dry-run.
- Dashboard DELETE /api/status/events (scoped to user_id) + rendering live
tracker/provider/action names via FK join with snapshot fallback.
- PATCH /api/users/{id} for username/role change with last-admin guard.
- Deletion protection returns structured {message, entity, blocked_by}
(ApiError carries .blockedBy; frontend opens BlockedByModal).
- Backup prepare-restore → AppSetting markers + atomic write of
pending_restore.json; lifespan hook applies on next startup and archives
under data/applied_restores/. apply-restart sends SIGTERM so the lifespan
shutdown runs; NOTIFY_BRIDGE_SUPERVISED env override gates the button.
Manual POST /api/backup/files (same format as scheduled).
- New periodic-summary test path reuses shared collect_scheduled_assets
(limit=0) so test and future production code go through one primitive.
- Per-receiver locale for Telegram test messages (resolves
TelegramChat.language_override per chat instead of applying the first
receiver's locale to everyone).
- Bounded concurrency (semaphores) in NotificationDispatcher._preload_asset_data
and _refresh_telegram_chat_titles; chat title sweep extended to 24h since
save_chat_from_webhook covers active chats opportunistically.
- Telegram poller detects the \"webhook is active\" 409 and auto-calls
deleteWebhook for bots whose DB update_mode is polling (throttled per bot).
- TelegramClient.get_chat added (CLAUDE.md rule 6); set_album_thumbnail added.
- Seeds: rename \"Default Commands\" → \"Default Immich Commands\";
track_assets_removed default False.
Frontend
- Global provider selector visible when there is only one provider.
- Clear-events button + i18n + ConfirmModal on the dashboard; new icons/
labels/filters/colors for action_success / action_partial / action_failed.
- Auto-select first available tracking/template/command/config + bot on
create forms (trackers, command-trackers, targets, template/command
configs).
- Telegram target disable_url_preview defaults to true.
- BlockedByModal wired into 8 deletion flows; fetchAuth helper for
multipart/binary calls (reuses api()'s refresh + ApiError mapping).
- Immich tracker 'Checking links' parallelised (concurrency cap 6).
- Backup page: pending-restore banner + Apply-now / Apply-later modal,
restarting overlay polling /api/health, manual 'Create backup' button.
- Command-trackers listener row gets an 'Edit album scope' modal with
inherit/explicit multiselect.
- Users page: Edit user modal (username + role).
- parseDate helper for consistent UTC date rendering.
Migrations / schema
- event_log: + user_id, action_id, action_name (+ backfill user_id from
notification_tracker).
- command_tracker_listener: + allowed_album_ids.
123 lines
4.2 KiB
Python
123 lines
4.2 KiB
Python
"""NUT (UPS)-specific bot command handler."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
from collections.abc import Callable, Coroutine
|
|
from typing import Any
|
|
|
|
from ..database.models import CommandConfig, CommandTracker, ServiceProvider, TelegramBot
|
|
from ..services import make_nut_provider
|
|
from .base import CommandResponse, ProviderCommandHandler
|
|
from .handler import _render_cmd_template
|
|
|
|
_LOGGER = logging.getLogger(__name__)
|
|
|
|
_NUT_COMMANDS = {"status", "devices", "battery"}
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Command dispatch table
|
|
# ---------------------------------------------------------------------------
|
|
|
|
_TEXT_COMMANDS: dict[str, Callable[..., Coroutine[Any, Any, dict[str, Any]]]] = {}
|
|
|
|
|
|
def _text_cmd(fn: Callable[..., Coroutine[Any, Any, dict[str, Any]]]) -> Callable[..., Coroutine[Any, Any, dict[str, Any]]]:
|
|
"""Register a function in the text command dispatch table."""
|
|
name = fn.__name__.removeprefix("_cmd_")
|
|
_TEXT_COMMANDS[name] = fn
|
|
return fn
|
|
|
|
|
|
class NutCommandHandler(ProviderCommandHandler):
|
|
"""Handles NUT-specific bot commands."""
|
|
|
|
provider_type = "nut"
|
|
|
|
def get_provider_commands(self) -> set[str]:
|
|
return _NUT_COMMANDS
|
|
|
|
def get_rate_categories(self) -> dict[str, str]:
|
|
return {"devices": "api", "battery": "api", "status": "api"}
|
|
|
|
async def handle(
|
|
self,
|
|
cmd: str,
|
|
args: str,
|
|
count: int,
|
|
locale: str,
|
|
response_mode: str,
|
|
provider: ServiceProvider,
|
|
cmd_templates: dict[str, dict[str, str]],
|
|
bot: TelegramBot,
|
|
tracker: CommandTracker,
|
|
config: CommandConfig,
|
|
*,
|
|
listener: Any = None,
|
|
page: int = 1,
|
|
) -> CommandResponse | None:
|
|
fn = _TEXT_COMMANDS.get(cmd)
|
|
if fn is None:
|
|
return None
|
|
ctx = await fn(provider, count)
|
|
return CommandResponse(text=_render_cmd_template(cmd_templates, cmd, locale, ctx))
|
|
|
|
|
|
async def _query_ups(
|
|
provider: ServiceProvider,
|
|
) -> list[dict[str, Any]]:
|
|
"""Connect to a NUT provider and query UPS data."""
|
|
from notify_bridge_core.providers.nut.models import NutUpsData
|
|
|
|
results: list[dict[str, Any]] = []
|
|
nut = make_nut_provider(provider)
|
|
try:
|
|
client = nut._make_client()
|
|
await client.connect()
|
|
try:
|
|
devices = await client.list_ups()
|
|
for dev in devices:
|
|
variables = await client.list_var(dev.name)
|
|
data = NutUpsData.from_variables(dev.name, variables)
|
|
results.append({
|
|
"name": data.name,
|
|
"description": data.description,
|
|
"model": data.model,
|
|
"manufacturer": data.manufacturer,
|
|
"status": data.status,
|
|
"battery_charge": int(data.battery_charge) if data.battery_charge is not None else None,
|
|
"battery_runtime": data.battery_runtime_formatted,
|
|
"ups_load": int(data.ups_load) if data.ups_load is not None else None,
|
|
"input_voltage": str(data.input_voltage) if data.input_voltage is not None else None,
|
|
"output_voltage": str(data.output_voltage) if data.output_voltage is not None else None,
|
|
})
|
|
finally:
|
|
await client.disconnect()
|
|
except Exception as exc:
|
|
_LOGGER.warning("Failed to query NUT provider %s: %s", provider.name, exc)
|
|
return results
|
|
|
|
|
|
@_text_cmd
|
|
async def _cmd_status(provider: ServiceProvider, count: int) -> dict[str, Any]:
|
|
devices = await _query_ups(provider)
|
|
return {"devices": devices}
|
|
|
|
|
|
@_text_cmd
|
|
async def _cmd_devices(provider: ServiceProvider, count: int) -> dict[str, Any]:
|
|
devices: list[dict[str, Any]] = []
|
|
nut = make_nut_provider(provider)
|
|
try:
|
|
device_list = await nut.list_collections()
|
|
devices.extend(device_list)
|
|
except Exception as exc:
|
|
_LOGGER.warning("Failed to list devices from %s: %s", provider.name, exc)
|
|
return {"devices": devices}
|
|
|
|
|
|
@_text_cmd
|
|
async def _cmd_battery(provider: ServiceProvider, count: int) -> dict[str, Any]:
|
|
devices = await _query_ups(provider)
|
|
return {"devices": devices}
|