jarvis-ai-assistant 0.1.53__py3-none-any.whl → 0.1.56__py3-none-any.whl

jarvis/main.py

@@ -100,23 +100,26 @@ def select_task(tasks: dict) -> str:
 def main():
     """Jarvis 的主入口点"""
     # 添加参数解析器
+    load_env_from_file()
     parser = argparse.ArgumentParser(description='Jarvis AI 助手')
     parser.add_argument('-f', '--files', nargs='*', help='要处理的文件列表')
     parser.add_argument('--keep-history', action='store_true', help='保持聊天历史(不删除会话)')
-    parser.add_argument('-p', '--platform', default='', help='选择AI平台')
-    parser.add_argument('-m', '--model', default='', help='模型')  # 用于指定使用的模型名称，默认使用环境变量或平台默认模型
+    parser.add_argument('-p', '--platform', default=os.getenv('JARVIS_PLATFORM') or 'kimi', help='选择AI平台')
+    parser.add_argument('-m', '--model', default=os.getenv('JARVIS_MODEL') or '', help='模型')  # 用于指定使用的模型名称，默认使用环境变量或平台默认模型
     args = parser.parse_args()
 
-    load_env_from_file()
-
     platform = args.platform if args.platform else os.getenv('JARVIS_PLATFORM')
 
     if not platform:
         PrettyOutput.print("未指定AI平台，请使用 -p 参数或者设置 JARVIS_PLATFORM 环境变量", OutputType.ERROR)
         return 1
-
-    PlatformRegistry.get_global_platform_registry().set_global_platform_name(platform)
     
+    PlatformRegistry.get_global_platform_registry().set_global_platform_name(platform)
+
+    if args.model:
+        PrettyOutput.print(f"用户传入了模型参数，更换模型: {args.model}", OutputType.USER)
+        os.environ["JARVIS_MODEL"] = args.model
+
     try:
         # 获取全局模型实例
         agent = Agent()

jarvis/models/ai8.py

@@ -63,7 +63,7 @@ class AI8Model(BasePlatform):
         
         PrettyOutput.print("使用AI8_MODEL环境变量配置模型", OutputType.SUCCESS)
         
-        self.model_name = os.getenv("AI8_MODEL") or "deepseek-chat"
+        self.model_name = os.getenv("AI8_MODEL") or os.getenv("JARVIS_MODEL") or "deepseek-chat"
         if self.model_name not in self.models:
             PrettyOutput.print(f"警告: 当前选择的模型 {self.model_name} 不在可用列表中", OutputType.WARNING)
         

jarvis/models/openai.py

@@ -30,7 +30,7 @@ class OpenAIModel(BasePlatform):
             raise Exception("OPENAI_API_KEY is not set")
             
         self.base_url = os.getenv("OPENAI_API_BASE", "https://api.deepseek.com")
-        self.model_name = os.getenv("OPENAI_MODEL_NAME", "deepseek-chat")
+        self.model_name = os.getenv("OPENAI_MODEL_NAME") or os.getenv("JARVIS_MODEL") or "deepseek-chat"
 
         PrettyOutput.print(f"当前使用模型: {self.model_name}", OutputType.SYSTEM)
             

jarvis/models/oyi.py

@@ -36,7 +36,7 @@ class OyiModel(BasePlatform):
         if not self.token:
             raise Exception("OYI_API_KEY is not set")
         
-        self.model_name = os.getenv("OYI_MODEL") or "deepseek-chat"
+        self.model_name = os.getenv("OYI_MODEL") or os.getenv("JARVIS_MODEL") or "deepseek-chat"
         if self.model_name not in [m.split()[0] for m in available_models]:
             PrettyOutput.print(f"警告: 当前选择的模型 {self.model_name} 不在可用列表中", OutputType.WARNING)
         

jarvis/tools/bing_search.py

@@ -0,0 +1,38 @@
+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)

jarvis/tools/registry.py

@@ -101,6 +101,7 @@ class ToolRegistry:
                     )
                     PrettyOutput.print(f"从 {file_path} 加载工具: {tool_instance.name}: {tool_instance.description}", OutputType.INFO)
                     tool_found = True
+                    break
                     
             if not tool_found:
                 PrettyOutput.print(f"文件中未找到有效的工具类: {file_path}", OutputType.WARNING)

jarvis/tools/search.py

