1. 05 Apr, 2026 2 commits
  2. 04 Apr, 2026 38 commits
    • Wesley Liddick's avatar
      Merge pull request #1455 from touwaeriol/feat/channel-management · bf455811
      Wesley Liddick authored
      feat(channel): add channel management with multi-mode pricing and billing integration
      bf455811
    • erio's avatar
      refactor: unify interval filtering and eliminate redundant Resolve calls · e88b2890
      erio authored
      - applyRequestTierOverrides now uses filterValidIntervals consistently
        with applyTokenOverrides (per_request/image modes were not filtering)
      - CostInput accepts optional pre-resolved pricing via Resolved field,
        eliminating duplicate Resolver.Resolve() calls in gateway billing paths
      e88b2890
    • erio's avatar
      fix: resolve golangci-lint issues — remove unused constants and functions, fix gofmt · 1b5ae71d
      erio authored
      - Remove unused claudeMax*Tokens constants (Claude Max feature not included)
      - Remove unused UsageMapHook type, SetUsageMapHook method, and usageToMap function
      - Fix gofmt formatting in channel_service.go, openai_model_mapping_test.go,
        chatcompletions_to_responses.go
      1b5ae71d
    • erio's avatar
      revert: remove antigravity credits precheck logic (not part of channel feature) · d4ff835b
      erio authored
      Restore account_usage_service.go, antigravity_gateway_service.go,
      antigravity_credits_overages.go and its test to upstream/main state.
      These credits balance precheck changes were accidentally included
      during cherry-pick of channel management commits.
      d4ff835b
    • erio's avatar
      refactor: remove resolveOpenAIUpstreamModel, use normalizeCodexModel directly · e27b0adb
      erio authored
      Eliminates unnecessary indirection layer. The wrapper function only
      called normalizeCodexModel with a special case for "gpt 5.3 codex spark"
      (space-separated variant) that is no longer needed.
      
      All call sites now use normalizeCodexModel directly.
      e27b0adb
    • erio's avatar
      fix: resolve cherry-pick compilation and test issues · e59fa863
      erio authored
      - Add int64(0) param to SelectAccountWithLoadAwareness callers (signature change from channel scheduling refactor)
      - Add UsageMapHook type and struct field to StreamingProcessor
      - Revert Claude Max cache billing code to upstream/main (not part of channel feature)
      - Revert credits overages logic to upstream/main (non-channel change)
      - Remove Instructions field reference (non-channel OpenAI feature)
      - Restore sora_client_handler_test.go from upstream + add channel service nil params
      e59fa863
    • erio's avatar
      feat(channel): improve cache strategy and add restriction logging · 58f758c8
      erio authored
      - Change channel cache TTL from 60s to 10min (reduce unnecessary DB queries)
      - Actively rebuild cache after CRUD instead of lazy invalidation
      - Add slog.Warn logging for channel pricing restriction blocks (4 places)
      58f758c8
    • erio's avatar
      fix: channel cache fail-close, group conflict check across pages, status toggle stale data · feb6999d
      erio authored
      - GetGroupPlatforms failure now stores error-TTL cache and returns error (fail-close)
      - Frontend group-to-channel conflict map loads all channels instead of current page only
      - Toggle channel status reloads list when active filter would hide the changed item
      feb6999d
    • erio's avatar
      fix: resolve 5 audit findings in channel/credits/scheduling · 71f61bbc
      erio authored
      P0-1: Credits degraded response retry + fail-open
      - Add isAntigravityDegradedResponse() to detect transient API failures
      - Retry up to 3 times with exponential backoff (500ms/1s/2s)
      - Invalidate singleflight cache between retries
      - Fail-open after exhausting retries instead of 5h circuit break
      
      P1-1: Fix channel restriction pre-check timing conflict
      - Swap checkClaudeCodeRestriction before checkChannelPricingRestriction
      - Ensures channel restriction is checked against final fallback groupID
      
      P1-2: Add interval pricing validation (frontend + backend)
      - Backend: ValidateIntervals() with boundary, price, overlap checks
      - Frontend: validateIntervals() with Chinese error messages
      - Rules: MinTokens>=0, MaxTokens>MinTokens, prices>=0, no overlap
      
      P2: Fix cross-platform same-model pricing/mapping override
      - Store cache keys using original platform instead of group platform
      - Lookup across matching platforms (antigravity→anthropic→gemini)
      - Prevents anthropic/gemini same-name models from overwriting each other
      71f61bbc
    • erio's avatar
      test: add unit tests for channel pricing restriction in scheduling phase · 6d3ea64a
      erio authored
      20 test cases covering:
      - billingModelForRestriction: 4 cases (requested/channel_mapped/upstream/empty)
      - resolveAccountUpstreamModel: 3 cases (antigravity/unsupported/non-antigravity)
      - checkChannelPricingRestriction: 10 cases (nil guards, 3 billing sources,
        RestrictModels disabled, no channel)
      - isUpstreamModelRestrictedByChannel: 3 cases (restricted/allowed/unsupported)
      6d3ea64a
    • erio's avatar
      fix: address review findings for channel restriction refactoring · 1fca2bfa
      erio authored
      - Fix 7 stale comments still mentioning "限制检查" in handlers/services
      - Make billingModelForRestriction explicitly list channel_mapped case
      - Add slog.Warn for error swallowing in ResolveChannelMapping and
        needsUpstreamChannelRestrictionCheck
      - Document sticky session upstream check exemption
      1fca2bfa
    • erio's avatar
      refactor: move channel model restriction from handler to scheduling phase · ce41afb7
      erio authored
      Move the model pricing restriction check from 8 handler entry points
      to the account scheduling phase (SelectAccountForModelWithExclusions /
      SelectAccountWithLoadAwareness), aligning restriction with billing:
      
      - requested: check original request model against pricing list
      - channel_mapped: check channel-mapped model against pricing list
      - upstream: per-account check using account-mapped model
      
      Handler layer now only resolves channel mapping (no restriction).
      Scheduling layer performs pre-check for requested/channel_mapped,
      and per-account filtering for upstream billing source.
      ce41afb7
    • erio's avatar
      refactor: extract helpers to reduce duplication and function length in gateway billing · b4a42a64
      erio authored
      - Extract resolveChannelPricing to DRY the resolver pattern shared by calculateImageCost/calculateTokenCost
      - Remove unnecessary IIFE wrapper and pass accountRateMultiplier as parameter
      - Extract resolveBillingMode, resolveMediaType, optionalSubscriptionID to simplify buildRecordUsageLog (104→65 lines)
      - Extract shouldDeductAPIKeyQuota/shouldUpdateRateLimits/shouldUpdateAccountQuota methods on postUsageBillingParams to unify duplicated billing conditions
      b4a42a64
    • erio's avatar
      refactor: merge RecordUsage and RecordUsageWithLongContext into shared core · 58b26cb4
      erio authored
      - Extract recordUsageCore with recordUsageOpts for parameterized differences
      - RecordUsage (276 lines) → thin wrapper (~40 lines)
      - RecordUsageWithLongContext (251 lines) → thin wrapper (~20 lines)
      - Split billing logic into calculateSoraMediaCost, calculateImageCost,
        calculateTokenCost sub-functions
      - Extract buildRecordUsageLog for usage log construction
      - Net reduction: -79 lines, eliminated ~170 lines of duplication
      58b26cb4
    • erio's avatar
    • erio's avatar
      refactor: extract computeTokenBreakdown to deduplicate billing logic · 3cd398b0
      erio authored
      - calculateTokenCost reduced from 80 to 15 lines
      - calculateCostInternal reduced from 91 to 15 lines
      - Shared logic in computeTokenBreakdown + computeCacheCreationCost
      - Unified rateMultiplier <= 0 protection in both paths
      3cd398b0
    • erio's avatar
      refactor: use structured error responses in channel handler · d3127b8e
      erio authored
      Replace response.BadRequest with response.ErrorFrom + infraerrors.BadRequest
      to provide machine-readable reason codes (VALIDATION_ERROR, INVALID_CHANNEL_ID,
      MISSING_PARAMETER) for frontend i18n support.
      d3127b8e
    • erio's avatar
      refactor: split buildCache into sub-functions, reduce nesting 5→2 · 6de1d0cb
      erio authored
      - Extract newEmptyChannelCache() factory to deduplicate map init
      - Extract expandPricingToCache() for model pricing expansion
      - Extract expandMappingToCache() for model mapping expansion
      - buildCache reduced from 110 to 50 lines
      6de1d0cb
    • erio's avatar
    • erio's avatar
      refactor: replace magic strings with named constants · 0d241d52
      erio authored
      - PricingSourceChannel/LiteLLM/Fallback for resolver source
      - MediaTypeImage/Video/Prompt for result.MediaType
      - Reuse BillingModeToken/BillingModeImage for billing mode
      - Reuse BillingModelSourceChannelMapped/PlatformAnthropic in handler
      0d241d52
    • erio's avatar
      fix(ui): show token breakdown when image model uses token billing · 212eaa3a
      erio authored
      Only display image count format when billing_mode is "image".
      When channel has token pricing, show input/output/cache token details.
      212eaa3a
    • erio's avatar
      fix: billing mode display follows cost calculation result · f3ab3fe5
      erio authored
      Instead of hardcoding BillingMode="image" when ImageCount>0,
      let cost.BillingMode (set by CalculateCostUnified/CalculateImageCost)
      take priority. This ensures channel token pricing shows "token" mode.
      f3ab3fe5
    • erio's avatar
      b8c56ff9
    • erio's avatar
      feat: channel token pricing takes priority over per-image billing · 38da737e
      erio authored
      When ImageCount > 0, check if channel has token pricing configured:
      - YES (source=channel, mode=token) → use token billing with image_output_tokens
      - NO → fall back to CalculateImageCost (original per-image billing)
      
      This allows channels to configure $/MTok pricing for image generation
      models while maintaining backward compatibility for setups without
      channel pricing.
      38da737e
    • erio's avatar
      1b2ea7a1
    • erio's avatar
      a9e5fc85
    • erio's avatar
      fix: address audit findings - cache sync, validation, consistency · 9b213115
      erio authored
      - clearCreditsExhausted: sync Redis scheduler cache after DB update
      - Image billing mode UI: write to per_request_price instead of image_output_price
      - OpenAI RecordUsage: use BillingModelSourceRequested constant, add s.cfg nil guard
      - Fix i18n key path: admin.channels.perRequestPriceRequired → admin.channels.form.perRequestPriceRequired
      9b213115
    • erio's avatar
      test: add unit tests for channel platform matching, interval validation, credits check · 55343473
      erio authored
      - TestIsPlatformPricingMatch: 12 cases covering all platform combinations
      - TestMatchingPlatforms: 4 cases for platform expansion
      - TestGetChannelModelPricing_AntigravityCrossPlatform: antigravity sees anthropic pricing
      - TestGetChannelModelPricing_AnthropicCannotSeeAntigravityPricing: no reverse leakage
      - TestResolveChannelMapping_AntigravityCrossPlatform: antigravity uses anthropic mapping
      - TestFilterValidIntervals: 8 cases for empty interval filtering
      - TestHasEnoughCredits: 10 cases for credits balance threshold logic
      - Extract hasEnoughCredits() pure function for testability
      55343473
    • erio's avatar
      fix: validate empty intervals + antigravity platform pricing match · 2355029d
      erio authored
      - Backend: reject intervals with all-null price fields on save
      - Backend: filterValidIntervals skips empty intervals in pricing resolver
      - Frontend: red border + asterisk on empty interval rows
      - Backend: antigravity groups now match anthropic/gemini channel pricing
      2355029d
    • erio's avatar
      fix: antigravity groups now match anthropic/gemini channel pricing · 8d25335b
      erio authored
      Antigravity platform serves both Claude and Gemini models, but channel
      pricing/mapping is configured under Anthropic/Gemini tabs. The cache
      builder was using strict platform equality, causing antigravity groups
      to miss all channel pricing entries, resulting in $0 billing.
      
      Add isPlatformPricingMatch() to treat antigravity as superset of
      anthropic+gemini for pricing and mapping cache indexing.
      8d25335b
    • erio's avatar
      feat(ui): display three-level model mapping chain in usage logs · c0b5900a
      erio authored
      - Show channel + account mapping steps using model_mapping_chain field
      - Add model_mapping_chain to AdminUsageLog TypeScript type
      - Fallback to two-level display when chain is not available
      - Fix cost nil guard in Anthropic/Antigravity RecordUsage paths
      - Bump version to 0.1.105.31
      c0b5900a
    • erio's avatar
      fix: add cost nil guard to Anthropic/Antigravity RecordUsage paths · 35a92905
      erio authored
      - Apply same nil-pointer protection as OpenAI path
      - Remove unused accessToken/proxyURL params from checkAccountCredits
      35a92905
    • erio's avatar
      fix: golangci-lint test assertion and gofmt · c9145ad4
      erio authored
      c9145ad4
    • erio's avatar
      fix: resolve golangci-lint issues · 3851628a
      erio authored
      - Fix errcheck: defer rows.Close() with nolint
      - Fix errcheck: type assertion with ok check in channel cache
      - Fix staticcheck ST1005: lowercase error string
      - Fix staticcheck SA5011: nil check cost before use in openai gateway
      - Fix gofmt: format chatcompletions_to_responses.go
      3851628a
    • erio's avatar
      feat: image output token billing, channel-mapped billing source, credits balance precheck · d72ac926
      erio authored
      - Parse candidatesTokensDetails from Gemini API to separate image/text output tokens
      - Add image_output_tokens and image_output_cost to usage_log (migration 089)
      - Support per-image-token pricing via output_cost_per_image_token from model pricing data
      - Channel pricing ImageOutputPrice override works in token billing mode
      - Auto-fill image_output_price in channel pricing form from model defaults
      - Add "channel_mapped" billing model source as new default (migration 088)
      - Bills by model name after channel mapping, before account mapping
      - Fix channel cache error TTL sign error (115s → 5s)
      - Fix Update channel only invalidating new groups, not removed groups
      - Fix frontend model_mapping clearing sending undefined instead of {}
      - Credits balance precheck via shared AccountUsageService cache before injection
      - Skip credits injection for accounts with insufficient balance
      - Don't mark credits exhausted for "exhausted your capacity on this model" 429s
      d72ac926
    • erio's avatar
      feat(channel): 渠道管理全链路集成 — 模型映射、定价、限制、用量统计 · 2555951b
      erio authored
      - 渠道模型映射:支持精确匹配和通配符映射,按平台隔离
      - 渠道模型定价:支持 token/按次/图片三种计费模式,区间分层定价
      - 模型限制:渠道可限制仅允许定价列表中的模型
      - 计费模型来源:支持 requested/upstream 两种计费模型选择
      - 用量统计:usage_logs 新增 channel_id/model_mapping_chain/billing_tier/billing_mode 字段
      - Dashboard 支持 model_source 维度(requested/upstream/mapping)查看模型统计
      - 全部 gateway handler 统一接入 ResolveChannelMappingAndRestrict
      - 修复测试:同步 SoraGenerationRepository 接口、SQL INSERT 参数、scan 字段
      2555951b
    • erio's avatar
    • erio's avatar