outman/dify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove - in dataset retriever tool name (#3381)

Browse Source
This commit is contained in:
Yeuoly 2024-04-12 11:12:52 +08:00 committed by GitHub
parent f7a417fdb4
commit 44448ba68d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/core/tools/tool/dataset_retriever/dataset_multi_retriever_tool.py
View File

@ -31,7 +31,7 @@ class DatasetMultiRetrieverToolInput(BaseModel):
class DatasetMultiRetrieverTool(BaseTool): class DatasetMultiRetrieverTool(BaseTool):
"""Tool for querying multi dataset.""" """Tool for querying multi dataset."""
name: str = "dataset-" name: str = "dataset_"
args_schema: type[BaseModel] = DatasetMultiRetrieverToolInput args_schema: type[BaseModel] = DatasetMultiRetrieverToolInput
description: str = "dataset multi retriever and rerank. " description: str = "dataset multi retriever and rerank. "
tenant_id: str tenant_id: str
@ -47,7 +47,7 @@ class DatasetMultiRetrieverTool(BaseTool):
@classmethod @classmethod
def from_dataset(cls, dataset_ids: list[str], tenant_id: str, **kwargs): def from_dataset(cls, dataset_ids: list[str], tenant_id: str, **kwargs):
return cls( return cls(
name=f'dataset-{tenant_id}', name=f"dataset_{tenant_id.replace('-', '_')}",
tenant_id=tenant_id, tenant_id=tenant_id,
dataset_ids=dataset_ids, dataset_ids=dataset_ids,
**kwargs **kwargs

2
api/core/tools/tool/dataset_retriever/dataset_retriever_tool.py
View File

@ -46,7 +46,7 @@ class DatasetRetrieverTool(BaseTool):
description = description.replace('\n', '').replace('\r', '') description = description.replace('\n', '').replace('\r', '')
return cls( return cls(
name=f'dataset-{dataset.id}', name=f"dataset_{dataset.id.replace('-', '_')}",
tenant_id=dataset.tenant_id, tenant_id=dataset.tenant_id,
dataset_id=dataset.id, dataset_id=dataset.id,
description=description, description=description,

6
web/app/components/app/chat/thought/tool.tsx
View File

@ -19,7 +19,7 @@ type Props = {
} }
const getIcon = (toolName: string, allToolIcons: Record<string, string | Emoji>) => { const getIcon = (toolName: string, allToolIcons: Record<string, string | Emoji>) => {
if (toolName.startsWith('dataset-')) if (toolName.startsWith('dataset_'))
return <DataSetIcon className='shrink-0'></DataSetIcon> return <DataSetIcon className='shrink-0'></DataSetIcon>
const icon = allToolIcons[toolName] const icon = allToolIcons[toolName]
if (!icon) if (!icon)
@ -50,9 +50,9 @@ const Tool: FC<Props> = ({
}) => { }) => {
const { t } = useTranslation() const { t } = useTranslation()
const { name, input, isFinished, output } = payload const { name, input, isFinished, output } = payload
const toolName = name.startsWith('dataset-') ? t('dataset.knowledge') : name const toolName = name.startsWith('dataset_') ? t('dataset.knowledge') : name
const [isShowDetail, setIsShowDetail] = useState(false) const [isShowDetail, setIsShowDetail] = useState(false)
const icon = getIcon(toolName, allToolIcons) as any const icon = getIcon(name, allToolIcons) as any
return ( return (
<div> <div>
<div className={cn(!isShowDetail && 'shadow-sm', !isShowDetail && 'inline-block', 'max-w-full overflow-x-auto bg-white rounded-md')}> <div className={cn(!isShowDetail && 'shadow-sm', !isShowDetail && 'inline-block', 'max-w-full overflow-x-auto bg-white rounded-md')}>