AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-08-12 21:39:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: replace the end user column in the web page Log & Ann. with the… (#653)

Browse Source 
Co-authored-by: Hao Fu <hao.fu@helloklarity.com>
This commit is contained in:
TheFu527 2023-07-27 12:48:43 +08:00 committed by GitHub
parent f9412f5fdb
commit 94b54b7ca9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/controllers/console/app/conversation.py
View File

@ -95,6 +95,7 @@ class CompletionConversationApi(Resource):
'status': fields.String, 'status': fields.String,
'from_source': fields.String, 'from_source': fields.String,
'from_end_user_id': fields.String, 'from_end_user_id': fields.String,
'from_end_user_session_id': fields.String(attribute='end_user.session_id'),
'from_account_id': fields.String, 'from_account_id': fields.String,
'read_at': TimestampField, 'read_at': TimestampField,
'created_at': TimestampField, 'created_at': TimestampField,
@ -135,6 +136,8 @@ class CompletionConversationApi(Resource):
query = db.select(Conversation).where(Conversation.app_id == app.id, Conversation.mode == 'completion') query = db.select(Conversation).where(Conversation.app_id == app.id, Conversation.mode == 'completion')
query = query.options(joinedload(Conversation.end_user))
if args['keyword']: if args['keyword']:
query = query.join( query = query.join(
Message, Message.conversation_id == Conversation.id Message, Message.conversation_id == Conversation.id
@ -246,6 +249,7 @@ class ChatConversationApi(Resource):
'status': fields.String, 'status': fields.String,
'from_source': fields.String, 'from_source': fields.String,
'from_end_user_id': fields.String, 'from_end_user_id': fields.String,
'from_end_user_session_id': fields.String(attribute='end_user.session_id'),
'from_account_id': fields.String, 'from_account_id': fields.String,
'summary': fields.String(attribute='summary_or_query'), 'summary': fields.String(attribute='summary_or_query'),
'read_at': TimestampField, 'read_at': TimestampField,
@ -288,6 +292,8 @@ class ChatConversationApi(Resource):
query = db.select(Conversation).where(Conversation.app_id == app.id, Conversation.mode == 'chat') query = db.select(Conversation).where(Conversation.app_id == app.id, Conversation.mode == 'chat')
query = query.options(joinedload(Conversation.end_user))
if args['keyword']: if args['keyword']:
query = query.join( query = query.join(
Message, Message.conversation_id == Conversation.id Message, Message.conversation_id == Conversation.id

4
api/models/model.py
View File

@ -203,7 +203,7 @@ class Conversation(db.Model):
system_instruction_tokens = db.Column(db.Integer, nullable=False, server_default=db.text('0')) system_instruction_tokens = db.Column(db.Integer, nullable=False, server_default=db.text('0'))
status = db.Column(db.String(255), nullable=False) status = db.Column(db.String(255), nullable=False)
from_source = db.Column(db.String(255), nullable=False) from_source = db.Column(db.String(255), nullable=False)
from_end_user_id = db.Column(UUID) from_end_user_id = db.Column(UUID, db.ForeignKey('end_users.id'))
from_account_id = db.Column(UUID) from_account_id = db.Column(UUID)
read_at = db.Column(db.DateTime) read_at = db.Column(db.DateTime)
read_account_id = db.Column(UUID) read_account_id = db.Column(UUID)
@ -213,6 +213,8 @@ class Conversation(db.Model):
messages = db.relationship("Message", backref="conversation", lazy='select', passive_deletes="all") messages = db.relationship("Message", backref="conversation", lazy='select', passive_deletes="all")
message_annotations = db.relationship("MessageAnnotation", backref="conversation", lazy='select', passive_deletes="all") message_annotations = db.relationship("MessageAnnotation", backref="conversation", lazy='select', passive_deletes="all")
end_user = db.relationship("EndUser", backref="conversations")
is_deleted = db.Column(db.Boolean, nullable=False, server_default=db.text('false')) is_deleted = db.Column(db.Boolean, nullable=False, server_default=db.text('false'))
@property @property

2
web/app/components/app/log/list.tsx
View File

@ -412,7 +412,7 @@ const ConversationList: FC<IConversationList> = ({ logs, appDetail, onRefresh })
</thead> </thead>
<tbody className="text-gray-500"> <tbody className="text-gray-500">
{logs.data.map((log) => { {logs.data.map((log) => {
const endUser = log.from_end_user_id?.slice(0, 8) const endUser = log.from_end_user_session_id
const leftValue = get(log, isChatMode ? 'summary' : 'message.query') const leftValue = get(log, isChatMode ? 'summary' : 'message.query')
const rightValue = get(log, isChatMode ? 'message_count' : 'message.answer') const rightValue = get(log, isChatMode ? 'message_count' : 'message.answer')
return <tr return <tr

1
web/models/log.ts
View File

@ -79,6 +79,7 @@ export type CompletionConversationGeneralDetail = {
status: 'normal' | 'finished' status: 'normal' | 'finished'
from_source: 'api' | 'console' from_source: 'api' | 'console'
from_end_user_id: string from_end_user_id: string
from_end_user_session_id: string
from_account_id: string from_account_id: string
read_at: Date read_at: Date
created_at: number created_at: number