5585 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Calcium-Ion	55b7e485c1	Merge pull request #4162 from yyhhyyyyyy/fix/tiered-text-tool-surcharge ... fix(billing): preserve text tool surcharges in tiered settlement	2026-04-23 19:01:13 +08:00
CaIon	5c4ed5be99	fix(billing): use tieredQuota fallback in composeTieredTextQuota error path ... Remove the intermediate branch that recomputed quota from EstimatedQuotaBeforeGroup when tieredResult is nil. This discarded the FinalPreConsumedQuota fallback that TryTieredSettle already selected. Now the error path simply adds tool surcharges to the passed-in tieredQuota, preserving the existing fallback semantics. Also removes unrelated mise.toml and adds a test covering the error fallback with a pre-consumed quota that differs from the estimate.	2026-04-23 18:59:48 +08:00
yyhhyyyyyy	1fe9f6f989	fix(billing): preserve text tool surcharges in tiered settlement	2026-04-09 18:18:01 +08:00
CaIon	4d2993e4cc	Merge remote-tracking branch 'origin/main' into nightly ... # Conflicts: # web/src/helpers/render.jsx # web/src/hooks/usage-logs/useUsageLogsData.jsx # web/src/i18n/locales/en.json nightly-20260409	2026-04-09 17:12:21 +08:00
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
Seefs	0664bb3f65	Merge pull request #4076 from seefs001/ci/add-pr-check ... ci: refine PR template and add PR submission checks v0.12.6	2026-04-09 14:35:38 +08:00
Seefs	c7cf20391e	fix: document render (#4153)	2026-04-09 14:35:31 +08:00
Calcium-Ion	b07f0b9626	Merge pull request #4154 from seefs001/feature/vllm-extensions-params ... feat: fill in some custom fields for vllm-omini	2026-04-09 14:35:05 +08:00
Calcium-Ion	53cf37a469	fix(ali): accept string usage values in task polling (#4155)	2026-04-09 14:34:44 +08:00
Seefs	3bda738ec1	fix: prefer explicit pricing for compact models (#4156)	2026-04-09 14:34:14 +08:00
NyaMisty	160cb28572	fix(zhipu_4v): use correct endpoint for coding plan image generation (#4146)	2026-04-09 14:33:48 +08:00
Seefs	274307b0a9	fix(ali): accept string usage values in task polling	2026-04-09 12:48:17 +08:00
Seefs	a19a63b98c	feat: fill in some custom fields for vllm-omini.	2026-04-09 12:41:51 +08:00
CaIon	78e4cb3cad	feat(web): redesign group ratio rules with collapsible grouped layout ... Rewrite GroupGroupRatioRules and GroupSpecialUsableRules to group rules by user group in collapsible sections instead of a flat table. Default collapsed to reduce visual clutter when many rules exist. Fix i18n translations for ja, zh-TW with proper native text; add missing keys. v0.12.5	2026-04-08 17:09:42 +08:00
forsakenyang	c734db34e8	feat: add minimax image generation relay support (#4103)	2026-04-08 16:57:44 +08:00
星野梦月	a18ea3cc16	feat: 支持强制使用 AUTH LOGIN 以解决 outlook 等邮箱的发件问题 (#4112) ... * feat: 支持强制使用 AUTH LOGIN 以解决 outlook 等邮箱的发件问题 * fix: 修复通过 SSL 发送邮件时绕过 AUTH LOGIN 的问题 * fix: remove redundant branch, delete test file, add i18n translations - Remove redundant else-if branch in SendEmail since auth is already computed via getSMTPAuth() - Delete option_smtp_auth_test.go as requested - Add i18n translations for '强制使用 AUTH LOGIN' checkbox	2026-04-08 16:53:10 +08:00
CaIon	aafbd78887	feat(dashboard): add copy button next to API link in API info panel ... Closes #4058	2026-04-08 16:39:50 +08:00
CaIon	77897a8101	feat(dashboard): enhance chart axes and update sorting logic	2026-04-08 15:57:26 +08:00
Calcium-Ion	9b4ffb0875	Merge pull request #4142 from seefs001/fix/skip_failure_option ... fix: 修复 失败后不重试 配置项写到内存被覆盖 v0.12.4	2026-04-08 15:45:02 +08:00
CaIon	606a4eee96	feat(dashboard): add admin user analytics and fix chart labels ... - Add GET /api/data/users endpoint for user-grouped quota data (admin only) - Add user consumption ranking (horizontal bar, top 10) and user consumption trend (area chart) tabs visible only to admin users - Fix mislabeled "消耗趋势" tab to "调用趋势" (shows call counts, not quota) - Add processUserData helper for user ranking and trend data extraction - Add i18n keys for new tabs across all 7 locales	2026-04-08 15:44:01 +08:00
Calcium-Ion	9ffb85a36b	Merge pull request #4068 from feitianbubu/seedance-support-duration ... Seedance support duration	2026-04-08 15:01:25 +08:00
Seefs	c3b8fa29b2	fix: 修复 失败后不重试 配置项写到内存被覆盖	2026-04-08 14:01:27 +08:00
Calcium-Ion	a057eddac1	Merge pull request #4131 from binorxin/add-error-logs ... chore: 添加 启用错误日志记录到env配置中	2026-04-08 13:46:18 +08:00
Calcium-Ion	1110403750	Merge pull request #4136 from QuantumNous/dependabot/go_modules/github.com/aws/aws-sdk-go-v2/service/bedrockruntime-1.50.4 ... chore(deps): bump github.com/aws/aws-sdk-go-v2/service/bedrockruntime from 1.50.0 to 1.50.4	2026-04-08 13:43:34 +08:00
Calcium-Ion	3a2aecbc01	Merge pull request #4123 from bbbugg/fix/enabled-api ... fix(pricing): add filtering for pricing based on usable groups	2026-04-08 13:43:02 +08:00
Calcium-Ion	49648d8b80	Merge pull request #4128 from zuiho-kai/fix/claude-stream-usage-overwrite ... fix: Claude 流式断流时不再整份覆盖 usage，保留 cache 计费字段	2026-04-08 13:42:39 +08:00
Seefs	59d5aef393	fix: 修复 失败后不重试 配置项写到内存被覆盖	2026-04-08 13:41:31 +08:00
Seefs	48695e0e6f	Merge pull request #3350 from goodmorning10/feat/error-boundary ... feat: add ErrorBoundary to prevent full-page crashes	2026-04-08 12:21:11 +08:00
Seefs	e96ca77542	Merge branch 'main' into feat/error-boundary	2026-04-08 12:20:50 +08:00
Seefs	1ad2557668	Merge pull request #3488 from clansty/feature/channel-affinity-include-model ... feat: add IncludeModelName option to channel affinity rules	2026-04-08 11:54:31 +08:00
dependabot[bot]	ded3bb9cb1	chore(deps): bump github.com/aws/aws-sdk-go-v2/service/bedrockruntime ... Bumps [github.com/aws/aws-sdk-go-v2/service/bedrockruntime](https://github.com/aws/aws-sdk-go-v2) from 1.50.0 to 1.50.4. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.50.0...service/ssm/v1.50.4) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/bedrockruntime dependency-version: 1.50.4 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2026-04-08 01:23:22 +00:00
CaIon	dc83c4af31	refactor(settings): update RatioSetting component to use ModelPricingCombined and adjust tab structure ... - Replaced ModelRatioSettings with ModelPricingCombined in the RatioSetting component. - Updated tab structure to prioritize pricing settings over model settings. - Removed unused imports for ModelRatioSettings and ModelSettingsVisualEditor. v0.12.3	2026-04-08 01:00:09 +08:00
borx	cf1b485389	add 添加 启用错误日志记录到env配置中	2026-04-07 21:12:13 +08:00
Clansty	741aaf4436	fix: wrap scope tag labels with t() for i18n support	2026-04-07 20:00:34 +08:00
zuiho	c66636a0c7	fix: 采纳 CodeRabbit 建议，!Done 时也用 fallback 覆盖占位 CompletionTokens ... message_start 阶段可能给 CompletionTokens 非零占位值， 只检查 == 0 不够，加上 !Done && fallback > current 条件。	2026-04-07 17:52:11 +08:00
zuiho	f7cdc727df	fix: Claude 流式断流时不再整份覆盖 usage，保留 cache 计费字段 ... HandleStreamFinalResponse 在 !Done 时调用 ResponseText2Usage 整份覆盖 claudeInfo.Usage，导致 message_start 已获取的 CacheReadInputTokens、 CacheCreationInputTokens 等字段丢失，prompt 退化为占位值 1。 修复： - 只补缺失的 CompletionTokens/PromptTokens，保留已有 cache 数据 - PromptTokens 兜底改用 info.GetEstimatePromptTokens()（与其他渠道对齐） Fixes #4127	2026-04-07 17:41:08 +08:00
bbbugg	07843d7898	fix(pricing): add filtering for pricing based on usable groups	2026-04-07 15:56:28 +08:00
irongit	559c98f261	feat(web): add ErrorBoundary to prevent full-page crashes	2026-04-06 22:32:19 +08:00
Calcium-Ion	960bf9c49e	Merge pull request #4114 from RedwindA/fix/4110 ... feat(token): add batch API for fetching token keys	2026-04-06 19:49:10 +08:00
RedwindA	12a48c620e	feat(token): add batch API for fetching token keys ... Add new endpoint POST /api/token/batch/keys to fetch multiple token keys in a single request, improving performance when exporting or copying multiple tokens. - Backend: Add GetTokenKeysBatch controller and GetTokenKeysByIds model - Backend: Add route with CriticalRateLimit and DisableCache middleware - Frontend: Add fetchTokenKeysBatch helper function - Frontend: Update useTokensData to use batch API for token export	2026-04-06 19:46:01 +08:00
Calcium-Ion	eacc245bad	Merge pull request #4106 from HynoR/feat/fix ... feat(playground): enhance max_tokens handling and input sanitization v0.12.2	2026-04-06 16:01:28 +08:00
CaIon	03758a4a85	refactor(file-source): unify file source creation and enhance caching mechanisms	2026-04-06 15:54:55 +08:00
CaIon	8fc0eb78e2	feat(billing): enhance task billing process with video input detection and updated pricing logic ... - Added `EstimateBilling` function to check for video input in request metadata and return corresponding discount ratios. - Updated `ModelPriceHelperPerCall` to incorporate new pricing logic based on model ratios and video input. - Enhanced task billing logs to include model ratio information and adjusted calculations for actual quota based on additional multipliers. - Introduced `renderTaskBillingProcess` to improve rendering of task billing information in the UI.	2026-04-06 15:54:55 +08:00
HynoR	427fb7eaf6	refactor(playground): remove playgroundMaxTokens helper and update input handling ... - Deleted the `playgroundMaxTokens` helper functions and their associated tests. - Updated `loadConfig` and `usePlaygroundState` to handle `max_tokens` directly without sanitization. - Simplified input handling in `usePlaygroundState` to directly set values without normalization.	2026-04-06 00:48:06 +08:00
HynoR	4cd0e3651d	feat(playground): enhance max_tokens handling and input sanitization ... - Introduced `sanitizePlaygroundInputs` to normalize `max_tokens` input values. - Updated `loadConfig` to utilize the new sanitization function. - Replaced `Input` with `InputNumber` for `max_tokens` in `ParameterControl` for better user experience. - Modified API payload building logic to handle `max_tokens` more robustly. - Added tests for new helper functions in `playgroundMaxTokens.js` to ensure correct behavior.	2026-04-06 00:40:08 +08:00
Calcium-Ion	677d02f2ab	Merge pull request #4097 from QuantumNous/dependabot/npm_and_yarn/electron/lodash-4.18.1 ... chore(deps-dev): bump lodash from 4.17.23 to 4.18.1 in /electron	2026-04-05 15:30:22 +08:00
dependabot[bot]	c583382af7	chore(deps-dev): bump lodash from 4.17.23 to 4.18.1 in /electron ... Bumps [lodash](https://github.com/lodash/lodash) from 4.17.23 to 4.18.1. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.23...4.18.1) --- updated-dependencies: - dependency-name: lodash dependency-version: 4.18.1 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2026-04-05 06:04:44 +00:00
Calcium-Ion	b1950655e7	Merge pull request #3523 from QuantumNous/dependabot/npm_and_yarn/electron/xmldom/xmldom-0.8.12 ... chore(deps-dev): bump @xmldom/xmldom from 0.8.11 to 0.8.12 in /electron	2026-04-05 14:04:19 +08:00
Calcium-Ion	22cbbcab4c	Merge pull request #4080 from QuantumNous/dependabot/npm_and_yarn/electron/electron-39.8.5 ... chore(deps-dev): bump electron from 35.7.5 to 39.8.5 in /electron	2026-04-05 14:03:40 +08:00
Calcium-Ion	873067f7d1	Merge pull request #4090 from seefs001/fix/claude2openai-usage ... fix: emit claude message_delta for usage-only final stream chunk	2026-04-04 21:09:46 +08:00