Skip to content

Commit 121d717

Browse files
update command
1 parent 22688a4 commit 121d717

File tree

2 files changed

+18
-17
lines changed

2 files changed

+18
-17
lines changed

conf/conf.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,8 @@ func loadConf() bool {
630630
}
631631
}
632632

633-
if len(m) > 2 {
633+
if !(len(m) == 0 || (len(m) == 1 && (m["bot_name"] != "" || m["http_host"] != "")) ||
634+
(len(m) == 2 && m["bot_name"] != "" && m["http_host"] != "")) {
634635
return false
635636
}
636637

conf/conf_test.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ func TestInitConf_AllEnvVars(t *testing.T) {
3131
os.Setenv("GEMINI_TOKEN", "gemini_test")
3232
os.Setenv("ERNIE_AK", "ernie-ak")
3333
os.Setenv("ERNIE_SK", "ernie-sk")
34-
34+
3535
os.Setenv("VOL_AUDIO_APP_ID", "test-audio-app-id")
3636
os.Setenv("VOL_AUDIO_TOKEN", "test-audio-token")
3737
os.Setenv("VOL_AUDIO_REC_CLUSTER", "test-cluster")
38-
38+
3939
os.Setenv("TELEGRAM_BOT_TOKEN", "test_bot_token")
4040
os.Setenv("DEEPSEEK_TOKEN", "test_deepseek_token")
4141
os.Setenv("FREQUENCY_PENALTY", "0.5")
@@ -46,7 +46,7 @@ func TestInitConf_AllEnvVars(t *testing.T) {
4646
os.Setenv("STOP", "stop-sequence")
4747
os.Setenv("LOG_PROBS", "true")
4848
os.Setenv("TOP_LOG_PROBS", "5")
49-
49+
5050
os.Setenv("TELEGRAM_BOT_TOKEN", "test_bot_token")
5151
os.Setenv("DEEPSEEK_TOKEN", "test_deepseek_token")
5252
os.Setenv("REQ_KEY", "test-req-key")
@@ -65,7 +65,7 @@ func TestInitConf_AllEnvVars(t *testing.T) {
6565
os.Setenv("PHOTO_LANGUAGE", "1")
6666
os.Setenv("OPACITY", "0.75")
6767
os.Setenv("LOGO_TEXT_CONTENT", "Test Logo")
68-
68+
6969
os.Setenv("TELEGRAM_BOT_TOKEN", "test_bot_token")
7070
os.Setenv("DEEPSEEK_TOKEN", "test_deepseek_token")
7171
os.Setenv("EMBEDDING_TYPE", "openai")
@@ -75,9 +75,9 @@ func TestInitConf_AllEnvVars(t *testing.T) {
7575
os.Setenv("SPACE", "test-space")
7676
os.Setenv("CHUNK_SIZE", "500")
7777
os.Setenv("CHUNK_OVERLAP", "50")
78-
78+
7979
os.Setenv("MCP_CONF_PATH", "./conf/mcp/mcp.json")
80-
80+
8181
os.Setenv("TELEGRAM_BOT_TOKEN", "test_bot_token")
8282
os.Setenv("DEEPSEEK_TOKEN", "test_deepseek_token")
8383
os.Setenv("VOL_VIDEO_MODEL", "model-v1")
@@ -86,10 +86,10 @@ func TestInitConf_AllEnvVars(t *testing.T) {
8686
os.Setenv("FPS", "30")
8787
os.Setenv("RESOLUTION", "1920x1080")
8888
os.Setenv("WATERMARK", "true")
89-
89+
9090
// 调用初始化函数
9191
InitConf()
92-
92+
9393
// 断言检查
9494
assertEqual(t, *BaseConfInfo.TelegramBotToken, "test_bot_token", "BotToken")
9595
assertEqual(t, *BaseConfInfo.DeepseekToken, "test_deepseek_token", "DeepseekToken")
@@ -110,19 +110,19 @@ func TestInitConf_AllEnvVars(t *testing.T) {
110110
assertEqual(t, *BaseConfInfo.GeminiToken, "gemini_test", "GeminiToken")
111111
assertEqual(t, *BaseConfInfo.ErnieAK, "ernie-ak", "ErnieAK")
112112
assertEqual(t, *BaseConfInfo.ErnieSK, "ernie-sk", "ErnieSK")
113-
113+
114114
assertEqual(t, *AudioConfInfo.VolAudioAppID, "test-audio-app-id", "AudioAppID")
115115
assertEqual(t, *AudioConfInfo.VolAudioToken, "test-audio-token", "AudioToken")
116116
assertEqual(t, *AudioConfInfo.VolAudioRecCluster, "test-cluster", "AudioCluster")
117-
117+
118118
assertFloatEqual(t, *LLMConfInfo.FrequencyPenalty, 0.5, "FrequencyPenalty")
119119
assertInt(t, *LLMConfInfo.MaxTokens, 2048, "MaxTokens")
120120
assertFloatEqual(t, *LLMConfInfo.PresencePenalty, 1.0, "PresencePenalty")
121121
assertFloatEqual(t, *LLMConfInfo.Temperature, 0.9, "Temperature")
122122
assertFloatEqual(t, *LLMConfInfo.TopP, 0.8, "TopP")
123123
assertBool(t, *LLMConfInfo.LogProbs, true, "LogProbs")
124124
assertInt(t, *LLMConfInfo.TopLogProbs, 5, "TopLogProbs")
125-
125+
126126
assertEqual(t, *PhotoConfInfo.ReqKey, "test-req-key", "ReqKey")
127127
assertEqual(t, *PhotoConfInfo.ModelVersion, "v2.1", "ModelVersion")
128128
assertEqual(t, *PhotoConfInfo.ReqScheduleConf, "scheduleA", "ReqScheduleConf")
@@ -139,24 +139,24 @@ func TestInitConf_AllEnvVars(t *testing.T) {
139139
assertInt(t, *PhotoConfInfo.Language, 1, "Language")
140140
assertFloatEqual(t, *PhotoConfInfo.Opacity, 0.75, "Opacity")
141141
assertEqual(t, *PhotoConfInfo.LogoTextContent, "Test Logo", "LogoTextContent")
142-
142+
143143
assertEqual(t, *RagConfInfo.EmbeddingType, "openai", "EmbeddingType")
144144
assertEqual(t, *RagConfInfo.KnowledgePath, "/data/knowledge", "KnowledgePath")
145145
assertEqual(t, *RagConfInfo.VectorDBType, "milvus", "VectorDBType")
146146
assertEqual(t, *RagConfInfo.ChromaURL, "http://localhost:8000", "ChromaURL")
147147
assertEqual(t, *RagConfInfo.Space, "test-space", "ChromaSpace")
148148
assertInt(t, *RagConfInfo.ChunkSize, 500, "ChunkSize")
149149
assertInt(t, *RagConfInfo.ChunkOverlap, 50, "ChunkOverlap")
150-
151-
assertEqual(t, *McpConfPath, "./conf/mcp/mcp.json", "MCP_CONF_PATH")
152-
150+
151+
assertEqual(t, *ToolsConfInfo.McpConfPath, "./conf/mcp/mcp.json", "MCP_CONF_PATH")
152+
153153
assertEqual(t, *VideoConfInfo.VolVideoModel, "model-v1", "VOL_VIDEO_MODEL")
154154
assertEqual(t, *VideoConfInfo.Radio, "radio-123", "RADIO")
155155
assertInt(t, *VideoConfInfo.Duration, 120, "DURATION")
156156
assertInt(t, *VideoConfInfo.FPS, 30, "FPS")
157157
assertEqual(t, *VideoConfInfo.Resolution, "1920x1080", "RESOLUTION")
158158
assertBool(t, *VideoConfInfo.Watermark, true, "WATERMARK")
159-
159+
160160
os.Clearenv()
161161
}
162162

0 commit comments

Comments
 (0)