cnhkmcp 2.3.0__py3-none-any.whl → 2.3.2__py3-none-any.whl

cnhkmcp/untracked/APP/trailSomeAlphas/skills/brain-feature-implementation/scripts/ace.log

@@ -1,3 +1,15 @@
 2026-01-30 01:46:34,276 - ace - ERROR - 
 Incorrect email or password
 
+2026-01-31 17:23:24,903 - ace - ERROR - 
+Incorrect email or password
+
+2026-01-31 17:23:25,385 - ace - ERROR - 
+Incorrect email or password
+
+2026-01-31 17:23:25,859 - ace - ERROR - 
+Incorrect email or password
+
+2026-01-31 17:23:26,330 - ace - ERROR - 
+Incorrect email or password
+

cnhkmcp/untracked/APP/trailSomeAlphas/skills/brain-feature-implementation/scripts/fetch_dataset.py

@@ -32,6 +32,12 @@ def main():
     parser.add_argument("--delay", type=int, default=1, help="Delay (default: 1)")
     parser.add_argument("--universe", default="TOP3000", help="Universe (default: TOP3000)")
     parser.add_argument("--instrument-type", default="EQUITY", dest="instrument_type", help="Instrument Type (default: EQUITY)")
+    parser.add_argument(
+        "--data-type",
+        default="MATRIX",
+        choices=["MATRIX", "VECTOR"],
+        help="Data type to request from BRAIN datafields (MATRIX or VECTOR). Default: MATRIX",
+    )
 
     args = parser.parse_args()
 
@@ -83,7 +89,7 @@ def main():
             delay=args.delay,
             universe=args.universe,
             instrument_type=args.instrument_type,
-            data_type="ALL",
+            data_type=args.data_type,
         )
 
         if df is None or df.empty:

cnhkmcp/untracked/APP/trailSomeAlphas/skills/brain-feature-implementation/scripts/validator.py

