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

jarvis/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.173"
+__version__ = "0.1.175"

jarvis/jarvis_agent/__init__.py

@@ -11,7 +11,7 @@ from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils.output import PrettyOutput, OutputType
 from jarvis.jarvis_utils.embedding import get_context_token_count
 from jarvis.jarvis_utils.config import get_max_tool_call_count, is_auto_complete, is_execute_tool_confirm
-from jarvis.jarvis_utils.methodology import load_methodology
+from jarvis.jarvis_utils.methodology import load_methodology, upload_methodology
 from jarvis.jarvis_utils.globals import make_agent_name, set_agent, delete_agent
 from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.config import get_max_token_count
@@ -645,7 +645,7 @@ want: 创建新工具来解决XXX问题
 name: generate_new_tool
 arguments:
   tool_name: 工具名称
-  tool_code: |
+  tool_code: |2
     # -*- coding: utf-8 -*-
     from typing import Dict, Any
     from jarvis.jarvis_utils.output import PrettyOutput, OutputType
@@ -699,96 +699,12 @@ name: methodology
 arguments:
   operation: add/update
   problem_type: 方法论类型，不要过于细节，也不要过于泛化
-  content: |
+  content: |2
     方法论内容
 {ct("TOOL_CALL")}
 
 如果以上三种情况都不适用，则直接输出原因分析，不要使用工具调用格式。
 </output_requirements>
-
-<tool_example>
-以下是一个完整的工具示例，供参考：
-
-```python
-# -*- coding: utf-8 -*-
-from typing import Dict, Any
-from jarvis.jarvis_utils.output import PrettyOutput, OutputType
-
-class text_transformer:
-    name = "text_transformer"
-    description = "Tool for text transformation"
-    Tool description for text transformation
-    适用场景：1. 格式化文本; 2. 处理标题; 3. 标准化输出
-    \"\"\"
-    
-    parameters = {{
-        "type": "object",
-        "properties": {{
-            "text": {{
-                "type": "string",
-                "description": "需要转换格式的文本"
-            }},
-            "transform_type": {{
-                "type": "string",
-                "description": "转换类型，可选值为 upper（大写）、lower（小写）或 title（首字母大写）",
-                "enum": ["upper", "lower", "title"]
-            }}
-        }},
-        "required": ["text", "transform_type"]
-    }}
-    
-    @staticmethod
-    def check() -> bool:
-        return True
-    
-    def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
-        try:
-            text = args["text"]
-            transform_type = args["transform_type"]
-            
-            # 使用PrettyOutput显示执行过程
-            PrettyOutput.print(f"正在将文本转换为 {{transform_type}} 格式...", OutputType.INFO)
-            
-            if transform_type == "upper":
-                result = text.upper()
-                PrettyOutput.print("文本已转换为大写", OutputType.SUCCESS)
-            elif transform_type == "lower":
-                result = text.lower()
-                PrettyOutput.print("文本已转换为小写", OutputType.SUCCESS)
-            elif transform_type == "title":
-                result = text.title()
-                PrettyOutput.print("文本已转换为首字母大写", OutputType.SUCCESS)
-            else:
-                PrettyOutput.print(f"不支持的转换类型: {{transform_type}}", OutputType.ERROR)
-                return {{
-                    "success": False,
-                    "stdout": "",
-                    "stderr": f"不支持的转换类型: {{transform_type}}"
-                }}
-            
-            return {{
-                "success": True,
-                "stdout": result,
-                "stderr": ""
-            }}
-            
-        except Exception as e:
-            PrettyOutput.print(f"转换失败: {{str(e)}}", OutputType.ERROR)
-            return {{
-                "success": False,
-                "stdout": "",
-                "stderr": f"转换失败: {{str(e)}}"
-            }}
-```
-
-使用方法：
-```
-name: text_transformer
-arguments:
-    text: hello world
-    transform_type: upper
-```
-</tool_example>
 </task_analysis>"""
 
                 self.prompt = analysis_prompt
@@ -838,7 +754,16 @@ arguments:
                 msg = user_input
                 for handler in self.input_handler:
                     msg, _ = handler(msg, self)
-                self.prompt = f"{user_input}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(msg, self.get_tool_registry())}"
+                
+                # 先尝试上传方法轮
+                platform = self.model if hasattr(self.model, 'upload_files') else None
+                if platform and upload_methodology(platform):
+                    methodology_prompt = f"{user_input}\n\n方法论已上传到平台，请参考平台上的方法论内容"
+                else:
+                    # 上传失败则回退到本地加载
+                    methodology_prompt = f"{user_input}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(msg, self.get_tool_registry())}"
+                
+                self.prompt = methodology_prompt
                 self.first = False
 
             self.conversation_length = get_context_token_count(self.prompt)

jarvis/jarvis_code_agent/code_agent.py

@@ -374,7 +374,8 @@ class CodeAgent:
                     final_ret += f"# 应用补丁:\n```diff\n{diff}\n```"
 
                     # 修改后的提示逻辑
-                    addon_prompt = f"如果用户的需求未完成，请继续生成补丁，如果已经完成，请终止，不要输出新的PATCH，不要实现任何超出用户需求外的内容\n"
+                    addon_prompt = "如果对应语言有静态检查工具，请使用静态检查工具检查代码，如果本次修改引入了警告和错误，请根据警告和错误信息修复代码\n"
+                    addon_prompt += "在引入警告和错误都被修复的前提下，如果用户的需求未完成，请继续生成补丁，如果已经完成，请终止，不要实现任何超出用户需求外的内容\n"
                     addon_prompt += "如果有任何信息不明确，调用工具获取信息\n"
                     addon_prompt += "每次响应必须且只能包含一个操作\n"
 

jarvis/jarvis_dev/main.py

@@ -125,7 +125,7 @@ PM_PROMPT = f"""
 ## 消息传递模板
 {ot("SEND_MESSAGE")}
 to: [角色]
