jarvis-ai-assistant 0.1.77__py3-none-any.whl → 0.1.79__py3-none-any.whl

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.77" 
+__version__ = "0.1.79" 

jarvis/agent.py

@@ -24,20 +24,20 @@ class Agent:
             name: Agent名称，默认为"Jarvis"
             is_sub_agent: 是否为子Agent，默认为False
         """
-        self.model = PlatformRegistry.get_global_platform()
+        self.model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
         self.tool_registry = ToolRegistry.get_global_tool_registry()
         self.name = name
         self.is_sub_agent = is_sub_agent
         self.prompt = ""
-        self.conversation_turns = 0  
+        self.conversation_length = 0  # 改用长度计数器
         
-        # 从环境变量加载嵌入模型配置
-        self.embedding_model_name = os.environ.get("JARVIS_EMBEDDING_MODEL", "BAAI/bge-large-zh-v1.5")
+        # 从环境变量加载配置
         self.embedding_dimension = 1536  # Default for many embedding models
+        self.max_context_length = int(os.getenv('JARVIS_MAX_CONTEXT_LENGTH', '30720'))  # 默认30k
         
         # 初始化嵌入模型
         try:
-            self.embedding_model = load_embedding_model(self.embedding_model_name)
+            self.embedding_model = load_embedding_model()
             
             # 预热模型并获取正确的维度
             test_text = "这是一段测试文本，用于确保模型完全加载。"
@@ -223,6 +223,7 @@ class Agent:
             
             # 清空当前对话历史，但保留系统消息
             self.model.delete_chat()
+            self.conversation_length = 0  # 重置对话长度
             
             # 添加总结作为新的上下文
             self.prompt = f"""以下是之前对话的关键信息总结：
@@ -231,9 +232,7 @@ class Agent:
 
 请基于以上信息继续完成任务。
 """
-            
-            # 重置对话轮数
-            self.conversation_turns = 0
+            self.conversation_length = len(self.prompt)  # 设置新的起始长度
             
         except Exception as e:
             PrettyOutput.print(f"总结对话历史失败: {str(e)}", OutputType.ERROR)
@@ -319,6 +318,7 @@ class Agent:
             tools_prompt = ""
 
             # 选择工具
+            PrettyOutput.section("选择工具", OutputType.PLANNING)
             tools = self.tool_registry.get_all_tools()
             if tools:
                 tools_prompt += "可用工具:\n"
@@ -331,8 +331,7 @@ class Agent:
             # 显示任务开始
             PrettyOutput.section(f"开始新任务: {self.name}", OutputType.PLANNING)
 
-            self.clear_history()
-            self.conversation_turns = 0  
+            self.clear_history()  
 
             self.model.set_system_message(f"""你是 {self.name}，一个问题处理能力强大的 AI 助手。
                                           
@@ -401,14 +400,15 @@ arguments:
                     # 显示思考状态
                     PrettyOutput.print("分析任务...", OutputType.PROGRESS)
                     
-                    # 增加对话轮次
-                    self.conversation_turns += 1
+                    # 累加对话长度
+                    self.conversation_length += len(self.prompt)
                     
-                    # 如果对话超过10轮，在提示中添加提醒
-                    if self.conversation_turns > 10:
-                        self.prompt = f"{self.prompt}\n(提示：当前对话已超过10轮，建议使用 !<<SUMMARIZE>>! 指令总结对话历史，避免token超限)"
+                    # 如果对话历史长度超过限制，在提示中添加提醒
+                    if self.conversation_length > self.max_context_length:
+                        self.prompt = f"{self.prompt}\n(提示：当前对话历史长度已超过{self.max_context_length}字符，建议使用 !<<SUMMARIZE>>! 指令总结对话历史，避免token超限)"
                     
                     current_response = self._call_model(self.prompt)
+                    self.conversation_length += len(current_response)  # 添加响应长度
                     
                     # 检查是否需要总结对话历史
                     if "!<<SUMMARIZE>>!" in current_response:
@@ -463,6 +463,7 @@ arguments:
         """清除对话历史，只保留系统提示"""
         self.prompt = "" 
         self.model.reset()
-        self.conversation_turns = 0  # 重置对话轮次
+        self.conversation_length = 0  # 重置对话长度
+
 
 

jarvis/jarvis_codebase/main.py

@@ -19,22 +19,6 @@ class CodeBase:
         self.root_dir = root_dir
         os.chdir(self.root_dir)
         self.thread_count = int(os.environ.get("JARVIS_THREAD_COUNT") or 10)
