From e874815a897ff7cb86baa1c723f2189a586677df Mon Sep 17 00:00:00 2001 From: wangting829 <1940087162@qq.com> Date: Fri, 12 Apr 2024 17:45:34 +0800 Subject: [PATCH] =?UTF-8?q?bug:=20=E4=BD=8E=E7=89=88=E6=9C=ACnode,=20Reada?= =?UTF-8?q?bleStream=E4=B8=8D=E5=85=BC=E5=AE=B9=20(#443)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix:删除日志 * fix: 单测先屏蔽 * fix: node支持版本更改 * fix:【js】低版本node，ReadableStream不兼容 * fix:【js】管控api 单测 * fix:【js】管控api 单测 --------- Co-authored-by: wangting31 --- javascript/package.json | 3 +- .../ChatCompletion/__tests__/index.test.ts | 3 +- .../src/Completions/__tests__/index.test.ts | 1 + .../__tests__/index.test.ts | 25 ++++++++++------ javascript/src/DynamicModelEndpoint/index.ts | 29 +++++++++--------- javascript/src/DynamicModelEndpoint/utils.ts | 6 ++++ .../src/Embedding/__tests__/index.test.ts | 1 + javascript/src/Fetch/fetch.ts | 5 ++-- javascript/src/Images/__tests__/index.test.ts | 1 + javascript/src/Plugin/__tests__/index.test.ts | 30 +------------------ javascript/src/Plugin/index.ts | 1 - javascript/src/utils.ts | 11 ++++--- 12 files changed, 53 insertions(+), 63 deletions(-) diff --git a/javascript/package.json b/javascript/package.json index 9918df65..e1e0dd40 100644 --- a/javascript/package.json +++ b/javascript/package.json @@ -1,6 +1,6 @@ { "name": "@baiducloud/qianfan", - "version": "0.0.9", + "version": "0.0.10", "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org/" @@ -13,6 +13,7 @@ "main": "dist/bundle.js", "type": "commonjs", "scripts": { + "start": "NODE_ENV=production ts-node src/test/chatCompletion", "build": "npx rollup -c rollup.config.mjs", "test": "jest --detectOpenHandles", "publish:main": "npm version patch && npm run build && npm publish --access public", diff --git a/javascript/src/ChatCompletion/__tests__/index.test.ts b/javascript/src/ChatCompletion/__tests__/index.test.ts index 202da781..35c18437 100644 --- a/javascript/src/ChatCompletion/__tests__/index.test.ts +++ b/javascript/src/ChatCompletion/__tests__/index.test.ts @@ -16,6 +16,7 @@ import {ChatBody, RespBase} from '../../interface'; import {ChatCompletion, setEnvVariable} from '../../index'; setEnvVariable('QIANFAN_BASE_URL', 'http://127.0.0.1:8866'); +setEnvVariable('QIANFAN_CONSOLE_API_BASE_URL', 'http://127.0.0.1:8866'); setEnvVariable('QIANFAN_ACCESS_KEY', '123'); setEnvVariable('QIANFAN_SECRET_KEY', '456'); @@ -36,7 +37,7 @@ describe('ChatCompletion', () => { }, ], }; - const res = (await client.chat(body, 'ERNIE-Bot-turbo')) as RespBase; + const res = (await client.chat(body, 'ernie-bot')) as RespBase; const result = res?.result; expect(result).toBeDefined(); }); diff --git a/javascript/src/Completions/__tests__/index.test.ts b/javascript/src/Completions/__tests__/index.test.ts index 47fe5bfa..3e99cf1a 100644 --- a/javascript/src/Completions/__tests__/index.test.ts +++ b/javascript/src/Completions/__tests__/index.test.ts @@ -15,6 +15,7 @@ import {CompletionBody, RespBase} from '../../interface'; import {Completions, setEnvVariable} from '../../index'; setEnvVariable('QIANFAN_BASE_URL', 'http://127.0.0.1:8866'); +setEnvVariable('QIANFAN_CONSOLE_API_BASE_URL', 'http://127.0.0.1:8866'); setEnvVariable('QIANFAN_ACCESS_KEY', '123'); setEnvVariable('QIANFAN_SECRET_KEY', '456'); diff --git a/javascript/src/DynamicModelEndpoint/__tests__/index.test.ts b/javascript/src/DynamicModelEndpoint/__tests__/index.test.ts index 4095cf17..4e77ae70 100644 --- a/javascript/src/DynamicModelEndpoint/__tests__/index.test.ts +++ b/javascript/src/DynamicModelEndpoint/__tests__/index.test.ts @@ -34,7 +34,8 @@ jest.mock('../../HttpClient', () => { jest.mock('../../Fetch/fetch', () => { return jest.fn().mockImplementation(() => { return { - makeRequest: jest.fn() + makeRequest: jest + .fn() .mockResolvedValueOnce({ result: { common: [ @@ -70,17 +71,19 @@ describe('DynamicModelEndpoint', () => { endpoint.setDynamicMapExpireAt(Date.now() / 1000 + 1000); // 设置为未过期 const dynamicTypeModelEndpointMap = endpoint.getDynamicTypeModelEndpointMap(); dynamicTypeModelEndpointMap.set('chat', new Map([['model1', 'https://example.com/Model0']])); - - await expect(endpoint.getEndpoint('chat', 'Model1')).resolves.toEqual('https://example.com/Model0'); + await expect(endpoint.getEndpoint('chat', 'Model1')).resolves.toEqual( + '/rpc/2.0/ai_custom/v1/wenxinworkshop/chat/Model0' + ); }); // 测试动态映射已过期并成功更新后获取端点 it('should update and return endpoint from dynamic mapping when expired', async () => { const endpoint = setupDynamicModelEndpoint({}); endpoint.setDynamicMapExpireAt(Date.now() / 1000 - 1); // 设置为已过期 const dynamicTypeModelEndpointMap = endpoint.getDynamicTypeModelEndpointMap(); - dynamicTypeModelEndpointMap.set('chat', new Map([['model1', 'https://example.com/Model0']])); - await expect(endpoint.getEndpoint('chat', 'model1')).resolves.toEqual('https://example.com/Model1'); - expect(dynamicTypeModelEndpointMap.get('chat').get('model1')).toEqual('https://example.com/Model1'); + await expect(endpoint.getEndpoint('chat', 'model1')).resolves.toEqual( + '/rpc/2.0/ai_custom/v1/wenxinworkshop/chat/Model1' + ); + expect(dynamicTypeModelEndpointMap.get('chat').get('model2')).toEqual('https://example.com/Model2'); }); // 测试更新动态映射失败时的，读取默认配置 it('should handle failure during dynamic mapping update', async () => { @@ -88,7 +91,11 @@ describe('DynamicModelEndpoint', () => { const fetchInstance = new Fetch() as jest.Mocked; client.getSignature.mockResolvedValue({}); // 假设这是获取签名的响应 fetchInstance.makeRequest.mockRejectedValue(new Error('Failed to fetch')); // 模拟 fetch 请求失败 - const endpoint = new DynamicModelEndpoint(client, 'https://qianfan-console-api-base-url.com', 'https://qianfan-base-url.com'); + const endpoint = new DynamicModelEndpoint( + client, + 'https://qianfan-console-api-base-url.com', + 'https://qianfan-base-url.com' + ); const dynamicTypeModelEndpointMap = endpoint.getDynamicTypeModelEndpointMap(); dynamicTypeModelEndpointMap.set('chat', new Map([['model1', 'https://example.com/Model0']])); endpoint.setDynamicMapExpireAt(Date.now() / 1000 - 1); // 设置为已过期 @@ -98,6 +105,6 @@ describe('DynamicModelEndpoint', () => { it('should return an empty string when the model is not found in both mappings', async () => { const endpoint = setupDynamicModelEndpoint({}); endpoint.setDynamicMapExpireAt(Date.now() / 1000 + 1000); // 设置为未过期 - await expect(endpoint.getEndpoint('chat', 'NonExistentModel')).resolves.toEqual(undefined); + await expect(endpoint.getEndpoint('chat', 'NonExistentModel')).resolves.toEqual(''); }); -}); \ No newline at end of file +}); diff --git a/javascript/src/DynamicModelEndpoint/index.ts b/javascript/src/DynamicModelEndpoint/index.ts index 4e999e5f..133d0b40 100644 --- a/javascript/src/DynamicModelEndpoint/index.ts +++ b/javascript/src/DynamicModelEndpoint/index.ts @@ -51,24 +51,25 @@ class DynamicModelEndpoint { } finally { release(); // 释放互斥锁 - // 在更新逻辑完成后继续 + const getEndpointUrl = (typeMap :Map) => { + const modelKey = (model || '').toLowerCase(); + const rawEndPoint = typeMap.get(modelKey) || ''; + let endPoint = type === 'plugin' ? rawEndPoint : rawEndPoint.split('/').pop() || ''; + return endPoint ? getPath({ + Authentication: 'IAM', + api_base: this.qianfanBaseUrl, + endpoint: endPoint, + type, + }) : ''; + }; const dynamicTypeMap = getTypeMap(this.dynamicTypeModelEndpointMap, type); - if (dynamicTypeMap) { - const url = dynamicTypeMap.get(model?.toLowerCase() ?? '') ?? ''; - - return url; // 如果找到了动态类型映射中的URL，返回它 + let url = dynamicTypeMap ? getEndpointUrl(dynamicTypeMap) : ''; + if (url) { + return url; } - // 如果动态映射中没有找到，尝试从静态映射中获取 const typeMap = getTypeMap(typeModelEndpointMap, type); - const endPoint = typeMap.get(model?.toLowerCase() ?? '') ?? ''; - const url = getPath({ - Authentication: 'IAM', - api_base: this.qianfanBaseUrl, - endpoint: endPoint, - type, - }); - return url; // 返回从静态映射中获取的URL + return typeMap ? getEndpointUrl(typeMap) : ''; // 返回从静态映射中获取的URL } } /** diff --git a/javascript/src/DynamicModelEndpoint/utils.ts b/javascript/src/DynamicModelEndpoint/utils.ts index 5346f535..fdf05910 100644 --- a/javascript/src/DynamicModelEndpoint/utils.ts +++ b/javascript/src/DynamicModelEndpoint/utils.ts @@ -79,12 +79,18 @@ const image2textEndpoints = new Map([ ['fuyu-8b', 'fuyu_8b'], ]); +// 一言插件模型 +const pluginEndpoints = new Map([ + ['ebpluginv2', 'erniebot/plugin'], +]); + // 将模型 endpoints 映射添加到主映射中 typeModelEndpointMap.set(ModelType.CHAT, chatModelEndpoints); typeModelEndpointMap.set(ModelType.COMPLETIONS, completionsModelEndpoints); typeModelEndpointMap.set(ModelType.EMBEDDINGS, embeddingEndpoints); typeModelEndpointMap.set(ModelType.TEXT_2_IMAGE, text2imageEndpoints); typeModelEndpointMap.set(ModelType.IMAGE_2_TEXT, image2textEndpoints); +typeModelEndpointMap.set(ModelType.PLUGIN, pluginEndpoints); export {typeModelEndpointMap}; // 检查CHAT是否有数据的函数 diff --git a/javascript/src/Embedding/__tests__/index.test.ts b/javascript/src/Embedding/__tests__/index.test.ts index 8836398a..995aee5c 100644 --- a/javascript/src/Embedding/__tests__/index.test.ts +++ b/javascript/src/Embedding/__tests__/index.test.ts @@ -3,6 +3,7 @@ import {Embedding, setEnvVariable} from '../../index'; // 设置环境变量 setEnvVariable('QIANFAN_BASE_URL', 'http://127.0.0.1:8866'); +setEnvVariable('QIANFAN_CONSOLE_API_BASE_URL', 'http://127.0.0.1:8866'); setEnvVariable('QIANFAN_ACCESS_KEY', '123'); setEnvVariable('QIANFAN_SECRET_KEY', '456'); diff --git a/javascript/src/Fetch/fetch.ts b/javascript/src/Fetch/fetch.ts index e9177c2d..689421c0 100644 --- a/javascript/src/Fetch/fetch.ts +++ b/javascript/src/Fetch/fetch.ts @@ -1,4 +1,5 @@ import fetch, {RequestInit, Response} from 'node-fetch'; +import {Readable} from 'stream'; import {RateLimiter, TokenLimiter} from '../Limiter'; import {RETRY_CODE} from '../constant'; import {Stream} from '../streaming'; @@ -227,8 +228,8 @@ export class Fetch { } const val = this.getTpmHeader(response.headers); // 流式 - if (options.stream && res instanceof ReadableStream) { - const [stream1, stream2] = res.tee(); + if (options.stream && res instanceof Readable) { + const [stream1, stream2] = (res as any).tee(); if (isOpenTpm(val)) { const updateTokensAsync = async () => { for await (const data of (stream1 as unknown as AsyncIterableType)) { diff --git a/javascript/src/Images/__tests__/index.test.ts b/javascript/src/Images/__tests__/index.test.ts index edb65194..acbe6d26 100644 --- a/javascript/src/Images/__tests__/index.test.ts +++ b/javascript/src/Images/__tests__/index.test.ts @@ -2,6 +2,7 @@ import {Image2Text, Text2Image, setEnvVariable} from '../../index'; // 设置环境变量 setEnvVariable('QIANFAN_BASE_URL', 'http://127.0.0.1:8866'); +setEnvVariable('QIANFAN_CONSOLE_API_BASE_URL', 'http://127.0.0.1:8866'); setEnvVariable('QIANFAN_ACCESS_KEY', '123'); setEnvVariable('QIANFAN_SECRET_KEY', '456'); diff --git a/javascript/src/Plugin/__tests__/index.test.ts b/javascript/src/Plugin/__tests__/index.test.ts index 04eb3893..a25e39b6 100644 --- a/javascript/src/Plugin/__tests__/index.test.ts +++ b/javascript/src/Plugin/__tests__/index.test.ts @@ -17,6 +17,7 @@ import {Plugin, setEnvVariable} from '../../index'; // 设置环境变量 setEnvVariable('QIANFAN_BASE_URL', 'http://127.0.0.1:8866'); +setEnvVariable('QIANFAN_CONSOLE_API_BASE_URL', 'http://127.0.0.1:8866'); setEnvVariable('QIANFAN_ACCESS_KEY', '123'); setEnvVariable('QIANFAN_SECRET_KEY', '456'); @@ -28,35 +29,6 @@ describe('Plugin functionality', () => { jest.clearAllMocks(); }); - it('should handle weather plugin', async () => { - const resp = await client.plugins({ - query: '深圳今天天气如何', - plugins: ['uuid-weatherforecast'], - }); - const result = resp?.result; - expect(result).toBeDefined(); - }); - - it('should handle weather plugin with stream', async () => { - const resp = await client.plugins({ - query: '深圳未来七天天气如何', - plugins: ['uuid-weatherforecast'], - stream: true, - verbose: false, - }); - expect(resp).toBeDefined(); - }); - - it('should handle chatocr plugin', async () => { - const resp = await client.plugins({ - query: '请解析这张图片, 告诉我怎么画这张图的简笔画', - plugins: ['uuid-chatocr'], - stream: false, - fileurl: 'https://xxx.bcebos.com/xxx/xxx.jpeg', - }); - expect(resp).toBeDefined(); - }); - it('should handle eChart plugin', async () => { const resp = await client.plugins({ messages: [ diff --git a/javascript/src/Plugin/index.ts b/javascript/src/Plugin/index.ts index 4bb1160e..09eca2b9 100644 --- a/javascript/src/Plugin/index.ts +++ b/javascript/src/Plugin/index.ts @@ -37,7 +37,6 @@ class Plugin extends BaseClient { modelInfoMap: modelInfoMapUppercase, baseUrl: this.qianfanBaseUrl, body, - endpoint: this.Endpoint, type, }); return (await this.sendRequest(type, model, AKPath, requestBody, stream)) as diff --git a/javascript/src/utils.ts b/javascript/src/utils.ts index d35dd041..8c5c9e50 100644 --- a/javascript/src/utils.ts +++ b/javascript/src/utils.ts @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -import * as dotenv from 'dotenv'; +import dotenv from 'dotenv'; import {BASE_PATH, DEFAULT_CONFIG} from './constant'; import {IAMConfig, QfLLMInfoMap, ReqBody} from './interface'; import * as packageJson from '../package.json'; -dotenv.config(); +dotenv.config({path: '../.env'}); /** * 获取访问令牌的URL地址 @@ -97,10 +97,9 @@ export const getPath = ({ type?: string, }): string => { if (endpoint && type) { - const boundary = type === 'plugin' ? '/' : ''; - return Authentication === 'IAM' - ? `${BASE_PATH}/${type}/${endpoint}${boundary}` - : `${api_base}/${type}/${endpoint}${boundary}`; + const basePath = Authentication === 'IAM' ? BASE_PATH : api_base; + const suffix = type === 'plugin' ? '/' : `/${type}/`; + return `${basePath}${suffix}${endpoint}`; } else if (model && modelInfoMap && modelInfoMap[model]) { const modelEndpoint = getModelEndpoint(model, modelInfoMap);