|  | @@ -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,
 |