fix(api): switch dataset query created_by_role to CreatorUserRole enums

Note: `CreatorUserRole.END_USER` is `"end_user"` (underscore), matching the prior value.

Tests not run (not requested).
This commit is contained in:
-LAN-
2026-01-06 19:14:52 +08:00
parent a015cad8b8
commit 7e33faecfe
3 changed files with 12 additions and 8 deletions

View File

@ -12,7 +12,7 @@ from core.rag.models.document import Document
from extensions.ext_database import db
from models.dataset import ChildChunk, DatasetQuery, DocumentSegment
from models.dataset import Document as DatasetDocument
from models.enums import UserFrom
from models.enums import CreatorUserRole
_logger = logging.getLogger(__name__)
@ -39,9 +39,9 @@ class DatasetIndexToolCallbackHandler:
source="app",
source_app_id=self._app_id,
created_by_role=(
UserFrom.ACCOUNT
CreatorUserRole.ACCOUNT
if self._invoke_from in {InvokeFrom.EXPLORE, InvokeFrom.DEBUGGER}
else UserFrom.END_USER
else CreatorUserRole.END_USER
),
created_by=self._user_id,
)

View File

@ -63,7 +63,7 @@ from libs.json_in_md_parser import parse_and_check_json_markdown
from models import UploadFile
from models.dataset import ChildChunk, Dataset, DatasetMetadata, DatasetQuery, DocumentSegment, SegmentAttachmentBinding
from models.dataset import Document as DatasetDocument
from models.enums import UserFrom
from models.enums import CreatorUserRole
from services.external_knowledge_service import ExternalDatasetService
default_retrieval_model: dict[str, Any] = {
@ -177,7 +177,11 @@ class DatasetRetrieval:
)
all_documents = []
user_from = UserFrom.ACCOUNT if invoke_from in {InvokeFrom.EXPLORE, InvokeFrom.DEBUGGER} else UserFrom.END_USER
user_from = (
CreatorUserRole.ACCOUNT
if invoke_from in {InvokeFrom.EXPLORE, InvokeFrom.DEBUGGER}
else CreatorUserRole.END_USER
)
if retrieve_config.retrieve_strategy == DatasetRetrieveConfigEntity.RetrieveStrategy.SINGLE:
all_documents = self.single_retrieve(
app_id,

View File

@ -13,7 +13,7 @@ from core.rag.retrieval.retrieval_methods import RetrievalMethod
from extensions.ext_database import db
from models import Account
from models.dataset import Dataset, DatasetQuery
from models.enums import UserFrom
from models.enums import CreatorUserRole
logger = logging.getLogger(__name__)
@ -99,7 +99,7 @@ class HitTestingService:
content=json.dumps(dataset_queries),
source="hit_testing",
source_app_id=None,
created_by_role=UserFrom.ACCOUNT,
created_by_role=CreatorUserRole.ACCOUNT,
created_by=account.id,
)
db.session.add(dataset_query)
@ -139,7 +139,7 @@ class HitTestingService:
content=query,
source="hit_testing",
source_app_id=None,
created_by_role=UserFrom.ACCOUNT,
created_by_role=CreatorUserRole.ACCOUNT,
created_by=account.id,
)