opensource/dify
3
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-09-24 23:22:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

test: migrate tag service tests to testcontainers (#38313)

Browse Source
This commit is contained in:
Escape0707
2026-07-02 11:58:56 +00:00
committed by GitHub
parent 12c06a61be
commit dcc06dee20
4 changed files with 1029 additions and 1491 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/services/tag_service.py
+15 -12
View File
@@ -14,6 +14,9 @@ from models.enums import TagType
from models.model import App, Tag, TagBinding
from models.snippet import CustomizedSnippet
type _SessionLike = Session | scoped_session
type _TagTypeLike = TagType | str
class SaveTagPayload(BaseModel):
name: str = Field(min_length=1, max_length=50)
@@ -38,7 +41,7 @@ class TagBindingDeletePayload(BaseModel):
class TagService:
@staticmethod
def get_tags(session: Session, tag_type: str, current_tenant_id: str, keyword: str | None = None):
def get_tags(session: Session, tag_type: _TagTypeLike, current_tenant_id: str, keyword: str | None = None):
stmt = (
select(Tag.id, Tag.type, Tag.name, func.count(TagBinding.id).label("binding_count"))
.outerjoin(TagBinding, Tag.id == TagBinding.tag_id)
@@ -55,10 +58,10 @@ class TagService:
@staticmethod
def get_target_ids_by_tag_ids(
tag_type: str,
tag_type: _TagTypeLike,
current_tenant_id: str,
tag_ids: list[str],
session: scoped_session | Session,
session: _SessionLike,
*,
match_all: bool = False,
):
@@ -104,7 +107,7 @@ class TagService:
return tag_bindings
@staticmethod
def get_tag_by_tag_name(tag_type: str, current_tenant_id: str, tag_name: str, session: scoped_session):
def get_tag_by_tag_name(tag_type: _TagTypeLike, current_tenant_id: str, tag_name: str, session: _SessionLike):
if not tag_type or not tag_name:
return []
tags = list(
@@ -117,7 +120,7 @@ class TagService:
return tags
@staticmethod
def get_tags_by_target_id(tag_type: str, current_tenant_id: str, target_id: str, session: scoped_session):
def get_tags_by_target_id(tag_type: _TagTypeLike, current_tenant_id: str, target_id: str, session: _SessionLike):
tags = session.scalars(
select(Tag)
.join(TagBinding, Tag.id == TagBinding.tag_id)
@@ -132,7 +135,7 @@ class TagService:
return tags or []
@staticmethod
def save_tags(payload: SaveTagPayload, session: scoped_session) -> Tag:
def save_tags(payload: SaveTagPayload, session: _SessionLike) -> Tag:
if TagService.get_tag_by_tag_name(payload.type, current_user.current_tenant_id, payload.name, session):
raise ValueError("Tag name already exists")
tag = Tag(
@@ -148,7 +151,7 @@ class TagService:
@staticmethod
def update_tags(
payload: UpdateTagPayload, tag_id: str, session: scoped_session, *, tag_type: TagType | None = None
payload: UpdateTagPayload, tag_id: str, session: _SessionLike, *, tag_type: TagType | None = None
) -> Tag:
current_tenant_id = current_user.current_tenant_id
stmt = select(Tag).where(Tag.id == tag_id, Tag.tenant_id == current_tenant_id)
@@ -175,7 +178,7 @@ class TagService:
return tag
@staticmethod
def get_tag_binding_count(tag_id: str, session: scoped_session, *, tag_type: TagType | None = None) -> int:
def get_tag_binding_count(tag_id: str, session: _SessionLike, *, tag_type: TagType | None = None) -> int:
current_tenant_id = current_user.current_tenant_id
stmt = (
select(func.count(TagBinding.id))
@@ -188,7 +191,7 @@ class TagService:
return count
@staticmethod
def delete_tag(tag_id: str, session: scoped_session, *, tag_type: TagType | None = None):
def delete_tag(tag_id: str, session: _SessionLike, *, tag_type: TagType | None = None):
current_tenant_id = current_user.current_tenant_id
stmt = select(Tag).where(Tag.id == tag_id, Tag.tenant_id == current_tenant_id)
if tag_type is not None:
@@ -207,7 +210,7 @@ class TagService:
session.commit()
@staticmethod
def save_tag_binding(payload: TagBindingCreatePayload, session: scoped_session):
def save_tag_binding(payload: TagBindingCreatePayload, session: _SessionLike):
TagService.check_target_exists(payload.type, payload.target_id, session)
valid_tag_ids = session.scalars(
select(Tag.id).where(
@@ -234,7 +237,7 @@ class TagService:
session.commit()
@staticmethod
def delete_tag_binding(payload: TagBindingDeletePayload, session: scoped_session):
def delete_tag_binding(payload: TagBindingDeletePayload, session: _SessionLike):
TagService.check_target_exists(payload.type, payload.target_id, session)
result = cast(
CursorResult,
@@ -257,7 +260,7 @@ class TagService:
session.commit()
@staticmethod
def check_target_exists(type: str, target_id: str, session: scoped_session):
def check_target_exists(type: _TagTypeLike, target_id: str, session: _SessionLike):
if type == "knowledge":
dataset = session.scalar(
select(Dataset)