fix: adapt the latest java trigger worflow code (#156)

* Change docker build command
* fix according to latest PythongGateway.java code

Author: zhongjiajie

.github/workflows/ci.yaml

@@ -197,14 +197,11 @@ jobs:
       # Switch to project root directory to run mvnw command
       - name: Build Image
         working-directory: dolphinscheduler
-
         run: |
           ./mvnw -B clean install \
-          -Dmaven.test.skip \
-          -Dmaven.javadoc.skip \
-          -Dcheckstyle.skip=true \
-          -Pdocker,release -Ddocker.tag=ci \
-          -pl dolphinscheduler-standalone-server -am
+              -Dmaven.test.skip=true \
+              -Dspotless.skip=true \
+              -Pdocker,staging -Ddocker.tag=ci
       - name: Set up Python
         uses: actions/setup-python@v4
         with:

src/pydolphinscheduler/constants.py

@@ -56,7 +56,7 @@ class TaskType(str):
     HTTP = "HTTP"
     PYTHON = "PYTHON"
     SQL = "SQL"
-    SUB_WORKFLOW = "SUB_PROCESS"
+    SUB_WORKFLOW = "SUB_WORKFLOW"
     PROCEDURE = "PROCEDURE"
     DATAX = "DATAX"
     DEPENDENT = "DEPENDENT"

src/pydolphinscheduler/core/workflow.py

@@ -484,9 +484,7 @@ def start(self) -> None:
             self._user,
             self._project,
             self.name,
-            "",
             self.worker_group,
             self.warning_type,
             self.warning_group_id,
-            24 * 3600,
         )

src/pydolphinscheduler/java_gateway.py

@@ -299,22 +299,18 @@ def exec_workflow_instance(
         user_name: str,
         project_name: str,
         workflow_name: str,
-        cron_time: str,
         worker_group: str,
         warning_type: str,
         warning_group_id: int,
-        timeout: int,
     ):
         """Exec workflow instance through java gateway."""
         return self.gateway.entry_point.execWorkflowInstance(
             user_name,
             project_name,
             workflow_name,
-            cron_time,
             worker_group,
             warning_type,
             warning_group_id,
-            timeout,
         )
 
 

src/pydolphinscheduler/tasks/dependent.py

@@ -135,8 +135,8 @@ def project_code(self) -> str:
 
     @property
     def definition_code(self) -> str:
-        """Get dependent definition code."""
-        return self.get_code_from_gateway().get("processDefinitionCode")
+        """Get dependent workflow code."""
+        return self.get_code_from_gateway().get("workflowDefinitionCode")
 
     @property
     def dep_task_code(self) -> str:

src/pydolphinscheduler/tasks/sub_workflow.py

@@ -28,14 +28,14 @@
 class SubWorkflow(BatchTask):
     """Task SubWorkflow object, declare behavior for SubWorkflow task to dolphinscheduler."""
 
-    _task_custom_attr = {"process_definition_code"}
+    _task_custom_attr = {"workflow_definition_code"}
 
     def __init__(self, name: str, workflow_name: str, *args, **kwargs):
         super().__init__(name, TaskType.SUB_WORKFLOW, *args, **kwargs)
         self.workflow_name = workflow_name
 
     @property
