jarvis-ai-assistant 0.3.8__py3-none-any.whl → 0.3.10__py3-none-any.whl

jarvis/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI Assistant"""
 
-__version__ = "0.3.8"
+__version__ = "0.3.10"

jarvis/jarvis_agent/jarvis.py

@@ -19,17 +19,17 @@ def run_cli(
     ctx: typer.Context,
     llm_type: str = typer.Option(
         "normal",
-        "-t", "--llm_type",
+        "-t", "--llm-type",
         help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
     ),
     task: Optional[str] = typer.Option(
         None, "-T", "--task", help="从命令行直接输入任务内容"
     ),
     model_group: Optional[str] = typer.Option(
-        None, "-g", "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
+        None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
     tool_group: Optional[str] = typer.Option(
-        None, "-G", "--tool_group", help="使用的工具组，覆盖配置文件中的设置"
+        None, "-G", "--tool-group", help="使用的工具组，覆盖配置文件中的设置"
     ),
     config_file: Optional[str] = typer.Option(
         None, "-f", "--config", help="自定义配置文件路径"

jarvis/jarvis_agent/main.py

@@ -43,18 +43,18 @@ def cli(
         None, "-f", "--config", help="代理配置文件路径"
     ),
     agent_definition: Optional[str] = typer.Option(
-        None, "-c", "--agent_definition", help="代理定义文件路径"
+        None, "-c", "--agent-definition", help="代理定义文件路径"
     ),
     task: Optional[str] = typer.Option(
         None, "-t", "--task", help="初始任务内容"
     ),
     llm_type: str = typer.Option(
         "normal",
-        "-t", "--llm_type",
+        "-t", "--llm-type",
         help="使用的LLM类型，覆盖配置文件中的设置",
     ),
     model_group: Optional[str] = typer.Option(
-        None, "-g", "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
+        None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),):
     """Main entry point for Jarvis agent"""
     # Initialize environment

jarvis/jarvis_code_agent/code_agent.py

@@ -51,24 +51,31 @@ class CodeAgent:
         llm_type: str = "normal",
         model_group: Optional[str] = None,
         need_summary: bool = True,
+        append_tools: Optional[str] = None,
     ):
         self.root_dir = os.getcwd()
 
         # 检测 git username 和 email 是否已设置
         self._check_git_config()
         tool_registry = ToolRegistry()  # type: ignore
-        tool_registry.use_tools(
-            [
-                "execute_script",
-                "search_web",
-                "ask_user",
-                "read_code",
-                "rewrite_file",
-                "save_memory",
-                "retrieve_memory",
-                "clear_memory",
-            ]
-        )
+        base_tools = [
+            "execute_script",
+            "search_web",
+            "ask_user",
+            "read_code",
+            "rewrite_file",
+            "save_memory",
+            "retrieve_memory",
+            "clear_memory",
+        ]
+        
+        if append_tools:
+            additional_tools = [tool.strip() for tool in append_tools.split(",")]
+            base_tools.extend(additional_tools)
+            # 去重
+            base_tools = list(dict.fromkeys(base_tools))
+            
+        tool_registry.use_tools(base_tools)
         code_system_prompt = self._get_system_prompt()
         self.agent = Agent(
             system_prompt=code_system_prompt,
@@ -639,15 +646,18 @@ def cli(
     llm_type: str = typer.Option(
         "normal",
         "-t",
-        "--llm_type",
+        "--llm-type",
         help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
     ),
     model_group: Optional[str] = typer.Option(
-        None, "-g", "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
+        None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
     requirement: Optional[str] = typer.Option(
         None, "-r", "--requirement", help="要处理的需求描述"
     ),
+    append_tools: Optional[str] = typer.Option(
+        None, "--append-tools", help="要追加的工具列表，用逗号分隔"
+    ),
     restore_session: bool = typer.Option(
         False,
         "--restore-session",
@@ -698,6 +708,7 @@ def cli(
             llm_type=llm_type,
             model_group=model_group,
             need_summary=False,
+            append_tools=append_tools,
         )
 
         # 尝试恢复会话

jarvis/jarvis_code_analysis/code_review.py

@@ -826,11 +826,11 @@ def review_commit(
     llm_type: str = typer.Option(
         "normal",
         "-t",
-        "--llm_type",
+        "--llm-type",
         help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
     ),
     model_group: Optional[str] = typer.Option(
-        None, "-g", "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
+        None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
 ):
     """审查指定的提交"""
@@ -857,11 +857,11 @@ def review_current(
     llm_type: str = typer.Option(
         "normal",
         "-t",
-        "--llm_type",
+        "--llm-type",
         help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
     ),
     model_group: Optional[str] = typer.Option(
-        None, "-g", "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
+        None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
 ):
     """审查当前的变更"""
@@ -889,11 +889,11 @@ def review_range(
     llm_type: str = typer.Option(
         "normal",
         "-t",
-        "--llm_type",
+        "--llm-type",
         help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
     ),
     model_group: Optional[str] = typer.Option(
-        None, "-g", "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
+        None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
 ):
     """审查提交范围"""
@@ -922,11 +922,11 @@ def review_file(
     llm_type: str = typer.Option(
         "normal",
         "-t",
-        "--llm_type",
+        "--llm-type",
         help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
     ),
     model_group: Optional[str] = typer.Option(
-        None, "-g", "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
+        None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
 ):
     """审查指定的文件"""

jarvis/jarvis_git_utils/git_commiter.py

@@ -389,11 +389,11 @@ def cli(
     llm_type: str = typer.Option(
         "normal",
         "-t",
-        "--llm_type",
+        "--llm-type",
         help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
     ),
     model_group: Optional[str] = typer.Option(
-        None, "-g", "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
+        None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
 ):
     init_env("欢迎使用 Jarvis-GitCommitTool，您的Git提交助手已准备就绪！")

jarvis/jarvis_memory_organizer/memory_organizer.py

@@ -590,12 +590,12 @@ def organize(
         help="模拟运行，只显示将要进行的操作但不实际执行",
     ),
     llm_group: Optional[str] = typer.Option(
-        None, "-g", "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
+        None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
     llm_type: Optional[str] = typer.Option(
         "normal",
         "-t",
-        "--llm_type",
+        "--llm-type",
         help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
     ),
 ):

jarvis/jarvis_platform_manager/main.py

@@ -363,11 +363,11 @@ def chat_command(
     llm_type: str = typer.Option(
         "normal",
         "-t",
-        "--llm_type",
+        "--llm-type",
         help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
     ),
     llm_group: Optional[str] = typer.Option(
-        None, "-g", "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
+        None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
 ) -> None:
     """与指定平台和模型聊天。"""
@@ -447,11 +447,11 @@ def role_command(
     llm_type: Optional[str] = typer.Option(
         None,
         "-t",
-        "--llm_type",
+        "--llm-type",
         help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式），覆盖角色配置",
     ),
     llm_group: Optional[str] = typer.Option(
-        None, "-g", "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
+        None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
 ) -> None:
     """加载角色配置文件并开始对话。"""

{jarvis_ai_assistant-0.3.8.dist-info → jarvis_ai_assistant-0.3.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.8
+Version: 0.3.10
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -61,6 +61,7 @@ Requires-Dist: markdownify>=1.1.0
 Requires-Dist: typer
 Requires-Dist: pathspec
 Requires-Dist: plotext==5.2.8
+Requires-Dist: packaging>=24.2
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"

{jarvis_ai_assistant-0.3.8.dist-info → jarvis_ai_assistant-0.3.10.dist-info}/RECORD

@@ -1,12 +1,12 @@
-jarvis/__init__.py,sha256=v5YcQ0Ez7aCUxmeZE7-B-WO0DwFAP8zg1gHfdxy9-eo,73
+jarvis/__init__.py,sha256=tk1ticxnbAOJGeyx5laAITBb3eg6KF7MxbYRsoDNBe0,74
 jarvis/jarvis_agent/__init__.py,sha256=NF_eUF85RRplGJyLmInIsTn-09aEPtjj4utYvEALvJw,31802
 jarvis/jarvis_agent/agent_manager.py,sha256=YzpMiF0H2-eyk2kn2o24Bkj3bXsQx7Pv2vfD4gWepo0,2893
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=Qs4LAr4xdKLBJpQE81YP4CkucAop86ms0iVoKa1nnso,2468
 jarvis/jarvis_agent/config_editor.py,sha256=Ctk82sO6w2cNW0-_5L7Bomj-hgM4U7WwMc52fwhAJyg,1809
 jarvis/jarvis_agent/edit_file_handler.py,sha256=w-byNJ4TN_SlV3djjfFC7OksySOFGrM8ku49w662dzc,11854
 jarvis/jarvis_agent/file_methodology_manager.py,sha256=qCRh36LLiaF3cXwIRlHurCzQlQQCUvd9BteCdj3CxfQ,4526
-jarvis/jarvis_agent/jarvis.py,sha256=2XMuMA3A4ihE4RAo-XnYZHnJ0ZrGRFagE1s-eiGdZ9Q,3252
-jarvis/jarvis_agent/main.py,sha256=Sd4-OnBcMqY5i7vb-Riy_JT2fGfuANtgiAWvWFY8LXM,3345
+jarvis/jarvis_agent/jarvis.py,sha256=eBz0cKCaDHHA9JZvYSKu1igSCMclhRw6bEr0hOJuK-0,3252
+jarvis/jarvis_agent/main.py,sha256=0xq-rjadcTedcB2HJSk2v0ihcm2-r2NXLj_Nq9xS9LY,3345
 jarvis/jarvis_agent/memory_manager.py,sha256=F7HTNzdN1_-cSygnz7zKSJRJvPLUOosqcXQeiW8zG4U,5266
 jarvis/jarvis_agent/methodology_share_manager.py,sha256=vwWNexluTXSI3qeNP3zJAemOjWW37o_1AlqDR1C8wCI,6910
 jarvis/jarvis_agent/output_handler.py,sha256=P7oWpXBGFfOsWq7cIhS_z9crkQ19ES7qU5pM92KKjAs,1172
@@ -21,9 +21,9 @@ jarvis/jarvis_agent/task_manager.py,sha256=HJm4_SMpsFbQMUUsAZeHm7cZuhNbz28YW-DRL
 jarvis/jarvis_agent/tool_executor.py,sha256=k73cKhZEZpljvui4ZxALlFEIE-iLzJ32Softsmiwzqk,1896
 jarvis/jarvis_agent/tool_share_manager.py,sha256=R5ONIQlDXX9pFq3clwHFhEW8BAJ3ECaR2DqWCEC9tzM,5205
 jarvis/jarvis_code_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_code_agent/code_agent.py,sha256=49B2079pBLlxMmUaAzToAa-SdwAwDqWCeBhCnaA3Quk,29106
+jarvis/jarvis_code_agent/code_agent.py,sha256=KEku3DaunvjLVX7lIvTRsHT-DlN2K5bZT0ypfgYtLmA,29555
 jarvis/jarvis_code_agent/lint.py,sha256=LZPsfyZPMo7Wm7LN4osZocuNJwZx1ojacO3MlF870x8,4009
-jarvis/jarvis_code_analysis/code_review.py,sha256=GHNzJKLRxNIINGxM2dnDg7JV9bxG88bY2ZDh4qgqTV0,36023
+jarvis/jarvis_code_analysis/code_review.py,sha256=OLoMtXz7Kov6cVTdBoxq_OsX_j0rb7Rk3or5tKgiLpo,36023
 jarvis/jarvis_code_analysis/checklists/__init__.py,sha256=LIXAYa1sW3l7foP6kohLWnE98I_EQ0T7z5bYKHq6rJA,78
 jarvis/jarvis_code_analysis/checklists/c_cpp.py,sha256=9t62bMqs6qTkFSio4SKkj88qyb5ZubWrw3MxJBQ4X1A,1317
 jarvis/jarvis_code_analysis/checklists/csharp.py,sha256=ShPXrl2_UPAnGaCHAG2wLl90COG3HK2XCSr1UK2dxN4,2420
@@ -48,13 +48,13 @@ jarvis/jarvis_data/config_schema.json,sha256=xri_qfCrs2AJ-fPwvnV4oU7VJpIrUxddffQ
 jarvis/jarvis_data/tiktoken/9b5ad71b2ce5302211f9c61530b329a4922fc6a4,sha256=Ijkht27pm96ZW3_3OFE-7xAPtR0YyTWXoRO8_-hlsqc,1681126
 jarvis/jarvis_git_squash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_git_squash/main.py,sha256=6PECdAbTbrsJBRLK1pXBh4hdJ_LADh-XXSic1xJi97E,2255
-jarvis/jarvis_git_utils/git_commiter.py,sha256=6mdYbC6bMMQt4q5Is65ylL2S-Mho7ZdAB_NgoNq-CKA,15894
+jarvis/jarvis_git_utils/git_commiter.py,sha256=GpSnVa72b9yWoJBbK1Qp_Kb4iimwVW6K7JjXF5pCfnk,15894
 jarvis/jarvis_mcp/__init__.py,sha256=OPMtjD-uq9xAaKCRIDyKIosaFfBe1GBPu1az-mQ0rVM,2048
 jarvis/jarvis_mcp/sse_mcp_client.py,sha256=neKrgFxwLDPWjVrl9uDt1ricNwbLZbv1ZEFh0IkmqZk,22656
 jarvis/jarvis_mcp/stdio_mcp_client.py,sha256=APYUksYKlMx7AVNODKOLrTkKZPnp4kqTQIYIuNDDKko,11286
 jarvis/jarvis_mcp/streamable_mcp_client.py,sha256=sP0KEsxVcXGht0eA7a_m-ECtZAk39s4PL9OUdm35x2Y,14467
 jarvis/jarvis_memory_organizer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_memory_organizer/memory_organizer.py,sha256=nUySOLUfWtGTu92XH2w5Jez46HZl_CFIdxEE_feFqpQ,26502
+jarvis/jarvis_memory_organizer/memory_organizer.py,sha256=4tf6Bs8u6Drj4repvuY3-XeH2Sb6ajVMFcW-rQEiGEY,26502
 jarvis/jarvis_methodology/main.py,sha256=6QF8hH3vB6rfxim0fPR34uVPf41zVpb4ZLqrFN2qONg,10983
 jarvis/jarvis_multi_agent/__init__.py,sha256=kCgtAX7VvliyEOQxIj2DvNjRAuh6bpNaOtDn60nzph4,6089
 jarvis/jarvis_multi_agent/main.py,sha256=Wbarez48QxXexlKEOcRsoMbcQEOP5rv_DzGkNk0SfpY,1779
@@ -68,7 +68,7 @@ jarvis/jarvis_platform/registry.py,sha256=1bMy0YZUa8NLzuZlKfC4CBtpa0iniypTxUZk0H
 jarvis/jarvis_platform/tongyi.py,sha256=KXEMfylTU91kHisXSaiz8dxzNXK_d7XD9vjuw4yXuVs,22891
 jarvis/jarvis_platform/yuanbao.py,sha256=32hjk1Ju1tqrMpF47JsSuaxej5K-gUPxjsDu9g0briY,23575
 jarvis/jarvis_platform_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_platform_manager/main.py,sha256=kN5X6Y6p9g0ZHvMY-uBYd0QxCaJ9uhyPRzo1SUk2kxM,20966
+jarvis/jarvis_platform_manager/main.py,sha256=5k7D-tBsNjXPH07eO4f-0gwyUY7STGSNBSl1PbLq15A,20966
 jarvis/jarvis_platform_manager/service.py,sha256=myJYGSUclCEiRTf3JKs4JndwhXJeQj7MQQy4i13jMt0,13767
 jarvis/jarvis_rag/__init__.py,sha256=HRTXgnQxDuaE9x-e3r6SYqhJ5d4DSI_rrIxy2IGY6qk,320
 jarvis/jarvis_rag/cache.py,sha256=Tqx_Oe-AhuWlMXHGHUaIuG6OEHoHBVZq7mL3kldtFFU,2723
@@ -119,9 +119,9 @@ jarvis/jarvis_utils/methodology.py,sha256=IIMU17WVSunsWXsnXROd4G77LxgYs4xEC_xm_0
 jarvis/jarvis_utils/output.py,sha256=QRLlKObQKT0KuRSeZRqYb7NlTQvsd1oZXZ41WxeWEuU,10894
 jarvis/jarvis_utils/tag.py,sha256=f211opbbbTcSyzCDwuIK_oCnKhXPNK-RknYyGzY1yD0,431
 jarvis/jarvis_utils/utils.py,sha256=LiVui9RMsbfUdzbvBBwbGNC4uniGnLp3LFsk7LXGrQE,47370
-jarvis_ai_assistant-0.3.8.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.3.8.dist-info/METADATA,sha256=5h0sEIQsEFZ1lrU4nb22YbwiccopozZDg4n9GEygOPo,18184
-jarvis_ai_assistant-0.3.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.3.8.dist-info/entry_points.txt,sha256=4GcWKFxRJD-QU14gw_3ZaW4KuEVxOcZK9i270rwPdjA,1395
-jarvis_ai_assistant-0.3.8.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.3.8.dist-info/RECORD,,
+jarvis_ai_assistant-0.3.10.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.3.10.dist-info/METADATA,sha256=rp-slMeLj1Yk803AxEoLzwNSvSfH0QUSeja5zdq8_Vs,18216
+jarvis_ai_assistant-0.3.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.3.10.dist-info/entry_points.txt,sha256=4GcWKFxRJD-QU14gw_3ZaW4KuEVxOcZK9i270rwPdjA,1395
+jarvis_ai_assistant-0.3.10.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.3.10.dist-info/RECORD,,