zlei6/ragflow
1
0
Fork 0
mirror of https://github.com/infiniflow/ragflow.git synced 2026-07-30 12:39:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Go: add command, list, remove, stop tasks (#16190)

Browse Source 
### What problem does this PR solve?

```
RAGFlow(admin)> stop user 'abc' ingestion tasks;
+-----------------------------------+-------+--------------------------------------------------------------------------+-------+
| command                           | email | error                                                                    | tasks |
+-----------------------------------+-------+--------------------------------------------------------------------------+-------+
| stop_ingestion_tasks_by_condition | abc   | 'Stop ingestion tasks by condition' is implemented in enterprise edition |       |
+-----------------------------------+-------+--------------------------------------------------------------------------+-------+
RAGFlow(admin)> stop user 'abc' ingestion tasks 'created;
+-----------------------------------+-------+--------------------------------------------------------------------------+----------+-------+
| command                           | email | error                                                                    | status   | tasks |
+-----------------------------------+-------+--------------------------------------------------------------------------+----------+-------+
| stop_ingestion_tasks_by_condition | abc   | 'Stop ingestion tasks by condition' is implemented in enterprise edition | created; |       |
+-----------------------------------+-------+--------------------------------------------------------------------------+----------+-------+
RAGFlow(admin)> stop user 'abc' ingestion tasks 'create';
+-----------------------------------+-------+--------------------------------------------------------------------------+--------+-------+
| command                           | email | error                                                                    | status | tasks |
+-----------------------------------+-------+--------------------------------------------------------------------------+--------+-------+
| stop_ingestion_tasks_by_condition | abc   | 'Stop ingestion tasks by condition' is implemented in enterprise edition | create |       |
+-----------------------------------+-------+--------------------------------------------------------------------------+--------+-------+
RAGFlow(admin)> remove user 'abc' ingestion tasks 'create';
+-------------------------------------+-------+----------------------------------------------------------------------------+--------+-------+
| command                             | email | error                                                                      | status | tasks |
+-------------------------------------+-------+----------------------------------------------------------------------------+--------+-------+
| remove_ingestion_tasks_by_condition | abc   | 'Remove ingestion tasks by condition' is implemented in enterprise edition | create |       |
+-------------------------------------+-------+----------------------------------------------------------------------------+--------+-------+
RAGFlow(admin)> remove user 'abc' ingestion tasks;
+-------------------------------------+-------+----------------------------------------------------------------------------+-------+
| command                             | email | error                                                                      | tasks |
+-------------------------------------+-------+----------------------------------------------------------------------------+-------+
| remove_ingestion_tasks_by_condition | abc   | 'Remove ingestion tasks by condition' is implemented in enterprise edition |       |
+-------------------------------------+-------+----------------------------------------------------------------------------+-------+
```

### Type of change

- [x] New Feature (non-breaking change which adds functionality)

---------

Signed-off-by: Jin Hai <haijin.chn@gmail.com>
This commit is contained in:
Jin Hai
2026-06-18 17:50:21 +08:00
committed by GitHub
parent 1a8ee8ba61
commit 3eb49ca7f8
5 changed files with 396 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
internal/admin/enterprise_service.go
View File

