jarvis-ai-assistant 0.1.78__tar.gz → 0.1.79__tar.gz

{jarvis_ai_assistant-0.1.78/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.79}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.78
+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.78 → jarvis_ai_assistant-0.1.79}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.78"
+version = "0.1.79"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "Your Name", email = "your.email@example.com" }]

{jarvis_ai_assistant-0.1.78 → jarvis_ai_assistant-0.1.79}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.78",
+    version="0.1.79",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.1.78 → jarvis_ai_assistant-0.1.79}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.1.78 → jarvis_ai_assistant-0.1.79}/src/jarvis/agent.py

@@ -29,10 +29,11 @@ class Agent:
         self.name = name
         self.is_sub_agent = is_sub_agent
         self.prompt = ""
-        self.conversation_turns = 0  
+        self.conversation_length = 0  # 改用长度计数器
         
-        # 从环境变量加载嵌入模型配置
+        # 从环境变量加载配置
         self.embedding_dimension = 1536  # Default for many embedding models
+        self.max_context_length = int(os.getenv('JARVIS_MAX_CONTEXT_LENGTH', '30720'))  # 默认30k
         
         # 初始化嵌入模型
         try:
@@ -222,6 +223,7 @@ class Agent:
             
             # 清空当前对话历史，但保留系统消息
             self.model.delete_chat()
+            self.conversation_length = 0  # 重置对话长度
             
             # 添加总结作为新的上下文
             self.prompt = f"""以下是之前对话的关键信息总结：
@@ -230,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)
@@ -318,6 +318,7 @@ class Agent:
             tools_prompt = ""
 
             # 选择工具
+            PrettyOutput.section("选择工具", OutputType.PLANNING)
             tools = self.tool_registry.get_all_tools()
             if tools:
                 tools_prompt += "可用工具:\n"
@@ -330,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 助手。
                                           
@@ -400,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:
@@ -462,6 +463,7 @@ arguments:
         """清除对话历史，只保留系统提示"""
         self.prompt = "" 
         self.model.reset()
-        self.conversation_turns = 0  # 重置对话轮次
+        self.conversation_length = 0  # 重置对话长度
+
 
 

{jarvis_ai_assistant-0.1.78 → jarvis_ai_assistant-0.1.79}/src/jarvis/rag/main.py

@@ -373,7 +373,7 @@ class RAGTool:
             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)

jarvis_ai_assistant-0.1.79/src/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_ai_assistant-0.1.79/src/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_ai_assistant-0.1.78 → jarvis_ai_assistant-0.1.79}/src/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_ai_assistant-0.1.78 → jarvis_ai_assistant-0.1.79/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.78
+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.78 → jarvis_ai_assistant-0.1.79}/src/jarvis_ai_assistant.egg-info/SOURCES.txt

@@ -21,7 +21,9 @@ src/jarvis/models/registry.py
 src/jarvis/rag/__init__.py
 src/jarvis/rag/main.py
 src/jarvis/tools/__init__.py
+src/jarvis/tools/ask_user.py
 src/jarvis/tools/base.py
+src/jarvis/tools/chdir.py
 src/jarvis/tools/codebase_qa.py
 src/jarvis/tools/coder.py
 src/jarvis/tools/file_ops.py