-        self.cheap_platform = os.environ.get("JARVIS_CHEAP_PLATFORM") or os.environ.get("JARVIS_PLATFORM") or "kimi"
-        self.cheap_model = os.environ.get("JARVIS_CHEAP_MODEL") or os.environ.get("JARVIS_MODEL") or "kimi"
-        self.normal_platform = os.environ.get("JARVIS_PLATFORM") or "kimi"
-        self.codegen_platform = os.environ.get("JARVIS_CODEGEN_PLATFORM") or os.environ.get("JARVIS_PLATFORM") or "kimi"
-        self.codegen_model = os.environ.get("JARVIS_CODEGEN_MODEL") or os.environ.get("JARVIS_MODEL") or "kimi"
-        self.normal_model = os.environ.get("JARVIS_MODEL") or "kimi"
-        self.embedding_model_name = os.environ.get("JARVIS_EMBEDDING_MODEL") or "BAAI/bge-large-zh-v1.5"
-        if not self.cheap_platform or not self.cheap_model or not self.codegen_platform or not self.codegen_model or not self.embedding_model_name or not self.normal_platform or not self.normal_model:
-            raise ValueError("JARVIS_CHEAP_PLATFORM or JARVIS_CHEAP_MODEL or JARVIS_CODEGEN_PLATFORM or JARVIS_CODEGEN_MODEL or JARVIS_EMBEDDING_MODEL or JARVIS_PLATFORM or JARVIS_MODEL is not set")
-        
-        PrettyOutput.print(f"廉价模型使用平台: {self.cheap_platform} 模型: {self.cheap_model}", output_type=OutputType.INFO)
-        PrettyOutput.print(f"代码生成模型使用平台: {self.codegen_platform} 模型: {self.codegen_model}", output_type=OutputType.INFO)
-        PrettyOutput.print(f"分析模型使用平台: {self.normal_platform} 模型: {self.normal_model}", output_type=OutputType.INFO)
-        PrettyOutput.print(f"嵌入模型: {self.embedding_model_name}", output_type=OutputType.INFO)
-        PrettyOutput.print(f"索引建立线程数: {self.thread_count}", output_type=OutputType.INFO)
-        PrettyOutput.print(f"检索算法：分层导航小世界算法", output_type=OutputType.INFO)
             
         # 初始化数据目录
         self.data_dir = os.path.join(self.root_dir, ".jarvis-codebase")
@@ -43,7 +27,7 @@ class CodeBase:
             
         # 初始化嵌入模型，使用系统默认缓存目录
         try:
-            self.embedding_model = load_embedding_model(self.embedding_model_name)
+            self.embedding_model = load_embedding_model()
             
             # 强制完全加载所有模型组件
             test_text = """
@@ -62,7 +46,7 @@ class CodeBase:
         self.vector_dim = self.embedding_model.get_sentence_embedding_dimension()
 
         self.git_file_list = self.get_git_file_list()
-        self.platform_registry = PlatformRegistry().get_global_platform_registry()
+        self.platform_registry = PlatformRegistry.get_global_platform_registry()
         
         # 初始化缓存和索引
         self.cache_path = os.path.join(self.data_dir, "cache.pkl")
@@ -102,8 +86,7 @@ class CodeBase:
                 return False
 
     def make_description(self, file_path: str) -> str:
-        model = self.platform_registry.create_platform(self.cheap_platform)
-        model.set_model_name(self.cheap_model)
+        model = PlatformRegistry.get_global_platform_registry().get_codegen_platform()
         model.set_suppress_output(True)
         content = open(file_path, "r", encoding="utf-8").read()
         prompt = f"""请分析以下代码文件，并生成一个详细的描述。描述应该包含以下要点：
@@ -411,8 +394,7 @@ class CodeBase:
         if not initial_results:
             return []
 
-        model = self.platform_registry.create_platform(self.normal_platform)
-        model.set_model_name(self.normal_model)
+        model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
         model.set_suppress_output(True)
 
         try:
@@ -470,8 +452,7 @@ class CodeBase:
 
     def search_similar(self, query: str, top_k: int = 20) -> List[Tuple[str, float, str]]:
         """搜索相似文件"""
-        model = self.platform_registry.create_platform(self.normal_platform)
-        model.set_model_name(self.normal_model)
+        model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
         model.set_suppress_output(True)
         
         try:
