fix(components): add missing regex handler to Condition node #5651
Conversation
The Condition agentflow node's Regex operation was not functional because compareOperationFunctions was missing the regex handler. Changes: - Added regex handler with unescapeRegexPattern helper function - Handles Flowise's escaping of regex metacharacters - Gracefully returns false for invalid regex patterns - Added 22 unit tests Fixes FlowiseAI#5650
Summary of ChangesHello @Aadil-Hasun, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request addresses a critical missing feature in the Highlights
Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request successfully adds the missing regex operation to the Condition node, including a comprehensive set of unit tests. The implementation correctly handles escaped characters from the Flowise UI and gracefully manages invalid regex patterns. My review includes a few suggestions to improve the implementation's correctness and robustness, as well as enhance the consistency and completeness of the new tests. Specifically, I've pointed out a potential bug in the regex unescaping logic and suggested improvements to the test structure and assertions.
| const unescapeRegexPattern = (escaped: string): string => { | ||
| return escaped | ||
| .replace(/\\\\/g, '\0') // Preserve intentional backslashes (\\) | ||
| .replace(/\\([[\].*+?^${}()|])/g, '$1') // Unescape all regex metacharacters |
There was a problem hiding this comment.
The set of metacharacters being unescaped here is too broad and can cause incorrect regex evaluation. According to the provided tests and description, Flowise only escapes [, ], and \. This implementation, however, unescapes many other metacharacters like ., *, +, ?, etc. This would cause a pattern like \. (intended to match a literal dot) to become ., which matches any character.
The unescaping should be restricted to only [ and ], as \ is already handled by the surrounding replace calls.
| .replace(/\\([[\].*+?^${}()|])/g, '$1') // Unescape all regex metacharacters | |
| .replace(/\([[\]])/g, '$1') // Unescape only brackets, as other metachars aren't escaped by Flowise |
| { type: 'string', value1: null, operation: 'regex', value2: 'test' } | ||
| ] | ||
| const result = await nodeClass.run(createConditionNodeData('test-null', conditions), '', { agentflowRuntime: { state: {} } }) | ||
| expect(result.output.conditions[0].isFulfilled).toBeUndefined() |
There was a problem hiding this comment.
To make this test more robust and align with other tests for non-matching conditions (e.g., lines 44-45), you should also assert that the else condition is fulfilled.
expect(result.output.conditions[0].isFulfilled).toBeUndefined()
expect(result.output.conditions[1].isFulfilled).toBe(true)| { type: 'string', value1: 'Hello', operation: 'regex', value2: 'hello' } | ||
| ] | ||
| const result = await nodeClass.run(createConditionNodeData('test-case', conditions), '', { agentflowRuntime: { state: {} } }) | ||
| expect(result.output.conditions[0].isFulfilled).toBeUndefined() |
There was a problem hiding this comment.
Similar to other tests for non-matching conditions, it would be good to also assert that the else condition is fulfilled to ensure the fallback logic is working as expected.
expect(result.output.conditions[0].isFulfilled).toBeUndefined()
expect(result.output.conditions[1].isFulfilled).toBe(true)|
|
||
| it('should handle ^ (start anchor)', async () => { | ||
| const conditions = [{ type: 'string', value1: 'hello world', operation: 'regex', value2: '^hello' }] | ||
| const result = await new Condition_Agentflow().run(createConditionNodeData('test-caret', conditions), '', { agentflowRuntime: { state: {} } }) |
There was a problem hiding this comment.
For consistency with the other test suites in this file, please use the nodeClass instance created in the beforeEach block instead of creating a new Condition_Agentflow instance in each test. This should be applied to all tests within the 'Complex regex patterns - all metacharacters' describe block.
const result = await nodeClass.run(createConditionNodeData('test-caret', conditions), '', { agentflowRuntime: { state: {} } })- Move unescapeRegexPattern to module level for performance - Restrict unescaping to only [, ], * (verified by UI testing) - Use nodeClass from beforeEach in all tests for consistency - Add else condition assertions for non-matching tests - Add test for escaped asterisk
1 participant
Summary
Fixes #5650 - The Regex operation in Condition node was not implemented.
Changes
Flowise/packages/components/nodes/agentflow/Condition/Condition.ts:277:12-297:13) handler to
compareOperationFunctionsFlowise/packages/components/nodes/agentflow/Condition/Condition.ts:278:16-288:17) helper to handle Flowise's escaping of metacharacters
falsefor invalid regex patterns (no crashes)Test Coverage
^ $ [ ] . * + ? { } ( ) |Known Limitation
Patterns matching markdown link syntax may be affected by existing
removeMarkdownpreprocessing.