fix: correct graph_enabled logic in process configuration
- Updated the logic for `graph_enabled` in `UploadConfirmDialog.vue` to require both `nodeExtractConfig.enabled` and `graphEnabled` to be true. - Added a new test case in `knowledge_process_config_test.go` to ensure that `GraphEnabled` is false when `ExtractConfig.Enabled` is false. - Adjusted the `ResolveProcessConfig` function to reflect the updated dependency between graph and extract configurations, ensuring proper behavior in the process configuration resolution.
This commit is contained in:
@@ -687,7 +687,7 @@ function buildProcessOverrides(): KnowledgeProcessOverrides {
|
||||
enabled: state.questionGenerationConfig.enabled,
|
||||
question_count: state.questionGenerationConfig.questionCount,
|
||||
},
|
||||
graph_enabled: state.nodeExtractConfig.enabled || state.graphEnabled,
|
||||
graph_enabled: state.nodeExtractConfig.enabled && state.graphEnabled,
|
||||
extract_config: {
|
||||
enabled: state.nodeExtractConfig.enabled,
|
||||
text: state.nodeExtractConfig.text,
|
||||
|
||||
@@ -49,6 +49,9 @@ func ResolveProcessConfig(kb *types.KnowledgeBase, overrides *types.KnowledgePro
|
||||
eff.ExtractConfig = mergeExtractConfig(eff.ExtractConfig, overrides.ExtractConfig)
|
||||
}
|
||||
|
||||
// Match KnowledgeBase.IsGraphEnabled: graph fan-out requires extract to be on.
|
||||
eff.GraphEnabled = eff.GraphEnabled && eff.ExtractConfig.Enabled
|
||||
|
||||
return eff
|
||||
}
|
||||
|
||||
@@ -178,9 +181,7 @@ func mergeExtractConfig(base types.ExtractConfig, override *types.ExtractConfig)
|
||||
return base
|
||||
}
|
||||
result := base
|
||||
if override.Enabled {
|
||||
result.Enabled = true
|
||||
}
|
||||
result.Enabled = override.Enabled
|
||||
if override.Text != "" {
|
||||
result.Text = override.Text
|
||||
}
|
||||
|
||||
@@ -43,6 +43,19 @@ func TestResolveProcessConfig_GraphDisabled(t *testing.T) {
|
||||
require.False(t, eff.GraphEnabled)
|
||||
}
|
||||
|
||||
func TestResolveProcessConfig_GraphRequiresExtractEnabled(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
kb := testKBWithGraphEnabled(true)
|
||||
overrides := &types.KnowledgeProcessOverrides{
|
||||
GraphEnabled: processConfigBoolPtr(true),
|
||||
ExtractConfig: &types.ExtractConfig{Enabled: false},
|
||||
}
|
||||
eff := ResolveProcessConfig(kb, overrides)
|
||||
require.False(t, eff.ExtractConfig.Enabled)
|
||||
require.False(t, eff.GraphEnabled)
|
||||
}
|
||||
|
||||
func TestResolveProcessConfig_NilOverridesUsesKBDefaults(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
@@ -155,7 +168,8 @@ func TestResolveProcessConfig_ExtractConfigFieldMerge(t *testing.T) {
|
||||
}
|
||||
overrides := &types.KnowledgeProcessOverrides{
|
||||
ExtractConfig: &types.ExtractConfig{
|
||||
Tags: []string{"override-tag"},
|
||||
Enabled: true,
|
||||
Tags: []string{"override-tag"},
|
||||
},
|
||||
}
|
||||
eff := ResolveProcessConfig(kb, overrides)
|
||||
|
||||
Reference in New Issue
Block a user