fix policy.ID may confuse if appear in multiple run_policies

anyongjin · anyongjin · commit d046ebb310ff · 2025-04-25T19:23:21.000+08:00
fix api_server.enable
auto redirect to /dash in live mode
diff --git a/biz/biz.go b/biz/biz.go
@@ -193,26 +193,22 @@ Even if the job has no entry tasks, this method should be called to postpone the
 添加批量入场任务。
 即使job没有入场任务，也应该调用此方法，用于推迟入场时间TFEnterMS
 */
-func AddBatchJob(account, tf string, job *strat.StratJob, isInfo bool) {
+func AddBatchJob(account, tf string, job *strat.StratJob, infoEnv *ta.BarEnv) {
 	lockBatch.Lock()
 	defer lockBatch.Unlock()
 	key := fmt.Sprintf("%s_%s_%s", tf, account, job.Strat.Name)
 	tasks, ok := strat.BatchTasks[key]
 	if !ok {
 		tasks = &strat.BatchMap{
-			Map:     make(map[string]*strat.BatchTask),
+			Map:     make(map[string]*strat.JobEnv),
 			TFMSecs: int64(utils2.TFToSecs(tf) * 1000),
 		}
 		strat.BatchTasks[key] = tasks
 	}
 	// Delay 3s to wait for execution
 	// 推迟3s等待执行
 	tasks.ExecMS = btime.TimeMS() + core.DelayBatchMS
-	var batchType = strat.BatchTypeInOut
-	if isInfo {
-		batchType = strat.BatchTypeInfo
-	}
-	tasks.Map[job.Symbol.Symbol] = &strat.BatchTask{Job: job, Type: batchType}
+	tasks.Map[job.Symbol.Symbol] = &strat.JobEnv{Job: job, Env: infoEnv}
 }
 
 func TryFireBatches(currMS int64) int {
@@ -241,38 +237,40 @@ func TryFireBatches(currMS int64) int {
 			}
 			continue
 		}
-		var enterJobs []*strat.StratJob
-		var infoJobs = make(map[string]*strat.StratJob)
+		var mainJobs []*strat.StratJob
+		var infoJobs = make(map[string]*strat.JobEnv)
 		var stgy *strat.TradeStrat
 		for pair, task := range tasks.Map {
 			stgy = task.Job.Strat
-			if task.Type == strat.BatchTypeInOut {
-				enterJobs = append(enterJobs, task.Job)
-			} else if task.Type == strat.BatchTypeInfo {
-				infoJobs[pair] = task.Job
+			if task.Env == nil {
+				mainJobs = append(mainJobs, task.Job)
 			} else {
-				panic(fmt.Sprintf("unsupport BatchType: %v", task.Type))
+				infoJobs[pair] = task
 			}
 		}
-		account := strings.Split(key, "_")[1]
+		arr := strings.Split(key, "_")
+		timeframe, account := arr[0], arr[1]
 		openOds, lock := ormo.GetOpenODs(account)
 		lock.Lock()
 		allOrders := utils.ValsOfMap(openOds)
 		lock.Unlock()
 		delete(strat.BatchTasks, key)
-		if len(enterJobs) > 0 {
+		for _, job := range mainJobs {
+			job.InitBar(allOrders)
+		}
+		if len(infoJobs) > 0 {
+			stgy.OnBatchInfos(timeframe, infoJobs)
+		}
+		if len(mainJobs) > 0 {
 			// Check all batch tasks at this time and decide which ones to enter or exit
 			// 检查此时间所有批量任务，决定哪些入场或那些出场
-			for _, job := range enterJobs {
-				job.InitBar(allOrders)
-			}
-			stgy.OnBatchJobs(enterJobs)
+			stgy.OnBatchJobs(mainJobs)
 			// Perform entry/exit tasks
 			// 执行入场/出场任务
 			odMgr := GetOdMgr(account)
 			var ents []*ormo.InOutOrder
 			var exits []*ormo.InOutOrder
-			for _, job := range enterJobs {
+			for _, job := range mainJobs {
 				if len(job.Entrys) == 0 && len(job.Exits) == 0 {
 					continue
 				}
@@ -290,9 +288,6 @@ func TryFireBatches(currMS int64) int {
 				}
 			}
 		}
-		if len(infoJobs) > 0 {
-			stgy.OnBatchInfos(infoJobs)
-		}
 	}
 	return waitNum
 }
diff --git a/biz/config.yml b/biz/config.yml
@@ -118,7 +118,7 @@ webhook:
   exception:
     content: '{name}: {status}'
 api_server:
-  enabled: false
+  enable: false
   bind_ip: 127.0.0.1
   port: 8001
   jwt_secret_key: '123456789'
diff --git a/biz/trader.go b/biz/trader.go
@@ -128,7 +128,7 @@ func (t *Trader) onAccountKline(account string, env *ta.BarEnv, bar *orm.InfoKli
 		if !barExpired {
 			isBatch = job.Strat.BatchInOut && job.Strat.OnBatchJobs != nil
 			if isBatch {
-				AddBatchJob(account, bar.TimeFrame, job, false)
+				AddBatchJob(account, bar.TimeFrame, job, nil)
 			} else {
 				enters = append(enters, job.Entrys...)
 			}
@@ -151,7 +151,7 @@ func (t *Trader) onAccountKline(account string, env *ta.BarEnv, bar *orm.InfoKli
 		job.IsWarmUp = bar.IsWarmUp
 		job.Strat.OnInfoBar(job, env, bar.Symbol, bar.TimeFrame)
 		if job.Strat.BatchInfo && job.Strat.OnBatchInfos != nil {
-			AddBatchJob(account, bar.TimeFrame, job, true)
+			AddBatchJob(account, bar.TimeFrame, job, env)
 		}
 	}
 	// 处理订单
diff --git a/config/biz.go b/config/biz.go
@@ -756,23 +756,23 @@ func DumpYaml(desensitize bool) ([]byte, *errs.Error) {
 	return data, nil
 }
 
+// ID return name_index
 func (c *RunPolicyConfig) ID() string {
-	if c.Dirt == "" {
-		return c.Name
-	}
+	return fmt.Sprintf("%s_%d", c.Name, c.Index)
+}
+
+func (c *RunPolicyConfig) Key() string {
+	name := c.Name
 	if c.Dirt == "long" {
-		return c.Name + ":l"
+		name += ":l"
 	} else if c.Dirt == "short" {
-		return c.Name + ":s"
+		name += ":s"
 	} else {
 		panic(fmt.Sprintf("unknown run_policy dirt: %v", c.Dirt))
 	}
-}
-
-func (c *RunPolicyConfig) Key() string {
 	tfStr := strings.Join(c.RunTimeframes, "|")
 	pairStr := strings.Join(c.Pairs, "|")
-	return fmt.Sprintf("%s/%s/%s", c.ID(), tfStr, pairStr)
+	return fmt.Sprintf("%s/%s/%s", name, tfStr, pairStr)
 }
 
 func (c *RunPolicyConfig) OdDirt() int {
@@ -889,6 +889,7 @@ func (c *RunPolicyConfig) ToYaml() string {
 
 func (c *RunPolicyConfig) Clone() *RunPolicyConfig {
 	res := &RunPolicyConfig{
+		Index:         c.Index,
 		Name:          c.Name,
 		Filters:       c.Filters,
 		RunTimeframes: c.RunTimeframes,
diff --git a/config/types.go b/config/types.go
@@ -150,6 +150,7 @@ type RunPolicyConfig struct {
 	PairParams    map[string]map[string]float64 `yaml:"pair_params,omitempty" mapstructure:"pair_params"`
 	defs          map[string]*core.Param
 	Score         float64
+	Index         int // index in run_policy array
 }
 
 type StratPerfConfig struct {
diff --git a/core/data.go b/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.3"
-	UIVersion = "v0.2.12"
+	Version   = "v0.2.14-beta.4"
+	UIVersion = "v0.2.14-beta.4"
 	SysLang   string // language code for current system 当前系统语言设置
 	LogFile   string
 	DevDbPath string
diff --git a/doc/config.yml b/doc/config.yml
@@ -172,7 +172,7 @@ webhook:  # 发送消息的配置
   exception:
     content: '{name}: {status}'
 api_server:  # 供外部通过api控制机器人
-  enabled: true
+  enable: true
   bind_ip: 127.0.0.1
   port: 8001
   jwt_secret_key: nj234hujivhguih2rj3y4234nkjoghfy9088weurt
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.23.0
 
 require (
 	github.com/anyongjin/go-bayesopt v1.0.2
-	github.com/banbox/banexg v0.2.23
+	github.com/banbox/banexg v0.2.25
 	github.com/banbox/banta v0.2.0
 	github.com/c-bata/goptuna v0.9.0
 	github.com/dgraph-io/ristretto v0.2.0
diff --git a/go.sum b/go.sum
@@ -3,8 +3,9 @@ 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.23 h1:7ao69yvBYOD3pOoqeFTm9uOnNpbfqF0SC6gtq6XReKc=
-github.com/banbox/banexg v0.2.23/go.mod h1:OW31oCQoMsPjetaPgtTgHZvBzn34t2CzYYA4iW3TWIs=
+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/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=
 github.com/beevik/ntp v1.4.3 h1:PlbTvE5NNy4QHmA4Mg57n7mcFTmr1W1j3gcK7L1lqho=
diff --git a/opt/common.go b/opt/common.go
@@ -113,11 +113,12 @@ func (o *OptInfo) runGetBtResult(pol *config.RunPolicyConfig) {
 	o.BTResult = bt.BTResult
 }
 
-func (o *OptInfo) ToPol(name, dirt, tfStr, pairStr string) *config.RunPolicyConfig {
+func (o *OptInfo) ToPol(idx int, name, dirt, tfStr, pairStr string) *config.RunPolicyConfig {
 	if o.Dirt == "" {
 		o.Dirt = dirt
 	}
 	res := &config.RunPolicyConfig{
+		Index:  idx,
 		Name:   name,
 		Dirt:   o.Dirt,
 		Params: o.Params,
diff --git a/opt/hyper_opt.go b/opt/hyper_opt.go
@@ -858,24 +858,24 @@ func collectOptLog(paths []string, minScore float64, picker, pairSel string) (st
 						inUnion = false
 						if needRun {
 							config.RunPolicy = []*config.RunPolicyConfig{
-								long.ToPol(name, dirt, tfStr, pair),
-								short.ToPol(name, dirt, tfStr, pair),
+								long.ToPol(0, name, dirt, tfStr, pair),
+								short.ToPol(1, name, dirt, tfStr, pair),
 							}
 						}
 					} else if dirt == "long" {
 						if long == nil {
 							long = best
 							if needRun {
 								config.RunPolicy = []*config.RunPolicyConfig{
-									long.ToPol(name, dirt, tfStr, pair),
+									long.ToPol(0, name, dirt, tfStr, pair),
 								}
 							}
 						} else {
 							shortMain = best
 							if needRun {
 								config.RunPolicy = []*config.RunPolicyConfig{
-									short.ToPol(name, dirt, tfStr, pair),
-									shortMain.ToPol(name, dirt, tfStr, pair),
+									short.ToPol(0, name, dirt, tfStr, pair),
+									shortMain.ToPol(1, name, dirt, tfStr, pair),
 								}
 							}
 						}
@@ -884,20 +884,20 @@ func collectOptLog(paths []string, minScore float64, picker, pairSel string) (st
 							short = best
 							if needRun {
 								config.RunPolicy = []*config.RunPolicyConfig{
-									short.ToPol(name, dirt, tfStr, pair)}
+									short.ToPol(0, name, dirt, tfStr, pair)}
 							}
 						} else {
 							longMain = best
 							if needRun {
 								config.RunPolicy = []*config.RunPolicyConfig{
-									long.ToPol(name, dirt, tfStr, pair),
-									longMain.ToPol(name, dirt, tfStr, pair)}
+									long.ToPol(0, name, dirt, tfStr, pair),
+									longMain.ToPol(1, name, dirt, tfStr, pair)}
 							}
 						}
 					} else {
 						both = best
 						if needRun {
-							config.RunPolicy = []*config.RunPolicyConfig{both.ToPol(name, dirt, tfStr, pair)}
+							config.RunPolicy = []*config.RunPolicyConfig{both.ToPol(0, name, dirt, tfStr, pair)}
 						}
 					}
 					var dumpPath string
diff --git a/strat/common.go b/strat/common.go
@@ -566,9 +566,9 @@ func (w Warms) Update(pair, tf string, num int) {
 /*
 JobForbidType 0 allow; 1 forbid; 2 forbid & occupy a slot
 */
-func JobForbidType(pair, tf, stratName string) int {
+func JobForbidType(pair, tf, stratID string) int {
 	if jobs, ok := ForbidJobs[fmt.Sprintf("%s_%s", pair, tf)]; ok {
-		hold, ok2 := jobs[stratName]
+		hold, ok2 := jobs[stratID]
 		if ok2 {
 			if hold {
 				return 2
diff --git a/strat/main.go b/strat/main.go
@@ -321,18 +321,18 @@ func initBarEnv(exs *orm.ExSymbol, tf string) *ta.BarEnv {
 	return env
 }
 
-func markStratJob(tf, stgName string, exs *orm.ExSymbol, dirt int, accLimits accStratLimits) *errs.Error {
+func markStratJob(tf, polID string, exs *orm.ExSymbol, dirt int, accLimits accStratLimits) *errs.Error {
 	envKey := strings.Join([]string{exs.Symbol, tf}, "_")
 	for acc, jobs := range AccJobs {
 		envJobs, ok := jobs[envKey]
 		if !ok {
 			return errs.NewMsg(errs.CodeRunTime, "`envKey` for StratJob not found: %s", envKey)
 		}
-		job, ok := envJobs[stgName]
+		job, ok := envJobs[polID]
 		if !ok {
-			return errs.NewMsg(errs.CodeRunTime, "`name` for StratJob not found: %s %s", stgName, envKey)
+			return errs.NewMsg(errs.CodeRunTime, "`name` for StratJob not found: %s %s", polID, envKey)
 		}
-		if accLimits.tryAdd(acc, stgName) {
+		if accLimits.tryAdd(acc, polID) {
 			job.MaxOpenShort = job.Strat.EachMaxShort
 			job.MaxOpenLong = job.Strat.EachMaxLong
 			if dirt == core.OdDirtShort {
diff --git a/strat/types.go b/strat/types.go
@@ -40,7 +40,7 @@ type TradeStrat struct {
 	OnInfoBar           func(s *StratJob, e *ta.BarEnv, pair, tf string)    // Other dependent bar data 其他依赖的bar数据
 	OnTrades            func(s *StratJob, trades []*banexg.Trade)           // Transaction by transaction data 逐笔交易数据
 	OnBatchJobs         func(jobs []*StratJob)                              // All target jobs at the current time, used for bulk opening/closing of orders 当前时间所有标的job，用于批量开单/平仓
-	OnBatchInfos        func(jobs map[string]*StratJob)                     // All info marked jobs at the current time, used for batch processing 当前时间所有info标的job，用于批量处理
+	OnBatchInfos        func(tf string, jobs map[string]*JobEnv)            // All info marked jobs at the current time, used for batch processing 当前时间所有info标的job，用于批量处理
 	OnCheckExit         func(s *StratJob, od *ormo.InOutOrder) *ExitReq     // Custom order exit logic 自定义订单退出逻辑
 	OnOrderChange       func(s *StratJob, od *ormo.InOutOrder, chgType int) // Order update callback 订单更新回调
 	GetDrawDownExitRate CalcDDExitRate                                      // Calculate the ratio of tracking profit taking, drawdown, and exit 计算跟踪止盈回撤退出的比率
@@ -56,14 +56,9 @@ const (
 	OdChgExitFill         // Order exit completed 订单退出完成
 )
 
-const (
-	BatchTypeInOut = iota
-	BatchTypeInfo
-)
-
-type BatchTask struct {
-	Job  *StratJob
-	Type int
+type JobEnv struct {
+	Job *StratJob
+	Env *ta.BarEnv
 }
 
 /*
@@ -72,7 +67,7 @@ Batch execution task pool for all targets in the current exchange market time cy
 当前交易所-市场-时间周期下，所有标的的批量执行任务池
 */
 type BatchMap struct {
-	Map     map[string]*BatchTask
+	Map     map[string]*JobEnv
 	TFMSecs int64
 	ExecMS  int64 // The timestamp for executing batch tasks is delayed by a few seconds upon receiving a new target; Delay exceeded and BatchMS did not receive, start execution 执行批量任务的时间戳，每收到新的标的，推迟几秒；超过DelayBatchMS未收到，开始执行
 }
diff --git a/web/ui/src/lib/dash/AddBot.svelte b/web/ui/src/lib/dash/AddBot.svelte
@@ -28,7 +28,7 @@
 
   function validateUrl(value: string): string | null {
     if (!value) return m.this_is_required();
-    if (!/^(https?:\/\/)?\S+/.test(value)) return m.not_url();
+    if (!/^(https?:\/\/)\S+/.test(value)) return m.not_url();
     return null;
   }
 
diff --git a/web/ui/src/lib/dev/AllConfig.svelte b/web/ui/src/lib/dev/AllConfig.svelte
@@ -177,7 +177,7 @@ webhook:  # ${m.cfg_webhook()}
   exception:
     content: '{name}: {status}'
 api_server:  # ${m.cfg_api_server()}
-  enabled: true
+  enable: true
   bind_ip: 127.0.0.1  # ${m.cfg_api_bind_ip()}
   port: 8001
   jwt_secret_key: fn234njkcu89234nbf
diff --git a/web/ui/src/routes/(dev)/+page.svelte b/web/ui/src/routes/(dev)/+page.svelte
@@ -1,9 +1,19 @@
 <script lang="ts">
   import * as m from '$lib/paraglide/messages.js'
   import Icon from '$lib/Icon.svelte'
-  import {getLocale} from "$lib/paraglide/runtime";
+  import {getLocale, localizeHref} from "$lib/paraglide/runtime";
+  import {onMount} from "svelte";
+  import {getApi} from "$lib/netio";
+  import {redirect} from "@sveltejs/kit";
 
   let showQRCode = $state(false)
+
+  onMount(() => {
+    // /ping可访问表示处于实时模式，跳转到DashBoard
+    getApi('/ping').then(rsp => {
+      redirect(302, localizeHref('/dash'))
+    })
+  })
 </script>
 
 <main class="flex-1 flex items-center justify-center">

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ func (t Trader) onAccountKline(account string, env ta.BarEnv, bar *orm.InfoKli`
`128`	`128`	`if !barExpired {`
`129`	`129`	`isBatch = job.Strat.BatchInOut && job.Strat.OnBatchJobs != nil`
`130`	`130`	`if isBatch {`
`131`		`- AddBatchJob(account, bar.TimeFrame, job, false)`
	`131`	`+ AddBatchJob(account, bar.TimeFrame, job, nil)`
`132`	`132`	`} else {`
`133`	`133`	`enters = append(enters, job.Entrys...)`
`134`	`134`	`}`
`@@ -151,7 +151,7 @@ func (t Trader) onAccountKline(account string, env ta.BarEnv, bar *orm.InfoKli`
`151`	`151`	`job.IsWarmUp = bar.IsWarmUp`
`152`	`152`	`job.Strat.OnInfoBar(job, env, bar.Symbol, bar.TimeFrame)`
`153`	`153`	`if job.Strat.BatchInfo && job.Strat.OnBatchInfos != nil {`
`154`		`- AddBatchJob(account, bar.TimeFrame, job, true)`
	`154`	`+ AddBatchJob(account, bar.TimeFrame, job, env)`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`	`// 处理订单`
Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,7 @@ type RunPolicyConfig struct {`
`150`	`150`	PairParams map[string]map[string]float64 `yaml:"pair_params,omitempty" mapstructure:"pair_params"`
`151`	`151`	`defs map[string]*core.Param`
`152`	`152`	`Score float64`
	`153`	`+ Index int // index in run_policy array`
`153`	`154`	`}`
`154`	`155`
`155`	`156`	`type StratPerfConfig struct {`
Original file line number	Diff line number	Diff line change
`@@ -113,11 +113,12 @@ func (o OptInfo) runGetBtResult(pol config.RunPolicyConfig) {`
`113`	`113`	`o.BTResult = bt.BTResult`
`114`	`114`	`}`
`115`	`115`
`116`		`-func (o OptInfo) ToPol(name, dirt, tfStr, pairStr string) config.RunPolicyConfig {`
	`116`	`+func (o OptInfo) ToPol(idx int, name, dirt, tfStr, pairStr string) config.RunPolicyConfig {`
`117`	`117`	`if o.Dirt == "" {`
`118`	`118`	`o.Dirt = dirt`
`119`	`119`	`}`
`120`	`120`	`res := &config.RunPolicyConfig{`
	`121`	`+ Index: idx,`
`121`	`122`	`Name: name,`
`122`	`123`	`Dirt: o.Dirt,`
`123`	`124`	`Params: o.Params,`