adam-community 1.0.12__tar.gz → 1.0.14__tar.gz

{adam_community-1.0.12 → adam_community-1.0.14}/PKG-INFO

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

adam_community-1.0.14/adam_community/__version__.py

@@ -0,0 +1 @@
+__version__ = "1.0.14"

{adam_community-1.0.12 → adam_community-1.0.14}/adam_community/cli/build.py

@@ -54,9 +54,9 @@ def check_python_files(directory: Path) -> Tuple[bool, List[str]]:
             # 检查参数类型是否都是有效的JSON Schema类型
             param_errors = []
             for param_name, param_info in func_info["parameters"]["properties"].items():
-                if "type" not in param_info:
+                if "type" not in param_info and "oneOf" not in param_info:
                     param_errors.append(f"参数 '{param_name}' 缺少类型定义")
-                elif param_info["type"] not in ["string", "integer", "number", "boolean", "array", "object", "null"]:
+                elif "type" in param_info and 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:

{adam_community-1.0.12 → adam_community-1.0.14}/adam_community/cli/cli.py

@@ -72,6 +72,7 @@ def config(disable_update_check, enable_update_check):
     else:
         click.echo("请使用 --disable-update-check 或 --enable-update-check 选项")
 
+
 # 添加 init 命令
 cli.add_command(init)
 

{adam_community-1.0.12 → adam_community-1.0.14}/adam_community/cli/init.py

@@ -4,6 +4,7 @@ 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='项目的中文显示名称')  
@@ -11,11 +12,11 @@ from typing import Dict, Any
 @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(智能体工具)')
+              type=click.Choice(['kit', 'agent'], case_sensitive=False), 
+              help='选择项目类型: kit(表单工具) 或 agent(智能体工具)')
+@click.option('--collection', help='知识库名称（仅当启用 RAG 功能时使用）')
 @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):
+def init(name: str, display_name: str, description: str, version: str, author: str, type: str, collection: str, directory: str):
     """初始化一个新的 Adam 工具项目"""
     
     # 验证项目名称格式
