jprdonnelly/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-26 22:00:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor: convert isinstance chains to match/case in otel parser (#36534)

Browse Source 
Co-authored-by: Cowork 3P <cowork-3p@localhost>
This commit is contained in:
liaoyl830
2026-05-23 02:39:24 +08:00
committed by GitHub
parent 790ca72627
commit 2a0c098857
1 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
api/extensions/otel/parser/base.py
View File

@@ -53,25 +53,27 @@ def safe_json_dumps(obj: Any, ensure_ascii: bool = False) -> str:
def _convert_value(value: Any) -> Any:
"""Recursively convert non-serializable values."""
if value is None:
return None
if isinstance(value, (bool, int, float, str)):
return value
if isinstance(value, Segment):
# Convert Segment to its underlying value
return _convert_value(value.value)
if isinstance(value, File):
# Convert File to dict
return value.to_dict()
if isinstance(value, BaseModel):
# Convert Pydantic model to dict
return _convert_value(value.model_dump(mode="json"))
if isinstance(value, dict):
return {k: _convert_value(v) for k, v in value.items()}
if isinstance(value, (list, tuple)):
return [_convert_value(item) for item in value]
# Fallback to string representation for unknown types
return str(value)
match value:
case None:
return None
case bool() | int() | float() | str():
return value
case Segment():
# Convert Segment to its underlying value
return _convert_value(value.value)
case File():
# Convert File to dict
return value.to_dict()
case BaseModel():
# Convert Pydantic model to dict
return _convert_value(value.model_dump(mode="json"))
case dict():
return {k: _convert_value(v) for k, v in value.items()}
case list() | tuple():
return [_convert_value(item) for item in value]
case _:
# Fallback to string representation for unknown types
return str(value)
try:
converted = _convert_value(obj)
@@ -104,15 +106,15 @@ class DefaultNodeOTelParser:
span.set_attribute(GenAIAttributes.FRAMEWORK, "dify")
node_type = node.node_type
if node_type == BuiltinNodeTypes.LLM:
span.set_attribute(GenAIAttributes.SPAN_KIND, "LLM")
elif node_type == BuiltinNodeTypes.KNOWLEDGE_RETRIEVAL:
span.set_attribute(GenAIAttributes.SPAN_KIND, "RETRIEVER")
elif node_type == BuiltinNodeTypes.TOOL:
span.set_attribute(GenAIAttributes.SPAN_KIND, "TOOL")
else:
span.set_attribute(GenAIAttributes.SPAN_KIND, "TASK")
match node.node_type:
case BuiltinNodeTypes.LLM:
span.set_attribute(GenAIAttributes.SPAN_KIND, "LLM")
case BuiltinNodeTypes.KNOWLEDGE_RETRIEVAL:
span.set_attribute(GenAIAttributes.SPAN_KIND, "RETRIEVER")
case BuiltinNodeTypes.TOOL:
span.set_attribute(GenAIAttributes.SPAN_KIND, "TOOL")
case _:
span.set_attribute(GenAIAttributes.SPAN_KIND, "TASK")
# Extract inputs and outputs from result_event
if result_event and result_event.node_run_result: