From a42e9e3fc808786661eefd669cb8cd9a4272db0c Mon Sep 17 00:00:00 2001
From: Heatherm Huang <heathermhuang@gmail.com>
Date: Mon, 6 Jul 2026 17:02:28 +0800
Subject: [PATCH 1/4] fix: expose Grok image pricing controls

---
 frontend/src/views/admin/GroupsView.vue         | 13 +++----------
 .../admin/__tests__/groupsImagePricing.spec.ts  | 17 +++++++++++++++++
 frontend/src/views/admin/groupsImagePricing.ts  |  9 +++++++++
 3 files changed, 29 insertions(+), 10 deletions(-)
 create mode 100644 frontend/src/views/admin/__tests__/groupsImagePricing.spec.ts
 create mode 100644 frontend/src/views/admin/groupsImagePricing.ts

diff --git a/frontend/src/views/admin/GroupsView.vue b/frontend/src/views/admin/GroupsView.vue
index 56d21c86c1..1901971e45 100644
--- a/frontend/src/views/admin/GroupsView.vue
+++ b/frontend/src/views/admin/GroupsView.vue
@@ -789,11 +789,7 @@
 
         <!-- 图片生成计费配置 -->
         <div
-          v-if="
-            createForm.platform === 'antigravity' ||
-            createForm.platform === 'gemini' ||
-            createForm.platform === 'openai'
-          "
+          v-if="supportsImagePricingPlatform(createForm.platform)"
           class="border-t pt-4"
         >
           <label
@@ -2128,11 +2124,7 @@
 
         <!-- 图片生成计费配置 -->
         <div
-          v-if="
-            editForm.platform === 'antigravity' ||
-            editForm.platform === 'gemini' ||
-            editForm.platform === 'openai'
-          "
+          v-if="supportsImagePricingPlatform(editForm.platform)"
           class="border-t pt-4"
         >
           <label
@@ -3216,6 +3208,7 @@ import {
 } from "./groupsModelsList";
 import { createModelsListCandidatesTracker } from "./groupsModelsListCandidates";
 import { normalizeSupportedModelScopesForPlatform } from "./groupsSupportedModelScopes";
+import { supportsImagePricingPlatform } from "./groupsImagePricing";
 
 const { t } = useI18n();
 const appStore = useAppStore();
diff --git a/frontend/src/views/admin/__tests__/groupsImagePricing.spec.ts b/frontend/src/views/admin/__tests__/groupsImagePricing.spec.ts
new file mode 100644
index 0000000000..5f6ebce2fa
--- /dev/null
+++ b/frontend/src/views/admin/__tests__/groupsImagePricing.spec.ts
@@ -0,0 +1,17 @@
+import { describe, expect, it } from "vitest";
+
+import {
+  imagePricingPlatforms,
+  supportsImagePricingPlatform,
+} from "../groupsImagePricing";
+
+describe("groups image pricing platform support", () => {
+  it("includes Grok media groups", () => {
+    expect(supportsImagePricingPlatform("grok")).toBe(true);
+    expect(imagePricingPlatforms.has("grok")).toBe(true);
+  });
+
+  it("keeps non-media group platforms out of the image pricing controls", () => {
+    expect(supportsImagePricingPlatform("anthropic")).toBe(false);
+  });
+});
diff --git a/frontend/src/views/admin/groupsImagePricing.ts b/frontend/src/views/admin/groupsImagePricing.ts
new file mode 100644
index 0000000000..1a2c5170ce
--- /dev/null
+++ b/frontend/src/views/admin/groupsImagePricing.ts
@@ -0,0 +1,9 @@
+export const imagePricingPlatforms = new Set([
+  "antigravity",
+  "gemini",
+  "grok",
+  "openai",
+]);
+
+export const supportsImagePricingPlatform = (platform: string): boolean =>
+  imagePricingPlatforms.has(platform);

From 6b4c3c6ed18eae39aba5c7ed774215b1ef34db61 Mon Sep 17 00:00:00 2001
From: Heatherm Huang <heathermhuang@gmail.com>
Date: Mon, 6 Jul 2026 18:23:38 +0800
Subject: [PATCH 2/4] test: cover Grok video media rate billing

---
 .../openai_gateway_record_usage_test.go       | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/backend/internal/service/openai_gateway_record_usage_test.go b/backend/internal/service/openai_gateway_record_usage_test.go
index 8323035ffe..5546190d14 100644
--- a/backend/internal/service/openai_gateway_record_usage_test.go
+++ b/backend/internal/service/openai_gateway_record_usage_test.go
@@ -1803,6 +1803,51 @@ func TestOpenAIGatewayServiceRecordUsage_ImageIndependentMultiplierUsesImageRate
 	require.Equal(t, string(BillingModeImage), *usageRepo.lastLog.BillingMode)
 }
 
