jarvis-ai-assistant 0.1.175__py3-none-any.whl → 0.1.177__py3-none-any.whl

jarvis/jarvis_platform/kimi.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from typing import Dict, List, Tuple
+from typing import Dict, Generator, List, Tuple
 import requests # type: ignore
 import json
 import os
@@ -241,7 +241,7 @@ class KimiModel(BasePlatform):
         return True
 
 
-    def chat(self, message: str) -> str:
+    def chat(self, message: str) -> Generator[str, None, None]:
         """Send message and get response"""
         if not self.chat_id:
             if not self._create_chat():
@@ -279,177 +279,29 @@ class KimiModel(BasePlatform):
 
         try:
             response = while_success(lambda: requests.post(url, headers=headers, json=payload, stream=True), sleep_time=5)
-            full_response = ""
-
-            # 收集搜索和引用结果
-            search_results = []
-            ref_sources = []
-
-            # 使用Rich的Live组件来实时展示更新
-            if not self.suppress_output:
-                text_content = Text()
-                panel = Panel(text_content, 
-                            title=f"[bold magenta]{self.model_name}[/bold magenta]", 
-                            subtitle="思考中...", 
-                            border_style="magenta", 
-                            box=box.ROUNDED)
-                
-                with Live(panel, refresh_per_second=3, transient=False) as live:
-                    for line in response.iter_lines():
-                        if not line:
-                            continue
-
-                        line = line.decode('utf-8')
-                        if not line.startswith("data: "):
-                            continue
-
-                        try:
-                            data = json.loads(line[6:])
-                            event = data.get("event")
-
-                            if event == "cmpl":
-                                # 处理补全文本
-                                text = data.get("text", "")
-                                if text:
-                                    full_response += text
-                                    text_content.append(text)
-                                    panel.subtitle = "生成中..."
-                                    live.update(panel)
-
-                            elif event == "search_plus":
-                                # 收集搜索结果
-                                msg = data.get("msg", {})
-                                if msg.get("type") == "get_res":
-                                    search_results.append({
-                                        "date": msg.get("date", ""),
-                                        "site_name": msg.get("site_name", ""),
-                                        "snippet": msg.get("snippet", ""),
-                                        "title": msg.get("title", ""),
-                                        "type": msg.get("type", ""),
-                                        "url": msg.get("url", "")
-                                    })
-                                    panel.subtitle = f"搜索中: 找到 {len(search_results)} 个结果"
-                                    live.update(panel)
-
-                            elif event == "ref_docs":
-                                # 收集引用来源
-                                ref_cards = data.get("ref_cards", [])
-                                for card in ref_cards:
-                                    ref_sources.append({
-                                        "idx_s": card.get("idx_s", ""),
-                                        "idx_z": card.get("idx_z", ""),
-                                        "ref_id": card.get("ref_id", ""),
-                                        "url": card.get("url", ""),
-                                        "title": card.get("title", ""),
-                                        "abstract": card.get("abstract", ""),
-                                        "source": card.get("source_label", ""),
-                                        "rag_segments": card.get("rag_segments", []),
-                                        "origin": card.get("origin", {})
-                                    })
-                                    panel.subtitle = f"分析引用: 找到 {len(ref_sources)} 个来源"
-                                    live.update(panel)
-
-                        except json.JSONDecodeError:
-                            continue
-                    
-                    # 显示对话完成状态
-                    panel.subtitle = "[bold green]回答完成[/bold green]"
-                    live.update(panel)
-            else:
-                # 如果禁止输出，则静默处理
-                for line in response.iter_lines():
-                    if not line:
-                        continue
-
-                    line = line.decode('utf-8')
-                    if not line.startswith("data: "):
-                        continue
-
-                    try:
-                        data = json.loads(line[6:])
-                        event = data.get("event")
-
-                        if event == "cmpl":
-                            # 处理补全文本
-                            text = data.get("text", "")
-                            if text:
-                                full_response += text
-
-                        elif event == "search_plus":
-                            # 收集搜索结果
-                            msg = data.get("msg", {})
-                            if msg.get("type") == "get_res":
-                                search_results.append({
-                                    "date": msg.get("date", ""),
-                                    "site_name": msg.get("site_name", ""),
-                                    "snippet": msg.get("snippet", ""),
-                                    "title": msg.get("title", ""),
-                                    "type": msg.get("type", ""),
-                                    "url": msg.get("url", "")
-                                })
-
-                        elif event == "ref_docs":
-                            # 收集引用来源
-                            ref_cards = data.get("ref_cards", [])
-                            for card in ref_cards:
-                                ref_sources.append({
-                                    "idx_s": card.get("idx_s", ""),
-                                    "idx_z": card.get("idx_z", ""),
-                                    "ref_id": card.get("ref_id", ""),
-                                    "url": card.get("url", ""),
-                                    "title": card.get("title", ""),
-                                    "abstract": card.get("abstract", ""),
-                                    "source": card.get("source_label", ""),
-                                    "rag_segments": card.get("rag_segments", []),
-                                    "origin": card.get("origin", {})
-                                })
-
-                    except json.JSONDecodeError:
-                        continue
-
-            # 显示搜索结果摘要
-            if search_results and not self.suppress_output:
-                output = ["搜索结果:"]
-                for result in search_results:
-                    output.append(f"- {result['title']}")
-                    if result['date']:
-                        output.append(f"  日期: {result['date']}")
-                    output.append(f"  来源: {result['site_name']}")
-                    if result['snippet']:
-                        output.append(f"  摘要: {result['snippet']}")
-                    output.append(f"  链接: {result['url']}")
-                    output.append("")
-                PrettyOutput.print("\n".join(output), OutputType.PROGRESS)
-
-            # 显示引用来源
-            if ref_sources and not self.suppress_output:
-                output = ["引用来源:"]
-                for source in ref_sources:
-                    output.append(f"- [{source['ref_id']}] {source['title']} ({source['source']})")
-                    output.append(f"  链接: {source['url']}")
-                    if source['abstract']:
-                        output.append(f"  摘要: {source['abstract']}")
-
-                    # 显示相关段落
-                    if source['rag_segments']:
-                        output.append("  相关段落:")
-                        for segment in source['rag_segments']:
-                            text = segment.get('text', '').replace('\n', ' ').strip()
-                            if text:
-                                output.append(f"    - {text}")
-
-                    # 显示原文引用
-                    origin = source['origin']
-                    if origin:
-                        text = origin.get('text', '')
-                        if text:
-                            output.append(f"  原文: {text}")
+            # 如果禁止输出，则静默处理
+            for line in response.iter_lines():
+                if not line:
+                    continue
+
+                line = line.decode('utf-8')
+                if not line.startswith("data: "):
+                    continue
+
+                try:
+                    data = json.loads(line[6:])
+                    event = data.get("event")
 
