AI/ragflow
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/infiniflow/ragflow.git synced 2025-07-06 07:25:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix for volcengine (#909)

Browse Source 
### What problem does this PR solve?
Bug fixes for the VolcEngine

- Bug fix for front-end configuration code of VolcEngine

- Bug fix for tokens counting logic of VolcEngine


### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)

---------

Co-authored-by: 海贼宅 <stu_xyx@163.com>
This commit is contained in:
yungongzi 2024-05-24 11:34:39 +08:00 committed by GitHub
parent 735bdf06a4
commit c0d71adaa2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rag/llm/chat_model.py
View File

@ -359,6 +359,7 @@ class VolcEngineChat(Base):
if system: if system:
history.insert(0, {"role": "system", "content": system}) history.insert(0, {"role": "system", "content": system})
ans = "" ans = ""
tk_count = 0
try: try:
req = { req = {
"parameters": { "parameters": {
@ -376,10 +377,9 @@ class VolcEngineChat(Base):
if not resp.choices[0].message.content: if not resp.choices[0].message.content:
continue continue
ans += resp.choices[0].message.content ans += resp.choices[0].message.content
yield ans
if resp.choices[0].finish_reason == "stop": if resp.choices[0].finish_reason == "stop":
yield resp.usage.total_tokens tk_count = resp.usage.total_tokens
yield ans
except Exception as e: except Exception as e:
yield ans + "\n**ERROR**: " + str(e) yield ans + "\n**ERROR**: " + str(e)
yield 0 yield tk_count

6
web/src/pages/user-setting/setting-model/index.tsx
View File

@ -102,7 +102,7 @@ const ModelCard = ({ item, clickApiKey }: IModelCardProps) => {
<Col span={12} className={styles.factoryOperationWrapper}> <Col span={12} className={styles.factoryOperationWrapper}>
<Space size={'middle'}> <Space size={'middle'}>
<Button onClick={handleApiKeyClick}> <Button onClick={handleApiKeyClick}>
{isLocalLlmFactory(item.name) ? t('addTheModel') : 'API-Key'} {isLocalLlmFactory(item.name) || item.name === 'VolcEngine' ? t('addTheModel') : 'API-Key'}
<SettingOutlined /> <SettingOutlined />
</Button> </Button>
<Button onClick={handleShowMoreClick}> <Button onClick={handleShowMoreClick}>
@ -181,11 +181,13 @@ const UserSettingModel = () => {
(llmFactory: string) => { (llmFactory: string) => {
if (isLocalLlmFactory(llmFactory)) { if (isLocalLlmFactory(llmFactory)) {
showLlmAddingModal(llmFactory); showLlmAddingModal(llmFactory);
} else if (llmFactory === 'VolcEngine') {
showVolcAddingModal('VolcEngine');
} else { } else {
showApiKeyModal({ llm_factory: llmFactory }); showApiKeyModal({ llm_factory: llmFactory });
} }
}, },
[showApiKeyModal, showLlmAddingModal], [showApiKeyModal, showLlmAddingModal, showVolcAddingModal],
); );
const handleAddModel = (llmFactory: string) => () => { const handleAddModel = (llmFactory: string) => () => {