Skip to content

A modern and easy to use dashboard. 80+ integrations. 20K+ icons built in. Authentication out of the box. No YAML, drag and drop configuration.

fix(assistant): make availability controls clear and immediate (#7282)

Thomas95de5fd33563
diff --git a/apps/nextjs/src/app/[locale]/manage/assistant/_components/assistant-configuration.tsx b/apps/nextjs/src/app/[locale]/manage/assistant/_components/assistant-configuration.tsx
index 32213946a..933bee211 100644
--- a/apps/nextjs/src/app/[locale]/manage/assistant/_components/assistant-configuration.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/assistant/_components/assistant-configuration.tsx
@@ -29,7 +29,6 @@ import {
IconAlertTriangle,
IconBrandGithub,
IconCheck,
- IconCircleCheck,
IconDatabaseSearch,
IconKey,
IconPlus,
@@ -181,11 +180,20 @@ export const AssistantConfiguration = ({
);
setModelDiscoveryPath(configuration?.modelDiscoveryPath ?? "");
setModelId(configuration?.modelId ?? "");
- setEnabled(configuration?.enabled ?? false);
setWebSearchEnabled(configuration?.webSearchEnabled ?? false);
setApiKey("");
setCredentialFlow("idle");
- }, [configuration]);
+ }, [
+ configuration?.provider,
+ configuration?.baseUrl,
+ configuration?.modelDiscoveryPath,
+ configuration?.modelId,
+ configuration?.webSearchEnabled,
+ ]);
+
+ useEffect(() => {
+ setEnabled(configuration?.enabled ?? false);
+ }, [configuration?.enabled]);
const normalizedBaseUrl = baseUrl.trim().replace(/\/$/, "");
const normalizedModelDiscoveryPath = modelDiscoveryPath.trim() || null;
@@ -203,7 +211,10 @@ export const AssistantConfiguration = ({
refetch: discoverModels,
} = clientApi.assistant.discoverModels.useQuery(undefined, {
enabled:
- configuration?.connectionConfigured === true && configuration.modelDiscoveryPath !== null && !connectionChanged,
+ enabled &&
+ configuration?.connectionConfigured === true &&
+ configuration.modelDiscoveryPath !== null &&
+ !connectionChanged,
staleTime: 5 * 60_000,
retry: false,
});
@@ -263,6 +274,9 @@ export const AssistantConfiguration = ({
setCredentialFlow("idle");
setHeaders([]);
setClearHeaders(false);
+ // Disabled discovery queries keep their previous models when invalidated.
+ await utils.assistant.discoverModels.cancel();
+ utils.assistant.discoverModels.setData(undefined, []);
await Promise.all([
utils.assistant.getAdminConfiguration.invalidate(),
utils.assistant.discoverModels.invalidate(),
@@ -278,16 +292,20 @@ export const AssistantConfiguration = ({
onError: (error) => showErrorNotification({ title: t("notification.error.title"), message: error.message }),
});
+ const refreshAssistantConfiguration = async () => {
+ await Promise.all([
+ utils.assistant.getAdminConfiguration.invalidate(),
+ utils.assistant.getAvailability.invalidate(),
+ utils.assistant.getRuntimeOptions.invalidate(),
+ ]);
+ if (refreshAfterSave) {
+ router.refresh();
+ }
+ };
+
const saveConfiguration = clientApi.assistant.updateConfiguration.useMutation({
onSuccess: async () => {
- await Promise.all([
- utils.assistant.getAdminConfiguration.invalidate(),
- utils.assistant.getAvailability.invalidate(),
- utils.assistant.getRuntimeOptions.invalidate(),
- ]);
- if (refreshAfterSave) {
- router.refresh();
- }
+ await refreshAssistantConfiguration();
showSuccessNotification({
title: t("notification.saved.title"),
message: t("notification.saved.message"),
@@ -296,7 +314,16 @@ export const AssistantConfiguration = ({
onError: (error) => showErrorNotification({ title: t("notification.error.title"), message: error.message }),
});
- const pending = updateConnection.isPending || saveConfiguration.isPending;
+ const updateAvailability = clientApi.assistant.updateConfiguration.useMutation({
+ onMutate: (input) => setEnabled(input.enabled),
+ onSuccess: refreshAssistantConfiguration,
+ onError: (error) => {
+ setEnabled(configuration?.enabled ?? false);
+ showErrorNotification({ title: t("notification.error.title"), message: error.message });
+ },
+ });
+
+ const pending = updateConnection.isPending || saveConfiguration.isPending || updateAvailability.isPending;
const resetCredentialFlow = () => {
setApiKey("");
@@ -308,7 +335,6 @@ export const AssistantConfiguration = ({
setHeaders([]);
setClearHeaders(false);
setModelId("");
- setEnabled(false);
setWebSearchEnabled(false);
};
@@ -332,7 +358,6 @@ export const AssistantConfiguration = ({
const changeModelDiscoveryPath = (value: string) => {
if (value !== modelDiscoveryPath) {
setModelId("");
- setEnabled(false);
}
setModelDiscoveryPath(value);
};
@@ -380,6 +405,20 @@ export const AssistantConfiguration = ({
return (
<>
<Stack className={classes.configuration} gap="md">
+ <Paper className={classes.enableRow} withBorder p="md" radius="md">
+ <Switch
+ w="100%"
+ styles={{ body: { alignItems: "center", justifyContent: "space-between" } }}
+ checked={enabled}
+ onChange={(event) => updateAvailability.mutate({ enabled: event.currentTarget.checked })}
+ disabled={pending}
+ label={t("enabled.label")}
+ description={t("enabled.description")}
+ labelPosition="left"
+ size="lg"
+ />
+ </Paper>
+
<Paper className={classes.summary} withBorder p="md" radius="md" pos="relative">
<LoadingOverlay visible={pending} />
<Group justify="space-between" align="center">
@@ -673,12 +712,11 @@ export const AssistantConfiguration = ({
actions={
<Group justify="flex-end">
<Button
- leftSection={<IconCircleCheck size={16} />}
onClick={saveAssistantConfiguration}
- disabled={!canSaveConfiguration}
+ disabled={!canSaveConfiguration || pending}
loading={saveConfiguration.isPending}
>
- {t("save")}
+ {t("model.save")}
</Button>
</Group>
}
@@ -798,24 +836,6 @@ export const AssistantConfiguration = ({
</Group>
</Stack>
)}
-
- <Group className={classes.enableRow} justify="space-between" align="center" wrap="nowrap">
- <Box>
- <Text size="sm" fw={600}>
- {t("enabled.label")}
- </Text>
- <Text size="sm" c="dimmed">
- {t("enabled.description")}
- </Text>
- </Box>
- <Switch
- checked={enabled}
- onChange={(event) => setEnabled(event.currentTarget.checked)}
- disabled={!canSaveConfiguration}
- aria-label={t("enabled.label")}
- size="md"
- />
- </Group>
</ConfigurationSection>
</Stack>
</>
diff --git a/packages/api/src/router/assistant.ts b/packages/api/src/router/assistant.ts
index a0795e639..429bcc70c 100644
--- a/packages/api/src/router/assistant.ts
+++ b/packages/api/src/router/assistant.ts
@@ -745,19 +745,36 @@ export const assistantRouter = createTRPCRouter({
.input(
z.object({
enabled: z.boolean(),
- modelId: z.string().trim().min(1).max(256),
+ modelId: z.string().trim().min(1).max(256).optional(),
webSearchEnabled: z.boolean().default(false),
}),
)
.mutation(async ({ ctx, input }) => {
+ if (!input.enabled && !input.modelId) {
+ await ctx.db
+ .update(assistantConfigurations)
+ .set({ enabled: false, updatedAt: new Date() })
+ .where(eq(assistantConfigurations.id, configurationId));
+ return;
+ }
const configuration = await getConfigurationAsync(ctx.db);
if (!configuration) {
throw new TRPCError({ code: "PRECONDITION_FAILED", message: "Save a provider connection first." });
}
+ if (!input.modelId && !configuration.modelId) {
+ throw new TRPCError({ code: "BAD_REQUEST", message: "Choose a model before enabling the Assistant." });
+ }
const requiresApiKey = assistantProviderRequiresApiKey(configuration.provider);
if (input.enabled && requiresApiKey && !configuration.encryptedApiKey) {
throw new TRPCError({ code: "PRECONDITION_FAILED", message: "This provider requires an API key." });
}
+ if (!input.modelId) {
+ await ctx.db
+ .update(assistantConfigurations)
+ .set({ enabled: input.enabled, updatedAt: new Date() })
+ .where(eq(assistantConfigurations.id, configurationId));
+ return;
+ }
if (input.webSearchEnabled && !assistantProviderCanUseOpenRouterServerTools(configuration.provider)) {
throw new TRPCError({
code: "BAD_REQUEST",
diff --git a/packages/onboarding/src/setup-studio.tsx b/packages/onboarding/src/setup-studio.tsx
index 2f1048819..9e5076e60 100644
--- a/packages/onboarding/src/setup-studio.tsx
+++ b/packages/onboarding/src/setup-studio.tsx
@@ -25,7 +25,6 @@ import {
Slider,
Stack,
Switch,
- Tabs,
Text,
TextInput,
ThemeIcon,
@@ -1591,32 +1590,31 @@ const BoardPreview = ({
const Extensions = (props: StudioSectionProps) => {
const t = useI18n("init.studio.extend");
return (
- <Stack gap={0}>
+ <Stack gap="md">
<Title id="studio-section-title" ref={props.headingRef} order={2} tabIndex={-1} mb="xs">
{t("title")}
</Title>
- <Tabs defaultValue="workshop">
- <Tabs.List grow aria-label={t("tabsLabel")}>
- <Tabs.Tab value="workshop" leftSection={<IconSparkles size={16} />}>
- {t("workshop")}
- </Tabs.Tab>
- <Tabs.Tab value="assistant" leftSection={<IconRobot size={16} />}>
- {t("assistant")}
- </Tabs.Tab>
- <Tabs.Tab value="mcp" leftSection={<IconCode size={16} />}>
- MCP
- </Tabs.Tab>
- </Tabs.List>
- <Tabs.Panel value="workshop" pt="xs">
- <WorkshopSetup environment={props.environment} runtimeCapabilities={props.runtimeCapabilities} />
- </Tabs.Panel>
- <Tabs.Panel value="assistant" pt="xs">
- <AssistantSetup environment={props.environment} configuration={props.assistantConfiguration} />
- </Tabs.Panel>
- <Tabs.Panel value="mcp" pt="xs">
- <McpSetup environment={props.environment} />
- </Tabs.Panel>
- </Tabs>
+ <Stack gap="sm">
+ <Group gap="xs">
+ <IconRobot size={20} aria-hidden />
+ <Title order={3}>{t("assistant")}</Title>
+ </Group>
+ <AssistantSetup environment={props.environment} configuration={props.assistantConfiguration} />
+ </Stack>
+ <Accordion variant="separated" order={3}>
+ <Accordion.Item value="workshop">
+ <Accordion.Control icon={<IconSparkles size={18} />}>{t("workshop")}</Accordion.Control>
+ <Accordion.Panel>
+ <WorkshopSetup environment={props.environment} runtimeCapabilities={props.runtimeCapabilities} />
+ </Accordion.Panel>
+ </Accordion.Item>
+ <Accordion.Item value="mcp">
+ <Accordion.Control icon={<IconCode size={18} />}>MCP</Accordion.Control>
+ <Accordion.Panel>
+ <McpSetup environment={props.environment} />
+ </Accordion.Panel>
+ </Accordion.Item>
+ </Accordion>
</Stack>
);
};
diff --git a/packages/translation/src/lang/en.json b/packages/translation/src/lang/en.json
index ea9936372..2a361a78e 100644
--- a/packages/translation/src/lang/en.json
+++ b/packages/translation/src/lang/en.json
@@ -7233,6 +7233,7 @@
"model": {
"title": "Model",
"description": "Select a discovered model or enter an exact endpoint model ID.",
+ "save": "Save model settings",
"placeholder": "Model ID",
"refresh": "Refresh models",
"chooseModel": "Choose the model used for new conversations.",
@@ -7259,7 +7260,7 @@
},
"enabled": {
"label": "Enable Assistant",
- "description": "Shows the assistant to all signed-in users. Existing Homarr permissions still apply to every internal tool call."
+ "description": "Turn off to hide the Assistant for all users. Saved provider settings are kept for later."
},
"save": "Save assistant",
"notification": {