ngskcloud
/
gcgj-dify-1.7.0
17
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: ruff check

Browse Source
pull/21471/head
hieheihei 11 months ago
parent 432455a796
commit a84ef153b3
5 changed files with 109 additions and 108 deletions
Show Stats Download Patch File Download Diff File

144
api/core/ops/aliyun_trace/aliyun_trace.py
Unescape Escape View File

@ -71,8 +71,8 @@ class AliyunDataTrace(BaseTraceInstance):
aliyun_config: AliyunConfig, aliyun_config: AliyunConfig,
): ):
super().__init__(aliyun_config) super().__init__(aliyun_config)
base_url = aliyun_config.endpoint.rstrip('/') base_url = aliyun_config.endpoint.rstrip("/")
endpoint = urljoin(base_url, f'adapt_{aliyun_config.license_key}/api/otlp/traces') endpoint = urljoin(base_url, f"adapt_{aliyun_config.license_key}/api/otlp/traces")
self.trace_client = TraceClient(service_name=aliyun_config.app_name, endpoint=endpoint) self.trace_client = TraceClient(service_name=aliyun_config.app_name, endpoint=endpoint)
def trace(self, trace_info: BaseTraceInfo): def trace(self, trace_info: BaseTraceInfo):
@ -103,7 +103,7 @@ class AliyunDataTrace(BaseTraceInstance):
def workflow_trace(self, trace_info: WorkflowTraceInfo): def workflow_trace(self, trace_info: WorkflowTraceInfo):
trace_id = convert_to_trace_id(trace_info.workflow_run_id) trace_id = convert_to_trace_id(trace_info.workflow_run_id)
workflow_span_id = convert_to_span_id(trace_info.workflow_run_id, 'workflow') workflow_span_id = convert_to_span_id(trace_info.workflow_run_id, "workflow")
self.add_workflow_span(trace_id, workflow_span_id, trace_info) self.add_workflow_span(trace_id, workflow_span_id, trace_info)
workflow_node_executions = self.get_workflow_node_executions(trace_info) workflow_node_executions = self.get_workflow_node_executions(trace_info)
@ -130,19 +130,19 @@ class AliyunDataTrace(BaseTraceInstance):
status = Status(StatusCode.ERROR, trace_info.error) status = Status(StatusCode.ERROR, trace_info.error)
trace_id = convert_to_trace_id(message_id) trace_id = convert_to_trace_id(message_id)
message_span_id = convert_to_span_id(message_id, 'message') message_span_id = convert_to_span_id(message_id, "message")
message_span = SpanData( message_span = SpanData(
trace_id=trace_id, trace_id=trace_id,
parent_span_id=None, parent_span_id=None,
span_id=message_span_id, span_id=message_span_id,
name='message', name="message",
start_time=convert_datetime_to_nanoseconds(trace_info.start_time), start_time=convert_datetime_to_nanoseconds(trace_info.start_time),
end_time=convert_datetime_to_nanoseconds(trace_info.end_time), end_time=convert_datetime_to_nanoseconds(trace_info.end_time),
attributes={ attributes={
GEN_AI_SESSION_ID: trace_info.metadata.get('conversation_id', ''), GEN_AI_SESSION_ID: trace_info.metadata.get("conversation_id", ""),
GEN_AI_USER_ID: str(user_id), GEN_AI_USER_ID: str(user_id),
GEN_AI_SPAN_KIND: GenAISpanKind.CHAIN.value, GEN_AI_SPAN_KIND: GenAISpanKind.CHAIN.value,
GEN_AI_FRAMEWORK: 'dify', GEN_AI_FRAMEWORK: "dify",
INPUT_VALUE: json.dumps(trace_info.inputs, ensure_ascii=False), INPUT_VALUE: json.dumps(trace_info.inputs, ensure_ascii=False),
OUTPUT_VALUE: str(trace_info.outputs), OUTPUT_VALUE: str(trace_info.outputs),
}, },
@ -153,17 +153,17 @@ class AliyunDataTrace(BaseTraceInstance):
llm_span = SpanData( llm_span = SpanData(
trace_id=trace_id, trace_id=trace_id,
parent_span_id=message_span_id, parent_span_id=message_span_id,
span_id=convert_to_span_id(message_id, 'llm'), span_id=convert_to_span_id(message_id, "llm"),
name='llm', name="llm",
start_time=convert_datetime_to_nanoseconds(trace_info.start_time), start_time=convert_datetime_to_nanoseconds(trace_info.start_time),
end_time=convert_datetime_to_nanoseconds(trace_info.end_time), end_time=convert_datetime_to_nanoseconds(trace_info.end_time),
attributes={ attributes={
GEN_AI_SESSION_ID: trace_info.metadata.get('conversation_id', ''), GEN_AI_SESSION_ID: trace_info.metadata.get("conversation_id", ""),
GEN_AI_USER_ID: str(user_id), GEN_AI_USER_ID: str(user_id),
GEN_AI_SPAN_KIND: GenAISpanKind.LLM.value, GEN_AI_SPAN_KIND: GenAISpanKind.LLM.value,
GEN_AI_FRAMEWORK: 'dify', GEN_AI_FRAMEWORK: "dify",
GEN_AI_MODEL_NAME: trace_info.metadata.get('ls_model_name', ''), GEN_AI_MODEL_NAME: trace_info.metadata.get("ls_model_name", ""),
GEN_AI_SYSTEM: trace_info.metadata.get('ls_provider', ''), GEN_AI_SYSTEM: trace_info.metadata.get("ls_provider", ""),
GEN_AI_USAGE_INPUT_TOKENS: str(trace_info.message_tokens), GEN_AI_USAGE_INPUT_TOKENS: str(trace_info.message_tokens),
GEN_AI_USAGE_OUTPUT_TOKENS: str(trace_info.answer_tokens), GEN_AI_USAGE_OUTPUT_TOKENS: str(trace_info.answer_tokens),
GEN_AI_USAGE_TOTAL_TOKENS: str(trace_info.total_tokens), GEN_AI_USAGE_TOTAL_TOKENS: str(trace_info.total_tokens),
@ -186,19 +186,19 @@ class AliyunDataTrace(BaseTraceInstance):
documents_data = extract_retrieval_documents(trace_info.documents) documents_data = extract_retrieval_documents(trace_info.documents)
dataset_retrieval_span = SpanData( dataset_retrieval_span = SpanData(
trace_id=convert_to_trace_id(message_id), trace_id=convert_to_trace_id(message_id),
parent_span_id=convert_to_span_id(message_id, 'message'), parent_span_id=convert_to_span_id(message_id, "message"),
span_id=generate_span_id(), span_id=generate_span_id(),
name='dataset_retrieval', name="dataset_retrieval",
start_time=convert_datetime_to_nanoseconds(trace_info.start_time), start_time=convert_datetime_to_nanoseconds(trace_info.start_time),
end_time=convert_datetime_to_nanoseconds(trace_info.end_time), end_time=convert_datetime_to_nanoseconds(trace_info.end_time),
attributes={ attributes={
GEN_AI_SPAN_KIND: GenAISpanKind.RETRIEVER.value, GEN_AI_SPAN_KIND: GenAISpanKind.RETRIEVER.value,
GEN_AI_FRAMEWORK: 'dify', GEN_AI_FRAMEWORK: "dify",
RETRIEVAL_QUERY: str(trace_info.inputs), RETRIEVAL_QUERY: str(trace_info.inputs),
RETRIEVAL_DOCUMENT: json.dumps(documents_data, ensure_ascii=False), RETRIEVAL_DOCUMENT: json.dumps(documents_data, ensure_ascii=False),
INPUT_VALUE: str(trace_info.inputs), INPUT_VALUE: str(trace_info.inputs),
OUTPUT_VALUE: json.dumps(documents_data, ensure_ascii=False), OUTPUT_VALUE: json.dumps(documents_data, ensure_ascii=False),
} },
) )
self.trace_client.add_span(dataset_retrieval_span) self.trace_client.add_span(dataset_retrieval_span)
@ -213,14 +213,14 @@ class AliyunDataTrace(BaseTraceInstance):
tool_span = SpanData( tool_span = SpanData(
trace_id=convert_to_trace_id(message_id), trace_id=convert_to_trace_id(message_id),
parent_span_id=convert_to_span_id(message_id, 'message'), parent_span_id=convert_to_span_id(message_id, "message"),
span_id=generate_span_id(), span_id=generate_span_id(),
name=trace_info.tool_name, name=trace_info.tool_name,
start_time=convert_datetime_to_nanoseconds(trace_info.start_time), start_time=convert_datetime_to_nanoseconds(trace_info.start_time),
end_time=convert_datetime_to_nanoseconds(trace_info.end_time), end_time=convert_datetime_to_nanoseconds(trace_info.end_time),
attributes={ attributes={
GEN_AI_SPAN_KIND: GenAISpanKind.TOOL.value, GEN_AI_SPAN_KIND: GenAISpanKind.TOOL.value,
GEN_AI_FRAMEWORK: 'dify', GEN_AI_FRAMEWORK: "dify",
TOOL_NAME: trace_info.tool_name, TOOL_NAME: trace_info.tool_name,
TOOL_DESCRIPTION: json.dumps(trace_info.tool_config, ensure_ascii=False), TOOL_DESCRIPTION: json.dumps(trace_info.tool_config, ensure_ascii=False),
TOOL_PARAMETERS: json.dumps(trace_info.tool_inputs, ensure_ascii=False), TOOL_PARAMETERS: json.dumps(trace_info.tool_inputs, ensure_ascii=False),
@ -274,17 +274,13 @@ class AliyunDataTrace(BaseTraceInstance):
trace_info: WorkflowTraceInfo, workflow_span_id: int): trace_info: WorkflowTraceInfo, workflow_span_id: int):
try: try:
if node_execution.node_type == NodeType.LLM: if node_execution.node_type == NodeType.LLM:
node_span = self.build_workflow_llm_span( node_span = self.build_workflow_llm_span(trace_id, workflow_span_id, trace_info, node_execution)
trace_id, workflow_span_id, trace_info, node_execution)
elif node_execution.node_type == NodeType.KNOWLEDGE_RETRIEVAL: elif node_execution.node_type == NodeType.KNOWLEDGE_RETRIEVAL:
node_span = self.build_workflow_retrieval_span( node_span = self.build_workflow_retrieval_span(trace_id, workflow_span_id, trace_info, node_execution)
trace_id, workflow_span_id, trace_info, node_execution)
elif node_execution.node_type == NodeType.TOOL: elif node_execution.node_type == NodeType.TOOL:
node_span = self.build_workflow_tool_span( node_span = self.build_workflow_tool_span(trace_id, workflow_span_id, trace_info, node_execution)
trace_id, workflow_span_id, trace_info, node_execution)
else: else:
node_span = self.build_workflow_task_span( node_span = self.build_workflow_task_span(trace_id, workflow_span_id, trace_info, node_execution)
trace_id, workflow_span_id, trace_info, node_execution)
return node_span return node_span
except Exception: except Exception:
return None return None
@ -297,37 +293,39 @@ class AliyunDataTrace(BaseTraceInstance):
span_status = Status(StatusCode.ERROR, str(node_execution.error)) span_status = Status(StatusCode.ERROR, str(node_execution.error))
return span_status return span_status
def build_workflow_task_span(self, trace_id: int, workflow_span_id: int, trace_info: WorkflowTraceInfo, def build_workflow_task_span(
self, trace_id: int, workflow_span_id: int, trace_info: WorkflowTraceInfo,
node_execution: WorkflowNodeExecution) -> SpanData: node_execution: WorkflowNodeExecution) -> SpanData:
return SpanData( return SpanData(
trace_id=trace_id, trace_id=trace_id,
parent_span_id=workflow_span_id, parent_span_id=workflow_span_id,
span_id=convert_to_span_id(node_execution.id, 'node'), span_id=convert_to_span_id(node_execution.id, "node"),
name=node_execution.title, name=node_execution.title,
start_time=convert_datetime_to_nanoseconds(node_execution.created_at), start_time=convert_datetime_to_nanoseconds(node_execution.created_at),
end_time=convert_datetime_to_nanoseconds(node_execution.finished_at), end_time=convert_datetime_to_nanoseconds(node_execution.finished_at),
attributes={ attributes={
GEN_AI_SESSION_ID: trace_info.metadata.get('conversation_id', ''), GEN_AI_SESSION_ID: trace_info.metadata.get("conversation_id", ""),
GEN_AI_SPAN_KIND: GenAISpanKind.TASK.value, GEN_AI_SPAN_KIND: GenAISpanKind.TASK.value,
GEN_AI_FRAMEWORK: 'dify', GEN_AI_FRAMEWORK: "dify",
INPUT_VALUE: json.dumps(node_execution.inputs, ensure_ascii=False), INPUT_VALUE: json.dumps(node_execution.inputs, ensure_ascii=False),
OUTPUT_VALUE: json.dumps(node_execution.outputs, ensure_ascii=False), OUTPUT_VALUE: json.dumps(node_execution.outputs, ensure_ascii=False),
}, },
status=self.get_workflow_node_status(node_execution), status=self.get_workflow_node_status(node_execution),
) )
def build_workflow_tool_span(self, trace_id: int, workflow_span_id: int, trace_info: WorkflowTraceInfo, def build_workflow_tool_span(
self, trace_id: int, workflow_span_id: int, trace_info: WorkflowTraceInfo,
node_execution: WorkflowNodeExecution) -> SpanData: node_execution: WorkflowNodeExecution) -> SpanData:
return SpanData( return SpanData(
trace_id=trace_id, trace_id=trace_id,
parent_span_id=workflow_span_id, parent_span_id=workflow_span_id,
span_id=convert_to_span_id(node_execution.id, 'node'), span_id=convert_to_span_id(node_execution.id, "node"),
name=node_execution.title, name=node_execution.title,
start_time=convert_datetime_to_nanoseconds(node_execution.created_at), start_time=convert_datetime_to_nanoseconds(node_execution.created_at),
end_time=convert_datetime_to_nanoseconds(node_execution.finished_at), end_time=convert_datetime_to_nanoseconds(node_execution.finished_at),
attributes={ attributes={
GEN_AI_SPAN_KIND: GenAISpanKind.TOOL.value, GEN_AI_SPAN_KIND: GenAISpanKind.TOOL.value,
GEN_AI_FRAMEWORK: 'dify', GEN_AI_FRAMEWORK: "dify",
TOOL_NAME: node_execution.title, TOOL_NAME: node_execution.title,
TOOL_DESCRIPTION: json.dumps( TOOL_DESCRIPTION: json.dumps(
node_execution.metadata.get(WorkflowNodeExecutionMetadataKey.TOOL_INFO, {}), ensure_ascii=False), node_execution.metadata.get(WorkflowNodeExecutionMetadataKey.TOOL_INFO, {}), ensure_ascii=False),
@ -338,49 +336,51 @@ class AliyunDataTrace(BaseTraceInstance):
status=self.get_workflow_node_status(node_execution), status=self.get_workflow_node_status(node_execution),
) )
def build_workflow_retrieval_span(self, trace_id: int, workflow_span_id: int, trace_info: WorkflowTraceInfo, def build_workflow_retrieval_span(
self, trace_id: int, workflow_span_id: int, trace_info: WorkflowTraceInfo,
node_execution: WorkflowNodeExecution) -> SpanData: node_execution: WorkflowNodeExecution) -> SpanData:
return SpanData( return SpanData(
trace_id=trace_id, trace_id=trace_id,
parent_span_id=workflow_span_id, parent_span_id=workflow_span_id,
span_id=convert_to_span_id(node_execution.id, 'node'), span_id=convert_to_span_id(node_execution.id, "node"),
name=node_execution.title, name=node_execution.title,
start_time=convert_datetime_to_nanoseconds(node_execution.created_at), start_time=convert_datetime_to_nanoseconds(node_execution.created_at),
end_time=convert_datetime_to_nanoseconds(node_execution.finished_at), end_time=convert_datetime_to_nanoseconds(node_execution.finished_at),
attributes={ attributes={
GEN_AI_SPAN_KIND: GenAISpanKind.RETRIEVER.value, GEN_AI_SPAN_KIND: GenAISpanKind.RETRIEVER.value,
GEN_AI_FRAMEWORK: 'dify', GEN_AI_FRAMEWORK: "dify",
RETRIEVAL_QUERY: str(node_execution.inputs.get('query', '')), RETRIEVAL_QUERY: str(node_execution.inputs.get("query", "")),
RETRIEVAL_DOCUMENT: json.dumps(node_execution.outputs.get('result', []), ensure_ascii=False), RETRIEVAL_DOCUMENT: json.dumps(node_execution.outputs.get("result", []), ensure_ascii=False),
INPUT_VALUE: str(node_execution.inputs.get('query', '')), INPUT_VALUE: str(node_execution.inputs.get("query", "")),
OUTPUT_VALUE: json.dumps(node_execution.outputs.get('result', []), ensure_ascii=False), OUTPUT_VALUE: json.dumps(node_execution.outputs.get("result", []), ensure_ascii=False),
}, },
status=self.get_workflow_node_status(node_execution), status=self.get_workflow_node_status(node_execution),
) )
def build_workflow_llm_span(self, trace_id: int, workflow_span_id: int, trace_info: WorkflowTraceInfo, def build_workflow_llm_span(
self, trace_id: int, workflow_span_id: int, trace_info: WorkflowTraceInfo,
node_execution: WorkflowNodeExecution) -> SpanData: node_execution: WorkflowNodeExecution) -> SpanData:
return SpanData( return SpanData(
trace_id=trace_id, trace_id=trace_id,
parent_span_id=workflow_span_id, parent_span_id=workflow_span_id,
span_id=convert_to_span_id(node_execution.id, 'node'), span_id=convert_to_span_id(node_execution.id, "node"),
name=node_execution.title, name=node_execution.title,
start_time=convert_datetime_to_nanoseconds(node_execution.created_at), start_time=convert_datetime_to_nanoseconds(node_execution.created_at),
end_time=convert_datetime_to_nanoseconds(node_execution.finished_at), end_time=convert_datetime_to_nanoseconds(node_execution.finished_at),
attributes={ attributes={
GEN_AI_SESSION_ID: trace_info.metadata.get('conversation_id', ''), GEN_AI_SESSION_ID: trace_info.metadata.get("conversation_id", ""),
GEN_AI_SPAN_KIND: GenAISpanKind.LLM.value, GEN_AI_SPAN_KIND: GenAISpanKind.LLM.value,
GEN_AI_FRAMEWORK: 'dify', GEN_AI_FRAMEWORK: "dify",
GEN_AI_MODEL_NAME: node_execution.process_data.get('model_name', ''), GEN_AI_MODEL_NAME: node_execution.process_data.get("model_name", ""),
GEN_AI_SYSTEM: node_execution.process_data.get('model_provider', ''), GEN_AI_SYSTEM: node_execution.process_data.get("model_provider", ""),
GEN_AI_USAGE_INPUT_TOKENS: str(node_execution.outputs.get('usage', {}).get('prompt_tokens', 0)), GEN_AI_USAGE_INPUT_TOKENS: str(node_execution.outputs.get("usage", {}).get("prompt_tokens", 0)),
GEN_AI_USAGE_OUTPUT_TOKENS: str(node_execution.outputs.get('usage', {}).get('completion_tokens', 0)), GEN_AI_USAGE_OUTPUT_TOKENS: str(node_execution.outputs.get("usage", {}).get("completion_tokens", 0)),
GEN_AI_USAGE_TOTAL_TOKENS: str(node_execution.outputs.get('usage', {}).get('total_tokens', 0)), GEN_AI_USAGE_TOTAL_TOKENS: str(node_execution.outputs.get("usage", {}).get("total_tokens", 0)),
GEN_AI_PROMPT: json.dumps(node_execution.process_data.get('prompts', []), ensure_ascii=False), GEN_AI_PROMPT: json.dumps(node_execution.process_data.get("prompts", []), ensure_ascii=False),
GEN_AI_COMPLETION: str(node_execution.outputs.get('text', '')), GEN_AI_COMPLETION: str(node_execution.outputs.get("text", "")),
GEN_AI_RESPONSE_FINISH_REASON: node_execution.outputs.get('finish_reason', ''), GEN_AI_RESPONSE_FINISH_REASON: node_execution.outputs.get("finish_reason", ""),
INPUT_VALUE: json.dumps(node_execution.process_data.get('prompts', []), ensure_ascii=False), INPUT_VALUE: json.dumps(node_execution.process_data.get("prompts", []), ensure_ascii=False),
OUTPUT_VALUE: str(node_execution.outputs.get('text', '')) OUTPUT_VALUE: str(node_execution.outputs.get("text", ""))
}, },
status=self.get_workflow_node_status(node_execution), status=self.get_workflow_node_status(node_execution),
) )
@ -388,7 +388,7 @@ class AliyunDataTrace(BaseTraceInstance):
def add_workflow_span(self, trace_id: int, workflow_span_id: int, trace_info: WorkflowTraceInfo): def add_workflow_span(self, trace_id: int, workflow_span_id: int, trace_info: WorkflowTraceInfo):
message_span_id = None message_span_id = None
if trace_info.message_id: if trace_info.message_id:
message_span_id = convert_to_span_id(trace_info.message_id, 'message') message_span_id = convert_to_span_id(trace_info.message_id, "message")
user_id = trace_info.metadata.get("user_id") user_id = trace_info.metadata.get("user_id")
status: Status = Status(StatusCode.OK) status: Status = Status(StatusCode.OK)
if trace_info.error: if trace_info.error:
@ -398,15 +398,15 @@ class AliyunDataTrace(BaseTraceInstance):
trace_id=trace_id, trace_id=trace_id,
parent_span_id=None, parent_span_id=None,
span_id=message_span_id, span_id=message_span_id,
name='message', name="message",
start_time=convert_datetime_to_nanoseconds(trace_info.start_time), start_time=convert_datetime_to_nanoseconds(trace_info.start_time),
end_time=convert_datetime_to_nanoseconds(trace_info.end_time), end_time=convert_datetime_to_nanoseconds(trace_info.end_time),
attributes={ attributes={
GEN_AI_SESSION_ID: trace_info.metadata.get('conversation_id', ''), GEN_AI_SESSION_ID: trace_info.metadata.get("conversation_id", ""),
GEN_AI_USER_ID: str(user_id), GEN_AI_USER_ID: str(user_id),
GEN_AI_SPAN_KIND: GenAISpanKind.CHAIN.value, GEN_AI_SPAN_KIND: GenAISpanKind.CHAIN.value,
GEN_AI_FRAMEWORK: 'dify', GEN_AI_FRAMEWORK: "dify",
INPUT_VALUE: trace_info.workflow_run_inputs.get('sys.query', ''), INPUT_VALUE: trace_info.workflow_run_inputs.get("sys.query", ""),
OUTPUT_VALUE: json.dumps(trace_info.workflow_run_outputs, ensure_ascii=False), OUTPUT_VALUE: json.dumps(trace_info.workflow_run_outputs, ensure_ascii=False),
}, },
status=status, status=status,
@ -417,13 +417,13 @@ class AliyunDataTrace(BaseTraceInstance):
trace_id=trace_id, trace_id=trace_id,
parent_span_id=message_span_id, parent_span_id=message_span_id,
span_id=workflow_span_id, span_id=workflow_span_id,
name='workflow', name="workflow",
start_time=convert_datetime_to_nanoseconds(trace_info.start_time), start_time=convert_datetime_to_nanoseconds(trace_info.start_time),
end_time=convert_datetime_to_nanoseconds(trace_info.end_time), end_time=convert_datetime_to_nanoseconds(trace_info.end_time),
attributes={ attributes={
GEN_AI_USER_ID: str(user_id), GEN_AI_USER_ID: str(user_id),
GEN_AI_SPAN_KIND: GenAISpanKind.CHAIN.value, GEN_AI_SPAN_KIND: GenAISpanKind.CHAIN.value,
GEN_AI_FRAMEWORK: 'dify', GEN_AI_FRAMEWORK: "dify",
INPUT_VALUE: json.dumps(trace_info.workflow_run_inputs, ensure_ascii=False), INPUT_VALUE: json.dumps(trace_info.workflow_run_inputs, ensure_ascii=False),
OUTPUT_VALUE: json.dumps(trace_info.workflow_run_outputs, ensure_ascii=False), OUTPUT_VALUE: json.dumps(trace_info.workflow_run_outputs, ensure_ascii=False),
}, },
@ -438,16 +438,16 @@ class AliyunDataTrace(BaseTraceInstance):
status = Status(StatusCode.ERROR, trace_info.error) status = Status(StatusCode.ERROR, trace_info.error)
suggested_question_span = SpanData( suggested_question_span = SpanData(
trace_id=convert_to_trace_id(message_id), trace_id=convert_to_trace_id(message_id),
parent_span_id=convert_to_span_id(message_id, 'message'), parent_span_id=convert_to_span_id(message_id, "message"),
span_id=convert_to_span_id(message_id, 'suggested_question'), span_id=convert_to_span_id(message_id, "suggested_question"),
name='suggested_question', name="suggested_question",
start_time=convert_datetime_to_nanoseconds(trace_info.start_time), start_time=convert_datetime_to_nanoseconds(trace_info.start_time),
end_time=convert_datetime_to_nanoseconds(trace_info.end_time), end_time=convert_datetime_to_nanoseconds(trace_info.end_time),
attributes={ attributes={
GEN_AI_SPAN_KIND: GenAISpanKind.LLM.value, GEN_AI_SPAN_KIND: GenAISpanKind.LLM.value,
GEN_AI_FRAMEWORK: 'dify', GEN_AI_FRAMEWORK: "dify",
GEN_AI_MODEL_NAME: trace_info.metadata.get('ls_model_name', ''), GEN_AI_MODEL_NAME: trace_info.metadata.get("ls_model_name", ""),
GEN_AI_SYSTEM: trace_info.metadata.get('ls_provider', ''), GEN_AI_SYSTEM: trace_info.metadata.get("ls_provider", ""),
GEN_AI_PROMPT: json.dumps(trace_info.inputs, ensure_ascii=False), GEN_AI_PROMPT: json.dumps(trace_info.inputs, ensure_ascii=False),
GEN_AI_COMPLETION: json.dumps(trace_info.suggested_question, ensure_ascii=False), GEN_AI_COMPLETION: json.dumps(trace_info.suggested_question, ensure_ascii=False),
INPUT_VALUE: json.dumps(trace_info.inputs, ensure_ascii=False), INPUT_VALUE: json.dumps(trace_info.inputs, ensure_ascii=False),
@ -464,11 +464,11 @@ def extract_retrieval_documents(documents: list[Document]):
document_data = { document_data = {
"content": document.page_content, "content": document.page_content,
"metadata": { "metadata": {
"dataset_id": document.metadata.get('dataset_id'), "dataset_id": document.metadata.get("dataset_id"),
"doc_id": document.metadata.get('doc_id'), "doc_id": document.metadata.get("doc_id"),
"document_id": document.metadata.get('document_id'), "document_id": document.metadata.get("document_id"),
}, },
"score": document.metadata.get('score'), "score": document.metadata.get("score"),
} }
documents_data.append(document_data) documents_data.append(document_data)
return documents_data return documents_data

4
api/core/ops/aliyun_trace/data_exporter/traceclient.py
Unescape Escape View File

@ -70,7 +70,7 @@ class TraceClient:
raise ValueError(f"AliyunTrace API check failed: {str(e)}") raise ValueError(f"AliyunTrace API check failed: {str(e)}")
def get_project_url(self): def get_project_url(self):
return 'https://arms.console.aliyun.com/#/llm' return "https://arms.console.aliyun.com/#/llm"
def add_span(self, span_data: SpanData): def add_span(self, span_data: SpanData):
if span_data is None: if span_data is None:
@ -181,7 +181,7 @@ def convert_to_span_id(uuid_v4: str, span_type: str) -> int:
except Exception as e: except Exception as e:
raise ValueError(f"Invalid UUID input: {e}") raise ValueError(f"Invalid UUID input: {e}")
combined_key = f"{uuid_obj.hex}-{span_type}" combined_key = f"{uuid_obj.hex}-{span_type}"
hash_bytes = hashlib.sha256(combined_key.encode('utf-8')).digest() hash_bytes = hashlib.sha256(combined_key.encode("utf-8")).digest()
span_id = int.from_bytes(hash_bytes[:8], byteorder="big", signed=False) span_id = int.from_bytes(hash_bytes[:8], byteorder="big", signed=False)
return span_id return span_id

50
api/core/ops/aliyun_trace/entities/semconv.py
Unescape Escape View File

@ -13,53 +13,53 @@ GEN_AI_FRAMEWORK = "gen_ai.framework"
# Chain # Chain
INPUT_VALUE = 'input.value' INPUT_VALUE = "input.value"
OUTPUT_VALUE = 'output.value' OUTPUT_VALUE = "output.value"
#Retriever #Retriever
RETRIEVAL_QUERY = 'retrieval.query' RETRIEVAL_QUERY = "retrieval.query"
RETRIEVAL_DOCUMENT = 'retrieval.document' RETRIEVAL_DOCUMENT = "retrieval.document"
#LLM #LLM
GEN_AI_MODEL_NAME = 'gen_ai.model_name' GEN_AI_MODEL_NAME = "gen_ai.model_name"
GEN_AI_SYSTEM = 'gen_ai.system' GEN_AI_SYSTEM = "gen_ai.system"
GEN_AI_USAGE_INPUT_TOKENS = 'gen_ai.usage.input_tokens' GEN_AI_USAGE_INPUT_TOKENS = "gen_ai.usage.input_tokens"
GEN_AI_USAGE_OUTPUT_TOKENS = 'gen_ai.usage.output_tokens' GEN_AI_USAGE_OUTPUT_TOKENS = "gen_ai.usage.output_tokens"
GEN_AI_USAGE_TOTAL_TOKENS = 'gen_ai.usage.total_tokens' GEN_AI_USAGE_TOTAL_TOKENS = "gen_ai.usage.total_tokens"
GEN_AI_PROMPT_TEMPLATE_TEMPLATE = 'gen_ai.prompt_template.template' GEN_AI_PROMPT_TEMPLATE_TEMPLATE = "gen_ai.prompt_template.template"
GEN_AI_PROMPT_TEMPLATE_VARIABLE = 'gen_ai.prompt_template.variable' GEN_AI_PROMPT_TEMPLATE_VARIABLE = "gen_ai.prompt_template.variable"
GEN_AI_PROMPT = 'gen_ai.prompt' GEN_AI_PROMPT = "gen_ai.prompt"
GEN_AI_COMPLETION = 'gem_ai.completion' GEN_AI_COMPLETION = "gem_ai.completion"
GEN_AI_RESPONSE_FINISH_REASON = 'gen_ai.response.finish_reason' GEN_AI_RESPONSE_FINISH_REASON = "gen_ai.response.finish_reason"
#Tool #Tool
TOOL_NAME = 'tool.name' TOOL_NAME = "tool.name"
TOOL_DESCRIPTION = 'tool.description' TOOL_DESCRIPTION = "tool.description"
TOOL_PARAMETERS = 'tool.parameters' TOOL_PARAMETERS = "tool.parameters"
class GenAISpanKind(Enum): class GenAISpanKind(Enum):
CHAIN = 'CHAIN' CHAIN = "CHAIN"
RETRIEVER = 'RETRIEVER' RETRIEVER = "RETRIEVER"
RERANKER = 'RERANKER' RERANKER = "RERANKER"
LLM = 'LLM' LLM = "LLM"
EMBEDDING = 'EMBEDDING' EMBEDDING = "EMBEDDING"
TOOL = 'TOOL' TOOL = "TOOL"
AGENT = 'AGENT' AGENT = "AGENT"
TASK = 'TASK' TASK = "TASK"

1
api/core/ops/entities/config_entity.py
Unescape Escape View File

@ -119,6 +119,7 @@ class WeaveConfig(BaseTracingConfig):
raise ValueError("host must start with https:// or http://") raise ValueError("host must start with https:// or http://")
return v return v
class AliyunConfig(BaseTracingConfig): class AliyunConfig(BaseTracingConfig):
""" """
Model class for Aliyun tracing config. Model class for Aliyun tracing config.

2
api/core/ops/ops_trace_manager.py
Unescape Escape View File

@ -92,7 +92,7 @@ class OpsTraceProviderConfigMap(dict[str, dict[str, Any]]):
return { return {
"config_class": AliyunConfig, "config_class": AliyunConfig,
"secret_keys": ["license_key"], "secret_keys": ["license_key"],
"other_keys": ["endpoint","app_name"], "other_keys": ["endpoint", "app_name"],
"trace_instance": AliyunDataTrace, "trace_instance": AliyunDataTrace,
} }

Write Preview
Loading…
Cancel
Save