feat(usage): add per-user external channel billing statistics

controller/log.go

@@ -1,6 +1,7 @@
 package controller
 
 import (
+	"fmt"
 	"net/http"
 	"strconv"
 
@@ -154,3 +155,64 @@ func GetLogsSelfStat(c *gin.Context) {
 	})
 	return
 }
+
+// parseUnixBound parses an optional unix-second query parameter. An absent or
+// empty value means an open bound (0); a malformed value is a client error.
+func parseUnixBound(c *gin.Context, name string) (int64, bool) {
+	v := c.Query(name)
+	if v == "" {
+		return 0, true
+	}
+	n, err := strconv.ParseInt(v, 10, 64)
+	if err != nil {
+		common.ApiError(c, fmt.Errorf("invalid %s", name))
+		return 0, false
+	}
+	return n, true
+}
+
+// GetExternalBillingStat returns per-user external-channel usage for all users (admin).
+func GetExternalBillingStat(c *gin.Context) {
+	startTimestamp, ok := parseUnixBound(c, "start_timestamp")
+	if !ok {
+		return
+	}
+	endTimestamp, ok := parseUnixBound(c, "end_timestamp")
+	if !ok {
+		return
+	}
+	username := c.Query("username")
+	rows, err := model.SumExternalByUser(startTimestamp, endTimestamp, username)
+	if err != nil {
+		common.ApiError(c, err)
+		return
+	}
+	if rows == nil {
+		rows = []model.ExternalBillingRow{}
+	}
+	c.JSON(http.StatusOK, gin.H{"success": true, "message": "", "data": rows})
+	return
+}
+
+// GetExternalBillingSelfStat returns the caller's own external-channel usage.
+func GetExternalBillingSelfStat(c *gin.Context) {
+	startTimestamp, ok := parseUnixBound(c, "start_timestamp")
+	if !ok {
+		return
+	}
+	endTimestamp, ok := parseUnixBound(c, "end_timestamp")
+	if !ok {
+		return
+	}
+	username := c.GetString("username")
+	rows, err := model.SumExternalByUser(startTimestamp, endTimestamp, username)
+	if err != nil {
+		common.ApiError(c, err)
+		return
+	}
+	if rows == nil {
+		rows = []model.ExternalBillingRow{}
+	}
+	c.JSON(http.StatusOK, gin.H{"success": true, "message": "", "data": rows})
+	return
+}

model/log.go

@@ -694,6 +694,55 @@ func SumUsedToken(logType int, startTimestamp int64, endTimestamp int64, modelNa
 	return token
 }
 
