Quellcode durchsuchen

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

### What problem does this PR solve?

#4243

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
tags/nightly
Kevin Hu vor 10 Monaten
Ursprung
Commit
097aab09a2
Es ist kein Account mit der E-Mail-Adresse des Committers verbunden
2 geänderte Dateien mit 7 neuen und 24 gelöschten Zeilen
  1. 4
    10
      api/apps/llm_app.py
  2. 3
    14
      api/utils/api_utils.py

+ 4
- 10
api/apps/llm_app.py Datei anzeigen

@@ -15,7 +15,7 @@
#
import logging
import json
import os
from flask import request
from flask_login import login_required, current_user
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.db_models import TenantLLM
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
import requests


@manager.route('/factories', methods=['GET']) # noqa: F821
@@ -254,16 +254,10 @@ def add_llm():
base_url=llm["api_base"]
)
try:
img_url = (
"https://www.8848seo.cn/zb_users/upload/2022/07/20220705101240_99378.jpg"
)
res = requests.get(img_url)
if res.status_code == 200:
m, tc = mdl.describe(res.content)
with open(os.path.join(get_project_base_directory(), "web/src/assets/yay.jpg"), "rb") as f:
m, tc = mdl.describe(f.read())
if not tc:
raise Exception(m)
else:
pass
except Exception as e:
msg += f"\nFail to access model({llm['llm_name']})." + str(e)
elif llm["model_type"] == LLMType.TTS:

+ 3
- 14
api/utils/api_utils.py Datei anzeigen

@@ -98,14 +98,9 @@ def get_exponential_backoff_interval(retries, full_jitter=False):

def get_data_error_result(code=settings.RetCode.DATA_ERROR,
message='Sorry! Data missing!'):
import re
result_dict = {
"code": code,
"message": re.sub(
r"rag",
"seceum",
message,
flags=re.IGNORECASE)}
"message": message}
response = {}
for key, value in result_dict.items():
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'):
import re
result_dict = {"code": code, "message": re.sub(r"rag", "seceum", message, flags=re.IGNORECASE)}
result_dict = {"code": code, "message": message}
response = {}
for key, value in result_dict.items():
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,
):
import re
result_dict = {
"code": code,
"message": re.sub(
r"rag",
"seceum",
message,
flags=re.IGNORECASE)}
"message": message}
response = {}
for key, value in result_dict.items():
if value is None and key != "code":

Laden…
Abbrechen
Speichern