jarvis-ai-assistant 0.1.175__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.175"
+__version__ = "0.1.176"

jarvis/jarvis_agent/__init__.py

@@ -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>
@@ -751,19 +737,18 @@ arguments:
             self.prompt = f"{user_input}"
 
             if self.first:
-                msg = user_input
-                for handler in self.input_handler:
-                    msg, _ = handler(msg, self)
                 
                 # 先尝试上传方法轮
                 platform = self.model if hasattr(self.model, 'upload_files') else None
                 if platform and upload_methodology(platform):
-                    methodology_prompt = f"{user_input}\n\n方法论已上传到平台，请参考平台上的方法论内容"
+                    self.prompt = f"{user_input}\n\n方法论已上传到平台，请参考平台上的方法论内容"
                 else:
+                    msg = user_input
+                    for handler in self.input_handler:
+                        msg, _ = handler(msg, self)
                     # 上传失败则回退到本地加载
-                    methodology_prompt = f"{user_input}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(msg, self.get_tool_registry())}"
+                    self.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_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,8 +372,8 @@ class CodeAgent:
                     final_ret += f"# 应用补丁:\n```diff\n{diff}\n```"
 
                     # 修改后的提示逻辑
-                    addon_prompt = "如果对应语言有静态检查工具，请使用静态检查工具检查代码，如果本次修改引入了警告和错误，请根据警告和错误信息修复代码\n"
-                    addon_prompt += "在引入警告和错误都被修复的前提下，如果用户的需求未完成，请继续生成补丁，如果已经完成，请终止，不要实现任何超出用户需求外的内容\n"
+                    addon_prompt = "如果对应语言有静态检查工具，请使用静态检查工具检查修改的代码，如果本次修改引入了警告和错误，请根据警告和错误信息修复代码\n"
+                    addon_prompt += "在引入警告和错误都被修复的前提下，如果用户的需求未完成，请继续修改代码，如果已经完成，请终止，不要实现任何超出用户需求外的内容\n"
                     addon_prompt += "如果有任何信息不明确，调用工具获取信息\n"
                     addon_prompt += "每次响应必须且只能包含一个操作\n"
 

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,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
@@ -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_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()
 
     # 创建命令行参数解析器
     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_utils/config.py

@@ -160,4 +160,13 @@ def get_max_big_content_size() -> int:
     返回：
         int: 最大大内容大小，默认为1MB
     """
-    return int(os.getenv('JARVIS_MAX_BIG_CONTENT_SIZE', '96000'))
+    return int(os.getenv('JARVIS_MAX_BIG_CONTENT_SIZE', '96000'))
+
+def get_pretty_output() -> bool:
+    """
+    获取是否启用PrettyOutput。
+
+    返回：
+        bool: 如果启用PrettyOutput则返回True，默认为True
+    """
+    return os.getenv('JARVIS_PRETTY_OUTPUT', 'false') == 'true'

jarvis/jarvis_utils/embedding.py

@@ -69,16 +69,7 @@ def split_text_into_chunks(text: str, max_length: int = 512, min_length: int = 5
 
         # 处理最后一个块
         if current_chunk:
-            if current_tokens >= min_length:
-                chunks.append(current_chunk)
-            elif chunks:  # 如果最后一个块太短，尝试与前面的块合并
-                last_chunk = chunks[-1]
-                combined = last_chunk + current_chunk
-                combined_tokens = get_context_token_count(combined)
-                if combined_tokens <= max_length:
-                    chunks[-1] = combined
-                else:
-                    chunks.append(current_chunk)
+            chunks.append(current_chunk)  # 直接添加最后一个块，无论长度如何
 
         return chunks
 

jarvis/jarvis_utils/output.py

@@ -17,7 +17,9 @@ from rich.syntax import Syntax
 from rich.style import Style as RichStyle
 from pygments.lexers import guess_lexer
 from pygments.util import ClassNotFound
+from jarvis.jarvis_utils.config import get_pretty_output
 from jarvis.jarvis_utils.globals import console, get_agent_list
+# from rich.box import HEAVY
 class OutputType(Enum):
     """
     输出类型枚举，用于分类和样式化不同类型的消息。
