jarvis-ai-assistant 0.1.174__py3-none-any.whl → 0.1.176__py3-none-any.whl

jarvis/__init__.py

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

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
@@ -337,33 +337,20 @@ class Agent:
         action_handlers = '\n'.join([f'- {handler.name()}' for handler in self.output_handler])
 
         # 任务完成提示
-        complete_prompt = f"3. 输出{ot('!!!COMPLETE!!!')}" if need_complete and self.auto_complete else ""
+        complete_prompt = f"- 输出{ot('!!!COMPLETE!!!')}" if need_complete and self.auto_complete else ""
 
         addon_prompt = f"""
-<addon>
-<instructions>
-**系统指令：**
-- 每次响应必须且只能包含一个操作
-- 严格遵循操作调用格式
-- 必须包含参数和说明
-- 操作结束需等待结果
-- 如果判断任务已经完成，不必输出操作
+请判断是否已经完成任务，如果已经完成：
+- 说明完成原因，不需要再有新的操作
+{complete_prompt}
+如果没有完成，请进行下一步操作：
+- 仅包含一个操作
 - 如果信息不明确，请请求用户补充
 - 如果执行过程中连续失败5次，请使用ask_user询问用户操作
-</instructions>
-
-<actions>
-**可用操作列表：**
+- 操作列表：
 {action_handlers}
-</actions>
 
-<completion>
-如果任务已完成，请：
-1. 说明完成原因
-2. 保持输出格式规范
-{complete_prompt}
-</completion>
-</addon>
+请继续。
 """
 
         return addon_prompt
@@ -401,8 +388,6 @@ class Agent:
         if self.conversation_length > self.max_token_count:
             message = self._summarize_and_clear_history() + "\n\n" + message
             self.conversation_length += get_context_token_count(message)
-
-        print("🤖 模型思考：")
         return self.model.chat_until_success(message)   # type: ignore
 
 
@@ -547,7 +532,7 @@ class Agent:
 1. 首先检查现有工具或方法论是否已经可以完成该任务，如果可以，直接说明即可，无需生成新内容
 2. 如果现有工具/方法论不足，评估当前任务是否可以通过编写新工具来自动化解决
 3. 如果可以通过工具解决，请设计并提供工具代码
-4. 如果无法通过编写通用工具完成，评估是否可以总结为通用方法论
+4. 如果无法通过编写通用工具完成，评估当前的执行流程是否可以总结为通用方法论
 5. 如果以上都不可行，给出详细理由
 
 请根据分析结果采取相应行动：说明现有工具/方法论、创建新工具、生成新方法论或说明原因。
@@ -570,6 +555,7 @@ class Agent:
 2. 方法论应该具备足够的通用性，可应用于同类问题
 3. 特别注意用户在执行过程中提供的修正、反馈和改进建议
 4. 如果用户明确指出了某个解决步骤的优化方向，这应该被纳入方法论
+5. 方法论要严格按照实际的执行流程来总结，不要遗漏或增加任何步骤
 </evaluation_criteria>
 
 <tool_requirements>
@@ -645,7 +631,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 +685,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
@@ -835,10 +737,18 @@ arguments:
             self.prompt = f"{user_input}"
 
             if self.first:
-                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):
+                    self.prompt = f"{user_input}\n\n方法论已上传到平台，请参考平台上的方法论内容"
+                else:
+                    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())}"
+                
                 self.first = False
 
             self.conversation_length = get_context_token_count(self.prompt)

jarvis/jarvis_agent/jarvis.py

@@ -18,7 +18,6 @@ from jarvis.jarvis_agent import (
 )
 from jarvis.jarvis_tools.registry import ToolRegistry
 from jarvis.jarvis_utils.utils import init_env
-from jarvis.jarvis_agent.file_input_handler import file_input_handler
 from jarvis.jarvis_agent.shell_input_handler import shell_input_handler
 from jarvis.jarvis_agent.builtin_input_handler import builtin_input_handler
 