@@ -170,7 +170,10 @@ supported_functions = {
     'scale_down': {'min_args': 2, 'max_args': 2, 'arg_types': ['expression', 'number'], 'param_names': ['x', 'constant']},
     
     # Arithmetic 类别函数
-    'add': {'min_args': 2, 'max_args': 3, 'arg_types': ['expression', 'expression', 'boolean']},  # add(x, y, filter=false)
+    # add(x, y, ..., filter=false)
+    # NOTE: add() is variadic (>=2 terms) with an optional boolean filter flag.
+    # We validate it with custom logic in validate_function().
+    'add': {'min_args': 2, 'max_args': 101, 'arg_types': ['expression'] * 101},
     'multiply': {'min_args': 2, 'max_args': 100, 'arg_types': ['expression'] * 99 + ['boolean'], 'param_names': ['x', 'y', 'filter']},  # multiply(x, y, ..., filter=false)
     'sign': {'min_args': 1, 'max_args': 1, 'arg_types': ['expression']},
     'subtract': {'min_args': 2, 'max_args': 3, 'arg_types': ['expression', 'expression', 'boolean']},  # subtract(x, y, filter=false)
@@ -501,6 +504,10 @@ class ExpressionValidator:
         if not function_info:
             return [f"未知函数: {function_name}"]
         
+        # Custom validation for variadic functions with optional flags
+        if function_name == 'add':
+            return self._validate_add(args, is_in_group_arg)
+
         errors = []
         
         # 检查参数数量
@@ -591,9 +598,9 @@ class ExpressionValidator:
             if arg.node_type != 'number':
                 errors.append(f"参数 {arg_index+1} 应该是一个数字，但得到 {arg.node_type}")
         elif expected_type == 'boolean':
-            # 布尔值可以是数字（0/1）
-            if arg.node_type != 'number':
-                errors.append(f"参数 {arg_index+1} 应该是一个布尔值（0/1），但得到 {arg.node_type}")
+            # 布尔值可以是 true/false 或数字（0/1）
+            if arg.node_type not in {'boolean', 'number'}:
+                errors.append(f"参数 {arg_index+1} 应该是一个布尔值（true/false 或 0/1），但得到 {arg.node_type}")
         elif expected_type == 'field':
             if arg.node_type != 'field' and arg.node_type != 'category':
                 # 允许field或category作为字段参数
@@ -610,6 +617,75 @@ class ExpressionValidator:
             # group函数的category参数可以是任何类型（field、category等），不进行类型校验
         
         return errors
+
+    def _validate_add(self, args: List[Any], is_in_group_arg: bool = False) -> List[str]:
+        """Validate add(x, y, ..., filter=false).
+
+        Rules:
+        - At least 2 positional expression terms.
+        - Optional filter flag can be provided as:
+          - named argument: filter=<boolean>
+          - last positional argument: <boolean>
+        """
+        errors: List[str] = []
+
+        if len(args) < 2:
+            return [f"函数 add 需要至少 2 个参数，但只提供了 {len(args)}"]
+
+        named_filter_nodes: List[ASTNode] = []
+        positional_nodes: List[ASTNode] = []
+
+        for arg in args:
+            if isinstance(arg, dict) and arg.get('type') == 'named':
+                name = arg.get('name')
+                value = arg.get('value')
+                if name != 'filter':
+                    errors.append(f"函数 add 不存在参数 '{name}'")
+                    continue
+                if not hasattr(value, 'node_type'):
+                    errors.append("函数 add 的参数 filter 格式错误")
+                    continue
+                named_filter_nodes.append(value)
+            elif isinstance(arg, dict) and arg.get('type') == 'positional':
+                value = arg.get('value')
+                if hasattr(value, 'node_type'):
+                    positional_nodes.append(value)
+                else:
+                    errors.append("函数 add 的位置参数格式错误")
+            elif hasattr(arg, 'node_type'):
+                positional_nodes.append(arg)
+            else:
+                errors.append("函数 add 的参数格式错误")
+
+        if len(named_filter_nodes) > 1:
+            errors.append("函数 add 的参数 'filter' 只能出现一次")
+
+        positional_filter_node: Optional[ASTNode] = None
+        # Only infer a positional filter flag when:
+        # - no named filter is provided
+        # - there are at least 3 positional args (x, y, filter)
+        # - the last arg is boolean or numeric 0/1
+        if not named_filter_nodes and len(positional_nodes) >= 3:
+            last = positional_nodes[-1]
+            if last.node_type == 'boolean' or (last.node_type == 'number' and last.value in {0, 1}):
+                positional_filter_node = positional_nodes.pop()
+
+        if len(positional_nodes) < 2:
+            errors.append(f"函数 add 需要至少 2 个输入项（不含filter），但只提供了 {len(positional_nodes)}")
+
+        # Validate all term inputs as expressions (no-op, but keep recursion behavior consistent)
+        for idx, node in enumerate(positional_nodes):
+            errors.extend(self._validate_arg_type(node, 'expression', idx, 'add', is_in_group_arg))
+
+        # Validate filter, if present (named takes precedence; if both present, that's an error)
+        if positional_filter_node is not None and named_filter_nodes:
+            errors.append("函数 add 的 filter 不能同时用位置参数和命名参数传递")
+        if positional_filter_node is not None:
+            errors.extend(self._validate_arg_type(positional_filter_node, 'boolean', len(positional_nodes), 'add', is_in_group_arg))
+        if named_filter_nodes:
+            errors.extend(self._validate_arg_type(named_filter_nodes[0], 'boolean', len(positional_nodes), 'add', is_in_group_arg))
+
+        return errors
     
     def validate_ast(self, ast: Optional[ASTNode], is_in_group_arg: bool = False) -> List[str]:
         """递归验证抽象语法树"""

cnhkmcp/untracked/APP/trailSomeAlphas/skills/template_final_enhance/op/321/206/320/220/342/225/227/321/207/342/225/227/320/243.md

@@ -194,27 +194,36 @@ days_from_last_change(A) / last_diff_value(A,d)
 场景：
 因子是“事件驱动型”的（评级变动、ESG 评级更新等），只在变动后若干天内才有信号；
 可以构造“距上次变化时间”的信号。
-七、Reduce / Combo 等（reduce_ / combo_a / self_corr 等）*
+七、Vector Operator*
+这些用于处理“向量类型数据”，需要先生成统计特征才能用。
 
-这些更多在多因子/多 Alpha 组合层面用，但单因子也有场景：
+补充：常用 Vector Operators（Combo, Regular）
 
-reduce_*（avg / max / min / stddev / percentage等）
+> 一句话描述：Vector 字段（例如一只股票一天里的一串向量值）不能直接参与普通的算术/时序/截面运算，通常需要先用 `vec_*` 把它“降维”为标量特征（均值/分位/波动/偏度等），再进入后续流程。
 
-场景：
-你想从一个“多维度向量”提炼单值，例如同一公司的多条 ESG 子项合成一个指标；
-或在历史上把 A 的波动性/偏度/峰度作为新的单因子。
-combo_a(alphas, ...)
+- `vec_avg(x)`（base）：对向量求均值。例：输入 (2,3,5,6,3,8,10) 输出 37/7=5.29
+- `vec_sum(x)`（base）：对向量求和。例：输入 (2,3,5,6,3,8,10) 输出 37
+- `vec_count(x)`（genius）：向量元素个数
+- `vec_choose(x, nth=k)`（genius）：取向量中第 k 个元素（从 0 开始计数）
+- `vec_max(x)`（genius）：向量最大值
+- `vec_min(x)`（genius）：向量最小值
+- `vec_range(x)`（genius）：向量极差（max-min）
+- `vec_stddev(x)`（genius）：向量标准差
+- `vec_ir(x)`（genius）：向量信息比率（均值/标准差）
+- `vec_skewness(x)`（genius）：向量偏度
+- `vec_kurtosis(x)`（genius）：向量峰度
+- `vec_norm(x)`（genius）：向量范数（所有元素绝对值之和）
+- `vec_percentage(x, percentage=0.5)`（genius）：向量分位数（如 0.5 为中位数）
+- `vec_powersum(x, constant=2)`（genius）：向量幂和（对每个元素做幂后求和）
+- `vec_filter(vec, value=nan)`（genius）：按值过滤向量（可一次过滤多个值，例如 `"nan 0 10"`）。注意：输出仍然是 VECTOR 类型（还未降维）。
+
+注意：
+- Vector type 数据不能直接用；你必须先用一个 `vec_*` 把它变成标量特征后再做后续组合。
+- `vec_*` 只能作用在 VECTOR 类型数据上；普通 MATRIX 字段不能直接喂给 `vec_*`。
 
-场景：
-多个不同构造方式的同主题因子（比如多个 ESG 变体）组合，提升稳健性；
-单一指标不够可靠，想自动根据历史 IR 给权重。
-self_corr(A)
 
-场景：
-研究同因子在截面上的相关结构，比如 ESG 因子和某个 sector pattern 是否极度重叠；
-更偏研究/调试，不是直接构造单因子。
-小结（对应你说的那些“现实情景”）：
 
+小结：
 只头部/尾部有信号：
 想起：rank + bucket + 逻辑算子（greater/less/if_else/trade_when）、right_tail / left_tail。
 中间区间是噪音：
@@ -396,11 +405,8 @@ ts_delta(B,d) / days_from_last_change(B)
 例如 volume 爆量那几天放大 A，平时保持中立：
 b_spike = greater(ts_delta(B,1), thresh)
 core = trade_when(b_spike, 1.5*A, A)。
-七、Reduce / Combo 等
 
-多数用于多维/多因子的情况，不再一一展开；简单原则：
 
-若 B 其实是一组值（如多个 volume 相关字段），先用 reduce_avg/reduce_max 合成一个 B_agg，再按前面逻辑当作单一 B 处理。
 最后给一个总的“使用从属 B 的模板公式”
 
 可以抽象成：

cnhkmcp/untracked/APP//321/210/342/224/220/320/240/321/210/320/261/320/234/321/206/320/231/320/243/321/205/342/225/235/320/220/321/206/320/230/320/241.py

@@ -2376,6 +2376,7 @@ def inspiration_generate():
     delay = data.get('delay')
     universe = data.get('universe')
     dataset_id = data.get('datasetId')
+    data_type = data.get('dataType') or 'MATRIX'
     
     try:
         import openai
@@ -2391,10 +2392,13 @@ def inspiration_generate():
         if not s:
             return jsonify({'error': 'Not logged in'}), 401
         
+        if data_type not in ("MATRIX", "VECTOR"):
+            data_type = "MATRIX"
+
         operators_df = get_operators(s)
         operators_df = operators_df[operators_df['scope'] == 'REGULAR']
         
-        datafields_df = get_datafields(s, region=region, delay=int(delay), universe=universe, dataset_id=dataset_id, data_type="ALL")
+        datafields_df = get_datafields(s, region=region, delay=int(delay), universe=universe, dataset_id=dataset_id, data_type=data_type)
         
         # count the datatype of the datafields_df, if most of them are VECTOR, then we keep the VECTOR category operators in the operators_df, otherwise we remove them
         datatype_counts = datafields_df['type'].value_counts().to_dict()
@@ -2516,6 +2520,7 @@ def inspiration_run_pipeline():
         region = data.get('region')
         delay = data.get('delay')
         universe = data.get('universe')
+        data_type = data.get('dataType') or 'MATRIX'
         api_key = data.get('apiKey')
         base_url = data.get('baseUrl')
         model = data.get('model')
@@ -2541,6 +2546,11 @@ def inspiration_run_pipeline():
 
         def run_process():
             try:
+                if data_type not in ("MATRIX", "VECTOR"):
+                    dt = "MATRIX"
+                else:
+                    dt = str(data_type)
+
                 cmd = [
                     sys.executable,
                     run_pipeline_path,
@@ -2548,7 +2558,8 @@ def inspiration_run_pipeline():
                     '--region', str(region),
                     '--delay', str(delay),
                     '--dataset-id', str(dataset_id),
-                    '--universe', str(universe)
+                    '--universe', str(universe),
+                    '--data-type', dt,
                 ]
 
                 if api_key:
@@ -2672,6 +2683,13 @@ def inspiration_enhance_template():
         api_key = request.form.get('apiKey')
         base_url = request.form.get('baseUrl')
         model = request.form.get('model')
+        data_type = request.form.get('dataType') or 'MATRIX'
+
+        session_id = request.headers.get('Session-ID') or flask_session.get('brain_session_id')
+        session_info = brain_sessions.get(session_id) if session_id else None
+
+        if data_type not in ("MATRIX", "VECTOR"):
+            data_type = "MATRIX"
 
         if not idea_files or not api_key:
             return jsonify({'success': False, 'error': 'Missing ideaFiles or apiKey'}), 400
@@ -2711,12 +2729,19 @@ def inspiration_enhance_template():
                     env = os.environ.copy()
                     env['IDEA_JSON'] = idea_path
                     env['MOONSHOT_API_KEY'] = api_key
+                    env['DATA_TYPE'] = str(data_type)
                     if base_url:
                         env['MOONSHOT_BASE_URL'] = base_url
                     if model:
                         env['MOONSHOT_MODEL'] = model
                     env['PYTHONIOENCODING'] = 'utf-8'
 
+                    # Inherit BRAIN auth from the logged-in web session (same as run-pipeline).
+                    # Do NOT accept raw credentials from the enhance form.
+                    if session_info and session_info.get('username') and session_info.get('password'):
+                        env['BRAIN_USERNAME'] = session_info['username']
+                        env['BRAIN_PASSWORD'] = session_info['password']
+
                     log_queue.put(f"=== 开始处理: {name} ({idx}/{total}) ===")
                     proc = subprocess.Popen(
                         [sys.executable, enhance_script],

cnhkmcp/untracked/back_up/platform_functions.py

@@ -423,7 +423,7 @@ class BrainApiClient:
         return False
     
     async def get_datasets(self, instrument_type: str = "EQUITY", region: str = "USA", 
-                          delay: int = 1, universe: str = "TOP3000", theme: str = "false", search: Optional[str] = None) -> Dict[str, Any]:
+                          delay: int = 1, universe: str = "TOP3000", theme: str = "ALL", search: Optional[str] = None) -> Dict[str, Any]:
         """Get available datasets."""
         await self.ensure_authenticated()
         
@@ -1883,7 +1883,7 @@ async def get_datasets(
     region: str = "USA",
     delay: int = 1,
     universe: str = "TOP3000",
-    theme: str = "false",
+    theme: str = "ALL",
     search: Optional[str] = None
 ) -> Dict[str, Any]:
     """

cnhkmcp/untracked/mcp/321/206/320/246/320/227/321/204/342/225/227/342/225/242/321/210/320/276/342/225/221/321/205/320/255/320/253/321/207/320/231/320/2302_/321/205/320/266/320/222/321/206/320/256/320/254/321/205/320/236/320/257/321/207/320/231/320/230/321/205/320/240/320/277/321/205/320/232/320/270/321/204/342/225/225/320/235/321/204/342/225/221/320/226/321/206/342/225/241/320/237/321/210/320/267/320/230/321/205/320/251/320/270/321/205/342/226/221/342/226/222/321/210/320/277/320/245/321/210/342/224/220/320/251/321/204/342/225/225/320/272/platform_functions.py

@@ -357,7 +357,7 @@ class BrainApiClient:
             raise
     
     async def get_datasets(self, instrument_type: str = "EQUITY", region: str = "USA",
-                          delay: int = 1, universe: str = "TOP3000", theme: str = "false", search: Optional[str] = None) -> Dict[str, Any]:
+                          delay: int = 1, universe: str = "TOP3000", theme: str = "ALL", search: Optional[str] = None) -> Dict[str, Any]:
         """Get available datasets."""
         await self.ensure_authenticated()
         
@@ -1761,7 +1761,7 @@ async def get_datasets(
     region: str = "USA",
     delay: int = 1,
     universe: str = "TOP3000",
-    theme: str = "false",
+    theme: str = "ALL",
     search: Optional[str] = None,
 ) -> Dict[str, Any]:
     """

cnhkmcp/untracked/platform_functions.py

@@ -357,7 +357,7 @@ class BrainApiClient:
             raise
     
     async def get_datasets(self, instrument_type: str = "EQUITY", region: str = "USA",
-                          delay: int = 1, universe: str = "TOP3000", theme: str = "false", search: Optional[str] = None) -> Dict[str, Any]:
+                          delay: int = 1, universe: str = "TOP3000", theme: str = "ALL", search: Optional[str] = None) -> Dict[str, Any]:
         """Get available datasets."""
         await self.ensure_authenticated()
         