-content: |
+content: |2
   # [任务主题]
 
   ## 背景与目标
@@ -259,7 +259,7 @@ BA_PROMPT = f"""
 ## 消息传递模板
 {ot("SEND_MESSAGE")}
 to: [角色]
-content: |
+content: |2
   # [需求主题]
 
   ## 背景与目标
@@ -415,7 +415,7 @@ SA_PROMPT = f"""
 ## 消息传递模板
 {ot("SEND_MESSAGE")}
 to: [角色]
-content: |
+content: |2
   # [架构主题]
 
   ## 背景与目标
@@ -571,7 +571,7 @@ TL_PROMPT = f"""
 ## 消息传递模板
 {ot("SEND_MESSAGE")}
 to: [角色]
-content: |
+content: |2
   # [技术主题]
 
   ## 背景与目标
@@ -750,7 +750,7 @@ arguments:
 ## 消息传递模板
 {ot("SEND_MESSAGE")}
 to: [角色]
-content: |
+content: |2
   # [开发主题]
 
   ## 背景与目标
@@ -931,7 +931,7 @@ arguments:
 ## 消息传递模板
 {ot("SEND_MESSAGE")}
 to: [角色]
-content: |
+content: |2
   # [测试主题]
 
   ## 背景与目标

jarvis/jarvis_methodology/main.py

@@ -95,10 +95,10 @@ def extract_methodology(input_file):
 请按以下格式返回结果：
 <methodologies>
 - problem_type: [问题类型1]
-  content: |
+  content: |2
     [多行方法论内容1]
 - problem_type: [问题类型2]
-  content: |
+  content: |2
     [多行方法论内容2]
 </methodologies>
 
@@ -192,10 +192,10 @@ def extract_methodology_from_url(url):
 请按以下格式返回结果：
 <methodologies>
 - problem_type: [问题类型1]
-  content: |
+  content: |2
     [多行方法论内容1]
 - problem_type: [问题类型2]
-  content: |
+  content: |2
     [多行方法论内容2]
 </methodologies>
 

jarvis/jarvis_multi_agent/__init__.py

@@ -33,23 +33,18 @@ class MultiAgent(OutputHandler):
 ```
 {ot("SEND_MESSAGE")}
 to: 智能体名称    # 目标智能体名称
-content: |
-    # 消息主题
-
-    ## 背景信息
-    [提供必要的上下文和背景]
-
-    ## 具体需求
-    [明确表达期望完成的任务]
-
-    ## 相关资源
-    [列出相关文档、数据或工具]
-
-    ## 期望结果
-    [描述期望的输出格式和内容]
-
-    ## 下一步计划
-    [描述下一步的计划和行动]
+content: |2
+  # 消息主题
+  ## 背景信息
+  [提供必要的上下文和背景]
+  ## 具体需求
+  [明确表达期望完成的任务]
+  ## 相关资源
+  [列出相关文档、数据或工具]
+  ## 期望结果
+  [描述期望的输出格式和内容]
+  ## 下一步计划
+  [描述下一步的计划和行动]
 {ct("SEND_MESSAGE")}
 ```
 
@@ -58,11 +53,10 @@ content: |
 ```
 {ot("SEND_MESSAGE")}
 to: 智能体名称    # 目标智能体名称
-content: |
-    # 消息主题
-
-    ## 任务结果
-    [任务完成结果，用于反馈]
+content: |2
+  # 消息主题
+  ## 任务结果
+  [任务完成结果，用于反馈]
 {ct("SEND_MESSAGE")}
 ```
 

jarvis/jarvis_platform/base.py

@@ -48,7 +48,6 @@ class BasePlatform(ABC):
         start_time = time.time()
 
         input_token_count = get_context_token_count(message)
-
         if is_context_overflow(message):
             PrettyOutput.print("错误：输入内容超过最大限制", OutputType.WARNING)
             return "错误：输入内容超过最大限制"
@@ -56,10 +55,12 @@ class BasePlatform(ABC):
         if input_token_count > get_max_input_token_count():
             current_suppress_output = self.suppress_output
             self.set_suppress_output(True)
-            inputs = split_text_into_chunks(message, get_max_input_token_count() - 1024, get_max_input_token_count() - 2048)
+            max_chunk_size = get_max_input_token_count() - 1024  # 留出一些余量
+            min_chunk_size = max_chunk_size // 2  # 最小块大小设为最大块大小的一半
+            inputs = split_text_into_chunks(message, max_chunk_size, min_chunk_size)
             with yaspin(text="正在提交长上下文...", color="cyan") as spinner:
                 prefix_prompt = f"""
