From f637ae4794a09a7d800d4e4d80e825c3e079529f Mon Sep 17 00:00:00 2001 From: Joe <79627742+ZhouhaoJiang@users.noreply.github.com> Date: Sun, 30 Jun 2024 01:12:16 +0800 Subject: [PATCH] fix: langsmith message_trace end_user_data session_id error (#5759) --- api/core/ops/langfuse_trace/langfuse_trace.py | 4 +++- api/core/ops/langsmith_trace/langsmith_trace.py | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/api/core/ops/langfuse_trace/langfuse_trace.py b/api/core/ops/langfuse_trace/langfuse_trace.py index 06eb3e2f43..5b5d5def1b 100644 --- a/api/core/ops/langfuse_trace/langfuse_trace.py +++ b/api/core/ops/langfuse_trace/langfuse_trace.py @@ -215,7 +215,9 @@ class LangFuseDataTrace(BaseTraceInstance): end_user_data: EndUser = db.session.query(EndUser).filter( EndUser.id == message_data.from_end_user_id ).first() - user_id = end_user_data.session_id + if end_user_data is not None: + user_id = end_user_data.session_id + metadata["user_id"] = user_id trace_data = LangfuseTrace( id=message_id, diff --git a/api/core/ops/langsmith_trace/langsmith_trace.py b/api/core/ops/langsmith_trace/langsmith_trace.py index 1dbda601ed..0fee076d55 100644 --- a/api/core/ops/langsmith_trace/langsmith_trace.py +++ b/api/core/ops/langsmith_trace/langsmith_trace.py @@ -183,13 +183,15 @@ class LangSmithDataTrace(BaseTraceInstance): message_id = message_data.id user_id = message_data.from_account_id + metadata["user_id"] = user_id + if message_data.from_end_user_id: end_user_data: EndUser = db.session.query(EndUser).filter( EndUser.id == message_data.from_end_user_id - ).first().session_id - end_user_id = end_user_data.session_id - metadata["end_user_id"] = end_user_id - metadata["user_id"] = user_id + ).first() + if end_user_data is not None: + end_user_id = end_user_data.session_id + metadata["end_user_id"] = end_user_id message_run = LangSmithRunModel( input_tokens=trace_info.message_tokens,