jarvis-ai-assistant 0.1.61__tar.gz → 0.1.63__tar.gz

{jarvis_ai_assistant-0.1.61/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.63}/PKG-INFO

@@ -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 → jarvis_ai_assistant-0.1.63}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.61"
+version = "0.1.63"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "Your Name", email = "your.email@example.com" }]

{jarvis_ai_assistant-0.1.61 → jarvis_ai_assistant-0.1.63}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.61",
+    version="0.1.63",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.1.61 → jarvis_ai_assistant-0.1.63}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.1.61 → jarvis_ai_assistant-0.1.63}/src/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_ai_assistant-0.1.61 → jarvis_ai_assistant-0.1.63}/src/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 → jarvis_ai_assistant-0.1.63/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -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