@@ -0,0 +1,129 @@
+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
+
+class SearchTool:
+    name = "search"
+    description = "使用Bing搜索引擎搜索信息，并根据问题提取关键信息"
+    parameters = {
+        "type": "object",
+        "properties": {
+            "query": {
+                "type": "string",
+                "description": "搜索关键词"
+            },
+            "question": {
+                "type": "string",
+                "description": "需要回答的具体问题，用于从搜索结果中提取相关信息"
+            },
+            "max_results": {
+                "type": "integer",
+                "description": "最大搜索结果数量",
+                "default": 3
+            }
+        },
+        "required": ["query", "question"]
+    }
+
+    def __init__(self):
+        """初始化搜索工具，需要传入语言模型用于信息提取"""
+        self.model = PlatformRegistry.get_global_platform_registry().get_global_platform()
+        self.webpage_tool = WebpageTool()
+
+    def _search(self, query: str, max_results: int) -> List[Dict]:
+        """执行搜索请求"""
+        try:
+            results = bing_search(query)
+            if not results:
+                return []
+            
+            # 格式化搜索结果
+            formatted_results = []
+            for result in results[:max_results]:
+                formatted_results.append({
+                    "title": result.get("title", ""),
+                    "href": result.get("href", ""),
+                    "body": result.get("abstract", "")
+                })
+            return formatted_results
+        except Exception as e:
+            PrettyOutput.print(f"搜索请求失败: {str(e)}", OutputType.ERROR)
+            return []
+
+    def _extract_info(self, contents: List[str], question: str) -> str:
+        """使用语言模型从网页内容中提取关键信息"""
+        prompt = f"""请根据以下搜索结果内容，回答问题：{question}
+
+搜索结果内容：
+{'-' * 40}
+{''.join(contents)}
+{'-' * 40}
+
+请提供一个简洁、准确的答案，重点关注与问题直接相关的信息。如果搜索结果中没有相关信息，请明确说明。
+回答时注意：
+1. 保持客观性，只基于搜索结果提供信息
+2. 如果不同来源有冲突，请指出差异
+3. 适当引用信息来源
+4. 如果信息不完整或不确定，请说明"""
+
+        try:
+            response = self.model.chat(prompt)
+            return response
+        except Exception as e:
+            return f"信息提取失败: {str(e)}"
+
+    def execute(self, args: Dict) -> Dict[str, Any]:
+        """执行搜索并提取信息"""
+        try:
+            query = args["query"]
+            question = args["question"]
+            max_results = args.get("max_results", 3)
+            
+            # 打印搜索信息
+            PrettyOutput.print(f"搜索查询: {query}", OutputType.INFO)
+            PrettyOutput.print(f"相关问题: {question}", OutputType.INFO)
+            
+            # 获取搜索结果
+            results = self._search(query, max_results)
+            if not results:
+                return {
+                    "success": False,
+                    "error": "未能获取任何搜索结果"
+                }
+            
+            # 收集网页内容
+            contents = []
+            for i, result in enumerate(results, 1):
+                try:
+                    PrettyOutput.print(f"正在读取第 {i}/{len(results)} 个结果... {result['title']} - {result['href']}", OutputType.PROGRESS)
+                    webpage_result = self.webpage_tool.execute({"url": result["href"]})
+                    if webpage_result["success"]:
+                        contents.append(f"\n来源 {i}：{result['href']}\n")
+                        contents.append(webpage_result["stdout"])
+                except Exception as e:
+                    PrettyOutput.print(f"读取结果 {i} 失败: {str(e)}", OutputType.WARNING)
+                    continue
+            
+            if not contents:
+                return {
+                    "success": False,
+                    "error": "未能获取任何有效的搜索结果"
+                }
+            
+            # 提取信息
+            PrettyOutput.print("正在分析搜索结果...", OutputType.PROGRESS)
+            analysis = self._extract_info(contents, question)
+            
+            return {
+                "success": True,
+                "stdout": f"搜索分析结果：\n\n{analysis}",
+                "stderr": ""
+            }
+
+        except Exception as e:
+            return {
+                "success": False,
+                "error": f"搜索失败: {str(e)}"
+            } 

jarvis/tools/webpage.py

