admin777/new-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,511 Commits 3 Branches 660 Tags
Commit Graph

5511 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yyhhyyyyyy
0220df8429
fix(channel-test): support tiered billing model tests (#4145) 
Pre-fill BillingRequestInput from dto.Request before ModelPriceHelper,
so tiered_expr billing resolves param() from the structured request
instead of reading HTTP body (which is empty in channel-test context).

- attachTestBillingRequestInput: marshal dto.Request → RequestInput
- ResolveIncomingBillingExprRequestInput: early-return when pre-filled
- settleTestQuota / buildTestLogOther: align test settlement & logging
  with production TryTieredSettle / InjectTieredBillingInfo paths
 2026-04-09 17:08:52 +08:00
CaIon
35d0704640 Merge branch 'origin/main' into nightly 
Resolve 4 conflicts:
- relay/compatible_handler.go: accept main's refactor (postConsumeQuota -> service.PostTextConsumeQuota)
- service/quota.go: accept main's PostClaudeConsumeQuota deletion, keep nightly's tiered billing in PostWssConsumeQuota and PostAudioConsumeQuota
- web/src/i18n/locales/{en,zh-CN}.json: merge both sets of translation keys

Post-merge integration:
- Add tiered billing (TryTieredSettle, InjectTieredBillingInfo) to PostTextConsumeQuota
- Update tool pricing calls to use nightly's generic GetToolPriceForModel/GetToolPrice API
 2026-04-02 00:39:13 +08:00
CaIon
a706f00287 feat(EditChannelModal): persist advanced settings state in local storage
Some checks failed
Publish Docker image (Multi Registries, native amd64+arm64) / Build & push (amd64) [native] (push) Has been cancelled
Details
Publish Docker image (Multi Registries, native amd64+arm64) / Build & push (arm64) [native] (push) Has been cancelled
Details
Publish Docker image (Multi Registries, native amd64+arm64) / Create multi-arch manifests (Docker Hub) (push) Has been cancelled
Details
Build Electron App / build (windows-latest) (push) Has been cancelled
Details
Build Electron App / release (push) Has been cancelled
Details
Release (Linux, macOS, Windows) / Linux Release (push) Has been cancelled
Details
Release (Linux, macOS, Windows) / macOS Release (push) Has been cancelled
Details
Release (Linux, macOS, Windows) / Windows Release (push) Has been cancelled
Details 
Added functionality to save and restore the state of advanced settings in the EditChannelModal using local storage. This enhancement allows users to maintain their preferences when editing channels, improving the overall user experience.
v0.12.0 		2026-04-02 00:17:21 +08:00
Calcium-Ion
7efb1922fe
Merge pull request #3526 from feitianbubu/pr/e560265b6e57aa7b95bc98cb53397ef0a3082d9d 
支持wan2.7生图-wan2.7-image
 2026-04-02 00:15:04 +08:00
Calcium-Ion
89fe99f3bd
Merge pull request #3512 from imlhb/patch-2 
fix: prevent double-counting of image count n in billing
 2026-04-02 00:14:39 +08:00
feitianbubu
e5b5331d3b feat: wan 2.7 support N for gen images number 2026-04-01 17:39:50 +08:00
feitianbubu
18373c6eac feat: add wan 2.7 2026-04-01 17:39:11 +08:00
Calcium-Ion
5b47011e08
Merge pull request #3450 from QuantumNous/dependabot/npm_and_yarn/electron/picomatch-4.0.4 
chore(deps-dev): bump picomatch from 4.0.3 to 4.0.4 in /electron
 2026-04-01 14:35:30 +08:00
CaIon
ab99c30884 fix: move image count n to OtherRatio to prevent double-counting 
The previous commit commented out AddOtherRatio("n") in the Ali
adaptor to fix double-counting but this could cause billing evasion
when n is specified via extra["parameters"] instead of request.N.

Root cause: ImagePriceRatio in GetTokenCountMeta() already included
n, AND channel adaptors added OtherRatio("n"), resulting in n²
billing.

Proper fix:
- Remove n from ImagePriceRatio (keep sizeRatio * qualityRatio only)
- In ImageHelper, add default OtherRatio("n") when adaptor hasn't
  set one; set fallback tokens to 1 (base unit)
- Restore Ali adaptor's AddOtherRatio("n") — it uses actual upstream
  parameters/response count, preventing billing evasion
 2026-03-31 23:58:10 +08:00
CaIon
670abee2f0 fix(EditChannelModal): enhance clipboard handling with error checks
Some checks failed
Publish Docker image (Multi Registries, native amd64+arm64) / Build & push (amd64) [native] (push) Has been cancelled
Details
Publish Docker image (Multi Registries, native amd64+arm64) / Build & push (arm64) [native] (push) Has been cancelled
Details
Publish Docker image (Multi Registries, native amd64+arm64) / Create multi-arch manifests (Docker Hub) (push) Has been cancelled
Details 
Added checks to ensure clipboard functionality is available before attempting to read from it. Improved error handling during clipboard read operations to prevent unhandled exceptions.
v0.12.0-alpha.2 		2026-03-31 21:42:36 +08:00
CaIon
8bb9a42f68 feat: add clipboard magic string for quick channel creation from token copy
Some checks failed
Publish Docker image (Multi Registries, native amd64+arm64) / Build & push (amd64) [native] (push) Has been cancelled
Details
Publish Docker image (Multi Registries, native amd64+arm64) / Build & push (arm64) [native] (push) Has been cancelled
Details
Publish Docker image (Multi Registries, native amd64+arm64) / Create multi-arch manifests (Docker Hub) (push) Has been cancelled
Details 
When copying a token, users can now choose "Copy Connection String" which
encodes both the API key and server URL as a JSON clipboard payload
(type: newapi_channel_conn). When opening the channel creation form, the
clipboard is auto-detected and a banner offers to fill key + base_url,
eliminating repeated tab-switching when connecting to another new-api instance.
v0.12.0-alpha.1 		2026-03-31 19:39:23 +08:00
CaIon
d22f889e5d fix(xAI): set MaxTokens to nil when MaxCompletionTokens is 0 for grok-3-mini model 2026-03-31 19:16:16 +08:00
Calcium-Ion
3734059da7
Merge pull request #3462 from DaZuiZui/main 
docs(zh-TW): fix missing content and add partner logo
 2026-03-31 19:02:15 +08:00
Calcium-Ion
26ce873f8b
Merge pull request #3474 from wans10/main 
fix(dashboard): 修复消耗分布图表悬浮时滚动条闪烁
 2026-03-31 18:57:16 +08:00
CaIon
e099117c61 refactor: use POST for account binding endpoints and normalize reset responses 
- Switch /api/oauth/email/bind and /api/oauth/wechat/bind from GET to
  POST with JSON body for better REST semantics
- Normalize password reset endpoint to return consistent responses
- Apply url.QueryEscape to WeChat code parameter for robustness
 2026-03-31 18:44:40 +08:00
CaIon
310d618a16 style: enhance footer layout and add custom class for styling 
- Refactor Footer component to use a semantic <footer> element for better accessibility.
- Update CSS to include a new class for the custom footer, allowing for relative positioning.
- Adjust layout to improve responsiveness and visual alignment of footer content.
 2026-03-31 18:41:44 +08:00
CaIon
20399d3c8f fix: harden SSRF protection for unauthenticated and user-level endpoints 
- Add ValidateURLWithFetchSetting check before fetching MJ image URLs
  in RelayMidjourneyImage (unauthenticated endpoint)
- Add ValidateURLWithFetchSetting check before fetching video URLs
  in VideoProxy (upstream-controlled URL)
- Enable ApplyIPFilterForDomain by default to prevent DNS rebinding
  bypass of SSRF protection
- Elevate FetchModels endpoint from AdminAuth to RootAuth
- Update frontend: mark domain IP filtering as recommended, update
  description and i18n translations (zh-CN/zh-TW/en/fr/ja/ru/vi)
 2026-03-31 17:57:47 +08:00
刘泓宾
53aeee4ff7
Comment out price data adjustment logic 
Comment out code that modifies price data based on image count.
测试发现，如果是接入阿里百炼平台的qwen-image-2.0系列模型，这边计费的时候会出现 0.2*n*倍率*n的情况，最前面的0.2*n会直接显示为模型价格。
例如：
日志详情	模型价格 $0.600000，专属倍率 0.3
其他详情	大小 1080*1920, 品质 standard, 生成数量 3, 其他倍率 n: 3.000000
计费过程	模型价格：$0.600000 * 专属倍率：0.3 = $0.180000
 2026-03-31 17:12:06 +08:00
CaIon
5238f279db feat: record stream interruption reasons via StreamStatus
Some checks failed
Publish Docker image (Multi Registries, native amd64+arm64) / Build & push (amd64) [native] (push) Has been cancelled
Details
Publish Docker image (Multi Registries, native amd64+arm64) / Build & push (arm64) [native] (push) Has been cancelled
Details
Publish Docker image (Multi Registries, native amd64+arm64) / Create multi-arch manifests (Docker Hub) (push) Has been cancelled
Details
Build Electron App / build (windows-latest) (push) Has been cancelled
Details
Build Electron App / release (push) Has been cancelled
Details
Release (Linux, macOS, Windows) / Linux Release (push) Has been cancelled
Details
Release (Linux, macOS, Windows) / macOS Release (push) Has been cancelled
Details
Release (Linux, macOS, Windows) / Windows Release (push) Has been cancelled
Details 
- Add StreamStatus type (relay/common) to track stream end reason
  (done/timeout/client_gone/scanner_error/eof/panic/ping_fail) and
  accumulate soft errors during streaming via sync.Once + sync.Mutex.
- Add StreamResult (relay/helper) as the callback interface: adapters
  call sr.Error() for soft errors, sr.Stop() for fatal, sr.Done() for
  normal completion. No early-return problem — multiple errors per chunk
  are naturally supported.
- Refactor StreamScannerHandler callback from func(string) bool to
  func(string, *StreamResult). All 9 channel adapters updated.
- Write stream_status into log other JSON field (admin-only) with
  status ok/error, end_reason, error_count, and error messages.
- Frontend: display stream status in log detail expansion for admins.
v0.11.9 		2026-03-31 16:54:39 +08:00
CaIon
5402bf417d feat: expose i18n instance to the global window object for easier access 2026-03-31 16:54:39 +08:00
Seefs
c766913baf
Merge pull request #3507 from QuantumNous/dependabot/go_modules/golang.org/x/image-0.38.0 
chore(deps): bump golang.org/x/image from 0.23.0 to 0.38.0
 2026-03-31 16:52:35 +08:00
dependabot[bot]
40dc43f44e
chore(deps): bump golang.org/x/image from 0.23.0 to 0.38.0 
Bumps [golang.org/x/image](https://github.com/golang/image) from 0.23.0 to 0.38.0.
- [Commits](https://github.com/golang/image/compare/v0.23.0...v0.38.0)

---
updated-dependencies:
- dependency-name: golang.org/x/image
  dependency-version: 0.38.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-03-30 16:24:46 +00:00
wans10
b2dd4acc9f fix(dashboard): 修复消耗分布图表悬浮时滚动条闪烁 2026-03-28 12:14:22 +08:00
哇塞大嘴好帥
4e492b26f6
Update README.zh_TW.md 2026-03-27 17:34:28 +08:00
哇塞大嘴好帥
82b750398c
Update README.zh_TW.md 2026-03-27 17:15:12 +08:00
Seefs
fbf235d222
Merge pull request #3461 from feitianbubu/pr/0ec3d7a1b2cc1375b5c7fe041ae94d714eb03a69 
feat: prevent metadata from overriding model fields
 2026-03-27 15:36:01 +08:00
feitianbubu
62b9aaa520 feat: prevent metadata from overriding model fields 2026-03-27 15:31:41 +08:00
dependabot[bot]
814a3f5124
chore(deps-dev): bump picomatch from 4.0.3 to 4.0.4 in /electron 
Bumps [picomatch](https://github.com/micromatch/picomatch) from 4.0.3 to 4.0.4.
- [Release notes](https://github.com/micromatch/picomatch/releases)
- [Changelog](https://github.com/micromatch/picomatch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/picomatch/compare/4.0.3...4.0.4)

---
updated-dependencies:
- dependency-name: picomatch
  dependency-version: 4.0.4
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-03-26 07:58:57 +00:00
Calcium-Ion
22b6b16702
Merge pull request #3440 from seefs001/refactor/expose-skip-retry-option
Some checks failed
Publish Docker image (Multi Registries, native amd64+arm64) / Build & push (amd64) [native] (push) Has been cancelled
Details
Publish Docker image (Multi Registries, native amd64+arm64) / Build & push (arm64) [native] (push) Has been cancelled
Details
Publish Docker image (Multi Registries, native amd64+arm64) / Create multi-arch manifests (Docker Hub) (push) Has been cancelled
Details 
refactor: expose skip-retry option and show it in rules list
v0.11.9-alpha.3 		2026-03-25 14:11:37 +08:00
Seefs
6154b8e3cd refactor: expose skip-retry option and show it in rules list 2026-03-25 14:06:35 +08:00
Calcium-Ion
ff66288e3a
Merge pull request #3438 from seefs001/fix/openrouter-usage 
fix: restore pre-3400 OpenRouter billing semantics
 2026-03-25 14:02:08 +08:00
Seefs
926e1781dd fix: preserve cache usage in openai-to-claude response conversion 2026-03-25 13:49:21 +08:00
Seefs
d4a470a638 fix: restore pre-3400 OpenRouter billing semantics 2026-03-25 13:24:52 +08:00
Seefs
9f61407bf0 fix: restore pre-3400 OpenRouter billing semantics 2026-03-25 13:11:51 +08:00
CaIon
dbf900a531 fix: restore doubao coding plan deprecation and regex ignored models lost during conflict resolution
Some checks failed
Publish Docker image (Multi Registries, native amd64+arm64) / Build & push (amd64) [native] (push) Has been cancelled
Details
Publish Docker image (Multi Registries, native amd64+arm64) / Build & push (arm64) [native] (push) Has been cancelled
Details
Publish Docker image (Multi Registries, native amd64+arm64) / Create multi-arch manifests (Docker Hub) (push) Has been cancelled
Details
v0.11.9-alpha.2 		2026-03-25 00:04:01 +08:00
CaIon
7399e4721b feat: add slide-in animations and update translations for new UI elements 
# Conflicts:
#	web/src/components/table/channels/modals/EditChannelModal.jsx
 2026-03-24 23:57:58 +08:00
CaIon
a5e20269dd security: harden Docker and release CI workflows 
- Pin all GitHub Actions to commit SHA to prevent supply chain attacks
- Enable SLSA provenance attestation (mode=max) and SBOM generation
- Add cosign keyless signing for Docker images via GitHub OIDC
- Capture and output image digests to GitHub Job Summary
- Pin Dockerfile base images to digest (bun:1, golang:1.26.1-alpine, debian:bookworm-slim)
- Add SHA256 checksum generation for binary releases (Linux/macOS/Windows)
- Update actions/checkout v3->v4, actions/setup-go v3->v5 in release.yml
 2026-03-24 23:56:15 +08:00
Calcium-Ion
9ae9040b3c
Merge pull request #3401 from seefs001/fix/convert-openai-detail-field
Some checks failed
Publish Docker image (Multi Registries, native amd64+arm64) / Build & push (amd64) [native] (push) Has been cancelled
Details
Publish Docker image (Multi Registries, native amd64+arm64) / Build & push (arm64) [native] (push) Has been cancelled
Details
Publish Docker image (Multi Registries, native amd64+arm64) / Create multi-arch manifests (Docker Hub) (push) Has been cancelled
Details 
fix: the "detail" field is empty, an empty field was sent to upstream
v0.11.9-alpha.1 		2026-03-23 15:04:06 +08:00
Calcium-Ion
0191a68d4e
Merge pull request #3400 from seefs001/fix/openai-usage 
refactor: optimize billing flow for OpenAI-to-Anthropic convert
 2026-03-23 15:03:57 +08:00
Calcium-Ion
16221f8279
Merge pull request #3399 from seefs001/refactor/codex-usage 
Refactor/codex usage
 2026-03-23 15:03:47 +08:00
Calcium-Ion
763c3ff709
Merge pull request #3331 from seefs001/fix/claude-beta-query 
fix: apply forced beta query at final upstream URL stage
 2026-03-23 15:03:36 +08:00
Calcium-Ion
c667e4706a
Merge pull request #3333 from seefs001/fix/channel-affinity-disable 
fix: honor channel affinity skip-retry when channel is disabled
 2026-03-23 15:03:23 +08:00
Calcium-Ion
216b94dac0
Merge pull request #3335 from seefs001/chore/adjuct-default-settings 
adjuct default settings
 2026-03-23 15:03:01 +08:00
Calcium-Ion
49eb533aaf
Merge pull request #3381 from seefs001/feature/regex-ignored-upstream-models 
feat: support regex-prefixed ignored upstream models
 2026-03-23 15:02:44 +08:00
Calcium-Ion
7693edae53
Merge pull request #3393 from seefs001/fix/oauth-bind 
fix: oauth bind callback handling
 2026-03-23 15:02:34 +08:00
Seefs
ded4a124e2 fix: the "detail" field is empty, an empty field was sent to the upstream system. 2026-03-23 15:00:20 +08:00
Calcium-Ion
d6982c8182
Merge pull request #3379 from seefs001/refactor/rm-coding-plan 
fix: disable doubao coding plan selection
 2026-03-23 14:53:13 +08:00
Seefs
9ecad90652 refactor: optimize billing flow for OpenAI-to-Anthropic convert 2026-03-23 14:22:12 +08:00
Seefs
929b5060ea refactor: simplify codex account modal and collapse raw json by default 2026-03-23 13:54:54 +08:00
Seefs
755ece2f01 refactor: simplify codex account modal and collapse raw json by default 2026-03-23 00:58:59 +08:00