cnhkmcp 2.3.7__py3-none-any.whl → 2.3.8__py3-none-any.whl

cnhkmcp/untracked/skills/brain-inspectRawTemplate-create-Setting/scripts/validator.py

@@ -613,6 +613,16 @@ class ExpressionValidator:
         """验证参数类型是否符合预期"""
         errors = []
 
+        def _is_number_like(node: ASTNode) -> bool:
+            if node is None:
+                return False
+            if node.node_type == 'number':
+                return True
+            if node.node_type == 'unop' and isinstance(node.value, dict) and node.value.get('op') in {'-', '+'}:
+                if node.children and hasattr(node.children[0], 'node_type'):
+                    return _is_number_like(node.children[0])
+            return False
+
         # Unit compatibility check
         # bucket()/group_cartesian_product() output a derived category (grouping key).
         # It can only be consumed where a category/grouping key is expected (typically by group_* operators).
@@ -634,7 +644,8 @@ class ExpressionValidator:
             # 表达式可以是任何有效的AST节点
             pass
         elif expected_type == 'number':
-            if arg.node_type != 'number':
+            # 允许 -1 这类一元负号数字常量（解析为 unop(number)）
+            if not _is_number_like(arg):
                 errors.append(f"参数 {arg_index+1} 应该是一个数字，但得到 {arg.node_type}")
         elif expected_type == 'boolean':
             # 布尔值可以是 true/false 或数字（0/1）
