jarvis-ai-assistant 0.1.83__py3-none-any.whl → 0.1.85__py3-none-any.whl

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.83" 
+__version__ = "0.1.85" 

jarvis/agent.py

@@ -266,8 +266,10 @@ class Agent:
                 
                 # 检查是否包含工具调用
                 try:
-                    result = Agent.extract_tool_calls(response)
-                    PrettyOutput.print(result, OutputType.RESULT)
+                    tool_calls = Agent.extract_tool_calls(response)
+                    if tool_calls:
+                        result = self.tool_registry.handle_tool_calls(tool_calls)
+                        PrettyOutput.print(result, OutputType.RESULT)
                 except Exception as e:
                     PrettyOutput.print(f"处理方法论生成失败: {str(e)}", OutputType.ERROR)
                 

jarvis/jarvis_codebase/main.py

@@ -76,7 +76,7 @@ class CodeBase:
         """获取 git 仓库中的文件列表，排除 .jarvis-codebase 目录"""
         files = os.popen("git ls-files").read().splitlines()
         # 过滤掉 .jarvis-codebase 目录下的文件
-        return [f for f in files if not f.startswith(".jarvis-codebase/")]
+        return [f for f in files if not f.startswith(".jarvis-")]
 
     def is_text_file(self, file_path: str):
         with open(file_path, "r", encoding="utf-8") as f:
@@ -86,10 +86,9 @@ class CodeBase:
             except UnicodeDecodeError:
                 return False
 
-    def make_description(self, file_path: str) -> str:
+    def make_description(self, file_path: str, content: str) -> str:
         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"""请分析以下代码文件，并生成一个详细的描述。描述应该包含以下要点：
 
 1. 主要功能和用途
@@ -237,14 +236,22 @@ class CodeBase:
             if not self.is_text_file(file_path):
                 return None
                 
-            md5 = hashlib.md5(open(file_path, "rb").read()).hexdigest()
+            # 读取文件内容，限制长度
+            with open(file_path, "r", encoding="utf-8") as f:
+                content = f.read()
+                if len(content) > self.max_context_length:
+                    PrettyOutput.print(f"文件 {file_path} 内容超出长度限制，将截取前 {self.max_context_length} 个字符", 
+                                     output_type=OutputType.WARNING)
+                    content = content[:self.max_context_length]
+            
+            md5 = hashlib.md5(content.encode('utf-8')).hexdigest()
             
             # 检查文件是否已经处理过且内容未变
             if file_path in self.vector_cache:
                 if self.vector_cache[file_path].get("md5") == md5:
                     return None
                     
-            description = self.make_description(file_path)
+            description = self.make_description(file_path, content)  # 传入截取后的内容
             vector = self.vectorize_file(file_path, description)
             
             # 保存到缓存，使用实际文件路径作为键

jarvis/jarvis_rag/main.py

@@ -370,9 +370,15 @@ class RAGTool:
         # 获取所有文件
         all_files = []
         for root, _, files in os.walk(dir):
-            if any(ignored in root for ignored in ['.jarvis-rag', '.git', '__pycache__', 'node_modules']):
+            # 忽略特定目录
+            if any(ignored in root for ignored in ['.git', '__pycache__', 'node_modules']) or \
+               any(part.startswith('.jarvis-') for part in root.split(os.sep)):
                 continue
             for file in files:
+                # 忽略 .jarvis- 开头的文件
+                if file.startswith('.jarvis-'):
+                    continue
+                    
                 file_path = os.path.join(root, file)
                 # 跳过大文件
                 if os.path.getsize(file_path) > 100 * 1024 * 1024:  # 100MB

{jarvis_ai_assistant-0.1.83.dist-info → jarvis_ai_assistant-0.1.85.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.83
+Version: 0.1.85
 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.83.dist-info → jarvis_ai_assistant-0.1.85.dist-info}/RECORD

@@ -1,13 +1,13 @@
-jarvis/__init__.py,sha256=S9oTgBnIxuAWrIt79cFytfBwF-uR1VoqSb-FgvZCcF0,50
-jarvis/agent.py,sha256=2g2fl9BFosi4YasIEUgutS1pX6AMTf2wit5V0bZILMU,18944
+jarvis/__init__.py,sha256=CSCMvkP7vytslNiqC8OQkG-M3_75PziRYYuzcVBVfp0,50
+jarvis/agent.py,sha256=LfWTMp7lyrMebby56up-58VuxK5JSnfq0cyJDWG7HBw,19069
 jarvis/main.py,sha256=ksZkJzqc4oow6wB-7QbGJLejGblrbZtRI3fdciS5DS4,5455
 jarvis/utils.py,sha256=jvo6ylvrTaSmXWcYY0qTTf14TwCkAhPsCUuIl5WHEuw,8640
 jarvis/jarvis_codebase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_codebase/main.py,sha256=rlcN44mm67c-ZlCtcsq52jmqWlf4wPxvc-_HbgmoXOk,24510
+jarvis/jarvis_codebase/main.py,sha256=tefwhPXVcUoV7ZIhF4AiIBsZ9sJRCkjI_i5lyusbZOI,24972
 jarvis/jarvis_coder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_coder/main.py,sha256=TxtFCzA5SJSorHtHX5_V3qQeJsoFMgVdrwxLJ9GnPw8,23619
 jarvis/jarvis_rag/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_rag/main.py,sha256=6G5rpcedxzALanGtXdhBxKR_uG4Sjiei8qolI-BuDp4,22682
+jarvis/jarvis_rag/main.py,sha256=pIZXnw7xl6yqdN0Lghu7WDwd-kyh36KTCAgOoSn95uk,22932
 jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_smart_shell/main.py,sha256=QgR1CZRcTVfC8a5hMso3onH3pFdDoniRjr0YQvY2jXQ,3809
 jarvis/models/__init__.py,sha256=mrOt67nselz_H1gX9wdAO4y2DY5WPXzABqJbr5Des8k,63
@@ -31,9 +31,9 @@ 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.83.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.83.dist-info/METADATA,sha256=7r6J3Z_AjmLRXsQjyIVtJ1F4DnmepO_ES8PLFIE_BLY,12736
-jarvis_ai_assistant-0.1.83.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.83.dist-info/entry_points.txt,sha256=sdmIO86MrIUepJTGyHs0i_Ho9VGf1q9YRP4RgQvGWcI,280
-jarvis_ai_assistant-0.1.83.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.83.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.85.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.85.dist-info/METADATA,sha256=RK6Yy0tqkTb0tMnqxLLyizhi6fZmFTEwAP-rI6PRCHM,12736
+jarvis_ai_assistant-0.1.85.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.85.dist-info/entry_points.txt,sha256=sdmIO86MrIUepJTGyHs0i_Ho9VGf1q9YRP4RgQvGWcI,280
+jarvis_ai_assistant-0.1.85.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.85.dist-info/RECORD,,