Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
赵月辉
/
fastgpt-migrated
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
Unverified
Commit
4d043e0e
authored
May 06, 2023
by
archer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: auth key code
parent
d1ee3913
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
23 deletions
+28
-23
src/service/events/generateQA.ts
+10
-12
src/service/events/generateVector.ts
+9
-11
src/service/utils/tools.ts
+9
-0
No files found.
src/service/events/generateQA.ts
View file @
4d043e0e
...
...
@@ -8,6 +8,7 @@ import { PgClient } from '@/service/pg';
import
{
ModelSplitDataSchema
}
from
'@/types/mongoSchema'
;
import
{
modelServiceToolMap
}
from
'../utils/chat'
;
import
{
ChatRoleEnum
}
from
'@/constants/chat'
;
import
{
getErrMessage
}
from
'../utils/tools'
;
export
async
function
generateQA
(
next
=
false
):
Promise
<
any
>
{
if
(
process
.
env
.
queueTask
!==
'1'
)
{
...
...
@@ -51,17 +52,14 @@ export async function generateQA(next = false): Promise<any> {
const
key
=
await
getApiKey
({
model
:
OpenAiChatEnum
.
GPT35
,
userId
:
dataItem
.
userId
});
userOpenAiKey
=
key
.
userOpenAiKey
;
systemAuthKey
=
key
.
systemAuthKey
;
}
catch
(
error
:
any
)
{
if
(
error
?.
code
===
501
)
{
// 余额不够了, 清空该记录
await
SplitData
.
findByIdAndUpdate
(
dataItem
.
_id
,
{
textList
:
[],
errorText
:
error
.
message
});
throw
new
Error
(
error
?.
message
);
}
throw
new
Error
(
'获取 openai key 失败'
);
}
catch
(
err
:
any
)
{
// 余额不够了, 清空该记录
await
SplitData
.
findByIdAndUpdate
(
dataItem
.
_id
,
{
textList
:
[],
errorText
:
getErrMessage
(
err
,
'获取 OpenAi Key 失败'
)
});
generateQA
(
true
);
return
;
}
console
.
log
(
`正在生成一组QA, 包含
${
textList
.
length
}
组文本。ID:
${
dataItem
.
_id
}
`
);
...
...
@@ -171,7 +169,7 @@ A2:
setTimeout
(()
=>
{
generateQA
(
true
);
},
4
000
);
},
1
000
);
}
}
...
...
src/service/events/generateVector.ts
View file @
4d043e0e
...
...
@@ -2,6 +2,7 @@ import { openaiCreateEmbedding } from '../utils/chat/openai';
import
{
getApiKey
}
from
'../utils/auth'
;
import
{
openaiError2
}
from
'../errorCode'
;
import
{
PgClient
}
from
'@/service/pg'
;
import
{
getErrMessage
}
from
'../utils/tools'
;
export
async
function
generateVector
(
next
=
false
):
Promise
<
any
>
{
if
(
process
.
env
.
queueTask
!==
'1'
)
{
...
...
@@ -45,16 +46,13 @@ export async function generateVector(next = false): Promise<any> {
try
{
const
res
=
await
getApiKey
({
model
:
'gpt-3.5-turbo'
,
userId
:
dataItem
.
userId
});
userOpenAiKey
=
res
.
userOpenAiKey
;
}
catch
(
error
:
any
)
{
if
(
error
?.
code
===
501
)
{
await
PgClient
.
delete
(
'modelData'
,
{
where
:
[[
'id'
,
dataId
]]
});
generateVector
(
true
);
return
;
}
throw
new
Error
(
'获取 openai key 失败'
);
}
catch
(
err
:
any
)
{
await
PgClient
.
delete
(
'modelData'
,
{
where
:
[[
'id'
,
dataId
]]
});
generateVector
(
true
);
getErrMessage
(
err
,
'获取 OpenAi Key 失败'
);
return
;
}
// 生成词向量
...
...
@@ -104,6 +102,6 @@ export async function generateVector(next = false): Promise<any> {
}
setTimeout
(()
=>
{
generateVector
(
true
);
},
2
000
);
},
1
000
);
}
}
src/service/utils/tools.ts
View file @
4d043e0e
...
...
@@ -26,3 +26,12 @@ export const axiosConfig = () => ({
auth
:
process
.
env
.
OPENAI_BASE_URL_AUTH
||
''
}
});
/**
* get error message
*/
export
const
getErrMessage
=
(
err
:
any
,
defaultMsg
=
''
):
string
=>
{
const
msg
=
typeof
err
===
'string'
?
err
:
err
?.
message
||
defaultMsg
||
''
;
msg
&&
console
.
log
(
'error =>'
,
msg
);
return
msg
;
};
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