@@ -554,8 +535,7 @@ class CodeBase:
 
 请用专业的语言回答用户的问题，如果给出的文件内容不足以回答用户的问题，请告诉用户，绝对不要胡编乱造。
 """
-        model = self.platform_registry.create_platform(self.codegen_platform)
-        model.set_model_name(self.codegen_model)
+        model = PlatformRegistry.get_global_platform_registry().get_codegen_platform()
         try:
             response = model.chat(prompt)
             return response

jarvis/jarvis_coder/main.py

@@ -21,13 +21,7 @@ index_lock = threading.Lock()
 class JarvisCoder:
     def __init__(self, root_dir: str, language: str):
         """初始化代码修改工具"""
-        
-        self.platform = os.environ.get("JARVIS_CODEGEN_PLATFORM") or os.environ.get("JARVIS_PLATFORM")
-        self.model = os.environ.get("JARVIS_CODEGEN_MODEL") or os.environ.get("JARVIS_MODEL")
-
 
-        if not self.platform or not self.model:
-            raise ValueError("JARVIS_CODEGEN_PLATFORM or JARVIS_CODEGEN_MODEL is not set")
 
         self.root_dir = find_git_root(root_dir)
         if not self.root_dir:
@@ -486,8 +480,6 @@ def main():
     load_env_from_file()
     
     parser = argparse.ArgumentParser(description='代码修改工具')
-    parser.add_argument('-p', '--platform', help='AI平台名称', default=os.environ.get('JARVIS_CODEGEN_PLATFORM'))
-    parser.add_argument('-m', '--model', help='模型名称', default=os.environ.get('JARVIS_CODEGEN_MODEL'))
     parser.add_argument('-d', '--dir', help='项目根目录', default=os.getcwd())
     parser.add_argument('-l', '--language', help='编程语言', default="python")
     args = parser.parse_args()
@@ -495,9 +487,6 @@ def main():
     # 设置平台
     if not args.platform:
         print("错误: 未指定AI平台，请使用 -p 参数")
-    # 设置模型
-    if args.model:
-        os.environ['JARVIS_CODEGEN_MODEL'] = args.model
         
     tool = JarvisCoder(args.dir, args.language)
     

jarvis/main.py

@@ -104,31 +104,16 @@ def main():
     parser = argparse.ArgumentParser(description='Jarvis AI 助手')
     parser.add_argument('-f', '--files', nargs='*', help='要处理的文件列表')
     parser.add_argument('--keep-history', action='store_true', help='保持聊天历史(不删除会话)')
-    parser.add_argument('-p', '--platform', default=os.getenv('JARVIS_PLATFORM') or 'kimi', help='选择AI平台')
-    parser.add_argument('-m', '--model', default=os.getenv('JARVIS_MODEL') or '', help='模型')  # 用于指定使用的模型名称，默认使用环境变量或平台默认模型
     args = parser.parse_args()
 
-    platform = args.platform if args.platform else os.getenv('JARVIS_PLATFORM')
-
-    if not platform:
-        PrettyOutput.print("未指定AI平台，请使用 -p 参数或者设置 JARVIS_PLATFORM 环境变量", OutputType.ERROR)
-        return 1
-    
-    PlatformRegistry.get_global_platform_registry().set_global_platform_name(platform)
-
-    if args.model:
-        os.environ["JARVIS_MODEL"] = args.model
-
     try:
         # 获取全局模型实例
         agent = Agent()
 
         # 如果用户传入了模型参数，则更换当前模型为用户指定的模型
-        if args.model:
-            agent.model.set_model_name(args.model)
 
         # 欢迎信息
-        PrettyOutput.print(f"Jarvis 已初始化 - With {platform} 平台，模型: {agent.model.name()}", OutputType.SYSTEM)
+        PrettyOutput.print(f"Jarvis 已初始化 - With {agent.model.name()}", OutputType.SYSTEM)
         if args.keep_history:
             PrettyOutput.print("已启用历史保留模式", OutputType.INFO)
         

jarvis/models/registry.py

@@ -152,14 +152,26 @@ class PlatformRegistry:
         """
         self.platforms: Dict[str, Type[BasePlatform]] = {}
 
-    @staticmethod
-    def get_global_platform() -> BasePlatform:
-        """获取全局平台实例"""
-        platform = PlatformRegistry.get_global_platform_registry().create_platform(PlatformRegistry.global_platform_name)
-        if not platform:
-            raise Exception(f"Failed to create platform: {PlatformRegistry.global_platform_name}")
+    def get_normal_platform(self) -> BasePlatform:
+        platform_name = os.environ.get("JARVIS_PLATFORM", "kimi")
+        model_name = os.environ.get("JARVIS_MODEL", "kimi")
+        platform = self.create_platform(platform_name)
+        platform.set_model_name(model_name)
+        return platform
+    
+    def get_codegen_platform(self) -> BasePlatform:
+        platform_name = os.environ.get("JARVIS_CODEGEN_PLATFORM", os.environ.get("JARVIS_PLATFORM", "kimi"))
+        model_name = os.environ.get("JARVIS_CODEGEN_MODEL", os.environ.get("JARVIS_MODEL", "kimi"))
+        platform = self.create_platform(platform_name)
+        platform.set_model_name(model_name)
+        return platform
+    
+    def get_cheap_platform(self) -> BasePlatform:
+        platform_name = os.environ.get("JARVIS_CHEAP_PLATFORM", os.environ.get("JARVIS_PLATFORM", "kimi"))
+        model_name = os.environ.get("JARVIS_CHEAP_MODEL", os.environ.get("JARVIS_MODEL", "kimi"))
+        platform = self.create_platform(platform_name)
+        platform.set_model_name(model_name)
         return platform
