Skip to content

Commit 1c5c955

Browse files
author
lrhh123
committed
fix: 修复 Dify 无法连接的问题
1 parent 5155587 commit 1c5c955

File tree

20 files changed

+449
-696
lines changed

20 files changed

+449
-696
lines changed

‎.env‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ PY_HOSTNAME=localhost
22
PY_PORT=9999
33
VAR=1234
44
BKEXE_PATH=./backend/__main__.exe
5-
PKG_VERSION=0.0.1
5+
PKG_VERSION=0.0.1
6+
DEBUG=true

‎package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
]
6161
},
6262
"jest": {
63+
"testTimeout": 300000,
6364
"moduleDirectories": [
6465
"node_modules",
6566
"release/app/node_modules",
@@ -125,6 +126,7 @@
125126
"ms": "^2.1.3",
126127
"net": "^1.0.2",
127128
"node-cron": "^3.0.3",
129+
"node-fetch": "2.6.7",
128130
"openai": "^4.38.3",
129131
"pg-connection-string": "^2.6.4",
130132
"pg-hstore": "^2.3.4",

‎pnpm-lock.yaml‎

Lines changed: 19 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/__tests__/App.test.tsx‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
1-
import '@testing-library/jest-dom';
2-
import { render } from '@testing-library/react';
3-
import App from '../renderer/App';
4-
import { isVersionGreater } from '../renderer/services/system/controller';
5-
6-
describe('App', () => {
7-
it('should render', () => {
8-
expect(render(<App />)).toBeTruthy();
9-
});
10-
});
11-
12-
describe('Version Comparison Tests', () => {
13-
test('Standard version comparison where online version is greater', () => {
14-
expect(isVersionGreater('1.0.1', '1.0.0')).toBe(true);
15-
});
16-
17-
test('Standard version comparison where current version is greater', () => {
18-
expect(isVersionGreater('1.0.0', '1.0.1')).toBe(false);
19-
});
20-
21-
test('Beta version comparison with higher beta number', () => {
22-
expect(isVersionGreater('1.0.0-beta.2', '1.0.0-beta.1')).toBe(true);
23-
});
24-
25-
test('Beta version comparison with lower beta number', () => {
26-
expect(isVersionGreater('1.0.0-beta.1', '1.0.0-beta.2')).toBe(false);
27-
});
28-
29-
test('Beta versus stable where stable should be greater', () => {
30-
expect(isVersionGreater('1.0.0', '1.0.0-beta.1')).toBe(true);
31-
});
32-
33-
test('Stable versus beta where beta should be lesser', () => {
34-
expect(isVersionGreater('1.0.0-beta.1', '1.0.0')).toBe(false);
35-
});
36-
37-
test('Identical versions should not be greater', () => {
38-
expect(isVersionGreater('1.0.0', '1.0.0')).toBe(false);
39-
});
40-
41-
test('Beta suffix without number compared to numeric beta suffix', () => {
42-
expect(isVersionGreater('1.0.0-beta', '1.0.0-beta.1')).toBe(false);
43-
});
44-
45-
test('Numeric beta suffix compared to beta suffix without number', () => {
46-
expect(isVersionGreater('1.0.0-beta.1', '1.0.0-beta')).toBe(true);
47-
});
48-
49-
test('Beta version comparison with identical suffix and number', () => {
50-
expect(isVersionGreater('1.0.0-beta.1', '1.0.0-beta.1')).toBe(false);
51-
});
52-
});
1+
// import '@testing-library/jest-dom';
2+
// import { render } from '@testing-library/react';
3+
// import App from '../renderer/App';
4+
// import { isVersionGreater } from '../renderer/services/system/controller';
5+
6+
// describe('App', () => {
7+
// it('should render', () => {
8+
// expect(render(<App />)).toBeTruthy();
9+
// });
10+
// });
11+
12+
// describe('Version Comparison Tests', () => {
13+
// test('Standard version comparison where online version is greater', () => {
14+
// expect(isVersionGreater('1.0.1', '1.0.0')).toBe(true);
15+
// });
16+
17+
// test('Standard version comparison where current version is greater', () => {
18+
// expect(isVersionGreater('1.0.0', '1.0.1')).toBe(false);
19+
// });
20+
21+
// test('Beta version comparison with higher beta number', () => {
22+
// expect(isVersionGreater('1.0.0-beta.2', '1.0.0-beta.1')).toBe(true);
23+
// });
24+
25+
// test('Beta version comparison with lower beta number', () => {
26+
// expect(isVersionGreater('1.0.0-beta.1', '1.0.0-beta.2')).toBe(false);
27+
// });
28+
29+
// test('Beta versus stable where stable should be greater', () => {
30+
// expect(isVersionGreater('1.0.0', '1.0.0-beta.1')).toBe(true);
31+
// });
32+
33+
// test('Stable versus beta where beta should be lesser', () => {
34+
// expect(isVersionGreater('1.0.0-beta.1', '1.0.0')).toBe(false);
35+
// });
36+
37+
// test('Identical versions should not be greater', () => {
38+
// expect(isVersionGreater('1.0.0', '1.0.0')).toBe(false);
39+
// });
40+
41+
// test('Beta suffix without number compared to numeric beta suffix', () => {
42+
// expect(isVersionGreater('1.0.0-beta', '1.0.0-beta.1')).toBe(false);
43+
// });
44+
45+
// test('Numeric beta suffix compared to beta suffix without number', () => {
46+
// expect(isVersionGreater('1.0.0-beta.1', '1.0.0-beta')).toBe(true);
47+
// });
48+
49+
// test('Beta version comparison with identical suffix and number', () => {
50+
// expect(isVersionGreater('1.0.0-beta.1', '1.0.0-beta.1')).toBe(false);
51+
// });
52+
// });

‎src/__tests__/gptproxy.test.js‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
import 'openai/shims/node';
2+
import fetch from 'node-fetch';
3+
4+
global.fetch = fetch;
5+
6+
// eslint-disable-next-line import/first
7+
import { DifyAI } from '../main/gptproxy';
8+
9+
process.env.DEBUG = 'true';
10+
11+
// '{"code": "invalid_param", "message": "Missing required parameter in the JSON body", "params": "inputs"}
12+
13+
describe('DifyAI', () => {
14+
it('chat generation', async () => {
15+
const dify = new DifyAI({
16+
apiKey: 'app-5uPNxwQ6Q8bU6FzO3WZ72tqV',
17+
baseURL: 'https://api.dify.ai/v1',
18+
});
19+
const response = await dify.chat.completions.create({
20+
model: 'gpt-3.5-turbo',
21+
stream: true,
22+
messages: [
23+
// { role: 'user', content: 'Hello, how are you?' },
24+
// { role: 'assistant', content: 'I am fine, thank you.' },
25+
{ role: 'user', content: 'Hi' },
26+
],
27+
});
28+
expect(response).toBeDefined();
29+
// 打印返回结果
30+
console.log(response);
31+
});
32+
});

‎src/main/backend/backend.ts‎

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -370,26 +370,18 @@ class BKServer {
370370
});
371371

372372
// 检查 GPT 链接是否正常
373-
this.app.get('/api/v1/base/gpt/health', async (req, res) => {
374-
// const { base_url: gptBaseUrl, key, use_dify: useDify, model } = req.query;
375-
// try {
376-
// const { status, message } = await this.messageService.checkApiHealth({
377-
// baseUrl: String(gptBaseUrl),
378-
// apiKey: String(key),
379-
// useDify: dify,
380-
// model: String(model),
381-
// });
382-
// res.json({
383-
// status,
384-
// message,
385-
// });
386-
// } catch (error) {
387-
// console.error(error);
388-
// res.json({
389-
// status: false,
390-
// message: error instanceof Error ? error.message : 'Unknown error',
391-
// });
392-
// }
373+
this.app.post('/api/v1/base/gpt/health', async (req, res) => {
374+
const { cfg } = req.body;
375+
try {
376+
const resp = await this.messageService.checkGptHealth(cfg);
377+
res.json(resp);
378+
} catch (error) {
379+
console.error(error);
380+
res.json({
381+
success: false,
382+
error: error instanceof Error ? error.message : String(error),
383+
});
384+
}
393385
});
394386

395387
// 检查插件是否正常工作

‎src/main/backend/controllers/configController.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,10 @@ export class ConfigController {
315315
plugin = await Plugin.create({
316316
code: config.pluginCode,
317317
});
318+
} else {
319+
await plugin.update({
320+
code: config.pluginCode,
321+
});
318322
}
319323

320324
pluginId = plugin.id;

0 commit comments

Comments
 (0)