Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

章节重排 与 test拆分 #32

Merged
merged 8 commits into from
Nov 26, 2024
+341 −9
Merged

章节重排 与 test拆分 #32

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
855f176
加个AI常量
RoyilEs Nov 21, 2024
3b959b6
console-AiSetting-AiType update ctype.AiType
RoyilEs Nov 21, 2024
ec735d1
Merge branch 'Changbaiqi:main' into main
RoyilEs Nov 22, 2024
f023740
Merge branch 'Changbaiqi:main' into main
RoyilEs Nov 25, 2024
e8d9638
拉取对应课程的章节信息
RoyilEs Nov 25, 2024
a143f72
提取章节主要信息 与 按照任务点节点重排顺序
RoyilEs Nov 26, 2024
a33dd5d
测试拆分
RoyilEs Nov 26, 2024
695d083
Merge branch 'main' into main
Changbaiqi Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
console-AiSetting-AiType update ctype.AiType
@RoyilEs
RoyilEs committed Nov 21, 2024
commit 3b959b6d3b307f341e485b01fa88d0774050ae62
9 changes: 5 additions & 4 deletions yatori-go/yatori-go-console/config/Config.go
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@ import (
"github.com/spf13/viper"
"log"
"os"
"yatori-go-core/models/ctype"
log2 "yatori-go-core/utils/log"
)

@@ -28,10 +29,10 @@ type BasicSetting struct {
IpProxySw int `json:"ipProxySw,omitempty"` //是否开启IP代理，0代表关，1代表开，默认为关
}
type AiSetting struct {
AiType string `json:"aiType"`
AiUrl string `json:"aiUrl"`
Model string `json:"model"`
APIKEY string `json:"API_KEY" yaml:"API_KEY" mapstructure:"API_KEY"`
AiType ctype.AiType `json:"aiType"`
AiUrl string `json:"aiUrl"`
Model string `json:"model"`
APIKEY string `json:"API_KEY" yaml:"API_KEY" mapstructure:"API_KEY"`
}
type Setting struct {
BasicSetting BasicSetting `json:"basicSetting"`
8 changes: 4 additions & 4 deletions yatori-go/yatori-go-console/logic/yinghua/YinghuaPart.go
View file
Original file line number Diff line number Diff line change
@@ -183,7 +183,7 @@ func workAction(setting config.Setting, user *config.Users, userCache *yinghuaAp
return
}
//检测AI可用性
err := utils.AICheck(setting.AiSetting.AiUrl, setting.AiSetting.Model, setting.AiSetting.AiType, setting.AiSetting.APIKEY)
err := utils.AICheck(setting.AiSetting.AiUrl, setting.AiSetting.Model, setting.AiSetting.APIKEY, setting.AiSetting.AiType)
if err != nil {
lg.Print(lg.INFO, lg.BoldRed, "AI不可用，错误信息："+err.Error())
os.Exit(0)
@@ -198,7 +198,7 @@ func workAction(setting config.Setting, user *config.Users, userCache *yinghuaAp
modelLog.ModelPrint(setting.BasicSetting.LogModel == 0, lg.INFO, "[", lg.Green, userCache.Account, lg.Default, "] ", "<"+setting.AiSetting.AiType+">", lg.Default, " 【"+node.Name+"】 ", lg.Yellow, "正在AI自动写章节作业...")
//开始写作业
for _, work := range detailAction {
err := yinghua.StartWorkAction(userCache, work, setting.AiSetting.AiUrl, setting.AiSetting.Model, setting.AiSetting.AiType, setting.AiSetting.APIKEY)
err := yinghua.StartWorkAction(userCache, work, setting.AiSetting.AiUrl, setting.AiSetting.Model, setting.AiSetting.APIKEY, setting.AiSetting.AiType)
if err != nil {
lg.Print(lg.INFO, "[", lg.Green, userCache.Account, lg.Default, "] ", "<"+setting.AiSetting.AiType+">", " 【", node.Name, "】 ", lg.BoldRed, "该章节作业无法正常执行，服务器返回信息：", err.Error())
continue
@@ -223,7 +223,7 @@ func examAction(setting config.Setting, user *config.Users, userCache *yinghuaAp
return
}
//检测AI可用性
err := utils.AICheck(setting.AiSetting.AiUrl, setting.AiSetting.Model, setting.AiSetting.AiType, setting.AiSetting.APIKEY)
err := utils.AICheck(setting.AiSetting.AiUrl, setting.AiSetting.Model, setting.AiSetting.APIKEY, setting.AiSetting.AiType)
if err != nil {
lg.Print(lg.INFO, lg.BoldRed, "<"+setting.AiSetting.AiType+">", "AI不可用，错误信息："+err.Error())
os.Exit(0)
@@ -238,7 +238,7 @@ func examAction(setting config.Setting, user *config.Users, userCache *yinghuaAp
//开始考试
modelLog.ModelPrint(setting.BasicSetting.LogModel == 0, lg.INFO, "[", lg.Green, userCache.Account, lg.Default, "] ", "<"+setting.AiSetting.AiType+">", lg.Default, " 【"+node.Name+"】 ", lg.Yellow, "正在AI自动考试...")
for _, exam := range detailAction {
err := yinghua.StartExamAction(userCache, exam, setting.AiSetting.AiUrl, setting.AiSetting.Model, setting.AiSetting.AiType, setting.AiSetting.APIKEY)
err := yinghua.StartExamAction(userCache, exam, setting.AiSetting.AiUrl, setting.AiSetting.Model, setting.AiSetting.APIKEY, setting.AiSetting.AiType)
if err != nil {
lg.Print(lg.INFO, "[", lg.Green, userCache.Account, lg.Default, "] ", "<"+setting.AiSetting.AiType+">", " 【", node.Name, "】 ", lg.BoldRed, "该考试无法正常执行，服务器返回信息：", err.Error())
continue