-    def process_definition_code(self) -> str:
+    def workflow_definition_code(self) -> str:
         """Get workflow code, a wrapper for :func:`get_workflow_info`.
 
         We can not change this function name to workflow_code, because it is a keyword used in

tests/core/test_yaml_workflow.py

@@ -190,7 +190,7 @@ def test_get_error(task_type):
     "pydolphinscheduler.tasks.dependent.DependentItem.get_code_from_gateway",
     return_value={
         "projectCode": 0,
-        "processDefinitionCode": 0,
+        "workflowDefinitionCode": 0,
         "taskDefinitionCode": 0,
     },
 )

tests/tasks/test_dependent.py

@@ -78,7 +78,7 @@
     "pydolphinscheduler.tasks.dependent.DependentItem.get_code_from_gateway",
     return_value={
         "projectCode": TEST_PROJECT_CODE,
-        "processDefinitionCode": TEST_DEFINITION_CODE,
+        "workflowDefinitionCode": TEST_DEFINITION_CODE,
         "taskDefinitionCode": TEST_TASK_CODE,
     },
 )
@@ -117,7 +117,7 @@ def test_dependent_item_get_define(mock_task_info, dep_date, dep_cycle):
     "pydolphinscheduler.tasks.dependent.DependentItem.get_code_from_gateway",
     return_value={
         "projectCode": TEST_PROJECT_CODE,
-        "processDefinitionCode": TEST_DEFINITION_CODE,
+        "workflowDefinitionCode": TEST_DEFINITION_CODE,
         "taskDefinitionCode": TEST_TASK_CODE,
     },
 )
@@ -212,7 +212,7 @@ def test_dependent_item_code_parameter(task_name: dict, result: str | None):
     "pydolphinscheduler.tasks.dependent.DependentItem.get_code_from_gateway",
     return_value={
         "projectCode": TEST_PROJECT_CODE,
-        "processDefinitionCode": TEST_DEFINITION_CODE,
+        "workflowDefinitionCode": TEST_DEFINITION_CODE,
         "taskDefinitionCode": TEST_TASK_CODE,
     },
 )
@@ -353,7 +353,7 @@ def test_dependent_operator_set_define_error(mock_code, arg_list):
     "pydolphinscheduler.tasks.dependent.DependentItem.get_code_from_gateway",
     return_value={
         "projectCode": TEST_PROJECT_CODE,
-        "processDefinitionCode": TEST_DEFINITION_CODE,
+        "workflowDefinitionCode": TEST_DEFINITION_CODE,
         "taskDefinitionCode": TEST_TASK_CODE,
     },
 )
@@ -552,7 +552,7 @@ def test_operator_dependent_item(
     "pydolphinscheduler.tasks.dependent.DependentItem.get_code_from_gateway",
     return_value={
         "projectCode": TEST_PROJECT_CODE,
-        "processDefinitionCode": TEST_DEFINITION_CODE,
+        "workflowDefinitionCode": TEST_DEFINITION_CODE,
         "taskDefinitionCode": TEST_TASK_CODE,
     },
 )
@@ -682,7 +682,7 @@ def get_dep_task_list(*operator):
     "pydolphinscheduler.tasks.dependent.DependentItem.get_code_from_gateway",
     return_value={
         "projectCode": TEST_PROJECT_CODE,
-        "processDefinitionCode": TEST_DEFINITION_CODE,
+        "workflowDefinitionCode": TEST_DEFINITION_CODE,
         "taskDefinitionCode": TEST_TASK_CODE,
     },
 )
@@ -738,7 +738,7 @@ def test_operator_dependent_task_list_multi_dependent_list(
     "pydolphinscheduler.tasks.dependent.DependentItem.get_code_from_gateway",
     return_value={
         "projectCode": TEST_PROJECT_CODE,
-        "processDefinitionCode": TEST_DEFINITION_CODE,
+        "workflowDefinitionCode": TEST_DEFINITION_CODE,
         "taskDefinitionCode": TEST_TASK_CODE,
     },
 )

tests/tasks/test_sub_workflow.py

@@ -35,7 +35,7 @@
         (
             {"workflow_name": TEST_SUB_WORKFLOW_NAME},
             {
-                "processDefinitionCode": TEST_SUB_WORKFLOW_CODE,
+                "workflowDefinitionCode": TEST_SUB_WORKFLOW_CODE,
                 "localParams": [],
                 "resourceList": [],
                 "dependence": {},
@@ -83,7 +83,7 @@ def test_sub_workflow_get_define(mock_workflow_definition):
     expect_task_params = {
         "resourceList": [],
         "localParams": [],
-        "processDefinitionCode": TEST_SUB_WORKFLOW_CODE,
+        "workflowDefinitionCode": TEST_SUB_WORKFLOW_CODE,
         "dependence": {},
         "conditionResult": {"successNode": [""], "failedNode": [""]},
         "waitStartTimeout": {},
@@ -115,7 +115,7 @@ def test_deprecated_sub_workflow_get_define(mock_workflow_definition):
     expect_task_params = {
         "resourceList": [],
         "localParams": [],
-        "processDefinitionCode": TEST_SUB_WORKFLOW_CODE,
+        "workflowDefinitionCode": TEST_SUB_WORKFLOW_CODE,
         "dependence": {},
         "conditionResult": {"successNode": [""], "failedNode": [""]},
         "waitStartTimeout": {},