@@ -900,6 +911,172 @@ class ExpressionValidator:
         Returns:
             Tuple[bool, str]: (是否成功, 转换后的表达式或错误信息)
         """
+        def _top_level_equals_positions(stmt: str) -> List[int]:
+            """返回所有“顶层赋值”等号位置。
+
+            仅统计括号外（()[]{})、引号外、且不属于比较操作符(==,!=,<=,>=)的 '='。
+            这样可以避免把关键字参数（如 rettype=0）误判为赋值语句。
+            """
+            positions: List[int] = []
+            paren_depth = 0
+            bracket_depth = 0
+            brace_depth = 0
+            in_single_quote = False
+            in_double_quote = False
+            escape = False
+
+            for i, ch in enumerate(stmt):
+                if escape:
+                    escape = False
+                    continue
+                if ch == '\\':
+                    escape = True
+                    continue
+
+                if in_single_quote:
+                    if ch == "'":
+                        in_single_quote = False
+                    continue
+                if in_double_quote:
+                    if ch == '"':
+                        in_double_quote = False
+                    continue
+
+                if ch == "'":
+                    in_single_quote = True
+                    continue
+                if ch == '"':
+                    in_double_quote = True
+                    continue
+
+                if ch == '(':
+                    paren_depth += 1
+                    continue
+                if ch == ')':
+                    paren_depth = max(0, paren_depth - 1)
+                    continue
+                if ch == '[':
+                    bracket_depth += 1
+                    continue
+                if ch == ']':
+                    bracket_depth = max(0, bracket_depth - 1)
+                    continue
+                if ch == '{':
+                    brace_depth += 1
+                    continue
+                if ch == '}':
+                    brace_depth = max(0, brace_depth - 1)
+                    continue
+
+                if paren_depth or bracket_depth or brace_depth:
+                    continue
+
+                if ch != '=':
+                    continue
+
+                prev_ch = stmt[i - 1] if i > 0 else ''
+                next_ch = stmt[i + 1] if i + 1 < len(stmt) else ''
+                if prev_ch in ['=', '!', '<', '>'] or next_ch == '=':
+                    continue
+
+                positions.append(i)
+
+            return positions
+
+        def _keyword_arg_names(stmt: str):
+            """提取函数调用中的命名参数名（如 rettype=0 中的 rettype）。
+
+            只收集括号/中括号/大括号内部出现的 name= 形式，避免把脚本级赋值误当作命名参数。
+            """
+            names = set()
+            paren_depth = 0
+            bracket_depth = 0
+            brace_depth = 0
+            in_single_quote = False
+            in_double_quote = False
+            escape = False
+
+            i = 0
+            while i < len(stmt):
+                ch = stmt[i]
+
+                if escape:
+                    escape = False
+                    i += 1
+                    continue
+                if ch == '\\':
+                    escape = True
+                    i += 1
+                    continue
+
+                if in_single_quote:
+                    if ch == "'":
+                        in_single_quote = False
+                    i += 1
+                    continue
+                if in_double_quote:
+                    if ch == '"':
+                        in_double_quote = False
+                    i += 1
+                    continue
+
+                if ch == "'":
+                    in_single_quote = True
+                    i += 1
+                    continue
+                if ch == '"':
+                    in_double_quote = True
+                    i += 1
+                    continue
+
+                if ch == '(':
+                    paren_depth += 1
+                    i += 1
+                    continue
+                if ch == ')':
+                    paren_depth = max(0, paren_depth - 1)
+                    i += 1
+                    continue
+                if ch == '[':
+                    bracket_depth += 1
+                    i += 1
+                    continue
+                if ch == ']':
+                    bracket_depth = max(0, bracket_depth - 1)
+                    i += 1
+                    continue
+                if ch == '{':
+                    brace_depth += 1
+                    i += 1
+                    continue
+                if ch == '}':
+                    brace_depth = max(0, brace_depth - 1)
+                    i += 1
+                    continue
+
+                inside_container = bool(paren_depth or bracket_depth or brace_depth)
+
+                if inside_container and (ch.isalpha() or ch == '_'):
+                    start = i
+                    i += 1
+                    while i < len(stmt) and (stmt[i].isalnum() or stmt[i] == '_'):
+                        i += 1
+                    name = stmt[start:i]
+
+                    j = i
+                    while j < len(stmt) and stmt[j].isspace():
+                        j += 1
+
+                    if j < len(stmt) and stmt[j] == '=':
+                        next_ch = stmt[j + 1] if j + 1 < len(stmt) else ''
+                        if next_ch != '=':
+                            names.add(name.lower())
+                    continue
+
+                i += 1
+
+            return names
+
         # 检查表达式是否以分号结尾
         if expression.strip().endswith(';'):
             return False, "表达式不能以分号结尾"
@@ -914,51 +1091,13 @@ class ExpressionValidator:
         
         # 处理每个赋值语句（除了最后一个）
         for i, stmt in enumerate(statements[:-1]):
-            # 检查是否包含赋值符号
-            if '=' not in stmt:
-                return False, f"第{i+1}个语句必须是赋值语句（使用=符号）"
-            
-            # 检查是否是比较操作符（==, !=, <=, >=）
-            if any(op in stmt for op in ['==', '!=', '<=', '>=']):
-                # 如果包含比较操作符，需要确认是否有赋值符号
-                # 使用临时替换法：将比较操作符替换为临时标记，再检查是否还有=
-                temp_stmt = stmt
-                for op in ['==', '!=', '<=', '>=']:
-                    temp_stmt = temp_stmt.replace(op, '---')
-                
-                if '=' not in temp_stmt:
-                    return False, f"第{i+1}个语句必须是赋值语句，不能只是比较表达式"
-            
-            # 找到第一个=符号（不是比较操作符的一部分）
-            # 先将比较操作符替换为临时标记，再找=
-            temp_stmt = stmt
-            for op in ['==', '!=', '<=', '>=']:
-                temp_stmt = temp_stmt.replace(op, '---')
-            
-            if '=' not in temp_stmt:
+            eq_positions = _top_level_equals_positions(stmt)
+            if not eq_positions:
                 return False, f"第{i+1}个语句必须是赋值语句（使用=符号）"
-            
-            # 找到实际的=位置
-            equals_pos = temp_stmt.index('=')
-            
-            # 在原始语句中找到对应位置
-            real_equals_pos = 0
-            temp_count = 0
-            for char in stmt:
-                if temp_count == equals_pos:
-                    break
-                if char in '!<>':
-                    # 检查是否是比较操作符的一部分
-                    if real_equals_pos + 1 < len(stmt) and stmt[real_equals_pos + 1] == '=':
-                        # 是比较操作符，跳过两个字符
-                        real_equals_pos += 2
-                        temp_count += 3  # 因为替换成了三个字符的---
-                    else:
-                        real_equals_pos += 1
-                        temp_count += 1
-                else:
-                    real_equals_pos += 1
-                    temp_count += 1
+            if len(eq_positions) > 1:
+                return False, f"第{i+1}个语句只能包含一个赋值符号（=）"
+
+            real_equals_pos = eq_positions[0]
             
             # 分割变量名和值
             var_name = stmt[:real_equals_pos].strip()
@@ -975,9 +1114,12 @@ class ExpressionValidator:
             
             # 检查变量值中使用的变量是否已经定义
             # 简单检查：提取所有可能的变量名
+            kw_names = _keyword_arg_names(var_value)
             used_vars = re.findall(r'\b[a-zA-Z_][a-zA-Z0-9_]*\b', var_value)
             for used_var in used_vars:
                 used_var_lower = used_var.lower()
+                if used_var_lower in kw_names:
+                    continue
                 if used_var_lower not in variables:
                     # 检查是否是函数名
                     if used_var not in supported_functions:
@@ -1000,19 +1142,16 @@ class ExpressionValidator:
         final_stmt = statements[-1]
         
         # 检查最后一个语句是否是赋值语句
-        if '=' in final_stmt:
-            # 替换比较操作符为临时标记，然后检查是否还有单独的=
-            temp_stmt = final_stmt
-            for op in ['==', '!=', '<=', '>=']:
-                temp_stmt = temp_stmt.replace(op, '---')
-            
-            if '=' in temp_stmt:
-                return False, "最后一个语句不能是赋值语句"
+        if _top_level_equals_positions(final_stmt):
+            return False, "最后一个语句不能是赋值语句"
         
         # 检查最后一个语句中使用的变量是否已经定义
+        kw_names = _keyword_arg_names(final_stmt)
         used_vars = re.findall(r'\b[a-zA-Z_][a-zA-Z0-9_]*\b', final_stmt)
         for used_var in used_vars:
             used_var_lower = used_var.lower()
+            if used_var_lower in kw_names:
+                continue
             if used_var_lower not in variables:
                 # 检查是否是函数名
                 if used_var not in supported_functions:

{cnhkmcp-2.3.7.dist-info → cnhkmcp-2.3.8.dist-info}/METADATA

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

{cnhkmcp-2.3.7.dist-info → cnhkmcp-2.3.8.dist-info}/RECORD

@@ -1,4 +1,4 @@
-cnhkmcp/__init__.py,sha256=13ULgeeyONpZWNtJMNnbw8quqeWiTEvC7Jx3rxgy4Gk,2759
+cnhkmcp/__init__.py,sha256=aWRBIhD8S5oQMt2dB_le4tIteFbvHPhFteGiStHA2Go,2759
 cnhkmcp/untracked/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cnhkmcp/untracked/arXiv_API_Tool_Manual.md,sha256=I3hvI5mpmIjBuWptufoVSWFnuhyUc67oCGHEuR0p_xs,13552
 cnhkmcp/untracked/arxiv_api.py,sha256=ka2TCUMNdPFSsqgsDxZyLoIXCKaiX9OKuAx6IMEjCdI,9300
@@ -131,7 +131,7 @@ cnhkmcp/untracked/APP/Tranformer/helpful_functions.py,sha256=Jc8gclRkvGx7el0XgTm
 cnhkmcp/untracked/APP/Tranformer/parsetab.py,sha256=L_XJWx4AmYWASQ-krdrcyu7cEFbRdKS5MWppZ0Qfjlo,7650
 cnhkmcp/untracked/APP/Tranformer/template_summary.txt,sha256=gWz5LFlPtOmw0JnLj68hgWsoSFNyA18uCJWIYWHLbe8,111054
 cnhkmcp/untracked/APP/Tranformer/transformer_config.json,sha256=ene-WntIVbcoN3_H1ztlwtZK6eadSXCfqs1SSgrGAIg,179
-cnhkmcp/untracked/APP/Tranformer/validator.py,sha256=lDFLTDWzSnW4h1QJnYjWq12jPjFYxUDGMYrjQL9dVyM,62077
+cnhkmcp/untracked/APP/Tranformer/validator.py,sha256=-GqGCkE4pNjP6_-ZChNuNWKhEK988VywRJ8XMSoUz8g,66355
 cnhkmcp/untracked/APP/Tranformer/output/Alpha_candidates.json,sha256=vMw3zhzcwARGm92ykdGTeYTsrCje_RHt0sWv17R0qUs,368947
 cnhkmcp/untracked/APP/Tranformer/output/Alpha_candidates_示例.json,sha256=K40tcWPiUKaPnrtMdfsN2BOBG5IzqSz04XT6gRz7FVE,23139
 cnhkmcp/untracked/APP/Tranformer/output/Alpha_generated_expressions_error.json,sha256=T1PNoYwrqgwDVLtfmj7L5e0Sq02OEbqHPC8RFhICuUU,2
@@ -143,7 +143,7 @@ cnhkmcp/untracked/APP/blueprints/idea_house.py,sha256=P_Pq_kmw2N3YluBOH9e0SwsCsw
 cnhkmcp/untracked/APP/blueprints/inspiration_house.py,sha256=Zras66ksS3WRUnRcxKNaon2sHFeoZwdlY3K54sgcCyQ,18994
 cnhkmcp/untracked/APP/blueprints/paper_analysis.py,sha256=tYGh-A1pzvSw6ZzoMKyIJBysbX8xsdBZncWw8ZGKyVQ,22241
 cnhkmcp/untracked/APP/blueprints/parsetab.py,sha256=qJJR3QDtcqoBafLaIvvTiILY0REfP5VevvesWveEg1A,7650
-cnhkmcp/untracked/APP/blueprints/validator.py,sha256=lDFLTDWzSnW4h1QJnYjWq12jPjFYxUDGMYrjQL9dVyM,62077
+cnhkmcp/untracked/APP/blueprints/validator.py,sha256=-GqGCkE4pNjP6_-ZChNuNWKhEK988VywRJ8XMSoUz8g,66355
 cnhkmcp/untracked/APP/custom_templates/templates.json,sha256=ARrpRsxGcUpC2iepS6j6A_0tdu_xUJTIyvLDb8uzL_E,48776
 cnhkmcp/untracked/APP/give_me_idea/BRAIN_Alpha_Template_Expert_SystemPrompt.md,sha256=vZZFH7_h1PXQIYRA5eFPqJDJflsfVFFFzDjm8bNjZPc,15401
 cnhkmcp/untracked/APP/give_me_idea/ace_lib.py,sha256=nSnmM5zfI6lxIln1vctz7TCwjAWcljVXITy7R4gS3Q0,53947
@@ -291,7 +291,7 @@ cnhkmcp/untracked/APP/trailSomeAlphas/skills/brain-feature-implementation/script
 cnhkmcp/untracked/APP/trailSomeAlphas/skills/brain-feature-implementation/scripts/implement_idea.py,sha256=8nAyiFE0X6pcGQwZ4m-S9ph7lPSAGzzX7VLKBucBfZ8,8181
 cnhkmcp/untracked/APP/trailSomeAlphas/skills/brain-feature-implementation/scripts/merge_expression_list.py,sha256=4NzMqgwdLUx0baVm3CNRBlr17mtdnUzUdi3Depui8pc,3362
 cnhkmcp/untracked/APP/trailSomeAlphas/skills/brain-feature-implementation/scripts/parsetab.py,sha256=29clH5xFEmKpqzRvrLN89QE8JFJNYFhH-gEFR4y7448,7650
-cnhkmcp/untracked/APP/trailSomeAlphas/skills/brain-feature-implementation/scripts/validator.py,sha256=q6zpapSaZwRosCo5D0bumsqkr5dj0nKveNdjekLFJkY,62649
+cnhkmcp/untracked/APP/trailSomeAlphas/skills/brain-feature-implementation/scripts/validator.py,sha256=XPW94uD50rzX_MKNb0O405IZZcIrEh3T2vxXMljjMHY,66981
 cnhkmcp/untracked/APP/trailSomeAlphas/skills/template_final_enhance/op总结.md,sha256=HDc8lhGdMst2QgFCqD5fJWvDZ3w1S2DEk0bMsHziflA,20562
 cnhkmcp/untracked/APP/trailSomeAlphas/skills/template_final_enhance/sample_prompt.md,sha256=vf6Ps-hzIH-MRf-cv0Dyro7StdTJ-v6RAjHCXkpRwLE,6217
 cnhkmcp/untracked/APP/trailSomeAlphas/skills/template_final_enhance/单因子思考逻辑链.md,sha256=2IfV6lOKYwoZIlN1tjXjOezJn9pQxX4K3iPmnZh01gA,13232
@@ -308,7 +308,7 @@ cnhkmcp/untracked/mcp文件论坛版2_如果原版启动不了浏览器就试这
 cnhkmcp/untracked/skills/Claude_Skill_Creation_Guide.md,sha256=Wx4w8deBkuw0UcSwzNNQdRIuCqDXGk3-fRQBWcPQivw,5025
 cnhkmcp/untracked/skills/alpha-expression-verifier/SKILL.md,sha256=7oGzMIXUJzDCtbxND6QWmh6azkLqoFJNURIh-F-aPUQ,2213
 cnhkmcp/untracked/skills/alpha-expression-verifier/scripts/parsetab.py,sha256=L_XJWx4AmYWASQ-krdrcyu7cEFbRdKS5MWppZ0Qfjlo,7650
-cnhkmcp/untracked/skills/alpha-expression-verifier/scripts/validator.py,sha256=lDFLTDWzSnW4h1QJnYjWq12jPjFYxUDGMYrjQL9dVyM,62077
+cnhkmcp/untracked/skills/alpha-expression-verifier/scripts/validator.py,sha256=-GqGCkE4pNjP6_-ZChNuNWKhEK988VywRJ8XMSoUz8g,66355
 cnhkmcp/untracked/skills/alpha-expression-verifier/scripts/verify_expr.py,sha256=zDSlYf0XlkyML-fcL4wld445RMbztt4pDSP5b6W6JKQ,1659
 cnhkmcp/untracked/skills/brain-calculate-alpha-selfcorrQuick/SKILL.md,sha256=UKQhfHPOH8_YXnRotzXuG8BrgFeXhQoxAZIEeaQxGds,1183
 cnhkmcp/untracked/skills/brain-calculate-alpha-selfcorrQuick/reference.md,sha256=ws9oUgtEdK7aVjw6sNoVzFQ3gyoX5UIlyz3wItI0fxI,3115
@@ -380,7 +380,7 @@ cnhkmcp/untracked/skills/brain-inspectRawTemplate-create-Setting/scripts/parse_i
 cnhkmcp/untracked/skills/brain-inspectRawTemplate-create-Setting/scripts/parsetab.py,sha256=JvZ5WdYXoDafh4tSl2nw0rzhCCIdA4T_UXabMl9gkYg,7650
 cnhkmcp/untracked/skills/brain-inspectRawTemplate-create-Setting/scripts/process_template.py,sha256=AbNB9IniG4JuZK8V9xJkOlvvafs8FNkGjMqVKLCL0RM,3627
 cnhkmcp/untracked/skills/brain-inspectRawTemplate-create-Setting/scripts/resolve_settings.py,sha256=wdhmkHEvIX4OaLTwLbERXUU8RFmL7ezW4YTJXbEs4Fs,2928
-cnhkmcp/untracked/skills/brain-inspectRawTemplate-create-Setting/scripts/validator.py,sha256=_OJTcDyO7XVgO0_icUEdUzMHTXkh9V7OWqJVWGYwtqs,62545
+cnhkmcp/untracked/skills/brain-inspectRawTemplate-create-Setting/scripts/validator.py,sha256=b4NvSugrUPa2YZbXBbVy_LdCgCPf637fMumZlKdXS1A,66823
 cnhkmcp/untracked/skills/brain-nextMove-analysis/SKILL.md,sha256=MGmM3HHYTdzxLE6uOxs9mB4i3At4JGjJYzsbzQKTjgc,1685
 cnhkmcp/untracked/skills/brain-nextMove-analysis/reference.md,sha256=6aNmPqWRn09XdQMRxoVTka9IYVOUv5LcWparHu16EfQ,9460
 cnhkmcp/untracked/skills/planning-with-files/SKILL.md,sha256=WORMds3daIxA7qRTamVcTSiySAzXvkHlzONC1Kv6ato,6686
@@ -395,9 +395,9 @@ cnhkmcp/untracked/skills/pull_BRAINSkill/SKILL.md,sha256=QyXQ0wr9LeZyKqkvSTto72b
 cnhkmcp/untracked/skills/pull_BRAINSkill/scripts/pull_skills.py,sha256=6v3Z3cc9_qKvBj7C6y2jWY1pAd76SA3JmiVj_KkZkmw,6341
 cnhkmcp/vector_db/_manifest.json,sha256=RBNvo1WzZ4oRRq0W9-hknpT7T8If536DEMBg9hyq_4o,2
 cnhkmcp/vector_db/_meta.json,sha256=xQwhRA0prLtwFAMAGR1ZgCR76jVEFIEfF-1SNPpTMgI,91
-cnhkmcp-2.3.7.dist-info/licenses/LICENSE,sha256=QLxO2eNMnJQEdI_R1UV2AOD-IvuA8zVrkHWA4D9gtoc,1081
-cnhkmcp-2.3.7.dist-info/METADATA,sha256=QJtvYs51Cvz14j2Bro0cgzmT6LerISsgNTDPeOQbrcw,5171
-cnhkmcp-2.3.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cnhkmcp-2.3.7.dist-info/entry_points.txt,sha256=lTQieVyIvjhSMK4fT-XwnccY-JBC1H4vVQ3V9dDM-Pc,70
-cnhkmcp-2.3.7.dist-info/top_level.txt,sha256=x--ibUcSgOS9Z_RWK2Qc-vfs7DaXQN-WMaaxEETJ1Bw,8
-cnhkmcp-2.3.7.dist-info/RECORD,,
+cnhkmcp-2.3.8.dist-info/licenses/LICENSE,sha256=QLxO2eNMnJQEdI_R1UV2AOD-IvuA8zVrkHWA4D9gtoc,1081
+cnhkmcp-2.3.8.dist-info/METADATA,sha256=RCn5ZGpYfNCYrTjuW4R7VhA-Wy3wU-cAlevJzQiqmDE,5171
+cnhkmcp-2.3.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cnhkmcp-2.3.8.dist-info/entry_points.txt,sha256=lTQieVyIvjhSMK4fT-XwnccY-JBC1H4vVQ3V9dDM-Pc,70
+cnhkmcp-2.3.8.dist-info/top_level.txt,sha256=x--ibUcSgOS9Z_RWK2Qc-vfs7DaXQN-WMaaxEETJ1Bw,8
+cnhkmcp-2.3.8.dist-info/RECORD,,