@@ -125,7 +127,7 @@ class PrettyOutput:
         except (ClassNotFound, Exception):
             return default_lang
     @staticmethod
-    def _format(output_type: OutputType, timestamp: bool = True) -> Text:
+    def _format(output_type: OutputType, timestamp: bool = True) -> str:
         """
         使用时间戳和图标格式化输出头。
 
@@ -136,14 +138,13 @@ class PrettyOutput:
         返回：
             Text: 格式化后的rich Text对象
         """
-        formatted = Text()
+        icon = PrettyOutput._ICONS.get(output_type, "")
+        formatted = f"{icon} "
         if timestamp:
-            formatted.append(f"[{datetime.now().strftime('%H:%M:%S')}][{output_type.value}]", style=output_type.value)
+            formatted+=f"[{datetime.now().strftime('%H:%M:%S')}][{output_type.value}]"
         agent_info = get_agent_list()
         if agent_info:
-            formatted.append(f"[{agent_info}]", style="blue")
-        icon = PrettyOutput._ICONS.get(output_type, "")
-        formatted.append(f" {icon} ", style=output_type.value)
+            formatted+=f"[{agent_info}]"
         return formatted
     @staticmethod
     def print(text: str, output_type: OutputType, timestamp: bool = True, lang: Optional[str] = None, traceback: bool = False):
