feat: 1) support length_not_equal comparison; 2) All length comparators support numbers; 3) Optimize the is_true and is_not_true comparisons

Author: wangdan-fit2cloud

apps/application/flow/compare/__init__.py

@@ -23,6 +23,7 @@
 from .len_gt_compare import LenGTCompare
 from .len_le_compare import LenLECompare
 from .len_lt_compare import LenLTCompare
+from .len_not_equal_compare import LenNotEqualCompare
 from .lt_compare import LTCompare
 from .not_contain_compare import NotContainCompare
 from .not_equal_compare import NotEqualCompare
@@ -42,6 +43,7 @@
     'le': LECompare(),
     'lt': LTCompare(),
     'len_eq': LenEqualCompare(),
+    'len_not_eq': LenNotEqualCompare(),
     'len_ge': LenGECompare(),
     'len_gt': LenGTCompare(),
     'len_le': LenLECompare(),

apps/application/flow/compare/is_not_true.py

@@ -12,7 +12,4 @@
 class IsNotTrueCompare(Compare):
 
     def compare(self, source_value, compare, target_value):
-        try:
-            return source_value is False
-        except Exception:
-            return False
+        return str(source_value).lower() not in ('true', '1')

apps/application/flow/compare/is_true.py

@@ -12,7 +12,4 @@
 class IsTrueCompare(Compare):
 
     def compare(self, source_value, compare, target_value):
-        try:
-            return source_value is True
-        except Exception:
-            return False
+        return str(source_value).lower() in ('true', '1')

apps/application/flow/compare/len_equal_compare.py

@@ -4,15 +4,45 @@
     @Author：虎
     @file： equal_compare.py
     @date：2024/6/7 14:44
-    @desc:
+    @desc: 长度等于比较器
 """
 from .compare import Compare
 
 
+def compute_length(source_value, target_length) -> list:
+    """
+    计算长度
+
+    Args:
+        source_value: 引用变量
+        target_length: 目标长度字符串
+
+    Raises:
+        ValueError: 当 target_value 不是数字 或 小于0时，抛出该异常
+    """
+    # 获取target_value的长度
+    target_length = int(target_length) if target_length else 0
+    if target_length < 0:
+        raise ValueError("The target length must be greater than or equal to 0")
+
+    # 获取source_value的长度
+    try:
+        source_length = len(source_value) if source_value is not None else 0
+    except Exception:
+        # 可计算数字长度
+        source_length = len(str(source_value))
+
+    return [source_length, target_length]
+
+
 class LenEqualCompare(Compare):
 
     def compare(self, source_value, compare, target_value):
         try:
-            return len(source_value) == int(target_value)
-        except Exception as e:
+            # 计算长度
+            source_length, target_length = compute_length(source_value, target_value)
+
+            # 长度等于 比较
+            return source_length == target_length
+        except Exception:
             return False

apps/application/flow/compare/len_ge_compare.py

@@ -4,15 +4,20 @@
     @Author：虎
     @file： lt_compare.py
     @date：2024/6/11 9:52
-    @desc: 大于比较器
+    @desc: 长度大于等于比较器
 """
 from .compare import Compare
+from .len_equal_compare import compute_length
 
 
 class LenGECompare(Compare):
 
     def compare(self, source_value, compare, target_value):
         try:
-            return len(source_value) >= int(target_value)
+            # 计算长度
+            source_length, target_length = compute_length(source_value, target_value)
+
+            # 长度大于等于 比较
+            return source_length >= target_length
         except Exception:
             return False

apps/application/flow/compare/len_gt_compare.py

@@ -4,15 +4,20 @@
     @Author：虎
     @file： lt_compare.py
     @date：2024/6/11 9:52
-    @desc: 大于比较器
+    @desc: 长度大于比较器
 """
 from .compare import Compare
+from .len_equal_compare import compute_length
 
 
 class LenGTCompare(Compare):
 
     def compare(self, source_value, compare, target_value):
         try:
-            return len(source_value) > int(target_value)
+            # 计算长度
+            source_length, target_length = compute_length(source_value, target_value)
+
+            # 长度大于 比较
+            return source_length > target_length
         except Exception:
             return False

apps/application/flow/compare/len_le_compare.py

@@ -4,15 +4,20 @@
     @Author：虎
     @file： lt_compare.py
     @date：2024/6/11 9:52
-    @desc: 小于比较器
+    @desc: 长度小于等于比较器
 """
 from .compare import Compare
+from .len_equal_compare import compute_length
 
 
 class LenLECompare(Compare):
 
     def compare(self, source_value, compare, target_value):
         try:
-            return len(source_value) <= int(target_value)
+            # 计算长度
+            source_length, target_length = compute_length(source_value, target_value)
+
+            # 长度小于等于 比较
+            return source_length <= target_length
         except Exception:
             return False

apps/application/flow/compare/len_lt_compare.py

@@ -4,15 +4,20 @@
     @Author：虎
     @file： lt_compare.py
     @date：2024/6/11 9:52
-    @desc: 小于比较器
+    @desc: 长度小于比较器
 """
 from .compare import Compare
+from .len_equal_compare import compute_length
 
 
 class LenLTCompare(Compare):
 
     def compare(self, source_value, compare, target_value):
         try:
-            return len(source_value) < int(target_value)
+            # 计算长度
+            source_length, target_length = compute_length(source_value, target_value)
+
+            # 长度小于 比较
+            return source_length < target_length
         except Exception:
             return False

apps/application/flow/compare/len_not_equal_compare.py

@@ -0,0 +1,23 @@
+# coding=utf-8
+"""
+    @project: maxkb
+    @Author：wangliang181230
+    @file： len_not_equal_compare.py
+    @date：2026/4/28 20:17
+    @desc: 长度不等于比较器
+"""
+from .compare import Compare
+from .len_equal_compare import compute_length
+
+
+class LenNotEqualCompare(Compare):
+
+    def compare(self, source_value, compare, target_value):
+        try:
+            # 计算长度
+            source_length, target_length = compute_length(source_value, target_value)
+
+            # 长度不等于 比较
+            return source_length != target_length
+        except Exception:
+            return False

apps/application/flow/compare/wildcard_compare.py

@@ -12,12 +12,11 @@
 from .compare import Compare
 from common.cache.mem_cache import MemCache
 
-
 match_cache = MemCache('wildcard_to_regex', {
-    'TIMEOUT': 3600, # 缓存有效期为 1 小时
+    'TIMEOUT': 3600,  # 缓存有效期为 1 小时
     'OPTIONS': {
-        'MAX_ENTRIES': 500, # 最多缓存 500 个条目
-        'CULL_FREQUENCY': 10, # 达到上限时，删除约 1/10 的缓存
+        'MAX_ENTRIES': 500,  # 最多缓存 500 个条目
+        'CULL_FREQUENCY': 10,  # 达到上限时，删除约 1/10 的缓存
     },
 })
 
@@ -26,10 +25,11 @@ def translate_and_compile_and_cache(wildcard):
     match = match_cache.get(wildcard)
     if not match:
         regex = fnmatch.translate(wildcard)
-        match = re.compile(regex).match
+        match = re.compile(regex).fullmatch
         match_cache.set(wildcard, match)
     return match
 
+
 class WildcardCompare(Compare):
 
     def compare(self, source_value, compare, target_value):