+// ExternalBillingRow per-user external (third-party) channel usage aggregation.
+type ExternalBillingRow struct {
+	Username         string `json:"username"`
+	PromptTokens     int64  `json:"prompt_tokens"`
+	CompletionTokens int64  `json:"completion_tokens"`
+	TotalTokens      int64  `json:"total_tokens"`
+	Quota            int64  `json:"quota"`
+	ModelCount       int64  `json:"model_count"`
+}
+
+// SumExternalByUser aggregates, per user, consumption on external channels
+// (channels.tag = 'external') covering all models, regardless of whether an
+// explicit configured price exists (previously restricted to the model price
+// map, which silently dropped ratio-billed models). startTimestamp/endTimestamp
+// are unix seconds (0 = open).
+func SumExternalByUser(startTimestamp int64, endTimestamp int64, username string) ([]ExternalBillingRow, error) {
+	// Resolve external channel ids through the main DB: LOG_DB may be a
+	// separate database (e.g. ClickHouse) without a channels table, so a
+	// cross-database JOIN would fail there.
+	var externalChannelIds []int64
+	if err := DB.Table("channels").Where("tag = ?", "external").Pluck("id", &externalChannelIds).Error; err != nil {
+		common.SysError("failed to resolve external channels: " + err.Error())
+		return nil, errors.New("查询外部渠道统计数据失败")
+	}
+	if len(externalChannelIds) == 0 {
+		return nil, nil
+	}
+	tx := LOG_DB.Table("logs").
+		Select("username, COALESCE(sum(prompt_tokens),0) prompt_tokens, COALESCE(sum(completion_tokens),0) completion_tokens, COALESCE(sum(prompt_tokens),0)+COALESCE(sum(completion_tokens),0) total_tokens, COALESCE(sum(quota),0) quota, count(DISTINCT model_name) model_count").
+		Where("logs.channel_id IN ?", externalChannelIds).
+		Where("logs.type = ?", LogTypeConsume)
+	if startTimestamp != 0 {
+		tx = tx.Where("logs.created_at >= ?", startTimestamp)
+	}
+	if endTimestamp != 0 {
+		tx = tx.Where("logs.created_at <= ?", endTimestamp)
+	}
+	if username != "" {
+		tx = tx.Where("logs.username = ?", username)
+	}
+	tx = tx.Group("logs.username")
+	var rows []ExternalBillingRow
+	if err := tx.Scan(&rows).Error; err != nil {
+		common.SysError("failed to query external billing stat: " + err.Error())
+		return nil, errors.New("查询外部渠道统计数据失败")
+	}
+	return rows, nil
+}
+
 func CountOldLog(ctx context.Context, targetTimestamp int64) (int64, error) {
 	var total int64
 	if err := LOG_DB.WithContext(ctx).Model(&Log{}).Where("created_at < ?", targetTimestamp).Count(&total).Error; err != nil {

router/api-router.go

@@ -314,6 +314,8 @@ func SetApiRouter(router *gin.Engine) {
 		logRoute.GET("/", middleware.AdminAuth(), controller.GetAllLogs)
 		logRoute.GET("/stat", middleware.AdminAuth(), controller.GetLogsStat)
 		logRoute.GET("/self/stat", middleware.UserAuth(), controller.GetLogsSelfStat)
+		logRoute.GET("/stat/external", middleware.AdminAuth(), controller.GetExternalBillingStat)
+		logRoute.GET("/self/stat/external", middleware.UserAuth(), controller.GetExternalBillingSelfStat)
 		logRoute.GET("/channel_affinity_usage_cache", middleware.AdminAuth(), controller.GetChannelAffinityUsageCacheStats)
 		logRoute.GET("/search", middleware.AdminAuth(), controller.SearchAllLogs)
 		logRoute.GET("/self", middleware.UserAuth(), controller.GetUserLogs)

service/text_quota.go

@@ -371,7 +371,10 @@ func calculateTextQuotaSummary(ctx *gin.Context, relayInfo *relaycommon.RelayInf
 		noteQuotaClamp(relayInfo, clamp)
 	}
 
-	if !summary.hasBillableUsage() {
+	// 按次计费(UsePrice)模型的单价与 token 数无关: 上游未返回 usage 时
+	// (如 gcable embeddings 不返回 usage 字段, prompt_tokens=-1) 仍应按次结算,
+	// 不能因为 tokens 缺失就把已算出的按次费用清零
+	if !summary.hasBillableUsage() && !relayInfo.PriceData.UsePrice {
 		summary.Quota = 0
 	} else if !ratio.IsZero() && summary.Quota == 0 {
 		summary.Quota = 1
@@ -449,7 +452,7 @@ func PostTextConsumeQuota(ctx *gin.Context, relayInfo *relaycommon.RelayInfo, us
 		extraContent = append(extraContent, fmt.Sprintf("Audio Input 花费 %s", logger.LogQuota(common.QuotaFromDecimal(q))))
 	}
 
-	if !summary.hasBillableUsage() {
+	if !summary.hasBillableUsage() && !relayInfo.PriceData.UsePrice {
 		extraContent = append(extraContent, "上游没有返回计费信息，无法扣费（可能是上游超时）")
 		logger.LogError(ctx, fmt.Sprintf("total tokens is 0, cannot consume quota, userId %d, channelId %d, tokenId %d, model %s， pre-consumed quota %d", relayInfo.UserId, relayInfo.ChannelId, relayInfo.TokenId, summary.ModelName, relayInfo.FinalPreConsumedQuota))
 	} else {

web/src/features/channels/components/channels-columns.tsx

@@ -57,7 +57,7 @@ import { handleServerError } from '@/lib/handle-server-error'
 import { createServerError } from '@/lib/server-error-message'
 import { truncateText } from '@/lib/utils'
 
-import { getCodexUsage, updateChannelBalance } from '../api'
+import { getCodexUsage, updateChannelBalance, updateChannel } from '../api'
 import {
   CHANNEL_STATUS_CONFIG,
   CHANNEL_TYPE_TASK_PLUGIN,
@@ -615,6 +615,44 @@ export function BalanceCell({ channel }: { channel: Channel }) {
 /**
  * Generate channels columns configuration
  */
+/**
+ * Clickable external/internal classifier for a channel (persisted into channels.tag).
+ */
+function ExternalTagToggle({ channel, tag }: { channel: Channel; tag: string }) {
+  const { t } = useTranslation()
+  const queryClient = useQueryClient()
+  const next = tag === 'external' ? 'internal' : 'external'
+  return (
+    <button
+      type='button'
+      onClick={async () => {
+        try {
+          const response = await updateChannel(channel.id, { tag: next })
+          if (response.success) {
+            queryClient.invalidateQueries({ queryKey: ['channels'] })
+          } else {
+            toast.error(response.message || t('Failed to update channel'))
+          }
+        } catch (error) {
+          toast.error(
+            error instanceof Error ? error.message : t('Failed to update channel')
+          )
+        }
+      }}
+      title={t('Click to toggle external/internal')}
+      className='cursor-pointer'
+    >
+      <StatusBadge
+        label={tag === 'external' ? t('External') : t('Internal')}
+        variant={tag === 'external' ? 'warning' : 'success'}
+        size='sm'
+        copyable={false}
+        className='-ml-1.5'
+      />
+    </button>
+  )
+}
+
 export function useChannelsColumns(
   options: {
     enableSelection?: boolean
@@ -1135,7 +1173,10 @@ export function useChannelsColumns(
           if (!tag) {
             return <span className='text-muted-foreground text-xs'>-</span>
           }
-
+          const orig = row.original as Channel
+          if (orig?.id && (tag === 'external' || tag === 'internal')) {
+            return <ExternalTagToggle channel={orig} tag={tag} />
+          }
           return (
             <StatusBadge
               label={tag}

web/src/features/external-billing/api.ts

@@ -0,0 +1,59 @@
+/* External billing API: per-user external (third-party) channel usage. */
+import { api } from '@/lib/api'
+
+export interface ExternalBillingRow {
+  username: string
+  prompt_tokens: number
+  completion_tokens: number
+  total_tokens: number
+  quota: number
+  model_count: number
+}
+
+export interface ExternalBillingResponse {
+  success: boolean
+  message: string
+  data: ExternalBillingRow[]
+}
+
+function buildParams(startTimestamp: number, endTimestamp: number, username?: string) {
+  const p: Record<string, number | string> = {}
+  if (startTimestamp) p.start_timestamp = startTimestamp
+  if (endTimestamp) p.end_timestamp = endTimestamp
+  if (username) p.username = username
+  return p
+}
+
+// The backend reports failures as HTTP 200 + success:false; surface them as
+// query errors instead of letting the page render them as empty usage.
+function assertSuccess(payload: ExternalBillingResponse): ExternalBillingResponse {
+  if (!payload.success) {
+    throw new Error(payload.message || 'Failed to load external usage')
+  }
+  return payload
+}
+
+/** Admin: all users' external usage. */
+export async function fetchExternalBilling(
+  startTimestamp: number,
+  endTimestamp: number,
+  username?: string
+): Promise<ExternalBillingResponse> {
+  const res = await api.get('/api/log/stat/external', {
+    params: buildParams(startTimestamp, endTimestamp, username),
+  })
+  return assertSuccess(res.data)
+}
+
+/** Member: own external usage. */
+export async function fetchExternalBillingSelf(
+  startTimestamp: number,
+  endTimestamp: number
+): Promise<ExternalBillingResponse> {
+  const res = await api.get('/api/log/self/stat/external', {
+    params: buildParams(startTimestamp, endTimestamp),
+  })
+  return assertSuccess(res.data)
+}
+
+export const QUOTA_PER_USD = 500000

web/src/hooks/use-sidebar-data.ts

@@ -29,6 +29,7 @@ import {
   MessageSquare,
   PlugZap,
   Radio,
+  Receipt,
   ServerCog,
   Settings,
   ShieldCheck,
@@ -116,6 +117,11 @@ export function useSidebarData(): SidebarData {
             url: '/wallet',
             icon: Wallet,
           },
+          {
+            title: t('My External Usage'),
+            url: '/external-billing?view=self',
+            icon: Receipt,
+          },
           {
             title: t('Profile'),
             url: '/profile',
@@ -137,6 +143,11 @@ export function useSidebarData(): SidebarData {
             url: '/channels',
             icon: Radio,
           },
+          {
+            title: t('External Billing'),
+            url: '/external-billing',
+            icon: Receipt,
+          },
           {
             title: t('Models'),
             url: '/models/metadata',

web/src/i18n/locales/en.json

@@ -6777,6 +6777,30 @@
     "Zhipu": "Zhipu",
     "Zhipu GLM": "Zhipu GLM",
     "Zhipu V4": "Zhipu V4",
-    "Zoom": "Zoom"
+    "Zoom": "Zoom",
+    "External Channel Billing": "External Channel Billing",
+    "External (third-party paid) channel usage per account across all models.": "External (third-party paid) channel usage per account across all models.",
+    "External Billing": "External Billing",
+    "My External Usage": "My External Usage",
+    "Click to toggle external/internal": "Click to toggle external/internal",
+    "Usage Summary": "Usage Summary",
+    "All time": "All time",
+    "Last 30 days": "Last 30 days",
+    "Last 7 days": "Last 7 days",
+    "Filter username…": "Filter username…",
+    "From date": "From date",
+    "To date": "To date",
+    "Failed to load external usage": "Failed to load external usage",
+    "Accounts": "Accounts",
+    "Total external tokens": "Total external tokens",
+    "Total external spend": "Total external spend (USD)",
+    "Account": "Account",
+    "External tokens": "External tokens",
+    "Spend (USD)": "Spend (USD)",
+    "External models": "External models",
+    "No external usage in this range": "No external usage in this range",
+    "External": "External",
+    "Internal": "Internal",
+    "Loading…": "Loading…"
   }
 }

web/src/i18n/locales/zh.json

@@ -6777,6 +6777,30 @@
     "Zhipu": "智谱",
     "Zhipu GLM": "智谱GLM",
     "Zhipu V4": "智谱 V4",
-    "Zoom": "缩放"
+    "Zoom": "缩放",
+    "External Channel Billing": "外部渠道账单",
+    "External (third-party paid) channel usage per account across all models.": "各账号外部（第三方付费）渠道用量，覆盖外部渠道上的全部模型。",
+    "Usage Summary": "用量汇总",
+    "All time": "全部时间",
+    "Last 30 days": "近 30 天",
+    "Last 7 days": "近 7 天",
+    "Filter username…": "筛选用户名…",
+    "From date": "开始日期",
+    "To date": "结束日期",
+    "Failed to load external usage": "加载外部用量数据失败",
+    "Accounts": "账号数",
+    "Total external tokens": "外部总 Token",
+    "Total external spend": "外部总消费 (USD)",
+    "Account": "账号",
+    "External tokens": "外部 Token",
+    "Spend (USD)": "消费 (USD)",
+    "External models": "外部模型数",
+    "No external usage in this range": "该时间范围内无外部用量",
+    "External Billing": "外部账单",
+    "My External Usage": "我的外部用量",
+    "Click to toggle external/internal": "点击切换 外部/内部",
+    "External": "外部",
+    "Internal": "内部",
+    "Loading…": "加载中…"
   }
 }