jarvis-ai-assistant 0.1.34__py3-none-any.whl → 0.1.36__py3-none-any.whl

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.34" 
+__version__ = "0.1.36" 

jarvis/agent.py

@@ -88,14 +88,15 @@ class Agent:
 
 
     def _load_methodology(self) -> str:
-        """加载方法论"""
+        """加载经验总结"""
         user_jarvis_methodology = os.path.expanduser("~/.jarvis_methodology")
         ret = ""
         if os.path.exists(user_jarvis_methodology):
             with open(user_jarvis_methodology, "r", encoding="utf-8") as f:
                 data = yaml.safe_load(f)
                 for k, v in data.items():
-                    ret += f"问题类型: \n{k}\n方法论: \n{v}\n\n"
+                    ret += f"问题类型: \n{k}\n经验总结: \n{v}\n\n"
+            PrettyOutput.print(f"从 {user_jarvis_methodology} 加载经验总结: {', '.join(data.keys())}", OutputType.INFO)
         return ret
 
     def run(self, user_input: str, file_list: Optional[List[str]] = None, keep_history: bool = False) -> str:
@@ -115,12 +116,12 @@ class Agent:
             if file_list:
                 self.model.upload_files(file_list)
 
-            # 加载方法论
+            # 加载经验总结
             methodology = self._load_methodology()
 
             methodology_prompt = ""
             if methodology:
