Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
new-api
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
1358a360
authored
Jun 13, 2025
by
CaIon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
feat(render): introduce getEffectiveRatio helper for improved group ratio handling
parent
fa7d18ab
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
35 additions
and
36 deletions
+35
-36
web/src/helpers/render.js
+35
-36
No files found.
web/src/helpers/render.js
View file @
1358a360
...
...
@@ -868,7 +868,27 @@ export function renderQuota(quota, digits = 2) {
}
function
isValidGroupRatio
(
ratio
)
{
return
ratio
!==
undefined
&&
ratio
!==
null
&&
ratio
!==
-
1
;
return
Number
.
isFinite
(
ratio
)
&&
ratio
!==
-
1
;
}
/**
* Helper function to get effective ratio and label
* @param {number} groupRatio - The default group ratio
* @param {number} user_group_ratio - The user-specific group ratio
* @returns {Object} - Object containing { ratio, label, useUserGroupRatio }
*/
function
getEffectiveRatio
(
groupRatio
,
user_group_ratio
)
{
const
useUserGroupRatio
=
isValidGroupRatio
(
user_group_ratio
);
const
ratioLabel
=
useUserGroupRatio
?
i18next
.
t
(
'专属倍率'
)
:
i18next
.
t
(
'分组倍率'
);
const
effectiveRatio
=
useUserGroupRatio
?
user_group_ratio
:
groupRatio
;
return
{
ratio
:
effectiveRatio
,
label
:
ratioLabel
,
useUserGroupRatio
:
useUserGroupRatio
};
}
export
function
renderModelPrice
(
...
...
@@ -894,11 +914,9 @@ export function renderModelPrice(
audioInputTokens
=
0
,
audioInputPrice
=
0
,
)
{
const
useUserGroupRatio
=
isValidGroupRatio
(
user_group_ratio
);
const
ratioLabel
=
useUserGroupRatio
?
i18next
.
t
(
'专属倍率'
)
:
i18next
.
t
(
'分组倍率'
);
groupRatio
=
useUserGroupRatio
?
user_group_ratio
:
groupRatio
;
const
{
ratio
:
effectiveGroupRatio
,
label
:
ratioLabel
}
=
getEffectiveRatio
(
groupRatio
,
user_group_ratio
);
groupRatio
=
effectiveGroupRatio
;
if
(
modelPrice
!==
-
1
)
{
return
i18next
.
t
(
'模型价格:${{price}} * {{ratioType}}:{{ratio}} = ${{total}}'
,
...
...
@@ -1110,11 +1128,7 @@ export function renderLogContent(
fileSearch
=
false
,
fileSearchCallCount
=
0
,
)
{
useUserGroupRatio
=
isValidGroupRatio
(
user_group_ratio
);
const
ratioLabel
=
useUserGroupRatio
?
i18next
.
t
(
'专属倍率'
)
:
i18next
.
t
(
'分组倍率'
);
const
ratio
=
useUserGroupRatio
?
user_group_ratio
:
groupRatio
;
const
{
ratio
,
label
:
ratioLabel
,
useUserGroupRatio
:
useUserGroupRatio
}
=
getEffectiveRatio
(
groupRatio
,
user_group_ratio
);
if
(
modelPrice
!==
-
1
)
{
return
i18next
.
t
(
'模型价格 ${{price}},{{ratioType}} {{ratio}}'
,
{
...
...
@@ -1169,11 +1183,8 @@ export function renderModelPriceSimple(
image
=
false
,
imageRatio
=
1.0
,
)
{
const
useUserGroupRatio
=
isValidGroupRatio
(
user_group_ratio
);
const
ratioLabel
=
useUserGroupRatio
?
i18next
.
t
(
'专属倍率'
)
:
i18next
.
t
(
'分组倍率'
);
groupRatio
=
useUserGroupRatio
?
user_group_ratio
:
groupRatio
;
const
{
ratio
:
effectiveGroupRatio
,
label
:
ratioLabel
}
=
getEffectiveRatio
(
groupRatio
,
user_group_ratio
);
groupRatio
=
effectiveGroupRatio
;
if
(
modelPrice
!==
-
1
)
{
return
i18next
.
t
(
'价格:${{price}} * {{ratioType}}:{{ratio}}'
,
{
price
:
modelPrice
,
...
...
@@ -1236,11 +1247,8 @@ export function renderAudioModelPrice(
cacheTokens
=
0
,
cacheRatio
=
1.0
,
)
{
const
useUserGroupRatio
=
isValidGroupRatio
(
user_group_ratio
);
const
ratioLabel
=
useUserGroupRatio
?
i18next
.
t
(
'专属倍率'
)
:
i18next
.
t
(
'分组倍率'
);
groupRatio
=
useUserGroupRatio
?
user_group_ratio
:
groupRatio
;
const
{
ratio
:
effectiveGroupRatio
,
label
:
ratioLabel
}
=
getEffectiveRatio
(
groupRatio
,
user_group_ratio
);
groupRatio
=
effectiveGroupRatio
;
// 1 ratio = $0.002 / 1K tokens
if
(
modelPrice
!==
-
1
)
{
return
i18next
.
t
(
...
...
@@ -1409,11 +1417,8 @@ export function renderClaudeModelPrice(
cacheCreationTokens
=
0
,
cacheCreationRatio
=
1.0
,
)
{
const
useUserGroupRatio
=
isValidGroupRatio
(
user_group_ratio
);
const
ratioLabel
=
useUserGroupRatio
?
i18next
.
t
(
'专属倍率'
)
:
i18next
.
t
(
'分组倍率'
);
groupRatio
=
useUserGroupRatio
?
user_group_ratio
:
groupRatio
;
const
{
ratio
:
effectiveGroupRatio
,
label
:
ratioLabel
}
=
getEffectiveRatio
(
groupRatio
,
user_group_ratio
);
groupRatio
=
effectiveGroupRatio
;
if
(
modelPrice
!==
-
1
)
{
return
i18next
.
t
(
...
...
@@ -1541,11 +1546,8 @@ export function renderClaudeLogContent(
cacheRatio
=
1.0
,
cacheCreationRatio
=
1.0
,
)
{
const
useUserGroupRatio
=
isValidGroupRatio
(
user_group_ratio
);
const
ratioLabel
=
useUserGroupRatio
?
i18next
.
t
(
'专属倍率'
)
:
i18next
.
t
(
'分组倍率'
);
groupRatio
=
useUserGroupRatio
?
user_group_ratio
:
groupRatio
;
const
{
ratio
:
effectiveGroupRatio
,
label
:
ratioLabel
}
=
getEffectiveRatio
(
groupRatio
,
user_group_ratio
);
groupRatio
=
effectiveGroupRatio
;
if
(
modelPrice
!==
-
1
)
{
return
i18next
.
t
(
'模型价格 ${{price}},{{ratioType}} {{ratio}}'
,
{
...
...
@@ -1578,11 +1580,8 @@ export function renderClaudeModelPriceSimple(
cacheCreationTokens
=
0
,
cacheCreationRatio
=
1.0
,
)
{
const
useUserGroupRatio
=
isValidGroupRatio
(
user_group_ratio
);
const
ratioLabel
=
useUserGroupRatio
?
i18next
.
t
(
'专属倍率'
)
:
i18next
.
t
(
'分组倍率'
);
groupRatio
=
useUserGroupRatio
?
user_group_ratio
:
groupRatio
;
const
{
ratio
:
effectiveGroupRatio
,
label
:
ratioLabel
}
=
getEffectiveRatio
(
groupRatio
,
user_group_ratio
);
groupRatio
=
effectiveGroupRatio
;
if
(
modelPrice
!==
-
1
)
{
return
i18next
.
t
(
'价格:${{price}} * {{ratioType}}:{{ratio}}'
,
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment