Skip to content

fix: The data source tool cannot obtain the execution parameters #4517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shaohuzhang1 merged 1 commit into from
Dec 15, 2025
Merged

fix: The data source tool cannot obtain the execution parameters #4517

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions apps/application/flow/step_node/tool_lib_node/impl/base_tool_lib_node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,16 +197,18 @@ def execute(self, tool_lib_id, input_field_list, **kwargs) -> NodeResult:
else:
all_params = init_params_default_value | params
if self.node.properties.get('kind') == 'data-source':
exist = function_executor.exec_code(f'{tool_lib.code}\ndef function_exist(function_name): return callable(globals().get(function_name))', {'function_name': 'get_download_file_list'})
exist = function_executor.exec_code(
f'{tool_lib.code}\ndef function_exist(function_name): return callable(globals().get(function_name))',
{'function_name': 'get_download_file_list'})
all_params = {**all_params, **self.workflow_params.get('data_source')}
if exist:
download_file_list = []
download_list = function_executor.exec_code(tool_lib.code,
{**all_params, **self.workflow_params.get('data_source')},
all_params,
function_name='get_download_file_list')
for item in download_list:
result = function_executor.exec_code(tool_lib.code,
{**all_params, **self.workflow_params.get('data_source'),
'download_item': item},
{**all_params, 'download_item': item},
function_name='download')
file_bytes = result.get('file_bytes', [])
chunks = []
Copy link
Contributor Author

@shaohuzhang1 shaohuzhang1 Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code looks mostly clean, but here are some minor suggestions for improvements:

  1. The workflow_params should be imported from the correct module where it is defined instead of being referenced directly.

  2. There is no need to pass both all_params and self.workflow_params.get('data_source') again when calling get_download_file_list, as you already have them in all_params.

  3. Similarly, when calling download, you can remove the unnecessary line {**all_params, **self.workflow_params.get('data_source'), 'download_item': item} because all parameters are already provided in all_params.

  4. It's generally better to use dictionary unpacking with | (union operator) instead of multiple assignment operations like {**all_params, ...} or similar.

Here is the improved version of the function:

def execute(self, tool_lib_id, input_field_list, **kwargs) -> NodeResult:
    ...
    if self.node.properties.get('kind') == 'data-source':
        exist = function_executor.exec_code(
            f'{tool_lib.code}\ndef function_exist(function_name): return callable(globals().get(function_name))',
            {'function_name': 'get_download_file_list'}
        )
        all_params.update({
            'data_source_params': self.workflow_params.get('data_source', {})
        })
        if not exist:
            # Handle case where get_download_file_list does not exist or other errors
            ...

        download_files = []
        files_data = function_executor.exec_code(
            tool_lib.code,
            all_params,
            function_name='get_download_file_list'
        )

        for download_item in files_data:
            file_content = function_executor.exec_code(
                tool_lib.code,
                {
                    **all_params,
                    'download_item': download_item
                },
                function_name='download'
            )

            # Process each chunk of the file content
            chunks = []
            # Your processing logic here...

These changes make the code cleaner and more maintainable by reducing redundancy and improving readability.

Expand Down
Loading