resolve: conflicts

api/core/ops/ops_trace_manager.py

@@ -16,11 +16,6 @@ from sqlalchemy.orm import Session
 from core.helper.encrypter import decrypt_token, encrypt_token, obfuscated_token
 from core.ops.entities.config_entity import (
     OPS_FILE_PATH,
-    ArizeConfig,
-    PhoenixConfig,
-    LangfuseConfig,
-    LangSmithConfig,
-    OpikConfig,
     TracingProviderEnum,
 )
 from core.ops.entities.trace_entity import (
@@ -34,10 +29,6 @@ from core.ops.entities.trace_entity import (
     TraceTaskName,
     WorkflowTraceInfo,
 )
-from core.ops.arize_phoenix_trace.arize_phoenix_trace import ArizePhoenixDataTrace
-from core.ops.langfuse_trace.langfuse_trace import LangFuseDataTrace
-from core.ops.langsmith_trace.langsmith_trace import LangSmithDataTrace
-from core.ops.opik_trace.opik_trace import OpikDataTrace
 from core.ops.utils import get_message_data
 from core.workflow.entities.workflow_execution import WorkflowExecution
 from extensions.ext_database import db
@@ -94,8 +85,8 @@ class OpsTraceProviderConfigMap(dict[str, dict[str, Any]]):
                     "trace_instance": WeaveDataTrace,
                 }
             case TraceAppConfig.ARIZE:
-                from core.ops.entities.config_entity import ArizeConfig
                 from core.ops.arize_phoenix_trace.arize_phoenix_trace import ArizePhoenixDataTrace
+                from core.ops.entities.config_entity import ArizeConfig
                 return {
                     "config_class": ArizeConfig,
                     "secret_keys": ["api_key", "space_id"],
@@ -103,8 +94,8 @@ class OpsTraceProviderConfigMap(dict[str, dict[str, Any]]):
                     "trace_instance": ArizePhoenixDataTrace,
                 }
             case TraceAppConfig.PHOENIX:
-                from core.ops.entities.config_entity import PhoenixConfig
                 from core.ops.arize_phoenix_trace.arize_phoenix_trace import ArizePhoenixDataTrace
+                from core.ops.entities.config_entity import PhoenixConfig
                 return {
                     "config_class": PhoenixConfig,
                     "secret_keys": ["api_key"],