diff --git a/browser_tests/fixtures/data/customerEvents.ts b/browser_tests/fixtures/data/customerEvents.ts index 797b68ad0d1..a84e7efcc0a 100644 --- a/browser_tests/fixtures/data/customerEvents.ts +++ b/browser_tests/fixtures/data/customerEvents.ts @@ -4,8 +4,9 @@ import type { BillingEventsResponse } from '@comfyorg/ingest-types' export const AGENT_USAGE_EVENT_TYPE = 'Agent Usage' export const PARTNER_NODE_USAGE_EVENT_TYPE = 'Partner Node Usage' export const API_USAGE_EVENT_TYPE = 'API Usage' +export const GPU_USAGE_EVENT_TYPE = 'GPU Usage' -/** `/api/billing/events` page with whole, sub-credit and non-numeric `charge_micro_usd`. */ +/** `/api/billing/events` page with whole, one-credit, sub-credit and non-numeric `charge_micro_usd`. */ export const AGENT_USAGE_CUSTOMER_EVENTS = { events: [ { @@ -28,6 +29,15 @@ export const AGENT_USAGE_CUSTOMER_EVENTS = { input_tokens: 96 } }, + { + event_id: 'evt-gpu-usage-one-credit', + event_type: 'gpu_usage', + createdAt: '2026-09-20T11:15:00Z', + params: { + charge_micro_usd: 4_740, + gpu_seconds: 3 + } + }, { event_id: 'evt-partner-node-usage', event_type: 'api_node_usage', @@ -40,6 +50,6 @@ export const AGENT_USAGE_CUSTOMER_EVENTS = { ], page: 1, limit: 7, - total: 3, + total: 4, totalPages: 1 } satisfies BillingEventsResponse diff --git a/browser_tests/tests/dialogs/usageLogsChargeTooltip.spec.ts b/browser_tests/tests/dialogs/usageLogsChargeTooltip.spec.ts index 43cc5b17d42..dcb50185d77 100644 --- a/browser_tests/tests/dialogs/usageLogsChargeTooltip.spec.ts +++ b/browser_tests/tests/dialogs/usageLogsChargeTooltip.spec.ts @@ -6,6 +6,7 @@ import { AGENT_USAGE_CUSTOMER_EVENTS, AGENT_USAGE_EVENT_TYPE, API_USAGE_EVENT_TYPE, + GPU_USAGE_EVENT_TYPE, PARTNER_NODE_USAGE_EVENT_TYPE } from '@e2e/fixtures/data/customerEvents' import { localAuthFixture as test } from '@e2e/fixtures/localAuthFixture' @@ -51,6 +52,20 @@ test.describe( ) }) + test('says Credit for a one-credit charge', async ({ comfyPage }) => { + const table = new UsageLogsTable(comfyPage.settingDialog) + const tooltip = new Tooltip(comfyPage.page) + + await table.additionalInfoButton(GPU_USAGE_EVENT_TYPE).hover() + + await expect(tooltip.open).toContainText('Charge: 1 Credit') + await expect(tooltip.open).not.toContainText('1 Credits') + await expectElementScreenshot( + tooltip.surface(tooltip.open), + 'activity-charge-tooltip-one-credit.png' + ) + }) + test('passes a non-numeric charge through unchanged', async ({ comfyPage }) => { diff --git a/browser_tests/tests/dialogs/usageLogsChargeTooltip.spec.ts-snapshots/activity-charge-tooltip-one-credit-chromium-linux.png b/browser_tests/tests/dialogs/usageLogsChargeTooltip.spec.ts-snapshots/activity-charge-tooltip-one-credit-chromium-linux.png new file mode 100644 index 00000000000..f9de651ca51 Binary files /dev/null and b/browser_tests/tests/dialogs/usageLogsChargeTooltip.spec.ts-snapshots/activity-charge-tooltip-one-credit-chromium-linux.png differ diff --git a/src/locales/ar/main.json b/src/locales/ar/main.json index 409215745d3..0e0429a9128 100644 --- a/src/locales/ar/main.json +++ b/src/locales/ar/main.json @@ -1202,6 +1202,7 @@ "apiPricing": "أسعار API", "charge": "تحصيل رسوم", "credits": "الرصيد", + "creditUnit": "الرصيد", "creditsAvailable": "الرصيد المتاح", "details": "التفاصيل", "eventType": "نوع الحدث", diff --git a/src/locales/de/main.json b/src/locales/de/main.json index 620b98a080b..da242586b59 100644 --- a/src/locales/de/main.json +++ b/src/locales/de/main.json @@ -1202,6 +1202,7 @@ "apiPricing": "API-Preise", "charge": "Abbuchung", "credits": "Credits", + "creditUnit": "Credits", "creditsAvailable": "Verfügbare Credits", "details": "Details", "eventType": "Ereignistyp", diff --git a/src/locales/en/main.json b/src/locales/en/main.json index 55595a14c7e..64348039c54 100644 --- a/src/locales/en/main.json +++ b/src/locales/en/main.json @@ -3085,6 +3085,7 @@ "additionalInfo": "Additional Info", "charge": "Charge", "lessThanOne": "<1", + "creditUnit": "Credit | Credits", "model": "Model", "api": "API", "added": "Added", diff --git a/src/locales/es/main.json b/src/locales/es/main.json index d6415c061e1..82e6143a5f7 100644 --- a/src/locales/es/main.json +++ b/src/locales/es/main.json @@ -1202,6 +1202,7 @@ "apiPricing": "Precios de la API", "charge": "Cobro", "credits": "Créditos", + "creditUnit": "Créditos", "creditsAvailable": "Créditos disponibles", "details": "Detalles", "eventType": "Tipo de evento", diff --git a/src/locales/fa/main.json b/src/locales/fa/main.json index 0ddfeaaea25..88cbc4473a4 100644 --- a/src/locales/fa/main.json +++ b/src/locales/fa/main.json @@ -1202,6 +1202,7 @@ "apiPricing": "قیمت‌گذاری API", "charge": "هزینه", "credits": "اعتبار", + "creditUnit": "اعتبار", "creditsAvailable": "اعتبار موجود", "details": "جزئیات", "eventType": "نوع رویداد", diff --git a/src/locales/fr/main.json b/src/locales/fr/main.json index edb6089f586..83c0ab67465 100644 --- a/src/locales/fr/main.json +++ b/src/locales/fr/main.json @@ -1202,6 +1202,7 @@ "apiPricing": "Tarification de l’API", "charge": "Débiter", "credits": "Crédits", + "creditUnit": "Crédits", "creditsAvailable": "Crédits disponibles", "details": "Détails", "eventType": "Type d'événement", diff --git a/src/locales/he/main.json b/src/locales/he/main.json index d1ed7101944..8376092b0f8 100644 --- a/src/locales/he/main.json +++ b/src/locales/he/main.json @@ -1202,6 +1202,7 @@ "apiPricing": "תמחור API", "charge": "חיוב", "credits": "קרדיטים", + "creditUnit": "קרדיטים", "creditsAvailable": "קרדיטים זמינים", "details": "פרטים", "eventType": "סוג האירוע", diff --git a/src/locales/it/main.json b/src/locales/it/main.json index e1b3b41b160..640ce5772d0 100644 --- a/src/locales/it/main.json +++ b/src/locales/it/main.json @@ -1202,6 +1202,7 @@ "apiPricing": "Prezzi API", "charge": "Addebito", "credits": "Crediti", + "creditUnit": "Crediti", "creditsAvailable": "Crediti disponibili", "details": "Dettagli", "eventType": "Tipo di evento", diff --git a/src/locales/ja/main.json b/src/locales/ja/main.json index 5f631cf1d8b..e5bc9e63bef 100644 --- a/src/locales/ja/main.json +++ b/src/locales/ja/main.json @@ -1202,6 +1202,7 @@ "apiPricing": "API料金", "charge": "請求", "credits": "クレジット", + "creditUnit": "クレジット", "creditsAvailable": "利用可能なクレジット", "details": "詳細", "eventType": "イベントタイプ", diff --git a/src/locales/ko/main.json b/src/locales/ko/main.json index 01c59f88a2c..c6e70df2654 100644 --- a/src/locales/ko/main.json +++ b/src/locales/ko/main.json @@ -1202,6 +1202,7 @@ "apiPricing": "API 가격", "charge": "청구", "credits": "크레딧", + "creditUnit": "크레딧", "creditsAvailable": "사용 가능한 크레딧", "details": "세부 정보", "eventType": "이벤트 유형", diff --git a/src/locales/pt-BR/main.json b/src/locales/pt-BR/main.json index 19859c65d76..bb3720c24fa 100644 --- a/src/locales/pt-BR/main.json +++ b/src/locales/pt-BR/main.json @@ -1202,6 +1202,7 @@ "apiPricing": "Preços da API", "charge": "Cobrar", "credits": "Créditos", + "creditUnit": "Créditos", "creditsAvailable": "Créditos disponíveis", "details": "Detalhes", "eventType": "Tipo de evento", diff --git a/src/locales/ru/main.json b/src/locales/ru/main.json index d336e0e0750..c50bafe7b31 100644 --- a/src/locales/ru/main.json +++ b/src/locales/ru/main.json @@ -1202,6 +1202,7 @@ "apiPricing": "Цены на API", "charge": "Списать средства", "credits": "Кредиты", + "creditUnit": "Кредиты", "creditsAvailable": "Доступно кредитов", "details": "Детали", "eventType": "Тип события", diff --git a/src/locales/tr/main.json b/src/locales/tr/main.json index c658c8260c4..586dd1f5006 100644 --- a/src/locales/tr/main.json +++ b/src/locales/tr/main.json @@ -1202,6 +1202,7 @@ "apiPricing": "API Fiyatlandırması", "charge": "Ücretlendirme", "credits": "Krediler", + "creditUnit": "Krediler", "creditsAvailable": "Mevcut kredi", "details": "Detaylar", "eventType": "Etkinlik Türü", diff --git a/src/locales/zh-TW/main.json b/src/locales/zh-TW/main.json index 39d2693cc51..ab4a862e61d 100644 --- a/src/locales/zh-TW/main.json +++ b/src/locales/zh-TW/main.json @@ -1202,6 +1202,7 @@ "apiPricing": "API 價格", "charge": "扣款", "credits": "點數", + "creditUnit": "點數", "creditsAvailable": "可用點數", "details": "詳細資料", "eventType": "事件類型", diff --git a/src/locales/zh/main.json b/src/locales/zh/main.json index 9927ed82b0c..ed4286a6a9e 100644 --- a/src/locales/zh/main.json +++ b/src/locales/zh/main.json @@ -1202,6 +1202,7 @@ "apiPricing": "API 价格", "charge": "扣费", "credits": "积分", + "creditUnit": "积分", "creditsAvailable": "积分可用", "details": "详情", "eventType": "事件类型", diff --git a/src/services/customerEventsService.test.ts b/src/services/customerEventsService.test.ts index ae5d5e6373b..1d26bd3b44e 100644 --- a/src/services/customerEventsService.test.ts +++ b/src/services/customerEventsService.test.ts @@ -13,7 +13,8 @@ vi.mock(import('@/i18n'), async () => { const { createI18n } = await import('vue-i18n') return { d: mockI18n.d, - t: (key: string) => key, + t: (key: string, plural?: unknown) => + typeof plural === 'number' ? `${key}[${plural}]` : key, i18n: createI18n({ legacy: false, locale: 'en' }) } }) @@ -231,27 +232,27 @@ describe('useCustomerEventsService', () => { }) it.for([ - { charge: 33_044, expected: 'credits.charge: 7 credits.credits' }, - { charge: '36209', expected: 'credits.charge: 8 credits.credits' }, + { charge: 33_044, expected: 'credits.charge: 7 credits.creditUnit[7]' }, + { charge: '36209', expected: 'credits.charge: 8 credits.creditUnit[8]' }, { charge: 10_000_000_000, - expected: 'credits.charge: 2,110,000 credits.credits' + expected: 'credits.charge: 2,110,000 credits.creditUnit[2110000]' }, - { charge: 0, expected: 'credits.charge: 0 credits.credits' }, + { charge: 0, expected: 'credits.charge: 0 credits.creditUnit[0]' }, { charge: 1, - expected: 'credits.charge: credits.lessThanOne credits.credits' + expected: 'credits.charge: credits.lessThanOne credits.creditUnit[2]' }, { charge: 1_000, - expected: 'credits.charge: credits.lessThanOne credits.credits' + expected: 'credits.charge: credits.lessThanOne credits.creditUnit[2]' }, { charge: 3_318, - expected: 'credits.charge: credits.lessThanOne credits.credits' + expected: 'credits.charge: credits.lessThanOne credits.creditUnit[2]' }, - { charge: 4_740, expected: 'credits.charge: 1 credits.credits' }, - { charge: 6_636, expected: 'credits.charge: 1 credits.credits' }, + { charge: 4_740, expected: 'credits.charge: 1 credits.creditUnit[1]' }, + { charge: 6_636, expected: 'credits.charge: 1 credits.creditUnit[1]' }, { charge: 'n/a', expected: 'Charge Micro Usd: n/a' } ])( 'should render charge_micro_usd $charge as $expected', @@ -262,6 +263,25 @@ describe('useCustomerEventsService', () => { } ) + it.for([ + [0, 'Credits'], + [1, 'Credit'], + [2, 'Credits'], + [7, 'Credits'] + ] as const)( + 'English charge unit for a count of %s is %s', + async ([count, unit]) => { + const { createI18n } = await import('vue-i18n') + const { default: en } = await import('@/locales/en/main.json') + const english = createI18n({ + legacy: false, + locale: 'en', + messages: { en } + }) + expect(english.global.t('credits.creditUnit', count)).toBe(unit) + } + ) + const withNothingToRender: ParamsCase[] = [ ['params carry only non-allowlisted keys', unrenderableParams], [ diff --git a/src/services/customerEventsService.ts b/src/services/customerEventsService.ts index 06c52639cd5..9aa3bbad02e 100644 --- a/src/services/customerEventsService.ts +++ b/src/services/customerEventsService.ts @@ -91,14 +91,15 @@ export const useCustomerEventsService = () => { function formatChargeCredits(microUsd: number) { const credits = microUsdToCredits(microUsd) - const amount = isSubCreditCharge(credits) - ? t('credits.lessThanOne') - : formatCredits({ - value: credits, - locale: i18n.global.locale.value, - numberOptions: { minimumFractionDigits: 0, maximumFractionDigits: 0 } - }) - return `${amount} ${t('credits.credits')}` + if (isSubCreditCharge(credits)) { + return `${t('credits.lessThanOne')} ${t('credits.creditUnit', 2)}` + } + const amount = formatCredits({ + value: credits, + locale: i18n.global.locale.value, + numberOptions: { minimumFractionDigits: 0, maximumFractionDigits: 0 } + }) + return `${amount} ${t('credits.creditUnit', Math.round(credits))}` } function formatTooltipParam(key: string, value: unknown) {