From 0b07c6914a8bd734eb736fb617bfd1ef66f452d7 Mon Sep 17 00:00:00 2001 From: takatost Date: Mon, 18 Mar 2024 21:52:28 +0800 Subject: [PATCH] fix bugs --- api/controllers/console/explore/parameter.py | 2 +- api/controllers/service_api/app/app.py | 2 +- api/controllers/web/app.py | 2 +- api/models/workflow.py | 14 ++++++++++++-- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/api/controllers/console/explore/parameter.py b/api/controllers/console/explore/parameter.py index 6eae6bafc9..45255edb3a 100644 --- a/api/controllers/console/explore/parameter.py +++ b/api/controllers/console/explore/parameter.py @@ -51,7 +51,7 @@ class AppParameterApi(InstalledAppResource): raise AppUnavailableError() features_dict = workflow.features_dict - user_input_form = workflow.user_input_form() + user_input_form = workflow.user_input_form(to_old_structure=True) else: app_model_config = app_model.app_model_config features_dict = app_model_config.to_dict() diff --git a/api/controllers/service_api/app/app.py b/api/controllers/service_api/app/app.py index 1e52b9e75d..ccf743371a 100644 --- a/api/controllers/service_api/app/app.py +++ b/api/controllers/service_api/app/app.py @@ -54,7 +54,7 @@ class AppParameterApi(Resource): raise AppUnavailableError() features_dict = workflow.features_dict - user_input_form = workflow.user_input_form() + user_input_form = workflow.user_input_form(to_old_structure=True) else: app_model_config = app_model.app_model_config features_dict = app_model_config.to_dict() diff --git a/api/controllers/web/app.py b/api/controllers/web/app.py index dc173508e6..8524bd45b0 100644 --- a/api/controllers/web/app.py +++ b/api/controllers/web/app.py @@ -52,7 +52,7 @@ class AppParameterApi(WebApiResource): raise AppUnavailableError() features_dict = workflow.features_dict - user_input_form = workflow.user_input_form() + user_input_form = workflow.user_input_form(to_old_structure=True) else: app_model_config = app_model.app_model_config features_dict = app_model_config.to_dict() diff --git a/api/models/workflow.py b/api/models/workflow.py index e14274d609..cdeefd9e39 100644 --- a/api/models/workflow.py +++ b/api/models/workflow.py @@ -129,7 +129,7 @@ class Workflow(db.Model): def features_dict(self): return json.loads(self.features) if self.features else {} - def user_input_form(self) -> list: + def user_input_form(self, to_old_structure: bool = False) -> list: # get start node from graph if not self.graph: return [] @@ -143,8 +143,18 @@ class Workflow(db.Model): return [] # get user_input_form from start node - return start_node.get('data', {}).get('variables', []) + variables = start_node.get('data', {}).get('variables', []) + if to_old_structure: + old_structure_variables = [] + for variable in variables: + old_structure_variables.append({ + variable['type']: variable + }) + + return old_structure_variables + + return variables class WorkflowRunTriggeredFrom(Enum): """