@@ -0,0 +1,76 @@
+from typing import Dict, Any
+import requests
+from bs4 import BeautifulSoup
+from jarvis.utils import PrettyOutput, OutputType
+
+class WebpageTool:
+    name = "read_webpage"
+    description = "读取网页内容，提取标题和正文文本"
+    parameters = {
+        "type": "object",
+        "properties": {
+            "url": {
+                "type": "string",
+                "description": "需要读取的网页URL"
+            }
+        },
+        "required": ["url"]
+    }
+
+    def execute(self, args: Dict) -> Dict[str, Any]:
+        """读取网页内容"""
+        try:
+            url = args["url"]
+            
+            # 设置请求头
+            headers = {
+                'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36'
+            }
+            
+            # 发送请求
+            PrettyOutput.print(f"正在读取网页: {url}", OutputType.INFO)
+            response = requests.get(url, headers=headers, timeout=10)
+            response.raise_for_status()
+            
+            # 使用正确的编码
+            response.encoding = response.apparent_encoding
+            
+            # 解析HTML
+            soup = BeautifulSoup(response.text, 'html.parser')
+            
+            # 移除script和style标签
+            for script in soup(["script", "style"]):
+                script.decompose()
+            
+            # 提取标题
+            title = soup.title.string if soup.title else ""
+            title = title.strip() if title else "无标题"
+            
+            # 提取正文
+            text = soup.get_text(separator='\n', strip=True)
+            lines = [line.strip() for line in text.splitlines() if line.strip()]
+            
+            # 构建输出
+            output = [
+                f"标题: {title}",
+                "",
+                "正文内容:",
+                "\n".join(lines)
+            ]
+            
+            return {
+                "success": True,
+                "stdout": "\n".join(output),
+                "stderr": ""
+            }
+
+        except requests.RequestException as e:
+            return {
+                "success": False,
+                "error": f"网页请求失败: {str(e)}"
+            }
+        except Exception as e:
+            return {
+                "success": False,
+                "error": f"解析网页失败: {str(e)}"
+            } 

{jarvis_ai_assistant-0.1.53.dist-info → jarvis_ai_assistant-0.1.56.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.53
+Version: 0.1.56
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -43,6 +43,7 @@ Requires-Dist: pyyaml>=5.1
 Requires-Dist: colorama>=0.4.6
 Requires-Dist: prompt_toolkit>=3.0.0
 Requires-Dist: openai>=1.20.0
+Requires-Dist: playwright>=1.41.1
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"

jarvis_ai_assistant-0.1.56.dist-info/RECORD

@@ -0,0 +1,29 @@
+jarvis/__init__.py,sha256=vS32islhec3FUi9M3w_YYwFmgxraLbtdULP2nR3_c68,50
+jarvis/agent.py,sha256=s8VebNef8BbKM6D9IDWWN-XenEXEL9KoYnDLGKyZY58,12347
+jarvis/main.py,sha256=gXXtnrkkvGwEswJL6qiYjVrg3bpzye-GJeAe0Nf2B9o,6509
+jarvis/utils.py,sha256=JlkuC9RtspXH2VWDmj9nR0vnb8ie1gIsKc4vC7WRco8,7321
+jarvis/jarvis_coder/main.py,sha256=eKo7ipNb3eSRuUMwMZclTozz6LUtU95t2B-w_LGkexs,30155
+jarvis/models/__init__.py,sha256=mrOt67nselz_H1gX9wdAO4y2DY5WPXzABqJbr5Des8k,63
+jarvis/models/ai8.py,sha256=6Nu4AJ_YtzVcVJirOrzbRI1WF0WpGBzWuDvu_C5oP0s,12624
+jarvis/models/base.py,sha256=eeNJJbv9ikPVTtV_E7mgW8LZzVgjQ-OzxlHF6slYrHw,1237
+jarvis/models/kimi.py,sha256=N0bPQ1ugx0RwjR96jLchmOPvCmws-fXyA0mnOAdo2k4,17161
+jarvis/models/openai.py,sha256=yJ8e4js365uh-pdka-q8tD6iUoSdP-n4kdxUfaHIQ28,4262
+jarvis/models/oyi.py,sha256=VwPW4UawGrMrDOCIbSs9ieNlE6N0pBtgiroyg9JCJ48,15004
+jarvis/models/registry.py,sha256=iVBjN9ImEvGHcz8WR-z8pPMJQZI907o_nccVOFANhak,7951
+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/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/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.56.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.56.dist-info/METADATA,sha256=77TKsWx_GKBmYymF7IowtGuVbe6kYcEwO5cqAnjSyTw,10049
+jarvis_ai_assistant-0.1.56.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.56.dist-info/entry_points.txt,sha256=xDf1Kjt0cr1GrASlrV1iuiMWMkAV6i-jUbcfKasR0os,89
+jarvis_ai_assistant-0.1.56.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.56.dist-info/RECORD,,

jarvis_ai_assistant-0.1.56.dist-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+jarvis = jarvis.main:main
+jarvis_coder = jarvis.jarvis_coder.main:main