Merge pull request #155 from hoomano/kroussel/workflow_refacto

Kroussel/workflow refacto
hoomano · Jul 1, 2024 · e512207 · e512207
2 parents 5c7c888 + d7b6a3d
commit e512207
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 18 deletions.
diff --git a/backend/app/models/workflows/workflow_process_controller.py b/backend/app/models/workflows/workflow_process_controller.py
@@ -154,18 +154,12 @@ def end_workflow_execution(self):
 
     def _generate_produced_text(self):
         try:
-            # For now, production of a workflow is the concatenation of results of all last step's validated executions' results
-            last_step = self.workflow_execution.task.steps[-1]
-            validated_last_step_executions = self.workflow_execution.get_valid_executions_of_a_step(last_step.workflow_step_pk)
-
-            production = "\n\n".join([list(step.result[0].values())[0] for step in validated_last_step_executions])
-
             produced_text_manager = TaskProducedTextManager(self.workflow_execution.session_id,
                                                             self.workflow_execution.user.user_id,
                                                             self.workflow_execution.user_task_execution_pk,
                                                             self.workflow_execution.task.name_for_system)
             produced_text_pk, produced_text_version_pk, title, production, text_type = produced_text_manager.save_produced_text(
-                production, title="", text_type_pk=self.workflow_execution.task.output_text_type_fk)
+                self.workflow_execution.result, title="", text_type_pk=self.workflow_execution.task.output_text_type_fk)
 
             return produced_text_pk, produced_text_version_pk, title, production
 

diff --git a/mojodex_core/entities/user_workflow_execution.py b/mojodex_core/entities/user_workflow_execution.py
@@ -135,4 +135,17 @@ def get_valid_executions_of_a_step(self,workflow_step_pk):
                 .order_by(UserWorkflowStepExecution.creation_date.asc()) \
                 .all()
         except Exception as e:
-            raise Exception(f"{self.__class__.__name__} :: get_valid_executions_of_a_step :: {e}")
+            raise Exception(f"{self.__class__.__name__} :: get_valid_executions_of_a_step :: {e}")
+
+
+    @property
+    def result(self):
+        """
+        For now, result of a workflow is the concatenation of results of all last step's validated executions' results
+        """
+        try:
+            last_step = self.task.steps[-1]
+            validated_last_step_executions = self.get_valid_executions_of_a_step(last_step.workflow_step_pk)
+            return "\n\n".join([list(step.result[0].values())[0] for step in validated_last_step_executions])
+        except Exception as e:
+            raise Exception(f"{self.__class__.__name__} :: result :: {e}")
diff --git a/mojodex_core/entities/workflow_step.py b/mojodex_core/entities/workflow_step.py
@@ -39,30 +39,33 @@ def get_definition_in_language(self, language_code):
             raise Exception(f"{self.__class__.__name__} :: get_definition_in_language :: {e}")
 
 
-    @property
-    def dependency_step(self):
-        """The dependency step of a workflow step is the step of its workflow which rank is the previous one."""
+    def _get_relative_step_by_rank(self, relative_rank: int):
+        """
+        Get the relative step of a workflow step by its rank."""
         try:
             session = object_session(self)
             return session.query(MdWorkflowStep) \
                 .filter(MdWorkflowStep.task_fk == self.task_fk) \
-                .filter(MdWorkflowStep.rank == self.rank - 1) \
+                .filter(MdWorkflowStep.rank == self.rank + relative_rank) \
                 .first()
+        except Exception as e:
+            raise Exception(f"{self.__class__.__name__} :: _get_relative_step_by_rank :: {e}")
+
+    @property
+    def dependency_step(self):
+        """The dependency step of a workflow step is the step of its workflow which rank is the previous one."""
+        try:
+            return self._get_relative_step_by_rank(-1)
         except Exception as e:
             raise Exception(f"{self.__class__.__name__} :: dependency_step :: {e}")
 
     @property
     def next_step(self):
         """
         The next step of a workflow step is the step of its workflow which rank is the next one.
-        :return:
         """
         try:
-            session = object_session(self)
-            return session.query(MdWorkflowStep) \
-                .filter(MdWorkflowStep.task_fk == self.task_fk) \
-                .filter(MdWorkflowStep.rank == self.rank + 1) \
-                .first()
+            return self._get_relative_step_by_rank(+1)
         except Exception as e:
             raise Exception(f"{self.__class__.__name__} :: next_step :: {e}")