-        
 
     def register_platform(self, name: str, platform_class: Type[BasePlatform]):
         """注册平台类
@@ -195,10 +207,3 @@ class PlatformRegistry:
         """获取可用平台列表"""
         return list(self.platforms.keys()) 
     
-    def set_global_platform_name(self, platform_name: str):
-        """设置全局平台"""
-        PlatformRegistry.global_platform_name = platform_name
-
-    def get_global_platform_name(self) -> str:
-        """获取全局平台名称"""
-        return PlatformRegistry.global_platform_name

jarvis/rag/main.py

@@ -13,6 +13,7 @@ from tqdm import tqdm
 import fitz  # PyMuPDF for PDF files
 from docx import Document as DocxDocument  # python-docx for DOCX files
 from pathlib import Path
+from jarvis.models.registry import PlatformRegistry
 
 @dataclass
 class Document:
@@ -140,7 +141,6 @@ class RAGTool:
         # 初始化配置
         self.min_paragraph_length = int(os.environ.get("JARVIS_MIN_PARAGRAPH_LENGTH", "50"))  # 最小段落长度
         self.max_paragraph_length = int(os.environ.get("JARVIS_MAX_PARAGRAPH_LENGTH", "1000"))  # 最大段落长度
-        self.embedding_model_name = os.environ.get("JARVIS_EMBEDDING_MODEL", "BAAI/bge-large-zh-v1.5")
         
         # 初始化数据目录
         self.data_dir = os.path.join(self.root_dir, ".jarvis-rag")
@@ -149,7 +149,7 @@ class RAGTool:
             
         # 初始化嵌入模型
         try:
-            self.embedding_model = load_embedding_model(self.embedding_model_name)
+            self.embedding_model = load_embedding_model()
             self.vector_dim = self.embedding_model.get_sentence_embedding_dimension()
             PrettyOutput.print("模型加载完成", output_type=OutputType.SUCCESS)
         except Exception as e:
@@ -363,17 +363,17 @@ class RAGTool:
                             output_type=OutputType.ERROR)
             return []
 
-    def build_index(self):
+    def build_index(self, dir: str):
         """构建文档索引"""
         # 获取所有文件
         all_files = []
-        for root, _, files in os.walk(self.root_dir):
+        for root, _, files in os.walk(dir):
             if any(ignored in root for ignored in ['.jarvis-rag', '.git', '__pycache__', 'node_modules']):
                 continue
             for file in files:
                 file_path = os.path.join(root, file)
                 # 跳过大文件
-                if os.path.getsize(file_path) > 10 * 1024 * 1024:  # 10MB
+                if os.path.getsize(file_path) > 100 * 1024 * 1024:  # 100MB
                     PrettyOutput.print(f"跳过大文件: {file_path}", 
                                     output_type=OutputType.WARNING)
                     continue
@@ -412,7 +412,8 @@ class RAGTool:
             文档和相似度得分的列表
         """
         if not self.index:
-            raise ValueError("索引未构建，请先调用build_index()")
+            PrettyOutput.print("索引未构建，正在构建...", output_type=OutputType.INFO)
+            self.build_index(self.root_dir)
             
         # 获取查询的向量表示
         query_vector = self._get_embedding(query)
@@ -431,8 +432,73 @@ class RAGTool:
                 
         return results
 
+    def is_index_built(self):
+        """检查索引是否已构建"""
+        return self.index is not None
+
+    def query(self, query: str) -> List[Document]:
+        """查询相关文档
+        
+        Args:
+            query: 查询文本
+            
+        Returns:
+            相关文档列表
+        """
+        if not self.is_index_built():
+            raise ValueError("索引未构建，请先调用build_index()")
+            
+        results = self.search(query)
+        return [doc for doc, _ in results]
+
+    def ask(self, question: str) -> Optional[str]:
+        """询问关于文档的问题
+        
+        Args:
+            question: 用户问题
+            
+        Returns:
+            模型回答，如果失败则返回 None
+        """
+        try:
+            # 搜索相关文档片段
+            results = self.query(question)
+            if not results:
+                return None
+
+            # 构建上下文
+            context = []
+            for doc in results:
+                context.append(f"""
+来源文件: {doc.metadata['file_path']}
+片段位置: {doc.metadata['chunk_index'] + 1}/{doc.metadata['total_chunks']}
+内容:
+{doc.content}
+---
+""")
+
+            # 构建提示词
+            prompt = f"""请基于以下文档片段回答用户的问题。如果文档片段中的信息不足以完整回答问题，请明确指出。
+            
+用户问题: {question}
+
+相关文档片段:
+{''.join(context)}
+
+请提供准确、简洁的回答，并在适当时引用具体的文档来源。
+"""
+            # 获取模型实例并生成回答
+            model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
+            response = model.chat(prompt)
+            
+            return response
+            
+        except Exception as e:
+            PrettyOutput.print(f"问答失败: {str(e)}", output_type=OutputType.ERROR)
+            return None
+
 def main():
-    """命令行入口"""
+    """主函数"""
     import argparse
     import sys
     
@@ -442,39 +508,57 @@ def main():
         sys.stdout = codecs.getwriter('utf-8')(sys.stdout.buffer, 'strict')
         sys.stderr = codecs.getwriter('utf-8')(sys.stderr.buffer, 'strict')
     
