cnhkmcp 2.3.6__tar.gz → 2.3.7__tar.gz

{cnhkmcp-2.3.6/cnhkmcp.egg-info → cnhkmcp-2.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cnhkmcp
-Version: 2.3.6
+Version: 2.3.7
 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.6 → cnhkmcp-2.3.7}/cnhkmcp/__init__.py

@@ -50,7 +50,7 @@ from .untracked.forum_functions import (
     read_full_forum_post
 )
 
-__version__ = "2.3.6"
+__version__ = "2.3.7"
 __author__ = "CNHK"
 __email__ = "cnhk@example.com"
 

{cnhkmcp-2.3.6/cnhkmcp/untracked/skills/alpha-expression-verifier/scripts → cnhkmcp-2.3.7/cnhkmcp/untracked/APP/Tranformer}/validator.py

@@ -25,7 +25,8 @@ except ImportError:
 supported_functions = {
     # Group 类别函数
     'group_min': {'min_args': 2, 'max_args': 2, 'arg_types': ['expression', 'category']},
-    'group_mean': {'min_args': 3, 'max_args': 3, 'arg_types': ['expression', 'expression', 'expression']},
+    # group_mean(x, w, group)
+    'group_mean': {'min_args': 3, 'max_args': 3, 'arg_types': ['expression', 'expression', 'category']},
     'group_median': {'min_args': 2, 'max_args': 2, 'arg_types': ['expression', 'category']},
     'group_max': {'min_args': 2, 'max_args': 2, 'arg_types': ['expression', 'category']},
     'group_rank': {'min_args': 2, 'max_args': 2, 'arg_types': ['expression', 'category']},
@@ -715,19 +716,53 @@ class ExpressionValidator:
             return cached
 
         derived = False
-        if node.node_type == 'function' and node.value in {'bucket', 'group_cartesian_product'}:
-            derived = True
+        if node.node_type == 'function':
+            if node.value in {'bucket', 'group_cartesian_product'}:
+                derived = True
+            else:
+                function_info = supported_functions.get(node.value, {})
+                arg_types = function_info.get('arg_types', [])
+                param_names = function_info.get('param_names', [])
+
+                positional_index = 0
+                for child in node.children:
+                    if isinstance(child, dict):
+                        if child.get('type') == 'named':
+                            name = child.get('name')
+                            value = child.get('value')
+
+                            expected_type = None
+                            if name in param_names:
+                                param_index = param_names.index(name)
+                                if param_index < len(arg_types):
+                                    expected_type = arg_types[param_index]
+
+                            if expected_type == 'category':
+                                continue
+
+                            if self._is_derived_category(value):
+                                derived = True
+                                break
+                        elif child.get('type') == 'positional':
+                            value = child.get('value')
+                            expected_type = arg_types[positional_index] if positional_index < len(arg_types) else None
+
+                            if expected_type != 'category' and self._is_derived_category(value):
+                                derived = True
+                                break
+                            positional_index += 1
+                    else:
+                        expected_type = arg_types[positional_index] if positional_index < len(arg_types) else None
+                        if expected_type != 'category' and self._is_derived_category(child):
+                            derived = True
+                            break
+                        positional_index += 1
         elif node.node_type in {'unop', 'binop'}:
             derived = any(
                 self._is_derived_category(child)
                 for child in node.children
                 if hasattr(child, 'node_type')
             )
-        elif node.node_type == 'function':
-            derived = any(
-                self._is_derived_category(child.get('value')) if isinstance(child, dict) else self._is_derived_category(child)
-                for child in node.children
-            )
 
         self._derived_category_cache[cache_key] = derived
         return derived

{cnhkmcp-2.3.6/cnhkmcp/untracked/APP/Tranformer → cnhkmcp-2.3.7/cnhkmcp/untracked/APP/blueprints}/validator.py

@@ -25,7 +25,8 @@ except ImportError:
 supported_functions = {
     # Group 类别函数
     'group_min': {'min_args': 2, 'max_args': 2, 'arg_types': ['expression', 'category']},
-    'group_mean': {'min_args': 3, 'max_args': 3, 'arg_types': ['expression', 'expression', 'expression']},
+    # group_mean(x, w, group)
+    'group_mean': {'min_args': 3, 'max_args': 3, 'arg_types': ['expression', 'expression', 'category']},
     'group_median': {'min_args': 2, 'max_args': 2, 'arg_types': ['expression', 'category']},
     'group_max': {'min_args': 2, 'max_args': 2, 'arg_types': ['expression', 'category']},
     'group_rank': {'min_args': 2, 'max_args': 2, 'arg_types': ['expression', 'category']},
@@ -715,19 +716,53 @@ class ExpressionValidator:
             return cached
 
         derived = False
-        if node.node_type == 'function' and node.value in {'bucket', 'group_cartesian_product'}:
-            derived = True
+        if node.node_type == 'function':
+            if node.value in {'bucket', 'group_cartesian_product'}:
+                derived = True
+            else:
+                function_info = supported_functions.get(node.value, {})
+                arg_types = function_info.get('arg_types', [])
+                param_names = function_info.get('param_names', [])
+
+                positional_index = 0
+                for child in node.children:
+                    if isinstance(child, dict):
+                        if child.get('type') == 'named':
+                            name = child.get('name')
+                            value = child.get('value')
+
+                            expected_type = None
+                            if name in param_names:
+                                param_index = param_names.index(name)
+                                if param_index < len(arg_types):
+                                    expected_type = arg_types[param_index]
+
+                            if expected_type == 'category':
+                                continue
+
+                            if self._is_derived_category(value):
+                                derived = True
+                                break
+                        elif child.get('type') == 'positional':
+                            value = child.get('value')
+                            expected_type = arg_types[positional_index] if positional_index < len(arg_types) else None
+
+                            if expected_type != 'category' and self._is_derived_category(value):
+                                derived = True
+                                break
+                            positional_index += 1
+                    else:
+                        expected_type = arg_types[positional_index] if positional_index < len(arg_types) else None
+                        if expected_type != 'category' and self._is_derived_category(child):
+                            derived = True
+                            break
+                        positional_index += 1
         elif node.node_type in {'unop', 'binop'}:
             derived = any(
                 self._is_derived_category(child)
                 for child in node.children
                 if hasattr(child, 'node_type')
             )
-        elif node.node_type == 'function':
-            derived = any(
-                self._is_derived_category(child.get('value')) if isinstance(child, dict) else self._is_derived_category(child)
-                for child in node.children
-            )
 
         self._derived_category_cache[cache_key] = derived
         return derived

{cnhkmcp-2.3.6 → cnhkmcp-2.3.7}/cnhkmcp/untracked/APP/trailSomeAlphas/skills/brain-feature-implementation/scripts/validator.py

@@ -25,7 +25,8 @@ except ImportError:
 supported_functions = {
     # Group 类别函数
     'group_min': {'min_args': 2, 'max_args': 2, 'arg_types': ['expression', 'category']},
-    'group_mean': {'min_args': 3, 'max_args': 3, 'arg_types': ['expression', 'expression', 'expression']},
+    # group_mean(x, w, group)
+    'group_mean': {'min_args': 3, 'max_args': 3, 'arg_types': ['expression', 'expression', 'category']},
     'group_median': {'min_args': 2, 'max_args': 2, 'arg_types': ['expression', 'category']},
     'group_max': {'min_args': 2, 'max_args': 2, 'arg_types': ['expression', 'category']},
     'group_rank': {'min_args': 2, 'max_args': 2, 'arg_types': ['expression', 'category']},
@@ -719,19 +720,54 @@ class ExpressionValidator:
             return cached
 
         derived = False
-        if node.node_type == 'function' and node.value in {'bucket', 'group_cartesian_product'}:
-            derived = True
+        if node.node_type == 'function':
+            if node.value in {'bucket', 'group_cartesian_product'}:
+                derived = True
+            else:
+                function_info = supported_functions.get(node.value, {})
+                arg_types = function_info.get('arg_types', [])
+                param_names = function_info.get('param_names', [])
+
+                positional_index = 0
+                for child in node.children:
+                    if isinstance(child, dict):
+                        if child.get('type') == 'named':
+                            name = child.get('name')
+                            value = child.get('value')
+
+                            expected_type = None
+                            if name in param_names:
+                                param_index = param_names.index(name)
+                                if param_index < len(arg_types):
+                                    expected_type = arg_types[param_index]
+
+                            # Do not propagate "derived" through allowed category/grouping-key inputs.
+                            if expected_type == 'category':
+                                continue
+
+                            if self._is_derived_category(value):
+                                derived = True
+                                break
+                        elif child.get('type') == 'positional':
+                            value = child.get('value')
+                            expected_type = arg_types[positional_index] if positional_index < len(arg_types) else None
+
+                            if expected_type != 'category' and self._is_derived_category(value):
+                                derived = True
+                                break
+                            positional_index += 1
+                    else:
+                        expected_type = arg_types[positional_index] if positional_index < len(arg_types) else None
+                        if expected_type != 'category' and self._is_derived_category(child):
+                            derived = True
+                            break
+                        positional_index += 1
         elif node.node_type in {'unop', 'binop'}:
             derived = any(
                 self._is_derived_category(child)
                 for child in node.children
                 if hasattr(child, 'node_type')
             )
-        elif node.node_type == 'function':
-            derived = any(
-                self._is_derived_category(child.get('value')) if isinstance(child, dict) else self._is_derived_category(child)
-                for child in node.children
-            )
 
         self._derived_category_cache[cache_key] = derived
         return derived

{cnhkmcp-2.3.6/cnhkmcp/untracked/APP/blueprints → cnhkmcp-2.3.7/cnhkmcp/untracked/skills/alpha-expression-verifier/scripts}/validator.py

@@ -25,7 +25,8 @@ except ImportError:
 supported_functions = {
     # Group 类别函数
     'group_min': {'min_args': 2, 'max_args': 2, 'arg_types': ['expression', 'category']},
-    'group_mean': {'min_args': 3, 'max_args': 3, 'arg_types': ['expression', 'expression', 'expression']},
+    # group_mean(x, w, group)
+    'group_mean': {'min_args': 3, 'max_args': 3, 'arg_types': ['expression', 'expression', 'category']},
     'group_median': {'min_args': 2, 'max_args': 2, 'arg_types': ['expression', 'category']},
     'group_max': {'min_args': 2, 'max_args': 2, 'arg_types': ['expression', 'category']},
     'group_rank': {'min_args': 2, 'max_args': 2, 'arg_types': ['expression', 'category']},
@@ -715,19 +716,53 @@ class ExpressionValidator:
             return cached
 
         derived = False
-        if node.node_type == 'function' and node.value in {'bucket', 'group_cartesian_product'}:
-            derived = True
+        if node.node_type == 'function':
+            if node.value in {'bucket', 'group_cartesian_product'}:
+                derived = True
+            else:
+                function_info = supported_functions.get(node.value, {})
+                arg_types = function_info.get('arg_types', [])
+                param_names = function_info.get('param_names', [])
+
+                positional_index = 0
+                for child in node.children:
+                    if isinstance(child, dict):
+                        if child.get('type') == 'named':
+                            name = child.get('name')
+                            value = child.get('value')
+
+                            expected_type = None
+                            if name in param_names:
+                                param_index = param_names.index(name)
+                                if param_index < len(arg_types):
+                                    expected_type = arg_types[param_index]
+
+                            if expected_type == 'category':
+                                continue
+
+                            if self._is_derived_category(value):
+                                derived = True
+                                break
+                        elif child.get('type') == 'positional':
+                            value = child.get('value')
+                            expected_type = arg_types[positional_index] if positional_index < len(arg_types) else None
+
+                            if expected_type != 'category' and self._is_derived_category(value):
+                                derived = True
+                                break
+                            positional_index += 1
+                    else:
+                        expected_type = arg_types[positional_index] if positional_index < len(arg_types) else None
+                        if expected_type != 'category' and self._is_derived_category(child):
+                            derived = True
+                            break
+                        positional_index += 1
         elif node.node_type in {'unop', 'binop'}:
             derived = any(
                 self._is_derived_category(child)
                 for child in node.children
                 if hasattr(child, 'node_type')
             )
-        elif node.node_type == 'function':
-            derived = any(
-                self._is_derived_category(child.get('value')) if isinstance(child, dict) else self._is_derived_category(child)
-                for child in node.children
-            )
 
         self._derived_category_cache[cache_key] = derived
         return derived

{cnhkmcp-2.3.6 → cnhkmcp-2.3.7}/cnhkmcp/untracked/skills/brain-inspectRawTemplate-create-Setting/scripts/validator.py

@@ -25,7 +25,8 @@ except ImportError:
 supported_functions = {
     # Group 类别函数
     'group_min': {'min_args': 2, 'max_args': 2, 'arg_types': ['expression', 'category']},
-    'group_mean': {'min_args': 3, 'max_args': 3, 'arg_types': ['expression', 'expression', 'expression']},
+    # group_mean(x, w, group)
+    'group_mean': {'min_args': 3, 'max_args': 3, 'arg_types': ['expression', 'expression', 'category']},
     'group_median': {'min_args': 2, 'max_args': 2, 'arg_types': ['expression', 'category']},
     'group_max': {'min_args': 2, 'max_args': 2, 'arg_types': ['expression', 'category']},
     'group_rank': {'min_args': 2, 'max_args': 2, 'arg_types': ['expression', 'category']},
@@ -719,19 +720,53 @@ class ExpressionValidator:
             return cached
 
         derived = False
-        if node.node_type == 'function' and node.value in {'bucket', 'group_cartesian_product'}:
-            derived = True
+        if node.node_type == 'function':
+            if node.value in {'bucket', 'group_cartesian_product'}:
+                derived = True
+            else:
+                function_info = supported_functions.get(node.value, {})
+                arg_types = function_info.get('arg_types', [])
+                param_names = function_info.get('param_names', [])
+
+                positional_index = 0
+                for child in node.children:
+                    if isinstance(child, dict):
+                        if child.get('type') == 'named':
+                            name = child.get('name')
+                            value = child.get('value')
+
+                            expected_type = None
+                            if name in param_names:
+                                param_index = param_names.index(name)
+                                if param_index < len(arg_types):
+                                    expected_type = arg_types[param_index]
+
+                            if expected_type == 'category':
+                                continue
+
+                            if self._is_derived_category(value):
+                                derived = True
+                                break
+                        elif child.get('type') == 'positional':
+                            value = child.get('value')
+                            expected_type = arg_types[positional_index] if positional_index < len(arg_types) else None
+
+                            if expected_type != 'category' and self._is_derived_category(value):
+                                derived = True
+                                break
+                            positional_index += 1
+                    else:
+                        expected_type = arg_types[positional_index] if positional_index < len(arg_types) else None
+                        if expected_type != 'category' and self._is_derived_category(child):
+                            derived = True
+                            break
+                        positional_index += 1
         elif node.node_type in {'unop', 'binop'}:
             derived = any(
                 self._is_derived_category(child)
                 for child in node.children
                 if hasattr(child, 'node_type')
             )
-        elif node.node_type == 'function':
-            derived = any(
-                self._is_derived_category(child.get('value')) if isinstance(child, dict) else self._is_derived_category(child)
-                for child in node.children
-            )
 
         self._derived_category_cache[cache_key] = derived
         return derived

{cnhkmcp-2.3.6 → cnhkmcp-2.3.7/cnhkmcp.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cnhkmcp
-Version: 2.3.6
+Version: 2.3.7
 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.6 → cnhkmcp-2.3.7}/cnhkmcp.egg-info/SOURCES.txt

@@ -27,7 +27,6 @@ cnhkmcp/untracked/示例工作流_Dataset_Exploration_Expert_Manual.md
 cnhkmcp/untracked/示例工作流_daily_report_workflow.md
 cnhkmcp/untracked/配置前运行我_安装必要依赖包.py
 cnhkmcp/untracked/AI打工人/BRAIN_AI打工人Mac_Linux版本.zip
-cnhkmcp/untracked/AI打工人/双击安装AI打工人_Windows版本.exe
 cnhkmcp/untracked/AI桌面插件/README.md
 cnhkmcp/untracked/AI桌面插件/ace.log
 cnhkmcp/untracked/AI桌面插件/config.json

{cnhkmcp-2.3.6 → cnhkmcp-2.3.7}/setup.py

@@ -13,7 +13,7 @@ def read_requirements():
 
 setup(
     name="cnhkmcp",
-    version="2.3.6",
+    version="2.3.7",
     author="CNHK",
     author_email="cnhk@example.com",
     description="A comprehensive Model Context Protocol (MCP) server for quantitative trading platform integration",