resolve conflicts

Author: RulaKhaled

packages/core/src/tracing/langgraph/index.ts

@@ -8,10 +8,10 @@ import {
   GEN_AI_PIPELINE_NAME_ATTRIBUTE,
   GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE,
   GEN_AI_REQUEST_MESSAGES_ATTRIBUTE,
-} from '../../utils/ai/gen-ai-attributes';
-import { truncateGenAiMessages } from '../../utils/ai/messageTruncation';
-import type { LangChainMessage } from '../../utils/langchain/types';
-import { normalizeLangChainMessages } from '../../utils/langchain/utils';
+} from '../ai/gen-ai-attributes';
+import { truncateGenAiMessages } from '../ai/messageTruncation';
+import type { LangChainMessage } from '../langchain/types';
+import { normalizeLangChainMessages } from '../langchain/utils';
 import { startSpan } from '../trace';
 import { LANGGRAPH_ORIGIN } from './constants';
 import type { CompiledGraph, LangGraphOptions } from './types';

packages/core/src/tracing/langgraph/utils.ts

@@ -7,9 +7,9 @@ import {
   GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE,
   GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE,
   GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE,
-} from '../../utils/ai/gen-ai-attributes';
-import type { LangChainMessage } from '../../utils/langchain/types';
-import { normalizeLangChainMessages } from '../../utils/langchain/utils';
+} from '../ai/gen-ai-attributes';
+import type { LangChainMessage } from '../langchain/types';
+import { normalizeLangChainMessages } from '../langchain/utils';
 import type { CompiledGraph, LangGraphTool } from './types';
 
 /**