-                methodology_prompt = f"""这是以往处理问题的标准方法论，如果当前任务与此类似，可参考：
+                methodology_prompt = f"""这是以往处理问题的标准经验总结，如果当前任务与此类似，可参考：
 {methodology}
 
 """
@@ -145,11 +146,11 @@ class Agent:
 6. 制定行动计划：根据目前可以使用的工具制定行动计划
 7. 执行行动计划：每步执行一个步骤，最多使用一个工具（工具执行完成后，等待工具结果再执行下一步）
 8. 监控与调整：如果执行结果与预期不符，则反思并调整行动计划，迭代之前的步骤
-9. 更新方法论（如有必要）：任务完成后总结执行过程中的经验教训，生成同类问题的通用方法论，使用方法论工具进行更新或者添加
+9. 更新经验总结（如有必要）：任务完成后总结执行过程中的经验教训，生成同类问题的通用经验总结，使用经验总结工具进行更新或者添加
 
 -------------------------------------------------------------                       
 
-方法论模板：
+经验总结模板：
 1. 问题重述
 2. 最优解决方案
 3. 最优方案执行步骤（失败的行动不需要体现）
@@ -223,7 +224,7 @@ arguments:
                     
                     if not user_input:
                         while True:
-                            choice = prompt("是否需要手动为此任务生成方法论以提升Jarvis对类似任务的处理能力？(y/n), 回车跳过: ")
+                            choice = prompt("是否需要手动为此任务生成经验总结以提升Jarvis对类似任务的处理能力？(y/n), 回车跳过: ")
                             if choice == "y":
                                 self._make_methodology()
                                 break
@@ -273,9 +274,9 @@ arguments:
         self.model.reset()
 
     def _make_methodology(self):
-        """生成方法论"""
-        current_response = self._call_model("""请根据之前的对话内容，判断是否有必要更新、添加、删除现有方法论，如果有，使用methodology工具进行管理。
-方法论模板：
+        """生成经验总结"""
+        current_response = self._call_model("""请根据之前的对话内容，判断是否有必要更新、添加、删除现有经验总结，如果有，使用methodology工具进行管理。
+经验总结模板：
 1. 问题重述
 2. 最优解决方案
 3. 最优方案执行步骤（失败的行动不需要体现）
@@ -286,4 +287,8 @@ arguments:
         except Exception as e:
             PrettyOutput.print(f"工具调用错误: {str(e)}", OutputType.ERROR)
             return
+        if len(result) > 0:
+            PrettyOutput.print("执行工具调用...", OutputType.PROGRESS)
+            tool_result = self.tool_registry.handle_tool_calls(result)
+            PrettyOutput.print(tool_result, OutputType.RESULT)
                          

jarvis/models/ai8.py

@@ -59,7 +59,7 @@ class AI8Model(BaseModel):
         PrettyOutput.print("ERNIE-3.5-128K", OutputType.INFO)
 
 
-        PrettyOutput.print("使用AI8_MODEL配置模型", OutputType.SUCCESS)
+        PrettyOutput.print("使用AI8_MODEL环境变量配置模型", OutputType.SUCCESS)
         
         self.system_message = ""
         self.conversation = None

jarvis/models/oyi.py

@@ -39,7 +39,7 @@ class OyiModel(BaseModel):
         PrettyOutput.print("generalv3.5", OutputType.INFO)
         PrettyOutput.print("gemini-pro", OutputType.INFO)
         PrettyOutput.print("llama3-70b-8192", OutputType.INFO)
-        PrettyOutput.print("使用OYI_MODEL配置模型", OutputType.SUCCESS)
+        PrettyOutput.print("使用OYI_MODEL环境变量配置模型", OutputType.SUCCESS)
         
                            
         self.messages = []

jarvis/tools/methodology.py

@@ -8,7 +8,7 @@ class MethodologyTool:
     """经验管理工具"""
     
     name = "methodology"
-    description = "管理问题处理方法论，支持添加、更新、删除操作"
+    description = "管理问题处理经验总结，支持添加、更新、删除操作"
     parameters = {
         "type": "object",
         "properties": {
@@ -23,7 +23,7 @@ class MethodologyTool:
             },
             "content": {
                 "type": "string",
-                "description": "方法论内容 (update/add 时必需)",
+                "description": "经验总结内容 (update/add 时必需)",
                 "optional": True
             }
         },
@@ -36,39 +36,39 @@ class MethodologyTool:
         self._ensure_file_exists()
             
     def _ensure_file_exists(self):
-        """确保方法论文件存在"""
+        """确保经验总结文件存在"""
         if not os.path.exists(self.methodology_file):
             try:
                 with open(self.methodology_file, 'w', encoding='utf-8') as f:
                     yaml.safe_dump({}, f, allow_unicode=True)
             except Exception as e:
-                PrettyOutput.print(f"创建方法论文件失败: {str(e)}", OutputType.ERROR)
+                PrettyOutput.print(f"创建经验总结文件失败: {str(e)}", OutputType.ERROR)
                 
     def _load_methodologies(self) -> Dict:
-        """加载所有方法论"""
+        """加载所有经验总结"""
         try:
             with open(self.methodology_file, 'r', encoding='utf-8') as f:
                 return yaml.safe_load(f) or {}
         except Exception as e:
-            PrettyOutput.print(f"加载方法论失败: {str(e)}", OutputType.ERROR)
+            PrettyOutput.print(f"加载经验总结失败: {str(e)}", OutputType.ERROR)
             return {}
             
     def _save_methodologies(self, methodologies: Dict):
-        """保存所有方法论"""
+        """保存所有经验总结"""
         try:
             with open(self.methodology_file, 'w', encoding='utf-8') as f:
                 yaml.safe_dump(methodologies, f, allow_unicode=True)
         except Exception as e:
-            PrettyOutput.print(f"保存方法论失败: {str(e)}", OutputType.ERROR)
+            PrettyOutput.print(f"保存经验总结失败: {str(e)}", OutputType.ERROR)
             
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
-        """执行方法论管理操作
+        """执行经验总结管理操作
         
         Args:
             args: 包含操作参数的字典
                 - operation: 操作类型 (delete/update/add)
                 - problem_type: 问题类型
-                - content: 方法论内容 (update/add 时必需)
+                - content: 经验总结内容 (update/add 时必需)
             
         Returns:
             Dict[str, Any]: 包含执行结果的字典
@@ -92,32 +92,28 @@ class MethodologyTool:
                     self._save_methodologies(methodologies)
                     return {
                         "success": True,
-                        "stdout": f"已删除问题类型 '{problem_type}' 的方法论"
+                        "stdout": f"已删除问题类型 '{problem_type}' 的经验总结"
                     }
                 else:
                     return {
                         "success": False,
-                        "error": f"未找到问题类型 '{problem_type}' 的方法论"
+                        "error": f"未找到问题类型 '{problem_type}' 的经验总结"
                     }
                     
             elif operation in ["update", "add"]:
                 if not content:
                     return {
                         "success": False,
-                        "error": f"{operation} 操作需要提供方法论内容"
-                    }
-                    
-                if operation == "update" and problem_type not in methodologies:
-                    return {
-                        "success": False,
-                        "error": f"未找到问题类型 '{problem_type}' 的方法论，无法更新"
+                        "error": "需要提供经验总结内容"
                     }
                     
                 methodologies[problem_type] = content
                 self._save_methodologies(methodologies)
+                
+                action = "更新" if problem_type in methodologies else "添加"
                 return {
                     "success": True,
-                    "stdout": f"已{'更新' if operation == 'update' else '添加'}问题类型 '{problem_type}' 的方法论"
+                    "stdout": f"已{action}问题类型 '{problem_type}' 的经验总结"
                 }
                 
             else:
@@ -133,13 +129,13 @@ class MethodologyTool:
             }
             
     def get_methodology(self, problem_type: str) -> Optional[str]:
-        """获取指定问题类型的方法论
+        """获取指定问题类型的经验总结
         
         Args:
             problem_type: 问题类型
             
         Returns:
-            Optional[str]: 方法论内容，如果不存在则返回 None
+            Optional[str]: 经验总结内容，如果不存在则返回 None
         """
         methodologies = self._load_methodologies()
         return methodologies.get(problem_type) 

jarvis/tools/registry.py

@@ -99,7 +99,7 @@ class ToolRegistry:
                         parameters=tool_instance.parameters,
                         func=tool_instance.execute
                     )
