mirror of
http://112.124.100.131/huang.ze/ebiz-dify-ai.git
synced 2025-12-15 05:46:52 +08:00
fix: if-else-node handles missing optional file variables (#15693)
This commit is contained in:
@@ -7,7 +7,7 @@ from pydantic import BaseModel, Field
|
|||||||
|
|
||||||
from core.file import File, FileAttribute, file_manager
|
from core.file import File, FileAttribute, file_manager
|
||||||
from core.variables import Segment, SegmentGroup, Variable
|
from core.variables import Segment, SegmentGroup, Variable
|
||||||
from core.variables.segments import FileSegment
|
from core.variables.segments import FileSegment, NoneSegment
|
||||||
from factories import variable_factory
|
from factories import variable_factory
|
||||||
|
|
||||||
from ..constants import CONVERSATION_VARIABLE_NODE_ID, ENVIRONMENT_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
|
from ..constants import CONVERSATION_VARIABLE_NODE_ID, ENVIRONMENT_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
|
||||||
@@ -131,11 +131,13 @@ class VariablePool(BaseModel):
|
|||||||
if attr not in {item.value for item in FileAttribute}:
|
if attr not in {item.value for item in FileAttribute}:
|
||||||
return None
|
return None
|
||||||
value = self.get(selector)
|
value = self.get(selector)
|
||||||
if not isinstance(value, FileSegment):
|
if not isinstance(value, (FileSegment, NoneSegment)):
|
||||||
return None
|
return None
|
||||||
|
if isinstance(value, FileSegment):
|
||||||
attr = FileAttribute(attr)
|
attr = FileAttribute(attr)
|
||||||
attr_value = file_manager.get_attr(file=value.value, attr=attr)
|
attr_value = file_manager.get_attr(file=value.value, attr=attr)
|
||||||
return variable_factory.build_segment(attr_value)
|
return variable_factory.build_segment(attr_value)
|
||||||
|
return value
|
||||||
|
|
||||||
return value
|
return value
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user