@@ -158,35 +159,52 @@ class PrettyOutput:
             traceback: 是否显示错误的回溯信息
         """
         styles = {
-            OutputType.SYSTEM: RichStyle(color="bright_cyan", bgcolor="#1a1a1a", frame=True, meta={"icon": "🤖"}),
-            OutputType.CODE: RichStyle(color="green", bgcolor="#1a1a1a", frame=True, meta={"icon": "📝"}),
-            OutputType.RESULT: RichStyle(color="bright_blue", bgcolor="#1a1a1a", frame=True, meta={"icon": "✨"}),
-            OutputType.ERROR: RichStyle(color="red", frame=True, bgcolor="dark_red", meta={"icon": "❌"}),
-            OutputType.INFO: RichStyle(color="gold1", frame=True, bgcolor="grey11", meta={"icon": "ℹ️"}),
-            OutputType.PLANNING: RichStyle(color="purple", bold=True, frame=True, meta={"icon": "📋"}),
-            OutputType.PROGRESS: RichStyle(color="white", encircle=True, frame=True, meta={"icon": "⏳"}),
-            OutputType.SUCCESS: RichStyle(color="bright_green", bold=True, strike=False, meta={"icon": "✅"}),
-            OutputType.WARNING: RichStyle(color="yellow", bold=True, blink2=True, bgcolor="dark_orange", meta={"icon": "⚠️"}),
-            OutputType.DEBUG: RichStyle(color="grey58", dim=True, conceal=True, meta={"icon": "🔍"}),
-            OutputType.USER: RichStyle(color="spring_green2", frame=True, meta={"icon": "👤"}),
-            OutputType.TOOL: RichStyle(color="dark_sea_green4", bgcolor="grey19", frame=True, meta={"icon": "🔧"}),
+            OutputType.SYSTEM: dict( bgcolor="#1e2b3c"),
+            OutputType.CODE: dict( bgcolor="#1c2b1c"),
+            OutputType.RESULT: dict( bgcolor="#1c1c2b"),
+            OutputType.ERROR: dict( bgcolor="#2b1c1c"),
+            OutputType.INFO: dict( bgcolor="#2b2b1c", meta={"icon": "ℹ️"}),
+            OutputType.PLANNING: dict(  bgcolor="#2b1c2b"),
+            OutputType.PROGRESS: dict(  bgcolor="#1c1c1c"),
+            OutputType.SUCCESS: dict( bgcolor="#1c2b1c"),
+            OutputType.WARNING: dict( bgcolor="#2b2b1c"),
+            OutputType.DEBUG: dict(  bgcolor="#1c1c1c"),
+            OutputType.USER: dict( bgcolor="#1c2b2b"),
+            OutputType.TOOL: dict( bgcolor="#1c2b2b"),
+        }
+
+        header_styles = {
+            OutputType.SYSTEM: RichStyle(color="bright_cyan", bgcolor="#1e2b3c", frame=True, meta={"icon": "🤖"}),
+            OutputType.CODE: RichStyle(color="green", bgcolor="#1c2b1c", frame=True, meta={"icon": "📝"}),
+            OutputType.RESULT: RichStyle(color="bright_blue", bgcolor="#1c1c2b", frame=True, meta={"icon": "✨"}),
+            OutputType.ERROR: RichStyle(color="red", frame=True, bgcolor="#2b1c1c", meta={"icon": "❌"}),
+            OutputType.INFO: RichStyle(color="gold1", frame=True, bgcolor="#2b2b1c", meta={"icon": "ℹ️"}),
+            OutputType.PLANNING: RichStyle(color="purple", bold=True, frame=True, bgcolor="#2b1c2b", meta={"icon": "📋"}),
+            OutputType.PROGRESS: RichStyle(color="white", encircle=True, frame=True, bgcolor="#1c1c1c", meta={"icon": "⏳"}),
+            OutputType.SUCCESS: RichStyle(color="bright_green", bold=True, strike=False, bgcolor="#1c2b1c", meta={"icon": "✅"}),
+            OutputType.WARNING: RichStyle(color="yellow", bold=True, blink2=True, bgcolor="#2b2b1c", meta={"icon": "⚠️"}),
+            OutputType.DEBUG: RichStyle(color="grey58", dim=True, conceal=True, bgcolor="#1c1c1c", meta={"icon": "🔍"}),
+            OutputType.USER: RichStyle(color="spring_green2", frame=True, bgcolor="#1c2b2b", meta={"icon": "👤"}),
+            OutputType.TOOL: RichStyle(color="dark_sea_green4", bgcolor="#1c2b2b", frame=True, meta={"icon": "🔧"}),
         }
+
         lang = lang if lang is not None else PrettyOutput._detect_language(text, default_lang='markdown')
-        header = PrettyOutput._format(output_type, timestamp)
-        content = Syntax(text, lang, theme="monokai", word_wrap=True)
+        header = Text(PrettyOutput._format(output_type, timestamp), style=header_styles[output_type])
+        content = Syntax(text, lang, theme="dracula", word_wrap=True, background_color=styles[output_type]["bgcolor"])
         panel = Panel(
             content,
-            style=styles[output_type],
-            border_style=styles[output_type],
+            border_style=header_styles[output_type],
             title=header,
             title_align="left",
             padding=(0, 0),
             highlight=True,
-            # box=HEAVY,
         )
-        console.print()
-        console.print(panel)
-        if traceback or output_type == OutputType.ERROR:
+        if get_pretty_output():
+            console.print(panel)
+        else:
+            console.print(header)
+            console.print(content)
+        if traceback:
             console.print_exception()
     @staticmethod
     def section(title: str, output_type: OutputType = OutputType.INFO):
@@ -197,23 +215,13 @@ class PrettyOutput:
             title: 章节标题文本
             output_type: 输出类型（影响样式）
         """
+        text = Text(title, style=output_type.value, justify="center")
         panel = Panel(
-            Text(title, style=output_type.value, justify="center"),
+            text,
             border_style=output_type.value
         )
