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(chat): generate images with your AI provider, no extra key needed (#15841)

Hazem Adel9f11f17d2435
diff --git a/bun.lock b/bun.lock
index c2203e15cbc..755ad56a56b 100644
--- a/bun.lock
+++ b/bun.lock
@@ -120,7 +120,7 @@
},
"packages/core/execution": {
"name": "@activepieces/core-execution",
- "version": "0.23.0",
+ "version": "0.23.1",
"dependencies": {
"@activepieces/core-piece-types": "workspace:*",
"@activepieces/core-utils": "workspace:*",
@@ -152,7 +152,7 @@
},
"packages/core/piece-types": {
"name": "@activepieces/core-piece-types",
- "version": "0.11.1",
+ "version": "0.11.2",
"dependencies": {
"@activepieces/core-utils": "workspace:*",
"tslib": "2.6.2",
@@ -188,7 +188,7 @@
},
"packages/core/utils": {
"name": "@activepieces/core-utils",
- "version": "0.8.1",
+ "version": "0.8.2",
"dependencies": {
"deepmerge-ts": "8.0.2",
"ipaddr.js": "2.3.0",
diff --git a/packages/core/execution/package.json b/packages/core/execution/package.json
index e52c52d0547..1c172caee15 100644
--- a/packages/core/execution/package.json
+++ b/packages/core/execution/package.json
@@ -1,6 +1,6 @@
{
"name": "@activepieces/core-execution",
- "version": "0.23.0",
+ "version": "0.23.1",
"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 6a907bfb38b..bbf25282cc2 100644
--- a/packages/core/execution/src/lib/workers/worker-contract.ts
+++ b/packages/core/execution/src/lib/workers/worker-contract.ts
@@ -156,6 +156,7 @@ export type AgentConfigResponse = {
providerConfigId: string
modelId: string
fastModelId: string
+ imageModelId?: string
systemPrompt: string
messages: unknown[]
allMessages: unknown[]
diff --git a/packages/core/piece-types/package.json b/packages/core/piece-types/package.json
index e63f1dc8304..674dd6f8e4e 100644
--- a/packages/core/piece-types/package.json
+++ b/packages/core/piece-types/package.json
@@ -1,6 +1,6 @@
{
"name": "@activepieces/core-piece-types",
- "version": "0.11.1",
+ "version": "0.11.2",
"type": "commonjs",
"main": "./dist/src/index.js",
"scripts": {
diff --git a/packages/core/piece-types/src/lib/ai-providers.ts b/packages/core/piece-types/src/lib/ai-providers.ts
index ea9e8810452..eb7480dfa7e 100644
--- a/packages/core/piece-types/src/lib/ai-providers.ts
+++ b/packages/core/piece-types/src/lib/ai-providers.ts
@@ -365,6 +365,7 @@ function buildProviderCapabilities(provider: AIProviderName): AIProviderCapabili
defaultEmbeddingModel: DEFAULT_EMBEDDING_MODELS[provider],
supportsEmbedding: DEFAULT_EMBEDDING_MODELS[provider] !== undefined,
supportsImageGeneration: !NO_IMAGE_GENERATION_PROVIDERS.has(provider),
+ defaultImageModel: DEFAULT_IMAGE_MODELS[provider],
webSearch: WEB_SEARCH_MODE_BY_PROVIDER[provider],
}
}
@@ -387,6 +388,13 @@ export const ACTIVEPIECES_IMAGE_TIERS = [
export type ActivepiecesImageTier = typeof ACTIVEPIECES_IMAGE_TIERS[number]
+const DEFAULT_IMAGE_MODELS: Partial<Record<AIProviderName, string>> = {
+ [AIProviderName.ACTIVEPIECES]: ACTIVEPIECES_IMAGE_TIERS[0].modelId,
+ [AIProviderName.OPENROUTER]: 'google/gemini-3.1-flash-lite-image',
+ [AIProviderName.OPENAI]: 'gpt-image-1.5',
+ [AIProviderName.GOOGLE]: 'gemini-2.5-flash-image',
+}
+
export const AI_PROVIDER_CAPABILITIES: Record<AIProviderName, AIProviderCapabilities> = {
[AIProviderName.OPENAI]: buildProviderCapabilities(AIProviderName.OPENAI),
[AIProviderName.ANTHROPIC]: buildProviderCapabilities(AIProviderName.ANTHROPIC),
@@ -437,5 +445,6 @@ export type AIProviderCapabilities = {
defaultEmbeddingModel: string | undefined
supportsEmbedding: boolean
supportsImageGeneration: boolean
+ defaultImageModel: string | undefined
webSearch: AIWebSearchMode | undefined
}
diff --git a/packages/core/utils/package.json b/packages/core/utils/package.json
index 84db8f954ae..038de4dadb1 100644
--- a/packages/core/utils/package.json
+++ b/packages/core/utils/package.json
@@ -1,6 +1,6 @@
{
"name": "@activepieces/core-utils",
- "version": "0.8.1",
+ "version": "0.8.2",
"type": "commonjs",
"main": "./dist/src/index.js",
"scripts": {
diff --git a/packages/core/utils/src/lib/ai-provider-health.ts b/packages/core/utils/src/lib/ai-provider-health.ts
index 225882fe013..6f787ae8760 100644
--- a/packages/core/utils/src/lib/ai-provider-health.ts
+++ b/packages/core/utils/src/lib/ai-provider-health.ts
@@ -138,7 +138,7 @@ function isNil<T>(value: T | null | undefined): value is null | undefined {
const MAX_OBSERVED_BODY_LENGTH = 2000
const CREDIT_ERROR_PATTERNS = [/credits/i, /\b402\b/, /payment.required/i]
-const TRANSIENT_ERROR_PATTERN = /\b(429|5\d\d)\b|rate.?limit|timeout|timed out|temporarily|econnreset|etimedout|socket hang up|service unavailable/i
+const TRANSIENT_ERROR_PATTERN = /\b(429|5\d\d)\b|rate.?limit|timeout|timed out|temporarily|econnreset|etimedout|socket hang up|service unavailable|aborted/i
const BILLING_BODY_PATTERN = /insufficient_quota|credit[_ ]balance|billing_hard_limit_reached|billing|\bcredits?\b|out of funds|payment required/i
diff --git a/packages/core/utils/test/ai-provider-health.test.ts b/packages/core/utils/test/ai-provider-health.test.ts
index 71acf9f22f6..aabc7c32a0c 100644
--- a/packages/core/utils/test/ai-provider-health.test.ts
+++ b/packages/core/utils/test/ai-provider-health.test.ts
@@ -76,6 +76,7 @@ describe('classifyProviderOutcome', () => {
expect(classifyProviderOutcome({ message: '429 rate limit exceeded' })).toBe('no_change')
expect(classifyProviderOutcome({ message: 'socket hang up' })).toBe('no_change')
expect(classifyProviderOutcome({ message: 'ETIMEDOUT' })).toBe('no_change')
+ expect(classifyProviderOutcome({ message: 'This operation was aborted' })).toBe('no_change')
})
it('treats an unrecognised failure as unreachable', () => {
diff --git a/packages/server/api/src/app/ai/providers/ai-provider.ts b/packages/server/api/src/app/ai/providers/ai-provider.ts
index 39bb189b244..ec726e72050 100644
--- a/packages/server/api/src/app/ai/providers/ai-provider.ts
+++ b/packages/server/api/src/app/ai/providers/ai-provider.ts
@@ -1,6 +1,8 @@
import { AIProviderAuthConfig, AIProviderConfig, AIProviderModel } from '@activepieces/shared'
import { FastifyBaseLogger } from 'fastify'
+export const MODEL_LIST_TIMEOUT_MS = 15_000
+
export type AIProviderStrategy<T extends AIProviderAuthConfig, C extends AIProviderConfig> = {
name: string
listModels(authConfig: T, config: C): Promise<AIProviderModel[]>
diff --git a/packages/server/api/src/app/ai/providers/google-provider.ts b/packages/server/api/src/app/ai/providers/google-provider.ts
index ed21d932ebe..93cfd880765 100644
--- a/packages/server/api/src/app/ai/providers/google-provider.ts
+++ b/packages/server/api/src/app/ai/providers/google-provider.ts
@@ -1,7 +1,7 @@
import { httpClient, HttpMethod } from '@activepieces/pieces-common'
import { AIProviderModel, AIProviderModelType, GoogleProviderAuthConfig, GoogleProviderConfig } from '@activepieces/shared'
import { FastifyBaseLogger } from 'fastify'
-import { AIProviderStrategy } from './ai-provider'
+import { AIProviderStrategy, MODEL_LIST_TIMEOUT_MS } from './ai-provider'
export const googleProvider: AIProviderStrategy<GoogleProviderAuthConfig, GoogleProviderConfig> = {
name: 'Google',
@@ -12,6 +12,7 @@ export const googleProvider: AIProviderStrategy<GoogleProviderAuthConfig, Google
const res = await httpClient.sendRequest<{ models: GoogleModel[] }>({
url: 'https://generativelanguage.googleapis.com/v1beta/models?pageSize=1000',
method: HttpMethod.GET,
+ timeout: MODEL_LIST_TIMEOUT_MS,
headers: {
'x-goog-api-key': authConfig.apiKey,
'Content-Type': 'application/json',
diff --git a/packages/server/api/src/app/ai/providers/openai-provider.ts b/packages/server/api/src/app/ai/providers/openai-provider.ts
index 8ff3ee378aa..63450e6931c 100644
--- a/packages/server/api/src/app/ai/providers/openai-provider.ts
+++ b/packages/server/api/src/app/ai/providers/openai-provider.ts
@@ -1,7 +1,7 @@
import { httpClient, HttpMethod } from '@activepieces/pieces-common'
import { AIProviderModel, AIProviderModelType, OpenAIProviderAuthConfig, OpenAIProviderConfig } from '@activepieces/shared'
import { FastifyBaseLogger } from 'fastify'
-import { AIProviderStrategy } from './ai-provider'
+import { AIProviderStrategy, MODEL_LIST_TIMEOUT_MS } from './ai-provider'
export const openaiProvider: AIProviderStrategy<OpenAIProviderAuthConfig, OpenAIProviderConfig> = {
name: 'OpenAI',
@@ -12,6 +12,7 @@ export const openaiProvider: AIProviderStrategy<OpenAIProviderAuthConfig, OpenAI
const res = await httpClient.sendRequest<{ data: OpenAIModel[] }>({
url: 'https://api.openai.com/v1/models',
method: HttpMethod.GET,
+ timeout: MODEL_LIST_TIMEOUT_MS,
headers: {
'Authorization': `Bearer ${authConfig.apiKey}`,
'Content-Type': 'application/json',
diff --git a/packages/server/api/src/app/ai/providers/openrouter-provider.ts b/packages/server/api/src/app/ai/providers/openrouter-provider.ts
index f7853ed4a5f..d149db8b7d4 100644
--- a/packages/server/api/src/app/ai/providers/openrouter-provider.ts
+++ b/packages/server/api/src/app/ai/providers/openrouter-provider.ts
@@ -1,7 +1,7 @@
import { httpClient, HttpMethod } from '@activepieces/pieces-common'
import { AIProviderModel, AIProviderModelType, OpenRouterProviderAuthConfig, OpenRouterProviderConfig } from '@activepieces/shared'
import { FastifyBaseLogger } from 'fastify'
-import { AIProviderStrategy } from './ai-provider'
+import { AIProviderStrategy, MODEL_LIST_TIMEOUT_MS } from './ai-provider'
export const openRouterProvider: AIProviderStrategy<OpenRouterProviderAuthConfig, OpenRouterProviderConfig> = {
name: 'OpenRouter',
@@ -19,6 +19,7 @@ export const openRouterProvider: AIProviderStrategy<OpenRouterProviderAuthConfig
const res = await httpClient.sendRequest<{ data: OpenRouterModel[] }>({
url: 'https://openrouter.ai/api/v1/models',
method: HttpMethod.GET,
+ timeout: MODEL_LIST_TIMEOUT_MS,
headers: {
'Content-Type': 'application/json',
},
diff --git a/packages/server/api/src/app/ee/agent/agent-helpers.ts b/packages/server/api/src/app/ee/agent/agent-helpers.ts
index cfa1b87ab81..53e971d2301 100644
--- a/packages/server/api/src/app/ee/agent/agent-helpers.ts
+++ b/packages/server/api/src/app/ee/agent/agent-helpers.ts
@@ -1,7 +1,8 @@
+import { setTimeout as delay } from 'node:timers/promises'
import { ExecuteAgentRunJobData } from '@activepieces/core-execution'
import { ActivepiecesAiBilling, ActivepiecesError, AIProviderName, apId, assertNotNullOrUndefined, ErrorCode, isNil, spreadIfDefined, tryCatch, tryCatchSync, unique } from '@activepieces/core-utils'
import { aiUtils } from '@activepieces/server-utils'
-import { AgentConfig, AgentConversation, AgentConversationStatus, AgentFlowTool, AgentTool, AgentToolType, AI_PROVIDER_ENTITY_TYPES, AIProviderModelType, FlowVersionState, GetAgentMemoryResponse, GetProviderConfigResponse, Project, ProjectType, ResolvedAgentFlowTool, UserMemory } from '@activepieces/shared'
+import { AgentConfig, AgentConversation, AgentConversationStatus, AgentFlowTool, AgentTool, AgentToolType, AI_PROVIDER_CAPABILITIES, AI_PROVIDER_ENTITY_TYPES, AIProviderModelType, FlowVersionState, GetAgentMemoryResponse, GetProviderConfigResponse, Project, ProjectType, ResolvedAgentFlowTool, UserMemory } from '@activepieces/shared'
import { SharedV3ProviderOptions } from '@ai-sdk/provider'
import { EmbeddingModel, LanguageModel } from 'ai'
import { FastifyBaseLogger } from 'fastify'
@@ -37,6 +38,7 @@ const userMemoryRepo = repoFactory(UserMemoryEntity)
const MAX_MEMORIES = 50
const MAX_MEMORY_LENGTH = 280
const MAX_INSTRUCTIONS_LENGTH = 4000
+const IMAGE_MODEL_LOOKUP_TIMEOUT_MS = 3_000
async function getConversationOrThrow({ id, platformId, userId, log }: { id: string, platformId: string, userId: string, log?: FastifyBaseLogger }): Promise<AgentConversation> {
const conversation = await conversationRepo().findOneBy({ id, platformId, userId })
@@ -175,6 +177,33 @@ async function resolveModelId({ platformId, providerConfig, selectedModel, scope
return picked.id
}
+async function resolveImageModelId({ platformId, providerConfig, scope, log }: { platformId: string, providerConfig: GetProviderConfigResponse, scope: ProviderScope, log: FastifyBaseLogger }): Promise<string | undefined> {
+ const { provider, configId } = providerConfig
+ const preferred = AI_PROVIDER_CAPABILITIES[provider].defaultImageModel
+ if (isNil(preferred) || provider === AIProviderName.ACTIVEPIECES) {
+ return preferred
+ }
+ const listed = await Promise.race([
+ tryCatch(() => aiProviderService(log).listModels({ platformId, provider, scope, configId })),
+ delay(IMAGE_MODEL_LOOKUP_TIMEOUT_MS, null),
+ ])
+ if (isNil(listed) || isNil(listed.data)) {
+ log.warn({ error: listed?.error, provider }, '[agentHelpers#resolveImageModelId] Could not list the key\'s models in time, leaving image generation off')
+ return undefined
+ }
+ const versionAt = preferred.search(/\d/)
+ const family = versionAt === -1 ? preferred : preferred.slice(0, versionAt)
+ const imageModelIds = listed.data.filter((model) => model.type === AIProviderModelType.IMAGE).map((model) => model.id)
+ if (imageModelIds.includes(preferred)) {
+ return preferred
+ }
+ const fallback = imageModelIds.find((id) => id.startsWith(family))
+ if (!isNil(fallback)) {
+ log.warn({ provider, preferred, fallback }, '[agentHelpers#resolveImageModelId] Default image model is not offered by this key, falling back')
+ }
+ return fallback
+}
+
async function resolveFastModelId({ platformId, providerConfig, scope, fallbackModelId, log }: { platformId: string, providerConfig: GetProviderConfigResponse, scope: ProviderScope, fallbackModelId?: string, log: FastifyBaseLogger }): Promise<string> {
return resolveModelId({ platformId, providerConfig, selectedModel: FAST_TIER_ID, scope, log, ...spreadIfDefined('fallbackModelId', fallbackModelId) })
}
@@ -391,6 +420,7 @@ export const agentHelpers = {
...agentModelResolution,
resolveFastModel,
resolveFastModelId,
+ resolveImageModelId,
resolveModelId,
resolveRunProvider,
resolveEmbeddingModel,
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 44d66fb08f5..d2145c14f0d 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
@@ -99,6 +99,8 @@ export const agentConfigRpc = (log: FastifyBaseLogger) => ({
// 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 generatesImagesOnProvider = actingRun && isNil(aiTools.imageGeneration)
+ const imageModelId = generatesImagesOnProvider ? await agentHelpers.resolveImageModelId({ platformId, providerConfig, scope: runScope, log }) : undefined
const lockResult = await agentHelpers.conversationRepo()
.createQueryBuilder()
@@ -163,7 +165,7 @@ export const agentConfigRpc = (log: FastifyBaseLogger) => ({
searchAvailable: webSearchAvailable,
fetchAvailable,
scrapeAvailable: fetchAvailable && !isNil(aiTools.webScraping),
- imageAvailable: actingRun && !isNil(aiTools.imageGeneration),
+ imageAvailable: actingRun && (!isNil(aiTools.imageGeneration) || !isNil(imageModelId)),
emailAvailable: emailEnabled,
agentsAvailable,
userEmail: runUserEmail,
@@ -243,6 +245,7 @@ export const agentConfigRpc = (log: FastifyBaseLogger) => ({
providerConfigId: providerConfig.configId,
modelId: resolvedModelId,
fastModelId,
+ ...spreadIfDefined('imageModelId', imageModelId),
systemPrompt: systemPromptText,
messages: messagesForLlm,
allMessages,
diff --git a/packages/server/api/test/integration/cloud/project-role/project-role.test.ts b/packages/server/api/test/integration/cloud/project-role/project-role.test.ts
index 622f721a2e0..54039bdac93 100644
--- a/packages/server/api/test/integration/cloud/project-role/project-role.test.ts
+++ b/packages/server/api/test/integration/cloud/project-role/project-role.test.ts
@@ -227,7 +227,7 @@ describe('Project Role API', () => {
it('should fail to delete a project role if project role does not exist', async () => {
const ctx = await createTestContext(app!)
- const response = await ctx.delete(`/v1/project-roles/${faker.lorem.word()}`)
+ const response = await ctx.delete(`/v1/project-roles/${faker.string.uuid()}`)
expect(response?.statusCode).toBe(StatusCodes.NOT_FOUND)
})
})
diff --git a/packages/server/api/test/unit/app/ee/agent/agent-fast-model-provider.test.ts b/packages/server/api/test/unit/app/ee/agent/agent-fast-model-provider.test.ts
index 3b8279a9ad2..43bed41ea56 100644
--- a/packages/server/api/test/unit/app/ee/agent/agent-fast-model-provider.test.ts
+++ b/packages/server/api/test/unit/app/ee/agent/agent-fast-model-provider.test.ts
@@ -1,5 +1,5 @@
import { AIProviderName } from '@activepieces/core-utils'
-import { AIProviderModelType } from '@activepieces/shared'
+import { aiProviderCredentials, AIProviderModelType, GetProviderConfigResponse } from '@activepieces/shared'
import { beforeEach, describe, expect, it, vi } from 'vitest'
const { mockGetChatProvider, mockGetConfigOrThrow, mockListModels } = vi.hoisted(() => ({
@@ -182,3 +182,70 @@ describe('resolveModelId', () => {
await expect(resolve({ selectedModel: 'smart' })).rejects.toMatchObject({ error: { code: 'ENTITY_NOT_FOUND' } })
})
})
+
+describe('resolveImageModelId', () => {
+ const config = ({ provider }: { provider: AIProviderName }): GetProviderConfigResponse => ({
+ ...aiProviderCredentials({ provider, auth: { apiKey: 'k' }, config: {} }),
+ configId: 'config-1',
+ platformId,
+ modelScope: 'all',
+ modelIds: [],
+ })
+
+ const resolve = (providerConfig: GetProviderConfigResponse) => agentHelpers.resolveImageModelId({ platformId, providerConfig, scope, log })
+
+ beforeEach(() => {
+ mockListModels.mockReset()
+ })
+
+ it('uses the default image model when the key offers it', async () => {
+ mockListModels.mockResolvedValue([{ id: 'gpt-5', type: AIProviderModelType.TEXT }, { id: 'gpt-image-2', type: AIProviderModelType.IMAGE }, { id: 'gpt-image-1.5', type: AIProviderModelType.IMAGE }])
+
+ expect(await resolve(config({ provider: AIProviderName.OPENAI }))).toBe('gpt-image-1.5')
+ })
+
+ it('falls back to an image model the key offers when the default is gone', async () => {
+ mockListModels.mockResolvedValue([{ id: 'gpt-5', type: AIProviderModelType.TEXT }, { id: 'gpt-image-2', type: AIProviderModelType.IMAGE }])
+
+ expect(await resolve(config({ provider: AIProviderName.OPENAI }))).toBe('gpt-image-2')
+ })
+
+ it('never falls back to a model outside the default family, like Imagen on Google', async () => {
+ mockListModels.mockResolvedValue([{ id: 'gemini-2.5-pro', type: AIProviderModelType.TEXT }, { id: 'imagen-4.0-generate-001', type: AIProviderModelType.IMAGE }])
+
+ expect(await resolve(config({ provider: AIProviderName.GOOGLE }))).toBeUndefined()
+ })
+
+ it('leaves images off rather than holding the turn when the model list is slow', async () => {
+ vi.useFakeTimers()
+ mockListModels.mockReturnValue(new Promise(() => undefined))
+
+ const resolving = resolve(config({ provider: AIProviderName.OPENAI }))
+ await vi.advanceTimersByTimeAsync(3_000)
+
+ expect(await resolving).toBeUndefined()
+ vi.useRealTimers()
+ })
+
+ it('offers no image model when the key has none', async () => {
+ mockListModels.mockResolvedValue([{ id: 'gpt-5', type: AIProviderModelType.TEXT }])
+
+ expect(await resolve(config({ provider: AIProviderName.OPENAI }))).toBeUndefined()
+ })
+
+ it('leaves images off when the model list cannot be read', async () => {
+ mockListModels.mockRejectedValue(new Error('provider down'))
+
+ expect(await resolve(config({ provider: AIProviderName.OPENAI }))).toBeUndefined()
+ })
+
+ it('uses the managed image model without listing', async () => {
+ expect(await resolve(config({ provider: AIProviderName.ACTIVEPIECES }))).toBe('google/gemini-3.1-flash-lite-image')
+ expect(mockListModels).not.toHaveBeenCalled()
+ })
+
+ it('offers nothing for a provider without a default', async () => {
+ expect(await resolve(config({ provider: AIProviderName.BEDROCK }))).toBeUndefined()
+ expect(mockListModels).not.toHaveBeenCalled()
+ })
+})
diff --git a/packages/server/worker/src/lib/execute/jobs/ai/generate-image.ts b/packages/server/worker/src/lib/execute/jobs/ai/generate-image.ts
index 3d979eb01ce..259d9a2e17d 100644
--- a/packages/server/worker/src/lib/execute/jobs/ai/generate-image.ts
+++ b/packages/server/worker/src/lib/execute/jobs/ai/generate-image.ts
@@ -1,6 +1,6 @@
-import { ActivepiecesAiBilling, AIProviderName, isNil } from '@activepieces/core-utils'
+import { ActivepiecesAiBilling, AIProviderName, isNil, spreadIfDefined } from '@activepieces/core-utils'
import { activepiecesAiCost, aiUtils, FlowStepMetadata } from '@activepieces/server-utils'
-import { AI_PROVIDER_CAPABILITIES, GenerateImageJobData, getEffectiveProviderAndModel, ResolveAiProviderResponse } from '@activepieces/shared'
+import { AI_PROVIDER_CAPABILITIES, AiProviderCredentials, GenerateImageJobData, getEffectiveProviderAndModel, ResolveAiProviderResponse } from '@activepieces/shared'
import { generateImage, generateText, ImageModel, ImagePart, LanguageModel } from 'ai'
import { JobContext } from '../../types'
import { ResolvedAiFile } from './ai-files'
@@ -13,76 +13,87 @@ export async function generateImageStep({ ctx, data, resolved, flowStep, billing
billing: ActivepiecesAiBilling
inputImages: ResolvedAiFile[]
}): Promise<string> {
- const image = await getGeneratedImage({ data, resolved, inputImages, flowStep, billing })
- const imageData = !isNil(image.base64) && image.base64.length > 0
- ? Buffer.from(image.base64, 'base64')
- : Buffer.from(image.uint8Array)
+ const image = await getGeneratedImage({ credentials: resolved, modelId: data.modelId, prompt: data.prompt ?? '', advancedOptions: data.advancedOptions, inputImages, flowStep, billing })
const { url } = await ctx.apiClient.saveFlowStepFile({
projectId: data.projectId,
platformId: data.platformId,
flowRunId: data.flowRunId,
- data: imageData,
+ data: imageBytesOf(image),
fileName: 'image.png',
})
return url
}
-async function getGeneratedImage({ data, resolved, inputImages, flowStep, billing }: {
- data: GenerateImageJobData
- resolved: ResolveAiProviderResponse
+export async function getGeneratedImage({ credentials, modelId, prompt, advancedOptions, inputImages, flowStep, billing, turnAlreadyCharged = false, aspectRatio, abortSignal }: {
+ credentials: AiProviderCredentials
+ modelId: string
+ prompt: string
+ advancedOptions?: Record<string, unknown>
inputImages: ResolvedAiFile[]
- flowStep: FlowStepMetadata
+ flowStep?: FlowStepMetadata
billing: ActivepiecesAiBilling
+ turnAlreadyCharged?: boolean
+ aspectRatio?: `${number}:${number}`
+ abortSignal?: AbortSignal
}): Promise<GeneratedImage> {
- const model = createImageCapableModel({ resolved, modelId: data.modelId, flowStep, billing })
- const { provider: effectiveProvider } = getEffectiveProviderAndModel({ provider: resolved.provider, model: data.modelId })
- const resolvedProvider = effectiveProvider ?? resolved.provider
- const prompt = data.prompt ?? ''
+ const model = createImageCapableModel({ credentials, modelId, flowStep, billing, turnAlreadyCharged })
+ const { provider: effectiveProvider } = getEffectiveProviderAndModel({ provider: credentials.provider, model: modelId })
+ const resolvedProvider = effectiveProvider ?? credentials.provider
const hasInputImages = inputImages.length > 0
- return withImageInputErrorContext({ modelId: data.modelId, hasInputImages }, async () => {
+ return withImageInputErrorContext({ modelId, hasInputImages }, async () => {
if (GENERATES_IMAGES_THROUGH_TEXT.has(resolvedProvider)) {
if (model.kind !== 'language') {
- throw new Error(`Model "${data.modelId}" resolves to ${resolvedProvider}, which generates images through text, but the provider returned an image-only model`)
+ throw new Error(`Model "${modelId}" resolves to ${resolvedProvider}, which generates images through text, but the provider returned an image-only model`)
}
- return generateImageUsingGenerateText({ model: model.model, prompt, inputImages })
+ return generateImageUsingGenerateText({ model: model.model, prompt, inputImages, aspectRatio, abortSignal })
}
if (model.kind !== 'image') {
throw new Error(`Provider ${resolvedProvider} does not support image models`)
}
const { image } = await generateImage({
model: model.model,
+ abortSignal,
+ ...spreadIfDefined('aspectRatio', aspectRatio),
prompt: hasInputImages
? { text: prompt, images: inputImages.map((file) => Buffer.from(file.base64, 'base64')) }
: prompt,
- providerOptions: { [resolvedProvider]: { ...stripLegacyImageField(data.advancedOptions) } } as Parameters<typeof generateImage>[0]['providerOptions'],
+ providerOptions: { [resolvedProvider]: { ...stripLegacyImageField(advancedOptions) } } as Parameters<typeof generateImage>[0]['providerOptions'],
})
- activepiecesAiCost.reportFixedCredits({ billing, provider: resolved.provider, modelId: data.modelId })
+ if (!turnAlreadyCharged) {
+ activepiecesAiCost.reportFixedCredits({ billing, provider: credentials.provider, modelId })
+ }
return image
})
}
-function createImageCapableModel({ resolved, modelId, flowStep, billing }: {
- resolved: ResolveAiProviderResponse
+export function imageBytesOf(image: GeneratedImage): Buffer {
+ return !isNil(image.base64) && image.base64.length > 0 ? Buffer.from(image.base64, 'base64') : Buffer.from(image.uint8Array)
+}
+
+function createImageCapableModel({ credentials, modelId, flowStep, billing, turnAlreadyCharged }: {
+ credentials: AiProviderCredentials
modelId: string
- flowStep: FlowStepMetadata
+ flowStep?: FlowStepMetadata
billing: ActivepiecesAiBilling
+ turnAlreadyCharged: boolean
}): ImageCapableModel {
- if (!AI_PROVIDER_CAPABILITIES[resolved.provider].supportsImageGeneration) {
- throw new Error(`Provider ${resolved.provider} does not support image models`)
+ if (!AI_PROVIDER_CAPABILITIES[credentials.provider].supportsImageGeneration) {
+ throw new Error(`Provider ${credentials.provider} does not support image models`)
}
- const credentials = resolved
const imageModel = aiUtils.createModelForImages({ credentials, modelId, flowStep })
if (!isNil(imageModel)) {
return { kind: 'image', model: imageModel }
}
- return { kind: 'language', model: aiUtils.createModel({ credentials, modelId, flowStep, billing }) }
+ return { kind: 'language', model: aiUtils.createModel({ credentials, modelId, flowStep, billing, turnAlreadyCharged }) }
}
-async function generateImageUsingGenerateText({ model, prompt, inputImages }: {
+async function generateImageUsingGenerateText({ model, prompt, inputImages, aspectRatio, abortSignal }: {
model: LanguageModel
prompt: string
inputImages: ResolvedAiFile[]
+ aspectRatio?: string
+ abortSignal?: AbortSignal
}): Promise<GeneratedImage> {
const imageParts = inputImages.map<ImagePart>((file) => ({
type: 'image',
@@ -90,9 +101,10 @@ async function generateImageUsingGenerateText({ model, prompt, inputImages }: {
}))
const result = await generateText({
model,
+ abortSignal,
providerOptions: {
- google: { responseModalities: ['TEXT', 'IMAGE'] },
- openrouter: { modalities: ['image', 'text'] },
+ google: { responseModalities: ['TEXT', 'IMAGE'], ...spreadIfDefined('imageConfig', isNil(aspectRatio) ? undefined : { aspectRatio }) },
+ openrouter: { modalities: ['image', 'text'], ...spreadIfDefined('image_config', isNil(aspectRatio) ? undefined : { aspect_ratio: aspectRatio }) },
},
messages: [{ role: 'user', content: [{ type: 'text', text: prompt }, ...imageParts] }],
})
diff --git a/packages/server/worker/src/lib/execute/jobs/ee/agent/agent-worker-tools.ts b/packages/server/worker/src/lib/execute/jobs/ee/agent/agent-worker-tools.ts
index 0e430bf6017..a88d6f43c8b 100644
--- a/packages/server/worker/src/lib/execute/jobs/ee/agent/agent-worker-tools.ts
+++ b/packages/server/worker/src/lib/execute/jobs/ee/agent/agent-worker-tools.ts
@@ -6,7 +6,7 @@ import { createEventEmitter } from './tools/event-emitter'
import { wrapTestFlowGate } from './tools/flow-gate-tools'
import { createAgentSurfaceTools, createBuildPlanTools, createLocalTools, createPhaseTools, createStructuredOutputTool, createThinkingTools } from './tools/session-tools'
import { extractResultText, extractUserFacingError, isSuccessResult, normalizePieceName, TOOL_EXECUTION_TIMEOUT_MS, truncateLargeResult, withToolTimeout, wrapToolsWithTaint } from './tools/tool-primitives'
-import { createImageTools, createProviderSearchTools, createScrapeTools, createSearchTools, createWebTools } from './tools/web-media-tools'
+import { createImageTools, createProviderSearchTools, createScrapeTools, createSearchTools, createWebTools, falImageGenerator, providerImageGenerator } from './tools/web-media-tools'
export { AgentEventEmitter, GateDecision, TaintState } from './tools/tool-primitives'
@@ -22,6 +22,8 @@ export const agentWorkerTools = {
createProviderSearchTools,
createScrapeTools,
createImageTools,
+ falImageGenerator,
+ providerImageGenerator,
createEmailTools,
wrapTestFlowGate,
createThinkingTools,
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 f7b62547b71..9b7a2607d7b 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
@@ -1,6 +1,6 @@
import { ActivepiecesAiBilling, ActivepiecesAiConsumerSource, AIProviderName, ErrorCode, formatPieceError, isNil, isObject, spreadIfDefined, tryCatch, tryCatchSync } from '@activepieces/core-utils'
import { agentAiUtils, aiUtils } from '@activepieces/server-utils'
-import { AgentEvent, AgentEventType, AgentKnowledgeBaseTool, AgentMcpTool, AgentOutputField, AgentPhase, AgentPieceTool, AgentResult, AgentRunSource, AgentTool, AgentToolType, EngineResponseStatus, ExecuteAgentRunJobData, MAX_AGENT_TURN_WALL_CLOCK_MS, PersistedAgentMessage, PersistedAgentPart, PersistedAgentRole, ResolvedAgentFlowTool, WorkerJobType } from '@activepieces/shared'
+import { AgentEvent, AgentEventType, AgentKnowledgeBaseTool, AgentMcpTool, AgentOutputField, AgentPhase, AgentPieceTool, AgentResult, AgentRunSource, AgentTool, AgentToolType, AiProviderCredentials, EngineResponseStatus, ExecuteAgentRunJobData, MAX_AGENT_TURN_WALL_CLOCK_MS, PersistedAgentMessage, PersistedAgentPart, PersistedAgentRole, ResolvedAgentFlowTool, WorkerJobType } from '@activepieces/shared'
import { createUIMessageStream, generateText, ModelMessage, streamText, ToolSet, toUIMessageStream } from 'ai'
import { FireAndForgetJobResult, JobContext, JobHandler, JobResultKind } from '../../../types'
import { agentMcpClient, McpConnection } from './agent-mcp-client'
@@ -189,6 +189,7 @@ export const executeAgentRunJob: JobHandler<ExecuteAgentRunJobData, FireAndForge
const phaseState: { phase: AgentPhase } = { phase: 'discovery' }
const taintState: TaintState = { tainted: source === AgentRunSource.FLOW_STEP }
+ const imageGenerator = pickImageGenerator({ falApiKey: aiTools.imageGeneration?.apiKey, imageModelId: config.imageModelId, credentials, billing })
const webTools: ToolSet = dryRun ? {} : {
...agentWorkerTools.createWebTools({ taintState }),
...(aiTools.webSearch ? agentWorkerTools.createSearchTools({ webSearch: aiTools.webSearch, taintState }) : {}),
@@ -198,8 +199,8 @@ export const executeAgentRunJob: JobHandler<ExecuteAgentRunJobData, FireAndForge
taintState,
}) : {}),
...(aiTools.webScraping ? agentWorkerTools.createScrapeTools({ scraping: aiTools.webScraping, taintState }) : {}),
- ...(aiTools.imageGeneration && !discoveryOnly ? agentWorkerTools.createImageTools({
- imageGeneration: aiTools.imageGeneration,
+ ...(imageGenerator && !discoveryOnly ? agentWorkerTools.createImageTools({
+ ...imageGenerator,
saveFile: ({ data, mediaType, fileName }) => ctx.apiClient.saveAgentFile({ platformId, conversationId, data, mediaType, ...spreadIfDefined('projectId', projectId ?? undefined), ...spreadIfDefined('fileName', fileName) }),
emitImage: eventEmitter.emitImageGenerated,
}) : {}),
@@ -483,6 +484,24 @@ function isKnowledgeBaseTool(tool: AgentTool): tool is AgentKnowledgeBaseTool {
return tool.type === AgentToolType.KNOWLEDGE_BASE
}
+function pickImageGenerator({ falApiKey, imageModelId, credentials, billing }: {
+ falApiKey: string | undefined
+ imageModelId: string | undefined
+ credentials: AiProviderCredentials
+ billing: ActivepiecesAiBilling
+}): Pick<Parameters<typeof agentWorkerTools.createImageTools>[0], 'generate' | 'billedAtCost'> | undefined {
+ if (!isNil(falApiKey)) {
+ return { generate: agentWorkerTools.falImageGenerator({ apiKey: falApiKey }), billedAtCost: false }
+ }
+ if (isNil(imageModelId)) {
+ return undefined
+ }
+ return {
+ generate: agentWorkerTools.providerImageGenerator({ credentials, modelId: imageModelId, billing }),
+ billedAtCost: credentials.provider === AIProviderName.ACTIVEPIECES,
+ }
+}
+
function buildToolSet({ ctx, eventEmitter, log, phaseState, taintState, mcpToolSet, webTools, projects, projectId, conversationId, flowRunId, runId, platformId, userId, userEmail, guides, dryRun, discoveryOnly, emailEnabled, agentsAvailable, abortSignal, source, provider, providerConfigId, configuredPieceTools, configuredFlowTools, configuredKnowledgeBaseTools, structuredOutput, captureStructured }: {
ctx: JobContext
provider: AIProviderName
diff --git a/packages/server/worker/src/lib/execute/jobs/ee/agent/tools/web-media-tools.ts b/packages/server/worker/src/lib/execute/jobs/ee/agent/tools/web-media-tools.ts
index 8f71ff0ea77..c908b6ae8bb 100644
--- a/packages/server/worker/src/lib/execute/jobs/ee/agent/tools/web-media-tools.ts
+++ b/packages/server/worker/src/lib/execute/jobs/ee/agent/tools/web-media-tools.ts
@@ -1,9 +1,10 @@
-import { isObject, tryCatch, tryCatchSync } from '@activepieces/core-utils'
+import { ActivepiecesAiBilling, isObject, tryCatch, tryCatchSync } from '@activepieces/core-utils'
import { safeHttp, WebSearchResult } from '@activepieces/server-utils'
-import { SaveAgentFileResponse } from '@activepieces/shared'
+import { AiProviderCredentials, SaveAgentFileResponse } from '@activepieces/shared'
import { tool, ToolExecutionOptions, ToolSet } from 'ai'
import { stripHtml } from 'string-strip-html'
import { z } from 'zod'
+import { getGeneratedImage, imageBytesOf } from '../../../ai/generate-image'
import { AgentEventEmitter, cardTitleFields, describeHttpError, FETCH_URL_TIMEOUT_MS, GeneratedImage, ImageAspect, ImageStyle, isReadableTextContentType, MAX_FETCH_URL_BYTES, ResolvedToolConfig, ScrapedPage, TaintState, truncateLargeResult, withToolTimeout } from './tool-primitives'
export function createWebTools({ taintState }: { taintState: TaintState }): ToolSet {
@@ -72,6 +73,19 @@ const FAL_MODEL_BY_STYLE: Record<ImageStyle, string> = {
abstract: 'fal-ai/flux/dev',
}
+const STYLE_GUIDANCE_BY_STYLE: Record<ImageStyle, string> = {
+ realistic: 'Style: a photorealistic photograph.',
+ graphic_text: 'Style: a clean marketing graphic; render any text exactly and legibly.',
+ brand_vector: 'Style: a flat vector logo or icon with clean shapes and a plain background.',
+ abstract: 'Style: an abstract, artistic composition.',
+}
+
+const ASPECT_RATIO_BY_ASPECT: Record<ImageAspect, `${number}:${number}`> = {
+ square: '1:1',
+ landscape: '16:9',
+ portrait: '9:16',
+}
+
const FAL_IMAGE_SIZE_BY_ASPECT: Record<ImageAspect, string> = {
square: 'square_hd',
landscape: 'landscape_16_9',
@@ -178,9 +192,10 @@ export function createScrapeTools({ scraping, taintState }: { scraping: Resolved
}
}
-export function createImageTools({ imageGeneration, saveFile, emitImage }: {
- imageGeneration: ResolvedToolConfig
- saveFile: (params: { data: Buffer, mediaType: string, fileName?: string }) => Promise<SaveAgentFileResponse>
+export function createImageTools({ generate, billedAtCost, saveFile, emitImage }: {
+ generate: ImageGenerator
+ billedAtCost: boolean
+ saveFile: ImageSaver
emitImage: AgentEventEmitter['emitImageGenerated']
}): ToolSet {
return {
@@ -197,40 +212,80 @@ export function createImageTools({ imageGeneration, saveFile, emitImage }: {
toolName: 'ap_generate_image',
timeoutMs: IMAGE_TIMEOUT_MS + 5_000,
fn: async (signal) => {
- const modelId = FAL_MODEL_BY_STYLE[toolInput.style]
- const imageSize = FAL_IMAGE_SIZE_BY_ASPECT[toolInput.aspectRatio ?? 'square']
- const { data: generated, error } = await tryCatch(() => generateImageWithFal({
- modelId, imageSize, prompt: toolInput.prompt, apiKey: imageGeneration.apiKey, signal,
- }))
- if (error) {
- return { content: [{ type: 'text', text: `Image generation failed: ${describeHttpError(error)}` }] }
- }
- const { data: saved, error: saveError } = await tryCatch(() => saveFile({
- data: generated.bytes,
- mediaType: generated.mediaType,
- fileName: `generated-${toolCallId}.${generated.extension}`,
- }))
- if (saveError) {
- return { content: [{ type: 'text', text: `Failed to store the generated image: ${saveError instanceof Error ? saveError.message : String(saveError)}` }] }
- }
- const timestamp = new Date().toISOString()
- emitImage({
- toolCallId,
- fileId: saved.fileId,
- url: saved.url,
- mediaType: generated.mediaType,
- prompt: toolInput.prompt,
- model: modelId,
- ...(toolInput.caption ? { caption: toolInput.caption } : {}),
- timestamp,
- })
- return { success: true, fileId: saved.fileId, url: saved.url, mediaType: generated.mediaType, model: modelId, prompt: toolInput.prompt }
+ const result = await generateAndStoreImage({ request: { ...toolInput, aspectRatio: toolInput.aspectRatio ?? 'square', signal }, caption: toolInput.caption, toolCallId, generate, saveFile, emitImage })
+ return billedAtCost ? { ...result, billedAtCost } : result
},
}),
}),
}
}
+export function falImageGenerator({ apiKey }: { apiKey: string }): ImageGenerator {
+ return async ({ prompt, style, aspectRatio, signal }) => {
+ const modelId = FAL_MODEL_BY_STYLE[style]
+ const image = await generateImageWithFal({ modelId, imageSize: FAL_IMAGE_SIZE_BY_ASPECT[aspectRatio], prompt, apiKey, signal })
+ return { ...image, model: modelId }
+ }
+}
+
+export function providerImageGenerator({ credentials, modelId, billing }: { credentials: AiProviderCredentials, modelId: string, billing: ActivepiecesAiBilling }): ImageGenerator {
+ return async ({ prompt, style, aspectRatio, signal }) => {
+ const image = await getGeneratedImage({
+ credentials,
+ modelId,
+ prompt: `${prompt}\n\n${STYLE_GUIDANCE_BY_STYLE[style]}`,
+ inputImages: [],
+ billing,
+ turnAlreadyCharged: true,
+ aspectRatio: ASPECT_RATIO_BY_ASPECT[aspectRatio],
+ abortSignal: signal,
+ })
+ return {
+ bytes: imageBytesOf(image),
+ mediaType: image.mediaType,
+ extension: extensionOf(image.mediaType),
+ model: modelId,
+ }
+ }
+}
+
+async function generateAndStoreImage({ request, caption, toolCallId, generate, saveFile, emitImage }: {
+ request: ImageRequest
+ caption?: string
+ toolCallId: string
+ generate: ImageGenerator
+ saveFile: ImageSaver
+ emitImage: AgentEventEmitter['emitImageGenerated']
+}): Promise<Record<string, unknown>> {
+ const { data: generated, error } = await tryCatch(() => generate(request))
+ if (error) {
+ return { content: [{ type: 'text', text: `Image generation failed: ${describeHttpError(error)}` }] }
+ }
+ const { data: saved, error: saveError } = await tryCatch(() => saveFile({
+ data: generated.bytes,
+ mediaType: generated.mediaType,
+ fileName: `generated-${toolCallId}.${generated.extension}`,
+ }))
+ if (saveError) {
+ return { content: [{ type: 'text', text: `Failed to store the generated image: ${saveError instanceof Error ? saveError.message : String(saveError)}` }] }
+ }
+ emitImage({
+ toolCallId,
+ fileId: saved.fileId,
+ url: saved.url,
+ mediaType: generated.mediaType,
+ prompt: request.prompt,
+ model: generated.model,
+ ...(caption ? { caption } : {}),
+ timestamp: new Date().toISOString(),
+ })
+ return { success: true, fileId: saved.fileId, url: saved.url, mediaType: generated.mediaType, model: generated.model, prompt: request.prompt }
+}
+
+function extensionOf(mediaType: string): string {
+ return mediaType.includes('jpeg') ? 'jpg' : (mediaType.split('/')[1] ?? 'png')
+}
+
async function scrapeWithFirecrawl({ url, apiKey, signal }: { url: string, apiKey: string, signal: AbortSignal }): Promise<ScrapedPage> {
const response = await safeHttp.axios.post('https://api.firecrawl.dev/v1/scrape', {
url,
@@ -303,7 +358,10 @@ async function generateImageWithFal({ modelId, imageSize, prompt, apiKey, signal
return {
bytes: Buffer.from(download.data),
mediaType,
- extension: mediaType.includes('jpeg') ? 'jpg' : (mediaType.split('/')[1] ?? 'png'),
+ extension: extensionOf(mediaType),
}
}
+type ImageRequest = { prompt: string, style: ImageStyle, aspectRatio: ImageAspect, signal: AbortSignal }
+type ImageGenerator = (request: ImageRequest) => Promise<GeneratedImage & { model: string }>
+type ImageSaver = (params: { data: Buffer, mediaType: string, fileName?: string }) => Promise<SaveAgentFileResponse>
diff --git a/packages/server/worker/test/lib/execute/jobs/ai/generate-image-charge.test.ts b/packages/server/worker/test/lib/execute/jobs/ai/generate-image-charge.test.ts
new file mode 100644
index 00000000000..6dc94a24674
--- /dev/null
+++ b/packages/server/worker/test/lib/execute/jobs/ai/generate-image-charge.test.ts
@@ -0,0 +1,47 @@
+import { ActivepiecesAiConsumerSource, AIProviderName } from '@activepieces/core-utils'
+import { aiProviderCredentials } from '@activepieces/shared'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const { reportFixedCredits } = vi.hoisted(() => ({ reportFixedCredits: vi.fn() }))
+
+vi.mock('@activepieces/server-utils', async (importOriginal) => ({
+ ...(await importOriginal<Record<string, unknown>>()),
+ aiUtils: { createModelForImages: () => ({ modelId: 'gpt-image-1.5' }) },
+ activepiecesAiCost: { reportFixedCredits },
+}))
+
+vi.mock('ai', async (importOriginal) => ({
+ ...(await importOriginal<Record<string, unknown>>()),
+ generateImage: async () => ({ image: { base64: Buffer.from('png').toString('base64'), uint8Array: new Uint8Array(), mediaType: 'image/png' } }),
+}))
+
+const { getGeneratedImage } = await import('../../../../../src/lib/execute/jobs/ai/generate-image')
+
+describe('getGeneratedImage charging', () => {
+ beforeEach(() => {
+ reportFixedCredits.mockReset()
+ })
+
+ it('charges a fixed credit for a flow step on an own key', async () => {
+ await generate({ turnAlreadyCharged: false })
+
+ expect(reportFixedCredits).toHaveBeenCalledTimes(1)
+ })
+
+ it('adds no fixed credit when the chat turn already charged for the call', async () => {
+ await generate({ turnAlreadyCharged: true })
+
+ expect(reportFixedCredits).not.toHaveBeenCalled()
+ })
+})
+
+function generate({ turnAlreadyCharged }: { turnAlreadyCharged: boolean }): ReturnType<typeof getGeneratedImage> {
+ return getGeneratedImage({
+ credentials: aiProviderCredentials({ provider: AIProviderName.OPENAI, auth: { apiKey: 'key' }, config: {} }),
+ modelId: 'gpt-image-1.5',
+ prompt: 'a banner',
+ inputImages: [],
+ billing: { source: ActivepiecesAiConsumerSource.CHAT, platformId: 'platform-1', projectId: null, conversationId: 'conversation-1', chat: { userId: 'user-1', turnIndex: 0, tier: 'fast' } },
+ turnAlreadyCharged,
+ })
+}
diff --git a/packages/server/worker/test/lib/execute/jobs/ee/agent/image-tools.test.ts b/packages/server/worker/test/lib/execute/jobs/ee/agent/image-tools.test.ts
new file mode 100644
index 00000000000..09906a79cf0
--- /dev/null
+++ b/packages/server/worker/test/lib/execute/jobs/ee/agent/image-tools.test.ts
@@ -0,0 +1,46 @@
+import { SaveAgentFileResponse } from '@activepieces/shared'
+import { ToolExecutionOptions } from 'ai'
+import { describe, expect, it, vi } from 'vitest'
+import { createImageTools } from '../../../../../../src/lib/execute/jobs/ee/agent/tools/web-media-tools'
+
+describe('ap_generate_image', () => {
+ it('stores the image, shows its card and returns the file', async () => {
+ const saveFile = vi.fn(async (): Promise<SaveAgentFileResponse> => SAVED)
+ const emitImage = vi.fn()
+
+ const result = await runImageTool({ generate: async () => GENERATED, billedAtCost: false, saveFile, emitImage })
+
+ expect(saveFile).toHaveBeenCalledWith({ data: GENERATED.bytes, mediaType: 'image/png', fileName: 'generated-call-1.png' })
+ expect(emitImage).toHaveBeenCalledWith(expect.objectContaining({ fileId: SAVED.fileId, model: GENERATED.model, caption: 'Launch banner' }))
+ expect(result).toEqual({ success: true, fileId: SAVED.fileId, url: SAVED.url, mediaType: 'image/png', model: GENERATED.model, prompt: 'a banner' })
+ })
+
+ it('marks an image made on the managed key as already billed at cost', async () => {
+ const result = await runImageTool({ generate: async () => GENERATED, billedAtCost: true, saveFile: async () => SAVED, emitImage: vi.fn() })
+
+ expect(result).toMatchObject({ success: true, billedAtCost: true })
+ })
+
+ it('reports a failed generation without storing anything, keeping the mark', async () => {
+ const saveFile = vi.fn(async (): Promise<SaveAgentFileResponse> => SAVED)
+
+ const result = await runImageTool({ generate: async () => { throw new Error('model unavailable') }, billedAtCost: true, saveFile, emitImage: vi.fn() })
+
+ expect(saveFile).not.toHaveBeenCalled()
+ expect(result).toEqual({ content: [{ type: 'text', text: 'Image generation failed: model unavailable' }], billedAtCost: true })
+ })
+})
+
+async function runImageTool(params: Parameters<typeof createImageTools>[0]): Promise<unknown> {
+ const execute = createImageTools(params).ap_generate_image.execute
+ if (!execute) {
+ throw new Error('ap_generate_image has no execute')
+ }
+ return execute({ prompt: 'a banner', style: 'graphic_text', caption: 'Launch banner' }, EXECUTION_OPTIONS)
+}
+
+const GENERATED = { bytes: Buffer.from('png'), mediaType: 'image/png', extension: 'png', model: 'google/gemini-3.1-flash-lite-image' }
+
+const SAVED: SaveAgentFileResponse = { fileId: 'file-1', url: 'https://files.example/file-1' }
+
+const EXECUTION_OPTIONS: ToolExecutionOptions = { toolCallId: 'call-1', messages: [] }