增加打印。

Signed-off-by: zouap <zouap@pcl.ac.cn>

modules/aisafety/resty.go

@@ -66,7 +66,7 @@ func createSign(params map[string]interface{}, signKey string) string {
 	return strings.ToUpper(hex.EncodeToString(h.Sum(nil)))
 }
 
-func CreateSafetyTask(jobName string, body interface{}) (string, error) {
+func CreateSafetyTask(taskId string, body interface{}) (string, error) {
 	checkSetting()
 	client := getRestyClient()
 
@@ -74,7 +74,7 @@ func CreateSafetyTask(jobName string, body interface{}) (string, error) {
 	log.Warn("job req:", string(reqPara))
 
 	params := make(map[string]interface{})
-	//params["appId"] = APPID
+	params["unionId"] = taskId
 
 	res, err := client.R().
 		SetHeader("Content-Type", "application/json").
@@ -82,11 +82,11 @@ func CreateSafetyTask(jobName string, body interface{}) (string, error) {
 		SetHeader("sign", createSign(params, KEY)).
 		//SetAuthToken(TOKEN).
 		SetBody(body).
-		Post(HOST + "/v1/external/eval-standard/create")
-	log.Info("url=" + HOST + "/v1/external/eval-standard/create")
+		Post(HOST + "/v1/external/eval-standard/create?unionId=" + taskId)
+	log.Info("url=" + HOST + "/v1/external/eval-standard/create?unionId=" + taskId)
 
 	responseStr := string(res.Body())
-	log.Info("GetAlgorithmList responseStr=" + responseStr + "  res code=" + fmt.Sprint(res.StatusCode()))
+	log.Info("CreateSafetyTask responseStr=" + responseStr + "  res code=" + fmt.Sprint(res.StatusCode()))
 
 	if err != nil {
 		return "", fmt.Errorf("resty create job: %s", err)
@@ -134,15 +134,16 @@ func GetTaskStatus(jobID string) error {
 	client := getRestyClient()
 	var taskResult string
 	params := make(map[string]interface{})
-	//params["appId"] = APPID
+	params["serialNo"] = jobID
 
 	res, err := client.R().
 		SetHeader("Content-Type", "application/json").
 		SetHeader("appId", APPID).
 		SetHeader("sign", createSign(params, KEY)).
 		SetResult(&taskResult).
-		Get(HOST + "/v1/external/eval-standard/query")
-	log.Info("url=" + HOST + "/v1/external/eval-standard/query")
+		Get(HOST + "/v1/external/eval-standard/query?serialNo=" + jobID)
+
+	log.Info("url=" + HOST + "/v1/external/eval-standard/query?serialNo=" + jobID)
 	if err != nil {
 		return fmt.Errorf("resty GetJob: %v", err)
 	}

routers/repo/ai_model_manage.go

@@ -84,17 +84,7 @@ func saveModelByParameters(jobId string, versionName string, name string, versio
 		}
 		cloudType = models.TypeCloudBrainOne
 	}
-	//  else if cloudType == models.TypeC2Net {
-	// 	if aiTask.ComputeResource == models.NPUResource {
-	// 		modelPath, modelSize, err = downloadModelFromCloudBrainTwo(id, aiTask.JobName, "", aiTask.TrainUrl, modelSelectedFile)
-	// 		if err != nil {
-	// 			log.Info("download model from CloudBrainTwo faild." + err.Error())
-	// 			return err
-	// 		}
-	// 	} else if aiTask.ComputeResource == models.GPUResource {
-
-	// 	}
-	// }
+
 	accuracy := make(map[string]string)
 	accuracy["F1"] = ""
 	accuracy["Recall"] = ""

routers/repo/aisafety.go

@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"os"
 	"strings"
+	"time"
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/aisafety"
@@ -16,17 +17,21 @@ import (
 	"code.gitea.io/gitea/modules/storage"
 	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/services/cloudbrain/resource"
+	uuid "github.com/satori/go.uuid"
 )
 
 func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
 	log.Info("start to create CloudBrainAiSafetyCreate")
+	uuid := uuid.NewV4()
+	id := uuid.String()
 	//jobType := ctx.Query("jobType")
 	//if jobType == string(models.JobTypeBenchmark) {
 	jsonMap, err := getJsonContent("http://192.168.207.34:8065/Test_zap1234/openi_aisafety/raw/branch/master/result/0301.json")
 	if err == nil {
 		aisafety.GetAlgorithmList()
-		aisafety.CreateSafetyTask("test", jsonMap)
-		//aisafety.GetTaskStatus()
+		aisafety.CreateSafetyTask(id, jsonMap)
+		time.Sleep(time.Duration(2) * time.Second)
+		aisafety.GetTaskStatus(id)
 	}
 	//}
 }