Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions apps/trigger/serializers/trigger_task.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,23 @@
from django.utils.translation import gettext_lazy as _
from rest_framework import serializers

from application.models import ChatRecord
from common.db.search import native_page_search, get_dynamics_model
from common.exception.app_exception import AppApiException
from common.utils.common import get_file_content
from maxkb.conf import PROJECT_DIR
from trigger.models import TriggerTask, TaskRecord


class ChatRecordSerializerModel(serializers.ModelSerializer):
class Meta:
model = ChatRecord
fields = ['id', 'chat_id', 'vote_status', 'vote_reason', 'vote_other_content', 'problem_text', 'answer_text',
'message_tokens', 'answer_tokens', 'const', 'improve_paragraph_id_list', 'run_time', 'index',
'answer_text_list', 'details',
'create_time', 'update_time']


class TriggerTaskResponse(serializers.ModelSerializer):
class Meta:
model = TriggerTask
Expand All @@ -40,6 +51,28 @@ def list(self, with_valid=True):
return [TriggerTaskResponse(row).data for row in self.get_query_set()]


class TriggerTaskRecordOperateSerializer(serializers.Serializer):
trigger_id = serializers.CharField(required=True, label=_("Trigger ID"))
workspace_id = serializers.CharField(required=True, label=_('workspace id'))
trigger_task_id = serializers.CharField(required=True, label=_("Trigger task ID"))
trigger_task_record_id = serializers.CharField(required=True, label=_("Trigger task record ID"))

def get_execution_details(self, is_valid=True):
if is_valid:
self.is_valid(raise_exception=True)
task_record = QuerySet(TaskRecord).filter(trigger_id=self.data.get("trigger_id"),
trigger_task_id=self.data.get("trigger_task_id"),
id=self.data.get('trigger_task_record_id')).first()
if not task_record:
raise AppApiException(500, _('Trigger task record id does not exist'))
if task_record.source_type == 'APPLICATION':
chat_record = QuerySet(ChatRecord).filter(id=task_record.task_record_id).first()
return ChatRecordSerializerModel(chat_record).data
if task_record.source_type == 'TOOL':
pass
return None


class TriggerTaskRecordQuerySerializer(serializers.Serializer):
trigger_id = serializers.CharField(required=True, label=_("Trigger ID"))
workspace_id = serializers.CharField(required=True, label=_('workspace id'))
Expand Down
5 changes: 4 additions & 1 deletion apps/trigger/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,8 @@
'workspace/<str:workspace_id>/trigger/<str:trigger_id>/task_record/<int:current_page>/<int:page_size>',
views.TriggerTaskRecordPageView.as_view(), name='trigger_task_record'),
path('workspace/<str:workspace_id>/task', views.TriggerTaskView.as_view(), name='task'),
path('trigger/v1/webhook/<str:trigger_id>', EventTriggerView.as_view(), name='trigger_webhook')
path('trigger/v1/webhook/<str:trigger_id>', EventTriggerView.as_view(), name='trigger_webhook'),
path(
'workspace/<str:workspace_id>/trigger/<str:trigger_id>/trigger_task/<str:trigger_task_id>/trigger_task_record/<str:trigger_task_record_id>',
views.TriggerTaskRecordExecutionDetailsView.as_view(), name='task source trigger'),
]
23 changes: 22 additions & 1 deletion apps/trigger/views/trigger_task.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@

from application.api.application_api import ApplicationCreateAPI
from common import result
from trigger.serializers.trigger_task import TriggerTaskQuerySerializer, TriggerTaskRecordQuerySerializer
from trigger.serializers.trigger_task import TriggerTaskQuerySerializer, TriggerTaskRecordQuerySerializer, \
TriggerTaskRecordOperateSerializer


class TriggerTaskView(APIView):
Expand All @@ -36,6 +37,26 @@ class TriggerTaskRecordView(APIView):
pass


class TriggerTaskRecordExecutionDetailsView(APIView):
@extend_schema(
methods=['GET'],
description=_('Retrieve detailed records of tasks executed by the trigger.'),
summary=_('Retrieve detailed records of tasks executed by the trigger.'),
operation_id=_('Retrieve detailed records of tasks executed by the trigger.'), # type: ignore
parameters=ApplicationCreateAPI.get_parameters(),
request=ApplicationCreateAPI.get_request(),
responses=ApplicationCreateAPI.get_response(),
tags=[_('Trigger')] # type: ignore
)
def get(self, request: Request, workspace_id: str, trigger_id: str, trigger_task_id: str,
trigger_task_record_id: str):
return result.success(
TriggerTaskRecordOperateSerializer(
data={'workspace_id': workspace_id, 'trigger_id': trigger_id, 'trigger_task_id': trigger_task_id,
'trigger_task_record_id': trigger_task_record_id})
.get_execution_details())


class TriggerTaskRecordPageView(APIView):
@extend_schema(
methods=['GET'],
Expand Down
14 changes: 14 additions & 0 deletions ui/src/api/trigger/trigger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,19 @@ const pageTriggerTaskRecord = (
loading,
)
}

const getTriggerTaskRecordDetails = (
trigger_id: string,
trigger_task_id: string,
trigger_task_record_id: string,
loading?: Ref<boolean>,
) => {
return get(
`${prefix.value}/${trigger_id}/trigger_task/${trigger_task_id}/trigger_task_record/${trigger_task_record_id}`,
{},
loading,
)
}
export default {
pageTrigger,
getTriggerList,
Expand All @@ -151,4 +164,5 @@ export default {
delMulTrigger,
activateMulTrigger,
pageTriggerTaskRecord,
getTriggerTaskRecordDetails,
}
6 changes: 5 additions & 1 deletion ui/src/views/trigger/component/TriggerTaskRecordDrawer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,11 @@ import { ref, reactive } from 'vue'
import { isAppIcon, resetUrl } from '@/utils/common'
import triggerAPI from '@/api/trigger/trigger'
import { datetimeFormat } from '@/utils/time'
const toDetails = (row: any) => {}
const toDetails = (row: any) => {
triggerAPI.getTriggerTaskRecordDetails(row.trigger_id, row.trigger_task_id, row.id).then((ok) => {
console.log(ok)
})
}
const searchType = ref<string>('name')
const drawer = ref<boolean>(false)
const paginationConfig = reactive({
Expand Down