Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions browser_tests/fixtures/agentPromptHistoryFixture.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ export const promptHistoryTest = base.extend<{
historyReads: () => number
historyRequestThreadIds: string[]
completeLatestTurn: (content: MockAgentMessageContent) => void
finishLatestTurn: (reply: string, chargeMicroUsd: number) => Promise<void>
}
}>({
agentPanel: async ({ page }, use) => {
Expand Down Expand Up @@ -149,6 +150,41 @@ export const promptHistoryTest = base.extend<{
if (!turn) throw new Error('No turn has been sent yet')
turn.status = 'complete'
turn.content = content
},
finishLatestTurn: async (reply, chargeMicroUsd) => {
const turn = messages.findLast(({ role }) => role === 'assistant')
if (!turn) throw new Error('No turn has been sent yet')
turn.status = 'complete'
turn.content = { text: reply }
const usage = {
input_tokens: 10,
output_tokens: 5,
total_tokens: 15,
cache_creation_input_tokens: 0,
cache_read_input_tokens: 0,
charge_micro_usd: chargeMicroUsd
}
const socket = await getAgentSocket()
socket.send(
JSON.stringify({
type: 'agent_message_delta',
data: {
message_id: turn.id,
thread_id: threadId,
delta: reply
}
} satisfies AgentWsEvent)
)
socket.send(
JSON.stringify({
type: 'agent_message_done',
data: {
message_id: turn.id,
thread_id: threadId,
usage
}
} satisfies AgentWsEvent)
)
}
})
}
Expand Down
9 changes: 8 additions & 1 deletion browser_tests/fixtures/agentWorkflowSelectionFixture.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { networkIsolationFixture as base } from '@e2e/fixtures/networkIsolationFixture'