@@ -25,6 +26,17 @@ def init(name: str, display_name: str, description: str, version: str, author: s
         click.echo("示例: my-tool, data-processor, image-analyzer")
         return
     
+    # 如果没有提供项目类型，显示选择菜单
+    if not type:
+        type = select_project_type()
+    
+    # 如果是 agent 类型，询问是否需要 RAG 功能
+    enable_rag = False
+    if type == 'agent':
+        enable_rag = click.confirm('是否需要启用 RAG 知识库搜索功能？', default=False)
+        if enable_rag and not collection:
+            collection = click.prompt('知识库名称')
+    
     directory_path = Path(directory)
     project_path = directory_path / name
     
@@ -52,7 +64,11 @@ def init(name: str, display_name: str, description: str, version: str, author: s
         'description': description,
         'version': version,
         'author': author,
-        'project_type': type
+        'project_type': type,
+        'enable_rag': enable_rag,
+        'collection_name': collection if enable_rag else '',
+        'class_name': name.replace('-', '_').title(),
+        'rag_class_name': name.replace('-', '_').replace('_', '').title() + 'RAG' if enable_rag else ''
     }
     
     # 生成配置文件
@@ -65,8 +81,11 @@ def init(name: str, display_name: str, description: str, version: str, author: s
     
     if type == 'kit':
         generate_kit_files(env, project_path, config_path, template_vars)
-    else:
-        generate_toolbox_files(env, project_path, config_path, template_vars)
+    else:  # agent
+        generate_agent_files(env, project_path, config_path, template_vars)
+        # 如果启用了 RAG 功能，额外生成 RAG 文件
+        if enable_rag:
+            generate_rag_files(env, project_path, config_path, template_vars)
     
     # 生成 Makefile
     render_and_save(env, 'Makefile.j2', project_path / "Makefile", template_vars)
@@ -75,8 +94,8 @@ def init(name: str, display_name: str, description: str, version: str, author: s
     # 生成 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)
+    else:  # agent
+        render_and_save(env, 'README_agent.md.j2', project_path / "README.md", template_vars)
     click.echo(f"生成项目文档: README.md")
     
     click.echo(f"\n✅ 项目 '{name}' 初始化完成!")
@@ -88,10 +107,12 @@ def init(name: str, display_name: str, description: str, version: str, author: s
         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")
+        if enable_rag:
+            click.echo("4. 🔍 根据需要修改 RAG 知识库搜索功能")
+    click.echo(f"{4 if type == 'kit' else 5}. 📄 完善 config/long_description.md 描述文档")
+    click.echo(f"{5 if type == 'kit' else 6}. ⚙️ 运行 'make parse' 生成 functions.json")
+    click.echo(f"{6 if type == 'kit' else 7}. 📦 运行 'make build' 打包项目")
+    click.echo(f"\n💡 详细的开发指南请查看: https://sidereus-ai.feishu.cn/wiki/FVMowiyGCi4qYGkr131cPNzVnQd")
 
 
 def render_and_save(env: Environment, template_name: str, output_path: Path, template_vars: Dict[str, Any]):
@@ -115,8 +136,8 @@ def generate_kit_files(env: Environment, project_path: Path, config_path: Path,
     click.echo(f"生成主要实现文件: {python_filename}")
 
 
-def generate_toolbox_files(env: Environment, project_path: Path, config_path: Path, template_vars: Dict[str, Any]):
-    """生成 toolbox 项目的特定文件"""
+def generate_agent_files(env: Environment, project_path: Path, config_path: Path, template_vars: Dict[str, Any]):
+    """生成 agent 项目的特定文件"""
     
     # 生成 initial_system_prompt.md
     render_and_save(env, 'initial_system_prompt.md.j2', config_path / "initial_system_prompt.md", template_vars)
@@ -128,10 +149,35 @@ def generate_toolbox_files(env: Environment, project_path: Path, config_path: Pa
     
     # 生成主要的Python实现文件
     python_filename = f"{template_vars['name'].replace('-', '_')}.py"
-    render_and_save(env, 'toolbox_python.py.j2', project_path / python_filename, template_vars)
+    render_and_save(env, 'agent_python.py.j2', project_path / python_filename, template_vars)
     click.echo(f"生成主要实现文件: {python_filename}")
 
 
+def generate_rag_files(env: Environment, project_path: Path, config_path: Path, template_vars: Dict[str, Any]):
+    """生成 RAG 功能的额外文件"""
+    
+    # 生成 RAG 功能的 Python 实现文件
+    rag_filename = f"{template_vars['name'].replace('-', '_')}_rag.py"
+    render_and_save(env, 'rag_python.py.j2', project_path / rag_filename, template_vars)
+    click.echo(f"生成 RAG 功能文件: {rag_filename}")
+
+
+def select_project_type() -> str:
+    """显示项目类型选择菜单"""
+    click.echo("\n请选择项目类型:")
+    click.echo("1. kit (表单工具)")
+    click.echo("2. agent (智能体工具)")
+    
+    while True:
+        choice = click.prompt("请输入选项编号 (1 或 2)", type=str)
+        if choice == '1':
+            return 'kit'
+        elif choice == '2':
+            return 'agent'
+        else:
+            click.echo("❌ 无效选择，请输入 1 或 2")
+
+
 def validate_project_name(name: str) -> bool:
     """验证项目名称格式"""
     # 项目名称只能包含字母、数字和连字符，不能有空格

{adam_community-1.0.12 → adam_community-1.0.14}/adam_community/cli/templates/initial_assistant_message.md.j2

@@ -1,19 +1,19 @@
-# 欢迎使用{{ display_name }}工具！
+## 欢迎使用{{ display_name }}工具！
 
 我是您的专业{{ display_name }}助手，可以帮助您完成以下任务：
 
-## 🔧 主要功能
+### 🔧 主要功能
 - 功能1: 基础处理功能
 - 功能2: 高级分析功能  
 - 功能3: 结果导出功能
 
-## 🚀 快速开始
+### 🚀 快速开始
 1. 描述您的需求
 2. 提供必要的输入数据
 3. 我将为您执行相应操作
 4. 获取详细的分析结果
 
-## 💡 使用建议
+### 💡 使用建议
 - 请详细描述您的需求
 - 如有文件需要处理，请上传相关文件
 - 我会为您提供详细的操作步骤和结果分析

adam_community-1.0.14/adam_community/cli/templates/rag_python.py.j2

@@ -0,0 +1,76 @@
+from adam_community.tool import Tool
+from adam_community.util import knowledgeSearch
+import json
+
+class {{ class_name }}(Tool, calltype="python"):
+    """
+    {{ description }}
+    
+    :param str query: 搜索的关键词
+    """
+    
+    DISPLAY_NAME = "{{ display_name }}"
+    NETWORK = True
+    CONDA_ENV = "knowledgebase"
+    SIF = "akb:1.0.0"
+    COLLECTION_NAME = "{{ collection_name }}"
+    PROJECT_NAME = "default"
+    
+    # 基础提示词模板
+    BASIC_PROMPT = """
+# 参考资料
+<context>
+  {}
+</context>
+"""
+    
+    def call(self, kwargs):
+        """
+        执行知识库搜索并生成提示词
+        
+        Args:
+            kwargs: 包含查询参数的字典
+        """
+        query = kwargs.get('args', {}).get('query')
+        if not query:
+            self.logger.error("查询参数为空")
+            return
+            
+        self.logger.debug(f"搜索知识库 {self.COLLECTION_NAME}: {query}")
+
+        try:
+            # 调用知识库搜索（messages_prev 参数在本地实现中未使用，传 None 即可）
+            response_text = knowledgeSearch(query, None, self.PROJECT_NAME, self.COLLECTION_NAME)
+            
+            # 解析响应并提取内容
+            response = json.loads(response_text)
+            if response.get("code") != 0:
+                self.logger.warning(f"知识库搜索返回错误: {response.get('message', '未知错误')}")
+                return
+                
+            # 提取知识库内容
+            result_list = response.get("data", {}).get("result_list", [])
+            context_content = ""
+            
+            for point in result_list:
+                content = point.get("content", "")
+                if content:
+                    context_content += f"{content}\n---\n"
+            
+            # 生成最终提示词
+            prompt = self.BASIC_PROMPT.format(context_content)
+            print(prompt)
+                
+        except Exception as e:
+            self.logger.error(f"知识库搜索失败: {e}")
+    
+    def inputShow(self, **kwargs):
+        """显示输入信息"""
+        query = kwargs.get('args', {}).get('query', '')
+        return f"Searching knowledge base {self.COLLECTION_NAME}: {query}"
+    
+    def outputShow(self, kwargs):
+        """显示输出信息"""
+        query = kwargs.get('args', {}).get('query', '')
+        stderr = kwargs.get('stderr', '')
+        return f"Done searching knowledge base {self.COLLECTION_NAME}: {query}", stderr

{adam_community-1.0.12 → adam_community-1.0.14}/adam_community.egg-info/PKG-INFO

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

{adam_community-1.0.12 → adam_community-1.0.14}/adam_community.egg-info/SOURCES.txt

@@ -17,14 +17,15 @@ adam_community/cli/init.py
 adam_community/cli/parser.py
 adam_community/cli/updater.py
 adam_community/cli/templates/Makefile.j2
+adam_community/cli/templates/README_agent.md.j2
 adam_community/cli/templates/README_kit.md.j2
-adam_community/cli/templates/README_toolbox.md.j2
 adam_community/cli/templates/__init__.py
+adam_community/cli/templates/agent_python.py.j2
 adam_community/cli/templates/configure.json.j2
 adam_community/cli/templates/initial_assistant_message.md.j2
 adam_community/cli/templates/initial_system_prompt.md.j2
 adam_community/cli/templates/input.json.j2
 adam_community/cli/templates/kit_python.py.j2
 adam_community/cli/templates/long_description.md.j2
-adam_community/cli/templates/toolbox_python.py.j2
+adam_community/cli/templates/rag_python.py.j2
 test/test_util_tool.py

adam_community-1.0.12/adam_community/__version__.py

@@ -1 +0,0 @@
-__version__ = "1.0.12"