-    parser = argparse.ArgumentParser(description='RAG工具')
-    parser.add_argument('--dir', type=str, default=os.getcwd(), help='项目根目录')
-    parser.add_argument('--build', action='store_true', help='构建索引')
-    parser.add_argument('--query', type=str, help='搜索查询')
-    parser.add_argument('--top-k', type=int, default=5, help='返回结果数量')
-    
+    parser = argparse.ArgumentParser(description='文档检索和分析工具')
+    parser.add_argument('--dir', type=str, help='要处理的文档目录')
+    parser.add_argument('--build', action='store_true', help='构建文档索引')
+    parser.add_argument('--search', type=str, help='搜索文档内容')
+    parser.add_argument('--ask', type=str, help='询问关于文档的问题')
     args = parser.parse_args()
-    
+
     try:
-        rag = RAGTool(args.dir)
-        
-        if args.build:
-            rag.build_index()
-            
-        if args.query:
-            results = rag.search(args.query, args.top_k)
-            
-            if not results:
-                PrettyOutput.print("未找到相关内容", output_type=OutputType.WARNING)
-                return
-                
-            PrettyOutput.print("\n搜索结果:", output_type=OutputType.INFO)
-            for doc, score in results:
-                PrettyOutput.print("\n" + "="*50, output_type=OutputType.INFO)
-                PrettyOutput.print(f"文件: {doc.metadata['file_path']}", output_type=OutputType.INFO)
-                PrettyOutput.print(f"相似度: {score:.3f}", output_type=OutputType.INFO)
-                PrettyOutput.print(f"片段 {doc.metadata['chunk_index'] + 1}/{doc.metadata['total_chunks']}", 
-                                output_type=OutputType.INFO)
-                PrettyOutput.print("\n内容:", output_type=OutputType.INFO)
-                # 确保内容是UTF-8编码
-                content = doc.content.encode('utf-8', errors='replace').decode('utf-8')
-                PrettyOutput.print(content, output_type=OutputType.INFO)
-                
+        current_dir = find_git_root()
+        rag = RAGTool(current_dir)
+
+        if args.dir and args.build:
+            PrettyOutput.print(f"正在处理目录: {args.dir}", output_type=OutputType.INFO)
+            rag.build_index(args.dir)
+            return 0
+
+        if args.search or args.ask:
+            if not rag.is_index_built():
+                PrettyOutput.print("索引尚未构建，请先使用 --dir 和 --build 参数构建索引", output_type=OutputType.WARNING)
+                return 1
+
+            if args.search:
+                results = rag.query(args.search)
+                if not results:
+                    PrettyOutput.print("未找到相关内容", output_type=OutputType.WARNING)
+                    return 1
+                    
+                for doc in results:
+                    PrettyOutput.print(f"\n文件: {doc.metadata['file_path']}", output_type=OutputType.INFO)
+                    PrettyOutput.print(f"片段 {doc.metadata['chunk_index'] + 1}/{doc.metadata['total_chunks']}", 
+                                    output_type=OutputType.INFO)
+                    PrettyOutput.print("\n内容:", output_type=OutputType.INFO)
+                    content = doc.content.encode('utf-8', errors='replace').decode('utf-8')
+                    PrettyOutput.print(content, output_type=OutputType.INFO)
+                return 0
+
+            if args.ask:
+                # 调用 ask 方法
+                response = rag.ask(args.ask)
+                if not response:
+                    PrettyOutput.print("未能获取答案", output_type=OutputType.WARNING)
+                    return 1
+                    
+                # 显示回答
+                PrettyOutput.print("\n回答:", output_type=OutputType.INFO)
+                PrettyOutput.print(response, output_type=OutputType.INFO)
+                return 0
+
+        PrettyOutput.print("请指定操作参数。使用 -h 查看帮助。", output_type=OutputType.WARNING)
+        return 1
+
     except Exception as e:
         PrettyOutput.print(f"执行失败: {str(e)}", output_type=OutputType.ERROR)
         return 1

jarvis/tools/ask_user.py

@@ -0,0 +1,67 @@
+from typing import Dict, Any
+from jarvis.tools.base import Tool
+from jarvis.utils import get_multiline_input, PrettyOutput, OutputType
+
+class AskUserTool(Tool):
+    def __init__(self):
+        super().__init__(
+            name="ask_user",
+            description="""当缺少完成任务的信息或有关键决策信息缺失时，询问用户。
+用户可以输入多行文本，空行结束输入。
+
+使用场景：
+1. 需要用户提供更多信息来完成任务
+2. 需要用户做出关键决策
+3. 需要用户确认某些重要操作
+4. 需要用户提供额外信息
+
+参数说明：
+- question: 要询问用户的问题，应该清晰明确""",
+            parameters={
+                "type": "object",
+                "properties": {
+                    "question": {
+                        "type": "string",
+                        "description": "要询问用户的问题"
+                    }
+                },
+                "required": ["question"]
+            }
+        )
+
+    def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
+        """执行询问用户操作
+        
+        Args:
+            args: 包含问题的字典
+            
+        Returns:
+            Dict: 包含用户响应的字典
+        """
+        try:
+            question = args["question"]
+            
+            # 显示问题
+            PrettyOutput.print("\n问题:", OutputType.QUESTION)
+            PrettyOutput.print(question, OutputType.QUESTION)
+            
+            # 获取用户输入
+            PrettyOutput.print("\n请输入您的回答（输入空行结束）:", OutputType.INPUT)
+            user_response = get_multiline_input()
+            
+            if user_response == "__interrupt__":
+                return {
+                    "success": False,
+                    "error": "用户取消了输入"
+                }
+            
+            return {
+                "success": True,
+                "stdout": user_response
+            }
+            
+        except Exception as e:
+            return {
+                "success": False,
+                "error": f"询问用户失败: {str(e)}"
+            } 