@@ -17,6 +17,7 @@
package admin
import (
"fmt"
"ragflow/internal/common"
"ragflow/internal/dao"
"ragflow/internal/entity"
@@ -498,3 +499,68 @@ func (s *Service) PurgeUsersData(preview bool, days int, userPlan *string, userA
return result, nil
}
func (s *Service) ListIngestionTasksByCondition(email, status *string) ([]map[string]interface{}, error) {
if email == nil && status == nil {
return nil, fmt.Errorf("email or status are required")
}
element := map[string]interface{}{
"command": "list_ingestion_tasks_by_condition",
"error": "'List ingestion tasks by condition' is implemented in enterprise edition",
}
if email != nil {
element["email"] = *email
}
if status != nil {
element["status"] = *status
}
return []map[string]interface{}{element}, nil
}
func (s *Service) StopIngestionTasksByCondition(tasks []string, email, status *string) ([]map[string]interface{}, error) {
if email == nil && status == nil {
return nil, fmt.Errorf("email or status are required")
}
element := map[string]interface{}{
"command": "stop_ingestion_tasks_by_condition",
"tasks": tasks,
"error": "'Stop ingestion tasks by condition' is implemented in enterprise edition",
}
if email != nil {
element["email"] = *email
}
if status != nil {
element["status"] = *status
}
return []map[string]interface{}{element}, nil
}
func (s *Service) RemoveIngestionTasksByCondition(tasks []string, email, status *string) ([]map[string]interface{}, error) {
if email == nil && status == nil {
return nil, fmt.Errorf("email or status are required")
}
element := map[string]interface{}{
"command": "remove_ingestion_tasks_by_condition",
"tasks": tasks,
"error": "'Remove ingestion tasks by condition' is implemented in enterprise edition",
}
if email != nil {
element["email"] = *email
}
if status != nil {
element["status"] = *status
}
return []map[string]interface{}{element}, nil
}

76
internal/admin/handler.go
View File

@@ -1202,7 +1202,9 @@ func (h *Handler) ShowMessageQueue(c *gin.Context) {
}
type RemoveIngestionTaskRequest struct {
Tasks []string `json:"tasks" binding:"required"`
Tasks []string `json:"tasks"`
Email *string `json:"email"`
Status *string `json:"status"`
}
func (h *Handler) RemoveIngestionTasks(c *gin.Context) {
@@ -1212,17 +1214,28 @@ func (h *Handler) RemoveIngestionTasks(c *gin.Context) {
return
}
tasks, err := h.service.RemoveIngestionTasks(req.Tasks)
if err != nil {
errorResponse(c, err.Error(), 400)
return
}
if req.Email == nil && req.Status == nil {
tasks, err := h.service.RemoveIngestionTasks(req.Tasks)
if err != nil {
errorResponse(c, err.Error(), 400)
return
}
success(c, tasks, "Remove tasks successfully")
success(c, tasks, "Remove tasks successfully")
} else {
tasks, err := h.service.RemoveIngestionTasksByCondition(req.Tasks, req.Email, req.Status)
if err != nil {
errorResponse(c, err.Error(), 400)
return
}
success(c, tasks, "Remove tasks successfully")
}
}
type StopIngestionTaskRequest struct {
Tasks []string `json:"tasks" binding:"required"`
Tasks []string `json:"tasks"`
Email *string `json:"email"`
Status *string `json:"status"`
}
func (h *Handler) StopIngestionTasks(c *gin.Context) {
@@ -1232,26 +1245,47 @@ func (h *Handler) StopIngestionTasks(c *gin.Context) {
return
}
tasks, err := h.service.StopIngestionTasks(req.Tasks)
if err != nil {
errorResponse(c, err.Error(), 400)
return
}
if req.Email == nil && req.Status == nil {
tasks, err := h.service.StopIngestionTasks(req.Tasks)
if err != nil {
errorResponse(c, err.Error(), 400)
return
}
var result []map[string]string
for _, task := range tasks {
result = append(result, map[string]string{
"task_id": task.ID,
"status": task.Status,
})
}
var result []map[string]string
for _, task := range tasks {
result = append(result, map[string]string{
"task_id": task.ID,
"status": task.Status,
})
success(c, result, "Stop tasks successfully")
} else {
tasks, err := h.service.StopIngestionTasksByCondition(req.Tasks, req.Email, req.Status)
if err != nil {
errorResponse(c, err.Error(), 400)
return
}
success(c, tasks, "Stop tasks successfully")
}
}
success(c, result, "Stop tasks successfully")
type ListIngestionTasksRequest struct {
Email *string `json:"email"`
Status *string `json:"status"`
}
// ListIngestionTasks
func (h *Handler) ListIngestionTasks(c *gin.Context) {
tasks, err := h.service.ListIngestionTasks()
var err error
var tasks []map[string]interface{}
var req ListIngestionTasksRequest
if err = c.ShouldBindJSON(&req); err != nil {
tasks, err = h.service.ListIngestionTasks()
} else {
tasks, err = h.service.ListIngestionTasksByCondition(req.Email, req.Status)
}
if err != nil {
errorResponse(c, err.Error(), 500)
}