@@ -1761,7 +1761,7 @@ async def get_datasets(
     region: str = "USA",
     delay: int = 1,
     universe: str = "TOP3000",
-    theme: str = "false",
+    theme: str = "ALL",
     search: Optional[str] = None,
 ) -> Dict[str, Any]:
     """

cnhkmcp/untracked/skills/alpha-expression-verifier/scripts/parsetab.py

@@ -0,0 +1,60 @@
+
+# parsetab.py
+# This file is automatically generated. Do not edit.
+# pylint: disable=W,C,R
+_tabversion = '3.10'
+
+_lr_method = 'LALR'
+
+_lr_signature = 'ASSIGN BOOLEAN CATEGORY COMMA DIVIDE EQUAL FIELD FUNCTION GREATER GREATEREQUAL IDENTIFIER LESS LESSEQUAL LPAREN MINUS NOTEQUAL NUMBER PLUS RPAREN STRING TIMESexpression : comparison\n| expression EQUAL comparison\n| expression NOTEQUAL comparison\n| expression GREATER comparison\n| expression LESS comparison\n| expression GREATEREQUAL comparison\n| expression LESSEQUAL comparisoncomparison : term\n| comparison PLUS term\n| comparison MINUS termterm : factor\n| term TIMES factor\n| term DIVIDE factorfactor : NUMBER\n| STRING\n| FIELD\n| CATEGORY\n| IDENTIFIER\n| BOOLEAN\n| MINUS factor\n| LPAREN expression RPAREN\n| function_callfunction_call : FUNCTION LPAREN args RPARENargs : arg_list\n| emptyarg_list : arg\n| arg_list COMMA argarg : expression\n| IDENTIFIER ASSIGN expressionempty :'
+    
+_lr_action_items = {'NUMBER':([0,4,12,15,16,17,18,19,20,21,22,23,24,27,46,47,],[6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,]),'STRING':([0,4,12,15,16,17,18,19,20,21,22,23,24,27,46,47,],[7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,]),'FIELD':([0,4,12,15,16,17,18,19,20,21,22,23,24,27,46,47,],[8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,]),'CATEGORY':([0,4,12,15,16,17,18,19,20,21,22,23,24,27,46,47,],[9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,]),'IDENTIFIER':([0,4,12,15,16,17,18,19,20,21,22,23,24,27,46,47,],[10,10,10,10,10,10,10,10,10,10,10,10,10,44,44,10,]),'BOOLEAN':([0,4,12,15,16,17,18,19,20,21,22,23,24,27,46,47,],[11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,]),'MINUS':([0,2,3,4,5,6,7,8,9,10,11,12,13,15,16,17,18,19,20,21,22,23,24,25,27,28,29,30,31,32,33,34,35,36,37,38,44,45,46,47,],[4,22,-8,4,-11,-14,-15,-16,-17,-18,-19,4,-22,4,4,4,4,4,4,4,4,4,4,-20,4,22,22,22,22,22,22,-9,-10,-12,-13,-21,-18,-23,4,4,]),'LPAREN':([0,4,12,14,15,16,17,18,19,20,21,22,23,24,27,46,47,],[12,12,12,27,12,12,12,12,12,12,12,12,12,12,12,12,12,]),'FUNCTION':([0,4,12,15,16,17,18,19,20,21,22,23,24,27,46,47,],[14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,]),'$end':([1,2,3,5,6,7,8,9,10,11,13,25,28,29,30,31,32,33,34,35,36,37,38,45,],[0,-1,-8,-11,-14,-15,-16,-17,-18,-19,-22,-20,-2,-3,-4,-5,-6,-7,-9,-10,-12,-13,-21,-23,]),'EQUAL':([1,2,3,5,6,7,8,9,10,11,13,25,26,28,29,30,31,32,33,34,35,36,37,38,43,44,45,49,],[15,-1,-8,-11,-14,-15,-16,-17,-18,-19,-22,-20,15,-2,-3,-4,-5,-6,-7,-9,-10,-12,-13,-21,15,-18,-23,15,]),'NOTEQUAL':([1,2,3,5,6,7,8,9,10,11,13,25,26,28,29,30,31,32,33,34,35,36,37,38,43,44,45,49,],[16,-1,-8,-11,-14,-15,-16,-17,-18,-19,-22,-20,16,-2,-3,-4,-5,-6,-7,-9,-10,-12,-13,-21,16,-18,-23,16,]),'GREATER':([1,2,3,5,6,7,8,9,10,11,13,25,26,28,29,30,31,32,33,34,35,36,37,38,43,44,45,49,],[17,-1,-8,-11,-14,-15,-16,-17,-18,-19,-22,-20,17,-2,-3,-4,-5,-6,-7,-9,-10,-12,-13,-21,17,-18,-23,17,]),'LESS':([1,2,3,5,6,7,8,9,10,11,13,25,26,28,29,30,31,32,33,34,35,36,37,38,43,44,45,49,],[18,-1,-8,-11,-14,-15,-16,-17,-18,-19,-22,-20,18,-2,-3,-4,-5,-6,-7,-9,-10,-12,-13,-21,18,-18,-23,18,]),'GREATEREQUAL':([1,2,3,5,6,7,8,9,10,11,13,25,26,28,29,30,31,32,33,34,35,36,37,38,43,44,45,49,],[19,-1,-8,-11,-14,-15,-16,-17,-18,-19,-22,-20,19,-2,-3,-4,-5,-6,-7,-9,-10,-12,-13,-21,19,-18,-23,19,]),'LESSEQUAL':([1,2,3,5,6,7,8,9,10,11,13,25,26,28,29,30,31,32,33,34,35,36,37,38,43,44,45,49,],[20,-1,-8,-11,-14,-15,-16,-17,-18,-19,-22,-20,20,-2,-3,-4,-5,-6,-7,-9,-10,-12,-13,-21,20,-18,-23,20,]),'RPAREN':([2,3,5,6,7,8,9,10,11,13,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,48,49,],[-1,-8,-11,-14,-15,-16,-17,-18,-19,-22,-20,38,-30,-2,-3,-4,-5,-6,-7,-9,-10,-12,-13,-21,45,-24,-25,-26,-28,-18,-23,-27,-29,]),'COMMA':([2,3,5,6,7,8,9,10,11,13,25,28,29,30,31,32,33,34,35,36,37,38,40,42,43,44,45,48,49,],[-1,-8,-11,-14,-15,-16,-17,-18,-19,-22,-20,-2,-3,-4,-5,-6,-7,-9,-10,-12,-13,-21,46,-26,-28,-18,-23,-27,-29,]),'PLUS':([2,3,5,6,7,8,9,10,11,13,25,28,29,30,31,32,33,34,35,36,37,38,44,45,],[21,-8,-11,-14,-15,-16,-17,-18,-19,-22,-20,21,21,21,21,21,21,-9,-10,-12,-13,-21,-18,-23,]),'TIMES':([3,5,6,7,8,9,10,11,13,25,34,35,36,37,38,44,45,],[23,-11,-14,-15,-16,-17,-18,-19,-22,-20,23,23,-12,-13,-21,-18,-23,]),'DIVIDE':([3,5,6,7,8,9,10,11,13,25,34,35,36,37,38,44,45,],[24,-11,-14,-15,-16,-17,-18,-19,-22,-20,24,24,-12,-13,-21,-18,-23,]),'ASSIGN':([44,],[47,]),}
+
+_lr_action = {}
+for _k, _v in _lr_action_items.items():
+   for _x,_y in zip(_v[0],_v[1]):
+      if not _x in _lr_action:  _lr_action[_x] = {}
+      _lr_action[_x][_k] = _y
+del _lr_action_items
+
+_lr_goto_items = {'expression':([0,12,27,46,47,],[1,26,43,43,49,]),'comparison':([0,12,15,16,17,18,19,20,27,46,47,],[2,2,28,29,30,31,32,33,2,2,2,]),'term':([0,12,15,16,17,18,19,20,21,22,27,46,47,],[3,3,3,3,3,3,3,3,34,35,3,3,3,]),'factor':([0,4,12,15,16,17,18,19,20,21,22,23,24,27,46,47,],[5,25,5,5,5,5,5,5,5,5,5,36,37,5,5,5,]),'function_call':([0,4,12,15,16,17,18,19,20,21,22,23,24,27,46,47,],[13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,]),'args':([27,],[39,]),'arg_list':([27,],[40,]),'empty':([27,],[41,]),'arg':([27,46,],[42,48,]),}
+
+_lr_goto = {}
+for _k, _v in _lr_goto_items.items():
+   for _x, _y in zip(_v[0], _v[1]):
+       if not _x in _lr_goto: _lr_goto[_x] = {}
+       _lr_goto[_x][_k] = _y
+del _lr_goto_items
+_lr_productions = [
+  ("S' -> expression","S'",1,None,None,None),
+  ('expression -> comparison','expression',1,'p_expression','validator.py',386),
+  ('expression -> expression EQUAL comparison','expression',3,'p_expression','validator.py',387),
+  ('expression -> expression NOTEQUAL comparison','expression',3,'p_expression','validator.py',388),
+  ('expression -> expression GREATER comparison','expression',3,'p_expression','validator.py',389),
+  ('expression -> expression LESS comparison','expression',3,'p_expression','validator.py',390),
+  ('expression -> expression GREATEREQUAL comparison','expression',3,'p_expression','validator.py',391),
+  ('expression -> expression LESSEQUAL comparison','expression',3,'p_expression','validator.py',392),
+  ('comparison -> term','comparison',1,'p_comparison','validator.py',399),
+  ('comparison -> comparison PLUS term','comparison',3,'p_comparison','validator.py',400),
+  ('comparison -> comparison MINUS term','comparison',3,'p_comparison','validator.py',401),
+  ('term -> factor','term',1,'p_term','validator.py',408),
+  ('term -> term TIMES factor','term',3,'p_term','validator.py',409),
+  ('term -> term DIVIDE factor','term',3,'p_term','validator.py',410),
+  ('factor -> NUMBER','factor',1,'p_factor','validator.py',417),
+  ('factor -> STRING','factor',1,'p_factor','validator.py',418),
+  ('factor -> FIELD','factor',1,'p_factor','validator.py',419),
+  ('factor -> CATEGORY','factor',1,'p_factor','validator.py',420),
+  ('factor -> IDENTIFIER','factor',1,'p_factor','validator.py',421),
+  ('factor -> BOOLEAN','factor',1,'p_factor','validator.py',422),
+  ('factor -> MINUS factor','factor',2,'p_factor','validator.py',423),
+  ('factor -> LPAREN expression RPAREN','factor',3,'p_factor','validator.py',424),
+  ('factor -> function_call','factor',1,'p_factor','validator.py',425),
+  ('function_call -> FUNCTION LPAREN args RPAREN','function_call',4,'p_function_call','validator.py',453),
+  ('args -> arg_list','args',1,'p_args','validator.py',457),
+  ('args -> empty','args',1,'p_args','validator.py',458),
+  ('arg_list -> arg','arg_list',1,'p_arg_list','validator.py',465),
+  ('arg_list -> arg_list COMMA arg','arg_list',3,'p_arg_list','validator.py',466),
+  ('arg -> expression','arg',1,'p_arg','validator.py',473),
+  ('arg -> IDENTIFIER ASSIGN expression','arg',3,'p_arg','validator.py',474),
+  ('empty -> <empty>','empty',0,'p_empty','validator.py',481),
+]

cnhkmcp/untracked/skills/alpha-expression-verifier/scripts/validator.py

@@ -170,7 +170,10 @@ supported_functions = {
     'scale_down': {'min_args': 2, 'max_args': 2, 'arg_types': ['expression', 'number'], 'param_names': ['x', 'constant']},
     
     # Arithmetic 类别函数
-    'add': {'min_args': 2, 'max_args': 3, 'arg_types': ['expression', 'expression', 'boolean']},  # add(x, y, filter=false)
+    # add(x, y, ..., filter=false)
+    # NOTE: add() is variadic (>=2 terms) with an optional boolean filter flag.
+    # We validate it with custom logic in validate_function().
+    'add': {'min_args': 2, 'max_args': 101, 'arg_types': ['expression'] * 101},
     'multiply': {'min_args': 2, 'max_args': 100, 'arg_types': ['expression'] * 99 + ['boolean'], 'param_names': ['x', 'y', 'filter']},  # multiply(x, y, ..., filter=false)
     'sign': {'min_args': 1, 'max_args': 1, 'arg_types': ['expression']},
     'subtract': {'min_args': 2, 'max_args': 3, 'arg_types': ['expression', 'expression', 'boolean']},  # subtract(x, y, filter=false)
@@ -501,6 +504,10 @@ class ExpressionValidator:
         if not function_info:
             return [f"未知函数: {function_name}"]
         
+        # Custom validation for variadic functions with optional flags
+        if function_name == 'add':
+            return self._validate_add(args, is_in_group_arg)
+
         errors = []
         
         # 检查参数数量
@@ -591,9 +598,9 @@ class ExpressionValidator:
             if arg.node_type != 'number':
                 errors.append(f"参数 {arg_index+1} 应该是一个数字，但得到 {arg.node_type}")
         elif expected_type == 'boolean':
-            # 布尔值可以是数字（0/1）
-            if arg.node_type != 'number':
-                errors.append(f"参数 {arg_index+1} 应该是一个布尔值（0/1），但得到 {arg.node_type}")
+            # 布尔值可以是 true/false 或数字（0/1）
+            if arg.node_type not in {'boolean', 'number'}:
+                errors.append(f"参数 {arg_index+1} 应该是一个布尔值（true/false 或 0/1），但得到 {arg.node_type}")
         elif expected_type == 'field':
             if arg.node_type != 'field' and arg.node_type != 'category':
                 # 允许field或category作为字段参数
@@ -610,6 +617,73 @@ class ExpressionValidator:
             # group函数的category参数可以是任何类型（field、category等），不进行类型校验
         
         return errors
+
+    def _validate_add(self, args: List[Any], is_in_group_arg: bool = False) -> List[str]:
+        """Validate add(x, y, ..., filter=false).
+
+        Rules:
+        - At least 2 positional expression terms.
+        - Optional filter flag can be provided as:
+          - named argument: filter=<boolean>
+          - last positional argument: <boolean> or 0/1
+        """
+        errors: List[str] = []
+
+        if len(args) < 2:
+            return [f"函数 add 需要至少 2 个参数，但只提供了 {len(args)}"]
+
+        named_filter_nodes: List[ASTNode] = []
+        positional_nodes: List[ASTNode] = []
+
+        for arg in args:
+            if isinstance(arg, dict) and arg.get('type') == 'named':
+                name = arg.get('name')
+                value = arg.get('value')
+                if name != 'filter':
+                    errors.append(f"函数 add 不存在参数 '{name}'")
+                    continue
+                if not hasattr(value, 'node_type'):
+                    errors.append("函数 add 的参数 filter 格式错误")
+                    continue
+                named_filter_nodes.append(value)
+            elif isinstance(arg, dict) and arg.get('type') == 'positional':
+                value = arg.get('value')
+                if hasattr(value, 'node_type'):
+                    positional_nodes.append(value)
+                else:
+                    errors.append("函数 add 的位置参数格式错误")
+            elif hasattr(arg, 'node_type'):
+                positional_nodes.append(arg)
+            else:
+                errors.append("函数 add 的参数格式错误")
+
+        if len(named_filter_nodes) > 1:
+            errors.append("函数 add 的参数 'filter' 只能出现一次")
+
+        positional_filter_node: Optional[ASTNode] = None
+        # Only infer a positional filter flag when:
+        # - no named filter is provided
+        # - there are at least 3 positional args (x, y, filter)
+        # - the last arg is boolean or numeric 0/1
+        if not named_filter_nodes and len(positional_nodes) >= 3:
+            last = positional_nodes[-1]
+            if last.node_type == 'boolean' or (last.node_type == 'number' and last.value in {0, 1}):
+                positional_filter_node = positional_nodes.pop()
+
+        if len(positional_nodes) < 2:
+            errors.append(f"函数 add 需要至少 2 个输入项（不含filter），但只提供了 {len(positional_nodes)}")
+
+        for idx, node in enumerate(positional_nodes):
+            errors.extend(self._validate_arg_type(node, 'expression', idx, 'add', is_in_group_arg))
+
+        if positional_filter_node is not None and named_filter_nodes:
+            errors.append("函数 add 的 filter 不能同时用位置参数和命名参数传递")
+        if positional_filter_node is not None:
+            errors.extend(self._validate_arg_type(positional_filter_node, 'boolean', len(positional_nodes), 'add', is_in_group_arg))
+        if named_filter_nodes:
+            errors.extend(self._validate_arg_type(named_filter_nodes[0], 'boolean', len(positional_nodes), 'add', is_in_group_arg))
+
+        return errors
     
     def validate_ast(self, ast: Optional[ASTNode], is_in_group_arg: bool = False) -> List[str]:
         """递归验证抽象语法树"""

{cnhkmcp-2.3.0.dist-info → cnhkmcp-2.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cnhkmcp
-Version: 2.3.0
+Version: 2.3.2
 Summary: A comprehensive Model Context Protocol (MCP) server for quantitative trading platform integration
 Home-page: https://github.com/cnhk/cnhkmcp
 Author: CNHK