diff --git a/deploy/README.md b/deploy/README.md index 6ed859009..4fedc3499 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -418,7 +418,7 @@ PostgreSQL/Redis 启动密码。日常校验使用 `config --quiet` | 并发与排队 | “系统设置 → 运行设置”;Key 与账号分别设置排队容量和超时,可选择账号排队失败后换号,见[排队规则](../docs/api.md#并发与排队) | | 账号错误保护 | “系统设置 → 运行设置 → 错误保护”;默认关闭,按[自定义规则](../docs/api.md#账号错误保护)暂停账号调度 | | 全局请求位置 | “系统设置 → 上游配置 → 请求位置覆盖”,默认关闭 | -| OpenAI 请求国家 | “系统设置 → 上游配置 → 请求位置覆盖”中默认选中“跟随位置”,可选择“空值”“透传”或“自定义” | +| OpenAI 请求国家 | “系统设置 → 上游配置 → 请求国家”,默认跟随位置,也可选择“空值”“透传”或“自定义” | | OpenAI OAuth 同步审核模型 | “系统设置 → 上游配置 → 模型映射”中的“专用审核模型”默认开启,关闭后沿用客户端模型。[适用条件](../docs/api.md#正文兼容) | | 代理位置 | “代理管理”;优先于全局位置,全局关闭时仍可独立生效 | diff --git a/docs/api.md b/docs/api.md index eeb1a6c54..17f6ae387 100644 --- a/docs/api.md +++ b/docs/api.md @@ -1410,7 +1410,7 @@ Key 预算及其访问状态随互联默认公开,不要求开启 `shareQuota` 最多 256 项,每个 ID 最多 256 字节;重复 ID 去重,不接受空白、控制字符、`__` 前缀或 `*` 通配符。 允许保存当前上游目录尚未返回的 ID。限制按全局模型映射后的上游 ID 判断,不扩大账号本身的上游权限。 管理端刷新目录只更新目录,不修改模型限制。全选与取消全选只作用于上游目录中符合当前搜索条件的模型。 -账号白名单中,“添加模型”旁的图片按钮可勾选 `gpt-image-2` 和 `gpt-image-1.5`。 +账号和分组白名单均可一键勾选 `gpt-image-2` 和 `gpt-image-1.5`。 自定义模型取消勾选后在本次编辑期间保留,可再次勾选。保存时以最终选中项更新限制,关闭或取消编辑会丢弃草稿。 白名单的清理按钮列出当前目录未返回的已选 ID,默认不选中任何项, 由管理员确认后从当前表单移除,保存账号后生效。目录未就绪、刷新失败或返回空目录时不能清理,清理也不能将白名单置空。 @@ -1994,7 +1994,7 @@ GET 和 POST 均返回 `enabled`、`leadMinutes`、`weeklyTriggerRemainingPercen 分组详情和完整列表返回 `modelAccess`、`fastMode`、`allowImageGeneration` 和 `allowSubagents`。创建时省略这些字段使用默认值,更新时省略或传 `null` 保留现值。 `modelAccess` 复用账号的模型规则。默认 `{"mode":"all","models":[]}` 允许成员账号原本可以使用的模型。 -`allowlist` 和 `denylist` 使用区分大小写的完整模型 ID。编辑器候选取自该组成员账号,账号自身的限制继续生效。 +`allowlist` 和 `denylist` 使用区分大小写的完整模型 ID。分组与账号共用[模型限制编辑器](#账号模型限制)。可从成员账号的目录勾选模型,也可在创建或编辑分组时手动添加目录外的 ID。分组和账号分别保存规则,账号自身的限制继续生效。 Key 绑定多个组时,按模型分别合并启用组中的合格账号。例如两个组分别允许 X 和 Y,X 请求只能使用允许 X 的组内账号。 `fastMode` 默认跟随客户端。策略合并包括 Key 绑定的禁用分组,优先级依次为 `disabled`、`enabled`、`ultrafast`、`default`。未绑定分组的 Key 跟随客户端 diff --git a/docs/architecture.md b/docs/architecture.md index f26c104ad..780f5e648 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -361,7 +361,7 @@ Provider 可为模型提供来源账号集合;Core 在公开目录查询时结 | `views/<页面>/index.vue`、`views/<页面>/components/` | 页面组合与局部交互;复杂组件按职责拆成目录入口和相邻模块 | | `views/<页面>/composables/` | 页面查询、轮询、表单及操作生命周期 | | `presenter.ts`、页面 `utils/` | 纯展示投影或该页面拥有的业务转换,不启动请求 | -| `components/usage/`、`components/account/` | 跨页面复用的用量、健康时间线、套餐和额度窗口展示 | +| `components/usage/`、`components/account/` | 跨页面复用的用量、健康时间线、套餐和额度窗口展示,以及账号与分组共用的模型限制编辑器 | | `composables/` | 请求取消与过期结果隔离、分页、选择、异步动作、目录加载等共享机制 | | `i18n/` | Vue I18n 实例、三语资源和应用语言策略;从全局 Composer 派生 UI 库语言,不翻译用户数据或远端自由文本 | | `utils/` | 按用途分开的数据解析、数字与时长格式化、位置校验、客户端配置、插件导航及颜色工具 | diff --git a/frontend/src/views/accounts/components/AccountModelCleanupPopover.vue b/frontend/src/components/account/model-access/AccountModelCleanupPopover.vue similarity index 100% rename from frontend/src/views/accounts/components/AccountModelCleanupPopover.vue rename to frontend/src/components/account/model-access/AccountModelCleanupPopover.vue diff --git a/frontend/src/views/accounts/components/AccountModelOption.vue b/frontend/src/components/account/model-access/AccountModelOption.vue similarity index 100% rename from frontend/src/views/accounts/components/AccountModelOption.vue rename to frontend/src/components/account/model-access/AccountModelOption.vue diff --git a/frontend/src/views/accounts/components/AccountModelAccessField.vue b/frontend/src/components/account/model-access/index.vue similarity index 94% rename from frontend/src/views/accounts/components/AccountModelAccessField.vue rename to frontend/src/components/account/model-access/index.vue index 8d83d5618..861514021 100644 --- a/frontend/src/views/accounts/components/AccountModelAccessField.vue +++ b/frontend/src/components/account/model-access/index.vue @@ -8,9 +8,9 @@ import { computed, ref, useTemplateRef, watch } from 'vue' import { useI18n } from 'vue-i18n' import { getAccountGroupModels, getAccountModels, refreshAccountModels } from '@/api' import { useRequestState } from '@/composables/useRequestState' -import { accountModelAccessError, accountModelIdError, commonImageModels } from '../utils/modelAccess' import AccountModelCleanupPopover from './AccountModelCleanupPopover.vue' import AccountModelOption from './AccountModelOption.vue' +import { accountModelAccessError, accountModelIdError, commonImageModels } from './modelAccess' const props = withDefaults(defineProps<{ accountId?: string @@ -53,12 +53,10 @@ const modes = computed(() => [ }, { value: 'allowlist', - disabled: props.groupId === null, label: t('accounts.modelAccess.allowlist'), }, { value: 'denylist', - disabled: props.groupId === null, label: t('accounts.modelAccess.blocklist'), }, ]) @@ -115,7 +113,7 @@ const groups = computed(() => [ ids: catalogResults.value, }, ].filter(group => group.ids.length)) -const newModelId = computed(() => groupCatalog.value || groups.value.length +const newModelId = computed(() => groups.value.length ? '' : search.value.trim()) const inputError = computed(() => selectionError.value || (newModelId.value && accountModelIdError(newModelId.value))) @@ -301,17 +299,17 @@ watch(search, () => { diff --git a/frontend/src/views/accounts/utils/modelAccess.ts b/frontend/src/components/account/model-access/modelAccess.ts similarity index 100% rename from frontend/src/views/accounts/utils/modelAccess.ts rename to frontend/src/components/account/model-access/modelAccess.ts diff --git a/frontend/src/i18n/locales/en/accounts.json b/frontend/src/i18n/locales/en/accounts.json index d5484e73a..6dcbaa0da 100644 --- a/frontend/src/i18n/locales/en/accounts.json +++ b/frontend/src/i18n/locales/en/accounts.json @@ -224,7 +224,7 @@ "upstreamCatalog": "Upstream catalog", "selectAll": "Select all", "deselectAll": "Deselect all", - "addToDenylistHint": "Saving blocks this ID on the account", + "addToDenylistHint": "Add and save to block this model", "loadingModel": "Loading model", "noModels": "No models", "selectOrAddAtLeastOneModel": "Please select or add at least one model", diff --git a/frontend/src/i18n/locales/en/groups.json b/frontend/src/i18n/locales/en/groups.json index 5b5a4f7ac..8e8ba2872 100644 --- a/frontend/src/i18n/locales/en/groups.json +++ b/frontend/src/i18n/locales/en/groups.json @@ -43,8 +43,6 @@ "forceUltrafast": "Force Ultrafast", "subagents": "Collaborative subagents", "memberModels": "Member account models", - "searchModels": "Search member models", - "emptyCatalog": "Add an account with available models to this group first", "fastModeHelp": "Default follows the client. Disable downgrades both accelerated tiers to standard. A forced tier overrides the client selection when the model supports it.", "subagentsHelp": "Enable lets the client decide when to start a collaborative subagent. Disable rejects requests identified as coming from a collaborative subagent." }, diff --git a/frontend/src/i18n/locales/en/settings.json b/frontend/src/i18n/locales/en/settings.json index b55c5c369..86b48f8f8 100644 --- a/frontend/src/i18n/locales/en/settings.json +++ b/frontend/src/i18n/locales/en/settings.json @@ -315,7 +315,9 @@ "day": "d", "location": { "requestCountry": "Request country", + "requestCountryDescription": "Choose how Codex requests send the country code", "countryHelp": "Request country mode help", + "countryMode": "Policy", "countryModes": { "default": "Null", "passthrough": "Pass through", diff --git a/frontend/src/i18n/locales/zh-Hans/accounts.json b/frontend/src/i18n/locales/zh-Hans/accounts.json index 4faa34b6e..c20413095 100644 --- a/frontend/src/i18n/locales/zh-Hans/accounts.json +++ b/frontend/src/i18n/locales/zh-Hans/accounts.json @@ -224,7 +224,7 @@ "upstreamCatalog": "上游目录", "selectAll": "全选", "deselectAll": "取消全选", - "addToDenylistHint": "保存后,此账号将拒绝该模型", + "addToDenylistHint": "添加并保存后将拒绝该模型", "loadingModel": "加载模型中", "noModels": "暂无模型", "selectOrAddAtLeastOneModel": "请至少选择或添加一个模型", diff --git a/frontend/src/i18n/locales/zh-Hans/groups.json b/frontend/src/i18n/locales/zh-Hans/groups.json index f3bb20347..f64df844a 100644 --- a/frontend/src/i18n/locales/zh-Hans/groups.json +++ b/frontend/src/i18n/locales/zh-Hans/groups.json @@ -43,8 +43,6 @@ "forceUltrafast": "超快速", "subagents": "协作子代理", "memberModels": "成员账号模型", - "searchModels": "搜索成员账号模型", - "emptyCatalog": "暂无成员模型,请先将有模型的账号加入分组", "fastModeHelp": "默认跟随客户端。禁用会将加速请求降为标准档。选择快速或超快速时,若模型支持该档位,分组设置会覆盖客户端选择", "subagentsHelp": "启用后由客户端决定是否启动协作子代理。禁用会拒绝可识别的协作子代理请求" }, diff --git a/frontend/src/i18n/locales/zh-Hans/settings.json b/frontend/src/i18n/locales/zh-Hans/settings.json index 12915e121..c29e211e7 100644 --- a/frontend/src/i18n/locales/zh-Hans/settings.json +++ b/frontend/src/i18n/locales/zh-Hans/settings.json @@ -315,7 +315,9 @@ "day": "天", "location": { "requestCountry": "请求国家", + "requestCountryDescription": "设置 Codex 请求如何发送国家代码", "countryHelp": "请求国家模式说明", + "countryMode": "策略", "countryModes": { "default": "空值", "passthrough": "透传", diff --git a/frontend/src/i18n/locales/zh-Hant/accounts.json b/frontend/src/i18n/locales/zh-Hant/accounts.json index 2d82a8a76..d64770300 100644 --- a/frontend/src/i18n/locales/zh-Hant/accounts.json +++ b/frontend/src/i18n/locales/zh-Hant/accounts.json @@ -224,7 +224,7 @@ "upstreamCatalog": "上游目錄", "selectAll": "全選", "deselectAll": "取消全選", - "addToDenylistHint": "保存後,此賬號將拒絕該模型", + "addToDenylistHint": "加入並儲存後將拒絕此模型", "loadingModel": "加載模型中", "noModels": "暫無模型", "selectOrAddAtLeastOneModel": "請至少選擇或添加一個模型", diff --git a/frontend/src/i18n/locales/zh-Hant/groups.json b/frontend/src/i18n/locales/zh-Hant/groups.json index c36510e17..ab02aac60 100644 --- a/frontend/src/i18n/locales/zh-Hant/groups.json +++ b/frontend/src/i18n/locales/zh-Hant/groups.json @@ -43,8 +43,6 @@ "forceUltrafast": "超快速", "subagents": "協作子代理", "memberModels": "成員帳號模型", - "searchModels": "搜尋成員帳號模型", - "emptyCatalog": "暫無成員模型,請先將有模型的帳號加入分組", "fastModeHelp": "預設跟隨用戶端。禁用會將加速請求降為標準檔。選擇快速或超快速時,若模型支援該檔位,分組設定會覆寫用戶端選擇", "subagentsHelp": "啟用後由用戶端決定是否啟動協作子代理。禁用會拒絕可識別的協作子代理請求" }, diff --git a/frontend/src/i18n/locales/zh-Hant/settings.json b/frontend/src/i18n/locales/zh-Hant/settings.json index 9b6174342..7d8eca6db 100644 --- a/frontend/src/i18n/locales/zh-Hant/settings.json +++ b/frontend/src/i18n/locales/zh-Hant/settings.json @@ -315,7 +315,9 @@ "day": "天", "location": { "requestCountry": "請求國家", + "requestCountryDescription": "設定 Codex 請求如何傳送國家代碼", "countryHelp": "請求國家模式說明", + "countryMode": "策略", "countryModes": { "default": "空值", "passthrough": "透傳", diff --git a/frontend/src/views/accounts/components/AccountSettingsFields.vue b/frontend/src/views/accounts/components/AccountSettingsFields.vue index 015d8cfd6..400e366b6 100644 --- a/frontend/src/views/accounts/components/AccountSettingsFields.vue +++ b/frontend/src/views/accounts/components/AccountSettingsFields.vue @@ -3,8 +3,8 @@ import type { AccountGroupRef, AccountModelAccess } from '@/api' import { ZFormItem, ZInput, ZSwitch, ZTextarea } from '@codex-proxy/ui' import { useI18n } from 'vue-i18n' +import AccountModelAccessField from '@/components/account/model-access/index.vue' import AccountGroupCheckboxGrid from '@/components/AccountGroupCheckboxGrid.vue' -import AccountModelAccessField from './AccountModelAccessField.vue' import AccountNameField from './AccountNameField.vue' import AccountProxyField from './AccountProxyField.vue' diff --git a/frontend/src/views/accounts/composables/useAccountSettingsFormRules.ts b/frontend/src/views/accounts/composables/useAccountSettingsFormRules.ts index 1524de8a4..2fe7e67ef 100644 --- a/frontend/src/views/accounts/composables/useAccountSettingsFormRules.ts +++ b/frontend/src/views/accounts/composables/useAccountSettingsFormRules.ts @@ -2,8 +2,8 @@ import type { FormRules } from '@codex-proxy/ui' import type { AccountModelAccess } from '@/api' import { computed } from 'vue' import { useI18n } from 'vue-i18n' +import { accountModelAccessError } from '@/components/account/model-access/modelAccess' import { accountNameValid } from '../utils/accountName' -import { accountModelAccessError } from '../utils/modelAccess' interface AccountSettingsFormValue { name?: string diff --git a/frontend/src/views/groups/components/AccountGroupFormModal.vue b/frontend/src/views/groups/components/AccountGroupFormModal.vue index d6e82823c..13b927b28 100644 --- a/frontend/src/views/groups/components/AccountGroupFormModal.vue +++ b/frontend/src/views/groups/components/AccountGroupFormModal.vue @@ -7,9 +7,9 @@ import { normalizeRgbaHexColor, ZButton, ZColorPicker, ZDialog, ZForm, ZFormItem import { computed, useTemplateRef, watch } from 'vue' import { useI18n } from 'vue-i18n' +import AccountModelAccessField from '@/components/account/model-access/index.vue' +import { accountModelAccessError } from '@/components/account/model-access/modelAccess' import HelpPopover from '@/components/HelpPopover.vue' -import AccountModelAccessField from '@/views/accounts/components/AccountModelAccessField.vue' -import { accountModelAccessError } from '@/views/accounts/utils/modelAccess' import { ACCOUNT_GROUP_COLOR_PRESETS } from '../constants' const props = defineProps<{ @@ -81,7 +81,7 @@ const description = computed(() => props.group width="42rem" :show-close="!saving" :close-on-click-modal="!saving" :close-on-press-escape="!saving" > - + props.group :disabled="saving" /> -
+
diff --git a/frontend/src/views/settings/index.vue b/frontend/src/views/settings/index.vue index a0c11a783..a4510a392 100644 --- a/frontend/src/views/settings/index.vue +++ b/frontend/src/views/settings/index.vue @@ -17,6 +17,7 @@ import ConcurrencyPolicyCard from './components/ConcurrencyPolicyCard.vue' import AccountErrorProtectionCard from './components/error-protection/AccountErrorProtectionCard.vue' import ModelAliasesCard from './components/ModelAliasesCard.vue' import PrivacyPolicyCard from './components/privacy/PrivacyPolicyCard.vue' +import RequestCountryCard from './components/RequestCountryCard.vue' import RequestHistoryCard from './components/RequestHistoryCard.vue' import RequestLocationCard from './components/RequestLocationCard.vue' import ResetCreditCard from './components/ResetCreditCard.vue' @@ -246,11 +247,11 @@ watch(section, (value) => { +