adam-community 0.2__py3-none-any.whl → 0.3__py3-none-any.whl

adam_community/cli/build.py

@@ -13,24 +13,57 @@ def check_python_files(directory: Path) -> Tuple[bool, List[str]]:
     """检查所有 Python 文件是否都有参数定义"""
     tree = Tree("📦 Python 文件检查")
     errors = []
+    warnings = []
     functions = parse_directory(directory)
     
     tree.add(f"找到 {len(functions)} 个类定义")
     for func in functions:
         func_info = func["function"]
-        if not func_info["description"]:
-            tree.add(f"⚠️ {func_info['file']}: {func_info['name']} 没有描述")
+        
+        # 检查描述长度
+        description = func_info.get("description")
+        if description is None or not description:
+            warning_msg = f"⚠️ {func_info['file']}: {func_info['name']} 没有描述"
+            tree.add(warning_msg)
+            warnings.append(warning_msg)
+        elif len(description) > 1024:
+            error_msg = f"❌ {func_info['file']}: {func_info['name']} 描述长度超过1024字符 ({len(description)})"
+            tree.add(error_msg)
+            errors.append(error_msg)
+        else:
+            tree.add(f"✓ {func_info['file']}: {func_info['name']} 描述长度: {len(description)}")
 
+        # 检查参数定义
         if not func_info["parameters"]["properties"]:
-            tree.add(f"⚠️ {func_info['file']}: {func_info['name']} 没有参数定义")
+            warning_msg = f"⚠️ {func_info['file']}: {func_info['name']} 没有参数定义"
+            tree.add(warning_msg)
+            warnings.append(warning_msg)
         else:
-            tree.add(f"✓ {func_info['file']}: {func_info['name']}")
+            # 检查参数类型是否都是有效的JSON Schema类型
+            param_errors = []
+            for param_name, param_info in func_info["parameters"]["properties"].items():
+                if "type" not in param_info:
+                    param_errors.append(f"参数 '{param_name}' 缺少类型定义")
+                elif param_info["type"] not in ["string", "integer", "number", "boolean", "array", "object", "null"]:
+                    param_errors.append(f"参数 '{param_name}' 类型 '{param_info['type']}' 不是有效的JSON Schema类型")
+            
+            if param_errors:
+                for param_error in param_errors:
+                    error_msg = f"❌ {func_info['file']}: {func_info['name']} - {param_error}"
+                    tree.add(error_msg)
+                    errors.append(error_msg)
+            else:
+                tree.add(f"✓ {func_info['file']}: {func_info['name']} 参数类型验证通过")
     
     if errors:
         tree.add("❌ 检查未通过")
     else:
         tree.add("✅ 检查通过")
     
+    # 显示警告信息
+    if warnings:
+        tree.add(f"⚠️ 发现 {len(warnings)} 个警告（不影响构建）")
+    
     console.print(tree)
     return len(errors) == 0, errors
 

adam_community/cli/cli.py

@@ -3,6 +3,7 @@ import json
 from pathlib import Path
 from .parser import parse_directory
 from .build import build_package
+from .init import init
 
 @click.group()
 def cli():
@@ -40,5 +41,8 @@ def build(directory):
             click.echo(f"- {error}")
         raise click.Abort()
 
+# 添加 init 命令
+cli.add_command(init)
+
 if __name__ == '__main__':
     cli()

adam_community/cli/init.py

