jarvis-ai-assistant 0.1.75__tar.gz → 0.1.76__tar.gz

{jarvis_ai_assistant-0.1.75/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.76}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.75"
+version = "0.1.76"
 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.75 → jarvis_ai_assistant-0.1.76}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.75",
+    version="0.1.76",
     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.75 → jarvis_ai_assistant-0.1.76}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.1.75 → jarvis_ai_assistant-0.1.76}/src/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 → jarvis_ai_assistant-0.1.76/src/jarvis_ai_assistant.egg-info}/PKG-INFO

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