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

jarvis/__init__.py

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

jarvis/agent.py

@@ -25,6 +25,7 @@ class Agent:
         self.name = name
         self.is_sub_agent = is_sub_agent
         self.prompt = ""
+        self.conversation_turns = 0  # 添加对话轮次计数器
 
 
     @staticmethod
@@ -99,6 +100,75 @@ class Agent:
             PrettyOutput.print(f"从 {user_jarvis_methodology} 加载经验总结: {', '.join(data.keys())}", OutputType.INFO)
         return ret
 
+    def _summarize_and_clear_history(self) -> None:
+        """总结当前对话历史并清空历史记录，只保留系统消息和总结
+        
+        这个方法会：
+        1. 请求模型总结当前对话的关键信息
+        2. 清空对话历史
+        3. 保留系统消息
+        4. 添加总结作为新的上下文
+        5. 重置对话轮数
+        """
+        # 创建一个新的模型实例来做总结，避免影响主对话
+
+        PrettyOutput.print("总结对话历史，准备生成总结，开始新的对话...", OutputType.PLANNING)
+        
+        prompt = """请总结之前对话中的关键信息，包括：
+1. 当前任务目标
+2. 已经确认的关键信息
+3. 已经尝试过的方案
+4. 当前进展
+5. 待解决的问题
+
+请用简洁的要点形式描述，突出重要信息。不要包含对话细节。
+"""
+        
+        try:
+            summary = self.model.chat(prompt)
+            
+            # 清空当前对话历史，但保留系统消息
+            self.model.delete_chat()
+            
+            # 添加总结作为新的上下文
+            self.prompt = f"""以下是之前对话的关键信息总结：
+
+{summary}
+
+请基于以上信息继续完成任务。
+"""
+            
+            # 重置对话轮数
+            self.conversation_turns = 0
+            
+        except Exception as e:
+            PrettyOutput.print(f"总结对话历史失败: {str(e)}", OutputType.ERROR)
+
+    def _complete_task(self) -> str:
+        """完成任务并生成总结
+        
+        Returns:
+            str: 任务总结或完成状态
+        """
+        PrettyOutput.section("任务完成", OutputType.SUCCESS)
+        
+        if not self.is_sub_agent:
+            return "Task completed"
+        
+        # 生成任务总结
+        summary_prompt = f"""请对以上任务执行情况生成一个简洁的总结报告，包括：
+
+1. 任务目标: 任务重述
+2. 执行结果: 成功/失败
+3. 关键信息: 提取执行过程中的重要信息
+4. 重要发现: 任何值得注意的发现
+5. 后续建议: 如果有的话
+
+请用简洁的要点形式描述，突出重要信息。
+"""
+        self.prompt = summary_prompt
+        return self._call_model(self.prompt)
+
     def run(self, user_input: str, file_list: Optional[List[str]] = None, keep_history: bool = False) -> str:
         """处理用户输入并返回响应，返回任务总结报告
         
@@ -112,6 +182,7 @@ class Agent:
         """
         try:
             self.clear_history()
+            self.conversation_turns = 0  # 重置对话轮次
             
             if file_list:
                 self.model.upload_files(file_list)
@@ -146,8 +217,8 @@ class Agent:
 6. 制定行动计划：根据目前可以使用的工具制定行动计划
 7. 执行行动计划：每步执行一个步骤，最多使用一个工具（工具执行完成后，等待工具结果再执行下一步）
 8. 监控与调整：如果执行结果与预期不符，则反思并调整行动计划，迭代之前的步骤
-9. 经验总结：如果当前任务具有通用性且执行过程中遇到了值得记录的经验，使用经验总结工具记录经验总结
-
+9. 经验总结：如果当前任务具有通用性且执行过程中遇到了值得记录的经验，使用经验总结工具记录经验总结，以提升后期处理类似问题的能力
+10. 任务结束：如果任务已经完成，使用任务结束指令结束任务
 -------------------------------------------------------------                       
 
 经验总结模板：
@@ -184,6 +255,12 @@ arguments:
 
 -------------------------------------------------------------
 