@@ -0,0 +1,156 @@
+import click
+import json
+import os
+import re
+from pathlib import Path
+from jinja2 import Environment, FileSystemLoader
+from typing import Dict, Any
+
+@click.command()
+@click.option('--name', prompt='项目名称（仅支持字母、数字、连字符，不能有空格）', help='项目的英文名称（用于文件夹和配置）')
+@click.option('--display-name', prompt='显示名称', help='项目的中文显示名称')  
+@click.option('--description', prompt='项目描述', help='项目的简短描述')
+@click.option('--version', default='1.0.0', prompt='版本号', help='项目版本号')
+@click.option('--author', prompt='作者', help='项目作者')
+@click.option('--type', 
+              type=click.Choice(['kit', 'toolbox']), 
+              prompt='项目类型',
+              help='选择项目类型: kit(表单工具) 或 toolbox(智能体工具)')
+@click.argument('directory', type=click.Path(exists=True, file_okay=False, dir_okay=True), default='.')
+def init(name: str, display_name: str, description: str, version: str, author: str, type: str, directory: str):
+    """初始化一个新的 Adam 工具项目"""
+    
+    # 验证项目名称格式
+    if not validate_project_name(name):
+        click.echo(f"错误: 项目名称 '{name}' 格式不正确")
+        click.echo("项目名称只能包含字母、数字和连字符(-)，不能包含空格或其他特殊字符")
+        click.echo("示例: my-tool, data-processor, image-analyzer")
+        return
+    
+    directory_path = Path(directory)
+    project_path = directory_path / name
+    
+    # 检查目录是否已存在
+    if project_path.exists():
+        click.echo(f"错误: 目录 '{name}' 已存在")
+        return
+    
+    # 创建项目目录
+    project_path.mkdir(parents=True, exist_ok=True)
+    click.echo(f"创建项目目录: {project_path}")
+    
+    # 创建config目录
+    config_path = project_path / "config"
+    config_path.mkdir(parents=True, exist_ok=True)
+    
+    # 设置Jinja2环境
+    template_dir = Path(__file__).parent / "templates"
+    env = Environment(loader=FileSystemLoader(template_dir))
+    
+    # 模板变量
+    template_vars = {
+        'name': name,
+        'display_name': display_name,
+        'description': description,
+        'version': version,
+        'author': author,
+        'project_type': type
+    }
+    
+    # 生成配置文件
+    render_and_save(env, 'configure.json.j2', config_path / "configure.json", template_vars)
+    click.echo(f"生成配置文件: config/configure.json")
+    
+    # 生成描述文件
+    render_and_save(env, 'long_description.md.j2', config_path / "long_description.md", template_vars)
+    click.echo(f"生成描述文件: config/long_description.md")
+    
+    if type == 'kit':
+        generate_kit_files(env, project_path, config_path, template_vars)
+    else:
+        generate_toolbox_files(env, project_path, config_path, template_vars)
+    
+    # 生成 Makefile
+    render_and_save(env, 'Makefile.j2', project_path / "Makefile", template_vars)
+    click.echo(f"生成构建脚本: Makefile")
+    
+    # 生成 README 文件
+    if type == 'kit':
+        render_and_save(env, 'README_kit.md.j2', project_path / "README.md", template_vars)
+    else:
+        render_and_save(env, 'README_toolbox.md.j2', project_path / "README.md", template_vars)
+    click.echo(f"生成项目文档: README.md")
+    
+    click.echo(f"\n✅ 项目 '{name}' 初始化完成!")
+    click.echo(f"📁 项目路径: {project_path}")
+    click.echo("\n📋 后续步骤:")
+    click.echo("1. 📖 阅读 README.md 了解详细的开发指南")
+    click.echo("2. 🔧 根据需要修改 Python 代码实现")
+    if type == 'kit':
+        click.echo("3. 📝 自定义 config/input.json 表单配置")
+    else:
+        click.echo("3. 🤖 自定义 config/initial_system_prompt.md 和 config/initial_assistant_message.md")
+    click.echo("4. 📄 完善 config/long_description.md 描述文档")
+    click.echo("5. ⚙️ 运行 'make parse' 生成 functions.json")
+    click.echo("6. 📦 运行 'make build' 打包项目")
+    click.echo(f"\n💡 详细的开发指南请查看: {project_path}/README.md")
+
+
+def render_and_save(env: Environment, template_name: str, output_path: Path, template_vars: Dict[str, Any]):
+    """渲染模板并保存到文件"""
+    template = env.get_template(template_name)
+    content = template.render(**template_vars)
+    with open(output_path, 'w', encoding='utf-8') as f:
+        f.write(content)
+
+
+def generate_kit_files(env: Environment, project_path: Path, config_path: Path, template_vars: Dict[str, Any]):
+    """生成 kit 项目的特定文件"""
+    
+    # 生成 input.json 表单配置
+    render_and_save(env, 'input.json.j2', config_path / "input.json", template_vars)
+    click.echo(f"生成表单配置: config/input.json")
+    
+    # 生成主要的Python实现文件
+    python_filename = f"{template_vars['name'].replace('-', '_')}.py"
+    render_and_save(env, 'kit_python.py.j2', project_path / python_filename, template_vars)
+    click.echo(f"生成主要实现文件: {python_filename}")
+
+
+def generate_toolbox_files(env: Environment, project_path: Path, config_path: Path, template_vars: Dict[str, Any]):
+    """生成 toolbox 项目的特定文件"""
+    
+    # 生成 initial_system_prompt.md
+    render_and_save(env, 'initial_system_prompt.md.j2', config_path / "initial_system_prompt.md", template_vars)
+    click.echo(f"生成系统提示文件: config/initial_system_prompt.md")
+    
+    # 生成 initial_assistant_message.md
+    render_and_save(env, 'initial_assistant_message.md.j2', config_path / "initial_assistant_message.md", template_vars)
+    click.echo(f"生成助手消息文件: config/initial_assistant_message.md")
+    
+    # 生成主要的Python实现文件
+    python_filename = f"{template_vars['name'].replace('-', '_')}.py"
+    render_and_save(env, 'toolbox_python.py.j2', project_path / python_filename, template_vars)
+    click.echo(f"生成主要实现文件: {python_filename}")
+
+
+def validate_project_name(name: str) -> bool:
+    """验证项目名称格式"""
+    # 项目名称只能包含字母、数字和连字符，不能有空格
+    pattern = r'^[a-zA-Z0-9-]+$'
+    if not re.match(pattern, name):
+        return False
+    
+    # 不能以连字符开始或结束
+    if name.startswith('-') or name.endswith('-'):
+        return False
+    
+    # 不能有连续的连字符
+    if '--' in name:
+        return False
+    
+    # 长度限制
+    if len(name) < 1 or len(name) > 50:
+        return False
+    
+    return True