jarvis/tools/chdir.py

@@ -0,0 +1,89 @@
+from typing import Dict, Any
+import os
+from jarvis.utils import PrettyOutput, OutputType
+
+class ChdirTool:
+    """修改当前工作目录的工具"""
+    
+    name = "chdir"
+    description = "修改当前工作目录"
+    parameters = {
+        "type": "object",
+        "properties": {
+            "path": {
+                "type": "string",
+                "description": "要切换到的目录路径，支持相对路径和绝对路径"
+            }
+        },
+        "required": ["path"]
+    }
+    
+    def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
+        """执行目录切换
+        
+        Args:
+            args: 包含 path 参数的字典
+            
+        Returns:
+            执行结果字典，包含:
+            - success: 是否成功
+            - stdout: 成功时的输出信息
+            - error: 失败时的错误信息
+        """
+        try:
+            path = os.path.expanduser(args["path"])  # 展开 ~ 等路径
+            path = os.path.abspath(path)  # 转换为绝对路径
+            
+            # 检查目录是否存在
+            if not os.path.exists(path):
+                return {
+                    "success": False,
+                    "error": f"目录不存在: {path}"
+                }
+                
+            # 检查是否是目录
+            if not os.path.isdir(path):
+                return {
+                    "success": False,
+                    "error": f"路径不是目录: {path}"
+                }
+                
+            # 尝试切换目录
+            old_path = os.getcwd()
+            os.chdir(path)
+            
+            return {
+                "success": True,
+                "stdout": f"已切换工作目录:\n从: {old_path}\n到: {path}",
+                "stderr": ""
+            }
+            
+        except PermissionError:
+            return {
+                "success": False,
+                "error": f"没有权限访问目录: {path}"
+            }
+        except Exception as e:
+            return {
+                "success": False,
+                "error": f"切换目录失败: {str(e)}"
+            }
+            
+def main():
+    """命令行直接运行工具"""
+    import argparse
+    
+    parser = argparse.ArgumentParser(description='修改当前工作目录')
+    parser.add_argument('path', help='要切换到的目录路径')
+    args = parser.parse_args()
+    
+    tool = ChdirTool()
+    result = tool.execute({"path": args.path})
+    
+    if result["success"]:
+        PrettyOutput.print(result["stdout"], OutputType.SUCCESS)
+    else:
+        PrettyOutput.print(result["error"], OutputType.ERROR)
+        
+if __name__ == "__main__":
+    main() 

jarvis/tools/generator.py

@@ -42,11 +42,7 @@ class ToolGeneratorTool:
 
     def _generate_tool_code(self, tool_name: str, class_name: str, description: str, parameters: Dict) -> str:
         """使用大模型生成工具代码"""