+特殊指令：
+1. !<<SUMMARIZE>>! - 当你发现对话历史过长可能导致token超限时，可以使用此指令总结当前对话要点并清空历史。使用方法：直接回复"!<<SUMMARIZE>>!"即可。
+2. !<<FINISHED>>! - 当你确认任务已经完成时，使用此指令结束任务。使用方法：在回复中包含"!<<FINISHED>>!"即可。
+
+-------------------------------------------------------------
+
 {methodology_prompt}
 
 -------------------------------------------------------------
@@ -196,8 +273,20 @@ arguments:
                     # 显示思考状态
                     PrettyOutput.print("分析任务...", OutputType.PROGRESS)
                     
+                    # 增加对话轮次
+                    self.conversation_turns += 1
+                    
+                    # 如果对话超过10轮，在提示中添加提醒
+                    if self.conversation_turns > 10:
+                        self.prompt = f"{self.prompt}\n(提示：当前对话已超过10轮，建议使用 !<<SUMMARIZE>>! 指令总结对话历史，避免token超限)"
+                    
                     current_response = self._call_model(self.prompt)
                     
+                    # 检查是否需要总结对话历史
+                    if "!<<SUMMARIZE>>!" in current_response:
+                        self._summarize_and_clear_history()
+                        continue
+                    
                     try:
                         result = Agent.extract_tool_calls(current_response)
                     except Exception as e:
@@ -206,7 +295,6 @@ arguments:
                         continue
                     
                     if len(result) > 0:
-
                         PrettyOutput.print("执行工具调用...", OutputType.PROGRESS)
                         tool_result = self.tool_registry.handle_tool_calls(result)
                         PrettyOutput.print(tool_result, OutputType.RESULT)
@@ -214,6 +302,10 @@ arguments:
                         self.prompt = tool_result
                         continue
                     
+                    # 检查是否完成任务
+                    if "!<<FINISHED>>!" in current_response:
+                        return self._complete_task()
+                    
                     # 获取用户输入
                     user_input = get_multiline_input(f"{self.name}: 您可以继续输入，或输入空行结束当前任务")
                     if user_input == "__interrupt__":
@@ -225,34 +317,7 @@ arguments:
                         continue
                     
                     if not user_input:
-                        while True:
-                            choice = prompt("是否需要手动为此任务生成经验总结以提升Jarvis对类似任务的处理能力？(y/n), 回车跳过: ")
-                            if choice == "y":
-                                self._make_methodology()
-                                break
-                            elif choice == "n" or choice == "":
-                                break
-                            else:
-                                PrettyOutput.print("请输入y或n", OutputType.ERROR)
-                                continue
-                        PrettyOutput.section("任务完成", OutputType.SUCCESS)
-                        if self.is_sub_agent:
-                            # 生成任务总结
-                            summary_prompt = f"""请对以上任务执行情况生成一个简洁的总结报告，包括：
-
-1. 任务目标: 任务重述
-2. 执行结果: 成功/失败
-3. 关键信息: 提取执行过程中的重要信息
-4. 重要发现: 任何值得注意的发现
-5. 后续建议: 如果有的话
-
-请用简洁的要点形式描述，突出重要信息。
-"""
-                            self.prompt = summary_prompt
-                            summary = self._call_model(self.prompt)
-                            return summary
-                        else:
-                            return "Task completed"
+                        return self._complete_task()
 
                 except Exception as e:
                     PrettyOutput.print(str(e), OutputType.ERROR)
@@ -274,23 +339,6 @@ arguments:
         """清除对话历史，只保留系统提示"""
         self.prompt = "" 
         self.model.reset()
+        self.conversation_turns = 0  # 重置对话轮次
+
 
-    def _make_methodology(self):
-        """生成经验总结"""
-        current_response = self._call_model("""请根据之前的对话内容，判断是否有必要更新、添加、删除现有经验总结，如果有，使用methodology工具进行管理。
-经验总结模板：
-1. 问题重述
-2. 最优解决方案
-3. 最优方案执行步骤（失败的行动不需要体现）
-                         """)
-        
-        try:
-            result = Agent.extract_tool_calls(current_response)
-        except Exception as e:
-            PrettyOutput.print(f"工具调用错误: {str(e)}", OutputType.ERROR)
-            return
-        if len(result) > 0:
-            PrettyOutput.print("执行工具调用...", OutputType.PROGRESS)
-            tool_result = self.tool_registry.handle_tool_calls(result)
-            PrettyOutput.print(tool_result, OutputType.RESULT)
-                         

jarvis/jarvis_coder/main.py

@@ -11,6 +11,11 @@ import yaml
 from jarvis.models.base import BasePlatform
 from jarvis.utils import OutputType, PrettyOutput, get_multiline_input, load_env_from_file
 from jarvis.models.registry import PlatformRegistry
+from prompt_toolkit import PromptSession
+from prompt_toolkit.completion import WordCompleter, Completer, Completion
+from prompt_toolkit.formatted_text import FormattedText
+from prompt_toolkit.styles import Style
+import fnmatch
 
 # 全局锁对象
 index_lock = threading.Lock()
@@ -493,6 +498,7 @@ file2.py: 7
 注意事项：
 1、仅输出补丁内容，不要输出任何其他内容，每个补丁必须用<PATCH_START>和<PATCH_END>标记
 2、如果在大段代码中有零星修改，生成多个补丁
+3、要替换的内容，一定要与文件内容完全一致，不要有任何多余或者缺失的内容
 """
         
         success, response = self._call_model_with_retry(self.main_model, prompt)
@@ -758,8 +764,8 @@ def main():
     # 循环处理需求
     while True:
         try:
-            # 获取需求
-            feature = get_multiline_input("请输入开发需求 (输入空行退出):")
+            # 获取需求，传入项目根目录
+            feature = get_multiline_input("请输入开发需求 (输入空行退出):", tool.root_dir)
             
             if not feature or feature == "__interrupt__":
                 break
@@ -787,3 +793,122 @@ def main():
 
 if __name__ == "__main__":
     exit(main())
+
+class FilePathCompleter(Completer):
+    """文件路径自动完成器"""
+    
+    def __init__(self, root_dir: str):
+        self.root_dir = root_dir
+        self._file_list = None
+        
+    def _get_files(self) -> List[str]:
+        """获取git管理的文件列表"""
+        if self._file_list is None:
+            try:
+                # 切换到项目根目录
+                old_cwd = os.getcwd()
+                os.chdir(self.root_dir)
+                
+                # 获取git管理的文件列表
+                self._file_list = os.popen("git ls-files").read().splitlines()
+                
+                # 恢复工作目录
+                os.chdir(old_cwd)
+            except Exception as e:
+                PrettyOutput.print(f"获取文件列表失败: {str(e)}", OutputType.WARNING)
+                self._file_list = []
+        return self._file_list
+    
+    def get_completions(self, document, complete_event):
+        """获取补全建议"""
+        text_before_cursor = document.text_before_cursor
+        
+        # 检查是否刚输入了@
+        if text_before_cursor.endswith('@'):
+            # 显示所有文件
+            for path in self._get_files():
+                yield Completion(path, start_position=0)
+            return
+            
+        # 检查之前是否有@，并获取@后的搜索词
+        at_pos = text_before_cursor.rfind('@')
+        if at_pos == -1:
+            return
+            
+        search = text_before_cursor[at_pos + 1:].lower().strip()
+        
+        # 提供匹配的文件建议
+        for path in self._get_files():
+            path_lower = path.lower()
+            if (search in path_lower or  # 直接包含
+                search in os.path.basename(path_lower) or  # 文件名包含
+                any(fnmatch.fnmatch(path_lower, f'*{s}*') for s in search.split())): # 通配符匹配
+                # 计算正确的start_position
+                yield Completion(path, start_position=-(len(search)))
+
+class SmartCompleter(Completer):
+    """智能自动完成器，组合词语和文件路径补全"""
+    
+    def __init__(self, word_completer: WordCompleter, file_completer: FilePathCompleter):
+        self.word_completer = word_completer
+        self.file_completer = file_completer
+        
+    def get_completions(self, document, complete_event):
+        """获取补全建议"""
+        # 如果当前行以@结尾，使用文件补全
+        if document.text_before_cursor.strip().endswith('@'):
+            yield from self.file_completer.get_completions(document, complete_event)
+        else:
+            # 否则使用词语补全
+            yield from self.word_completer.get_completions(document, complete_event)
+
+def get_multiline_input(prompt_text: str, root_dir: str = None) -> str:
+    """获取多行输入，支持文件路径自动完成功能
+    
+    Args:
+        prompt_text: 提示文本
+        root_dir: 项目根目录，用于文件补全
+        
+    Returns:
+        str: 用户输入的文本
+    """
+    # 创建文件补全器
+    file_completer = FilePathCompleter(root_dir or os.getcwd())
+    
+    # 创建提示样式
+    style = Style.from_dict({
+        'prompt': 'ansicyan bold',
+        'input': 'ansiwhite',
+    })
+    
+    # 创建会话
+    session = PromptSession(
+        completer=file_completer,
+        style=style,
+        multiline=False,
+        enable_history_search=True,
+        complete_while_typing=True
+    )
+    
+    # 显示初始提示文本
+    print(f"\n{prompt_text}")
+    
+    # 创建提示符
+    prompt = FormattedText([
+        ('class:prompt', ">>> ")
+    ])
+    
+    # 获取输入
+    lines = []
+    try:
+        while True:
+            line = session.prompt(prompt).strip()
+            if not line:  # 空行表示输入结束
+                break
+            lines.append(line)
+    except KeyboardInterrupt:
+        return "__interrupt__"
+    except EOFError:
+        pass
+    
+    return "\n".join(lines)

jarvis/models/base.py

@@ -42,9 +42,5 @@ class BasePlatform(ABC):
         raise NotImplementedError("set_system_message is not implemented")
 
     def set_suppress_output(self, suppress: bool):
-        """设置是否屏蔽输出
-        
-        Args:
-            suppress: 是否屏蔽输出
-        """
+        """设置是否屏蔽输出"""
         self.suppress_output = suppress

jarvis/models/kimi.py

@@ -360,6 +360,8 @@ class KimiModel(BasePlatform):
                             PrettyOutput.print(f"  原文: {text}", OutputType.PROGRESS)
                     
                     PrettyOutput.print("", OutputType.PROGRESS)
+
+            PrettyOutput.print(full_response, OutputType.RESULT)
             
             return full_response
 

jarvis/models/registry.py

@@ -81,7 +81,7 @@ class PlatformRegistry:
             directory: 平台目录路径
             
         Returns:
-            Dict[str, Type[BaseModel]]: 平台名称到平台类的映射
+            Dict[str, Type[BasePlatform]]: 平台名称到平台类的映射
         """
         platforms = {}
         
@@ -112,7 +112,7 @@ class PlatformRegistry:
                     
                     # 遍历模块中的所有类
                     for name, obj in inspect.getmembers(module):
-                        # 检查是否是BaseModel的子类，但不是BaseModel本身
+                        # 检查是否是BasePlatform的子类，但不是BasePlatform本身
                         if (inspect.isclass(obj) and 
                             issubclass(obj, BasePlatform) and 
                             obj != BasePlatform and
@@ -176,7 +176,7 @@ class PlatformRegistry:
             name: 平台名称
             
         Returns:
-            BaseModel: 平台实例
+            BasePlatform: 平台实例
         """
         if name not in self.platforms:
             PrettyOutput.print(f"未找到平台: {name}", OutputType.ERROR)

jarvis/tools/coder.py

@@ -0,0 +1,66 @@
+import os
+from typing import Dict, Any, Optional
+from jarvis.jarvis_coder.main import JarvisCoder
+from jarvis.utils import PrettyOutput, OutputType
+
+class CoderTool:
+    """代码修改工具"""
+    
+    name = "coder"
+    description = "用于自动修改和生成代码的工具"
+    parameters = {
+        "feature": {
+            "type": "string",
+            "description": "要实现的功能描述",
+            "required": True
+        },
+        "dir": {
+            "type": "string", 
+            "description": "项目根目录",
+            "required": False
+        },
+        "language": {
+            "type": "string",
+            "description": "编程语言",
+            "required": False
+        }
+    }
+
+
+    def _init_coder(self, dir: Optional[str] = None, language: Optional[str] = "python") -> None:
+        """初始化JarvisCoder实例"""
+        if not self._coder:
+            import os
+            work_dir = dir or os.getcwd()
+            self._coder = JarvisCoder(work_dir, language)
+
+    def execute(self, **kwargs) -> Dict[str, Any]:
+        """执行代码修改
+        
+        Args:
+            feature: 要实现的功能描述
+            dir: 可选，项目根目录
+            language: 可选，编程语言
+            
+        Returns:
+            Dict[str, Any]: 执行结果
+        """
+        feature = kwargs.get("feature")
+        dir = kwargs.get("dir")
+        language = kwargs.get("language", "python")
+        
+        try:
+            self.current_dir = os.getcwd()
+            self._init_coder(dir, language)
+            result = self._coder.execute(feature)
+            return result
+        except Exception as e:
+            PrettyOutput.print(f"代码修改失败: {str(e)}", OutputType.ERROR)
+            return {
+                "success": False,
+                "stdout": "",
+                "stderr": f"执行失败: {str(e)}",
+                "error": e
+            } 
+        finally:
+            os.chdir(self.current_dir)

jarvis/tools/search.py

@@ -2,7 +2,39 @@ from typing import Dict, Any, List
 from jarvis.models.registry import PlatformRegistry
 from jarvis.utils import PrettyOutput, OutputType
 from jarvis.tools.webpage import WebpageTool
-from jarvis.tools.bing_search import bing_search
+from playwright.sync_api import sync_playwright
+from urllib.parse import quote
+
+def bing_search(query):
+    try:
+        with sync_playwright() as p:
+            browser = p.chromium.launch()
+            page = browser.new_page()
+            page.goto(
+                f"https://www.bing.com/search?form=QBRE&q={quote(query)}&cc=US"
+            )
+
+            page.wait_for_selector("#b_results", timeout=10000)
+            
+            summaries = page.evaluate("""() => {
+                const liElements = Array.from(
+                    document.querySelectorAll("#b_results > .b_algo")
+                );
+                return liElements.map((li) => {
+                    const abstractElement = li.querySelector(".b_caption > p");
+                    const linkElement = li.querySelector("a");
+                    const href = linkElement.getAttribute("href");
+                    const title = linkElement.textContent;
+                    const abstract = abstractElement ? abstractElement.textContent : "";
+                    return { href, title, abstract };
+                });
+            }""")
+            
+            browser.close()
+            print(summaries)
+            return summaries
+    except Exception as error:
+        print("An error occurred:", error)
 
 class SearchTool:
     name = "search"

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.58
+Version: 0.1.59
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -66,6 +66,8 @@ Dynamic: requires-python
 
 *Your intelligent assistant for development and system interaction*
 
+English | [简体中文](README_zh.md)
+
 [Features](#features) •
 [Usage](#usage) •
 [Configuration](#configuration) •
@@ -112,19 +114,23 @@ pip install jarvis-ai-assistant
 
 ## 🔧 Configuration
 
-Create a `.jarvis_env` file in your home directory with your API keys:
+Jarvis supports configuration through environment variables that can be set in the `~/.jarvis_env` file:
 
-### For Kimi:
-```bash
-KIMI_API_KEY=your_kimi_api_key_here
-```
+| Environment Variable | Description | Default Value | Required |
+|---------|------|--------|------|
+| JARVIS_PLATFORM | AI platform to use, supports kimi/openai/ai8 etc | kimi | Yes |
+| JARVIS_MODEL | Model name to use | - | No |
+| JARVIS_CODEGEN_PLATFORM | AI platform for code generation | Same as JARVIS_PLATFORM | No |
+| JARVIS_CODEGEN_MODEL | Model name for code generation | Same as JARVIS_MODEL | No |
+| OPENAI_API_KEY | API key for OpenAI platform | - | Required for OpenAI |
+| OPENAI_API_BASE | Base URL for OpenAI API | https://api.deepseek.com | No |
+| OPENAI_MODEL_NAME | Model name for OpenAI | deepseek-chat | No |
+| AI8_API_KEY | API key for AI8 platform | - | Required for AI8 |
+| AI8_MODEL | Model name for AI8 platform | deepseek-chat | No |
+| KIMI_API_KEY | API key for Kimi platform | - | Required for Kimi |
+| OYI_API_KEY | API key for OYI platform | - | Required for OYI |
+| OYI_MODEL | Model name for OYI platform | deepseek-chat | No |
 
-### For OpenAI:
-```bash
-OPENAI_API_KEY=your_api_key_here
-OPENAI_API_BASE=your_api_base  # Optional, defaults to https://api.deepseek.com
-OPENAI_MODEL_NAME=your_model_name  # Optional, defaults to deepseek-chat
-```
 
 ## 🎯 Usage
 
@@ -241,55 +247,57 @@ Create a new Python file in `~/.jarvis_models/`:
 
 ```python
 from typing import Dict, List
-from jarvis.models.base import BaseModel
+from jarvis.models.base import BasePlatform
 from jarvis.utils import PrettyOutput, OutputType
 
-class CustomModel(BaseModel):
+class CustomPlatform(BasePlatform):
     """Custom model implementation"""
     
-    model_name = "custom"  # Model identifier
+    platform_name = "custom"  # Platform identifier
     
     def __init__(self):
         """Initialize model"""
-        # Add your initialization code here
+        # add initialization code
+        super().__init__()
         self.messages = []
         self.system_message = ""
-        
-    def set_system_message(self, message: str):
-        """Set system message"""
-        self.system_message = message
-        
+
+    def set_model_name(self, model_name: str):
+        """Set model name"""
+        self.model_name = model_name
+
     def chat(self, message: str) -> str:
-        """Execute chat with the model
+        """Chat with model
         
         Args:
-            message: User input message
+            message: user input message
             
         Returns:
-            str: Model response
+            str: model response
         """
         try:
-            # Implement chat logic here
-            PrettyOutput.print("发送请求...", OutputType.PROGRESS)
+            # implement chat logic
+            PrettyOutput.print("Sending request...", OutputType.PROGRESS)
             
-            # Add message to history
+            # add message to history
             self.messages.append({"role": "user", "content": message})
             
-            # Get response from your model
-            response = "Model response"
+            # get response from model
+            response = "model response"
             
-            # Add response to history
+            # add response to history
             self.messages.append({"role": "assistant", "content": response})
             
             return response
             
         except Exception as e:
-            PrettyOutput.print(f"对话失败: {str(e)}", OutputType.ERROR)
+            PrettyOutput.print(f"Chat failed: {str(e)}", OutputType.ERROR)
             raise Exception(f"Chat failed: {str(e)}")
-            
-    def name(self) -> str:
-        """Return model name"""
-        return self.model_name
+    
+    def upload_files(self, file_list: List[str]) -> List[Dict]:
+        """Upload files"""
+        # implement file upload logic
+        return []    
         
     def reset(self):
         """Reset model state"""
@@ -297,10 +305,22 @@ class CustomModel(BaseModel):
         if self.system_message:
             self.messages.append({"role": "system", "content": self.system_message})
             
+    def name(self) -> str:
+        """Return model name"""
+        return self.model_name
+            
     def delete_chat(self) -> bool:
         """Delete current chat session"""
         self.reset()
-        return True
+        return True  
+
+    def set_system_message(self, message: str):
+        """Set system message"""
+        self.system_message = message
+
+    def set_suppress_output(self, suppress: bool):
+        """Set whether to suppress output"""
+        self.suppress_output = suppress
 ```
 
 ### Development Guidelines

{jarvis_ai_assistant-0.1.58.dist-info → jarvis_ai_assistant-0.1.59.dist-info}/RECORD

@@ -1,29 +1,29 @@
-jarvis/__init__.py,sha256=rc0PX9hG--lb8NGfVN3-VdS1SnQTkK_G_FvWr1ZO-LM,50
-jarvis/agent.py,sha256=s8VebNef8BbKM6D9IDWWN-XenEXEL9KoYnDLGKyZY58,12347
+jarvis/__init__.py,sha256=b8yvcF8JU8Ok7r75ZnTd8pf8eQvluvd5CjMfxkewBAc,50
+jarvis/agent.py,sha256=vSba-jPjCCxYqI2uje6OZK_m-VwmNTOnJSheZy1C5PA,13914
 jarvis/main.py,sha256=gXXtnrkkvGwEswJL6qiYjVrg3bpzye-GJeAe0Nf2B9o,6509
 jarvis/utils.py,sha256=JlkuC9RtspXH2VWDmj9nR0vnb8ie1gIsKc4vC7WRco8,7321
-jarvis/jarvis_coder/main.py,sha256=7Zc50dpPSM6hq4ASg1-yGZ83iS1NxuvQn70D9SPNbqY,30751
+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/base.py,sha256=39g0GcXrNu16RV3HzazIqleynCaQDhm0XzF0r0uMDro,1506
-jarvis/models/kimi.py,sha256=j4VtRip0WhTgI4PGL_YXL9Z-II-xHe6hvJW3vOY-ShA,17545
+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=iVBjN9ImEvGHcz8WR-z8pPMJQZI907o_nccVOFANhak,7951
+jarvis/models/registry.py,sha256=G4Woj4-GnLiKEPAZObyJN47mOQ2r0bo4xmaQdWZwHrs,7963
 jarvis/tools/__init__.py,sha256=Kj1bKj34lwRDKMKHLOrLyQElf2lHbqA2tDgP359eaDo,71
 jarvis/tools/base.py,sha256=EGRGbdfbLXDLwtyoWdvp9rlxNX7bzc20t0Vc2VkwIEY,652
-jarvis/tools/bing_search.py,sha256=SvYeXM83eP9qREDcWguh0_r0m0npbcwXIyzEwwfreKU,1444
+jarvis/tools/coder.py,sha256=FBAk9A8P6WCVpexcTLYw-bqH3z6CkYa9c1EWooLzv5s,1992
 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/registry.py,sha256=mlOAmUq3yzRz-7yvwrrCwbe5Lmw8eh1v8-_Fa5sezwI,7209
-jarvis/tools/search.py,sha256=o7EJqEtKKDqlENkXhxDuDA73djzeEH9j4BB0n61egso,4899
+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.58.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.58.dist-info/METADATA,sha256=upXDcw_I_71ZInBR5zWI90zGsm5YDBoFG64btCGews0,10049
-jarvis_ai_assistant-0.1.58.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.58.dist-info/entry_points.txt,sha256=ieRI4ilnGNx1R6LlzT2P510mJ27lhLesVZToezDjSd8,89
-jarvis_ai_assistant-0.1.58.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.58.dist-info/RECORD,,
+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/tools/bing_search.py

@@ -1,38 +0,0 @@
-from playwright.sync_api import sync_playwright
-from urllib.parse import quote
-
-def bing_search(query):
-    try:
-        with sync_playwright() as p:
-            browser = p.chromium.launch()
-            page = browser.new_page()
-            page.goto(
-                f"https://www.bing.com/search?form=QBRE&q={quote(query)}&cc=US"
-            )
-
-            page.wait_for_selector("#b_results", timeout=10000)
-            
-            summaries = page.evaluate("""() => {
-                const liElements = Array.from(
-                    document.querySelectorAll("#b_results > .b_algo")
-                );
-                return liElements.map((li) => {
-                    const abstractElement = li.querySelector(".b_caption > p");
-                    const linkElement = li.querySelector("a");
-                    const href = linkElement.getAttribute("href");
-                    const title = linkElement.textContent;
-                    const abstract = abstractElement ? abstractElement.textContent : "";
-                    return { href, title, abstract };
-                });
-            }""")
-            
-            browser.close()
-            print(summaries)
-            return summaries
-    except Exception as error:
-        print("An error occurred:", error)
-
-if __name__ == "__main__":
-    # results = bing_search("北京到西雅图的距离")
-    results = bing_search("北京到西雅图的距离")
-    print(results)