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

Replace image2text model check with internal image. (#4250)

Browse Source 
### What problem does this PR solve?

#4243

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
This commit is contained in:
Kevin Hu 2024-12-26 19:46:42 +08:00 committed by GitHub
parent 600f435d27
commit 097aab09a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/apps/llm_app.py
View File

@ -15,7 +15,7 @@
# #
import logging import logging
import json import json
import os
from flask import request from flask import request
from flask_login import login_required, current_user from flask_login import login_required, current_user
from api.db.services.llm_service import LLMFactoriesService, TenantLLMService, LLMService from api.db.services.llm_service import LLMFactoriesService, TenantLLMService, LLMService
@ -24,8 +24,8 @@ from api.utils.api_utils import server_error_response, get_data_error_result, va
from api.db import StatusEnum, LLMType from api.db import StatusEnum, LLMType
from api.db.db_models import TenantLLM from api.db.db_models import TenantLLM
from api.utils.api_utils import get_json_result from api.utils.api_utils import get_json_result
from api.utils.file_utils import get_project_base_directory
from rag.llm import EmbeddingModel, ChatModel, RerankModel, CvModel, TTSModel from rag.llm import EmbeddingModel, ChatModel, RerankModel, CvModel, TTSModel
import requests
@manager.route('/factories', methods=['GET']) # noqa: F821 @manager.route('/factories', methods=['GET']) # noqa: F821
@ -254,16 +254,10 @@ def add_llm():
base_url=llm["api_base"] base_url=llm["api_base"]
) )
try: try:
img_url = ( with open(os.path.join(get_project_base_directory(), "web/src/assets/yay.jpg"), "rb") as f:
"https://www.8848seo.cn/zb_users/upload/2022/07/20220705101240_99378.jpg" m, tc = mdl.describe(f.read())
)
res = requests.get(img_url)
if res.status_code == 200:
m, tc = mdl.describe(res.content)
if not tc: if not tc:
raise Exception(m) raise Exception(m)
else:
pass
except Exception as e: except Exception as e:
msg += f"\nFail to access model({llm['llm_name']})." + str(e) msg += f"\nFail to access model({llm['llm_name']})." + str(e)
elif llm["model_type"] == LLMType.TTS: elif llm["model_type"] == LLMType.TTS:

17
api/utils/api_utils.py
View File

@ -98,14 +98,9 @@ def get_exponential_backoff_interval(retries, full_jitter=False):
def get_data_error_result(code=settings.RetCode.DATA_ERROR, def get_data_error_result(code=settings.RetCode.DATA_ERROR,
message='Sorry! Data missing!'): message='Sorry! Data missing!'):
import re
result_dict = { result_dict = {
"code": code, "code": code,
"message": re.sub( "message": message}
r"rag",
"seceum",
message,
flags=re.IGNORECASE)}
response = {} response = {}
for key, value in result_dict.items(): for key, value in result_dict.items():
if value is None and key != "code": if value is None and key != "code":
@ -250,8 +245,7 @@ def construct_response(code=settings.RetCode.SUCCESS,
def construct_result(code=settings.RetCode.DATA_ERROR, message='data is missing'): def construct_result(code=settings.RetCode.DATA_ERROR, message='data is missing'):
import re result_dict = {"code": code, "message": message}
result_dict = {"code": code, "message": re.sub(r"rag", "seceum", message, flags=re.IGNORECASE)}
response = {} response = {}
for key, value in result_dict.items(): for key, value in result_dict.items():
if value is None and key != "code": if value is None and key != "code":
@ -314,14 +308,9 @@ def get_result(code=settings.RetCode.SUCCESS, message="", data=None):
def get_error_data_result(message='Sorry! Data missing!', code=settings.RetCode.DATA_ERROR, def get_error_data_result(message='Sorry! Data missing!', code=settings.RetCode.DATA_ERROR,
): ):
import re
result_dict = { result_dict = {
"code": code, "code": code,
"message": re.sub( "message": message}
r"rag",
"seceum",
message,
flags=re.IGNORECASE)}
response = {} response = {}
for key, value in result_dict.items(): for key, value in result_dict.items():
if value is None and key != "code": if value is None and key != "code":