fix RunPolicy Index not update

Author: anyongjin

config/biz.go

@@ -390,7 +390,7 @@ func ApplyConfig(args *CmdArgs, c *Config) *errs.Error {
 }
 
 func ApplyPairPolicy(pairs []string, policies []*RunPolicyConfig) {
-	staticPairs, fixPairs := initPolicies(policies)
+	staticPairs, fixPairs := SetRunPolicy(true, policies...)
 	if len(pairs) > 0 {
 		staticPairs = true
 		fixPairs = append(fixPairs, pairs...)
@@ -401,13 +401,17 @@ func ApplyPairPolicy(pairs []string, policies []*RunPolicyConfig) {
 	Pairs, _ = utils2.UniqueItems(pairs)
 }
 
-func initPolicies(policyList []*RunPolicyConfig) (bool, []string) {
-	if policyList == nil {
-		policyList = make([]*RunPolicyConfig, 0)
+// SetRunPolicy set run_policy and their indexs
+func SetRunPolicy(index bool, items ...*RunPolicyConfig) (bool, []string) {
+	if items == nil {
+		items = make([]*RunPolicyConfig, 0)
 	}
 	var polPairs []string
 	staticPairs := true
-	for _, pol := range policyList {
+	for i, pol := range items {
+		if index {
+			pol.Index = i
+		}
 		if pol.Params == nil {
 			pol.Params = make(map[string]float64)
 		}
@@ -421,7 +425,7 @@ func initPolicies(policyList []*RunPolicyConfig) (bool, []string) {
 			staticPairs = false
 		}
 	}
-	RunPolicy = policyList
+	RunPolicy = items
 	return staticPairs, polPairs
 }
 

core/data.go

@@ -43,8 +43,8 @@ var (
 	MemProfile bool
 
 	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.14-beta.4"
-	UIVersion = "v0.2.14-beta.4"
+	Version   = "v0.2.14-beta.5"
+	UIVersion = "v0.2.14-beta.5"
 	SysLang   string // language code for current system 当前系统语言设置
 	LogFile   string
 	DevDbPath string

entry/entry.go

@@ -40,7 +40,7 @@ func RunBackTest(args *config.CmdArgs) *errs.Error {
 		policyList := config.RunPolicy
 		for i, item := range policyList {
 			log.Info("start backtest", zap.Int("id", i+1), zap.String("name", item.Name))
-			config.RunPolicy = []*config.RunPolicyConfig{item}
+			config.SetRunPolicy(true, item)
 			outDir := runBackTest(fmt.Sprintf("%s%d", args.OutPath, i+1), "")
 			err_ := utils.CopyDir(outDir, fmt.Sprintf("%s_%d", outDir, i+1))
 			if err_ != nil {

go.sum

@@ -3,8 +3,7 @@ github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7X
 github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA=
 github.com/anyongjin/go-bayesopt v1.0.2 h1:845NHAdxk4x1FxeOS5McoaWO33ZfE2AR434j9lnEHAM=
 github.com/anyongjin/go-bayesopt v1.0.2/go.mod h1:KB64n3O9sPBql6pPnOKh0w8bnOSG1TIMNb+9c/9iQs0=
-github.com/banbox/banexg v0.2.24 h1:/JvL1p9iv4WLzacetDiFMW0yLrup8LL60fDN94dKngI=
-github.com/banbox/banexg v0.2.24/go.mod h1:OW31oCQoMsPjetaPgtTgHZvBzn34t2CzYYA4iW3TWIs=
+github.com/banbox/banexg v0.2.25 h1:X5FTrqXh2iOlKPkXFMGLIiSfpqV1ybokdj8OiinRdKs=
 github.com/banbox/banexg v0.2.25/go.mod h1:OW31oCQoMsPjetaPgtTgHZvBzn34t2CzYYA4iW3TWIs=
 github.com/banbox/banta v0.2.0 h1:fXdPHrPBDi3PQTV14pm84yBKIH2teB/3LQ9BUpTmIhI=
 github.com/banbox/banta v0.2.0/go.mod h1:+9PG7f4QZtfpJfKpGp7aToOUg2ByatDosHjjvGFjaVc=

opt/backtest.go

@@ -480,7 +480,7 @@ func relayUnFinishOrders(pairTfScores map[string]map[string]float64, forbidJobs
 		lite := NewBackTestLite(true, nil, nil, nil)
 		// set policy to run
 		// 重新加载策略任务
-		config.RunPolicy = gp.Policies
+		config.SetRunPolicy(false, gp.Policies...)
 		warms, _, err := strat.LoadStratJobs(core.Pairs, pairTfScores)
 		if err != nil {
 			return err

opt/hyper_opt.go

@@ -140,7 +140,7 @@ func RunRollBTPicker(args *config.CmdArgs) *errs.Error {
 				t.curMs += t.runMSecs
 				continue
 			}
-			config.RunPolicy = polList
+			config.SetRunPolicy(true, polList...)
 			core.BotRunning = true
 			t.dateRange.StartMS = t.curMs
 			t.dateRange.EndMS = t.curMs + t.runMSecs
@@ -225,7 +225,7 @@ Update strategy group parameters using EMA to avoid significant differences in p
 */
 func applyOptPolicies(olds, pols []*config.RunPolicyConfig, alpha float64) {
 	if alpha >= 1 {
-		config.RunPolicy = pols
+		config.SetRunPolicy(true, pols...)
 		return
 	}
 	var data = make(map[string]*config.RunPolicyConfig)
@@ -250,7 +250,7 @@ func applyOptPolicies(olds, pols []*config.RunPolicyConfig, alpha float64) {
 			res = append(res, item)
 		}
 	}
-	config.RunPolicy = res
+	config.SetRunPolicy(true, res...)
 }
 
 func RunOptimize(args *config.CmdArgs) *errs.Error {
@@ -494,7 +494,7 @@ func optForGroup(pol *config.RunPolicyConfig, method, picker string, rounds int,
 	if minScore > 0 && maxScore > 0 {
 		// 检查组合的是否优于long/short/both
 		flog.WriteString("\n========== union long/short ============\n")
-		config.RunPolicy = []*config.RunPolicyConfig{long, short}
+		config.SetRunPolicy(true, long, short)
 		bt, loss := runBTOnce()
 		line := fmt.Sprintf("loss: %5.2f \t%v\n", loss, bt.BriefLine())
 		flog.WriteString(line)
@@ -511,7 +511,7 @@ func optForGroup(pol *config.RunPolicyConfig, method, picker string, rounds int,
 	if minScore < 0 || maxScore > minScore*5 {
 		// The long and short returns are seriously unbalanced, the parameters with high fixed returns remain unchanged, and the parameters with low returns are fine-tuned to find the best score of the combination
 		// 多空收益严重不均衡，固定收益高的参数不变，微调收益低的参数，寻找组合最佳分数
-		config.RunPolicy = []*config.RunPolicyConfig{long, short}
+		config.SetRunPolicy(true, long, short)
 		var unionScore float64
 		if long.Score > short.Score {
 			optForPol(short, method, picker, rounds, flog)

web/ui/src/lib/order/OrderDetail.svelte

@@ -103,7 +103,7 @@
     {#if order.info}
       <div class="border rounded-lg p-5">
         <h3 class="text-lg font-bold mb-4">{m.additional_info()}</h3>
-        <pre class="whitespace-pre-wrap bg-base-200 p-4 rounded-lg text-sm">{JSON.stringify(order.info, null, 2)}</pre>
+        <pre class="whitespace-pre-wrap break-all bg-base-200 p-4 rounded-lg text-sm">{JSON.stringify(order.info, null, 2)}</pre>
       </div>
     {/if}
   </div> 

web/ui/src/routes/(dev)/+layout.svelte

@@ -151,7 +151,7 @@
         </div>
 
         <!-- 日志内容 -->
-        <pre class="flex-1 overflow-auto whitespace-pre-wrap">{logs}</pre>
+        <pre class="flex-1 overflow-auto whitespace-pre-wrap break-all">{logs}</pre>
       </div>
     </div>
   </div>

web/ui/src/routes/(dev)/+page.svelte

@@ -4,14 +4,14 @@
   import {getLocale, localizeHref} from "$lib/paraglide/runtime";
   import {onMount} from "svelte";
   import {getApi} from "$lib/netio";
-  import {redirect} from "@sveltejs/kit";
+  import {goto} from "$app/navigation";
 
   let showQRCode = $state(false)
 
   onMount(() => {
     // /ping可访问表示处于实时模式，跳转到DashBoard
     getApi('/ping').then(rsp => {
-      redirect(302, localizeHref('/dash'))
+      goto(localizeHref('/dash'))
     })
   })
 </script>

web/ui/src/routes/dash/log/+page.svelte

@@ -52,7 +52,7 @@
 
     <div class="bg-base-200/50 rounded-lg p-4">
       <a class="link link-primary link-hover" onclick={() => loadLogs(false)}>{loadingLogs ? m.loading() : m.load_more()}</a>
-      <pre class="whitespace-pre-wrap font-mono text-sm text-base-content/80">{logs}</pre>
+      <pre class="whitespace-pre-wrap break-all font-mono text-sm text-base-content/80">{logs}</pre>
     </div>
   </div>
 </div>