diff --git a/deploy/docker/docker-compose-pgvector.yml b/deploy/docker/docker-compose-pgvector.yml index 3f0a14921..9b0904fb4 100644 --- a/deploy/docker/docker-compose-pgvector.yml +++ b/deploy/docker/docker-compose-pgvector.yml @@ -150,7 +150,7 @@ services: # AI Proxy aiproxy: image: ghcr.io/labring/aiproxy:v0.1.5 - # image: registry.cn-hangzhou.aliyuncs.com/labring/aiproxy:v0.1.3 # 阿里云 + # image: registry.cn-hangzhou.aliyuncs.com/labring/aiproxy:v0.1.5 # 阿里云 container_name: aiproxy restart: unless-stopped depends_on: diff --git a/packages/service/common/api/type.d.ts b/packages/service/common/api/type.d.ts index 7e8790c4e..944a2edd8 100644 --- a/packages/service/common/api/type.d.ts +++ b/packages/service/common/api/type.d.ts @@ -15,8 +15,8 @@ declare global { var textCensorHandler: (params: { text: string }) => Promise<{ code: number; message?: string }>; var deepRagHandler: (data: DeepRagSearchProps) => Promise; var authOpenApiHandler: (data: AuthOpenApiLimitProps) => Promise; - var createUsageHandler: (data: CreateUsageProps) => Promise; - var concatUsageHandler: (data: ConcatUsageProps) => Promise; + var createUsageHandler: (data: CreateUsageProps) => any; + var concatUsageHandler: (data: ConcatUsageProps) => any; // API dataset var getProApiDatasetFileList: (data: GetProApiDatasetFileListParams) => Promise; diff --git a/packages/service/support/openapi/auth.ts b/packages/service/support/openapi/auth.ts index a894db600..883f58b4a 100644 --- a/packages/service/support/openapi/auth.ts +++ b/packages/service/support/openapi/auth.ts @@ -16,11 +16,9 @@ export async function authOpenApiKey({ apikey }: { apikey: string }) { } // auth limit - if (global.feConfigs?.isPlus) { - await global.authOpenApiHandler({ - openApi - }); - } + await global.authOpenApiHandler({ + openApi + }); updateApiKeyUsedTime(openApi._id); diff --git a/projects/app/package.json b/projects/app/package.json index 9cb830d46..6686d4974 100644 --- a/projects/app/package.json +++ b/projects/app/package.json @@ -1,6 +1,6 @@ { "name": "app", - "version": "4.9.4", + "version": "4.9.6", "private": false, "scripts": { "dev": "next dev", diff --git a/projects/app/src/service/common/system/constants.ts b/projects/app/src/service/common/system/constants.ts new file mode 100644 index 000000000..a5b14789b --- /dev/null +++ b/projects/app/src/service/common/system/constants.ts @@ -0,0 +1,3 @@ +export const isProVersion = () => { + return !!global.feConfigs?.isPlus; +}; diff --git a/projects/app/src/service/common/system/index.ts b/projects/app/src/service/common/system/index.ts index dbc87ad47..6b06449c2 100644 --- a/projects/app/src/service/common/system/index.ts +++ b/projects/app/src/service/common/system/index.ts @@ -23,6 +23,7 @@ import { getProApiDatasetFileListRequest, getProApiDatasetFilePreviewUrlRequest } from '@/service/core/dataset/apiDataset/controller'; +import { isProVersion } from './constants'; export const readConfigData = async (name: string) => { const splitName = name.split('.'); @@ -58,14 +59,17 @@ export function initGlobalVariables() { }; global.authOpenApiHandler = function authOpenApiHandler(data: AuthOpenApiLimitProps) { + if (!isProVersion()) return Promise.resolve(); return POST('/support/openapi/authLimit', data); }; global.createUsageHandler = function createUsageHandler(data: CreateUsageProps) { + if (!isProVersion()) return; return POST('/support/wallet/usage/createUsage', data); }; global.concatUsageHandler = function concatUsageHandler(data: ConcatUsageProps) { + if (!isProVersion()) return; return POST('/support/wallet/usage/concatUsage', data); }; diff --git a/projects/app/src/service/core/app/utils.ts b/projects/app/src/service/core/app/utils.ts index 6361e722c..1ca6d41e6 100644 --- a/projects/app/src/service/core/app/utils.ts +++ b/projects/app/src/service/core/app/utils.ts @@ -141,7 +141,7 @@ export const checkNode = async ({ node: StoreNodeItemType; ownerTmbId: string; }) => { - const { pluginId } = node; + const pluginId = node.pluginId; if (!pluginId) return node; try {