Skip to content

fix: Fix the wrong result of not_contain_compare when source_value is a list#5152

Merged
liuruibin merged 42 commits into1Panel-dev:v2from
wangliang181230:PR/fix-not_contain-compare
Apr 23, 2026
Merged

fix: Fix the wrong result of not_contain_compare when source_value is a list#5152
liuruibin merged 42 commits into1Panel-dev:v2from
wangliang181230:PR/fix-not_contain-compare

Conversation

@wangliang181230
Copy link
Copy Markdown
Contributor

What this PR does / why we need it?

fix: Fix the wrong result of not_contain_compare when source_value is a list

Summary of your change

修复 当 source_value 是 list 类型时, not_contain_compare 的判断结果错误的问题
顺便修复一些语法错误。

Please indicate you've done the following:

  • Made sure tests are passing and test coverage is added if needed.
  • Made sure commit message follow the rule of Conventional Commits specification.
  • Considered the docs impact and opened a new docs issue or PR with docs changes if needed.

@f2c-ci-robot
Copy link
Copy Markdown

f2c-ci-robot Bot commented Apr 23, 2026

Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@f2c-ci-robot
Copy link
Copy Markdown

f2c-ci-robot Bot commented Apr 23, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

chat_model = get_model_instance_by_model_workspace_id(model_id, workspace_id,
**(
model_params_setting or {})) if model_id is not None else None
**(model_params_setting or {})) if model_id is not None else None
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

fix style

if isinstance(source_value, str):
return str(target_value) not in source_value
elif isinstance(self, list):
elif isinstance(source_value, list):
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

此PR的核心修复点

value = 0 if ['0', '[]'].__contains__(value) else value
if isinstance(value, str) and value.lower() in ('false', '0', '[]', ''):
return False
return bool(value)
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

修复当 value 为字符串 false 时,bool(value) 返回了 True 的问题。
注:后面多处代码相同处理。

get_knowledge_operation_object(keywords.get('knowledge_id')),
get_knowledge_operation_object(keywords.get('knowledge_id')),
get_document_operation_object(keywords.get('document_id'))
),
Copy link
Copy Markdown
Contributor Author

@wangliang181230 wangliang181230 Apr 23, 2026

Choose a reason for hiding this comment

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

get_knowledge_document_operation_object 方法只有两个参数,这里多传了一个。

感觉应该是不小心多复制了一行代码。

from trigger.handler.impl.task.tool_task import ToolTask

ToolTask.execute(trigger_task, **kwargs)
ToolTask().execute(trigger_task, **kwargs)
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

ApplicationTaskToolTask 是 class,必须先实例化才能调用方法。
估计是漏写了。

@liuruibin liuruibin merged commit cf637a8 into 1Panel-dev:v2 Apr 23, 2026
1 of 2 checks passed
@wangliang181230 wangliang181230 deleted the PR/fix-not_contain-compare branch April 23, 2026 07:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants