jarvis-ai-assistant 0.1.84__tar.gz → 0.1.85__tar.gz

{jarvis_ai_assistant-0.1.84/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.85}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.84"
+version = "0.1.85"
 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.84 → jarvis_ai_assistant-0.1.85}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.84",
+    version="0.1.85",
     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.84 → jarvis_ai_assistant-0.1.85}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.1.84 → jarvis_ai_assistant-0.1.85}/src/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_ai_assistant-0.1.84 → jarvis_ai_assistant-0.1.85}/src/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:

{jarvis_ai_assistant-0.1.84 → jarvis_ai_assistant-0.1.85}/src/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.84 → jarvis_ai_assistant-0.1.85/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.84
+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