mirror of
https://github.com/langgenius/dify.git
synced 2024-11-16 03:32:23 +08:00
fix(ops_tracing): enhance error handle in celery tasks. (#10401)
This commit is contained in:
parent
033ab5490b
commit
aa3da0e24c
|
@ -54,3 +54,7 @@ class LangSmithConfig(BaseTracingConfig):
|
||||||
raise ValueError("endpoint must start with https://")
|
raise ValueError("endpoint must start with https://")
|
||||||
|
|
||||||
return v
|
return v
|
||||||
|
|
||||||
|
|
||||||
|
OPS_FILE_PATH = "ops_trace/"
|
||||||
|
OPS_TRACE_FAILED_KEY = "FAILED_OPS_TRACE"
|
||||||
|
|
|
@ -23,6 +23,11 @@ class BaseTraceInfo(BaseModel):
|
||||||
return v
|
return v
|
||||||
return ""
|
return ""
|
||||||
|
|
||||||
|
class Config:
|
||||||
|
json_encoders = {
|
||||||
|
datetime: lambda v: v.isoformat(),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
class WorkflowTraceInfo(BaseTraceInfo):
|
class WorkflowTraceInfo(BaseTraceInfo):
|
||||||
workflow_data: Any
|
workflow_data: Any
|
||||||
|
@ -100,6 +105,12 @@ class GenerateNameTraceInfo(BaseTraceInfo):
|
||||||
tenant_id: str
|
tenant_id: str
|
||||||
|
|
||||||
|
|
||||||
|
class TaskData(BaseModel):
|
||||||
|
app_id: str
|
||||||
|
trace_info_type: str
|
||||||
|
trace_info: Any
|
||||||
|
|
||||||
|
|
||||||
trace_info_info_map = {
|
trace_info_info_map = {
|
||||||
"WorkflowTraceInfo": WorkflowTraceInfo,
|
"WorkflowTraceInfo": WorkflowTraceInfo,
|
||||||
"MessageTraceInfo": MessageTraceInfo,
|
"MessageTraceInfo": MessageTraceInfo,
|
||||||
|
|
|
@ -6,12 +6,13 @@ import threading
|
||||||
import time
|
import time
|
||||||
from datetime import timedelta
|
from datetime import timedelta
|
||||||
from typing import Any, Optional, Union
|
from typing import Any, Optional, Union
|
||||||
from uuid import UUID
|
from uuid import UUID, uuid4
|
||||||
|
|
||||||
from flask import current_app
|
from flask import current_app
|
||||||
|
|
||||||
from core.helper.encrypter import decrypt_token, encrypt_token, obfuscated_token
|
from core.helper.encrypter import decrypt_token, encrypt_token, obfuscated_token
|
||||||
from core.ops.entities.config_entity import (
|
from core.ops.entities.config_entity import (
|
||||||
|
OPS_FILE_PATH,
|
||||||
LangfuseConfig,
|
LangfuseConfig,
|
||||||
LangSmithConfig,
|
LangSmithConfig,
|
||||||
TracingProviderEnum,
|
TracingProviderEnum,
|
||||||
|
@ -22,6 +23,7 @@ from core.ops.entities.trace_entity import (
|
||||||
MessageTraceInfo,
|
MessageTraceInfo,
|
||||||
ModerationTraceInfo,
|
ModerationTraceInfo,
|
||||||
SuggestedQuestionTraceInfo,
|
SuggestedQuestionTraceInfo,
|
||||||
|
TaskData,
|
||||||
ToolTraceInfo,
|
ToolTraceInfo,
|
||||||
TraceTaskName,
|
TraceTaskName,
|
||||||
WorkflowTraceInfo,
|
WorkflowTraceInfo,
|
||||||
|
@ -30,6 +32,7 @@ from core.ops.langfuse_trace.langfuse_trace import LangFuseDataTrace
|
||||||
from core.ops.langsmith_trace.langsmith_trace import LangSmithDataTrace
|
from core.ops.langsmith_trace.langsmith_trace import LangSmithDataTrace
|
||||||
from core.ops.utils import get_message_data
|
from core.ops.utils import get_message_data
|
||||||
from extensions.ext_database import db
|
from extensions.ext_database import db
|
||||||
|
from extensions.ext_storage import storage
|
||||||
from models.model import App, AppModelConfig, Conversation, Message, MessageAgentThought, MessageFile, TraceAppConfig
|
from models.model import App, AppModelConfig, Conversation, Message, MessageAgentThought, MessageFile, TraceAppConfig
|
||||||
from models.workflow import WorkflowAppLog, WorkflowRun
|
from models.workflow import WorkflowAppLog, WorkflowRun
|
||||||
from tasks.ops_trace_task import process_trace_tasks
|
from tasks.ops_trace_task import process_trace_tasks
|
||||||
|
@ -740,10 +743,17 @@ class TraceQueueManager:
|
||||||
def send_to_celery(self, tasks: list[TraceTask]):
|
def send_to_celery(self, tasks: list[TraceTask]):
|
||||||
with self.flask_app.app_context():
|
with self.flask_app.app_context():
|
||||||
for task in tasks:
|
for task in tasks:
|
||||||
|
file_id = uuid4().hex
|
||||||
trace_info = task.execute()
|
trace_info = task.execute()
|
||||||
task_data = {
|
task_data = TaskData(
|
||||||
|
app_id=task.app_id,
|
||||||
|
trace_info_type=type(trace_info).__name__,
|
||||||
|
trace_info=trace_info.model_dump() if trace_info else None,
|
||||||
|
)
|
||||||
|
file_path = f"{OPS_FILE_PATH}{task.app_id}/{file_id}.json"
|
||||||
|
storage.save(file_path, task_data.model_dump_json().encode("utf-8"))
|
||||||
|
file_info = {
|
||||||
|
"file_id": file_id,
|
||||||
"app_id": task.app_id,
|
"app_id": task.app_id,
|
||||||
"trace_info_type": type(trace_info).__name__,
|
|
||||||
"trace_info": trace_info.model_dump() if trace_info else {},
|
|
||||||
}
|
}
|
||||||
process_trace_tasks.delay(task_data)
|
process_trace_tasks.delay(file_info)
|
||||||
|
|
|
@ -1,17 +1,20 @@
|
||||||
|
import json
|
||||||
import logging
|
import logging
|
||||||
import time
|
|
||||||
|
|
||||||
from celery import shared_task
|
from celery import shared_task
|
||||||
from flask import current_app
|
from flask import current_app
|
||||||
|
|
||||||
|
from core.ops.entities.config_entity import OPS_FILE_PATH, OPS_TRACE_FAILED_KEY
|
||||||
from core.ops.entities.trace_entity import trace_info_info_map
|
from core.ops.entities.trace_entity import trace_info_info_map
|
||||||
from core.rag.models.document import Document
|
from core.rag.models.document import Document
|
||||||
|
from extensions.ext_redis import redis_client
|
||||||
|
from extensions.ext_storage import storage
|
||||||
from models.model import Message
|
from models.model import Message
|
||||||
from models.workflow import WorkflowRun
|
from models.workflow import WorkflowRun
|
||||||
|
|
||||||
|
|
||||||
@shared_task(queue="ops_trace")
|
@shared_task(queue="ops_trace")
|
||||||
def process_trace_tasks(tasks_data):
|
def process_trace_tasks(file_info):
|
||||||
"""
|
"""
|
||||||
Async process trace tasks
|
Async process trace tasks
|
||||||
:param tasks_data: List of dictionaries containing task data
|
:param tasks_data: List of dictionaries containing task data
|
||||||
|
@ -20,9 +23,12 @@ def process_trace_tasks(tasks_data):
|
||||||
"""
|
"""
|
||||||
from core.ops.ops_trace_manager import OpsTraceManager
|
from core.ops.ops_trace_manager import OpsTraceManager
|
||||||
|
|
||||||
trace_info = tasks_data.get("trace_info")
|
app_id = file_info.get("app_id")
|
||||||
app_id = tasks_data.get("app_id")
|
file_id = file_info.get("file_id")
|
||||||
trace_info_type = tasks_data.get("trace_info_type")
|
file_path = f"{OPS_FILE_PATH}{app_id}/{file_id}.json"
|
||||||
|
file_data = json.loads(storage.load(file_path))
|
||||||
|
trace_info = file_data.get("trace_info")
|
||||||
|
trace_info_type = file_data.get("trace_info_type")
|
||||||
trace_instance = OpsTraceManager.get_ops_trace_instance(app_id)
|
trace_instance = OpsTraceManager.get_ops_trace_instance(app_id)
|
||||||
|
|
||||||
if trace_info.get("message_data"):
|
if trace_info.get("message_data"):
|
||||||
|
@ -39,6 +45,10 @@ def process_trace_tasks(tasks_data):
|
||||||
if trace_type:
|
if trace_type:
|
||||||
trace_info = trace_type(**trace_info)
|
trace_info = trace_type(**trace_info)
|
||||||
trace_instance.trace(trace_info)
|
trace_instance.trace(trace_info)
|
||||||
end_at = time.perf_counter()
|
logging.info(f"Processing trace tasks success, app_id: {app_id}")
|
||||||
except Exception:
|
except Exception:
|
||||||
logging.exception("Processing trace tasks failed")
|
failed_key = f"{OPS_TRACE_FAILED_KEY}_{app_id}"
|
||||||
|
redis_client.incr(failed_key)
|
||||||
|
logging.info(f"Processing trace tasks failed, app_id: {app_id}")
|
||||||
|
finally:
|
||||||
|
storage.delete(file_path)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user