refactor(api): drop deprecated tenant ConversationConfig field and KV write path
The Tenant.ConversationConfig field was marked deprecated when
CustomAgent (builtin-quick-answer) replaced the per-tenant defaults
path, but the JSONB column, GET/PUT KV handlers, write helpers and
read fall-throughs all stayed wired. This had two concrete failure
modes:
- Input-field.vue silently PUT-ed per-user model picks back into
/tenants/kv/conversation-config, which requires Admin+ — Viewers
and Contributors got a 403 every time they switched chat models.
- The same write also overwrote the tenant-shared default for every
other user, turning a per-user UX into a per-tenant footgun.
Remove the field, the struct, the validate helper, the PUT case and
the two dead Summary helpers in session/helpers.go. KnowledgeSearch
loses its tenant-conversation fallback (one chunk-tool reader); the
global config + hardcoded defaults still cover it. session_agent_qa
already required agents to declare their own rerank_model_id, so no
behaviour change there.
Frontend follows:
- Input-field.vue: per-user 'last selected chat model' moves to
localStorage, no API call.
- AgentEditorModal: defaults for builtin-quick-answer creation now
come from prompt-templates (system/context/rewrite/fallback) and
retrieval-config (top_k / threshold), the two endpoints that
actually own those settings now.
- AgentSettings.vue: orphan settings page with no router/import
referencing it; deleted.
- api/system: getConversationConfig / updateConversationConfig and
the ConversationConfig interface go away.
Net: 137 insertions, 2761 deletions.
This commit is contained in:
@@ -261,104 +261,10 @@ func getFloat64(m map[string]interface{}, key string) float64 {
|
||||
return 0.0
|
||||
}
|
||||
|
||||
// createDefaultSummaryConfig creates a default summary configuration from config
|
||||
// It prioritizes tenant-level ConversationConfig, then falls back to config.yaml defaults
|
||||
func (h *Handler) createDefaultSummaryConfig(ctx context.Context) *types.SummaryConfig {
|
||||
// Try to get tenant from context
|
||||
tenant, _ := types.TenantInfoFromContext(ctx)
|
||||
// createDefaultSummaryConfig and fillSummaryConfigDefaults used to build
|
||||
// per-session SummaryConfig from tenant-level ConversationConfig + config.yaml
|
||||
// defaults. Both helpers became unreachable when the chat pipeline moved to
|
||||
// CustomAgent (builtin-quick-answer / smart-reasoning) and the tenant-level
|
||||
// ConversationConfig field was removed; deleting them avoids the only
|
||||
// remaining references to that defunct path.
|
||||
|
||||
// Initialize with config.yaml defaults
|
||||
cfg := &types.SummaryConfig{
|
||||
MaxTokens: h.config.Conversation.Summary.MaxTokens,
|
||||
TopP: h.config.Conversation.Summary.TopP,
|
||||
TopK: h.config.Conversation.Summary.TopK,
|
||||
FrequencyPenalty: h.config.Conversation.Summary.FrequencyPenalty,
|
||||
PresencePenalty: h.config.Conversation.Summary.PresencePenalty,
|
||||
RepeatPenalty: h.config.Conversation.Summary.RepeatPenalty,
|
||||
Prompt: h.config.Conversation.Summary.Prompt,
|
||||
ContextTemplate: h.config.Conversation.Summary.ContextTemplate,
|
||||
NoMatchPrefix: h.config.Conversation.Summary.NoMatchPrefix,
|
||||
Temperature: h.config.Conversation.Summary.Temperature,
|
||||
Seed: h.config.Conversation.Summary.Seed,
|
||||
MaxCompletionTokens: h.config.Conversation.Summary.MaxCompletionTokens,
|
||||
}
|
||||
|
||||
// Override with tenant-level conversation config if available
|
||||
if tenant != nil && tenant.ConversationConfig != nil {
|
||||
// Use custom prompt if provided
|
||||
if tenant.ConversationConfig.Prompt != "" {
|
||||
cfg.Prompt = tenant.ConversationConfig.Prompt
|
||||
}
|
||||
|
||||
// Use custom context template if provided
|
||||
if tenant.ConversationConfig.ContextTemplate != "" {
|
||||
cfg.ContextTemplate = tenant.ConversationConfig.ContextTemplate
|
||||
}
|
||||
if tenant.ConversationConfig.Temperature >= 0 {
|
||||
cfg.Temperature = tenant.ConversationConfig.Temperature
|
||||
}
|
||||
if tenant.ConversationConfig.MaxCompletionTokens > 0 {
|
||||
cfg.MaxCompletionTokens = tenant.ConversationConfig.MaxCompletionTokens
|
||||
}
|
||||
}
|
||||
|
||||
return cfg
|
||||
}
|
||||
|
||||
// fillSummaryConfigDefaults fills missing fields in summary config with defaults
|
||||
// It prioritizes tenant-level ConversationConfig, then falls back to config.yaml defaults
|
||||
func (h *Handler) fillSummaryConfigDefaults(ctx context.Context, config *types.SummaryConfig) {
|
||||
// Try to get tenant from context
|
||||
tenant, _ := types.TenantInfoFromContext(ctx)
|
||||
|
||||
// Determine default values: tenant config first, then config.yaml
|
||||
var defaultPrompt, defaultContextTemplate, defaultNoMatchPrefix string
|
||||
var defaultTemperature float64
|
||||
var defaultMaxCompletionTokens int
|
||||
|
||||
if tenant != nil && tenant.ConversationConfig != nil {
|
||||
// Use custom prompt if provided
|
||||
if tenant.ConversationConfig.Prompt != "" {
|
||||
defaultPrompt = tenant.ConversationConfig.Prompt
|
||||
}
|
||||
|
||||
// Use custom context template if provided
|
||||
if tenant.ConversationConfig.ContextTemplate != "" {
|
||||
defaultContextTemplate = tenant.ConversationConfig.ContextTemplate
|
||||
}
|
||||
defaultTemperature = tenant.ConversationConfig.Temperature
|
||||
defaultMaxCompletionTokens = tenant.ConversationConfig.MaxCompletionTokens
|
||||
}
|
||||
|
||||
// Fall back to config.yaml if tenant config is empty
|
||||
if defaultPrompt == "" {
|
||||
defaultPrompt = h.config.Conversation.Summary.Prompt
|
||||
}
|
||||
if defaultContextTemplate == "" {
|
||||
defaultContextTemplate = h.config.Conversation.Summary.ContextTemplate
|
||||
}
|
||||
if defaultTemperature == 0 {
|
||||
defaultTemperature = h.config.Conversation.Summary.Temperature
|
||||
}
|
||||
if defaultMaxCompletionTokens == 0 {
|
||||
defaultMaxCompletionTokens = h.config.Conversation.Summary.MaxCompletionTokens
|
||||
}
|
||||
defaultNoMatchPrefix = h.config.Conversation.Summary.NoMatchPrefix
|
||||
|
||||
// Fill missing fields
|
||||
if config.Prompt == "" {
|
||||
config.Prompt = defaultPrompt
|
||||
}
|
||||
if config.ContextTemplate == "" {
|
||||
config.ContextTemplate = defaultContextTemplate
|
||||
}
|
||||
if config.Temperature < 0 {
|
||||
config.Temperature = defaultTemperature
|
||||
}
|
||||
if config.MaxCompletionTokens == 0 {
|
||||
config.MaxCompletionTokens = defaultMaxCompletionTokens
|
||||
}
|
||||
if config.NoMatchPrefix == "" {
|
||||
config.NoMatchPrefix = defaultNoMatchPrefix
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user