adam-community 1.0.19__tar.gz → 1.0.21__tar.gz

{adam_community-1.0.19 → adam_community-1.0.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: adam_community
-Version: 1.0.19
+Version: 1.0.21
 Summary: Adam Community Tools and Utilities
 Home-page: https://github.com/yourusername/adam-community
 Author: Adam Community
@@ -17,6 +17,7 @@ Requires-Dist: rich>=13.0.0
 Requires-Dist: packaging>=21.0
 Requires-Dist: jsonschema>=4.0.0
 Requires-Dist: jinja2>=3.0.0
+Requires-Dist: prompt-toolkit
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

adam_community-1.0.21/adam_community/__version__.py

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

{adam_community-1.0.19 → adam_community-1.0.21}/adam_community/cli/build.py

@@ -266,7 +266,7 @@ def create_zip_package(directory: Path) -> str:
         
         for file in other_files:
             file_path = directory / "config" / file
-            if file_path.exists():
+            if file_path.exists() and f"config/{file}" not in zipf.namelist():
                 zipf.write(file_path, f"config/{file}")
                 file_count += 1
     

{adam_community-1.0.19 → adam_community-1.0.21}/adam_community/cli/init.py

@@ -1,4 +1,5 @@
 import click
+from prompt_toolkit import prompt
 import re
 from pathlib import Path
 from jinja2 import Environment, FileSystemLoader
@@ -6,11 +7,11 @@ 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('--name', help='项目的英文名称（用于文件夹和配置）')
+@click.option('--display-name', help='项目的中文显示名称')  
+@click.option('--description', help='项目的简短描述')
+@click.option('--version', help='项目版本号')
+@click.option('--author', help='项目作者')
 @click.option('--type', 
               type=click.Choice(['kit', 'agent'], case_sensitive=False), 
               help='选择项目类型: kit(表单工具) 或 agent(智能体工具)')
@@ -18,7 +19,19 @@ from typing import Dict, Any
 @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, collection: str, directory: str):
     """初始化一个新的 Adam 工具项目"""
-    
+    while not name:
+        name = prompt('项目名称（仅支持字母、数字、连字符，不能有空格）: ')
+    while not display_name:
+        display_name = prompt('显示名称: ')
+    while not description:
+        description = prompt('项目描述: ')
+    if not version:
+        version = prompt('版本号 [1.0.0]: ')
+        if not version:
+            version = "1.0.0"
+    while not author:
+        author = prompt('作者: ')
+
     # 验证项目名称格式
     if not validate_project_name(name):
         click.echo(f"错误: 项目名称 '{name}' 格式不正确")
@@ -34,8 +47,9 @@ def init(name: str, display_name: str, description: str, version: str, author: s
     enable_rag = False
     if type == 'agent':
         enable_rag = click.confirm('是否需要启用 RAG 知识库搜索功能？', default=False)
-        if enable_rag and not collection:
-            collection = click.prompt('知识库名称')
+        if enable_rag:
+            while not collection:
+                collection = prompt('知识库名称: ')
     
     directory_path = Path(directory)
     project_path = directory_path / name
@@ -181,7 +195,7 @@ def select_project_type() -> str:
     click.echo("2. agent (智能体工具)")
     
     while True:
-        choice = click.prompt("请输入选项编号 (1 或 2)", type=str)
+        choice = prompt("请输入选项编号 (1 或 2)：")
         if choice == '1':
             return 'kit'
         elif choice == '2':

{adam_community-1.0.19 → adam_community-1.0.21}/adam_community/tool.py

@@ -37,7 +37,7 @@ class Tool:
         """
         if self.calltype == "bash":
             os.environ["ADAM_OUTPUT_RAW"] = "true"
-            scripts = self.call(self, kwargs)
+            scripts = self.call(kwargs)
             os.environ["ADAM_OUTPUT_RAW"] = "false"
 
             scripts = '\n'.join(['bash -s << EOF', scripts, 'EOF'])

{adam_community-1.0.19 → adam_community-1.0.21}/adam_community.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: adam_community
-Version: 1.0.19
+Version: 1.0.21
 Summary: Adam Community Tools and Utilities
 Home-page: https://github.com/yourusername/adam-community
 Author: Adam Community
@@ -17,6 +17,7 @@ Requires-Dist: rich>=13.0.0
 Requires-Dist: packaging>=21.0
 Requires-Dist: jsonschema>=4.0.0
 Requires-Dist: jinja2>=3.0.0
+Requires-Dist: prompt-toolkit
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{adam_community-1.0.19 → adam_community-1.0.21}/adam_community.egg-info/requires.txt

@@ -5,3 +5,4 @@ rich>=13.0.0
 packaging>=21.0
 jsonschema>=4.0.0
 jinja2>=3.0.0
+prompt-toolkit

{adam_community-1.0.19 → adam_community-1.0.21}/setup.py

@@ -22,7 +22,8 @@ setup(
         "rich>=13.0.0",
         "packaging>=21.0",
         "jsonschema>=4.0.0",
-        "jinja2>=3.0.0"
+        "jinja2>=3.0.0",
+        "prompt-toolkit"
     ],
     entry_points={
         'console_scripts': [

adam_community-1.0.19/adam_community/__version__.py

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