-                    PrettyOutput.print(f"已加载工具: {tool_instance.name}: {tool_instance.description}", OutputType.INFO)
+                    PrettyOutput.print(f"从 {file_path} 加载工具: {tool_instance.name}: {tool_instance.description}", OutputType.INFO)
                     tool_found = True
                     
             if not tool_found:

{jarvis_ai_assistant-0.1.34.dist-info → jarvis_ai_assistant-0.1.36.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.34
+Version: 0.1.36
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire

{jarvis_ai_assistant-0.1.34.dist-info → jarvis_ai_assistant-0.1.36.dist-info}/RECORD

@@ -1,34 +1,34 @@
-jarvis/__init__.py,sha256=RVT-55Tcimq7qZyDboUbuGqg9M05dnJ_nxixuHNVsWk,50
-jarvis/agent.py,sha256=y-BkxqRzaUMNYr8wlAjkch1zzkaVpA9XoA447yP94R4,11811
+jarvis/__init__.py,sha256=1K8mUIwEsy3sPUIxD7iDbKMFX8NiGdBp69nW5a43mLE,50
+jarvis/agent.py,sha256=i_tETgROksmPp95RYnwb7m-ERl0Ob1OEybXXcXJUpPk,12213
 jarvis/main.py,sha256=FOfc2v7iX9my5USyf4oxcGzyJe4AH4TwIEQk2WdNWrI,5768
 jarvis/utils.py,sha256=JlkuC9RtspXH2VWDmj9nR0vnb8ie1gIsKc4vC7WRco8,7321
-jarvis/__pycache__/__init__.cpython-313.pyc,sha256=IcR2PLYNeOmMFHca120FExEodc6S-FsJQV3hstw5izE,209
-jarvis/__pycache__/agent.cpython-313.pyc,sha256=HdWVkR2FwKACF-V_YWKTqnG3G19H9zwy78qIqwsTri4,15206
+jarvis/__pycache__/__init__.cpython-313.pyc,sha256=y7E-wyD0KJpDfXJV1b-kHQFkNsSNBhIk3DalwVG3xBs,209
+jarvis/__pycache__/agent.cpython-313.pyc,sha256=OfeSUMB3KcaFXrCiYENrFVcdfRyxBNQks3OtVb8PXO4,15864
 jarvis/__pycache__/main.cpython-313.pyc,sha256=KKVD1bs_4MDOdq2f04rsJpI8Osp959Fo5KOsUUBvrDM,7985
 jarvis/__pycache__/models.cpython-313.pyc,sha256=uWuRIjGrY4YDB3dGW5PGDLWaS03et8g11O725TjY_eU,5960
 jarvis/__pycache__/tools.cpython-313.pyc,sha256=lAD4LrnnWzNZQmHXGfZ_2l7oskOpr2_2OC-gdFhxQY8,33933
 jarvis/__pycache__/utils.cpython-313.pyc,sha256=eXXM-V-2ax7qBNxktdUrEIwhAXPQHAlI7gLGewlKOj4,10276
 jarvis/__pycache__/zte_llm.cpython-313.pyc,sha256=kMm9IGundGmOPqjsgrm9oIaWLDagYGCPRAaE3ipkc-0,5662
 jarvis/models/__init__.py,sha256=Lqb1NWFIfq7HlZIsJ7eUGyGjdYyaJqOoOf7cG_yo73A,57
-jarvis/models/ai8.py,sha256=mXa_fE_tHztK9SP3gUOFoSl6A-ceUkNsTVC6flEXlow,11457
+jarvis/models/ai8.py,sha256=WfvQzSDUz19EVgqOwDzhlvPy5rNRS0bMkSNqWDwgIG4,11469
 jarvis/models/base.py,sha256=dNkYPg9ISrHGEpmQLN9kxCDU-kqJAJlm_owdDC302Dk,1132
 jarvis/models/kimi.py,sha256=iI8mBzUxiyxa_bzDG9uwE3BZtreEUt0EJOIP_l2rSDM,16788
 jarvis/models/openai.py,sha256=aFpRH6K0YG6suCRGlJLw2JzLh2Ftpn6AYhdnKtMQQlY,3940
-jarvis/models/oyi.py,sha256=DzRKD0jVYvU_O5dXKlOmy83j8tPIcGGHVJcV90QEmxs,12219
+jarvis/models/oyi.py,sha256=6EzUcPkE5dtVZJa8zMhFfcjdKPPFVCg6hqYtFzgh9zM,12231
 jarvis/models/registry.py,sha256=ecIo3a0G-pRPw4eg77ozzbGVh6vy93DHF8oAnU2g51w,7511
 jarvis/models/__pycache__/__init__.cpython-313.pyc,sha256=hD4Uui0EPCTfoPOasTYzIi46Kv_q7OI8m-Lck-nX4zM,220
-jarvis/models/__pycache__/ai8.cpython-313.pyc,sha256=xexoy9Qgy0BYAfKY85Yy3oj2B-Sw9q2TXxeTmeK6tvQ,14775
+jarvis/models/__pycache__/ai8.cpython-313.pyc,sha256=4tK3twFcGA4gbKciw9GpiI4-e9CxHPINtwvOz3sN_1I,14787
 jarvis/models/__pycache__/base.cpython-313.pyc,sha256=9VvOXFPYOrB-2pO2py7dWOVbimODnXQJFLlFbyF7-LI,2207
 jarvis/models/__pycache__/kimi.cpython-313.pyc,sha256=FGtHoTv747oNY4Lqnwf5BkGYKnevHOlIEDIlbsY7va0,20893
 jarvis/models/__pycache__/openai.cpython-313.pyc,sha256=CU3KaUA0XcOK55sexF7OxfQ6_jdofABsufmFxm0T3mk,6004
-jarvis/models/__pycache__/oyi.cpython-313.pyc,sha256=AzChNnqApFVNNXVi77uw7GwL7EfWnXp0T8G7_VUPpyY,14037
+jarvis/models/__pycache__/oyi.cpython-313.pyc,sha256=HbZxBtfuR6G_KkKNCmI924SGtRb1tTfexg6Mw2paLtA,14049
 jarvis/models/__pycache__/registry.cpython-313.pyc,sha256=jUZUyHyfzeQtjCdk2NCZGTsTUsvKyIlnZVDzZY1gLuU,9985
 jarvis/tools/__init__.py,sha256=Kj1bKj34lwRDKMKHLOrLyQElf2lHbqA2tDgP359eaDo,71
 jarvis/tools/base.py,sha256=EGRGbdfbLXDLwtyoWdvp9rlxNX7bzc20t0Vc2VkwIEY,652
 jarvis/tools/file_ops.py,sha256=h8g0eT9UvlJf4kt0DLXvdSsjcPj7x19lxWdDApeDfpg,3842
 jarvis/tools/generator.py,sha256=qyNdarq5SGEFBjkIlohk13cP5wV9IeQK5qJs7MwGUZg,5740
-jarvis/tools/methodology.py,sha256=ptYOJR2yX6wHqv8hbvA3QshOYiga1r-c1-WQtaDJpq8,5434
-jarvis/tools/registry.py,sha256=lSdx1coMf2IFE8hfwCbCgSW83yVRCp0H981kj7c80e0,7167
+jarvis/tools/methodology.py,sha256=G3cOaHTMujGZBhDLhQEqyCV2NISizO3MXRuho1KfI6Y,5223
+jarvis/tools/registry.py,sha256=_M18bNfcn39razBo47IXtxUnT625oQIrkKx45qq2Ims,7180
 jarvis/tools/shell.py,sha256=UPKshPyOaUwTngresUw-ot1jHjQIb4wCY5nkJqa38lU,2520
 jarvis/tools/sub_agent.py,sha256=rEtAmSVY2ZjFOZEKr5m5wpACOQIiM9Zr_3dT92FhXYU,2621
 jarvis/tools/__pycache__/__init__.cpython-313.pyc,sha256=2ezw_ULVg9CJCUdX-RXTgYHLxQBs5X7wWJu1GNAN3ro,231
@@ -38,10 +38,10 @@ jarvis/tools/__pycache__/calculator.cpython-313.pyc,sha256=C_qwTDGm6gc7QNxtPzPZX
 jarvis/tools/__pycache__/calculator_tool.cpython-313.pyc,sha256=PI4LZNDTPdSe3ffWDRovLZ-r-vF8Kl-n6xdGdFWiBpY,4296
 jarvis/tools/__pycache__/file_ops.cpython-313.pyc,sha256=qfgRIcO7JFsa_FxOOXV-3pNSnlovZDrcIkZ1WN3pOJI,3773
 jarvis/tools/__pycache__/generator.cpython-313.pyc,sha256=sSO-y6fREIenF4cvFgaAtd0rAu95Epd5VZpjhmOfPRk,6155
-jarvis/tools/__pycache__/methodology.cpython-313.pyc,sha256=bsSQdQBeEit_hqbkgHOdiilQP3CFC5AUjLu7WF8XGRQ,6318
+jarvis/tools/__pycache__/methodology.cpython-313.pyc,sha256=GWPSF5b0i6gUsgvJgXIkVQHpLRYQ7OzEiTLwe6aAuWU,6226
 jarvis/tools/__pycache__/python_script.cpython-313.pyc,sha256=8JpryqTovEiTvBlWAK1KjZmPvHUuPc9GT9rTXBEQoJc,6693
 jarvis/tools/__pycache__/rag.cpython-313.pyc,sha256=JH6-PSZRMKAvTZqCwlRXJGClxYXNMs-vetU0q7hBLz0,6064
-jarvis/tools/__pycache__/registry.cpython-313.pyc,sha256=TFRMsyO-g0YiQiez-jpi2YwBLzWu89Y6QyuidNB-ojc,9310
+jarvis/tools/__pycache__/registry.cpython-313.pyc,sha256=BE91SasFW5pLIGvnaEuy0wMVLowLStK9xwsGXoPTYdw,9344
 jarvis/tools/__pycache__/search.cpython-313.pyc,sha256=wLMIkFwT-h4NGHgssytT4xme7sGO6ZhEnex7kjcy0-k,5990
 jarvis/tools/__pycache__/shell.cpython-313.pyc,sha256=ATt7BraEX6Sd3Ih6etwFpZ8fYczlZn5f0IqdjaqXt6c,3349
 jarvis/tools/__pycache__/sub_agent.cpython-313.pyc,sha256=ROqk3BEwB_2-ALp6jG3wf18ShUr1lO0bhJjibOn6f3o,2799
@@ -49,9 +49,9 @@ jarvis/tools/__pycache__/user_confirmation.cpython-313.pyc,sha256=wK3Ev10lHSUSRv
 jarvis/tools/__pycache__/user_input.cpython-313.pyc,sha256=JjTFOhObKsKF4Pn8KBRuKfV1_Ssj083fjU7Mfc_5z7c,2531
 jarvis/tools/__pycache__/user_interaction.cpython-313.pyc,sha256=RuVZ-pmiPBDywY3efgXSfohMAciC1avMGPmBK5qlnew,3305
 jarvis/tools/__pycache__/webpage.cpython-313.pyc,sha256=BjzSfnNzsKCrLETCcWjt32lNDLzwnjqcVGg4JfWd9OM,3008
-jarvis_ai_assistant-0.1.34.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.34.dist-info/METADATA,sha256=S_8lh2XQ52K4VEXV-prKPu9uJHPjmUPkseye8QWmquE,9765
-jarvis_ai_assistant-0.1.34.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.34.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
-jarvis_ai_assistant-0.1.34.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.34.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.36.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.36.dist-info/METADATA,sha256=vCANngD8_2pKamajo7DXgPMM54K13Ja6s5iBtqsPqLk,9765
+jarvis_ai_assistant-0.1.36.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.36.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
+jarvis_ai_assistant-0.1.36.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.36.dist-info/RECORD,,