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

Merge branch 'fix/expect-value-check-error' into deploy/dev

Browse Source
This commit is contained in:
jyong 2025-03-19 16:14:16 +08:00
commit 4080e70e49
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/controllers/console/datasets/datasets.py
View File

@ -79,7 +79,7 @@ class DatasetListApi(Resource):
data = marshal(datasets, dataset_detail_fields) data = marshal(datasets, dataset_detail_fields)
for item in data: for item in data:
# convert embedding_model_provider to plugin standard format # convert embedding_model_provider to plugin standard format
if item["indexing_technique"] == "high_quality": if item["indexing_technique"] == "high_quality" and item["embedding_model_provider"]:
item["embedding_model_provider"] = str(ModelProviderID(item["embedding_model_provider"])) item["embedding_model_provider"] = str(ModelProviderID(item["embedding_model_provider"]))
item_model = f"{item['embedding_model']}:{item['embedding_model_provider']}" item_model = f"{item['embedding_model']}:{item['embedding_model_provider']}"
if item_model in model_names: if item_model in model_names:

4
api/controllers/service_api/dataset/dataset.py
View File

@ -7,6 +7,7 @@ from controllers.service_api import api
from controllers.service_api.dataset.error import DatasetInUseError, DatasetNameDuplicateError from controllers.service_api.dataset.error import DatasetInUseError, DatasetNameDuplicateError
from controllers.service_api.wraps import DatasetApiResource from controllers.service_api.wraps import DatasetApiResource
from core.model_runtime.entities.model_entities import ModelType from core.model_runtime.entities.model_entities import ModelType
from core.plugin.entities.plugin import ModelProviderID
from core.provider_manager import ProviderManager from core.provider_manager import ProviderManager
from fields.dataset_fields import dataset_detail_fields from fields.dataset_fields import dataset_detail_fields
from libs.login import current_user from libs.login import current_user
@ -48,7 +49,8 @@ class DatasetListApi(DatasetApiResource):
data = marshal(datasets, dataset_detail_fields) data = marshal(datasets, dataset_detail_fields)
for item in data: for item in data:
if item["indexing_technique"] == "high_quality": if item["indexing_technique"] == "high_quality" and item["embedding_model_provider"]:
item["embedding_model_provider"] = str(ModelProviderID(item["embedding_model_provider"]))
item_model = f"{item['embedding_model']}:{item['embedding_model_provider']}" item_model = f"{item['embedding_model']}:{item['embedding_model_provider']}"
if item_model in model_names: if item_model in model_names:
item["embedding_available"] = True item["embedding_available"] = True

2
api/core/rag/retrieval/dataset_retrieval.py
View File

@ -870,7 +870,7 @@ class DatasetRetrieval:
for condition in metadata_filtering_conditions.conditions: # type: ignore for condition in metadata_filtering_conditions.conditions: # type: ignore
metadata_name = condition.name metadata_name = condition.name
expected_value = condition.value expected_value = condition.value
if expected_value or condition.comparison_operator in ("empty", "not empty"): if expected_value is not None or condition.comparison_operator in ("empty", "not empty"):
if isinstance(expected_value, str): if isinstance(expected_value, str):
expected_value = self._replace_metadata_filter_value(expected_value, inputs) expected_value = self._replace_metadata_filter_value(expected_value, inputs)
filters = self._process_metadata_filter_func( filters = self._process_metadata_filter_func(

2
api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py
View File

@ -356,7 +356,7 @@ class KnowledgeRetrievalNode(LLMNode):
for condition in node_data.metadata_filtering_conditions.conditions: # type: ignore for condition in node_data.metadata_filtering_conditions.conditions: # type: ignore
metadata_name = condition.name metadata_name = condition.name
expected_value = condition.value expected_value = condition.value
if expected_value or condition.comparison_operator in ("empty", "not empty"): if expected_value is not None or condition.comparison_operator in ("empty", "not empty"):
if isinstance(expected_value, str): if isinstance(expected_value, str):
expected_value = self.graph_runtime_state.variable_pool.convert_template( expected_value = self.graph_runtime_state.variable_pool.convert_template(
expected_value expected_value

3
web/app/components/workflow/nodes/_base/hooks/use-node-help-link.ts
View File

@ -6,7 +6,7 @@ export const useNodeHelpLink = (nodeType: BlockEnum) => {
const language = useGetLanguage() const language = useGetLanguage()
const prefixLink = useMemo(() => { const prefixLink = useMemo(() => {
if (language === 'zh_Hans') if (language === 'zh_Hans')
return 'https://docs.dify.ai/v/zh-hans/guides/workflow/node/' return 'https://docs.dify.ai/zh-hans/guides/workflow/node/'
return 'https://docs.dify.ai/guides/workflow/node/' return 'https://docs.dify.ai/guides/workflow/node/'
}, [language]) }, [language])
@ -34,6 +34,7 @@ export const useNodeHelpLink = (nodeType: BlockEnum) => {
[BlockEnum.Tool]: 'tools', [BlockEnum.Tool]: 'tools',
[BlockEnum.DocExtractor]: 'doc-extractor', [BlockEnum.DocExtractor]: 'doc-extractor',
[BlockEnum.ListFilter]: 'list-operator', [BlockEnum.ListFilter]: 'list-operator',
[BlockEnum.Agent]: 'agent',
} }
} }