jarvis-ai-assistant 0.1.33__py3-none-any.whl → 0.1.35__py3-none-any.whl

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.33" 
+__version__ = "0.1.35" 

jarvis/agent.py

@@ -223,7 +223,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
@@ -286,4 +286,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/tools/methodology.py

@@ -104,20 +104,16 @@ class MethodologyTool:
                 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:

{jarvis_ai_assistant-0.1.33.dist-info → jarvis_ai_assistant-0.1.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.33
+Version: 0.1.35
 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.33.dist-info → jarvis_ai_assistant-0.1.35.dist-info}/RECORD

@@ -1,9 +1,9 @@
-jarvis/__init__.py,sha256=K3XebXHZE6kSmgNBnsXUeI2ljKwqHTsmFycr1tKnbP4,50
-jarvis/agent.py,sha256=QR5nwej7LKYg2s9q7lVG1R7C62t8OcJz0PTuIFncDB8,11805
+jarvis/__init__.py,sha256=5fI-hCcWwDpuWaG2NdTnIprGfc5gh3M97CKK4kUaYDs,50
+jarvis/agent.py,sha256=kopwMRC6ssHHqKCGivYbKw9QT1sfFGBp8mBlXpgvSL8,12050
 jarvis/main.py,sha256=FOfc2v7iX9my5USyf4oxcGzyJe4AH4TwIEQk2WdNWrI,5768
 jarvis/utils.py,sha256=JlkuC9RtspXH2VWDmj9nR0vnb8ie1gIsKc4vC7WRco8,7321
-jarvis/__pycache__/__init__.cpython-313.pyc,sha256=WcNiIdZTVZKVlyxKWve-Trc49FuiqOMMe4g_fMxKlDA,209
-jarvis/__pycache__/agent.cpython-313.pyc,sha256=cgbX5L0T16_ZBYw1K3wHGQ8UT7khEn5V7AlOGFkoN68,15200
+jarvis/__pycache__/__init__.cpython-313.pyc,sha256=qozlnWUMO-ailx2DuRnwBKrO-4o-Vlb6ojK2FFcB-20,209
+jarvis/__pycache__/agent.cpython-313.pyc,sha256=WjYlL3Cma6kJfYmyaqjztX0hayjzcHHgxFeCBVOBs_w,15571
 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
@@ -27,7 +27,7 @@ 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/methodology.py,sha256=UG6s5VYRcd9wrKX4cg6f7zJhet5AIcthFGMOAdevBiw,5175
 jarvis/tools/registry.py,sha256=lSdx1coMf2IFE8hfwCbCgSW83yVRCp0H981kj7c80e0,7167
 jarvis/tools/shell.py,sha256=UPKshPyOaUwTngresUw-ot1jHjQIb4wCY5nkJqa38lU,2520
 jarvis/tools/sub_agent.py,sha256=rEtAmSVY2ZjFOZEKr5m5wpACOQIiM9Zr_3dT92FhXYU,2621
@@ -38,7 +38,7 @@ 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=k_B9KD3FDJEt-wW_NwhVlK-hi1YB4iLCiCs82kVJHe8,6180
 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
@@ -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.33.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.33.dist-info/METADATA,sha256=WLKoychbzXs8Mom2ctlWUnrXnxTMn5BFzKBzf2ME3SE,9765
-jarvis_ai_assistant-0.1.33.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.33.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
-jarvis_ai_assistant-0.1.33.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.33.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.35.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.35.dist-info/METADATA,sha256=foV1g-55AuPkzNjRsR7zCfOOv8jodE53SorjSmpvYJs,9765
+jarvis_ai_assistant-0.1.35.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.35.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
+jarvis_ai_assistant-0.1.35.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.35.dist-info/RECORD,,