-                    output.append("")
+                    if event == "cmpl":
+                        # 处理补全文本
+                        text = data.get("text", "")
+                        if text:
+                            yield text
+                except json.JSONDecodeError:
+                    continue
 
-                PrettyOutput.print("\n".join(output), OutputType.PROGRESS)
 
-            return full_response
+            return None
 
         except Exception as e:
             raise Exception(f"Chat failed: {str(e)}")

jarvis/jarvis_platform/openai.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from typing import Dict, List, Tuple
+from typing import Dict, Generator, List, Tuple
 import os
 from openai import OpenAI
 from rich.live import Live
@@ -73,7 +73,7 @@ class OpenAIModel(BasePlatform):
         self.system_message = message
         self.messages.append({"role": "system", "content": self.system_message})
 
-    def chat(self, message: str) -> str:
+    def chat(self, message: str) -> Generator[str, None, None]:
         """Execute conversation"""
         try:
 
@@ -87,38 +87,16 @@ class OpenAIModel(BasePlatform):
             ) # type: ignore
 
             full_response = ""
-
-            # 使用Rich的Live组件来实时展示更新
-            if not self.suppress_output:
-                text_content = Text()
-                panel = Panel(text_content, 
-                              title=f"[bold blue]{self.model_name}[/bold blue]", 
-                              subtitle="生成中...", 
-                              border_style="cyan", 
-                              box=box.ROUNDED)
-                
-                with Live(panel, refresh_per_second=3, transient=False) as live:
-                    for chunk in response:
-                        if chunk.choices and chunk.choices[0].delta.content:
-                            text = chunk.choices[0].delta.content
-                            full_response += text
-                            text_content.append(text)
-                            live.update(panel)
-                    
-                    # 显示对话完成状态
-                    panel.subtitle = "[bold green]对话完成[/bold green]"
-                    live.update(panel)
-            else:
-                # 如果禁止输出，则静默处理
-                for chunk in response:
-                    if chunk.choices and chunk.choices[0].delta.content:
-                        text = chunk.choices[0].delta.content
-                        full_response += text
+            for chunk in response:
+                if chunk.choices and chunk.choices[0].delta.content:
+                    text = chunk.choices[0].delta.content
+                    full_response += text
+                    yield text
 
             # Add assistant reply to history
             self.messages.append({"role": "assistant", "content": full_response})
 