adam_community/cli/parser.py

@@ -3,6 +3,196 @@ from pathlib import Path
 from typing import List, Dict, Any
 from docstring_parser import parse as dsp
 
+def convert_python_type_to_json_schema(python_type: str) -> Dict[str, Any]:
+    """将 Python 类型转换为 JSON Schema 类型
+    
+    Args:
+        python_type: Python 类型字符串
+        
+    Returns:
+        Dict[str, Any]: JSON Schema 类型定义
+        
+    Raises:
+        ValueError: 当无法转换类型时抛出异常
+    """
+    python_type = python_type.lower().strip()
+    
+    # 基本类型映射
+    basic_types = {
+        'str': 'string',
+        'string': 'string',
+        'int': 'integer',
+        'integer': 'integer',
+        'float': 'number',
+        'number': 'number',
+        'bool': 'boolean',
+        'boolean': 'boolean',
+        'list': 'array',
+        'array': 'array',
+        'dict': 'object',
+        'object': 'object',
+        'tuple': 'array',
+        'set': 'array',
+        'none': 'null',
+        'null': 'null',
+        'any': 'object'  # 添加对 any 类型的支持
+    }
+    
+    # 处理基本类型
+    if python_type in basic_types:
+        return {"type": basic_types[python_type]}
+    
+    # 处理 Literal[T1, T2, ...] 格式
+    if python_type.startswith('literal[') and python_type.endswith(']'):
+        content = python_type[8:-1]  # 提取 Literal[ 和 ] 之间的内容
+        values = [v.strip().strip('"\'') for v in content.split(',')]
+        
+        # 尝试推断类型
+        if all(v.isdigit() or (v.startswith('-') and v[1:].isdigit()) for v in values):
+            # 所有值都是整数
+            return {
+                "type": "integer",
+                "enum": [int(v) for v in values]
+            }
+        elif all(v.replace('.', '').replace('-', '').isdigit() for v in values):
+            # 所有值都是数字
+            return {
+                "type": "number",
+                "enum": [float(v) for v in values]
+            }
+        else:
+            # 字符串类型
+            return {
+                "type": "string",
+                "enum": values
+            }
+    
+    # 处理 Union[T1, T2, ...] 或 T1 | T2 格式
+    if python_type.startswith('union[') and python_type.endswith(']'):
+        content = python_type[6:-1]
+        types = [t.strip() for t in content.split(',')]
+        return convert_union_types(types)
+    
+    # 处理 T1 | T2 格式（Python 3.10+ 的联合类型语法）
+    if '|' in python_type and not python_type.startswith('literal['):
+        types = [t.strip() for t in python_type.split('|')]
+        return convert_union_types(types)
+    
+    # 处理 Optional[T] 格式
+    if python_type.startswith('optional[') and python_type.endswith(']'):
+        inner_type = python_type[9:-1].strip()
+        try:
+            inner_schema = convert_python_type_to_json_schema(inner_type)
+            return {
+                "oneOf": [
+                    inner_schema,
+                    {"type": "null"}
+                ]
+            }
+        except ValueError as e:
+            raise ValueError(f"无法转换Optional类型 '{python_type}': {str(e)}")
+    
+    # 处理 List[T] 格式
+    if python_type.startswith('list[') and python_type.endswith(']'):
+        inner_type = python_type[5:-1]  # 提取 List[ 和 ] 之间的内容
+        try:
+            items_schema = convert_python_type_to_json_schema(inner_type)
+            return {
+                "type": "array",
+                "items": items_schema
+            }
+        except ValueError as e:
+            raise ValueError(f"无法转换列表元素类型 '{inner_type}': {str(e)}")
+    
+    # 处理 List[T] 格式（大写）
+    if python_type.startswith('list[') and python_type.endswith(']'):
+        inner_type = python_type[5:-1]
+        try:
+            items_schema = convert_python_type_to_json_schema(inner_type)
+            return {
+                "type": "array",
+                "items": items_schema
+            }
+        except ValueError as e:
+            raise ValueError(f"无法转换列表元素类型 '{inner_type}': {str(e)}")
+    
+    # 处理 Dict[K, V] 格式
+    if python_type.startswith('dict[') and python_type.endswith(']'):
+        # 提取键值类型
+        content = python_type[5:-1]
+        if ',' in content:
+            key_type, value_type = content.split(',', 1)
+            key_type = key_type.strip()
+            value_type = value_type.strip()
+            
+            try:
+                key_schema = convert_python_type_to_json_schema(key_type)
+                value_schema = convert_python_type_to_json_schema(value_type)
+                return {
+                    "type": "object",
+                    "additionalProperties": value_schema
+                }
+            except ValueError as e:
+                raise ValueError(f"无法转换字典类型 '{python_type}': {str(e)}")
+        else:
+            # 只有值类型的情况
+            try:
+                value_schema = convert_python_type_to_json_schema(content.strip())
+                return {
+                    "type": "object",
+                    "additionalProperties": value_schema
+                }
+            except ValueError as e:
+                raise ValueError(f"无法转换字典值类型 '{content}': {str(e)}")
+    
+    # 处理枚举类型
+    if python_type == 'enum':
+        return {"type": "string"}
+    
+    # 如果无法识别，抛出异常
+    raise ValueError(f"无法转换的Python类型: '{python_type}'")
+
+def convert_union_types(types: List[str]) -> Dict[str, Any]:
+    """转换联合类型为 JSON Schema
+    
+    Args:
+        types: 类型列表
+        
+    Returns:
+        Dict[str, Any]: JSON Schema 联合类型定义
+    """
+    schemas = []
+    for t in types:
+        try:
+            if t.lower() == 'none':
+                schemas.append({"type": "null"})
+            else:
+                schemas.append(convert_python_type_to_json_schema(t))
+        except ValueError as e:
+            raise ValueError(f"无法转换联合类型中的类型 '{t}': {str(e)}")
+    
+    if len(schemas) == 1:
+        return schemas[0]
+    else:
+        return {"oneOf": schemas}
+
+def validate_description_length(description: str, function_name: str, file_path: str) -> None:
+    """验证函数描述长度
+    
+    Args:
+        description: 函数描述
+        function_name: 函数名称
+        file_path: 文件路径
+        
+    Raises:
+        ValueError: 当描述长度超过1024字符时抛出异常
+    """
+    if len(description) > 1024:
+        raise ValueError(
+            f"函数 '{function_name}' 在文件 '{file_path}' 中的描述长度 ({len(description)}) "
+            f"超过了1024字符限制。请缩短描述长度。"
+        )
+
 def parse_python_file(file_path: Path) -> List[Dict[str, Any]]:
     """解析单个 Python 文件，提取类信息
     
@@ -32,6 +222,7 @@ def parse_python_file(file_path: Path) -> List[Dict[str, Any]]:
                 mem_per_cpu = 4000
                 partition = "gpu"
                 conda_env = "base"
+                display_name = None
                 
                 for item in node.body:
                     if isinstance(item, ast.Assign):
@@ -72,13 +263,27 @@ def parse_python_file(file_path: Path) -> List[Dict[str, Any]]:
                 # 使用 docstring_parser 解析类的文档字符串
                 docs = dsp(docstring)
                 if docs:
+                    # 验证描述长度
+                    if docs.short_description:
+                        validate_description_length(docs.short_description, node.name, str(file_path))
+                    
                     for p in docs.params:
-                        parameters["properties"][p.arg_name] = {
-                            "description": p.description or "",
-                            "type": p.type_name or "string"
-                        }
-                        if not p.is_optional:
-                            parameters["required"].append(p.arg_name)
+                        try:
+                            # 转换Python类型为JSON Schema类型
+                            json_schema_type = convert_python_type_to_json_schema(p.type_name or "string")
+                            
+                            parameters["properties"][p.arg_name] = {
+                                "description": p.description or "",
+                                **json_schema_type
+                            }
+                            
+                            if not p.is_optional:
+                                parameters["required"].append(p.arg_name)
+                        except ValueError as e:
+                            raise ValueError(
+                                f"在文件 '{file_path}' 的函数 '{node.name}' 中，"
+                                f"参数 '{p.arg_name}' 的类型转换失败: {str(e)}"
+                            )
                 
                 class_info = {
                     "function": {
@@ -118,4 +323,4 @@ def parse_directory(directory: Path) -> List[Dict[str, Any]]:
         if not py_file.name.startswith('_') and 'config' not in py_file.parts:
             classes = parse_python_file(py_file)
             all_classes.extend(classes)
-    return all_classes 
+    return all_classes

adam_community/cli/templates/__init__.py

@@ -0,0 +1 @@
+# Template module for init command

{adam_community-0.2.dist-info → adam_community-0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.2
 Name: adam_community
-Version: 0.2
+Version: 0.3
 Summary: Adam Community Tools and Utilities
 Home-page: https://github.com/yourusername/adam-community
 Author: Adam Community

adam_community-0.3.dist-info/RECORD

@@ -0,0 +1,14 @@
+adam_community/__init__.py,sha256=XC_W9nEYq0KSXRRIotZi02ZbLSVIf-XZO-nrhBYUOSg,180
+adam_community/tool.py,sha256=CCzWosxtuZ0yk7mupmnlgMpO59jr1hl-a_brSGIqhDI,4867
+adam_community/util.py,sha256=W4SD4x-Tg_JVAINoi2Q2j5FqbWrQxvg0TRYfE9Yh2WI,11031
+adam_community/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+adam_community/cli/build.py,sha256=XZK5OjbuihmwI9fZEKU7HkvYn0Ws5_MrE6okOxwwaOE,9753
+adam_community/cli/cli.py,sha256=i26C8A2iZKDKzGCcpxUg-Jn2uxnPBb9K6FiIsAwFZ2c,1451
+adam_community/cli/init.py,sha256=ut7ifGGiMG6gdTJl1JSbcxuZV7OS57JOb5hCGW-rEh0,6574
+adam_community/cli/parser.py,sha256=H4NjJSwjmgVxOdP8Ppp8rY_ZYBvmM-IYfAhZ1FnuLQA,12482
+adam_community/cli/templates/__init__.py,sha256=43rU9rFkpsVrWjxR-brDnT2eakgRtb4XpnunbE-ais4,34
+adam_community-0.3.dist-info/METADATA,sha256=z_ivcAXxjfhl4NfR3M1wRD1T1-1TzRyJN_A4Pwskom0,1184
+adam_community-0.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+adam_community-0.3.dist-info/entry_points.txt,sha256=4I7yRkn7cHwPY8-fWQLeAvKjc24zUy8Z65VsZNs0Wos,56
+adam_community-0.3.dist-info/top_level.txt,sha256=MS8jbePXKZChih9kGizNVX0I1MFZFGWBMCIW_r86qhU,15
+adam_community-0.3.dist-info/RECORD,,

{adam_community-0.2.dist-info → adam_community-0.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

adam_community-0.2.dist-info/RECORD

@@ -1,12 +0,0 @@
-adam_community/__init__.py,sha256=XC_W9nEYq0KSXRRIotZi02ZbLSVIf-XZO-nrhBYUOSg,180
-adam_community/tool.py,sha256=CCzWosxtuZ0yk7mupmnlgMpO59jr1hl-a_brSGIqhDI,4867
-adam_community/util.py,sha256=W4SD4x-Tg_JVAINoi2Q2j5FqbWrQxvg0TRYfE9Yh2WI,11031
-adam_community/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-adam_community/cli/build.py,sha256=A3rlPCz5iGNe3WS82dEMqVX2kwE6AuU18g5nCl1wjZU,8088
-adam_community/cli/cli.py,sha256=JoL8ePd1DdeRac1nRmtrcaa6oy6mKqtWBG2GjZr-3SM,1384
-adam_community/cli/parser.py,sha256=krqZiCgjTAPNPWw34lhuKROEI6pfHa0Txbne_oYRsvM,5042
-adam_community-0.2.dist-info/METADATA,sha256=bWBEnli5reo75dKu3c_Dcm1ZLiQMbbYuNMi-KgzysPc,1184
-adam_community-0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-adam_community-0.2.dist-info/entry_points.txt,sha256=4I7yRkn7cHwPY8-fWQLeAvKjc24zUy8Z65VsZNs0Wos,56
-adam_community-0.2.dist-info/top_level.txt,sha256=MS8jbePXKZChih9kGizNVX0I1MFZFGWBMCIW_r86qhU,15
-adam_community-0.2.dist-info/RECORD,,