From 8d667d5abdbd185e60140b22150851aa8e6a3ebe Mon Sep 17 00:00:00 2001 From: cecilia-uu <117628326+cecilia-uu@users.noreply.github.com> Date: Tue, 18 Jun 2024 16:28:46 +0800 Subject: [PATCH] fixed: duplicate name (#1202) ### What problem does this PR solve? Duplicate method name. ### Type of change - [x] Bug Fix (non-breaking change which fixes an issue) --- api/apps/dataset_api.py | 2 +- api/db/services/knowledgebase_service.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/api/apps/dataset_api.py b/api/apps/dataset_api.py index 09f82e38e..9f30d4f8a 100644 --- a/api/apps/dataset_api.py +++ b/api/apps/dataset_api.py @@ -125,7 +125,7 @@ def list_datasets(): desc = request.args.get("desc", True) try: tenants = TenantService.get_joined_tenants_by_user_id(current_user.id) - kbs = KnowledgebaseService.get_by_tenant_ids( + kbs = KnowledgebaseService.get_by_tenant_ids_by_offset( [m["tenant_id"] for m in tenants], current_user.id, int(offset), int(count), orderby, desc) return construct_json_result(data=kbs, code=RetCode.DATA_ERROR, message=f"attempt to list datasets") except Exception as e: diff --git a/api/db/services/knowledgebase_service.py b/api/db/services/knowledgebase_service.py index 61075f3e0..8ad9bce22 100644 --- a/api/db/services/knowledgebase_service.py +++ b/api/db/services/knowledgebase_service.py @@ -42,8 +42,7 @@ class KnowledgebaseService(CommonService): @classmethod @DB.connection_context() - def get_by_tenant_ids(cls, joined_tenant_ids, user_id, - offset, count, orderby, desc): + def get_by_tenant_ids_by_offset(cls, joined_tenant_ids, user_id, offset, count, orderby, desc): kbs = cls.model.select().where( ((cls.model.tenant_id.in_(joined_tenant_ids) & (cls.model.permission == TenantPermission.TEAM.value)) | (