jarvis-ai-assistant 0.1.61__py3-none-any.whl → 0.1.63__py3-none-any.whl

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.61" 
+__version__ = "0.1.63" 

jarvis/agent.py

@@ -142,16 +142,6 @@ class Agent:
         except Exception as e:
             PrettyOutput.print(f"总结对话历史失败: {str(e)}", OutputType.ERROR)
 
-    def _make_mathodology(self) -> str:
-        PrettyOutput.section("生成方法论", OutputType.PLANNING)
-        """生成方法论"""
-        prompt = f"""任务已经结束，请总结任务执行过程中的经验，评估是否需要补充新的方法论，如果需要，请调用方法论工具生成方法论，方法论内容格式如下：
-
-1. 问题重述
-2. 最优解决方案
-3. 最优方案执行步骤（失败的行动不需要体现）
-"""
-        return self._call_model(prompt)
     
     def _choose_methodology(self, methodology: Dict[str, str], task: str) -> str:
         """选择方法论"""
@@ -160,8 +150,10 @@ class Agent:
 {task}
 
 方法论:
-{methodology}
 """
+        for k, v in methodology.items():
+            prompt += f"问题类型：{k}\n"
+            prompt += f"方法论：{v}\n"
         return self._call_model(prompt)
 
     def _complete_task(self) -> str:
@@ -171,8 +163,6 @@ class Agent:
             str: 任务总结或完成状态
         """
         PrettyOutput.section("任务完成", OutputType.SUCCESS)
-
-        self._make_mathodology()
         
         if not self.is_sub_agent:
             return "Task completed"

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,19 +92,19 @@ 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": "需要提供经验总结内容"
+                        "error": "需要提供方法论内容"
                     }
                     
                 methodologies[problem_type] = content
@@ -113,7 +113,7 @@ class MethodologyTool:
                 action = "更新" if problem_type in methodologies else "添加"
                 return {
                     "success": True,
-                    "stdout": f"已{action}问题类型 '{problem_type}' 的经验总结"
+                    "stdout": f"已{action}问题类型 '{problem_type}' 的方法论"
                 }
                 
             else:
@@ -129,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_ai_assistant-0.1.61.dist-info → jarvis_ai_assistant-0.1.63.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
-jarvis/__init__.py,sha256=hXWmKj3rApgD-Yzo4jt2kZEsepnNS-DfVUFCBFc79b0,50
-jarvis/agent.py,sha256=rL3QMLD-48KMrRmiq8eU9T4ftdJdYVLg48e7df5Mg4E,14660
+jarvis/__init__.py,sha256=sZ5DQXpur0P2tY_PCFzbnYK8EQLpCoUcnhPRL-xFwRg,50
+jarvis/agent.py,sha256=aIth7geQ2ZIugBYjW_Rx3sr-I6NuZtH1INEj4hOBVD4,14242
 jarvis/main.py,sha256=gXXtnrkkvGwEswJL6qiYjVrg3bpzye-GJeAe0Nf2B9o,6509
 jarvis/utils.py,sha256=JlkuC9RtspXH2VWDmj9nR0vnb8ie1gIsKc4vC7WRco8,7321
 jarvis/jarvis_coder/main.py,sha256=TosDDiaYSjDpzKPNKcygxZ3XXWbcnvBmIIMn3UMBc60,35102
@@ -15,15 +15,15 @@ jarvis/tools/base.py,sha256=EGRGbdfbLXDLwtyoWdvp9rlxNX7bzc20t0Vc2VkwIEY,652
 jarvis/tools/coder.py,sha256=ZJfPInKms4Hj3-eQlBwamVsvZ-2nlZ-4jsqJ-tJc6mg,2040
 jarvis/tools/file_ops.py,sha256=h8g0eT9UvlJf4kt0DLXvdSsjcPj7x19lxWdDApeDfpg,3842
 jarvis/tools/generator.py,sha256=vVP3eN5cCDpRXf_fn0skETkPXAW1XZFWx9pt2_ahK48,5999
-jarvis/tools/methodology.py,sha256=G3cOaHTMujGZBhDLhQEqyCV2NISizO3MXRuho1KfI6Y,5223
+jarvis/tools/methodology.py,sha256=UG6s5VYRcd9wrKX4cg6f7zJhet5AIcthFGMOAdevBiw,5175
 jarvis/tools/registry.py,sha256=mlOAmUq3yzRz-7yvwrrCwbe5Lmw8eh1v8-_Fa5sezwI,7209
 jarvis/tools/search.py,sha256=1EqOVvLhg2Csh-i03-XeCrusbyfmH69FZ8khwZt8Tow,6131
 jarvis/tools/shell.py,sha256=UPKshPyOaUwTngresUw-ot1jHjQIb4wCY5nkJqa38lU,2520
 jarvis/tools/sub_agent.py,sha256=rEtAmSVY2ZjFOZEKr5m5wpACOQIiM9Zr_3dT92FhXYU,2621
 jarvis/tools/webpage.py,sha256=d3w3Jcjcu1ESciezTkz3n3Zf-rp_l91PrVoDEZnckOo,2391
-jarvis_ai_assistant-0.1.61.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.61.dist-info/METADATA,sha256=GAXcRDc-6S5k0wEoSdTkD-n-_RcFGcnjqTnabBDPjow,11213
-jarvis_ai_assistant-0.1.61.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.61.dist-info/entry_points.txt,sha256=ieRI4ilnGNx1R6LlzT2P510mJ27lhLesVZToezDjSd8,89
-jarvis_ai_assistant-0.1.61.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.61.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.63.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.63.dist-info/METADATA,sha256=8Kq0xkFkfbqX9sB6kR3h9yKJhtb2T5hgeVBy_1Onyx4,11213
+jarvis_ai_assistant-0.1.63.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.63.dist-info/entry_points.txt,sha256=ieRI4ilnGNx1R6LlzT2P510mJ27lhLesVZToezDjSd8,89
+jarvis_ai_assistant-0.1.63.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.63.dist-info/RECORD,,