Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove - in dataset retriever tool name #3381

Merged
merged 3 commits into from
Apr 12, 2024
Merged

fix: remove - in dataset retriever tool name #3381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5b1735
fix: remove \-
Yeuoly Apr 11, 2024
91f875b
fe
Yeuoly Apr 11, 2024
68c70fc
fix
Yeuoly Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/core/tools/tool/dataset_retriever/dataset_multi_retriever_tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class DatasetMultiRetrieverToolInput(BaseModel):

class DatasetMultiRetrieverTool(BaseTool):
"""Tool for querying multi dataset."""
name: str = "dataset-"
name: str = "dataset_"
args_schema: type[BaseModel] = DatasetMultiRetrieverToolInput
description: str = "dataset multi retriever and rerank. "
tenant_id: str
Expand All @@ -47,7 +47,7 @@ class DatasetMultiRetrieverTool(BaseTool):
@classmethod
def from_dataset(cls, dataset_ids: list[str], tenant_id: str, **kwargs):
return cls(
name=f'dataset-{tenant_id}',
name=f"dataset_{tenant_id.replace('-', '_')}",
tenant_id=tenant_id,
dataset_ids=dataset_ids,
**kwargs
Expand Down
2 changes: 1 addition & 1 deletion api/core/tools/tool/dataset_retriever/dataset_retriever_tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def from_dataset(cls, dataset: Dataset, **kwargs):

description = description.replace('\n', '').replace('\r', '')
return cls(
name=f'dataset-{dataset.id}',
name=f"dataset_{dataset.id.replace('-', '_')}",
tenant_id=dataset.tenant_id,
dataset_id=dataset.id,
description=description,
Expand Down
6 changes: 3 additions & 3 deletions web/app/components/app/chat/thought/tool.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ type Props = {
}

const getIcon = (toolName: string, allToolIcons: Record<string, string | Emoji>) => {
if (toolName.startsWith('dataset-'))
if (toolName.startsWith('dataset_'))
return <DataSetIcon className='shrink-0'></DataSetIcon>
const icon = allToolIcons[toolName]
if (!icon)
Expand Down Expand Up @@ -50,9 +50,9 @@ const Tool: FC<Props> = ({
}) => {
const { t } = useTranslation()
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 icon = getIcon(toolName, allToolIcons) as any
const icon = getIcon(name, allToolIcons) as any
return (
<div>
<div className={cn(!isShowDetail && 'shadow-sm', !isShowDetail && 'inline-block', 'max-w-full overflow-x-auto bg-white rounded-md')}>
Expand Down
Loading