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

aigroup_econ_mcp/__init__.py

@@ -10,7 +10,7 @@ AIGroup 计量经济学 MCP 服务
 - 模型诊断
 """
 
-__version__ = "0.4.0"
+__version__ = "0.4.2"
 __author__ = "AIGroup"
 __description__ = "专业计量经济学MCP工具 - 让大模型直接进行数据分析"
 

aigroup_econ_mcp/cli.py

@@ -1,87 +1,82 @@
-"""
-AIGroup 计量经济学 MCP 服务命令行入口
-"""
-
-import sys
-import click
-from .server import create_mcp_server
-
-
-@click.command()
-@click.option('--port', default=8000, help='服务器端口')
-@click.option('--host', default='127.0.0.1', help='服务器地址')
-@click.option('--transport', default='stdio',
-              type=click.Choice(['stdio', 'streamable-http', 'sse']),
-              help='传输协议 (默认: stdio)')
-@click.option('--debug', is_flag=True, help='启用调试模式')
-@click.option('--mount-path', default=None, help='挂载路径')
-@click.option('--version', is_flag=True, help='显示版本信息')
-def cli(port: int, host: str, transport: str, debug: bool, mount_path: str, version: bool):
-    """AIGroup 计量经济学 MCP 工具
-    
-    默认以stdio模式启动MCP服务器，适用于MCP客户端集成。
-    """
-    
-    # 处理版本标志
-    if version:
-        from . import __version__
-        click.echo(f"aigroup-econ-mcp v{__version__}", err=True)
-        click.echo("Professional econometrics MCP tool", err=True)
-        click.echo("Author: AIGroup", err=True)
-        sys.exit(0)
-
-    # 创建MCP服务器
-    mcp_server = create_mcp_server()
-
-    # 设置调试模式
-    if debug:
-        mcp_server.settings.debug = True
-        click.echo(f"[DEBUG] 调试模式已启用", err=True)
-
-    # 根据传输协议启动服务器
-    if transport == 'stdio':
-        # stdio模式直接运行，不输出任何日志到stdout（MCP协议通信）
-        # 所有日志输出到stderr
-        from . import __version__
-        click.echo(f"[INFO] aigroup-econ-mcp v{__version__} starting...", err=True)
-        click.echo(f"[INFO] Transport: stdio (MCP protocol)", err=True)
-        if debug:
-            click.echo(f"[DEBUG] Debug mode enabled", err=True)
-        click.echo(f"[INFO] Server ready. Waiting for MCP client connection...", err=True)
-        mcp_server.run(transport='stdio')
-        
-    elif transport == 'streamable-http':
-        # Streamable HTTP模式
-        click.echo(f"[INFO] Starting aigroup-econ-mcp server", err=True)
-        click.echo(f"[INFO] Professional econometrics MCP tool for AI data analysis", err=True)
-        click.echo(f"[INFO] Transport protocol: {transport}", err=True)
-        click.echo(f"[INFO] Service address: http://{host}:{port}", err=True)
-        if mount_path:
-            click.echo(f"[INFO] Mount path: {mount_path}", err=True)
-            
-        mcp_server.run(
-            transport='streamable-http',
-            host=host,
-            port=port,
-            mount_path=mount_path or '/mcp'
-        )
-        
-    elif transport == 'sse':
-        # SSE模式
-        click.echo(f"[INFO] Starting aigroup-econ-mcp server", err=True)
-        click.echo(f"[INFO] Professional econometrics MCP tool for AI data analysis", err=True)
-        click.echo(f"[INFO] Transport protocol: {transport}", err=True)
-        click.echo(f"[INFO] Service address: http://{host}:{port}", err=True)
-        if mount_path:
-            click.echo(f"[INFO] Mount path: {mount_path}", err=True)
-            
-        mcp_server.run(
-            transport='sse',
-            host=host,
-            port=port,
-            mount_path=mount_path or '/sse'
-        )
-
-
-if __name__ == "__main__":
+"""
+AIGroup 计量经济学 MCP 服务命令行入口
+"""
+
+import sys
+import click
+import uvicorn
+from .server import create_mcp_server
+
+
+@click.command()
+@click.option('--port', default=8000, help='服务器端口')
+@click.option('--host', default='127.0.0.1', help='服务器地址')
+@click.option('--transport', default='stdio',
+              type=click.Choice(['stdio', 'streamable-http', 'sse']),
+              help='传输协议 (默认: stdio)')
+@click.option('--debug', is_flag=True, help='启用调试模式')
+@click.option('--mount-path', default=None, help='挂载路径')
+@click.option('--version', is_flag=True, help='显示版本信息')
+def cli(port: int, host: str, transport: str, debug: bool, mount_path: str, version: bool):
+    """AIGroup 计量经济学 MCP 工具
+    
+    默认以stdio模式启动MCP服务器，适用于MCP客户端集成。
+    """
+    
+    # 处理版本标志
+    if version:
+        from . import __version__
+        click.echo(f"aigroup-econ-mcp v{__version__}", err=True)
+        click.echo("Professional econometrics MCP tool", err=True)
+        click.echo("Author: AIGroup", err=True)
+        sys.exit(0)
+
+    # 创建MCP服务器
+    mcp_server = create_mcp_server()
+
+    # 设置调试模式
+    if debug:
+        mcp_server.settings.debug = True
+        click.echo(f"[DEBUG] 调试模式已启用", err=True)
+
+    # 根据传输协议启动服务器
+    if transport == 'stdio':
+        # stdio模式直接运行，不输出任何日志到stdout（MCP协议通信）
+        # 所有日志输出到stderr
+        from . import __version__
+        click.echo(f"[INFO] aigroup-econ-mcp v{__version__} starting...", err=True)
+        click.echo(f"[INFO] Transport: stdio (MCP protocol)", err=True)
+        if debug:
+            click.echo(f"[DEBUG] Debug mode enabled", err=True)
+        click.echo(f"[INFO] Server ready. Waiting for MCP client connection...", err=True)
+        mcp_server.run(transport='stdio')
+        
+    elif transport == 'streamable-http':
+        # Streamable HTTP模式 - 使用uvicorn手动启动
+        click.echo(f"[INFO] Starting aigroup-econ-mcp server", err=True)
+        click.echo(f"[INFO] Professional econometrics MCP tool for AI data analysis", err=True)
+        click.echo(f"[INFO] Transport protocol: {transport}", err=True)
+        click.echo(f"[INFO] Service address: http://{host}:{port}", err=True)
+        if mount_path:
+            click.echo(f"[INFO] Mount path: {mount_path}", err=True)
+        
+        # 获取Starlette应用并启动uvicorn服务器
+        app = mcp_server.streamable_http_app()
+        uvicorn.run(app, host=host, port=port, log_level="info")
+        
+    elif transport == 'sse':
+        # SSE模式 - 使用uvicorn手动启动
+        click.echo(f"[INFO] Starting aigroup-econ-mcp server", err=True)
+        click.echo(f"[INFO] Professional econometrics MCP tool for AI data analysis", err=True)
+        click.echo(f"[INFO] Transport protocol: {transport}", err=True)
+        click.echo(f"[INFO] Service address: http://{host}:{port}", err=True)
+        if mount_path:
+            click.echo(f"[INFO] Mount path: {mount_path}", err=True)
+        
+        # 获取Starlette应用并启动uvicorn服务器
+        app = mcp_server.sse_app()
+        uvicorn.run(app, host=host, port=port, log_level="info")
+
+
+if __name__ == "__main__":
     cli()

aigroup_econ_mcp/server.py

@@ -38,7 +38,7 @@ from .tools.tool_handlers import (
 )
 
 # 导入装饰器
-from .tools.decorators import econometric_tool
+from .tools.base import with_file_support_decorator as econometric_tool
 
 
 # 应用上下文

aigroup_econ_mcp/tools/base.py

@@ -1,16 +1,26 @@
 """
