aigroup-econ-mcp 0.4.1__py3-none-any.whl → 0.4.2__py3-none-any.whl

aigroup_econ_mcp/tools/tool_registry.py

@@ -7,7 +7,7 @@ from typing import Dict, Any, Optional, List, Callable
 from pydantic import Field
 from typing import Annotated
 
-from .decorators import econometric_tool
+from .base import with_file_support_decorator as econometric_tool
 
 
 # 标准文件输入参数定义

{aigroup_econ_mcp-0.4.1.dist-info → aigroup_econ_mcp-0.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aigroup-econ-mcp
-Version: 0.4.1
+Version: 0.4.2
 Summary: 专业计量经济学MCP工具 - 让大模型直接进行数据分析
 Project-URL: Homepage, https://github.com/aigroup/aigroup-econ-mcp
 Project-URL: Repository, https://github.com/aigroup/aigroup-econ-mcp.git

{aigroup_econ_mcp-0.4.1.dist-info → aigroup_econ_mcp-0.4.2.dist-info}/RECORD

@@ -1,15 +1,17 @@
-aigroup_econ_mcp/__init__.py,sha256=2GgJrD8MTHFgaiXrWYsOou0034taAT1zTRyJx_NZKkg,472
+aigroup_econ_mcp/__init__.py,sha256=bznXd7hp7aeuPG5tlwKM9thcA-NphSurjl0Uh4K2SR4,472
 aigroup_econ_mcp/cli.py,sha256=7yeNXWNwMdpUswAO4LsqAvb0EmCO3S6Bs6sl483uSXI,3363
 aigroup_econ_mcp/config.py,sha256=ab5X4-H8isIe2nma0c0AOqlyYgwhf5kfe9Zx5XRrzIo,18876
-aigroup_econ_mcp/server.py,sha256=-FIO4rnJrRQJpT1UESB4-hN5SYMQlTdj94veFOn8cxw,21690
+aigroup_econ_mcp/server.py,sha256=cM3qRN756DblCjmxtKCueqFgjj3uYWm-wUgDKZYbRpI,21715
 aigroup_econ_mcp/tools/__init__.py,sha256=6C9seG5y9BKDl_cRpvMOT8WqSkBSGRPS_9P7-uRRTEc,357
-aigroup_econ_mcp/tools/base.py,sha256=CwZFtvagcv732OAyCecEfwj8vekrOHSKjPXwrWamW2g,8163
+aigroup_econ_mcp/tools/base.py,sha256=Mv_mcKVTIg9A2dsqBBiU74_Ai2nb5sn2S3U4CNOxLKw,15218
 aigroup_econ_mcp/tools/cache.py,sha256=Urv2zuycp5dS7Qh-XQWEMrwszq9RZ-il8cz_-WniGgc,15311
 aigroup_econ_mcp/tools/data_loader.py,sha256=BVYvP04bQpsk3dZVFy-Y8EK3dnY4Pm0JSBYrthnHf74,5619
-aigroup_econ_mcp/tools/decorators.py,sha256=Xn0P6sNWkJay4UWM5iRqKrs55O1clfrhRM18MpQ36Ko,6142
-aigroup_econ_mcp/tools/file_input_handler.py,sha256=uRju239j3U4DvNPIXnXtAzZFO7v9M2ca9bTi4JezYyQ,7866
-aigroup_econ_mcp/tools/file_parser.py,sha256=pzzsnxUnJQfYIX8rjvb9or3pAWU8zV9wG7s78ePlbko,20137
-aigroup_econ_mcp/tools/machine_learning.py,sha256=09RJAdqOl7Xxiv2E8PyhztYAyzt-cWffpSMh7_9GRbk,21472
+aigroup_econ_mcp/tools/file_parser.py,sha256=0isfNaUOz1SjlNLwy4T5J8OidWP2tEdm2KZEtyE-KRg,28203
+aigroup_econ_mcp/tools/machine_learning.py,sha256=PpxrJVJw4eND95Wl0uGPEqUHXrIwTUSCd0QB1B4o4wY,1459
+aigroup_econ_mcp/tools/ml_ensemble.py,sha256=XOL0PzCsx9LY_pFbKCAxjYdGny-HqEhlZyov2r1l3ww,6475
+aigroup_econ_mcp/tools/ml_evaluation.py,sha256=hiwVW3-N0hnSAJfZW4luOCXt3sTh1W9Hj3CwZLRVaJk,8900
+aigroup_econ_mcp/tools/ml_models.py,sha256=hJEUgARxkqYgJqu6_7eRc1WnD2HcTGxtXf8Jre_XO1U,2137
+aigroup_econ_mcp/tools/ml_regularization.py,sha256=p81UXlb9ebyRuA_hSA4phmbFvORF-MaINMlYJkWKTbo,5070
 aigroup_econ_mcp/tools/monitoring.py,sha256=-hcw5nu5Q91FmDz39mRBsKavrTmEqXsKfGzlXr_5f0c,16708
 aigroup_econ_mcp/tools/optimized_example.py,sha256=tZVQ2jTzHY_zixTynm4Sq8gj5hz6eWg7MKqNwsxrPoQ,6784
 aigroup_econ_mcp/tools/panel_data.py,sha256=uzbgcDLXACfdi9KaMRmZdRTkhMtEyWb7p3vS3mUJ-co,19254
@@ -18,10 +20,10 @@ aigroup_econ_mcp/tools/statistics.py,sha256=2cHgNSUXwPYPLxntVOEOL8yF-x92mrgjK-R8
 aigroup_econ_mcp/tools/time_series.py,sha256=LNCO0bYXLPilQ2kSVXA3woNp8ERVq7n3jaoQhWgTCJQ,21763
 aigroup_econ_mcp/tools/timeout.py,sha256=vNnGsR0sXW1xvIbKCF-qPUU3QNDAn_MaQgSxbGxkfW4,8404
 aigroup_econ_mcp/tools/tool_handlers.py,sha256=cqv7FU95b_kjEJcZSAIGuGjUqbcCCKT0MXrmflnnelo,15028
-aigroup_econ_mcp/tools/tool_registry.py,sha256=yoA00XBiIQ0ly45huW4x9TNHSEJqu7veGOwSyZF-qko,4388
+aigroup_econ_mcp/tools/tool_registry.py,sha256=4SFpMnReZyGfEHCCDnojwHIUEpuQICS9M2u_9xuoUck,4413
 aigroup_econ_mcp/tools/validation.py,sha256=F7LHwog5xtFIMjD9D48kd8jAF5MsZb7wjdrgaOg8EKo,16657
-aigroup_econ_mcp-0.4.1.dist-info/METADATA,sha256=ipzSXbSHPdZCgxmYgGvjDf7PLckgtAvpjbxYbQMUr-k,10800
-aigroup_econ_mcp-0.4.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aigroup_econ_mcp-0.4.1.dist-info/entry_points.txt,sha256=j5ZJYOc4lAZV-X3XkAuGhzHtIRcJtZ6Gz8ZKPY_QTrM,62
-aigroup_econ_mcp-0.4.1.dist-info/licenses/LICENSE,sha256=DoyCJUWlDzKbqc5KRbFpsGYLwLh-XJRHKQDoITjb1yc,1083
-aigroup_econ_mcp-0.4.1.dist-info/RECORD,,
+aigroup_econ_mcp-0.4.2.dist-info/METADATA,sha256=JdtsBmJRggHsUTYvWdw3f27ZnAYmsXnZTuiskfqHqHk,10800
+aigroup_econ_mcp-0.4.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aigroup_econ_mcp-0.4.2.dist-info/entry_points.txt,sha256=j5ZJYOc4lAZV-X3XkAuGhzHtIRcJtZ6Gz8ZKPY_QTrM,62
+aigroup_econ_mcp-0.4.2.dist-info/licenses/LICENSE,sha256=DoyCJUWlDzKbqc5KRbFpsGYLwLh-XJRHKQDoITjb1yc,1083
+aigroup_econ_mcp-0.4.2.dist-info/RECORD,,

aigroup_econ_mcp/tools/decorators.py

@@ -1,178 +0,0 @@
-"""
-工具装饰器模块
-提供自动文件输入处理、错误处理等功能
-"""
-
-from typing import Callable, Optional, Dict, Any, List
-from functools import wraps
-from mcp.server.session import ServerSession
-from mcp.server.fastmcp import Context
-from mcp.types import CallToolResult, TextContent
-
-from .file_parser import FileParser
-
-
-def with_file_input(tool_type: str):
-    """
-    为工具函数添加文件输入支持的装饰器
-    
-    支持两种输入方式：
-    1. file_path: CSV/JSON文件路径
-    2. file_content: 文件内容字符串
-    
-    Args:
-        tool_type: 工具类型 ('single_var', 'multi_var_dict', 'regression', 'panel', 'time_series')
-    
-    使用示例:
-        @with_file_input('regression')
-        async def my_tool(ctx, y_data=None, x_data=None, file_path=None, file_content=None, file_format='auto', **kwargs):
-            # 如果提供了file_path或file_content，数据会被自动填充
-            pass
-    """
-    def decorator(func: Callable) -> Callable:
-        @wraps(func)
-        async def wrapper(*args, **kwargs):
-            # 提取上下文和文件参数
-            ctx = args[0] if args else kwargs.get('ctx')
-            file_path = kwargs.get('file_path')
-            file_content = kwargs.get('file_content')
-            file_format = kwargs.get('file_format', 'auto')
-            
-            # 优先处理file_path
-            if file_path:
-                try:
-                    await ctx.info(f"检测到文件路径输入: {file_path}")
-                    
-                    # 从文件路径解析
-                    parsed = FileParser.parse_file_path(file_path, file_format)
-                    
-                    await ctx.info(
-                        f"文件解析成功：{parsed['n_variables']}个变量，"
-                        f"{parsed['n_observations']}个观测"
-                    )
-                    
-                    # 转换为工具格式
-                    converted = FileParser.convert_to_tool_format(parsed, tool_type)
-                    
-                    # 更新kwargs
-                    kwargs.update(converted)
-                    
-                    await ctx.info(f"数据已转换为{tool_type}格式")
-                    
-                except Exception as e:
-                    await ctx.error(f"文件解析失败: {str(e)}")
-                    return CallToolResult(
-                        content=[TextContent(type="text", text=f"文件解析错误: {str(e)}")],
-                        isError=True
-                    )
-            
-            # 如果没有file_path但有file_content，处理文件内容
-            elif file_content:
-                try:
-                    await ctx.info("检测到文件内容输入，开始解析...")
-                    
-                    # 解析文件内容
-                    parsed = FileParser.parse_file_content(file_content, file_format)
-                    
-                    await ctx.info(
-                        f"文件解析成功：{parsed['n_variables']}个变量，"
-                        f"{parsed['n_observations']}个观测"
-                    )
-                    
-                    # 转换为工具格式
-                    converted = FileParser.convert_to_tool_format(parsed, tool_type)
-                    
-                    # 更新kwargs
-                    kwargs.update(converted)
-                    
-                    await ctx.info(f"数据已转换为{tool_type}格式")
-                    
-                except Exception as e:
-                    await ctx.error(f"文件解析失败: {str(e)}")
-                    return CallToolResult(
-                        content=[TextContent(type="text", text=f"文件解析错误: {str(e)}")],
-                        isError=True
-                    )
-            
-            # 调用原函数
-            return await func(*args, **kwargs)
-        
-        return wrapper
-    return decorator
-
-
-def with_error_handling(func: Callable) -> Callable:
-    """
-    为工具函数添加统一错误处理的装饰器
-    """
-    @wraps(func)
-    async def wrapper(*args, **kwargs):
-        ctx = args[0] if args else kwargs.get('ctx')
-        tool_name = func.__name__
-        
-        try:
-            return await func(*args, **kwargs)
-        except Exception as e:
-            await ctx.error(f"{tool_name}执行出错: {str(e)}")
-            return CallToolResult(
-                content=[TextContent(type="text", text=f"错误: {str(e)}")],
-                isError=True
-            )
-    
-    return wrapper
-
-
-def with_logging(func: Callable) -> Callable:
-    """
-    为工具函数添加日志记录的装饰器
-    """
-    @wraps(func)
-    async def wrapper(*args, **kwargs):
-        ctx = args[0] if args else kwargs.get('ctx')
-        tool_name = func.__name__
-        
-        await ctx.info(f"开始执行 {tool_name}")
-        result = await func(*args, **kwargs)
-        await ctx.info(f"{tool_name} 执行完成")
-        
-        return result
-    
-    return wrapper
-
-
-def econometric_tool(
-    tool_type: str,
-    with_file_support: bool = True,
-    with_error_handling: bool = True,
-    with_logging: bool = True
-):
-    """
-    组合装饰器：为计量经济学工具添加所有标准功能
-    
-    Args:
-        tool_type: 工具类型
-        with_file_support: 是否启用文件输入支持
-        with_error_handling: 是否启用错误处理
-        with_logging: 是否启用日志记录
-    
-    使用示例:
-        @econometric_tool('regression')
-        async def ols_regression(ctx, y_data=None, x_data=None, **kwargs):
-            # 只需要编写核心业务逻辑
-            pass
-    """
-    def decorator(func: Callable) -> Callable:
-        wrapped = func
-        
-        if with_error_handling:
-            wrapped = globals()['with_error_handling'](wrapped)
-        
-        if with_file_support:
-            wrapped = with_file_input(tool_type)(wrapped)
-        
-        if with_logging:
-            wrapped = globals()['with_logging'](wrapped)
-        
-        return wrapped
-    
-    return decorator

aigroup_econ_mcp/tools/file_input_handler.py

@@ -1,268 +0,0 @@
-"""
-文件输入处理组件
-提供统一的文件输入处理接口，支持所有工具
-"""
-
-from typing import Dict, List, Any, Optional, Callable
-from functools import wraps
-from .file_parser import FileParser
-
-
-class FileInputHandler:
-    """
-    文件输入处理组件
-    
-    使用组件模式，为任何工具函数添加文件输入支持
-    """
-    
-    @staticmethod
-    def process_input(
-        file_content: Optional[str],
-        file_format: str,
-        tool_type: str,
-        data_params: Dict[str, Any]
-    ) -> Dict[str, Any]:
-        """
-        处理文件输入并转换为工具参数
-        
-        Args:
-            file_content: 文件内容
-            file_format: 文件格式
-            tool_type: 工具类型
-            data_params: 当前数据参数
-        
-        Returns:
-            更新后的参数字典
-        """
-        # 如果没有文件输入，直接返回原参数
-        if file_content is None:
-            return data_params
-        
-        # 解析文件
-        parsed = FileParser.parse_file_content(file_content, file_format)
-        
-        # 转换为工具格式
-        converted = FileParser.convert_to_tool_format(parsed, tool_type)
-        
-        # 合并参数（文件数据优先）
-        result = {**data_params, **converted}
-        
-        return result
-    
-    @staticmethod
-    def with_file_support(tool_type: str):
-        """
-        装饰器：为工具函数添加文件输入支持
-        
-        Args:
-            tool_type: 工具类型（single_var, multi_var_dict, regression, panel等）
-        
-        Returns:
-            装饰后的函数
-        
-        使用示例：
-            @FileInputHandler.with_file_support('regression')
-            async def my_regression_tool(y_data, x_data, file_content=None, file_format='auto'):
-                # 函数会自动处理file_content并填充y_data和x_data
-                pass
-        """
-        def decorator(func: Callable) -> Callable:
-            @wraps(func)
-            async def wrapper(*args, **kwargs):
-                # 提取文件相关参数
-                file_content = kwargs.get('file_content')
-                file_format = kwargs.get('file_format', 'auto')
-                
-                if file_content is not None:
-                    # 处理文件输入
-                    processed = FileInputHandler.process_input(
-                        file_content=file_content,
-                        file_format=file_format,
-                        tool_type=tool_type,
-                        data_params=kwargs
-                    )
-                    
-                    # 更新kwargs
-                    kwargs.update(processed)
-                
-                # 调用原函数
-                return await func(*args, **kwargs)
-            
-            return wrapper
-        return decorator
-
-
-class FileInputMixin:
-    """
-    文件输入混入类
-    
-    为类提供文件输入处理能力
-    """
-    
-    def parse_file_input(
-        self,
-        file_content: Optional[str],
-        file_format: str = "auto"
-    ) -> Optional[Dict[str, Any]]:
-        """解析文件输入"""
-        if file_content is None:
-            return None
-        return FileParser.parse_file_content(file_content, file_format)
-    
-    def convert_for_tool(
-        self,
-        parsed_data: Dict[str, Any],
-        tool_type: str
-    ) -> Dict[str, Any]:
-        """转换为工具格式"""
-        return FileParser.convert_to_tool_format(parsed_data, tool_type)
-    
-    def get_recommendations(
-        self,
-        parsed_data: Dict[str, Any]
-    ) -> Dict[str, Any]:
-        """获取工具推荐"""
-        return FileParser.auto_detect_tool_params(parsed_data)
-
-
-def create_file_params(
-    description: str = "CSV或JSON文件内容"
-) -> Dict[str, Any]:
-    """
-    创建标准的文件输入参数定义
-    
-    Args:
-        description: 参数描述
-    
-    Returns:
-        参数定义字典，可直接用于Field()
-    """
-    return {
-        "file_content": {
-            "default": None,
-            "description": f"""{description}
-            
-📁 支持格式：
-- CSV: 带表头的列数据，自动检测分隔符
-- JSON: {{"变量名": [数据], ...}} 或 [{{"变量1": 值, ...}}, ...]
-
-💡 使用方式：
-- 提供文件内容字符串（可以是base64编码）
-- 系统会自动解析并识别变量
-- 优先使用file_content，如果提供则忽略其他数据参数"""
-        },
-        "file_format": {
-            "default": "auto",
-            "description": """文件格式
-            
-可选值：
-- "auto": 自动检测（默认）
-- "csv": CSV格式
-- "json": JSON格式"""
-        }
-    }
-
-
-class UnifiedFileInput:
-    """
-    统一文件输入接口
-    
-    所有工具通过此类统一处理文件输入
-    """
-    
-    @staticmethod
-    async def handle(
-        ctx: Any,
-        file_content: Optional[str],
-        file_format: str,
-        tool_type: str,
-        original_params: Dict[str, Any]
-    ) -> Dict[str, Any]:
-        """
-        统一处理文件输入
-        
-        Args:
-            ctx: MCP上下文
-            file_content: 文件内容
-            file_format: 文件格式
-            tool_type: 工具类型
-            original_params: 原始参数
-        
-        Returns:
-            处理后的参数
-        """
-        if file_content is None:
-            return original_params
-        
-        try:
-            # 记录日志
-            await ctx.info("检测到文件输入，开始解析...")
-            
-            # 解析文件
-            parsed = FileParser.parse_file_content(file_content, file_format)
-            
-            # 记录解析结果
-            await ctx.info(
-                f"文件解析成功：{parsed['n_variables']}个变量，"
-                f"{parsed['n_observations']}个观测，"
-                f"数据类型={parsed['data_type']}"
-            )
-            
-            # 转换为工具格式
-            converted = FileParser.convert_to_tool_format(parsed, tool_type)
-            
-            # 合并参数
-            result = {**original_params}
-            result.update(converted)
-            
-            # 记录转换结果
-            if tool_type == 'regression':
-                await ctx.info(
-                    f"数据已转换：因变量={converted.get('y_variable')}，"
-                    f"自变量={converted.get('feature_names')}"
-                )
-            elif tool_type == 'panel':
-                await ctx.info(
-                    f"面板数据已识别：{len(set(converted.get('entity_ids', [])))}个实体，"
-                    f"{len(set(converted.get('time_periods', [])))}个时间点"
-                )
-            else:
-                await ctx.info(f"数据已转换为{tool_type}格式")
-            
-            return result
-            
-        except Exception as e:
-            await ctx.error(f"文件解析失败: {str(e)}")
-            raise ValueError(f"文件解析失败: {str(e)}")
-
-
-# 便捷函数
-async def process_file_for_tool(
-    ctx: Any,
-    file_content: Optional[str],
-    file_format: str,
-    tool_type: str,
-    **kwargs
-) -> Dict[str, Any]:
-    """
-    为工具处理文件输入的便捷函数
-    
-    使用示例：
-        params = await process_file_for_tool(
-            ctx=ctx,
-            file_content=file_content,
-            file_format=file_format,
-            tool_type='regression',
-            y_data=y_data,
-            x_data=x_data,
-            feature_names=feature_names
-        )
-        # params 现在包含处理后的所有参数
-    """
-    return await UnifiedFileInput.handle(
-        ctx=ctx,
-        file_content=file_content,
-        file_format=file_format,
-        tool_type=tool_type,
-        original_params=kwargs
-    )