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): allow renaming metadata to its current name (#44671)

Tianyu Cai0d97e3685eb5
diff --git a/api/repositories/knowledge/metadata_repository.py b/api/repositories/knowledge/metadata_repository.py
index fb28a19ec7b..b0f0e3cce48 100644
--- a/api/repositories/knowledge/metadata_repository.py
+++ b/api/repositories/knowledge/metadata_repository.py
@@ -65,8 +65,11 @@ class SQLAlchemyMetadataRepository:
)
@classmethod
- def _check_name(cls, session: Session, ref: DatasetRef, name: str) -> None:
- if session.scalar(cls._fields(ref).where(DatasetMetadata.name == name).limit(1)) is not None:
+ def _check_name(cls, session: Session, ref: DatasetRef, name: str, exclude_id: str | None = None) -> None:
+ stmt = cls._fields(ref).where(DatasetMetadata.name == name)
+ if exclude_id is not None:
+ stmt = stmt.where(DatasetMetadata.id != exclude_id)
+ if session.scalar(stmt.limit(1)) is not None:
raise ValueError("Metadata name already exists.")
def create(self, ref: DatasetRef, *, name: str, field_type: str, actor_id: str) -> MetadataRecord:
@@ -83,7 +86,7 @@ class SQLAlchemyMetadataRepository:
def rename(self, ref: DatasetRef, metadata_id: str, *, name: str, actor_id: str) -> MetadataRecord:
with self._sessions.begin() as session:
self._dataset(session, ref, write=True)
- self._check_name(session, ref, name)
+ self._check_name(session, ref, name, exclude_id=metadata_id)
row = session.scalar(self._fields(ref).where(DatasetMetadata.id == metadata_id))
if row is None:
raise MetadataResourceNotFoundError("Metadata not found.")
diff --git a/api/tests/unit_tests/services/knowledge/metadata/test_application.py b/api/tests/unit_tests/services/knowledge/metadata/test_application.py
index f74fd5b1e6b..c7eeb3c94af 100644
--- a/api/tests/unit_tests/services/knowledge/metadata/test_application.py
+++ b/api/tests/unit_tests/services/knowledge/metadata/test_application.py
@@ -1,4 +1,5 @@
from datetime import datetime
+from operator import itemgetter
from pathlib import Path
from typing import cast
from unittest.mock import Mock, create_autospec
@@ -352,6 +353,24 @@ class TestMetadataServiceSessionBoundaryCases:
with pytest.raises(ValueError, match="already exists"):
metadata_service.create_metadata(REF, MetadataArgs(type="string", name="author"), actor_id="actor")
+ @staticmethod
+ def test_rename_to_same_name_succeeds(metadata_service: MetadataService) -> None:
+ field = metadata_service.create_metadata(REF, MetadataArgs(type="string", name="author"), actor_id="actor")
+ result = metadata_service.update_metadata_name(REF, field.id, name="author", actor_id="actor")
+ assert result.name == "author"
+
+ @staticmethod
+ def test_rename_to_existing_name_fails(metadata_service: MetadataService) -> None:
+ field1 = metadata_service.create_metadata(REF, MetadataArgs(type="string", name="author"), actor_id="actor")
+ field2 = metadata_service.create_metadata(REF, MetadataArgs(type="string", name="writer"), actor_id="actor")
+ with pytest.raises(ValueError, match="already exists"):
+ metadata_service.update_metadata_name(REF, field2.id, name="author", actor_id="actor")
+ fields = metadata_service.get_dataset_metadatas(REF)
+ assert sorted(fields["doc_metadata"], key=itemgetter("name")) == [
+ {"id": field1.id, "type": "string", "name": "author", "count": 0},
+ {"id": field2.id, "type": "string", "name": "writer", "count": 0},
+ ]
+
@staticmethod
@pytest.mark.parametrize("partial", [True, False])
def test_update_uses_canonical_names_and_preserves_partial_values(