import type { RemoteConfig } from '@/platform/remoteConfig/types'
import type { UserDataFullInfo } from '@/platform/remote/comfyui/types'
import type { ComfyNodeDef } from '@/schemas/nodeDefSchema'
import type { CloudWorkflowEntry } from '@/workbench/extensions/agent/schemas/agentApiSchema'
Expand Down Expand Up @@ -41,15 +42,21 @@ function moveSavedWorkflow(

export const workflowSelectionTest = base.extend<{
nodeDefinitions: Record<string, ComfyNodeDef> | undefined
workflowSelectionFeatures: Partial<RemoteConfig> | undefined
workflowSelection: WorkflowSelection
}>({
nodeDefinitions: [undefined, { option: true }],
workflowSelection: async ({ page, nodeDefinitions }, use) => {
workflowSelectionFeatures: [undefined, { option: true }],
workflowSelection: async (
{ page, nodeDefinitions, workflowSelectionFeatures },
use
) => {
if (nodeDefinitions)
await page.route('**/api/object_info', (route) =>
route.fulfill(jsonRoute(nodeDefinitions))
)
await bootAgentApp(page, true, {
features: workflowSelectionFeatures,
objectInfo: nodeDefinitions ? 'server' : undefined
})
const workflows: CloudWorkflowEntry[] = []
Expand Down
45 changes: 45 additions & 0 deletions browser_tests/tests/agent/agentCreditUsageSummary.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import { expect } from '@playwright/test'

import enMessages from '@/locales/en/main.json' with { type: 'json' }

import { promptHistoryTest as test } from '@e2e/fixtures/agentPromptHistoryFixture'
import { AgentPanel } from '@e2e/fixtures/components/AgentPanel'

test.describe.configure({ timeout: 120_000 })
test.use({
workflowSelectionFeatures: {
'agent-credit-usage-summary': 'treatment'
}
})

test(
'shows server-reported Agent credits when a turn completes',
{ tag: ['@cloud', '@ui'] },
async ({ page, promptHistory, workflowSelection }) => {
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
await expect(
page.getByTestId('integrated-tab-bar-actions')
).toHaveAttribute('data-agent-gate-settled', 'true', { timeout: 8_000 })
const agentPanel = new AgentPanel(page)
await agentPanel.open()
await page
.getByRole('button', {
name: enMessages.sideToolbar.newBlankWorkflow,
exact: true
})
.click()
await agentPanel.workflowPicker.click()
await page
.getByRole('menuitemradio', { name: 'Unsaved Workflow', exact: true })
.click()
await expect.poll(() => workflowSelection.savedPaths.length).toBe(1)
workflowSelection.finishSave(true)

await agentPanel.composer.fill('Add a KSampler node.')
await agentPanel.sendButton.click()
await expect.poll(() => promptHistory.requests.length).toBe(1)
await promptHistory.finishLatestTurn('Done.', 6038)

const liveUsage = agentPanel.root.getByTestId('agent-credit-usage')
await expect(liveUsage).toHaveText('Agent used 1.27 credits')
}
)
4 changes: 4 additions & 0 deletions packages/ingest-types/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ export type {
AgentLlmTracesResponse,
AgentLlmTracesResponses,
AgentMessage,
AgentMessageDoneData,
AgentMessageDoneFrame,
AgentPausedContext,
AgentPendingAsk,
AgentPendingAskBase,
Expand Down Expand Up @@ -147,6 +149,8 @@ export type {
AgentToolCallData,
AgentToolCallFrame,
AgentTurnAccepted,
AgentTurnRefusal,
AgentTurnUsage,
AgentViewableAttachmentExtension,
Asset,
AssetCreated,
Expand Down
55 changes: 55 additions & 0 deletions packages/ingest-types/src/types.gen.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

49 changes: 49 additions & 0 deletions packages/ingest-types/src/zod.gen.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions packages/shared-frontend-utils/src/creditsUtil.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
formatCreditsFromUsd,
formatUsd,
formatUsdFromCents,
microUsdToCredits,
usdToCents,
usdToCredits
} from './creditsUtil'
Expand Down Expand Up @@ -50,6 +51,10 @@ describe('comfyCredits helpers', () => {
expect(creditsToUsd(211)).toBe(1) // 211 credits = 1 USD
})

test('converts micro-USD to fractional credits without rounding', () => {
expect(microUsdToCredits(6038)).toBeCloseTo(1.274)
})

test('formats credits and USD values using en-US locale', () => {
const locale = 'en-US'
expect(formatCredits({ value: 1234.567, locale })).toBe('1,234.57')
Expand Down
3 changes: 3 additions & 0 deletions packages/shared-frontend-utils/src/creditsUtil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ export const creditsToCents = (credits: number): number =>
export const usdToCredits = (usd: number): number =>
Math.round(usd * CREDITS_PER_USD)

export const microUsdToCredits = (microUsd: number): number =>
(microUsd * CREDITS_PER_USD) / 1_000_000

export const creditsToUsd = (credits: number): number =>
Math.round((credits / CREDITS_PER_USD) * 100) / 100

Expand Down
9 changes: 9 additions & 0 deletions packages/telemetry/src/TelemetryRegistry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import type {
AgentConsentResolvedMetadata,
AgentConsentShownMetadata,
AgentCreditTransitionNoticeMetadata,
AgentCreditUsageExposureMetadata,
AgentPaywallCtaMetadata,
AgentPaywallShownMetadata,
AgentEntryButtonClickedMetadata,
Expand Down Expand Up @@ -496,6 +497,14 @@ export class TelemetryRegistry implements TelemetryDispatcher {
this.dispatch((provider) => provider.trackAgentFreeUseExposure?.(metadata))
}

trackAgentCreditUsageExposure(
metadata: AgentCreditUsageExposureMetadata
): void {
this.dispatch((provider) =>
provider.trackAgentCreditUsageExposure?.(metadata)
)
}

trackAgentNodeTagged(metadata: AgentNodeTaggedMetadata): void {
this.dispatch((provider) => provider.trackAgentNodeTagged?.(metadata))
}
Expand Down
12 changes: 12 additions & 0 deletions packages/telemetry/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -898,6 +898,14 @@ export interface AgentFreeUseExposureMetadata extends Record<string, unknown> {
placement: AgentFreeUseVariant
'$feature/agent-free-use-message-placement': AgentFreeUseVariant
}
export type AgentCreditUsageVariant = 'control' | 'treatment'
export interface AgentCreditUsageExposureMetadata extends Record<
string,
unknown
> {
variant: AgentCreditUsageVariant
'$feature/agent-credit-usage-summary': AgentCreditUsageVariant
}
/**
* Interactions with the notice itself. This event adds what the existing
* outcome events cannot say: whether the notice was actually on screen in its
Expand Down Expand Up @@ -1580,6 +1588,9 @@ export interface TelemetryProvider {
): void
trackAgentFreeUseNotice?(metadata: AgentFreeUseNoticeMetadata): void
trackAgentFreeUseExposure?(metadata: AgentFreeUseExposureMetadata): void
trackAgentCreditUsageExposure?(
metadata: AgentCreditUsageExposureMetadata
): void
trackAgentNodeTagged?(metadata: AgentNodeTaggedMetadata): void
trackAgentAttachButtonClicked?(
metadata: AgentAttachButtonClickedMetadata
Expand Down Expand Up @@ -1769,6 +1780,7 @@ export const TelemetryEvents = {
AGENT_STARTER_PROMPT_CLICKED: 'app:agent_starter_prompt_clicked',
AGENT_FREE_USE_NOTICE: 'app:agent_free_use_notice',
AGENT_FREE_USE_EXPOSURE: 'app:agent_free_use_exposure',
AGENT_CREDIT_USAGE_EXPOSURE: 'app:agent_credit_usage_exposure',
AGENT_CREDIT_TRANSITION_NOTICE: 'app:agent_credit_transition_notice',
AGENT_NODE_TAGGED: 'app:agent_node_tagged',
AGENT_ATTACH_BUTTON_CLICKED: 'app:agent_attach_button_clicked',
Expand Down
Loading
Loading