适配datajuicer

Author: hhhhsc701

runtime/datamate-python/app/module/cleaning/__init__.py

@@ -19,7 +19,7 @@
 )
 
 from .service import (
-    CleanTaskValidator,
+    CleaningTaskValidator,
     CleaningTaskScheduler,
     CleaningTemplateService,
     CleaningTaskService,
@@ -42,7 +42,7 @@
     "CleaningTemplateRepository",
     "CleaningResultRepository",
     "OperatorInstanceRepository",
-    "CleanTaskValidator",
+    "CleaningTaskValidator",
     "CleaningTaskScheduler",
     "CleaningTemplateService",
     "CleaningTaskService",

runtime/datamate-python/app/module/cleaning/interface/cleaning_task_routes.py

@@ -44,7 +44,7 @@ def _get_task_service(db: AsyncSession) -> CleaningTaskService:
     """Get cleaning task service instance"""
     from app.module.cleaning.service import (
         CleaningTaskScheduler,
-        CleanTaskValidator,
+        CleaningTaskValidator,
     )
     from app.module.cleaning.repository import (
         CleaningTaskRepository,
@@ -72,7 +72,7 @@ def _get_task_service(db: AsyncSession) -> CleaningTaskService:
         operator_instance_repo=OperatorInstanceRepository(None),
         operator_service=operator_service,
         scheduler=scheduler,
-        validator=CleanTaskValidator(task_repo=task_repo, template_repo=None),
+        validator=CleaningTaskValidator(task_repo=task_repo, template_repo=None),
         dataset_service=dataset_service,
         lineage_service=lineage_service,
     )

runtime/datamate-python/app/module/cleaning/interface/cleaning_template_routes.py

@@ -43,7 +43,7 @@ def _get_operator_service():
 
 def _get_template_service(db: AsyncSession) -> CleaningTemplateService:
     """Get cleaning template service instance"""
-    from app.module.cleaning.service import CleanTaskValidator
+    from app.module.cleaning.service import CleaningTaskValidator
     from app.module.cleaning.repository import (
         CleaningTemplateRepository,
         OperatorInstanceRepository,
@@ -57,7 +57,7 @@ def _get_template_service(db: AsyncSession) -> CleaningTemplateService:
         template_repo=template_repo,
         operator_instance_repo=OperatorInstanceRepository(None),
         operator_service=operator_service,
-        validator=CleanTaskValidator(task_repo=None, template_repo=template_repo),
+        validator=CleaningTaskValidator(task_repo=None, template_repo=template_repo),
     )
 
 

runtime/datamate-python/app/module/cleaning/service/__init__.py

@@ -1,10 +1,10 @@
-from .clean_task_validator import CleanTaskValidator
+from .cleaning_task_validator import CleaningTaskValidator
 from .cleaning_task_scheduler import CleaningTaskScheduler
 from .cleaning_template_service import CleaningTemplateService
 from .cleaning_task_service import CleaningTaskService
 
 __all__ = [
-    "CleanTaskValidator",
+    "CleaningTaskValidator",
     "CleaningTaskScheduler",
     "CleaningTemplateService",
     "CleaningTaskService",

runtime/datamate-python/app/module/cleaning/service/cleaning_task_service.py

@@ -25,7 +25,7 @@
     CleaningProcess,
     CleaningTaskStatus,
 )
-from app.module.cleaning.service.clean_task_validator import CleanTaskValidator
+from app.module.cleaning.service.cleaning_task_validator import CleaningTaskValidator
 from app.module.cleaning.service.cleaning_task_scheduler import CleaningTaskScheduler
 from app.module.shared.common.lineage import LineageService
 from app.module.shared.schema.lineage import NodeType, EdgeType
@@ -46,7 +46,7 @@ def __init__(
         operator_instance_repo: OperatorInstanceRepository,
         operator_service,
         scheduler: CleaningTaskScheduler,
-        validator: CleanTaskValidator,
+        validator: CleaningTaskValidator,
         dataset_service,
         lineage_service: LineageService,
     ):

…cleaning/service/clean_task_validator.py …aning/service/cleaning_task_validator.pyruntime/datamate-python/app/module/cleaning/service/clean_task_validator.py renamed to runtime/datamate-python/app/module/cleaning/service/cleaning_task_validator.py runtime/datamate-python/app/module/cleaning/service/clean_task_validator.py renamed to runtime/datamate-python/app/module/cleaning/service/cleaning_task_validator.py

@@ -4,7 +4,7 @@
 from app.module.cleaning.schema import OperatorInstanceDto
 
 
-class CleanTaskValidator:
+class CleaningTaskValidator:
     """Validator for cleaning tasks and templates"""
 
     def __init__(self, task_repo=None, template_repo=None):
@@ -69,7 +69,7 @@ def check_and_get_executor_type(instances: list[OperatorInstanceDto]) -> str:
             if instance.categories:
                 for category in instance.categories:
                     if "datajuicer" in category.lower():
-                        executor_types.add("datajuicer")
+                        executor_types.add("default")
                     elif "datamate" in category.lower():
                         executor_types.add("datamate")
 

runtime/datamate-python/app/module/cleaning/service/cleaning_template_service.py

@@ -16,7 +16,7 @@
     CreateCleaningTemplateRequest,
     OperatorInstanceDto,
 )
-from app.module.cleaning.service.clean_task_validator import CleanTaskValidator
+from app.module.cleaning.service.cleaning_task_validator import CleaningTaskValidator
 
 logger = get_logger(__name__)
 
@@ -29,7 +29,7 @@ def __init__(
         template_repo: CleaningTemplateRepository,
         operator_instance_repo: OperatorInstanceRepository,
         operator_service,
-        validator: CleanTaskValidator,
+        validator: CleaningTaskValidator,
     ):
         self.template_repo = template_repo
         self.operator_instance_repo = operator_instance_repo