-                我将分多次提供大量内容，在我明确告诉你内容已经全部提供完毕之前，每次仅需要输出“已收到”，明白请输出“开始接收输入”。
+                我将分多次提供大量内容，在我明确告诉你内容已经全部提供完毕之前，每次仅需要输出"已收到"，明白请输出"开始接收输入"。
                 """
                 while_true(lambda: while_success(lambda: self.chat(prefix_prompt), 5), 5)
                 submit_count = 0

jarvis/jarvis_platform/kimi.py

@@ -5,6 +5,10 @@ import json
 import os
 import mimetypes
 import time
+from rich.live import Live
+from rich.text import Text
+from rich.panel import Panel
+from rich import box
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import while_success
@@ -281,61 +285,127 @@ class KimiModel(BasePlatform):
             search_results = []
             ref_sources = []
 
-            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:
-                            if not self.suppress_output:
-                                PrettyOutput.print_stream(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
-
+            # 使用Rich的Live组件来实时展示更新
             if not self.suppress_output:
-                PrettyOutput.print_stream_end()
-
+                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:

jarvis/jarvis_platform/openai.py

@@ -2,6 +2,10 @@
 from typing import Dict, List, Tuple
 import os
 from openai import OpenAI
+from rich.live import Live
+from rich.text import Text
+from rich.panel import Panel
+from rich import box
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
@@ -84,15 +88,32 @@ class OpenAIModel(BasePlatform):
 
             full_response = ""
 
-            for chunk in response:
-                if chunk.choices and chunk.choices[0].delta.content:
-                    text = chunk.choices[0].delta.content
-                    if not self.suppress_output:
-                        PrettyOutput.print_stream(text)
-                    full_response += text
-
+            # 使用Rich的Live组件来实时展示更新
             if not self.suppress_output:
-                PrettyOutput.print_stream_end()
+                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
 
             # Add assistant reply to history
             self.messages.append({"role": "assistant", "content": full_response})