Skip to content

Commit b3d6357

Browse files
feat: model configuration and embedding configuration optimization. (#2414)
Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
1 parent 7335e0a commit b3d6357

File tree

19 files changed

+309
-112
lines changed

19 files changed

+309
-112
lines changed

backend/api/handler/coze/config_service.go

Lines changed: 16 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/api/model/admin/config/config.go

Lines changed: 102 additions & 50 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/api/model/conversation/conversation/conversation.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/api/model/conversation/conversation/conversation_service.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/bizpkg/config/knowledge/knowledge.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,8 @@ func getKnowledgeConfigurationFromOldConfig() *config.KnowledgeConfig {
8282
APIType: envkey.GetStringD("ARK_EMBEDDING_API_TYPE", "text_api"),
8383
},
8484
Openai: &config.OpenAIConnInfo{
85-
ByAzure: envkey.GetBoolD("OPENAI_EMBEDDING_BY_AZURE", false),
86-
APIVersion: envkey.GetString("OPENAI_EMBEDDING_API_VERSION"),
87-
RequestDims: envkey.GetI32D("OPENAI_EMBEDDING_REQUEST_DIMS", 1024),
85+
ByAzure: envkey.GetBoolD("OPENAI_EMBEDDING_BY_AZURE", false),
86+
APIVersion: envkey.GetString("OPENAI_EMBEDDING_API_VERSION"),
8887
},
8988

9089
Gemini: &config.GeminiConnInfo{

backend/bizpkg/llm/modelbuilder/ark.go

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ type arkModelBuilder struct {
3333
cfg *config.Model
3434
}
3535

36-
func newArkModelBuilder(cfg *config.Model) *arkModelBuilder {
36+
func newArkModelBuilder(cfg *config.Model) Service {
3737
return &arkModelBuilder{
3838
cfg: cfg,
3939
}
@@ -84,6 +84,21 @@ func (b *arkModelBuilder) Build(ctx context.Context, params *LLMParams) (ToolCal
8484
chatModelConf.BaseURL = base.BaseURL
8585
}
8686

87+
switch base.ThinkingType {
88+
case config.ThinkingType_Enable:
89+
chatModelConf.Thinking = &model.Thinking{
90+
Type: model.ThinkingTypeEnabled,
91+
}
92+
case config.ThinkingType_Disable:
93+
chatModelConf.Thinking = &model.Thinking{
94+
Type: model.ThinkingTypeDisabled,
95+
}
96+
case config.ThinkingType_Auto:
97+
chatModelConf.Thinking = &model.Thinking{
98+
Type: model.ThinkingTypeAuto,
99+
}
100+
}
101+
87102
arkConn := b.cfg.Connection.Ark
88103
if arkConn != nil {
89104
chatModelConf.Region = arkConn.Region

backend/bizpkg/llm/modelbuilder/claude.go

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ type claudeModelBuilder struct {
2828
cfg *config.Model
2929
}
3030

31-
func newClaudeModelBuilder(cfg *config.Model) *claudeModelBuilder {
31+
func newClaudeModelBuilder(cfg *config.Model) Service {
3232
return &claudeModelBuilder{
3333
cfg: cfg,
3434
}
@@ -71,6 +71,17 @@ func (c *claudeModelBuilder) Build(ctx context.Context, params *LLMParams) (Tool
7171
conf.BaseURL = &base.BaseURL
7272
}
7373

74+
switch base.ThinkingType {
75+
case config.ThinkingType_Enable:
76+
conf.Thinking = &claude.Thinking{
77+
Enable: true,
78+
}
79+
case config.ThinkingType_Disable:
80+
conf.Thinking = &claude.Thinking{
81+
Enable: false,
82+
}
83+
}
84+
7485
c.applyParamsToChatModelConfig(conf, params)
7586

7687
return claude.NewChatModel(ctx, conf)

backend/bizpkg/llm/modelbuilder/deepseek.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ type deepseekModelBuilder struct {
2929
cfg *config.Model
3030
}
3131

32-
func newDeepseekModelBuilder(cfg *config.Model) *deepseekModelBuilder {
32+
func newDeepseekModelBuilder(cfg *config.Model) Service {
3333
return &deepseekModelBuilder{
3434
cfg: cfg,
3535
}

0 commit comments

Comments
 (0)