-        console.print()
-        console.print(panel)
-        console.print()
-    
-    @staticmethod
-    def _get_style(output_type: OutputType) -> RichStyle:
-        """
-        获取预定义的RichStyle用于输出类型。
-
-        参数：
-            output_type: 要获取样式的输出类型
-
-        返回：
-            RichStyle: 对应的样式
-        """
-        return console.get_style(output_type.value)
+        if get_pretty_output():
+            console.print(panel)
+        else:
+            console.print(text)
+    

{jarvis_ai_assistant-0.1.175.dist-info → jarvis_ai_assistant-0.1.176.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.175
+Version: 0.1.176
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -213,7 +213,8 @@ OPENAI_API_BASE=https://api.openai.com/v1  # 可选，默认为官方API地址
 | `JARVIS_CONFIRM_BEFORE_APPLY_PATCH` | true | 应用补丁前是否需要确认 |
 | `JARVIS_MAX_TOOL_CALL_COUNT` | 20 | 最大连续工具调用次数 |
 | `JARVIS_AUTO_UPDATE` | true | 是否自动更新Jarvis（仅在以git仓库方式安装时有效） |
-| `JARVIS_MAX_BIG_CONTENT_SIZE` | 10485760 | 最大大内容大小 |
+| `JARVIS_MAX_BIG_CONTENT_SIZE` | 96000 | 最大大内容大小 |
+| `JARVIS_PRETTY_OUTPUT` | false | 是否启用PrettyOutput |
 
 所有配置编写到`~/.jarvis/env`文件中即可生效。
 

{jarvis_ai_assistant-0.1.175.dist-info → jarvis_ai_assistant-0.1.176.dist-info}/RECORD

@@ -1,13 +1,12 @@
-jarvis/__init__.py,sha256=PW7wvclxKvhVfdxpCRbtFXcfiVyy6gIVpG9wmneeWDM,74
-jarvis/jarvis_agent/__init__.py,sha256=O_Qx-pqZjpb8LaXIDywgdKDDg-6Lq07wBgMF4PQECfQ,29246
+jarvis/__init__.py,sha256=t4h_MblKCYi1ODQZesEYCj6v7ydz3wTPEIcWq22dQ3U,74
+jarvis/jarvis_agent/__init__.py,sha256=ImVbBD4C5iq0z0DbtzIdBT2gzN7UcnWs9YeSgjoQxNE,29064
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=KhvlV_QdB3P-M0TCkWvdxidNie1jU7KoMOqTIXCpwwA,1529
-jarvis/jarvis_agent/file_input_handler.py,sha256=cIiE0pwMJVe1VfeNw8Dpm8mM_gwTcre-nxLstFjoq4k,4152
-jarvis/jarvis_agent/jarvis.py,sha256=IuM-A9KZd1jqOFszB2l-Ua1FE5uVGvvNia1SSgp7Jgg,5963
+jarvis/jarvis_agent/jarvis.py,sha256=r1fcQtPCWOMKVC9SdzUdjutaz5C3STuL7C9CqDXDLwE,5920
 jarvis/jarvis_agent/main.py,sha256=IAD59fEMWWSSAtHJhOQMPs_NMoKtcYjrxlTvhCHEVII,2626
 jarvis/jarvis_agent/output_handler.py,sha256=7qori-RGrQmdiFepoEe3oPPKJIvRt90l_JDmvCoa4zA,1219
 jarvis/jarvis_agent/shell_input_handler.py,sha256=pi3AtPKrkKc6K9e99S1djKXQ_XrxtP6FrSWebQmRT6E,1261
 jarvis/jarvis_code_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_code_agent/code_agent.py,sha256=9R32DV0-II4bxV_8b0tsdZW4UsuZjCf_fbplG2u27G0,17091
+jarvis/jarvis_code_agent/code_agent.py,sha256=FZS8kR1ZU_k1La3A7eQctRH84LRwqpbwN_Q4jpMFByY,16994
 jarvis/jarvis_code_analysis/code_review.py,sha256=68GCjxdg-n2hoMoCSGWpH_ZdQArc4G09E9Wwhypk4eY,30135
 jarvis/jarvis_code_analysis/checklists/__init__.py,sha256=cKQ_FOGy5TQgM-YkRCqORo-mUOZaPAJ9VDmZoFX58us,78
 jarvis/jarvis_code_analysis/checklists/c_cpp.py,sha256=SXPpYCNeCtU1PpKdKPiYDuOybfY9vaL0ejDn4imxDwA,1317
@@ -49,18 +48,18 @@ jarvis/jarvis_methodology/main.py,sha256=QJUMIb9o8JO-l207X5UIbazZKJYKG3F4iuUKtkm
 jarvis/jarvis_multi_agent/__init__.py,sha256=Xab5sFltJmX_9MoXqanmZs6FqKfUb2v_pG29Vk8ZXaw,4311
 jarvis/jarvis_multi_agent/main.py,sha256=Z6N5VMjzaernnRjPkqgYRv09cIhWIFQ6a__AqHA8xrQ,1567
 jarvis/jarvis_platform/__init__.py,sha256=0YnsUoM4JkIBOtImFdjfuDbrqQZT3dEaAwSJ62DrpCc,104
-jarvis/jarvis_platform/base.py,sha256=WVxGxXU9DfwQdISlPxBA7NGRsbjVuOQXxIrxg0eaT04,5423
-jarvis/jarvis_platform/human.py,sha256=5hfYSp0K7VmB_J2IyLwaVGOrxsaNIEZwsWvs1nF224U,2518
-jarvis/jarvis_platform/kimi.py,sha256=rVpAHoxuCXPZo9tepbp1NIX2Q8RYgnXyOJj0VS_q868,20669
-jarvis/jarvis_platform/openai.py,sha256=6qLCXoi15DGf9DvC9MUTha0gbZPoesFinixU2gSsBRI,5232
+jarvis/jarvis_platform/base.py,sha256=egcKQ8sUjANArAR48cbddmvsX7s_LexyVefztUAGBKY,6560
+jarvis/jarvis_platform/human.py,sha256=1Jh9xigQaU78WVvsIMaVH0i6QRhaSA1oaErv9BdntF8,2565
+jarvis/jarvis_platform/kimi.py,sha256=p18Ydb_0rgnK3-WZXKUtTBQTh7Da33O277PKWOMqBhA,13106
+jarvis/jarvis_platform/openai.py,sha256=ln-OYxZkWaSY9oDoBPMmMh2TDGN40iTtUURLk8batvQ,4159
 jarvis/jarvis_platform/registry.py,sha256=UjCdPT9WIRxU-F0uuPpKmKRRCcNNxjr-bRTEPgRSNx4,7740
-jarvis/jarvis_platform/yuanbao.py,sha256=yvAfvE9AyS-ZvOlHbwXwa6kHLt5IO778BzVbi0kvkw0,24013
+jarvis/jarvis_platform/yuanbao.py,sha256=0ZXq1seY-gmDLMS2Vq8cu7wLerfoWePScRZIahmkU4s,21668
 jarvis/jarvis_platform_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_platform_manager/main.py,sha256=VD0hKhLb8SevdFSYDXLRj3xwjBR1DTcRVgyn_Vp55VE,25593
 jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_smart_shell/main.py,sha256=uq5NCdNAdcHqvtG0zpajz85SigSKH1SSAcEpyHa_BOc,5180
 jarvis/jarvis_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_tools/ask_codebase.py,sha256=kIQwlSrCqtjXyl3YE8m6i188U62sZ78LAOz06Vsm-2k,9659
+jarvis/jarvis_tools/ask_codebase.py,sha256=fD3E4oY1o3-rVuzdgZKMmK4p1GtaW8PyCFyCDJKsM4U,9976
 jarvis/jarvis_tools/ask_user.py,sha256=cWSLG33b79IbIZEWsSNV5RHvGX6eo3nTM8TUhOMnGh8,2167
 jarvis/jarvis_tools/base.py,sha256=SR4dmrgYj3lNmtVDhHtItPvptTqCfw5SGRhgPT3I6ss,1189
 jarvis/jarvis_tools/chdir.py,sha256=wYVBqWF5kaUkKqH3cUAOKUsACzYsFtCCJJyd8UJsp4o,2706
@@ -85,19 +84,19 @@ jarvis/jarvis_tools/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 jarvis/jarvis_tools/cli/main.py,sha256=lk1MKpL_--JQornbGZGREgjLIhSsB3OJU-GFUfo64IE,5312
 jarvis/jarvis_utils/__init__.py,sha256=l-fsyQ-KzyqAhrJYur8eZAqsgaifGzSm24R2qtRGJ0g,849
 jarvis/jarvis_utils/builtin_replace_map.py,sha256=A-cJ8deht2vDl2iKRhoZ7qECyJ6sboVH5Zx-L9vIBUs,4314
-jarvis/jarvis_utils/config.py,sha256=zqGY4_oBH0Twu3SEAm4uAdQaIaz4qJ8uip-rlrMU_Bc,4537
-jarvis/jarvis_utils/embedding.py,sha256=5pum_0sq7IWLA-I9GSyFCdUgP-Zx49xonbFbPDsguw4,4239
+jarvis/jarvis_utils/config.py,sha256=EdTMfjGHn79CSz-JNZW86LVC31b5di-ig3lH06T50DU,4772
+jarvis/jarvis_utils/embedding.py,sha256=s7ze8-talEED9VXZm1QK5tPdfyj6sXJLP031tDkXeI4,3831
 jarvis/jarvis_utils/file_processors.py,sha256=tSZSMJ4qCJ_lXI0dyLgJ0j5qEh6CDXDSVI7vQiFmcuQ,2976
 jarvis/jarvis_utils/git_utils.py,sha256=MxhUcQ_gFUFyBxBiorEJ1wUk9a2TerFdq3-Z11FB-AE,11324
 jarvis/jarvis_utils/globals.py,sha256=Zs0chxA_giYiolYvawFFpcnTWgCUnn6GEusAh42jbz8,2275
 jarvis/jarvis_utils/input.py,sha256=qGf2q-yWhgT-OX-j_WYi7aZ11jYmuFNiMz2_W1nUOiM,7432
 jarvis/jarvis_utils/methodology.py,sha256=9dmtj6Ei2CRUdQP9TA_xToqZPYcm5_DQovwnRkEShsA,8626
-jarvis/jarvis_utils/output.py,sha256=7uhqaRCTFIKXhC8bvSQPNI3vyNoKEbzTTVFXbymzxZg,7726
+jarvis/jarvis_utils/output.py,sha256=ervq4aQ4t2q3DskoWqATKYAfKhLtskyQwPhGtwFp_ck,8340
 jarvis/jarvis_utils/tag.py,sha256=YJHmuedLb7_AiqvKQetHr4R1FxyzIh7HN0RRkWMmYbU,429
 jarvis/jarvis_utils/utils.py,sha256=iIcefLa1kvALkmQ19BLWDplmxrcOjtxWAgBIxrs8ytg,4439
-jarvis_ai_assistant-0.1.175.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.175.dist-info/METADATA,sha256=MWbQAB8D5l9rPNNML1rtCawvNHha-s-sAwQGMVJUyUc,14543
-jarvis_ai_assistant-0.1.175.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-jarvis_ai_assistant-0.1.175.dist-info/entry_points.txt,sha256=rjj61tZ7ahLi1R-JkJmX-IzIPPHD8mnwDZap1CnMe2s,973
-jarvis_ai_assistant-0.1.175.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.175.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.176.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.176.dist-info/METADATA,sha256=ku5RGDDI7kKDPucm9onv6KiUqx_VDzTHP0BV7xt74uY,14602
+jarvis_ai_assistant-0.1.176.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+jarvis_ai_assistant-0.1.176.dist-info/entry_points.txt,sha256=rjj61tZ7ahLi1R-JkJmX-IzIPPHD8mnwDZap1CnMe2s,973
+jarvis_ai_assistant-0.1.176.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.176.dist-info/RECORD,,

jarvis/jarvis_agent/file_input_handler.py

@@ -1,108 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-import os
-import re
-from typing import Any, Tuple
-
-from yaspin import yaspin
-
-from jarvis.jarvis_tools.file_operation import FileOperationTool
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from jarvis.jarvis_utils.utils import is_context_overflow
-
-
-def file_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
-    """Process user input containing file references and read file contents.
-    
-    Args:
-        user_input: Input string that may contain file references in format:
-            - 'file_path' (whole file)
-            - 'file_path:start_line,end_line' (line range)
-            - 'file_path:start_line:end_line' (alternative range format)
-        agent: Agent object for further processing (currently unused)
-        
-    Returns:
-        Tuple[str, bool]: 
-            - Processed prompt string with file contents prepended
-            - Boolean indicating if context overflow occurred
-    """
-    prompt = user_input
-    files = []
-
-    file_refs = re.findall(r"'([^']+)'", user_input)
-    for ref in file_refs:
-        # Handle file:start,end or file:start:end format
-        if ':' in ref:
-            file_path, line_range = ref.split(':', 1)
-            # Initialize with default values
-            start_line = 1  # 1-based
-            end_line = -1
-
-            # Process line range if specified
-            if ',' in line_range or ':' in line_range:
-                try:
-                    raw_start, raw_end = map(int, re.split(r'[,:]', line_range))
-
-                    # Handle special values and Python-style negative indices
-                    try:
-                        with open(file_path, 'r', encoding='utf-8', errors="ignore") as f:
-                            total_lines = len(f.readlines())
-                    except FileNotFoundError:
-                        PrettyOutput.print(f"文件不存在: {file_path}", OutputType.WARNING)
-                        continue
-                    # Process start line (0 means whole file, negative means from end)
-                    if raw_start == 0:  # 0表示整个文件
-                        start_line = 1
-                        end_line = total_lines
-                    else:
-                        start_line = raw_start if raw_start > 0 else total_lines + raw_start + 1
-
-                    # Process end line
-                    if raw_end == 0:  # 0表示整个文件（如果start也是0）
-                        end_line = total_lines
-                    else:
-                        end_line = raw_end if raw_end > 0 else total_lines + raw_end + 1
-
-                    # Auto-correct ranges
-                    start_line = max(1, min(start_line, total_lines))
-                    end_line = max(start_line, min(end_line, total_lines))
-
-                    # Final validation
-                    if start_line < 1 or end_line > total_lines or start_line > end_line:
-                        raise ValueError
-
-                except:
-                    continue
-
-            # Add file if it exists
-            if os.path.isfile(file_path):
-                files.append({
-                    "path": file_path,
-                    "start_line": start_line,
-                    "end_line": end_line
-                })
-        else:
-            # Handle simple file path
-            if os.path.isfile(ref):
-                files.append({
-                    "path": ref,
-                    "start_line": 1,  # 1-based
-                    "end_line": -1
-                })
-
-    # Read and process files if any were found
-    if files:
-        with yaspin(text="正在读取文件...", color="cyan") as spinner:
-            old_prompt = prompt
-            result = FileOperationTool().execute({"operation":"read","files": files})
-            if result["success"]:
-                spinner.text = "文件读取完成"
-                spinner.ok("✅")
-                # Prepend file contents to prompt and check for overflow
-                prompt = result["stdout"] + "\n" + prompt
-                if is_context_overflow(prompt):
-                    return old_prompt, False
-
-    return prompt, False
-