-            return full_response
+            return None
 
         except Exception as e:
             PrettyOutput.print(f"对话失败：{str(e)}", OutputType.ERROR)

jarvis/jarvis_platform/yuanbao.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from typing import Dict, List, Tuple
+from typing import Dict, Generator, List, Tuple
 import requests
 import json
 import os
@@ -294,7 +294,7 @@ class YuanbaoPlatform(BasePlatform):
             with open(file_path, 'rb') as file:
                 file_content = file.read()
 
-            spinner.write(f"ℹ️ 上传文件大小: {len(file_content)}")
+            spinner.write(f"ℹ️  上传文件大小: {len(file_content)}")
                 
             # Prepare headers for PUT request
             host = f"{upload_info['bucketName']}.{upload_info.get('accelerateDomain', 'cos.accelerate.myqcloud.com')}"
@@ -386,7 +386,7 @@ class YuanbaoPlatform(BasePlatform):
             PrettyOutput.print(f"生成签名时出错: {str(e)}", OutputType.ERROR)
             raise e
 
-    def chat(self, message: str) -> str:
+    def chat(self, message: str) -> Generator[str, None, None]:
         """发送消息并获取响应，可选文件附件
         
         参数:
@@ -452,86 +452,38 @@ class YuanbaoPlatform(BasePlatform):
                     error_msg += f", 响应: {response.text}"
                 raise Exception(error_msg)
 
-            full_response = ""
-            is_text_block = False
-            thinking_content = ""
-
-            # 使用Rich的Live组件来实时展示更新
-            if not self.suppress_output:
-                text_content = Text()
-                panel = Panel(text_content, title=f"[bold blue]{self.model_name}[/bold blue]", 
-                          subtitle="思考中...", border_style="blue", box=box.ROUNDED)
-                with Live(panel, refresh_per_second=3, transient=False) as live:
-                    # 处理SSE流响应
-                    for line in response.iter_lines():
-                        if not line:
-                            continue
-
-                        line_str = line.decode('utf-8')
-
-                        # SSE格式的行通常以"data: "开头
-                        if line_str.startswith("data: "):
-                            try:
-                                data_str = line_str[6:]  # 移除"data: "前缀
-                                data = json.loads(data_str)
-
-                                # 处理文本类型的消息
-                                if data.get("type") == "text":
-                                    is_text_block = True
-                                    msg = data.get("msg", "")
-                                    if msg:
-                                        full_response += msg
-                                        text_content.append(msg)
-                                        panel.subtitle = "正在回答..."
-                                        live.update(panel)
-
-                                # 处理思考中的消息
-                                elif data.get("type") == "think":
-                                    think_content = data.get("content", "")
-                                    if think_content:
-                                        thinking_content = think_content
-                                        panel.subtitle = f"思考中: {thinking_content}"
-                                        live.update(panel)
-
-                            except json.JSONDecodeError:
-                                pass
-
-                        # 检测结束标志
-                        elif line_str == "data: [DONE]":
-                            break
-                    
-                    # 显示对话完成状态
-                    panel.subtitle = "[bold green]对话完成[/bold green]"
-                    live.update(panel)
-            else:
-                # 如果禁止输出，则静默处理
-                for line in response.iter_lines():
-                    if not line:
-                        continue
-
-                    line_str = line.decode('utf-8')
-
-                    # SSE格式的行通常以"data: "开头
-                    if line_str.startswith("data: "):
-                        try:
-                            data_str = line_str[6:]  # 移除"data: "前缀
-                            data = json.loads(data_str)
-
-                            # 处理文本类型的消息
-                            if data.get("type") == "text":
-                                is_text_block = True
-                                msg = data.get("msg", "")
-                                if msg:
-                                    full_response += msg
-
-                        except json.JSONDecodeError:
-                            pass
-
-                    # 检测结束标志
-                    elif line_str == "data: [DONE]":
-                        break
-
-            return full_response
+            # 处理SSE流响应
+            for line in response.iter_lines():
+                if not line:
+                    continue
+
+                line_str = line.decode('utf-8')
+
+                # SSE格式的行通常以"data: "开头
+                if line_str.startswith("data: "):
+                    try:
+                        data_str = line_str[6:]  # 移除"data: "前缀
+                        data = json.loads(data_str)
+
+                        # 处理文本类型的消息
+                        if data.get("type") == "text":
+                            msg = data.get("msg", "")
+                            if msg:
+                                yield msg
+
+                        # 处理思考中的消息
+                        elif data.get("type") == "think":
+                            think_content = data.get("content", "")
+                            if think_content:
+                                yield think_content
+
+                    except json.JSONDecodeError:
+                        pass
+
+                # 检测结束标志
+                elif line_str == "data: [DONE]":
+                    return None
+            return None
 
         except Exception as e:
             raise Exception(f"对话失败: {str(e)}")

jarvis/jarvis_platform_manager/main.py

@@ -606,7 +606,7 @@ def main():
     """Main function"""
     import argparse
 
-    init_env()
+    init_env("欢迎使用 Jarvis-PlatformManager，您的平台管理助手已准备就绪！")
 
     parser = argparse.ArgumentParser(description='Jarvis AI 平台')
     subparsers = parser.add_subparsers(dest='command', help='可用子命令')

jarvis/jarvis_smart_shell/main.py

@@ -5,6 +5,8 @@ import os
 import sys
 from typing import Optional
 
+from sympy import false
+
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils.config import get_shell_name
 from jarvis.jarvis_utils.input import get_multiline_input
@@ -113,8 +115,8 @@ def process_request(request: str) -> Optional[str]:
         return None
 
 def main() -> int:
-    # 创建参数解析器
-    init_env()
+    # 创建参数解析器s
+    init_env("")
     parser = argparse.ArgumentParser(
         description="将自然语言要求转换为shell命令",
         formatter_class=argparse.RawDescriptionHelpFormatter,

jarvis/jarvis_tools/ask_codebase.py

@@ -253,20 +253,26 @@ def main():
     ```
     python -m jarvis.jarvis_tools.ask_codebase "登录功能在哪个文件实现？" --root_dir /path/to/codebase
     ```
+    如果没有提供问题参数，则会进入交互式多行输入模式
     """
     import argparse
     import sys
