refactor complete

backend/src/plugins/mapper.py

@@ -12,8 +12,7 @@ from ..core.superset_client import SupersetClient
 from ..core.logger import logger, belief_scope
 from ..core.database import SessionLocal
 from ..models.connection import ConnectionConfig
-from superset_tool.utils.dataset_mapper import DatasetMapper
-from superset_tool.utils.logger import SupersetLogger
+from ..core.utils.dataset_mapper import DatasetMapper
 # [/SECTION]
 
 # [DEF:MapperPlugin:Class]
@@ -137,25 +136,13 @@ class MapperPlugin(PluginBase):
 
             # Get config and initialize client
             from ..dependencies import get_config_manager
-            from superset_tool.models import SupersetConfig
             config_manager = get_config_manager()
             env_config = config_manager.get_environment(env_name)
             if not env_config:
                 logger.error(f"[MapperPlugin.execute][State] Environment '{env_name}' not found.")
                 raise ValueError(f"Environment '{env_name}' not found in configuration.")
 
-            # Map Environment model to SupersetConfig
-            superset_config = SupersetConfig(
-                env=env_config.name,
-                base_url=env_config.url,
-                auth={
-                    "provider": "db",  # Defaulting to db provider
-                    "username": env_config.username,
-                    "password": env_config.password,
-                    "refresh": "false"
-                }
-            )
-            client = SupersetClient(superset_config)
+            client = SupersetClient(env_config)
             client.authenticate()
 
             postgres_config = None
@@ -185,9 +172,7 @@ class MapperPlugin(PluginBase):
 
             logger.info(f"[MapperPlugin.execute][Action] Starting mapping for dataset {dataset_id} in {env_name}")
             
-            # Use internal SupersetLogger for DatasetMapper
-            s_logger = SupersetLogger(name="dataset_mapper_plugin")
-            mapper = DatasetMapper(s_logger)
+            mapper = DatasetMapper()
             
             try:
                 mapper.run_mapping(