feat: improve assistant interactions

This commit is contained in:
ajnart committed 2026-08-04 13:21:39 +02:00
1 parent 1642a862d9
commit 8e557fb9fd
25 files changed
+1345 -244

No files matched your search

@@ -0,0 +1,115 @@
// @vitest-environment node
import { describe, expect, test, vi } from "vitest";
import type { Session } from "@homarr/auth";
import { createId } from "@homarr/common";
import { integrations, integrationUserPermissions, users } from "@homarr/db/schema";
import { createDb } from "@homarr/db/test";
import { calendarRouter } from "../../widgets/calendar";
const { getDataAsync, handler } = vi.hoisted(() => {
const getDataAsync = vi.fn();
return { getDataAsync, handler: vi.fn(() => ({ getDataAsync })) };
});
vi.mock("@homarr/request-handler/calendar", () => ({
calendarMonthRequestHandler: { handler },
}));
const createCallerAsync = async () => {
const db = createDb();
const userId = createId();
const integrationId = createId();
await db.insert(users).values({ id: userId });
await db.insert(integrations).values({
id: integrationId,
kind: "radarr",
name: "Radarr",
url: "https://radarr.example.com",
});
await db.insert(integrationUserPermissions).values({ integrationId, userId, permission: "use" });
const session = {
user: { id: userId, permissions: [], colorScheme: "light" },
expires: new Date().toISOString(),
} satisfies Session;
return { caller: calendarRouter.createCaller({ db, deviceType: undefined, session }), integrationId };
};
const createEvent = (title: string, releaseType?: "digitalRelease" | "physicalRelease") => ({
title,
subTitle: null,
description: null,
startDate: new Date("2025-05-10T12:00:00.000Z"),
endDate: null,
image: null,
location: null,
indicatorColor: "blue",
links: [],
...(releaseType ? { metadata: { type: "radarr" as const, releaseType } } : {}),
});
describe("calendarRouter.findAllEvents", () => {
test("uses human month numbers and filters Radarr release types", async () => {
const { caller, integrationId } = await createCallerAsync();
getDataAsync.mockResolvedValueOnce({
data: [
createEvent("Digital", "digitalRelease"),
createEvent("Physical", "physicalRelease"),
createEvent("Sonarr episode"),
],
timestamp: new Date(),
});
const result = await caller.findAllEvents({
integrationIds: [integrationId],
year: 2025,
month: 5,
releaseType: ["digitalRelease"],
showUnmonitored: true,
});
expect(handler).toHaveBeenCalledWith(expect.objectContaining({ id: integrationId }), {
year: 2025,
month: 5,
releaseType: ["digitalRelease"],
showUnmonitored: true,
});
expect(result[0]?.events.map((event) => event.title)).toEqual(["Digital", "Sonarr episode"]);
});
test("rejects zero-based and out-of-range months", async () => {
const { caller } = await createCallerAsync();
await expect(
caller.findAllEvents({
integrationIds: [],
year: 2025,
month: 0,
releaseType: [],
showUnmonitored: true,
}),
).rejects.toThrow();
});
test("returns an integration-scoped error instead of silently dropping a failed calendar", async () => {
const { caller, integrationId } = await createCallerAsync();
getDataAsync.mockRejectedValueOnce(new Error("remote calendar unavailable"));
await expect(
caller.findAllEvents({
integrationIds: [integrationId],
year: 2025,
month: 5,
releaseType: ["inCinemas", "digitalRelease", "physicalRelease"],
showUnmonitored: true,
}),
).resolves.toEqual([
{
events: [],
integration: { id: integrationId, name: "Radarr", kind: "radarr" },
error: "Calendar events could not be loaded from this integration.",
},
]);
});
});
+20 -5
View File
@@ -17,13 +17,13 @@ export const calendarRouter = createTRPCRouter({
mcp: {
enabled: true,
description:
"Get calendar events for upcoming and recent media releases. REQUIRED: integrationIds (array of integration IDs from integration_all, filter by kind sonarr/radarr/lidarr/readarr), year (number), month (number), releaseType (array of 'inCinemas'|'digitalRelease'|'physicalRelease'), showUnmonitored (boolean). Great for 'what's coming out this week/month?'",
"Get calendar events from calendar-capable integrations. REQUIRED: integrationIds (IDs from integration_all whose kinds include Sonarr, Radarr, Lidarr, Readarr, Home Assistant, Nextcloud, or iCal), year (four-digit number), month (human month number from 1=January through 12=December), releaseType (Radarr filters: 'inCinemas'|'digitalRelease'|'physicalRelease'), showUnmonitored (boolean). Great for 'what's coming out this week/month?'",
},
})
.input(
z.object({
year: z.number(),
month: z.number(),
year: z.number().int().min(1970).max(9999),
month: z.number().int().min(1).max(12),
releaseType: z.array(z.enum(radarrReleaseTypes)),
showUnmonitored: z.boolean(),
}),
@@ -35,9 +35,12 @@ export const calendarRouter = createTRPCRouter({
const { integrationIds: _integrationIds, ...handlerInput } = input;
const innerHandler = calendarMonthRequestHandler.handler(integration, handlerInput);
const { data } = await innerHandler.getDataAsync();
const events = data.filter(
(event) => event.metadata?.type !== "radarr" || input.releaseType.includes(event.metadata.releaseType),
);
return {
events: data,
events,
integration: {
id: integration.id,
name: integration.name,
@@ -62,7 +65,19 @@ export const calendarRouter = createTRPCRouter({
{ cause: result.reason },
),
);
return [];
return integration
? [
{
events: [],
integration: {
id: integration.id,
name: integration.name,
kind: integration.kind,
},
error: "Calendar events could not be loaded from this integration.",
},
]
: [];
});
}),
});
@@ -0,0 +1,18 @@
// @vitest-environment node
import { describe, expect, test } from "vitest";
import { getCalendarMonthRange } from "./calendar";
describe("getCalendarMonthRange", () => {
test("treats month 5 as May and includes the calendar overflow days", () => {
const { startDate, endDate } = getCalendarMonthRange(2025, 5);
expect(startDate.getFullYear()).toBe(2025);
expect(startDate.getMonth()).toBe(3);
expect(startDate.getDate()).toBe(25);
expect(endDate.getFullYear()).toBe(2025);
expect(endDate.getMonth()).toBe(5);
expect(endDate.getDate()).toBe(6);
});
});
+10 -7
View File
@@ -6,6 +6,14 @@ import type { CalendarEvent, RadarrReleaseType } from "@homarr/integrations/type
import { createIntegrationRequestHandler } from "./lib/integration-request-handler";
export const getCalendarMonthRange = (year: number, month: number) => {
const zeroBasedMonth = month - 1;
return {
startDate: dayjs().year(year).month(zeroBasedMonth).startOf("month").subtract(6, "days").toDate(),
endDate: dayjs().year(year).month(zeroBasedMonth).endOf("month").add(6, "days").toDate(),
};
};
export const calendarMonthRequestHandler = createIntegrationRequestHandler<
CalendarEvent[],
IntegrationKindByCategory<"calendar">,
@@ -14,13 +22,8 @@ export const calendarMonthRequestHandler = createIntegrationRequestHandler<
async requestAsync(integration, input) {
const integrationInstance = await createIntegrationAsync(integration);
// Calendar component shows up to 6 days before and after the month, for example if 1. of january is sunday, it shows the last 6 days of december.
const startDate = dayjs().year(input.year).month(input.month).startOf("month").subtract(6, "days");
const endDate = dayjs().year(input.year).month(input.month).endOf("month").add(6, "days");
const { startDate, endDate } = getCalendarMonthRange(input.year, input.month);
return await integrationInstance.getCalendarEventsAsync(
startDate.toDate(),
endDate.toDate(),
input.showUnmonitored,
);
return await integrationInstance.getCalendarEventsAsync(startDate, endDate, input.showUnmonitored);
},
});
+15
View File
@@ -1559,7 +1559,10 @@
"composerPlaceholder": "Ask Homarr Assistant…",
"runtime": {
"model": "Model",
"searchModels": "Search models",
"noModels": "No models available",
"otherModels": "Other models",
"imageInput": "Accepts image input",
"thinking": "Thinking mode",
"reasoning": {
"auto": "Auto",
@@ -1598,12 +1601,18 @@
"mentions": {
"menu": "Add Homarr context",
"hint": "Type @ to add context",
"context": "Context",
"app": "Apps",
"integration": "Integrations",
"board": "Boards",
"widget": "Widgets",
"tools": "Available tools"
},
"markdown": {
"diagram": "Diagram",
"renderingDiagram": "Rendering diagram…",
"diagramUnavailable": "This diagram could not be rendered."
},
"commands": {
"menu": "Assistant commands",
"hint": "Type / for shortcuts",
@@ -1657,6 +1666,12 @@
},
"toolInput": "Input",
"toolOutput": "Output",
"webSearch": {
"title": "Web search",
"completed": "OpenRouter searched the live web for this response.",
"searches": "{count, plural, one {# search} other {# searches}}",
"sources": "{count, plural, one {# source} other {# sources}}"
},
"responseError": {
"title": "The assistant could not finish",
"description": "Try again. If the problem continues, ask an administrator to verify the configured model endpoint.",
+1 -1
View File
@@ -34,7 +34,7 @@ interface FetchCalendarProps extends WidgetComponentProps<"calendar"> {
const FetchCalendar = ({ month, setMonth, isEditMode, integrationIds, options }: FetchCalendarProps) => {
const input = {
integrationIds,
month: month.getMonth(),
month: month.getMonth() + 1,
year: month.getFullYear(),
releaseType: options.releaseType,
showUnmonitored: options.showUnmonitored,