Merge branch '1.1.3-lxg' into 1.1.3-master

api/controllers/console/explore/completion.py

@@ -194,7 +194,7 @@ class ChatApiForRobot(Resource):
         }
 
         # 4) 封装请求url并发送请求
-        chat_message_url = f'{request.host_url}/console/api/installed-apps/{installed_app_id}/chat-messages'
+        chat_message_url = f'{request.host_url}console/api/installed-apps/{installed_app_id}/chat-messages'
         logging.info("Sending request to %s", chat_message_url)
         response = requests.post(chat_message_url, data=json.dumps(data), headers=headers)
 

api/controllers/console/intention.py

@@ -27,7 +27,7 @@ from fields.intention_fields import (
 )
 from libs.login import current_user, login_required
 from models import UploadFile
-from models.intention import IntentionTrainTask, IntentionTrainFile
+from models.intention import IntentionTrainFile, IntentionTrainTask
 from services.errors.intention import IntentionTrainFileDuplicateError
 from services.file_service import FileService
 from services.intention_service import (

api/services/dataset_service.py

@@ -10,7 +10,7 @@ from typing import Any, Optional
 
 from flask_login import current_user  # type: ignore
 from sqlalchemy import func, literal, text
-from sqlalchemy.orm import Session, aliased
+from sqlalchemy.orm import Session
 from werkzeug.exceptions import NotFound
 
 from configs import dify_config