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

fix: service suggested api (#1452)

Browse Source
This commit is contained in:
crazywoola 2023-11-04 19:59:14 +08:00 committed by GitHub
parent b4861d2b5c
commit a9ee18300e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
api/controllers/service_api/app/message.py
View File

@ -11,7 +11,7 @@ from controllers.service_api.wraps import AppApiResource
from libs.helper import TimestampField, uuid_value from libs.helper import TimestampField, uuid_value
from services.message_service import MessageService from services.message_service import MessageService
from extensions.ext_database import db from extensions.ext_database import db
from models.model import Account, Message from models.model import Message, EndUser
class MessageListApi(AppApiResource): class MessageListApi(AppApiResource):
@ -103,24 +103,26 @@ class MessageSuggestedApi(AppApiResource):
message_id = str(message_id) message_id = str(message_id)
if app_model.mode != 'chat': if app_model.mode != 'chat':
raise NotChatAppError() raise NotChatAppError()
try: try:
message = db.session.query(Message).filter( message = db.session.query(Message).filter(
Message.id == message_id, Message.id == message_id,
Message.app_id == app_model.id, Message.app_id == app_model.id,
).first() ).first()
if end_user is None and message.from_account_id is not None: if end_user is None and message.from_end_user_id is not None:
user = db.session.get(Account, message.from_account_id) user = db.session.query(EndUser) \
elif end_user is None and message.from_end_user_id is not None: .filter(
user = create_or_update_end_user_for_user_id(app_model, message.from_end_user_id) EndUser.tenant_id == app_model.tenant_id,
EndUser.id == message.from_end_user_id,
EndUser.type == 'service_api'
).first()
else: else:
user = end_user user = end_user
questions = MessageService.get_suggested_questions_after_answer( questions = MessageService.get_suggested_questions_after_answer(
app_model=app_model, app_model=app_model,
user=user, user=user,
message_id=message_id message_id=message_id,
check_enabled=False
) )
except services.errors.message.MessageNotExistsError: except services.errors.message.MessageNotExistsError:
raise NotFound("Message Not Exists.") raise NotFound("Message Not Exists.")

4
web/app/components/develop/template/template_chat.zh.mdx
View File

@ -196,10 +196,10 @@ import { Row, Col, Properties, Property, Heading, SubProperty } from '../md.tsx'
</Col> </Col>
<Col sticky> <Col sticky>
<CodeGroup title="Request" tag="GET" label="/messages/{message_id}/suggested" targetCode={`curl --location --request GET '${props.appDetail.api_base_url}/messages/{message_id}/suggested \\\n--header 'Authorization: Bearer ENTER-YOUR-SECRET-KEY' \\\n--header 'Content-Type: application/json'`}> <CodeGroup title="Request" tag="GET" label="/messages/{message_id}/suggested" targetCode={`curl --location --request GET '${props.appDetail.api_base_url}/messages/{message_id}/suggested' \\\n--header 'Authorization: Bearer ENTER-YOUR-SECRET-KEY' \\\n--header 'Content-Type: application/json'`}>
```bash {{ title: 'cURL' }} ```bash {{ title: 'cURL' }}
curl --location --request GET '${props.appDetail.api_base_url}/messages/{message_id}/suggeste' \ curl --location --request GET '${props.appDetail.api_base_url}/messages/{message_id}/suggested' \
--header 'Authorization: Bearer ENTER-YOUR-SECRET-KEY' \ --header 'Authorization: Bearer ENTER-YOUR-SECRET-KEY' \
--header 'Content-Type: application/json' \ --header 'Content-Type: application/json' \
``` ```