+    from jarvis.jarvis_utils.input import get_multiline_input
 
-    init_env()
+    init_env("欢迎使用 Jarvis-AskCodebase，您的智能代码库查询工具已准备就绪！")
 
     # 创建命令行参数解析器
     parser = argparse.ArgumentParser(description="智能代码库查询工具")
-    parser.add_argument("question", help="关于代码库的问题")
+    parser.add_argument("question", nargs="?", help="关于代码库的问题")
     parser.add_argument("--root_dir", "-d", default=".", help="代码库根目录路径")
 
     # 解析命令行参数
     args = parser.parse_args()
 
+    # 如果没有提供问题参数，使用多行输入
+    if not args.question:
+        args.question = get_multiline_input("请输入关于代码库的问题:")
+
     # 创建并执行工具
     tool = AskCodebaseTool(auto_complete=False)
     result = tool.execute({

jarvis/jarvis_tools/cli/main.py

@@ -29,7 +29,7 @@ def main() -> int:
     import argparse
     import json
 
-    init_env()
+    init_env("欢迎使用 Jarvis-Tools，您的工具系统已准备就绪！")
 
     parser = argparse.ArgumentParser(description="Jarvis 工具系统命令行界面")
     subparsers = parser.add_subparsers(dest="command", help="命令")
@@ -47,6 +47,10 @@ def main() -> int:
         "--args-file", type=str, help="从文件加载工具参数 (JSON格式)"
     )
 
+    # 统计子命令
+    stat_parser = subparsers.add_parser("stat", help="显示工具调用统计信息")
+    stat_parser.add_argument("--json", action="store_true", help="以JSON格式输出")
+
     args = parser.parse_args()
 
     # 初始化工具注册表
@@ -72,6 +76,29 @@ def main() -> int:
                     print(f"   参数:")
                     print(tool["parameters"])  # 显示详细参数信息
 
+    elif args.command == "stat":
+        from tabulate import tabulate
+        stats = registry._get_tool_stats()
+        tools = registry.get_all_tools()
+        
+        # 构建统计表格数据
+        table_data = []
+        for tool in tools:
+            name = tool["name"]
+            count = stats.get(name, 0)
+            table_data.append([name, count])
+        
+        # 按调用次数降序排序
+        table_data.sort(key=lambda x: x[1], reverse=True)
+        
+        if args.json:
+            print(json.dumps(dict(table_data), indent=2))
+        else:
+            PrettyOutput.section("工具调用统计", OutputType.SYSTEM)
+            print(tabulate(table_data, headers=["工具名称", "调用次数"], tablefmt="grid"))
+            
+        return 0
+
     elif args.command == "call":
         tool_name = args.tool_name
         tool_obj = registry.get_tool(tool_name)