WebUI支持回测报告删除

anyongjin · anyongjin · commit 1abacac91a5f · 2025-05-16T11:23:28.000+08:00
回测限价单触发不考虑网络延迟
fix并发预热导致数据竞态
diff --git a/biz/odmgr_local.go b/biz/odmgr_local.go
@@ -395,7 +395,7 @@ func (o *LocalOrderMgr) tryFillTriggers(od *ormo.InOutOrder, bar *banexg.Kline,
 	curMS := btime.TimeMS()
 	// The time when the simulation is triggered
 	// 模拟触发时的时间
-	var rate = config.BTNetCost / tfSecs
+	var rate = float64(0) // 限价单触发不考虑网络延迟
 	odType := banexg.OdTypeMarket
 	if fillPrice > 0 {
 		odType = banexg.OdTypeLimit
diff --git a/core/data.go b/core/data.go
@@ -48,8 +48,8 @@ var (
 	NewNumInSim   int  // 撮合时创建新订单的数量
 
 	ConcurNum = 2 // The maximum number of K-line tasks to be downloaded at the same time. If it is too high, a 429 current limit will occur. 最大同时下载K线任务数，过大会出现429限流
-	Version   = "v0.2.17-beta.1"
-	UIVersion = "v0.2.16"
+	Version   = "v0.2.17-beta.2"
+	UIVersion = "v0.2.17-beta.2"
 	SysLang   string // language code for current system 当前系统语言设置
 	LogFile   string
 	DevDbPath string
diff --git a/core/types.go b/core/types.go
@@ -27,19 +27,19 @@ type PerfSta struct {
 	Delta    float64     `yaml:"delta" mapstructure:"delta"` // Multiplier before logarithmizing TotProfit 对TotProfit进行对数处理前的乘数
 }
 
-type StrVal struct {
-	Str string
-	Val float64
+type StrAny struct {
+	Str string `json:"str"`
+	Val any    `json:"val"`
 }
 
-type StrAny struct {
-	Str string
-	Any any
+type StrVal[T comparable] struct {
+	Str string `json:"str"`
+	Val T      `json:"val"`
 }
 
 type StrInt64 struct {
-	Str string
-	Int int64
+	Str string `json:"str"`
+	Int int64  `json:"int"`
 }
 
 type Param struct {
diff --git a/data/provider.go b/data/provider.go
@@ -137,7 +137,8 @@ func (p *Provider[IKlineFeeder]) warmJobs(warmJobs []*WarmJob, pb *utils.StagedP
 	}
 	skipWarms := make(map[string][2]int)
 	startTime := btime.TimeMS()
-	retErr := utils.ParallelRun(warmJobs, core.ConcurNum, func(_ int, job *WarmJob) *errs.Error {
+	// 这里不可使用并行预热，因预热过程会读写btime等全局变量，可能导致指标计算时repeat append on Series panic
+	for _, job := range warmJobs {
 		hold := job.hold
 		if job.timeMS == 0 {
 			job.timeMS = startTime
@@ -149,12 +150,14 @@ func (p *Provider[IKlineFeeder]) warmJobs(warmJobs []*WarmJob, pb *utils.StagedP
 			skipWarms[k] = v
 		}
 		lockMap.Unlock()
-		return err
-	})
+		if err != nil {
+			return sinceMap, err
+		}
+	}
 	if len(skipWarms) > 0 {
 		log.Warn("warm lacks", zap.String("items", StrWarmLacks(skipWarms)))
 	}
-	return sinceMap, retErr
+	return sinceMap, nil
 }
 
 type HistProvider struct {
diff --git a/entry/entry.go b/entry/entry.go
@@ -263,10 +263,15 @@ func runMergeAssets(args []string) error {
 	if len(files) < 2 {
 		return errs.NewMsg(errs.CodeParamRequired, "at least 2 files need to merge")
 	}
+	if outPath == "" {
+		return errs.NewMsg(errs.CodeParamRequired, "-out is required")
+	}
 	filesMap := make(map[string]string)
 	for _, file := range files {
-		filesMap[file] = ""
+		path := config.ParsePath(file)
+		filesMap[path] = ""
 	}
+	outPath = config.ParsePath(outPath)
 
 	lineArr := utils.SplitSolid(lines, ",", true)
 	err2 := opt.MergeAssetsHtml(outPath, filesMap, lineArr, false)
diff --git a/utils/file_util.go b/utils/file_util.go
@@ -111,6 +111,41 @@ func EnsureDir(dir string, perm os.FileMode) error {
 	return nil
 }
 
+func RemovePath(path string, recursive bool) error {
+	fileInfo, err := os.Stat(path)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return nil
+		}
+		return fmt.Errorf("check path fail: %s %w", path, err)
+	}
+
+	// check is dir
+	if fileInfo.IsDir() {
+		// not allow to delete by recursive
+		if !recursive {
+			// check is empty
+			entries, err := os.ReadDir(path)
+			if err != nil {
+				return fmt.Errorf("read dir fail: %s %w", path, err)
+			}
+
+			if len(entries) > 0 {
+				return fmt.Errorf("dir is not empty, enable recursive to delete: %s", path)
+			}
+
+			// delete empty dir
+			return os.Remove(path)
+		}
+
+		// delete all
+		return os.RemoveAll(path)
+	}
+
+	// delete file
+	return os.Remove(path)
+}
+
 // FindSubPath searches for the first occurrence of a directory named tgtName
 // within the specified workDir and its subdirectories up to two levels deep.
 func FindSubPath(parDir, tgtName string, maxDepth int) (string, error) {
diff --git a/utils/text_utils.go b/utils/text_utils.go
@@ -54,7 +54,7 @@ func MapToStr[T any](m map[string]T, value bool, precFlt int) string {
 	var b strings.Builder
 	arr := make([]*core.StrAny, 0, len(m))
 	for k, v := range m {
-		arr = append(arr, &core.StrAny{Str: k, Any: v})
+		arr = append(arr, &core.StrAny{Str: k, Val: v})
 	}
 	sort.Slice(arr, func(i, j int) bool {
 		return arr[i].Str < arr[j].Str
@@ -65,12 +65,12 @@ func MapToStr[T any](m map[string]T, value bool, precFlt int) string {
 		}
 		if value {
 			var valStr string
-			if fltVal, ok := p.Any.(float64); ok {
+			if fltVal, ok := p.Val.(float64); ok {
 				valStr = strconv.FormatFloat(fltVal, 'f', precFlt, 64)
-			} else if flt32Val, ok := p.Any.(float32); ok {
+			} else if flt32Val, ok := p.Val.(float32); ok {
 				valStr = strconv.FormatFloat(float64(flt32Val), 'f', precFlt, 64)
 			} else {
-				valStr = fmt.Sprintf("%v", p.Any)
+				valStr = fmt.Sprintf("%v", p.Val)
 			}
 			item := fmt.Sprintf("%s: %v", p.Str, valStr)
 			b.WriteString(item)
diff --git a/web/dev/api_dev.go b/web/dev/api_dev.go
@@ -73,6 +73,7 @@ func regApiDev(api fiber.Router) {
 	api.Get("/download", handleDownload)
 	api.Get("/compare_assets", getCompareAssets)
 	api.Post("/update_note", handleUpdateNote)
+	api.Post("/del_bt_reports", delBacktestReports)
 }
 
 func onWsDev(c *websocket.Conn) {
@@ -523,20 +524,25 @@ func getBtOptions(c *fiber.Ctx) error {
 	}
 
 	// 处理策略列表
-	stratMap := make(map[string]bool)
+	stratMap := make(map[string]int)
 	for _, o := range options {
 		strats := strings.Split(o.Strats, ",")
 		for _, s := range strats {
 			if s = strings.TrimSpace(s); s != "" {
-				stratMap[s] = true
+				oldNum, _ := stratMap[s]
+				stratMap[s] = oldNum + 1
 			}
 		}
 	}
-	strats := make([]string, 0, len(stratMap))
-	for s := range stratMap {
-		strats = append(strats, s)
+	strats := make([]core.StrVal[int], 0, len(stratMap))
+	for s, v := range stratMap {
+		strats = append(strats, core.StrVal[int]{
+			Str: s, Val: v,
+		})
 	}
-	sort.Strings(strats)
+	sort.Slice(strats, func(i, j int) bool {
+		return strats[i].Val > strats[j].Val
+	})
 
 	// 处理周期列表
 	periodMap := make(map[string]int)
@@ -1464,6 +1470,75 @@ func getCompareAssets(c *fiber.Ctx) error {
 	return c.Send(content)
 }
 
+func delBacktestReports(c *fiber.Ctx) error {
+	type DelArgs struct {
+		IDs    []int64  `json:"ids"`
+		Hashes []string `json:"hashes"`
+	}
+	var args = new(DelArgs)
+	if err := base.VerifyArg(c, args, base.ArgBody); err != nil {
+		return err
+	}
+
+	qu, conn, err2 := ormu.Conn()
+	if err2 != nil {
+		return err2
+	}
+	defer conn.Close()
+
+	// 构建files参数
+	files := make(map[string]bool)
+	tasks := make([]int64, 0, len(args.IDs))
+	failNum := 0
+	for _, id := range args.IDs {
+		task, err := qu.GetTask(context.Background(), id)
+		if err != nil {
+			failNum += 1
+			log.Error("query task fail", zap.Int64("id", id), zap.Error(err))
+			continue
+		}
+		tasks = append(tasks, id)
+		if task.Path != "" {
+			path := filepath.Join(config.GetDataDir(), "backtest", task.Path)
+			files[path] = utils.Exists(path)
+		}
+	}
+	for _, hash := range args.Hashes {
+		path := filepath.Join(config.GetDataDir(), "backtest", hash)
+		files[path] = utils.Exists(path)
+		rows, err := qu.FindTasks(context.Background(), ormu.FindTasksParams{
+			Path: hash,
+		})
+		if err != nil {
+			log.Error("FindTasks by hash fail", zap.String("hash", hash), zap.Error(err))
+			continue
+		}
+		for _, r := range rows {
+			tasks = append(tasks, r.ID)
+		}
+	}
+	for path, exist := range files {
+		if !exist {
+			continue
+		}
+		err := utils.RemovePath(path, true)
+		if err != nil {
+			log.Error("delete fail", zap.Error(err))
+			failNum += 1
+		}
+	}
+	if len(tasks) > 0 {
+		err := qu.DelTasks(context.Background(), tasks)
+		if err != nil {
+			log.Error("delete records fail", zap.Error(err))
+		}
+	}
+	return c.JSON(fiber.Map{
+		"success": len(files) - failNum,
+		"fail":    failNum,
+	})
+}
+
 // handleUpdateNote 处理更新回测任务备注的请求
 func handleUpdateNote(c *fiber.Ctx) error {
 	type UpdateNoteArgs struct {
diff --git a/web/ui/messages/en-US.json b/web/ui/messages/en-US.json
@@ -355,6 +355,8 @@
     "confirm_file_target": "Are you sure to {op} {src} to {target} ?",
     "input_file_name": "input target file name: ",
     "confirm_delete": "Are you sure to delete {src}? This operation cannot be undone!",
+    "confirm_delete_n": "Are you sure to delete {src} items? This operation cannot be undone!",
+    "delete_result": "delete {success} success, {fail} fail",
     "create": "Create",
     "bad_strat_name": "Please use the format \"folder:strategy\", such as Trend:MaCross",
     "only_strat_need": "Please enter the strategy name directly",
diff --git a/web/ui/messages/zh-CN.json b/web/ui/messages/zh-CN.json
@@ -355,6 +355,8 @@
   "confirm_file_target": "确定要将 {src} {op} 到 {target} 吗？",
   "input_file_name": "请输入目标文件名称",
   "confirm_delete": "确定要删除 {src} 吗？此操作不可恢复！",
+  "confirm_delete_n": "确定要删除 {src} 个条目吗? 此操作不可恢复！",
+  "delete_result": "已成功删除 {success} 个, 失败{fail} 个",
   "create": "创建",
   "bad_strat_name": "请使用\"目录:策略名\"的格式，例如 Trend:MaCross",
   "only_strat_need": "请直接输入策略名",
diff --git a/web/ui/src/lib/common.ts b/web/ui/src/lib/common.ts
@@ -10,4 +10,9 @@ export function getFirstValid(vals: any[]){
     }
   }
   return 0
+}
+
+export interface StrVal{
+  str: string
+  val: any
 }
diff --git a/web/ui/src/routes/(dev)/backtest/+page.svelte b/web/ui/src/routes/(dev)/backtest/+page.svelte
@@ -11,9 +11,11 @@
   import {site} from "$lib/stores/site";
   import Icon from "$lib/Icon.svelte";
   import {localizeHref} from "$lib/paraglide/runtime";
+  import {modals} from "$lib/stores/modals";
+  import type {StrVal} from "$lib/common";
 
   let tasks = $state<BtTask[]>([]);
-  let strats = $state<string[]>([]);
+  let strats = $state<StrVal[]>([]);
   let periods = $state<string[]>([]);
   let ranges = $state<{label: string, value: number}[]>([]);
   let hoveredCard = $state<number|null>(null);
@@ -110,12 +112,12 @@
     }
   }
 
-  function showStrats(strats: string) {
-    if(strats.includes(',')) {
-      const parts = strats.split(',');
+  function showStrats(name: string) {
+    if(name.includes(',')) {
+      const parts = name.split(',');
       return parts[0] + ' & ' + (parts.length - 1) + ' More';
     }
-    return strats;
+    return name;
   }
 
   function taskTooltip(task: BtTask){
@@ -179,6 +181,30 @@ Error: ${task.info}`
     }
   }
 
+  async function delActiveReports(){
+    const delNum = selectedTasks.length;
+    if (delNum == 0){
+      return
+    }
+    const ok = await modals.confirm(m.confirm_delete_n({src: delNum}));
+    if (!ok) return;
+    const ids = selectedTasks.map(t => t.id);
+    const rsp = await postApi("/dev/del_bt_reports", {ids});
+    if (rsp.code != 200) {
+      alerts.error(rsp.msg || 'Failed to delete reports');
+      return;
+    }
+    if (rsp.fail){
+      alerts.warning(m.delete_result(rsp as any))
+    }else{
+      alerts.success(m.delete_result(rsp as any))
+    }
+    if(rsp.success){
+      selectedTasks = [];
+      await fetchTasks();
+    }
+  }
+
   function isTaskSelected(task: BtTask) {
     return selectedTasks.some(t => t.id === task.id);
   }
@@ -239,8 +265,8 @@ Error: ${task.info}`
     <div class="flex gap-4">
       <select class="select" bind:value={selectedStrat}>
         <option value="">{m.all_strats()}</option>
-        {#each strats as strat}
-          <option value={strat}>{strat}</option>
+        {#each strats as item}
+          <option value={item.str}>{item.str}({item.val})</option>
         {/each}
       </select>
 
@@ -272,8 +298,11 @@ Error: ${task.info}`
       </button>
       {#if !isMultiSelect}
         <a class="btn btn-primary" href={localizeHref("/backtest/new")}>{m.run_backtest()}</a>
-      {:else if compareUrl}
-        <a class="btn btn-primary" href={compareUrl} target="_blank">{m.compare_assets()}</a>
+      {:else}
+        {#if compareUrl}
+          <a class="btn btn-primary" href={compareUrl} target="_blank">{m.compare_assets()}</a>
+        {/if}
+        <a class="btn btn-error" onclick={delActiveReports}>{m.delete_()}</a>
       {/if}
     </div>
   </div>

Original file line number	Diff line number	Diff line change
`@@ -27,19 +27,19 @@ type PerfSta struct {`
`27`	`27`	Delta float64 `yaml:"delta" mapstructure:"delta"` // Multiplier before logarithmizing TotProfit 对TotProfit进行对数处理前的乘数
`28`	`28`	`}`
`29`	`29`
`30`		`-type StrVal struct {`
`31`		`- Str string`
`32`		`- Val float64`
	`30`	`+type StrAny struct {`
	`31`	+ Str string `json:"str"`
	`32`	+ Val any `json:"val"`
`33`	`33`	`}`
`34`	`34`
`35`		`-type StrAny struct {`
`36`		`- Str string`
`37`		`- Any any`
	`35`	`+type StrVal[T comparable] struct {`
	`36`	+ Str string `json:"str"`
	`37`	+ Val T `json:"val"`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`type StrInt64 struct {`
`41`		`- Str string`
`42`		`- Int int64`
	`41`	+ Str string `json:"str"`
	`42`	+ Int int64 `json:"int"`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`type Param struct {`