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

jarvis/__init__.py

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

jarvis/agent.py

@@ -25,7 +25,7 @@ class Agent:
         self.name = name
         self.is_sub_agent = is_sub_agent
         self.prompt = ""
-        self.conversation_turns = 0  # 添加对话轮次计数器
+        self.conversation_turns = 0  
 
 
     @staticmethod
@@ -88,17 +88,15 @@ class Agent:
                 continue
 
 
-    def _load_methodology(self) -> str:
-        """加载经验总结"""
+    def _load_methodology(self) -> Dict[str, 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"
-            PrettyOutput.print(f"从 {user_jarvis_methodology} 加载经验总结: {', '.join(data.keys())}", OutputType.INFO)
-        return ret
+            PrettyOutput.print(f"从 {user_jarvis_methodology} 加载方法论: {', '.join(data.keys())}", OutputType.INFO)
+            return data
+        return {}
 
     def _summarize_and_clear_history(self) -> None:
         """总结当前对话历史并清空历史记录，只保留系统消息和总结
@@ -144,6 +142,28 @@ 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:
+        """选择方法论"""
+        prompt = f"""请根据任务内容选择合适的方法论，并返回方法论内容，格式如下：
+任务内容:
+{task}
+
+方法论:
+{methodology}
+"""
+        return self._call_model(prompt)
+
     def _complete_task(self) -> str:
         """完成任务并生成总结
         
@@ -151,6 +171,8 @@ class Agent:
             str: 任务总结或完成状态
         """
         PrettyOutput.section("任务完成", OutputType.SUCCESS)
+
+        self._make_mathodology()
         
         if not self.is_sub_agent:
             return "Task completed"
@@ -181,21 +203,23 @@ class Agent:
             str: 任务总结报告
         """
         try:
-            self.clear_history()
-            self.conversation_turns = 0  # 重置对话轮次
-            
             if file_list:
                 self.model.upload_files(file_list)
 
-            # 加载经验总结
+            # 加载方法论
             methodology = self._load_methodology()
 
+            methodology =self._choose_methodology(methodology, user_input)
+
             methodology_prompt = ""
             if methodology:
-                methodology_prompt = f"""这是以往处理问题的标准经验总结，如果当前任务与此类似，可参考：
+                methodology_prompt = f"""这是以往处理问题的标准方法论，如果当前任务与此类似，可参考：
 {methodology}
 
 """
+
+            self.clear_history()
+            self.conversation_turns = 0  
             
             # 显示任务开始
             PrettyOutput.section(f"开始新任务: {self.name}", OutputType.PLANNING)
@@ -217,11 +241,11 @@ class Agent:
 6. 制定行动计划：根据目前可以使用的工具制定行动计划
 7. 执行行动计划：每步执行一个步骤，最多使用一个工具（工具执行完成后，等待工具结果再执行下一步）
 8. 监控与调整：如果执行结果与预期不符，则反思并调整行动计划，迭代之前的步骤
-9. 经验总结：如果当前任务具有通用性且执行过程中遇到了值得记录的经验，使用经验总结工具记录经验总结，以提升后期处理类似问题的能力
+9. 方法论：如果当前任务具有通用性且执行过程中遇到了值得记录的经验，使用方法论工具记录方法论，以提升后期处理类似问题的能力
 10. 任务结束：如果任务已经完成，使用任务结束指令结束任务
 -------------------------------------------------------------                       
 
-经验总结模板：
+方法论模板：
 1. 问题重述
 2. 最优解决方案
 3. 最优方案执行步骤（失败的行动不需要体现）

jarvis/models/ai8.py

@@ -72,7 +72,7 @@ class AI8Model(BasePlatform):
 
     def set_model_name(self, model_name: str):
         """设置模型名称"""
-        PrettyOutput.print(f"设置模型: {model_name}", OutputType.USER)
+
         self.model_name = model_name
             
     def create_conversation(self) -> bool:

jarvis/models/openai.py

@@ -44,7 +44,7 @@ class OpenAIModel(BasePlatform):
 
     def set_model_name(self, model_name: str):
         """设置模型名称"""
-        PrettyOutput.print(f"设置模型: {model_name}", OutputType.USER)
+
         self.model_name = model_name
 
     def set_system_message(self, message: str):

jarvis/models/oyi.py

@@ -45,7 +45,7 @@ class OyiModel(BasePlatform):
 
     def set_model_name(self, model_name: str):
         """设置模型名称"""
-        PrettyOutput.print(f"设置模型: {model_name}", OutputType.USER)
+
         self.model_name = model_name
 
         

jarvis/models/registry.py

@@ -29,7 +29,8 @@ class PlatformRegistry:
                 # 创建 __init__.py 使其成为 Python 包
                 with open(os.path.join(user_platform_dir, "__init__.py"), "w") as f:
                     pass
-                PrettyOutput.print(f"已创建平台目录: {user_platform_dir}", OutputType.INFO)
+
+                pass
             except Exception as e:
                 PrettyOutput.print(f"创建平台目录失败: {str(e)}", OutputType.ERROR)
                 return ""
@@ -120,8 +121,8 @@ class PlatformRegistry:
                             # 检查平台实现
                             if not PlatformRegistry.check_platform_implementation(obj):
                                 continue
+
                             platforms[obj.platform_name] = obj
-                            PrettyOutput.print(f"从 {directory} 加载平台: {obj.platform_name}", OutputType.INFO)
                             break
                 except Exception as e:
                     PrettyOutput.print(f"加载平台 {module_name} 失败: {str(e)}", OutputType.ERROR)
@@ -159,6 +160,7 @@ class PlatformRegistry:
             raise Exception(f"Failed to create platform: {PlatformRegistry.global_platform_name}")
         return platform
         
+
     def register_platform(self, name: str, platform_class: Type[BasePlatform]):
         """注册平台类
         
@@ -167,7 +169,6 @@ class PlatformRegistry:
             model_class: 平台类
         """
         self.platforms[name] = platform_class
-        PrettyOutput.print(f"已注册平台: {name}", OutputType.INFO)
             
     def create_platform(self, name: str) -> Optional[BasePlatform]:
         """创建平台实例
@@ -183,8 +184,8 @@ class PlatformRegistry:
             return None
             
         try:
+
             platform = self.platforms[name]()
-            PrettyOutput.print(f"已创建平台实例: {name}", OutputType.INFO)
             return platform
         except Exception as e:
             PrettyOutput.print(f"创建平台失败: {str(e)}", OutputType.ERROR)

jarvis/tools/coder.py

@@ -26,6 +26,9 @@ class CoderTool:
         }
     }
 
