Merge pull request #288 from 0xff-dev/sort-dataset

fix: the data list is sorted in reverse order and supports returning …
kubeagi · Nov 24, 2023 · 59d84d2 · 59d84d2
2 parents ccf38ef + 55516c2
commit 59d84d2
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 2 deletions.
diff --git a/api/v1alpha1/condition.go b/api/v1alpha1/condition.go
@@ -33,7 +33,8 @@ const (
 	// TypeUnknown resources are unknown to the system
 	TypeUnknown ConditionType = "Unknown"
 	// TypeDone resources are believed to be processed
-	TypeDone ConditionType = "Done"
+	TypeDone           ConditionType = "Done"
+	TypeDataProcessing ConditionType = "DataProcessing"
 )
 
 // A ConditionReason represents the reason a resource is in a condition.

diff --git a/graphql-server/go-server/graph/schema/dataprocessing.gql b/graphql-server/go-server/graph/schema/dataprocessing.gql
@@ -38,6 +38,7 @@ query dataProcessSupportType{
           name
           zh_name
           description
+          enable
         }
       }
       message

diff --git a/graphql-server/go-server/graph/schema/versioned_dataset.graphqls b/graphql-server/go-server/graph/schema/versioned_dataset.graphqls
@@ -45,7 +45,7 @@ type VersionedDataset {
     """文件的同步状态, Processing或者'' 表示文件正在同步，Succeede 文件同步成功，Failed 存在文件同步失败"""
     syncStatus: String
 
-    """数据处理状态，如果为空，表示还没有开始，其他表示"""
+    """数据处理状态，如果为空，表示还没有开始，processing 处理中，process_fail处理失败，process_complete处理完成"""
     dataProcessStatus: String
 }
 

diff --git a/graphql-server/go-server/pkg/dataset/dataset.go b/graphql-server/go-server/pkg/dataset/dataset.go
@@ -19,6 +19,7 @@ package dataset
 import (
 	"context"
 	"fmt"
+	"sort"
 	"strings"
 
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -139,6 +140,9 @@ func ListDatasets(ctx context.Context, c dynamic.Interface, input *generated.Lis
 	if err != nil {
 		return nil, err
 	}
+	sort.Slice(datastList.Items, func(i, j int) bool {
+		return datastList.Items[i].GetCreationTimestamp().After(datastList.Items[j].GetCreationTimestamp().Time)
+	})
 	page, size := 1, 10
 	if input.Page != nil && *input.Page > 0 {
 		page = *input.Page

diff --git a/graphql-server/go-server/pkg/datasource/datasource.go b/graphql-server/go-server/pkg/datasource/datasource.go
@@ -18,6 +18,7 @@ package datasource
 
 import (
 	"context"
+	"sort"
 	"time"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -191,6 +192,9 @@ func ListDatasources(ctx context.Context, c dynamic.Interface, namespace, labelS
 	if err != nil {
 		return nil, err
 	}
+	sort.Slice(us.Items, func(i, j int) bool {
+		return us.Items[i].GetCreationTimestamp().After(us.Items[j].GetCreationTimestamp().Time)
+	})
 	result := make([]*model.Datasource, len(us.Items))
 	for idx, u := range us.Items {
 		result[idx] = datasource2model(&u)

diff --git a/graphql-server/go-server/pkg/embedder/embedder.go b/graphql-server/go-server/pkg/embedder/embedder.go
@@ -18,6 +18,7 @@ package embedder
 
 import (
 	"context"
+	"sort"
 	"time"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -161,6 +162,9 @@ func ListEmbedders(ctx context.Context, c dynamic.Interface, namespace, labelSel
 	if err != nil {
 		return nil, err
 	}
+	sort.Slice(us.Items, func(i, j int) bool {
+		return us.Items[i].GetCreationTimestamp().After(us.Items[j].GetCreationTimestamp().Time)
+	})
 	result := make([]*model.Embedder, len(us.Items))
 	for idx, u := range us.Items {
 		result[idx] = embedder2model(&u)

diff --git a/graphql-server/go-server/pkg/knowledgebase/knowledgebase.go b/graphql-server/go-server/pkg/knowledgebase/knowledgebase.go
@@ -18,6 +18,7 @@ package knowledgebase
 
 import (
 	"context"
+	"sort"
 	"time"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -184,6 +185,9 @@ func ListKnowledgeBases(ctx context.Context, c dynamic.Interface, namespace, lab
 	if err != nil {
 		return nil, err
 	}
+	sort.Slice(us.Items, func(i, j int) bool {
+		return us.Items[i].GetCreationTimestamp().After(us.Items[j].GetCreationTimestamp().Time)
+	})
 	result := make([]*model.KnowledgeBase, len(us.Items))
 	for idx, u := range us.Items {
 		result[idx] = knowledgebase2model(&u)

diff --git a/graphql-server/go-server/pkg/versioneddataset/versioned_dataset.go b/graphql-server/go-server/pkg/versioneddataset/versioned_dataset.go
@@ -19,6 +19,7 @@ package versioneddataset
 import (
 	"context"
 	"fmt"
+	"sort"
 	"strings"
 	"time"
 
@@ -87,6 +88,10 @@ func versionedDataset2model(obj *unstructured.Unstructured) (*generated.Versione
 			syncStatus := string(cond.Reason)
 			vds.SyncStatus = &syncStatus
 		}
+		if cond.Type == v1alpha1.TypeDataProcessing {
+			dataProcessStatus := string(cond.Reason)
+			vds.DataProcessStatus = &dataProcessStatus
+		}
 		if !cond.LastTransitionTime.IsZero() {
 			if first || vds.UpdateTimestamp.Before(cond.LastSuccessfulTime.Time) {
 				vds.UpdateTimestamp = &cond.LastTransitionTime.Time
@@ -110,6 +115,10 @@ func VersionFiles(ctx context.Context, c dynamic.Interface, input *generated.Ver
 		keyword = *filter.Keyword
 	}
 	objectInfoList := minioutils.ListObjectCompleteInfo(ctx, input.Namespace, prefix, minioClient, -1)
+	sort.Slice(objectInfoList, func(i, j int) bool {
+		return objectInfoList[i].LastModified.After(objectInfoList[j].LastModified)
+	})
+
 	result := make([]generated.PageNode, 0)
 	for _, obj := range objectInfoList {
 		if keyword == "" || strings.Contains(obj.Key, keyword) {