+func TestOpenAIGatewayServiceRecordUsage_GrokVideoUsesImageRateMultiplier(t *testing.T) {
+	mediaPrice2K := 0.4
+	groupID := int64(126)
+
+	usageRepo := &openAIRecordUsageLogRepoStub{inserted: true}
+	svc := newOpenAIRecordUsageServiceForTest(usageRepo, &openAIRecordUsageUserRepoStub{}, &openAIRecordUsageSubRepoStub{}, nil)
+
+	err := svc.RecordUsage(context.Background(), &OpenAIRecordUsageInput{
+		Result: &OpenAIForwardResult{
+			RequestID:    "video-request-123",
+			ResponseID:   "video-request-123",
+			Model:        "grok-imagine-video-1.5",
+			BillingModel: "grok-imagine-video-1.5",
+			ImageCount:   1,
+			ImageSize:    ImageBillingSize2K,
+			Duration:     time.Second,
+		},
+		APIKey: &APIKey{
+			ID:      10126,
+			GroupID: i64p(groupID),
+			Group: &Group{
+				ID:                   groupID,
+				Platform:             PlatformGrok,
+				RateMultiplier:       0.15,
+				ImageRateIndependent: true,
+				ImageRateMultiplier:  0.5,
+				ImagePrice2K:         &mediaPrice2K,
+			},
+		},
+		User:    &User{ID: 20126},
+		Account: &Account{ID: 30126, Platform: PlatformGrok},
+	})
+
+	require.NoError(t, err)
+	require.NotNil(t, usageRepo.lastLog)
+	require.Equal(t, "grok-imagine-video-1.5", usageRepo.lastLog.Model)
+	require.Equal(t, 1, usageRepo.lastLog.ImageCount)
+	require.Equal(t, ImageBillingSize2K, *usageRepo.lastLog.ImageSize)
+	require.InDelta(t, 0.4, usageRepo.lastLog.TotalCost, 1e-12)
+	require.InDelta(t, 0.2, usageRepo.lastLog.ActualCost, 1e-12)
+	require.InDelta(t, 0.5, usageRepo.lastLog.RateMultiplier, 1e-12)
+	require.NotNil(t, usageRepo.lastLog.BillingMode)
+	require.Equal(t, string(BillingModeImage), *usageRepo.lastLog.BillingMode)
+}
+
 func TestOpenAIGatewayServiceRecordUsage_ChannelImageBillingUsesImageCountAndSharedMultiplier(t *testing.T) {
 	groupID := int64(123)
 	usageRepo := &openAIRecordUsageLogRepoStub{inserted: true}

From 95717a7e6261ac0cbbb596400a4e7de2ec04d281 Mon Sep 17 00:00:00 2001
From: Heatherm Huang <heathermhuang@gmail.com>
Date: Mon, 6 Jul 2026 18:30:32 +0800
Subject: [PATCH 3/4] test: clarify Grok video billing test name

---
 backend/internal/service/openai_gateway_record_usage_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/internal/service/openai_gateway_record_usage_test.go b/backend/internal/service/openai_gateway_record_usage_test.go
index 5546190d14..733cc8ae68 100644
--- a/backend/internal/service/openai_gateway_record_usage_test.go
+++ b/backend/internal/service/openai_gateway_record_usage_test.go
@@ -1803,7 +1803,7 @@ func TestOpenAIGatewayServiceRecordUsage_ImageIndependentMultiplierUsesImageRate
 	require.Equal(t, string(BillingModeImage), *usageRepo.lastLog.BillingMode)
 }
 
-func TestOpenAIGatewayServiceRecordUsage_GrokVideoUsesImageRateMultiplier(t *testing.T) {
+func TestGrokVideoMediaBillingUsesImageRateMultiplier(t *testing.T) {
 	mediaPrice2K := 0.4
 	groupID := int64(126)
 

From de31e57333de894ead45520a70d60c5cfa33c3fb Mon Sep 17 00:00:00 2001
From: Heatherm Huang <heathermhuang@gmail.com>
Date: Mon, 6 Jul 2026 18:32:29 +0800
Subject: [PATCH 4/4] test: document Grok video media billing unit

---
 backend/internal/service/grok_media.go                     | 1 +
 .../internal/service/openai_gateway_record_usage_test.go   | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/backend/internal/service/grok_media.go b/backend/internal/service/grok_media.go
index 8942404eaa..f8b7ff3e83 100644
--- a/backend/internal/service/grok_media.go
+++ b/backend/internal/service/grok_media.go
@@ -483,6 +483,7 @@ func grokMediaUsageFromResponse(endpoint GrokMediaEndpoint, requestInfo GrokMedi
 		meta.ImageOutputSizes = collectOpenAIResponseImageOutputSizesFromJSONBytes(responseBody)
 	case GrokMediaEndpointVideosGenerations:
 		meta.ResponseID = extractGrokMediaVideoRequestID(responseBody)
+		// Video generation is one billable media unit; the legacy usage schema stores it in ImageCount.
 		meta.ImageCount = 1
 		meta.ImageSize = requestInfo.SizeTier
 		meta.ImageInputSize = requestInfo.Size
diff --git a/backend/internal/service/openai_gateway_record_usage_test.go b/backend/internal/service/openai_gateway_record_usage_test.go
index 733cc8ae68..697d89e81c 100644
--- a/backend/internal/service/openai_gateway_record_usage_test.go
+++ b/backend/internal/service/openai_gateway_record_usage_test.go
@@ -1816,9 +1816,10 @@ func TestGrokVideoMediaBillingUsesImageRateMultiplier(t *testing.T) {
 			ResponseID:   "video-request-123",
 			Model:        "grok-imagine-video-1.5",
 			BillingModel: "grok-imagine-video-1.5",
-			ImageCount:   1,
-			ImageSize:    ImageBillingSize2K,
-			Duration:     time.Second,
+			// The usage schema has no separate video count; video generation is billed as one media unit.
+			ImageCount: 1,
+			ImageSize:  ImageBillingSize2K,
+			Duration:   time.Second,
 		},
 		APIKey: &APIKey{
 			ID:      10126,