-        platform_name = os.getenv("JARVIS_CODEGEN_PLATFORM") or PlatformRegistry.get_global_platform_name()
-        model = PlatformRegistry.create_platform(platform_name)
-        model_name = os.getenv("JARVIS_CODEGEN_MODEL")
-        if model_name:
-            model.set_model_name(model_name)
+        model = PlatformRegistry.get_global_platform_registry().get_codegen_platform()
 
         prompt = f"""请生成一个Python工具类的代码，要求如下，除了代码，不要输出任何内容：
 

jarvis/tools/registry.py

@@ -1,6 +1,6 @@
-
 import importlib
 import json
+import os
 from pathlib import Path
 import sys
 from typing import Any, Callable, Dict, List, Optional
@@ -19,6 +19,7 @@ class ToolRegistry:
         # 加载内置工具和外部工具
         self._load_builtin_tools()
         self._load_external_tools()
+        self.max_context_length = int(os.getenv('JARVIS_MAX_CONTEXT_LENGTH', '30720'))  # 默认30k
 
     @staticmethod
     def get_global_tool_registry():
@@ -173,12 +174,51 @@ class ToolRegistry:
                 output = "\n\n".join(output_parts)
                 output = "没有输出和错误" if not output else output
                 PrettyOutput.section("执行成功", OutputType.SUCCESS)
+                
+                # 如果输出超过4k字符，使用大模型总结
+                if len(output) > 4096:
+                    try:
+                        PrettyOutput.print("输出较长，正在总结...", OutputType.PROGRESS)
+                        model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
+                        
+                        # 如果输出超过30k，只取最后30k字符
+                        if len(output) > self.max_context_length:
+                            output_to_summarize = output[-self.max_context_length:]
+                            truncation_notice = "\n(注意: 由于输出过长，仅总结最后30720字符)"
+                        else:
+                            output_to_summarize = output
+                            truncation_notice = ""
+
+                        prompt = f"""请总结以下工具执行结果，提取关键信息和重要结果。注意：
+1. 保留所有重要的数值、路径、错误信息等关键数据
+2. 保持结果的准确性
+3. 用简洁的语言描述主要内容
+4. 如果有错误信息，确保包含在总结中
+
+工具名称: {name}
+执行结果:
+{output_to_summarize}
+
+请提供总结："""
+
+                        summary = model.chat(prompt)
+                        output = f"""--- 原始输出较长，以下是总结 ---{truncation_notice}
+
+{summary}
+
+--- 总结结束 ---"""
+                        
+                    except Exception as e:
+                        PrettyOutput.print(f"总结失败: {str(e)}", OutputType.WARNING)
+                        output = f"输出较长 ({len(output)} 字符)，建议查看原始输出。\n前300字符预览:\n{output[:300]}..."
+            
             else:
                 error_msg = result["error"]
                 output = f"执行失败: {error_msg}"
                 PrettyOutput.section("执行失败", OutputType.ERROR)
                 
             return output
+            
         except Exception as e:
             PrettyOutput.print(f"执行工具失败: {str(e)}", OutputType.ERROR)
             return f"Tool call failed: {str(e)}"

jarvis/tools/search.py

@@ -86,7 +86,7 @@ class SearchTool:
 
     def __init__(self):
         """初始化搜索工具，需要传入语言模型用于信息提取"""
-        self.model = PlatformRegistry.get_global_platform_registry().get_global_platform()
+        self.model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
         self.webpage_tool = WebpageTool()
 
     def _search(self, query: str, max_results: int) -> List[Dict]:

jarvis/utils.py

@@ -209,8 +209,9 @@ def find_git_root(dir="."):
     os.chdir(curr_dir)
     return ret
 
-def load_embedding_model(model_name: str):
+def load_embedding_model():
     os.environ["TOKENIZERS_PARALLELISM"] = "false"
+    model_name = os.environ.get("JARVIS_EMBEDDING_MODEL", "BAAI/bge-large-zh-v1.5")
     PrettyOutput.print(f"正在加载嵌入模型: {model_name}...", OutputType.INFO)
     try:
         # 首先尝试离线加载
@@ -230,4 +231,5 @@ def load_embedding_model(model_name: str):
             cache_folder=os.path.expanduser("~/.cache/huggingface/hub")
         )
         PrettyOutput.print("模型下载并加载成功", OutputType.SUCCESS)
+    
     return embedding_model

{jarvis_ai_assistant-0.1.77.dist-info → jarvis_ai_assistant-0.1.79.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.77
+Version: 0.1.79
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire

{jarvis_ai_assistant-0.1.77.dist-info → jarvis_ai_assistant-0.1.79.dist-info}/RECORD

@@ -1,35 +1,37 @@
-jarvis/__init__.py,sha256=WZAfXLVIclhkO-zAnoGnZ9Gc0F0C_LUd0MwIpGBFrdw,50
-jarvis/agent.py,sha256=lUYH9wijs4wwbXMxqZBtOkEfL0jHLv9rw82r9EjPpXs,19743
-jarvis/main.py,sha256=7EcSlxa5JFFXBujzKDWdNtwX6axLhFFdJMc2GxTjfdk,6295
-jarvis/utils.py,sha256=TKKO7vbWLJ80n3JqL30HpbW-GuFfJTgR0GqBrsPPiwk,8566
+jarvis/__init__.py,sha256=yQPvXJ5FcieZn0Nq0nfH3oQgif5UqP0crtfwedPm4v8,50
+jarvis/agent.py,sha256=zFhEZDCly5JlezHOhWcwdE8WpYQ3fkyuqXv5Qq5wuDE,20032
+jarvis/main.py,sha256=OJc7e5i988eQLByT7SzX7eoa0HKm4LMg814gZv9hBX8,5487
+jarvis/utils.py,sha256=jvo6ylvrTaSmXWcYY0qTTf14TwCkAhPsCUuIl5WHEuw,8640
 jarvis/jarvis_codebase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_codebase/main.py,sha256=aGhfH9JTW-CX97OJErzxztJGhL_CH6lXeabfwZxHHxQ,26807
+jarvis/jarvis_codebase/main.py,sha256=DPMPw8qoKHooydELKwf_bXPa0a3459kdFcZOXdrM-N8,24785
 jarvis/jarvis_coder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_coder/main.py,sha256=4YhQ20MD8ntdD5hjmjJbBHYEDPDZ2aPIgAviJCvtOXE,24458
+jarvis/jarvis_coder/main.py,sha256=Hr6T5LHC5n08s9tnOt-2_h8TmzothBUhqcd2-fzwuVI,23790
 jarvis/models/__init__.py,sha256=mrOt67nselz_H1gX9wdAO4y2DY5WPXzABqJbr5Des8k,63
 jarvis/models/ai8.py,sha256=vgy-r_3HHxGMAalZrA65VWHC1PuwBTYgtprSgHkCbrk,12557
 jarvis/models/base.py,sha256=ShV1H8Unee4RMaiFO4idROQA0Hc6wu4dyeRPX5fcszk,1433
 jarvis/models/kimi.py,sha256=1iTB0Z_WOmCML3Ufsge6jmeKOYvccr7I5lS3JUXymU4,17611
 jarvis/models/openai.py,sha256=ayaBWAN5VexMcKVrjEPDNB-Q9wx0sCV9Z4BCrvwYJ9w,4315
 jarvis/models/oyi.py,sha256=X2c5SWDIuQDCCFBcEKbzIWEz3I34eOAi0d1XAFgxlpw,15001
-jarvis/models/registry.py,sha256=YpooKSpk5pSWfb5cBDz5wRfPK-abb9uuUZr4WBejqwI,7762
+jarvis/models/registry.py,sha256=Ez3MNCYIlvPxRS5rJrgV7b8BkXtaZ75bCkemPr3L9nw,8156
 jarvis/rag/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/rag/main.py,sha256=sgtOzmqi9cO9DcCenSXSad5Xr7MI0U7Ji2GtQL-YaO4,18161
+jarvis/rag/main.py,sha256=drCH9KmwQozxtPICIfTFXmkIhwN8WDreMOCTxtj9SPc,20842
 jarvis/tools/__init__.py,sha256=7Rqyj5hBAv5cWDVr5T9ZTZASO7ssBHeQNm2_4ZARdkA,72
+jarvis/tools/ask_user.py,sha256=xLXkYK3_f8EJ7kudA8MumOOCxyFl6z3DBS_zcscMH6Y,2151
 jarvis/tools/base.py,sha256=EGRGbdfbLXDLwtyoWdvp9rlxNX7bzc20t0Vc2VkwIEY,652
+jarvis/tools/chdir.py,sha256=TjfPbX8yvNKgUNJEMXh3ZlVDEIse_Fo8xMoVsiK7_dA,2688
 jarvis/tools/codebase_qa.py,sha256=LsowsgL7HBmdBwa7zXcYi_OkwOok4qbnzYWYsuZxHtU,2413
 jarvis/tools/coder.py,sha256=kmotT2Klsug44S51QoSW9DzkxLzcF-XonyYAEoWZV6c,2295
 jarvis/tools/file_ops.py,sha256=h8g0eT9UvlJf4kt0DLXvdSsjcPj7x19lxWdDApeDfpg,3842
-jarvis/tools/generator.py,sha256=vVP3eN5cCDpRXf_fn0skETkPXAW1XZFWx9pt2_ahK48,5999
+jarvis/tools/generator.py,sha256=S1DhHBfhNvF6SrORnlk8Mz210yDiJPuxbfswbX_UACs,5791
 jarvis/tools/methodology.py,sha256=UG6s5VYRcd9wrKX4cg6f7zJhet5AIcthFGMOAdevBiw,5175
-jarvis/tools/registry.py,sha256=MeTYNdZNRdhlgABviVxzbDPSgLpwDp2Nx2dGzedRu8U,7212
-jarvis/tools/search.py,sha256=3FX5oAkPiKD4Bvu8gBpKLQveOgl_K5jkvxRvkRPoH3M,8787
+jarvis/tools/registry.py,sha256=XhFufp57hJZkRj6MUC5m-q4WEHFp8hzGmW2zFIzk12w,9074
+jarvis/tools/search.py,sha256=c9dXtyICdl8Lm8shNPNyIx9k67uY0rMF8xnIKu2RsnE,8787
 jarvis/tools/shell.py,sha256=UPKshPyOaUwTngresUw-ot1jHjQIb4wCY5nkJqa38lU,2520
 jarvis/tools/sub_agent.py,sha256=rEtAmSVY2ZjFOZEKr5m5wpACOQIiM9Zr_3dT92FhXYU,2621
 jarvis/tools/webpage.py,sha256=d3w3Jcjcu1ESciezTkz3n3Zf-rp_l91PrVoDEZnckOo,2391
-jarvis_ai_assistant-0.1.77.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.77.dist-info/METADATA,sha256=Fo61TgkIMKSfekG4kV5RR_kfMDAgEpl5D2_2jl8geqU,12736
-jarvis_ai_assistant-0.1.77.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.77.dist-info/entry_points.txt,sha256=iEvZ0rn-muMxWCNH5QEvw_mTTy_EVhyQyxDxWXqQQVo,174
-jarvis_ai_assistant-0.1.77.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.77.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.79.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.79.dist-info/METADATA,sha256=rDiEYIVxK5o0hf9DBaTNURWMzrGyBOTlbXhu33S4Z-g,12736
+jarvis_ai_assistant-0.1.79.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.79.dist-info/entry_points.txt,sha256=iEvZ0rn-muMxWCNH5QEvw_mTTy_EVhyQyxDxWXqQQVo,174
+jarvis_ai_assistant-0.1.79.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.79.dist-info/RECORD,,