+    def __init__(self):
+        self._coder = None
+
 
     def _init_coder(self, dir: Optional[str] = None, language: Optional[str] = "python") -> None:
         """初始化JarvisCoder实例"""
@@ -34,7 +37,7 @@ class CoderTool:
             work_dir = dir or os.getcwd()
             self._coder = JarvisCoder(work_dir, language)
 
-    def execute(self, **kwargs) -> Dict[str, Any]:
+    def execute(self, args: Dict) -> Dict[str, Any]:
         """执行代码修改
         
         Args:
@@ -45,9 +48,9 @@ class CoderTool:
         Returns:
             Dict[str, Any]: 执行结果
         """
-        feature = kwargs.get("feature")
-        dir = kwargs.get("dir")
-        language = kwargs.get("language", "python")
+        feature = args.get("feature")
+        dir = args.get("dir")
+        language = args.get("language", "python")
         
         try:
             self.current_dir = os.getcwd()

{jarvis_ai_assistant-0.1.59.dist-info → jarvis_ai_assistant-0.1.61.dist-info}/METADATA

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

@@ -1,18 +1,18 @@
-jarvis/__init__.py,sha256=b8yvcF8JU8Ok7r75ZnTd8pf8eQvluvd5CjMfxkewBAc,50
-jarvis/agent.py,sha256=vSba-jPjCCxYqI2uje6OZK_m-VwmNTOnJSheZy1C5PA,13914
+jarvis/__init__.py,sha256=hXWmKj3rApgD-Yzo4jt2kZEsepnNS-DfVUFCBFc79b0,50
+jarvis/agent.py,sha256=rL3QMLD-48KMrRmiq8eU9T4ftdJdYVLg48e7df5Mg4E,14660
 jarvis/main.py,sha256=gXXtnrkkvGwEswJL6qiYjVrg3bpzye-GJeAe0Nf2B9o,6509
 jarvis/utils.py,sha256=JlkuC9RtspXH2VWDmj9nR0vnb8ie1gIsKc4vC7WRco8,7321
 jarvis/jarvis_coder/main.py,sha256=TosDDiaYSjDpzKPNKcygxZ3XXWbcnvBmIIMn3UMBc60,35102
 jarvis/models/__init__.py,sha256=mrOt67nselz_H1gX9wdAO4y2DY5WPXzABqJbr5Des8k,63
-jarvis/models/ai8.py,sha256=aSiUazBrj4Fsit3tQX7jj8nM8MDBhHFnFrbQC6CvcGw,12745
+jarvis/models/ai8.py,sha256=AMBZRS9hKW1Ts_YoHMMelhT0CRMeMzHtVH31z0FpP-Q,12671
 jarvis/models/base.py,sha256=ShV1H8Unee4RMaiFO4idROQA0Hc6wu4dyeRPX5fcszk,1433
 jarvis/models/kimi.py,sha256=1iTB0Z_WOmCML3Ufsge6jmeKOYvccr7I5lS3JUXymU4,17611
-jarvis/models/openai.py,sha256=FcZVcCK41jP4SB_q4kZ6bga2tYbL-s6zjpS4KU30-tw,4477
-jarvis/models/oyi.py,sha256=vVs1ru5K8WpofjwoYTxUQVvXL4Yc7ZH6nZhKYpEZcdk,15288
-jarvis/models/registry.py,sha256=G4Woj4-GnLiKEPAZObyJN47mOQ2r0bo4xmaQdWZwHrs,7963
+jarvis/models/openai.py,sha256=7oOxrL6EM7iaqJgZsaFvVmyzY0ars4BP3EKAUlX1RPw,4403
+jarvis/models/oyi.py,sha256=mW-uhUZbts2L_oI8WueZUTEmrLY1CiBHn4UV2HP7ZCE,15214
+jarvis/models/registry.py,sha256=hJyaROiOF_TkbtIXsjOD8-ArOvAvtxviawyqBFfLV6s,7617
 jarvis/tools/__init__.py,sha256=Kj1bKj34lwRDKMKHLOrLyQElf2lHbqA2tDgP359eaDo,71
 jarvis/tools/base.py,sha256=EGRGbdfbLXDLwtyoWdvp9rlxNX7bzc20t0Vc2VkwIEY,652
-jarvis/tools/coder.py,sha256=FBAk9A8P6WCVpexcTLYw-bqH3z6CkYa9c1EWooLzv5s,1992
+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
@@ -21,9 +21,9 @@ 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.59.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.59.dist-info/METADATA,sha256=--vje3-tzKtlivC7SlLfAPjA9MqIhkEcbFoKYXz7WFU,11213
-jarvis_ai_assistant-0.1.59.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.59.dist-info/entry_points.txt,sha256=ieRI4ilnGNx1R6LlzT2P510mJ27lhLesVZToezDjSd8,89
-jarvis_ai_assistant-0.1.59.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.59.dist-info/RECORD,,
+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,,