Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

fix(api): keep stored QA answers on partial segment updates (#44997)

Tanishqae0ed2d2f15a
diff --git a/api/repositories/knowledge/segment_repository.py b/api/repositories/knowledge/segment_repository.py
index 9badeb30c04..0b478b331d8 100644
--- a/api/repositories/knowledge/segment_repository.py
+++ b/api/repositories/knowledge/segment_repository.py
@@ -291,6 +291,7 @@ class SQLAlchemySegmentRepository:
keywords=tuple(keywords)
if isinstance(keywords, list) and all(isinstance(keyword, str) for keyword in keywords)
else None,
+ answer=segment.answer,
)
def get_segments(self, document_ref: DocumentRef, segment_ids: Sequence[str]) -> tuple[SegmentIndexTarget, ...]:
diff --git a/api/services/knowledge/segments/application.py b/api/services/knowledge/segments/application.py
index 87c6309a495..6b8ce7c5d5a 100644
--- a/api/services/knowledge/segments/application.py
+++ b/api/services/knowledge/segments/application.py
@@ -133,6 +133,8 @@ class SegmentUpdateState:
content: str
enabled: bool
keywords: tuple[str, ...] | None
+ # The stored QA answer, or None when the segment has none (non-QA documents).
+ answer: str | None
class SegmentStore(Protocol):
@@ -766,17 +768,18 @@ class SegmentMutationService:
if not previous.enabled and args.enabled is not True:
raise ValueError("Can't update disabled segment")
content = args.content or previous.content
+ answer = args.answer if "answer" in args.model_fields_set else previous.answer
content_changed = content != previous.content
keyword_changed = bool(args.keywords) and Counter(previous.keywords or ()) != Counter(args.keywords or ())
changes: dict[str, object] = {
"content": content,
- "word_count": len(content) + (len(args.answer or "") if scope.document.doc_form == "qa_model" else 0),
+ "word_count": len(content) + (len(answer or "") if scope.document.doc_form == "qa_model" else 0),
"enabled": True,
"disabled_at": None,
"disabled_by": None,
}
if scope.document.doc_form == "qa_model":
- changes["answer"] = args.answer
+ changes["answer"] = answer
if keyword_changed and not content_changed:
changes["keywords"] = args.keywords
try:
@@ -786,7 +789,7 @@ class SegmentMutationService:
index_node_hash=self._text_hash(content),
tokens=self._index.count_tokens(
scope.dataset,
- content + (args.answer or "") if scope.document.doc_form == "qa_model" else content,
+ content + (answer or "") if scope.document.doc_form == "qa_model" else content,
),
status="completed",
indexing_at=now,
diff --git a/api/tests/unit_tests/services/knowledge/segments/test_adapters.py b/api/tests/unit_tests/services/knowledge/segments/test_adapters.py
index b5eb078d818..67e457c65a2 100644
--- a/api/tests/unit_tests/services/knowledge/segments/test_adapters.py
+++ b/api/tests/unit_tests/services/knowledge/segments/test_adapters.py
@@ -1562,11 +1562,24 @@ def test_service_api_child_index_failure_preserves_rows_and_legacy_errors(
assert repository.get_children(ref) == before
[email protected]("values", [{"answer": "new answer"}, {"content": "new question", "answer": "new answer"}])
+ ("values", "answer"),
+ [
+ ({"answer": "new answer"}, "new answer"),
+ ({"content": "new question", "answer": "new answer"}, "new answer"),
+ # An omitted answer keeps the stored one.
+ ({"content": "new question"}, "answer"),
+ ({"keywords": ["keyword"]}, "answer"),
+ # An explicit answer is saved as sent, even when it is empty or null.
+ ({"answer": ""}, ""),
+ ({"content": "new question", "answer": None}, None),
+ ],
+)
def test_service_api_partial_qa_update_uses_shared_word_count_and_indexing(
indexing_probe: IndexingProbe,
sqlite_session_factory: sessionmaker[Session],
- values: dict[str, str],
+ values: dict[str, object],
+ answer: str | None,
) -> None:
app, _, _ = indexing_probe
with sqlite_session_factory.begin() as session:
@@ -1587,7 +1600,7 @@ def test_service_api_partial_qa_update_uses_shared_word_count_and_indexing(
assert document is not None
assert segment is not None
updated = SegmentService.update_segment(
- SegmentUpdateArgs(**values),
+ SegmentUpdateArgs.model_validate(values),
segment,
document,
dataset,
@@ -1596,8 +1609,8 @@ def test_service_api_partial_qa_update_uses_shared_word_count_and_indexing(
mutations=app.mutations,
)
assert updated.content == values.get("content", "question")
- assert updated.answer == "new answer"
- assert updated.word_count == len(updated.content) + len(updated.answer)
+ assert updated.answer == answer
+ assert updated.word_count == len(updated.content) + len(answer or "")
assert document.word_count == updated.word_count
if "content" in values:
assert updated.tokens == updated.word_count
diff --git a/api/tests/unit_tests/services/knowledge/segments/test_application.py b/api/tests/unit_tests/services/knowledge/segments/test_application.py
index 9a7860ee7d6..b671d228d1f 100644
--- a/api/tests/unit_tests/services/knowledge/segments/test_application.py
+++ b/api/tests/unit_tests/services/knowledge/segments/test_application.py
@@ -458,7 +458,7 @@ def test_create_segment_returns_store_detail() -> None:
)
def test_shared_update_rejects_disabled_or_indexing_segments(enabled: bool, indexing: bool, message: str) -> None:
service, _, store, _, _, state, _ = _service()
- store.get_segment_update_state.return_value = SegmentUpdateState("content", enabled, None)
+ store.get_segment_update_state.return_value = SegmentUpdateState("content", enabled, None, None)
state.is_segment_indexing.return_value = indexing
with pytest.raises(ValueError, match=message):
service.mutations.update_segment(
@@ -472,7 +472,7 @@ def test_shared_update_rejects_disabled_or_indexing_segments(enabled: bool, inde
def test_shared_disable_patch_does_not_replace_content() -> None:
service, _, store, _, _, state, _ = _service()
- store.get_segment_update_state.return_value = SegmentUpdateState("content", True, None)
+ store.get_segment_update_state.return_value = SegmentUpdateState("content", True, None, None)
service.mutations.update_segment(
SegmentMutationScope(_dataset(), _document()),
actor_id="editor",
@@ -490,7 +490,7 @@ def test_shared_disable_patch_does_not_replace_content() -> None:
def test_shared_writes_do_not_build_segment_detail() -> None:
service, _, store, _, _, _, _ = _service()
store.get_segment.side_effect = RuntimeError("attachment URL signing unavailable")
- store.get_segment_update_state.return_value = SegmentUpdateState("content", True, None)
+ store.get_segment_update_state.return_value = SegmentUpdateState("content", True, None, None)
scope = SegmentMutationScope(_dataset(), _document())
created = service.mutations.create_segment(scope, actor_id="author", args=SegmentUpdateArgs(content="content"))