@@ -122,7 +121,10 @@ def main() -> None:
             system_prompt=origin_agent_system_prompt,
             platform=args.platform,
             model_name=args.model,
-            input_handler=[file_input_handler, shell_input_handler, builtin_input_handler],
+            input_handler=[
+                shell_input_handler, 
+                builtin_input_handler
+            ],
             output_handler=[ToolRegistry()],
             need_summary=False
         )

jarvis/jarvis_code_agent/code_agent.py

@@ -16,7 +16,6 @@ from yaspin import yaspin  # type: ignore
 
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_agent.builtin_input_handler import builtin_input_handler
-from jarvis.jarvis_agent.file_input_handler import file_input_handler
 from jarvis.jarvis_agent.shell_input_handler import shell_input_handler
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_git_utils.git_commiter import GitCommitTool
@@ -109,7 +108,6 @@ class CodeAgent:
             platform=platform_instance,
             input_handler=[
                 shell_input_handler,
-                file_input_handler,
                 builtin_input_handler
             ],
             need_summary=need_summary
@@ -374,7 +372,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

@@ -1,15 +1,19 @@
 # -*- coding: utf-8 -*-
 from abc import ABC, abstractmethod
 import re
-from typing import List, Tuple
+from typing import Generator, List, Tuple
 
 from yaspin import yaspin
-from jarvis.jarvis_utils.config import get_max_input_token_count
+
+from jarvis.jarvis_utils.config import get_max_input_token_count, get_pretty_output
 from jarvis.jarvis_utils.embedding import split_text_into_chunks
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import get_context_token_count, is_context_overflow, while_success, while_true
 from jarvis.jarvis_utils.tag import ot, ct
-
+from rich.live import Live
+from rich.text import Text
+from rich.panel import Panel
+from rich import box
 
 class BasePlatform(ABC):
     """Base class for large language models"""
@@ -33,7 +37,7 @@ class BasePlatform(ABC):
         self.delete_chat()
 
     @abstractmethod
-    def chat(self, message: str) -> str:
+    def chat(self, message: str) -> Generator[str, None, None]:
         """Execute conversation"""
         raise NotImplementedError("chat is not implemented")
     
@@ -53,8 +57,6 @@ class BasePlatform(ABC):
             return "错误：输入内容超过最大限制"
 
         if input_token_count > get_max_input_token_count():
-            current_suppress_output = self.suppress_output
-            self.set_suppress_output(True)
             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)
@@ -70,32 +72,48 @@ class BasePlatform(ABC):
                     while_true(lambda: while_success(lambda: self.chat(f"<part_content>{input}</part_content>请返回已收到"), 5), 5)
                 spinner.text = "提交完成"
                 spinner.ok("✅")
-            self.set_suppress_output(current_suppress_output)
-            response = while_true(lambda: while_success(lambda: self.chat("内容已经全部提供完毕，请继续"), 5), 5)
-            
+            response = while_true(lambda: while_success(lambda: self._chat("内容已经全部提供完毕，请继续"), 5), 5)
         else:
-            response = self.chat(message)
-
-        end_time = time.time()
-        duration = end_time - start_time
-        char_count = len(response)
-
-        # Calculate token count and tokens per second
-        try:
-            token_count = get_context_token_count(response)
-            tokens_per_second = token_count / duration if duration > 0 else 0
-        except Exception as e:
-            PrettyOutput.print(f"Tokenization failed: {str(e)}", OutputType.WARNING)
-            token_count = 0
-            tokens_per_second = 0
-
-        # Print statistics
-        if not self.suppress_output:
-            PrettyOutput.print(
-                f"对话完成 - 耗时: {duration:.2f}秒, 输入字符数: {len(message)}, 输入Token数量: {input_token_count}, 输出字符数: {char_count}, 输出Token数量: {token_count}, 每秒Token数量: {tokens_per_second:.2f}",
-                OutputType.INFO,
+            response = ""
+
+            text_content = Text()
+            panel = Panel(
+                text_content, 
+                title=f"[bold cyan]{self.name()}[/bold cyan]", 
+                subtitle="[dim]思考中...[/dim]", 
+                border_style="bright_blue",
+                box=box.ROUNDED
             )
 
+            if not self.suppress_output:
+                if get_pretty_output():
+                    with Live(panel, refresh_per_second=10, transient=False) as live:
+                        for s in self.chat(message):
+                            response += s
+                            text_content.append(s, style="bright_white")
+                            panel.subtitle = "[yellow]正在回答...[/yellow]"
+                            live.update(panel)
+                        end_time = time.time()
+                        duration = end_time - start_time
+                        char_count = len(response)
+                        # Calculate token count and tokens per second
+                        try:
+                            token_count = get_context_token_count(response)
+                            tokens_per_second = token_count / duration if duration > 0 else 0
+                        except Exception as e:
+                            PrettyOutput.print(f"Tokenization failed: {str(e)}", OutputType.WARNING)
+                            token_count = 0
+                            tokens_per_second = 0
+                        panel.subtitle = f"[bold green]✓ 对话完成耗时: {duration:.2f}秒, 输入字符数: {len(message)}, 输入Token数量: {input_token_count}, 输出字符数: {char_count}, 输出Token数量: {token_count}, 每秒Token数量: {tokens_per_second:.2f}[/bold green]"
+                        live.update(panel)
+                else:
+                    for s in self.chat(message):
+                        print(s, end="", flush=True)
+                        response += s
+                    print()
+            else:
+                for s in self.chat(message):
+                    response += s
         # Keep original think tag handling
         response = re.sub(ot("think")+r'.*?'+ct("think"), '', response, flags=re.DOTALL)
         return response

jarvis/jarvis_platform/human.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from typing import Dict, List, Tuple
+from typing import Generator, List, Tuple
 import random
 import string
 from jarvis.jarvis_platform.base import BasePlatform
@@ -34,7 +34,7 @@ class HumanPlatform(BasePlatform):
         else:
             PrettyOutput.print(f"错误：不支持的模型: {model_name}", OutputType.ERROR)
 
-    def chat(self, message: str) -> str:
+    def chat(self, message: str) -> Generator[str, None, None]:
         """发送消息并获取人类响应"""
         if not self.conversation_id:
             self.conversation_id = ''.join(random.choices(string.ascii_letters + string.digits, k=8))
@@ -49,7 +49,8 @@ class HumanPlatform(BasePlatform):
             prompt = f"{message} {session_info}\n\n请回复:"
         
         response = get_multiline_input(prompt)
-        return response
+        yield response
+        return None
 
     def upload_files(self, file_list: List[str]) -> bool:
         """文件上传功能，人类平台不需要实际处理"""

jarvis/jarvis_platform/kimi.py

@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-from typing import Dict, List, Tuple
+from typing import Dict, Generator, List, Tuple
 import requests # type: ignore
 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
@@ -237,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():
@@ -275,12 +279,7 @@ 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 = []
-
+            # 如果禁止输出，则静默处理
             for line in response.iter_lines():
                 if not line:
                     continue
@@ -297,89 +296,12 @@ class KimiModel(BasePlatform):
                         # 处理补全文本
                         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", {})
-                            })
-
+                            yield text
                 except json.JSONDecodeError:
                     continue
 
-            if not self.suppress_output:
-                PrettyOutput.print_stream_end()
-
-
-            # 显示搜索结果摘要
-            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}")
-
-                    output.append("")
-
-                PrettyOutput.print("\n".join(output), OutputType.PROGRESS)
 
-            return full_response
+            return None
 
         except Exception as e:
             raise Exception(f"Chat failed: {str(e)}")