-工具模块基类
-提供统一的优化组件集成和错误处理
+工具模块基类和装饰器
+整合了工具基类、装饰器、错误处理和优化组件
 """
 
 import functools
 from typing import Any, Dict, List, Optional, Callable, Type
+from functools import wraps
+from mcp.server.session import ServerSession
+from mcp.server.fastmcp import Context
+from mcp.types import CallToolResult, TextContent
+
 from .validation import ValidationError, validate_econometric_data, validate_model_parameters
 from .cache import cache_result, cache_model, global_econometric_cache
 from .monitoring import monitor_performance, track_progress, global_performance_monitor
+from .file_parser import FileParser
 from ..config import get_config, econometric_config
 
 
+# ============================================================================
+# 错误类定义
+# ============================================================================
+
 class EconometricToolError(Exception):
     """计量经济学工具错误基类"""
     
@@ -45,6 +55,177 @@ class ConfigurationError(EconometricToolError):
     pass
 
 
+# ============================================================================
+# 装饰器函数
+# ============================================================================
+
+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 with_file_support_decorator(
+    tool_type: str,
+    enable_error_handling: bool = True,
+    enable_logging: bool = True
+):
+    """
+    组合装饰器：为计量经济学工具添加文件支持和其他标准功能
+    
+    Args:
+        tool_type: 工具类型
+        enable_error_handling: 是否启用错误处理
+        enable_logging: 是否启用日志记录
+    
+    使用示例:
+        @with_file_support_decorator('regression')
+        async def ols_regression(ctx, y_data=None, x_data=None, **kwargs):
+            # 只需要编写核心业务逻辑
+            pass
+    """
+    def decorator(func: Callable) -> Callable:
+        wrapped = func
+        
+        if enable_error_handling:
+            wrapped = with_error_handling(wrapped)
+        
+        wrapped = with_file_input(tool_type)(wrapped)
+        
+        if enable_logging:
+            wrapped = with_logging(wrapped)
+        
+        return wrapped
+    
+    return decorator
+
+
+# ============================================================================
+# 工具基类
+# ============================================================================
+
 class EconometricTool:
     """
     计量经济学工具基类
@@ -206,16 +387,27 @@ class EconometricTool:
         return global_econometric_cache.result_cache.get_function_cache_stats(self.tool_name) or {}
 
 
+# ============================================================================
 # 便捷装饰器函数
-def econometric_tool(tool_name: str = None):
+# ============================================================================
+
+def econometric_tool_with_optimization(tool_name: str = None):
     """
-    计量经济学工具装饰器
+    计量经济学工具装饰器（带优化）
+    
+    应用缓存、性能监控和错误处理
     
     Args:
         tool_name: 工具名称
         
     Returns:
         Callable: 装饰器函数
+        
+    使用示例:
+        @econometric_tool_with_optimization('my_analysis')
+        def my_analysis(data):
+            # 自动获得缓存、监控和错误处理
+            pass
     """
     def decorator(func):
         name = tool_name or func.__name__
@@ -261,11 +453,18 @@ def validate_input(data_type: str = "generic"):
 
 # 导出主要类和函数
 __all__ = [
+    # 错误类
     "EconometricToolError",
     "DataValidationError", 
     "ModelFittingError",
     "ConfigurationError",
+    # 基类
     "EconometricTool",
-    "econometric_tool",
+    # 装饰器
+    "with_file_input",
+    "with_error_handling",
+    "with_logging",
+    "with_file_support_decorator",
+    "econometric_tool_with_optimization",
     "validate_input"
 ]