Skip to content

AI Agents & MCPs & AI Workflow Automation • (~400 MCP servers for AI agents) • AI Automation / AI Agent with MCPs • AI Workflows & AI Agents • MCPs for AI Agents

feat(ai): choose which AI provider and image model chat uses for search and images (#15886)

Hazem Adel0e243a7d700f
diff --git a/bun.lock b/bun.lock
index 6fa290b0f2d..ce07ab442ba 100644
--- a/bun.lock
+++ b/bun.lock
@@ -120,7 +120,7 @@
},
"packages/core/execution": {
"name": "@activepieces/core-execution",
- "version": "0.23.3",
+ "version": "0.23.4",
"dependencies": {
"@activepieces/core-piece-types": "workspace:*",
"@activepieces/core-utils": "workspace:*",
@@ -165,7 +165,7 @@
},
"packages/core/shared": {
"name": "@activepieces/shared",
- "version": "0.185.1",
+ "version": "0.186.0",
"dependencies": {
"@activepieces/core-execution": "workspace:*",
"@activepieces/core-formula": "workspace:*",
diff --git a/packages/core/execution/package.json b/packages/core/execution/package.json
index c926a7f0a8d..f642e826e8f 100644
--- a/packages/core/execution/package.json
+++ b/packages/core/execution/package.json
@@ -1,6 +1,6 @@
{
"name": "@activepieces/core-execution",
- "version": "0.23.3",
+ "version": "0.23.4",
"type": "commonjs",
"main": "./dist/src/index.js",
"scripts": {
diff --git a/packages/core/execution/src/lib/workers/worker-contract.ts b/packages/core/execution/src/lib/workers/worker-contract.ts
index 2d7d9179764..78ce7655228 100644
--- a/packages/core/execution/src/lib/workers/worker-contract.ts
+++ b/packages/core/execution/src/lib/workers/worker-contract.ts
@@ -159,6 +159,9 @@ export type AgentConfigResponse = {
modelId: string
fastModelId: string
imageModelId?: string
+ searchCredentials?: AiProviderCredentials
+ searchModelId?: string
+ imageCredentials?: AiProviderCredentials
systemPrompt: string
messages: unknown[]
allMessages: unknown[]
diff --git a/packages/core/shared/package.json b/packages/core/shared/package.json
index 8972c89784f..1216b083c87 100644
--- a/packages/core/shared/package.json
+++ b/packages/core/shared/package.json
@@ -1,6 +1,6 @@
{
"name": "@activepieces/shared",
- "version": "0.185.1",
+ "version": "0.186.0",
"type": "commonjs",
"sideEffects": false,
"main": "./dist/src/index.js",
diff --git a/packages/core/shared/src/lib/management/ai-tools/index.ts b/packages/core/shared/src/lib/management/ai-tools/index.ts
index ed1ac4894c0..a5f16a2051b 100644
--- a/packages/core/shared/src/lib/management/ai-tools/index.ts
+++ b/packages/core/shared/src/lib/management/ai-tools/index.ts
@@ -13,6 +13,7 @@ export enum AiToolProvider {
FIRECRAWL = 'firecrawl',
APIFY = 'apify',
FAL = 'fal',
+ AI_PROVIDER = 'ai_provider',
}
export const AiToolAuthConfig = z.object({
@@ -23,6 +24,12 @@ export type AiToolAuthConfig = z.infer<typeof AiToolAuthConfig>
export const AiToolProviderConfig = z.record(z.string(), z.unknown())
export type AiToolProviderConfig = z.infer<typeof AiToolProviderConfig>
+export const AiProviderToolConfig = z.object({
+ aiProviderId: z.string().min(1, formErrors.required),
+ modelId: z.string().min(1, formErrors.required).optional(),
+})
+export type AiProviderToolConfig = z.infer<typeof AiProviderToolConfig>
+
export const AiToolConfig = z.object({
...BaseModelSchema,
platformId: z.string(),
@@ -46,7 +53,7 @@ export type AiToolConfigWithoutSensitiveData = z.infer<typeof AiToolConfigWithou
export const CreateAiToolConfigRequest = z.object({
capability: z.enum(AiToolCapability),
provider: z.enum(AiToolProvider),
- auth: AiToolAuthConfig,
+ auth: AiToolAuthConfig.optional(),
config: AiToolProviderConfig.optional(),
enabled: z.boolean().optional(),
})
@@ -73,3 +80,8 @@ export const GetEnabledAiToolsResponse = z.object({
imageGeneration: ResolvedAiTool.optional(),
})
export type GetEnabledAiToolsResponse = z.infer<typeof GetEnabledAiToolsResponse>
+
+export type AiProviderToolChoices = {
+ webSearch?: AiProviderToolConfig
+ imageGeneration?: AiProviderToolConfig
+}
diff --git a/packages/server/api/src/app/ai/ai-tool-config-service.ts b/packages/server/api/src/app/ai/ai-tool-config-service.ts
index 24e69732006..73a18d688bd 100644
--- a/packages/server/api/src/app/ai/ai-tool-config-service.ts
+++ b/packages/server/api/src/app/ai/ai-tool-config-service.ts
@@ -1,13 +1,15 @@
-import { ActivepiecesError, apId, ErrorCode, isNil, PlatformId, spreadIfDefined } from '@activepieces/core-utils'
-import { AiToolAuthConfig, AiToolCapability, AiToolConfigWithoutSensitiveData, CreateAiToolConfigRequest, GetEnabledAiToolsResponse, ResolvedAiTool, UpdateAiToolConfigRequest } from '@activepieces/shared'
+import { ActivepiecesError, AIProviderName, apId, ErrorCode, isNil, PlatformId, spreadIfDefined } from '@activepieces/core-utils'
+import { aiUtils } from '@activepieces/server-utils'
+import { AIProviderModelType, AiProviderToolChoices, AiProviderToolConfig, AiToolAuthConfig, AiToolCapability, AiToolConfigWithoutSensitiveData, AiToolProvider, AiToolProviderConfig, CreateAiToolConfigRequest, GetEnabledAiToolsResponse, ResolvedAiTool, UpdateAiToolConfigRequest } from '@activepieces/shared'
import { FastifyBaseLogger } from 'fastify'
import { repoFactory } from '../core/db/repo-factory'
import { encryptUtils } from '../helper/encryption'
+import { aiProviderService } from './ai-provider-service'
import { AiToolConfigEntity, AiToolConfigSchema } from './ai-tool-config-entity'
const aiToolConfigRepo = repoFactory<AiToolConfigSchema>(AiToolConfigEntity)
-export const aiToolConfigService = (_log: FastifyBaseLogger) => ({
+export const aiToolConfigService = (log: FastifyBaseLogger) => ({
async list(platformId: PlatformId): Promise<AiToolConfigWithoutSensitiveData[]> {
const configs = await aiToolConfigRepo().findBy({ platformId })
return configs.map(toWithoutSensitiveData)
@@ -15,7 +17,13 @@ export const aiToolConfigService = (_log: FastifyBaseLogger) => ({
async upsert(platformId: PlatformId, request: CreateAiToolConfigRequest): Promise<void> {
const existing = await aiToolConfigRepo().findOneBy({ platformId, capability: request.capability })
- const encryptedAuth = await encryptUtils.encryptObject(request.auth)
+ if (request.provider === AiToolProvider.AI_PROVIDER) {
+ await assertProviderChoice({ platformId, capability: request.capability, config: request.config, log })
+ }
+ else if (isNil(request.auth)) {
+ throw new ActivepiecesError({ code: ErrorCode.VALIDATION, params: { message: 'An API key is required for this service' } })
+ }
+ const encryptedAuth = await encryptUtils.encryptObject(request.auth ?? {})
await aiToolConfigRepo().save({
id: existing?.id ?? apId(),
platformId,
@@ -35,6 +43,14 @@ export const aiToolConfigService = (_log: FastifyBaseLogger) => ({
params: { entityId: id, entityType: 'AiToolConfig' },
})
}
+ const provider = request.provider ?? config.provider
+ if (provider === AiToolProvider.AI_PROVIDER && (!isNil(request.provider) || !isNil(request.config))) {
+ await assertProviderChoice({ platformId, capability: config.capability, config: request.config ?? config.config, log })
+ }
+ const leavesProviderWithoutKey = config.provider === AiToolProvider.AI_PROVIDER && provider !== AiToolProvider.AI_PROVIDER && isNil(request.auth)
+ if (leavesProviderWithoutKey) {
+ throw new ActivepiecesError({ code: ErrorCode.VALIDATION, params: { message: 'An API key is required for this service' } })
+ }
const encryptedAuth = !isNil(request.auth) ? await encryptUtils.encryptObject(request.auth) : undefined
await aiToolConfigRepo().update(id, {
...spreadIfDefined('provider', request.provider),
@@ -51,7 +67,7 @@ export const aiToolConfigService = (_log: FastifyBaseLogger) => ({
async getEnabledTools({ platformId }: { platformId: PlatformId }): Promise<GetEnabledAiToolsResponse> {
const configs = await aiToolConfigRepo().findBy({ platformId, enabled: true })
const result: GetEnabledAiToolsResponse = {}
- for (const config of configs) {
+ for (const config of configs.filter((row) => row.provider !== AiToolProvider.AI_PROVIDER)) {
const resolved = await toResolvedTool(config)
if (isNil(resolved)) {
continue
@@ -70,8 +86,39 @@ export const aiToolConfigService = (_log: FastifyBaseLogger) => ({
}
return result
},
+
+ async getProviderChoices({ platformId }: { platformId: PlatformId }): Promise<AiProviderToolChoices> {
+ const configs = await aiToolConfigRepo().findBy({ platformId, enabled: true, provider: AiToolProvider.AI_PROVIDER })
+ return Object.fromEntries(configs.flatMap((config) => {
+ const choice = AiProviderToolConfig.safeParse(config.config)
+ const key = CHOICE_KEY_BY_CAPABILITY[config.capability]
+ return choice.success && !isNil(key) ? [[key, choice.data]] : []
+ }))
+ },
})
+async function assertProviderChoice({ platformId, capability, config, log }: { platformId: PlatformId, capability: AiToolCapability, config: AiToolProviderConfig | null | undefined, log: FastifyBaseLogger }): Promise<void> {
+ const choice = AiProviderToolConfig.safeParse(config)
+ const configs = choice.success ? await aiProviderService(log).listConfigs(platformId) : []
+ const aiProvider = choice.success ? configs.find((row) => row.id === choice.data.aiProviderId) : undefined
+ const servesAllProjects = !isNil(aiProvider) && aiProvider.projectScope === 'all'
+ if (choice.success && servesAllProjects && await providerCovers({ platformId, capability, aiProvider, modelId: choice.data.modelId, log })) {
+ return
+ }
+ throw new ActivepiecesError({ code: ErrorCode.VALIDATION, params: { message: 'This AI provider cannot be used for this capability' } })
+}
+
+async function providerCovers({ platformId, capability, aiProvider, modelId, log }: { platformId: PlatformId, capability: AiToolCapability, aiProvider: { id: string, provider: AIProviderName }, modelId: string | undefined, log: FastifyBaseLogger }): Promise<boolean> {
+ if (capability === AiToolCapability.WEB_SEARCH) {
+ return aiUtils.supportsWebSearch(aiProvider.provider)
+ }
+ if (capability !== AiToolCapability.IMAGE_GENERATION || isNil(modelId)) {
+ return false
+ }
+ const models = await aiProviderService(log).listModels({ platformId, provider: aiProvider.provider, scope: { type: 'platform' }, configId: aiProvider.id })
+ return models.some((model) => model.id === modelId && model.type === AIProviderModelType.IMAGE)
+}
+
function toWithoutSensitiveData(config: AiToolConfigSchema): AiToolConfigWithoutSensitiveData {
return {
id: config.id,
@@ -79,7 +126,7 @@ function toWithoutSensitiveData(config: AiToolConfigSchema): AiToolConfigWithout
provider: config.provider,
config: config.config,
enabled: config.enabled,
- hasApiKey: !isNil(config.auth),
+ hasApiKey: config.provider !== AiToolProvider.AI_PROVIDER && !isNil(config.auth),
}
}
@@ -94,3 +141,8 @@ async function toResolvedTool(config: AiToolConfigSchema): Promise<ResolvedAiToo
...spreadIfDefined('config', config.config ?? undefined),
}
}
+
+const CHOICE_KEY_BY_CAPABILITY: Partial<Record<AiToolCapability, keyof AiProviderToolChoices>> = {
+ [AiToolCapability.WEB_SEARCH]: 'webSearch',
+ [AiToolCapability.IMAGE_GENERATION]: 'imageGeneration',
+}
diff --git a/packages/server/api/src/app/ee/agent/rpc/agent-config-rpc.ts b/packages/server/api/src/app/ee/agent/rpc/agent-config-rpc.ts
index 3a5dffc9aee..9ab01d02267 100644
--- a/packages/server/api/src/app/ee/agent/rpc/agent-config-rpc.ts
+++ b/packages/server/api/src/app/ee/agent/rpc/agent-config-rpc.ts
@@ -1,6 +1,6 @@
import { ActivepiecesError, ErrorCode, isNil, spreadIfDefined, tryCatch } from '@activepieces/core-utils'
-import { agentAiUtils, aiUtils } from '@activepieces/server-utils'
-import { AgentConfigResponse, AgentConversationStatus, AgentRunSource, GetAgentConfigRequest, GetEnabledAiToolsResponse, PersistedAgentMessage, PersistedAgentPartType, PersistedAgentRole } from '@activepieces/shared'
+import { agentAiUtils, aiUtils, ModelTierSurface } from '@activepieces/server-utils'
+import { AgentConfigResponse, AgentConversationStatus, AgentRunSource, AiProviderToolChoices, AiProviderToolConfig, AIProviderWithoutSensitiveData, GetAgentConfigRequest, GetEnabledAiToolsResponse, GetProviderConfigResponse, PersistedAgentMessage, PersistedAgentPartType, PersistedAgentRole } from '@activepieces/shared'
import { ModelMessage } from 'ai'
import { FastifyBaseLogger } from 'fastify'
import { agentApprovalGate } from '.././agent-approval-gate'
@@ -12,6 +12,7 @@ import { chatPersonalizationService } from '.././personalization/chat-personaliz
import { agentPrompt } from '.././prompt/agent-prompt'
import { agentSurfaceNotes } from '.././prompt/agent-surface-notes'
import { UserIdentity } from '.././prompt/agent-user-identity'
+import { aiProviderService, ProviderScope } from '../../../ai/ai-provider-service'
import { aiToolConfigService } from '../../../ai/ai-tool-config-service'
import { appConnectionService } from '../../../app-connection/app-connection-service/app-connection-service'
import { system } from '../../../helper/system/system'
@@ -35,10 +36,11 @@ export const agentConfigRpc = (log: FastifyBaseLogger) => ({
const isBuilder = requestedSource === AgentRunSource.AGENT_BUILDER
const carriesChatContext = requestedSource !== AgentRunSource.FLOW_STEP && requestedSource !== AgentRunSource.AGENT && !isBuilder
- const [conversation, userProjects, enabledAiTools] = await Promise.all([
+ const [conversation, userProjects, enabledAiTools, providerChoices] = await Promise.all([
loadOrStartConversation({ conversationId, platformId, userId, source: requestedSource, projectId: requestedProjectId, modelName, agentId: linkedAgentId, flowRunId }),
agentHelpers.getUserProjects({ platformId, userId, log }),
aiToolConfigService(log).getEnabledTools({ platformId }),
+ aiToolConfigService(log).getProviderChoices({ platformId }),
])
const [scopedMcpCredentials, runMemory, runUser, platformResult, identityResult, agentsSurfaceOn] = await Promise.all([
@@ -92,15 +94,21 @@ export const agentConfigRpc = (log: FastifyBaseLogger) => ({
const userContent = await buildUserContentWithFiles({ text: userMessage, files, attachmentNote: buildAttachmentNote(attachmentRefs) })
const aiTools: GetEnabledAiToolsResponse = dryRun ? {} : enabledAiTools
+ const surface = agentHelpers.surfaceOf({ source: requestedSource })
+ const chosenProviders = dryRun
+ ? { search: null, image: null }
+ : await resolveChosenProviders({ platformId, choices: providerChoices, surface, scope: runScope, log })
const actingRun = !dryRun && !discoveryOnly
const emailEnabled = actingRun && carriesChatContext && smtpEmailSender(log).isSmtpConfigured()
const agentsAvailable = actingRun && agentsSurfaceOn
const fetchAvailable = !dryRun
// Tavily takes precedence over native LLM search; native is only the no-Tavily fallback.
const tavilySearchAvailable = !isNil(aiTools.webSearch)
- const webSearchAvailable = fetchAvailable && (tavilySearchAvailable || aiUtils.supportsWebSearch(providerConfig.provider))
+ const webSearchAvailable = fetchAvailable && (tavilySearchAvailable || aiUtils.supportsWebSearch((chosenProviders.search?.credentials ?? providerConfig).provider))
const generatesImagesOnProvider = actingRun && isNil(aiTools.imageGeneration)
- const imageModelId = generatesImagesOnProvider ? await agentHelpers.resolveImageModelId({ platformId, providerConfig, scope: runScope, log }) : undefined
+ const imageModelId = !generatesImagesOnProvider
+ ? undefined
+ : chosenProviders.image?.modelId ?? await agentHelpers.resolveImageModelId({ platformId, providerConfig, scope: runScope, log })
const lockResult = await agentHelpers.conversationRepo()
.createQueryBuilder()
@@ -125,7 +133,6 @@ export const agentConfigRpc = (log: FastifyBaseLogger) => ({
const selectedModel = modelName ?? conversation.modelName ?? null
// The tier resolver finds no tier for a concrete model id and silently returns the default,
// so a source that names its own model must never be routed through it.
- const surface = agentHelpers.surfaceOf({ source: requestedSource })
const namesItsOwnModel = surface === 'flow'
const tier = agentHelpers.resolveTier({ tierId: namesItsOwnModel ? null : selectedModel, surface })
const resolvedModelId = namesItsOwnModel && !isNil(modelName)
@@ -248,6 +255,9 @@ export const agentConfigRpc = (log: FastifyBaseLogger) => ({
modelId: resolvedModelId,
fastModelId,
...spreadIfDefined('imageModelId', imageModelId),
+ ...spreadIfDefined('searchCredentials', chosenProviders.search?.credentials),
+ ...spreadIfDefined('searchModelId', chosenProviders.search?.modelId),
+ ...spreadIfDefined('imageCredentials', chosenProviders.image?.credentials),
systemPrompt: systemPromptText,
messages: messagesForLlm,
allMessages,
@@ -267,3 +277,61 @@ export const agentConfigRpc = (log: FastifyBaseLogger) => ({
},
})
+
+async function resolveChosenProviders({ platformId, choices, surface, scope, log }: { platformId: string, choices: AiProviderToolChoices, surface: ModelTierSurface, scope: ProviderScope, log: FastifyBaseLogger }): Promise<ChosenProviders> {
+ if (isNil(choices.webSearch) && isNil(choices.imageGeneration)) {
+ return { search: null, image: null }
+ }
+ const configs = await aiProviderService(log).listConfigs(platformId)
+ const [search, image] = await Promise.all([
+ resolveChosenProvider({ platformId, configs, choice: choices.webSearch, scope, log }).then((credentials) => withSearchModel({ platformId, credentials, surface, scope, log })),
+ resolveChosenProvider({ platformId, configs, choice: choices.imageGeneration, scope, log }).then((credentials) => withImageModel({ credentials, modelId: choices.imageGeneration?.modelId, log })),
+ ])
+ return { search, image }
+}
+
+async function withSearchModel({ platformId, credentials, surface, scope, log }: { platformId: string, credentials: GetProviderConfigResponse | null, surface: ModelTierSurface, scope: ProviderScope, log: FastifyBaseLogger }): Promise<ChosenProvider | null> {
+ if (isNil(credentials)) {
+ return null
+ }
+ const { data: modelId, error } = await tryCatch(() => agentHelpers.resolveFastModelId({ platformId, providerConfig: credentials, surface, scope, log }))
+ if (error) {
+ log.warn({ error, aiProvider: { id: credentials.configId } }, '[agentRpc#getAgentConfig] Chosen search provider has no usable model, using the chat provider')
+ return null
+ }
+ return { credentials, modelId }
+}
+
+function withImageModel({ credentials, modelId, log }: { credentials: GetProviderConfigResponse | null, modelId: string | undefined, log: FastifyBaseLogger }): ChosenProvider | null {
+ if (isNil(credentials) || isNil(modelId)) {
+ return null
+ }
+ const modelAllowed = credentials.modelScope !== 'selected' || credentials.modelIds.includes(modelId)
+ if (!modelAllowed) {
+ log.warn({ aiProvider: { id: credentials.configId } }, '[agentRpc#getAgentConfig] Chosen image model is no longer allowed on its key, using the chat provider')
+ return null
+ }
+ return { credentials, modelId }
+}
+
+async function resolveChosenProvider({ platformId, configs, choice, scope, log }: { platformId: string, configs: AIProviderWithoutSensitiveData[], choice: AiProviderToolConfig | undefined, scope: ProviderScope, log: FastifyBaseLogger }): Promise<GetProviderConfigResponse | null> {
+ const row = isNil(choice) ? undefined : configs.find((config) => config.id === choice.aiProviderId)
+ if (isNil(row)) {
+ return null
+ }
+ const { data, error } = await tryCatch(() => aiProviderService(log).getConfigOrThrow({ platformId, provider: row.provider, scope, configId: row.id }))
+ if (error) {
+ log.warn({ error, aiProvider: { id: row.id } }, '[agentRpc#getAgentConfig] Chosen AI provider cannot serve this run, using the chat provider')
+ }
+ return data ?? null
+}
+
+type ChosenProvider = {
+ credentials: GetProviderConfigResponse
+ modelId: string
+}
+
+type ChosenProviders = {
+ search: ChosenProvider | null
+ image: ChosenProvider | null
+}
diff --git a/packages/server/api/test/integration/ee/ai-tools/ai-tool-config.test.ts b/packages/server/api/test/integration/ee/ai-tools/ai-tool-config.test.ts
index 66d315f826e..d56696a5501 100644
--- a/packages/server/api/test/integration/ee/ai-tools/ai-tool-config.test.ts
+++ b/packages/server/api/test/integration/ee/ai-tools/ai-tool-config.test.ts
@@ -1,7 +1,10 @@
+import { AIProviderName } from '@activepieces/core-utils'
import { AiToolCapability, AiToolProvider, DefaultProjectRole } from '@activepieces/shared'
import { FastifyInstance } from 'fastify'
import { StatusCodes } from 'http-status-codes'
+import { aiToolConfigService } from '../../../../src/app/ai/ai-tool-config-service'
import { db } from '../../../helpers/db'
+import { mockAndSaveAIProvider } from '../../../helpers/mocks'
import { createMemberContext, createTestContext, TestContext } from '../../../helpers/test-context'
import { setupTestEnvironment, teardownTestEnvironment } from '../../../helpers/test-setup'
@@ -68,6 +71,78 @@ describe('AI Tools API', () => {
})
})
+ describe('using an AI provider as the source', () => {
+ it('saves a web search choice for a provider that searches and serves every project', async () => {
+ const aiProvider = await mockAndSaveAIProvider({ platformId: ctx.platform.id, provider: AIProviderName.GOOGLE, projectScope: 'all' })
+
+ const response = await ctx.post('/v1/ai-tools', {
+ capability: AiToolCapability.WEB_SEARCH,
+ provider: AiToolProvider.AI_PROVIDER,
+ config: { aiProviderId: aiProvider.id },
+ })
+
+ expect(response?.statusCode).toBe(StatusCodes.OK)
+ const choices = await aiToolConfigService(app!.log).getProviderChoices({ platformId: ctx.platform.id })
+ expect(choices.webSearch).toEqual({ aiProviderId: aiProvider.id })
+ const tools = await aiToolConfigService(app!.log).getEnabledTools({ platformId: ctx.platform.id })
+ expect(tools.webSearch).toBeUndefined()
+ })
+
+ it.each([
+ { name: 'a key limited to some projects', provider: AIProviderName.GOOGLE, projectScope: 'selected' as const, capability: AiToolCapability.WEB_SEARCH },
+ { name: 'a provider without web search', provider: AIProviderName.DEEPSEEK, projectScope: 'all' as const, capability: AiToolCapability.WEB_SEARCH },
+ { name: 'an image choice with no model', provider: AIProviderName.GOOGLE, projectScope: 'all' as const, capability: AiToolCapability.IMAGE_GENERATION },
+ ])('rejects $name', async ({ provider, projectScope, capability }) => {
+ const aiProvider = await mockAndSaveAIProvider({ platformId: ctx.platform.id, provider, projectScope })
+
+ const response = await ctx.post('/v1/ai-tools', {
+ capability,
+ provider: AiToolProvider.AI_PROVIDER,
+ config: { aiProviderId: aiProvider.id },
+ })
+
+ expect(response?.statusCode).toBe(StatusCodes.CONFLICT)
+ })
+
+ it('rejects a key from another platform', async () => {
+ const otherCtx = await createTestContext(app!)
+ const foreignProvider = await mockAndSaveAIProvider({ platformId: otherCtx.platform.id, provider: AIProviderName.GOOGLE, projectScope: 'all' })
+
+ const response = await ctx.post('/v1/ai-tools', {
+ capability: AiToolCapability.WEB_SEARCH,
+ provider: AiToolProvider.AI_PROVIDER,
+ config: { aiProviderId: foreignProvider.id },
+ })
+
+ expect(response?.statusCode).toBe(StatusCodes.CONFLICT)
+ })
+
+ it('still needs an API key for a dedicated service', async () => {
+ const response = await ctx.post('/v1/ai-tools', {
+ capability: AiToolCapability.WEB_SEARCH,
+ provider: AiToolProvider.TAVILY,
+ })
+
+ expect(response?.statusCode).toBe(StatusCodes.CONFLICT)
+ })
+
+ it('needs an API key to switch from a provider choice to a dedicated service', async () => {
+ const aiProvider = await mockAndSaveAIProvider({ platformId: ctx.platform.id, provider: AIProviderName.GOOGLE, projectScope: 'all' })
+ await ctx.post('/v1/ai-tools', {
+ capability: AiToolCapability.WEB_SEARCH,
+ provider: AiToolProvider.AI_PROVIDER,
+ config: { aiProviderId: aiProvider.id },
+ })
+ const [saved] = await aiToolConfigService(app!.log).list(ctx.platform.id)
+
+ const response = await ctx.post(`/v1/ai-tools/${saved.id}`, {
+ provider: AiToolProvider.TAVILY,
+ })
+
+ expect(response?.statusCode).toBe(StatusCodes.CONFLICT)
+ })
+ })
+
describe('GET /v1/ai-tools (list)', () => {
it('should list configs without exposing the api key', async () => {
await ctx.post('/v1/ai-tools', {
diff --git a/packages/server/worker/src/lib/execute/jobs/ee/agent/execute-agent-run.ts b/packages/server/worker/src/lib/execute/jobs/ee/agent/execute-agent-run.ts
index 5a2be29160e..37d65bbe53d 100644
--- a/packages/server/worker/src/lib/execute/jobs/ee/agent/execute-agent-run.ts
+++ b/packages/server/worker/src/lib/execute/jobs/ee/agent/execute-agent-run.ts
@@ -105,6 +105,8 @@ export const executeAgentRunJob: JobHandler<ExecuteAgentRunJobData, FireAndForge
const { credentials } = config
const { provider } = credentials
+ const searchCredentials = config.searchCredentials ?? credentials
+ const imageCredentials = config.imageCredentials ?? credentials
runProvider = provider
runModelId = config.modelId
source = config.source
@@ -112,7 +114,7 @@ export const executeAgentRunJob: JobHandler<ExecuteAgentRunJobData, FireAndForge
const tavilySearchActive = !dryRun && !isNil(aiTools.webSearch)
const providerSearchActive = !dryRun
&& !tavilySearchActive
- && aiUtils.supportsWebSearch(provider)
+ && aiUtils.supportsWebSearch(searchCredentials.provider)
const billing: ActivepiecesAiBilling = {
source: ActivepiecesAiConsumerSource.CHAT,
platformId,
@@ -193,13 +195,13 @@ export const executeAgentRunJob: JobHandler<ExecuteAgentRunJobData, FireAndForge
const readImage = async (fileId: string) => toResolvedAiFile({
stored: await ctx.apiClient.readAgentFile({ platformId, conversationId, fileId, ...spreadIfDefined('projectId', projectId ?? undefined) }),
})
- const imageGenerator = pickImageGenerator({ falApiKey: aiTools.imageGeneration?.apiKey, imageModelId: config.imageModelId, credentials, billing, readImage })
+ const imageGenerator = pickImageGenerator({ falApiKey: aiTools.imageGeneration?.apiKey, imageModelId: config.imageModelId, credentials: imageCredentials, billing, readImage })
const webTools: ToolSet = dryRun ? {} : {
...agentWorkerTools.createWebTools({ taintState }),
...(aiTools.webSearch ? agentWorkerTools.createSearchTools({ webSearch: aiTools.webSearch, taintState }) : {}),
...(providerSearchActive ? agentWorkerTools.createProviderSearchTools({
- search: (request) => aiUtils.searchWeb({ ...request, credentials, modelId: config.fastModelId, billing, turnAlreadyCharged: true }),
- billedAtCost: provider === AIProviderName.ACTIVEPIECES,
+ search: (request) => aiUtils.searchWeb({ ...request, credentials: searchCredentials, modelId: config.searchModelId ?? config.fastModelId, billing, turnAlreadyCharged: true }),
+ billedAtCost: searchCredentials.provider === AIProviderName.ACTIVEPIECES,
taintState,
}) : {}),
...(aiTools.webScraping ? agentWorkerTools.createScrapeTools({ scraping: aiTools.webScraping, taintState }) : {}),
diff --git a/packages/web/public/locales/en/translation.json b/packages/web/public/locales/en/translation.json
index dcf7ceb2ce5..c13004ef321 100644
--- a/packages/web/public/locales/en/translation.json
+++ b/packages/web/public/locales/en/translation.json
@@ -634,6 +634,10 @@
"Deploy flows across development, staging and production environments with version control and team collaboration": "Deploy flows across development, staging and production environments with version control and team collaboration",
"Repository URL": "Repository URL",
"Not connected": "Not connected",
+ "Using {provider}": "Using {provider}",
+ "Choose a model": "Choose a model",
+ "Image model": "Image model",
+ "Search and images use your AI provider. Scraping needs a service of its own. Connect a service to use it in place of your provider.": "Search and images use your AI provider. Scraping needs a service of its own. Connect a service to use it in place of your provider.",
"Project Folder": "Project Folder",
"Disconnect": "Disconnect",
"Enable releases to easily create and manage project releases.": "Enable releases to easily create and manage project releases.",
@@ -1475,20 +1479,18 @@
"Paste your API key": "Paste your API key",
"Get a {provider} API key": "Get a {provider} API key",
"Web Search": "Web Search",
- "Let the assistant search the live web for current information. When off, it falls back to the model’s built-in search if available.": "Let the assistant search the live web for current information. When off, it falls back to the model’s built-in search if available.",
+ "Let the assistant search the live web for current information.": "Let the assistant search the live web for current information.",
"Search API built for AI agents.": "Search API built for AI agents.",
"Web Scraping": "Web Scraping",
"Let the assistant extract the full clean content of a web page as markdown, including JavaScript-rendered pages.": "Let the assistant extract the full clean content of a web page as markdown, including JavaScript-rendered pages.",
"Clean markdown extraction, handles JS-rendered pages.": "Clean markdown extraction, handles JS-rendered pages.",
"Heavy-duty crawling and content extraction.": "Heavy-duty crawling and content extraction.",
"Image Generation": "Image Generation",
- "Let the assistant generate images — realistic photos, marketing graphics with text, brand logos, and abstract art. The model is chosen automatically per request.": "Let the assistant generate images — realistic photos, marketing graphics with text, brand logos, and abstract art. The model is chosen automatically per request.",
+ "Let the assistant generate images — realistic photos, marketing graphics with text, brand logos, and abstract art.": "Let the assistant generate images — realistic photos, marketing graphics with text, brand logos, and abstract art.",
"One key for Flux, Ideogram, Recraft and more — the assistant picks the right model.": "One key for Flux, Ideogram, Recraft and more — the assistant picks the right model.",
"Unlock AI Capabilities": "Unlock AI Capabilities",
"Give the AI assistant web search, scraping, and image generation by connecting the services you choose.": "Give the AI assistant web search, scraping, and image generation by connecting the services you choose.",
- "Connect external services so the AI assistant can search the web, scrape pages, and generate images.": "Connect external services so the AI assistant can search the web, scrape pages, and generate images.",
"Set up": "Set up",
- "Disconnect {name}": "Disconnect {name}",
"This removes the saved API key and disables this capability.": "This removes the saved API key and disables this capability.",
"Unlock AI": "Unlock AI",
"Set your AI providers so your users enjoy a seamless building experience with our universal AI pieces": "Set your AI providers so your users enjoy a seamless building experience with our universal AI pieces",
@@ -1607,7 +1609,6 @@
"GPT models \u2014 broad ecosystem and tooling": "GPT models \u2014 broad ecosystem and tooling",
"Google Vertex project ID": "Google Vertex project ID",
"Google Vertex project region": "Google Vertex project region",
- "Hidden from the assistant": "Hidden from the assistant",
"How this key is labelled and authorised.": "How this key is labelled and authorised.",
"How to get {name} credentials": "How to get {name} credentials",
"Irreversible actions for this key.": "Irreversible actions for this key.",
@@ -1639,7 +1640,6 @@
"Stored securely": "Stored securely",
"The provider rejected these credentials.": "The provider rejected these credentials.",
"This provider cannot list models automatically \u2014 add the model ids you want to expose.": "This provider cannot list models automatically \u2014 add the model ids you want to expose.",
- "Turned off": "Turned off",
"We verify the credentials, then you pick models and projects.": "We verify the credentials, then you pick models and projects.",
"Which of this key\u2019s models the platform may use.": "Which of this key\u2019s models the platform may use.",
"You have unsaved changes": "You have unsaved changes",
@@ -3140,5 +3140,8 @@
"tools": "tools",
"Control which built-in tools are available to agents via this MCP server.": "Control which built-in tools are available to agents via this MCP server.",
"Every piece you can use, in every project MCP reaches.": "Every piece you can use, in every project MCP reaches.",
- "{count} pieces, ready to run in every project MCP reaches.": "{count} pieces, ready to run in every project MCP reaches."
+ "{count} pieces, ready to run in every project MCP reaches.": "{count} pieces, ready to run in every project MCP reaches.",
+ "Reset {name}": "Reset {name}",
+ "Chat goes back to using {provider}.": "Chat goes back to using {provider}.",
+ "The assistant can't do this yet": "The assistant can't do this yet"
}
diff --git a/packages/web/src/app/routes/platform/setup/ai-capabilities/ai-capability-dialog.tsx b/packages/web/src/app/routes/platform/setup/ai-capabilities/ai-capability-dialog.tsx
index b313142d1f3..550fc72cba6 100644
--- a/packages/web/src/app/routes/platform/setup/ai-capabilities/ai-capability-dialog.tsx
+++ b/packages/web/src/app/routes/platform/setup/ai-capabilities/ai-capability-dialog.tsx
@@ -1,4 +1,9 @@
+import { isNil } from '@activepieces/core-utils';
import {
+ AIProviderModelType,
+ AiProviderToolConfig,
+ AIProviderWithoutSensitiveData,
+ AiToolCapability,
AiToolConfigWithoutSensitiveData,
AiToolProvider,
CreateAiToolConfigRequest,
@@ -37,24 +42,30 @@ import {
SelectTrigger,
SelectValue,
} from '@/components/ui/select';
-import { aiToolConfigMutations } from '@/features/platform-admin';
+import {
+ aiProviderQueries,
+ aiToolConfigMutations,
+} from '@/features/platform-admin';
-import { AiToolCapabilityInfo } from './catalog';
+import { aiCapabilitySources, AiToolCapabilityInfo } from './catalog';
const formSchema = z.object({
- provider: z.enum(AiToolProvider),
- apiKey: z.string().min(1, formErrors.required),
+ source: z.string().min(1, formErrors.required),
+ apiKey: z.string(),
+ modelId: z.string(),
});
type FormValues = z.infer<typeof formSchema>;
export function AiCapabilityDialog({
capabilityInfo,
existingConfig,
+ defaultProviderId,
onSaved,
children,
}: {
capabilityInfo: AiToolCapabilityInfo;
existingConfig?: AiToolConfigWithoutSensitiveData;
+ defaultProviderId?: string;
onSaved: () => void;
children: React.ReactNode;
}) {
@@ -67,6 +78,7 @@ export function AiCapabilityDialog({
key={open ? 'open' : 'closed'}
capabilityInfo={capabilityInfo}
existingConfig={existingConfig}
+ defaultProviderId={defaultProviderId}
onClose={() => setOpen(false)}
onSaved={onSaved}
/>
@@ -78,24 +90,82 @@ export function AiCapabilityDialog({
function CapabilityForm({
capabilityInfo,
existingConfig,
+ defaultProviderId,
onClose,
onSaved,
}: {
capabilityInfo: AiToolCapabilityInfo;
existingConfig?: AiToolConfigWithoutSensitiveData;
+ defaultProviderId?: string;
onClose: () => void;
onSaved: () => void;
}) {
+ const { data: providers = [] } = aiProviderQueries.useAiProviderConfigs();
+ const aiProviders = aiCapabilitySources.eligibleProviders({
+ capability: capabilityInfo.capability,
+ providers,
+ });
+ const existingChoice = AiProviderToolConfig.safeParse(existingConfig?.config);
+ const needsModel =
+ capabilityInfo.capability === AiToolCapability.IMAGE_GENERATION;
+ const savedKeyProvider = existingConfig?.hasApiKey
+ ? existingConfig.provider
+ : undefined;
const form = useForm<FormValues>({
- resolver: zodResolver(formSchema),
+ resolver: zodResolver(
+ formSchema.superRefine((values, ctx) => {
+ const aiSource = aiProviders.some((p) => p.id === values.source);
+ const keepsSavedKey = values.source === savedKeyProvider;
+ if (!aiSource && !keepsSavedKey && values.apiKey.length === 0) {
+ ctx.addIssue({
+ code: 'custom',
+ path: ['apiKey'],
+ message: formErrors.required,
+ });
+ }
+ if (aiSource && needsModel && values.modelId.length === 0) {
+ ctx.addIssue({
+ code: 'custom',
+ path: ['modelId'],
+ message: formErrors.required,
+ });
+ }
+ }),
+ ),
mode: 'onChange',
defaultValues: {
- provider: existingConfig?.provider ?? capabilityInfo.providers[0].id,
+ source: pickDefaultSource({
+ preferred: existingChoice.success
+ ? existingChoice.data.aiProviderId
+ : existingConfig?.provider ?? defaultProviderId,
+ sourceIds: [
+ ...aiProviders.map((p) => p.id),
+ ...capabilityInfo.providers.map((p) => p.id),
+ ],
+ fallback: capabilityInfo.providers[0].id,
+ }),
apiKey: '',
+ modelId: existingChoice.success ? existingChoice.data.modelId ?? '' : '',
},
});
+ const source = form.watch('source');
+ const selectedAiProvider = aiProviders.find((p) => p.id === source);
+ const { data: models = [] } = aiProviderQueries.useConfigModels(
+ needsModel ? selectedAiProvider?.id : undefined,
+ );
+ const imageModels = isNil(selectedAiProvider)
+ ? []
+ : models.filter(
+ (model) =>
+ model.type === AIProviderModelType.IMAGE &&
+ modelAllowed({ model, provider: selectedAiProvider }),
+ );
- const { mutate, isPending } = aiToolConfigMutations.useUpsertAiToolConfig({
+ const selectedModel = imageModels.find(
+ (model) => model.id === form.watch('modelId'),
+ );
+
+ const saveCallbacks: SaveCallbacks = {
onSuccess: () => {
onSaved();
onClose();
@@ -109,22 +179,45 @@ function CapabilityForm({
t('Failed to save. Please check the API key and try again.'),
});
},
- });
+ };
+ const { mutate, isPending } =
+ aiToolConfigMutations.useUpsertAiToolConfig(saveCallbacks);
+ const { mutate: reenable, isPending: isReenabling } =
+ aiToolConfigMutations.useUpdateAiToolConfig(saveCallbacks);
const handleSubmit = (values: FormValues) => {
form.clearErrors('root.serverError');
- const request: CreateAiToolConfigRequest = {
- capability: capabilityInfo.capability,
- provider: values.provider,
- auth: { apiKey: values.apiKey },
- enabled: true,
- };
+ const reusesSavedKey =
+ !isNil(existingConfig) &&
+ values.source === savedKeyProvider &&
+ values.apiKey.length === 0;
+ if (reusesSavedKey) {
+ reenable({ id: existingConfig.id, request: { enabled: true } });
+ return;
+ }
+ const request: CreateAiToolConfigRequest = isNil(selectedAiProvider)
+ ? {
+ capability: capabilityInfo.capability,
+ provider: z.enum(AiToolProvider).parse(values.source),
+ auth: { apiKey: values.apiKey },
+ enabled: true,
+ }
+ : {
+ capability: capabilityInfo.capability,
+ provider: AiToolProvider.AI_PROVIDER,
+ config: {
+ aiProviderId: selectedAiProvider.id,
+ ...(needsModel ? { modelId: values.modelId } : {}),
+ },
+ enabled: true,
+ };
mutate(request);
};
const selectedProvider = capabilityInfo.providers.find(
- (p) => p.id === form.watch('provider'),
+ (p) => p.id === source,
);
+ const sourceCount = aiProviders.length + capabilityInfo.providers.length;
return (
<Form {...form}>
@@ -134,20 +227,31 @@ function CapabilityForm({
<DialogDescription>{capabilityInfo.description}</DialogDescription>
</DialogHeader>
- {capabilityInfo.providers.length > 1 && (
+ {sourceCount > 1 && (
<FormField
control={form.control}
- name="provider"
+ name="source"
render={({ field }) => (
<FormItem>
- <FormLabel>{t('Provider')}</FormLabel>
- <Select value={field.value} onValueChange={field.onChange}>
+ <FormLabel>{t('Source')}</FormLabel>
+ <Select
+ value={field.value}
+ onValueChange={(value) => {
+ field.onChange(value);
+ form.setValue('modelId', '');
+ }}
+ >
<FormControl>
<SelectTrigger>
<SelectValue />
</SelectTrigger>
</FormControl>
<SelectContent>
+ {aiProviders.map((provider) => (
+ <SelectItem key={provider.id} value={provider.id}>
+ {provider.name}
+ </SelectItem>
+ ))}
{capabilityInfo.providers.map((provider) => (
<SelectItem key={provider.id} value={provider.id}>
{provider.name}
@@ -161,41 +265,86 @@ function CapabilityForm({
/>
)}
- <FormField
- control={form.control}
- name="apiKey"
- render={({ field }) => (
- <FormItem>
- <FormLabel>{t('API Key')}</FormLabel>
- <FormControl>
- <Input
- {...field}
- type="password"
- autoComplete="off"
- placeholder={
- existingConfig
- ? t('Enter a new key to replace the saved one')
- : t('Paste your API key')
- }
- />
- </FormControl>
- {selectedProvider && (
- <a
- href={selectedProvider.signupUrl}
- target="_blank"
- rel="noreferrer"
- className="inline-flex items-center gap-1 text-xs text-muted-foreground hover:underline"
- >
- {t('Get a {provider} API key', {
- provider: selectedProvider.name,
- })}
- <ExternalLink className="size-3" />
- </a>
- )}
- <FormMessage />
- </FormItem>
- )}
- />
+ {selectedAiProvider && needsModel && (
+ <FormField
+ control={form.control}
+ name="modelId"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>{t('Image model')}</FormLabel>
+ <Select value={field.value} onValueChange={field.onChange}>
+ <FormControl>
+ <SelectTrigger>
+ <SelectValue placeholder={t('Choose a model')}>
+ {selectedModel && (
+ <span className="flex min-w-0 items-baseline gap-2">
+ <span className="truncate">
+ {selectedModel.name}
+ </span>
+ <span className="truncate text-xs text-muted-foreground">
+ {selectedModel.id}
+ </span>
+ </span>
+ )}
+ </SelectValue>
+ </SelectTrigger>
+ </FormControl>
+ <SelectContent>
+ {imageModels.map((model) => (
+ <SelectItem key={model.id} value={model.id}>
+ <span className="flex flex-col">
+ <span>{model.name}</span>
+ <span className="text-xs text-muted-foreground">
+ {model.id}
+ </span>
+ </span>
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ )}
+
+ {!selectedAiProvider && (
+ <FormField
+ control={form.control}
+ name="apiKey"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>{t('API Key')}</FormLabel>
+ <FormControl>
+ <Input
+ {...field}
+ type="password"
+ autoComplete="off"
+ placeholder={
+ source === savedKeyProvider
+ ? t('Enter a new key to replace the saved one')
+ : t('Paste your API key')
+ }
+ />
+ </FormControl>
+ {selectedProvider && (
+ <a
+ href={selectedProvider.signupUrl}
+ target="_blank"
+ rel="noreferrer"
+ className="inline-flex items-center gap-1 text-xs text-muted-foreground hover:underline"
+ >
+ {t('Get a {provider} API key', {
+ provider: selectedProvider.name,
+ })}
+ <ExternalLink className="size-3" />
+ </a>
+ )}
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ )}
{form.formState.errors.root?.serverError && (
<p className="text-sm text-destructive">
@@ -207,7 +356,7 @@ function CapabilityForm({
<Button type="button" variant="outline" onClick={onClose}>
{t('Cancel')}
</Button>
- <Button type="submit" loading={isPending}>
+ <Button type="submit" loading={isPending || isReenabling}>
{t('Save')}
</Button>
</DialogFooter>
@@ -215,3 +364,33 @@ function CapabilityForm({
</Form>
);
}
+
+function pickDefaultSource({
+ preferred,
+ sourceIds,
+ fallback,
+}: {
+ preferred: string | undefined;
+ sourceIds: string[];
+ fallback: string;
+}): string {
+ return !isNil(preferred) && sourceIds.includes(preferred)
+ ? preferred
+ : fallback;
+}
+
+function modelAllowed({
+ model,
+ provider,
+}: {
+ model: { id: string };
+ provider: AIProviderWithoutSensitiveData;
+}): boolean {
+ return (
+ provider.modelScope !== 'selected' || provider.modelIds.includes(model.id)
+ );
+}
+
+type SaveCallbacks = Parameters<
+ typeof aiToolConfigMutations.useUpsertAiToolConfig
+>[0];
diff --git a/packages/web/src/app/routes/platform/setup/ai-capabilities/catalog.ts b/packages/web/src/app/routes/platform/setup/ai-capabilities/catalog.ts
index 6e1afc558fb..340a3f7e7bb 100644
--- a/packages/web/src/app/routes/platform/setup/ai-capabilities/catalog.ts
+++ b/packages/web/src/app/routes/platform/setup/ai-capabilities/catalog.ts
@@ -1,4 +1,10 @@
-import { AiToolCapability, AiToolProvider } from '@activepieces/shared';
+import { isNil } from '@activepieces/core-utils';
+import {
+ AI_PROVIDER_CAPABILITIES,
+ AIProviderWithoutSensitiveData,
+ AiToolCapability,
+ AiToolProvider,
+} from '@activepieces/shared';
import { t } from 'i18next';
export type AiToolProviderInfo = {
@@ -20,7 +26,7 @@ export const AI_TOOL_CATALOG: AiToolCapabilityInfo[] = [
capability: AiToolCapability.WEB_SEARCH,
name: t('Web Search'),
description: t(
- 'Let the assistant search the live web for current information. When off, it falls back to the model’s built-in search if available.',
+ 'Let the assistant search the live web for current information.',
),
providers: [
{
@@ -56,7 +62,7 @@ export const AI_TOOL_CATALOG: AiToolCapabilityInfo[] = [
capability: AiToolCapability.IMAGE_GENERATION,
name: t('Image Generation'),
description: t(
- 'Let the assistant generate images — realistic photos, marketing graphics with text, brand logos, and abstract art. The model is chosen automatically per request.',
+ 'Let the assistant generate images — realistic photos, marketing graphics with text, brand logos, and abstract art.',
),
providers: [
{
@@ -70,3 +76,60 @@ export const AI_TOOL_CATALOG: AiToolCapabilityInfo[] = [
],
},
];
+
+function providerCovers({
+ capability,
+ provider,
+}: {
+ capability: AiToolCapability;
+ provider: AIProviderWithoutSensitiveData;
+}): boolean {
+ const providerCapabilities = AI_PROVIDER_CAPABILITIES[provider.provider];
+ switch (capability) {
+ case AiToolCapability.WEB_SEARCH:
+ return !isNil(providerCapabilities.webSearch);
+ case AiToolCapability.IMAGE_GENERATION:
+ return !isNil(providerCapabilities.defaultImageModel);
+ case AiToolCapability.WEB_SCRAPING:
+ return false;
+ }
+}
+
+function eligibleProviders({
+ capability,
+ providers,
+}: {
+ capability: AiToolCapability;
+ providers: AIProviderWithoutSensitiveData[];
+}): AIProviderWithoutSensitiveData[] {
+ return providers.filter(
+ (provider) =>
+ provider.projectScope === 'all' &&
+ providerCovers({ capability, provider }),
+ );
+}
+
+function servesByDefault({
+ capability,
+ provider,
+}: {
+ capability: AiToolCapability;
+ provider: AIProviderWithoutSensitiveData;
+}): boolean {
+ const defaultImageModel =
+ AI_PROVIDER_CAPABILITIES[provider.provider].defaultImageModel;
+ const defaultModelAllowed =
+ capability !== AiToolCapability.IMAGE_GENERATION ||
+ provider.modelScope !== 'selected' ||
+ (!isNil(defaultImageModel) &&
+ provider.modelIds.includes(defaultImageModel));
+ return (
+ eligibleProviders({ capability, providers: [provider] }).length > 0 &&
+ defaultModelAllowed
+ );
+}
+
+export const aiCapabilitySources = {
+ eligibleProviders,
+ servesByDefault,
+};
diff --git a/packages/web/src/app/routes/platform/setup/ai/capabilities-tab/index.tsx b/packages/web/src/app/routes/platform/setup/ai/capabilities-tab/index.tsx
index d4e0a882319..1f7208a85f4 100644
--- a/packages/web/src/app/routes/platform/setup/ai/capabilities-tab/index.tsx
+++ b/packages/web/src/app/routes/platform/setup/ai/capabilities-tab/index.tsx
@@ -1,22 +1,19 @@
+import { AIProviderName, isNil } from '@activepieces/core-utils';
import {
+ AiProviderToolConfig,
+ AIProviderWithoutSensitiveData,
AiToolCapability,
AiToolConfigWithoutSensitiveData,
} from '@activepieces/shared';
import { t } from 'i18next';
-import {
- Globe,
- Image,
- LucideIcon,
- Search,
- Settings2,
- Trash2,
-} from 'lucide-react';
+import { Globe, Image, LucideIcon, Search, Trash2 } from 'lucide-react';
import { DataFetchErrorState } from '@/components/custom/data-fetch-error-state';
import { ConfirmationDeleteDialog } from '@/components/custom/delete-dialog';
+import { TextWithTooltip } from '@/components/custom/text-with-tooltip';
import { Button } from '@/components/ui/button';
-import { Switch } from '@/components/ui/switch';
import {
+ aiProviderQueries,
aiToolConfigMutations,
aiToolConfigQueries,
} from '@/features/platform-admin';
@@ -26,25 +23,34 @@ import { cn } from '@/lib/utils';
import { AiCapabilityDialog } from '../../ai-capabilities/ai-capability-dialog';
import {
AI_TOOL_CATALOG,
+ aiCapabilitySources,
AiToolCapabilityInfo,
- AiToolProviderInfo,
} from '../../ai-capabilities/catalog';
import { SectionHeader } from '../components/section-header';
export function CapabilitiesTab() {
const {
data: configs,
- isError,
- refetch,
+ isError: configsFailed,
+ refetch: refetchConfigs,
} = aiToolConfigQueries.useAiToolConfigs();
const { platform } = platformHooks.useCurrentPlatform();
const allowWrite = platform.plan.aiProvidersEnabled;
+ const {
+ data: providers,
+ isError: providersFailed,
+ refetch: refetchProviders,
+ } = aiProviderQueries.useAiProviderConfigs();
+ const isError = configsFailed || providersFailed;
+ const refetch = () => Promise.all([refetchConfigs(), refetchProviders()]);
+ const chatProvider =
+ providers?.find((provider) => provider.enabledForChat) ??
+ providers?.find(
+ (provider) => provider.provider === AIProviderName.ACTIVEPIECES,
+ );
- const { mutate: toggle } = aiToolConfigMutations.useUpdateAiToolConfig({
- onSuccess: () => refetch(),
- });
const { mutate: remove } = aiToolConfigMutations.useDeleteAiToolConfig({
- onSuccess: () => refetch(),
+ onSuccess: () => refetchConfigs(),
});
return (
@@ -54,7 +60,7 @@ export function CapabilitiesTab() {
isPageTitle
count={AI_TOOL_CATALOG.length}
description={t(
- 'Connect external services so the AI assistant can search the web, scrape pages, and generate images.',
+ 'Search and images use your AI provider. Scraping needs a service of its own. Connect a service to use it in place of your provider.',
)}
/>
{isError ? (
@@ -70,12 +76,19 @@ export function CapabilitiesTab() {
key={capabilityInfo.capability}
capabilityInfo={capabilityInfo}
config={config}
- allowWrite={allowWrite}
- onToggle={(enabled) =>
- config && toggle({ id: config.id, request: { enabled } })
+ providers={providers ?? []}
+ chatProviderFallback={
+ chatProvider &&
+ aiCapabilitySources.servesByDefault({
+ capability: capabilityInfo.capability,
+ provider: chatProvider,
+ })
+ ? chatProvider
+ : undefined
}
+ allowWrite={allowWrite}
onDelete={() => config && remove(config.id)}
- onSaved={() => refetch()}
+ onSaved={() => refetchConfigs()}
/>
);
})}
@@ -88,15 +101,17 @@ export function CapabilitiesTab() {
function CapabilityCard({
capabilityInfo,
config,
+ providers,
+ chatProviderFallback,
allowWrite,
- onToggle,
onDelete,
onSaved,
}: {
capabilityInfo: AiToolCapabilityInfo;
config?: AiToolConfigWithoutSensitiveData;
+ providers: AIProviderWithoutSensitiveData[];
+ chatProviderFallback?: AIProviderWithoutSensitiveData;
allowWrite: boolean;
- onToggle: (enabled: boolean) => void;
onDelete: () => void;
onSaved: () => void;
}) {
@@ -104,6 +119,24 @@ function CapabilityCard({
const connectedProvider = capabilityInfo.providers.find(
(provider) => provider.id === config?.provider,
);
+ const providerChoice = AiProviderToolConfig.safeParse(config?.config);
+ const chosenProvider = providerChoice.success
+ ? providers.find((p) => p.id === providerChoice.data.aiProviderId)
+ : undefined;
+ const sourceName = config?.enabled
+ ? chosenProvider?.name ?? connectedProvider?.name
+ : chatProviderFallback?.name;
+ const chosenModelId =
+ config?.enabled && providerChoice.success
+ ? providerChoice.data.modelId
+ : undefined;
+ const inUse = !isNil(sourceName);
+ const status = inUse
+ ? t('Using {provider}', { provider: sourceName })
+ : t('Not connected');
+ const statusText = isNil(chosenModelId)
+ ? status
+ : `${status} · ${chosenModelId}`;
return (
<div className="group flex flex-col rounded-lg border bg-card">
@@ -115,118 +148,69 @@ function CapabilityCard({
<p className="truncate text-sm font-medium leading-none">
{capabilityInfo.name}
</p>
- <div className="flex items-center gap-2 text-xs text-muted-foreground">
- <span className="flex items-center gap-1.5">
- <span
- className={cn('size-1.5 rounded-full', {
- 'bg-success-500': config?.enabled,
- 'bg-muted-foreground/40': config && !config.enabled,
- 'border border-muted-foreground/50': !config,
- })}
- />
- {!config
- ? t('Not connected')
- : config.enabled
- ? t('Active')
- : t('Turned off')}
- </span>
- {connectedProvider && (
- <>
- <span aria-hidden>·</span>
- <ProviderLink provider={connectedProvider} />
- </>
- )}
- </div>
+ <span className="flex min-w-0 items-center gap-1.5 text-xs text-muted-foreground">
+ <span
+ className={cn('size-1.5 shrink-0 rounded-full', {
+ 'bg-success-500': inUse,
+ 'border border-muted-foreground/50': !inUse,
+ })}
+ />
+ <TextWithTooltip tooltipMessage={statusText}>
+ <span className="truncate">{statusText}</span>
+ </TextWithTooltip>
+ </span>
</div>
{config && allowWrite && (
- <div className="flex items-center gap-0.5 opacity-0 transition-opacity group-focus-within:opacity-100 group-hover:opacity-100">
- <AiCapabilityDialog
- capabilityInfo={capabilityInfo}
- existingConfig={config}
- onSaved={onSaved}
+ <ConfirmationDeleteDialog
+ title={t('Reset {name}', { name: capabilityInfo.name })}
+ message={
+ chatProviderFallback
+ ? t('Chat goes back to using {provider}.', {
+ provider: chatProviderFallback.name,
+ })
+ : t(
+ 'This removes the saved API key and disables this capability.',
+ )
+ }
+ entityName={capabilityInfo.name}
+ mutationFn={async () => onDelete()}
+ >
+ <Button
+ variant="ghost"
+ size="icon-sm"
+ className="text-muted-foreground opacity-0 transition-opacity hover:text-destructive group-focus-within:opacity-100 group-hover:opacity-100"
>
- <Button
- variant="ghost"
- size="icon-sm"
- className="text-muted-foreground"
- >
- <Settings2 className="size-4" />
- </Button>
- </AiCapabilityDialog>
- <ConfirmationDeleteDialog
- title={t('Disconnect {name}', { name: capabilityInfo.name })}
- message={t(
- 'This removes the saved API key and disables this capability.',
- )}
- entityName={capabilityInfo.name}
- mutationFn={async () => onDelete()}
- >
- <Button
- variant="ghost"
- size="icon-sm"
- className="text-muted-foreground hover:text-destructive"
- >
- <Trash2 className="size-4" />
- </Button>
- </ConfirmationDeleteDialog>
- </div>
+ <Trash2 className="size-4" />
+ </Button>
+ </ConfirmationDeleteDialog>
)}
</div>
<p className="px-4 pb-4 text-sm text-muted-foreground">
{capabilityInfo.description}
</p>
<div className="mt-auto flex items-center justify-between gap-4 border-t px-4 py-2.5">
- {config ? (
- <>
- <span className="text-xs text-muted-foreground">
- {config.enabled
- ? t('Available to the assistant')
- : t('Hidden from the assistant')}
- </span>
- {allowWrite && (
- <Switch checked={config.enabled} onCheckedChange={onToggle} />
- )}
- </>
- ) : (
- <>
- <span className="flex min-w-0 items-center gap-1.5 truncate text-xs text-muted-foreground">
- {capabilityInfo.providers.map((provider, index) => (
- <span key={provider.id} className="flex items-center gap-1.5">
- {index > 0 && <span aria-hidden>·</span>}
- <ProviderLink provider={provider} />
- </span>
- ))}
- </span>
- {allowWrite && (
- <AiCapabilityDialog
- capabilityInfo={capabilityInfo}
- onSaved={onSaved}
- >
- <Button variant="outline" size="sm">
- {t('Connect')}
- </Button>
- </AiCapabilityDialog>
- )}
- </>
+ <span className="text-xs text-muted-foreground">
+ {inUse
+ ? t('Available to the assistant')
+ : t("The assistant can't do this yet")}
+ </span>
+ {allowWrite && (
+ <AiCapabilityDialog
+ capabilityInfo={capabilityInfo}
+ existingConfig={config}
+ defaultProviderId={chatProviderFallback?.id}
+ onSaved={onSaved}
+ >
+ <Button variant="outline" size="sm">
+ {inUse ? t('Change') : t('Connect')}
+ </Button>
+ </AiCapabilityDialog>
)}
</div>
</div>
);
}
-function ProviderLink({ provider }: { provider: AiToolProviderInfo }) {
- return (
- <a
- href={provider.signupUrl}
- target="_blank"
- rel="noreferrer"
- className="underline-offset-2 transition-colors hover:text-foreground hover:underline"
- >
- {provider.name}
- </a>
- );
-}
-
const CAPABILITY_ICON: Record<AiToolCapability, LucideIcon> = {
[AiToolCapability.WEB_SEARCH]: Search,
[AiToolCapability.WEB_SCRAPING]: Globe,
diff --git a/packages/web/src/features/platform-admin/hooks/ai-provider-hooks.ts b/packages/web/src/features/platform-admin/hooks/ai-provider-hooks.ts
index d0d61503754..e551ce2badd 100644
--- a/packages/web/src/features/platform-admin/hooks/ai-provider-hooks.ts
+++ b/packages/web/src/features/platform-admin/hooks/ai-provider-hooks.ts
@@ -37,6 +37,13 @@ export const aiProviderQueries = {
queryKey: aiProviderKeys.configs,
queryFn: () => aiProviderApi.listConfigs(),
}),
+ useConfigModels: (configId: string | undefined) =>
+ useQuery({
+ queryKey: aiProviderKeys.configModels(configId),
+ queryFn: () =>
+ isNil(configId) ? [] : aiProviderApi.listModelsForConfig(configId),
+ enabled: !isNil(configId),
+ }),
useProjectAiProviders: () => {
const projectId = authenticationSession.getProjectId();
return useQuery({
diff --git a/packages/web/src/features/platform-admin/hooks/ai-tool-config-hooks.ts b/packages/web/src/features/platform-admin/hooks/ai-tool-config-hooks.ts
index 1dba7d62793..d35c0f49a5f 100644
--- a/packages/web/src/features/platform-admin/hooks/ai-tool-config-hooks.ts
+++ b/packages/web/src/features/platform-admin/hooks/ai-tool-config-hooks.ts
@@ -27,14 +27,14 @@ export const aiToolConfigQueries = {
};
export const aiToolConfigMutations = {
- useUpsertAiToolConfig: ({ onSuccess, onError }: UpsertOptions) =>
+ useUpsertAiToolConfig: ({ onSuccess, onError }: MutationOptions) =>
useMutation({
mutationFn: (request: CreateAiToolConfigRequest) =>
aiToolConfigApi.upsert(request),
onSuccess,
onError,
}),
- useUpdateAiToolConfig: ({ onSuccess }: { onSuccess: () => void }) =>
+ useUpdateAiToolConfig: ({ onSuccess, onError }: MutationOptions) =>
useMutation({
mutationFn: ({
id,
@@ -44,6 +44,7 @@ export const aiToolConfigMutations = {
request: UpdateAiToolConfigRequest;
}) => aiToolConfigApi.update(id, request),
onSuccess,
+ onError,
}),
useDeleteAiToolConfig: ({ onSuccess }: { onSuccess: () => void }) =>
useMutation({
@@ -52,7 +53,7 @@ export const aiToolConfigMutations = {
}),
};
-type UpsertOptions = {
+type MutationOptions = {
onSuccess: () => void;
onError: (
error: AxiosError<{ message?: string; params?: { message: string } }>,