jarvis-ai-assistant 0.1.75__py3-none-any.whl → 0.1.76__py3-none-any.whl

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.75" 
+__version__ = "0.1.76" 

jarvis/agent.py

@@ -140,6 +140,7 @@ class Agent:
 
     def _load_methodology(self, user_input: str) -> Dict[str, str]:
         """加载方法论并构建向量索引"""
+        PrettyOutput.print("加载方法论...", OutputType.PLANNING)
         user_jarvis_methodology = os.path.expanduser("~/.jarvis_methodology")
         if not os.path.exists(user_jarvis_methodology):
             return {}
@@ -290,6 +291,38 @@ class Agent:
         self.prompt = summary_prompt
         return self._call_model(self.prompt)
 
+    def choose_tools(self, user_input: str) -> List[Dict]:
+        """根据用户输入选择工具"""
+        PrettyOutput.print("选择工具...", OutputType.PLANNING)
+        tools = self.tool_registry.get_all_tools()
+        prompt = f"""你是一个工具选择专家，请根据用户输入选择合适的工具，返回可能使用到的工具的名称。以下是可用工具：
+"""
+        for tool in tools:
+            prompt += f"- {tool['name']}: {tool['description']}\n"
+        prompt += f"用户输入: {user_input}\n"
+        prompt += f"请返回可能使用到的工具的名称，如果无法确定，请返回空列表。"
+        prompt += f"返回的格式为：\n"
+        prompt += f"<TOOL_CHOICE_START>\n"
+        prompt += f"tool_name1\n"
+        prompt += f"tool_name2\n"
+        prompt += f"<TOOL_CHOICE_END>\n"
+        model = PlatformRegistry.get_global_platform()
+        model.set_suppress_output(True)
+        try:
+            response = model.chat(prompt)
+            response = response.replace("<TOOL_CHOICE_START>", "").replace("<TOOL_CHOICE_END>", "")
+            tools_name = response.split("\n")
+            choosed_tools = []
+            for tool_name in tools_name:
+                for tool in tools:
+                    if tool['name'] == tool_name:
+                        choosed_tools.append(tool)
+                        break
+            return choosed_tools
+        except Exception as e:
+            PrettyOutput.print(f"工具选择失败: {str(e)}", OutputType.ERROR)
+            return []
+
     def run(self, user_input: str, file_list: Optional[List[str]] = None, keep_history: bool = False) -> str:
         """处理用户输入并返回响应，返回任务总结报告
         
@@ -302,6 +335,7 @@ class Agent:
             str: 任务总结报告
         """
         try:
+            PrettyOutput.section("准备环境", OutputType.PLANNING)
             if file_list:
                 self.model.upload_files(file_list)
 
@@ -313,18 +347,23 @@ class Agent:
 {methodology}
 
 """
+            tools_prompt = ""
+
+            # 选择工具
+            tools = self.choose_tools(user_input)
+            if tools:
+                tools_prompt += "可用工具:\n"
+                for tool in tools:
+                    PrettyOutput.print(f"选择工具: {tool['name']}", OutputType.INFO)
+                    tools_prompt += f"- 名称: {tool['name']}\n"
+                    tools_prompt += f"  描述: {tool['description']}\n"
+                    tools_prompt += f"  参数: {tool['parameters']}\n"
 
-            self.clear_history()
-            self.conversation_turns = 0  
-            
             # 显示任务开始
             PrettyOutput.section(f"开始新任务: {self.name}", OutputType.PLANNING)
 
-            tools_prompt = "可用工具:\n"
-            for tool in self.tool_registry.get_all_tools():
-                tools_prompt += f"- 名称: {tool['name']}\n"
-                tools_prompt += f"  描述: {tool['description']}\n"
-                tools_prompt += f"  参数: {tool['parameters']}\n"
+            self.clear_history()
+            self.conversation_turns = 0  
 
             self.model.set_system_message(f"""你是 {self.name}，一个问题处理能力强大的 AI 助手。
                                           

{jarvis_ai_assistant-0.1.75.dist-info → jarvis_ai_assistant-0.1.76.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
-jarvis/__init__.py,sha256=QI22PwoKYutESDAqieJRag7SVKB6_e2fb-wUgLp_-HY,50
-jarvis/agent.py,sha256=SNEXRnZQBdJipTaBcSz6olu1IFHN0IByGtPI4ogwgk4,19590
+jarvis/__init__.py,sha256=mqMOFwEAV4m463m3kW2Lz8KGIkWz1vJScSEYFQi4jsc,50
+jarvis/agent.py,sha256=10YxntRu9CWp-xZt7PmUYbzj_knwGM0QqyRbM4FaKSk,21473
 jarvis/main.py,sha256=7EcSlxa5JFFXBujzKDWdNtwX6axLhFFdJMc2GxTjfdk,6295
 jarvis/utils.py,sha256=vZV8sHj0ggZy4Rb8RxIujQhRWgeNEomhqVl4WXmpq7c,7498
 jarvis/jarvis_codebase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -25,9 +25,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.75.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.75.dist-info/METADATA,sha256=BbOVVNuBJBLMdNLekumUEPBV1-zrI9zcfOh4oBeKMwA,12399
-jarvis_ai_assistant-0.1.75.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.75.dist-info/entry_points.txt,sha256=QNUeqmUJd7nHufel2FO7cRttS1uKFfnbIyObv8eVyOY,140
-jarvis_ai_assistant-0.1.75.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.75.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.76.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.76.dist-info/METADATA,sha256=X1sBPb59GZyR4UjtnFntEQY4SzIe0q_KOgmYt62hMcU,12399
+jarvis_ai_assistant-0.1.76.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.76.dist-info/entry_points.txt,sha256=QNUeqmUJd7nHufel2FO7cRttS1uKFfnbIyObv8eVyOY,140
+jarvis_ai_assistant-0.1.76.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.76.dist-info/RECORD,,