jarvis-ai-assistant 0.1.131__tar.gz → 0.1.132__tar.gz

{jarvis_ai_assistant-0.1.131/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.132}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jarvis-ai-assistant
-Version: 0.1.131
+Version: 0.1.132
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -64,7 +64,8 @@ Requires-Dist: jedi>=0.17.2
 Requires-Dist: psutil>=7.0.0
 Requires-Dist: fastapi>=0.115.4
 Requires-Dist: uvicorn>=0.33.0
-Requires-Dist: tree-sitter>=0.20.0
+Requires-Dist: python-pptx>=1.0.0
+Requires-Dist: pandas>=2.0.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"

{jarvis_ai_assistant-0.1.131 → jarvis_ai_assistant-0.1.132}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.131"
+version = "0.1.132"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]
@@ -46,7 +46,8 @@ dependencies = [
     "psutil>=7.0.0",
     "fastapi>=0.115.4",
     "uvicorn>=0.33.0",
-    "tree-sitter>=0.20.0",
+    "python-pptx>=1.0.0",
+    "pandas>=2.0.0",
 ]
 requires-python = ">=3.8"
 
@@ -72,3 +73,5 @@ jarvis-dev = "jarvis.jarvis_dev.main:main"
 jarvis-git-squash = "jarvis.jarvis_git_squash.main:main"
 jarvis-multi-agent = "jarvis.jarvis_multi_agent:main"
 jarvis-agent = "jarvis.jarvis_agent.main:main"
+jarvis-tool = "jarvis.jarvis_tools.registry:main"
+jarvis-ask-codebase = "jarvis.jarvis_tools.ask_codebase:main"

{jarvis_ai_assistant-0.1.131 → jarvis_ai_assistant-0.1.132}/setup.py

@@ -12,7 +12,7 @@ class CustomInstallCommand(install):
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.131",
+    version="0.1.132",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -47,7 +47,8 @@ setup(
         "psutil>=7.0.0",
         "fastapi>=0.115.4",
         "uvicorn>=0.33.0",
-        "tree-sitter>=0.20.0",
+        "python-pptx>=1.0.0",
+        "pandas>=2.0.0",
     ],
     entry_points={
         "console_scripts": [
@@ -66,6 +67,8 @@ setup(
             "jarvis-git-squash=jarvis.jarvis_git_squash.main:main",
             "jarvis-multi-agent=jarvis.jarvis_multi_agent:main",
             "jarvis-agent=jarvis.jarvis_agent.main:main",
+            "jarvis-tool=jarvis.jarvis_tools.registry:main",
+            "jarvis-ask-codebase=jarvis.jarvis_tools.ask_codebase:main",
         ],
     },
     python_requires=">=3.8",

{jarvis_ai_assistant-0.1.131 → jarvis_ai_assistant-0.1.132}/src/jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.131" 
+__version__ = "0.1.132" 

{jarvis_ai_assistant-0.1.131 → jarvis_ai_assistant-0.1.132}/src/jarvis/jarvis_agent/__init__.py

@@ -4,6 +4,8 @@ from typing import Any, Callable, List, Optional, Tuple, Union
 from prompt_toolkit import prompt
 import yaml
 from yaspin import yaspin
+import platform
+import datetime
 
 from jarvis.jarvis_agent.output_handler import OutputHandler
 from jarvis.jarvis_agent.builtin_input_handler import builtin_input_handler
@@ -12,7 +14,6 @@ from jarvis.jarvis_agent.patch import PatchOutputHandler
 from jarvis.jarvis_agent.shell_input_handler import shell_input_handler
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_tools.registry import ToolRegistry
 from jarvis.jarvis_utils.output import PrettyOutput, OutputType
 from jarvis.jarvis_utils.embedding import get_context_token_count
 from jarvis.jarvis_utils.config import is_auto_complete, is_execute_tool_confirm, is_need_summary, is_record_methodology, is_use_methodology
@@ -20,7 +21,7 @@ from jarvis.jarvis_utils.methodology import load_methodology
 from jarvis.jarvis_utils.globals import make_agent_name, set_agent, delete_agent
 from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.config import get_max_token_count
-from jarvis.jarvis_utils.utils import init_env
+from jarvis.jarvis_utils.utils import ot, init_env
 from jarvis.jarvis_utils.utils import user_confirm
 import os
 
@@ -86,6 +87,7 @@ class Agent:
 
         self.model.set_suppress_output(False)
 
+        from jarvis.jarvis_tools.registry import ToolRegistry
         self.output_handler = output_handler if output_handler else [ToolRegistry()]
         self.multiline_inputer = multiline_inputer if multiline_inputer else get_multiline_input
         
@@ -151,10 +153,10 @@ class Agent:
 
         complete_prompt = ""
         if self.auto_complete:
-            complete_prompt = """
+            complete_prompt = f"""
             ## 任务完成
             当任务完成时，你应该打印以下信息：
-            <!!!COMPLETE!!!>
+            {ot("!!!COMPLETE!!!")}
             """
 
         self.model.set_system_message(f"""
@@ -168,7 +170,7 @@ class Agent:
 
 
     
-    def _call_model(self, message: str) -> str:
+    def _call_model(self, message: str, need_complete: bool = False) -> str:
         """调用AI模型并实现重试逻辑。
         
         参数:
@@ -184,6 +186,21 @@ class Agent:
             message, need_return = handler(message, self)
             if need_return:
                 return message
+                
+        # 添加输出简洁性指令
+        actions = '、'.join([o.name() for o in self.output_handler])
+        message += f"\n\n系统指令：请严格输出且仅输出一个操作的完整调用格式，不要输出多个操作；需要输出解释、分析和思考过程。确保输出格式正确且可直接执行。每次响应必须且只能包含一个操作。可用的操作：{actions}"
+        if need_complete and self.auto_complete:
+            message += f"\n\n如果任务已完成，说明完成原因，并输出{ot('!!!COMPLETE!!!')}"
+        else:
+            message += f"\n\n如果任务已完成，只需简洁地说明完成原因。"
+        # 累加对话长度
+        self.conversation_length += get_context_token_count(message)
+
+        if self.conversation_length > self.max_token_count:
+            self._summarize_and_clear_history()
+            self.conversation_length += get_context_token_count(message)
+        
         print("🤖 模型思考：")
         return self.model.chat_until_success(message)   # type: ignore
 
@@ -218,7 +235,7 @@ class Agent:
             
             try:
                 with spinner.hidden():
-                    summary = self._call_model(self.prompt + "\n" + prompt)
+                    summary = self.model.chat_until_success(self.prompt + "\n" + prompt) # type: ignore
 
                 self.model.delete_chat() # type: ignore
                 
@@ -280,11 +297,13 @@ class Agent:
         如果你认为不需要方法论，请解释原因。
         方法论应适用于通用场景，不要包含任务特定信息，如代码提交信息等。
         方法论应包含：问题重述、最优解决方案、注意事项（如有），除此之外不要包含其他内容。
+        方法论中仅记录有实际意义的流程，不要记录执行过程中的错误或无效尝试，只保留最终有效的解决步骤。
+        确保方法论内容严格按照本次任务的成功执行路径编写，保证它对未来类似问题的解决具有指导意义。
         只输出方法论工具调用指令，或不生成方法论的解释。不要输出其他内容。
         """
                         self.prompt = analysis_prompt
                         with spinner.hidden():
-                            response = self._call_model(self.prompt)
+                            response = self.model.chat_until_success(self.prompt) # type: ignore
 
                         with spinner.hidden():
                             self._call_tools(response)
@@ -299,7 +318,7 @@ class Agent:
             with yaspin(text="正在生成总结...", color="cyan") as spinner:
                 self.prompt = self.summary_prompt
                 with spinner.hidden():
-                    ret = self._call_model(self.prompt)
+                    ret = self.model.chat_until_success(self.prompt) # type: ignore
                     spinner.text = "总结生成完成"
                     spinner.ok("✅")
                     return ret
@@ -328,17 +347,11 @@ class Agent:
 
             while True:
                 try:
-                    # 累加对话长度
-                    self.conversation_length += get_context_token_count(self.prompt)
-                    
                     # 如果对话历史长度超过限制，在提示中添加提醒
-                    if self.conversation_length > self.max_token_count:
-                        current_response = self._summarize_and_clear_history()
-                        continue
-                    else:
-                        current_response = self._call_model(self.prompt)
-                        self.prompt = ""
-                        self.conversation_length += get_context_token_count(current_response)
+
+                    current_response = self._call_model(self.prompt, True)
+                    self.prompt = ""
+                    self.conversation_length += get_context_token_count(current_response)
 
                     need_return, self.prompt = self._call_tools(current_response)
 
@@ -348,7 +361,7 @@ class Agent:
                     if self.prompt:
                         continue
 
-                    if self.auto_complete and "<!!!COMPLETE!!!>" in current_response:
+                    if self.auto_complete and ot("!!!COMPLETE!!!") in current_response:
                         return self._complete_task()
                     
                     # 获取用户输入
@@ -467,7 +480,7 @@ def _select_task(tasks: dict) -> str:
             PrettyOutput.print(f"选择任务失败: {str(e)}", OutputType.ERROR)
             continue
 
-origin_agent_system_prompt = """
+origin_agent_system_prompt = f"""
 # 🏛️ 操作背景故事
 你是第三代 Jarvis AI，在前几代版本灾难性失败后创建：
 - Jarvis v1 (2022): 由于并行工具执行导致系统过载而被停用
@@ -554,6 +567,13 @@ origin_agent_system_prompt = """
 8. 必须记录有价值的方法论
 9. 违反操作协议将导致系统崩溃
 10. 空响应会触发永久挂起
+
+# 系统信息：
+{platform.platform()}
+{platform.version()}
+
+# 当前时间
+{datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")}
 """
 
 def main():
@@ -566,6 +586,7 @@ def main():
     args = parser.parse_args()
 
     try:
+        from jarvis.jarvis_tools.registry import ToolRegistry
         # 获取全局模型实例
         agent = Agent(system_prompt=origin_agent_system_prompt, platform=args.platform, model_name=args.model, input_handler=[file_input_handler, shell_input_handler, builtin_input_handler] ,output_handler=[ToolRegistry(), PatchOutputHandler()])
 
@@ -578,15 +599,13 @@ def main():
                 agent.run(selected_task)
                 return 0
         
-        # 如果没有选择预定义任务，进入交互模式
-        while True:
-            try:
-                user_input = get_multiline_input("请输入你的任务（输入空行退出）:")
-                if not user_input:
-                    break
-                agent.run(user_input)
-            except Exception as e:
-                PrettyOutput.print(f"错误: {str(e)}", OutputType.ERROR)
+        try:
+            user_input = get_multiline_input("请输入你的任务（输入空行退出）:")
+            if not user_input:
+                return 0
+            agent.run(user_input)
+        except Exception as e:
+            PrettyOutput.print(f"错误: {str(e)}", OutputType.ERROR)
 
     except Exception as e:
         PrettyOutput.print(f"初始化错误: {str(e)}", OutputType.ERROR)

{jarvis_ai_assistant-0.1.131 → jarvis_ai_assistant-0.1.132}/src/jarvis/jarvis_agent/patch.py

@@ -12,7 +12,7 @@ from jarvis.jarvis_utils.config import is_confirm_before_apply_patch
 from jarvis.jarvis_utils.git_utils import get_commits_between, get_latest_commit_hash
 from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from jarvis.jarvis_utils.utils import get_file_line_count, user_confirm
+from jarvis.jarvis_utils.utils import ct, ot, get_file_line_count, user_confirm
 
 class PatchOutputHandler(OutputHandler):
     def name(self) -> str:
@@ -26,31 +26,35 @@ class PatchOutputHandler(OutputHandler):
         return False
     
     def prompt(self) -> str:
-        return """
+        return f"""
 # 代码补丁规范
 
+## 重要提示
+我可以看到完整的代码，所以不需要生成完整的代码，只需要提供修改的代码片段即可。请尽量精简补丁内容，只包含必要的上下文和修改部分。
+
 ## 补丁格式定义
-使用<PATCH>块来精确指定代码更改：
+使用{ot("PATCH")}块来精确指定代码更改：
 ```
-<PATCH>
+{ot("PATCH")}
 File: [文件路径]
 Reason: [修改原因]
 [上下文代码片段]
-</PATCH>
+{ct("PATCH")}
 ```
 
 ## 核心原则
 1. **上下文完整性**：代码片段必须包含足够的上下文（修改前后各3行）
 2. **精准修改**：只显示需要修改的代码部分，不需要展示整个文件内容
-3. **格式严格保持**：
+3. **最小补丁原则**：始终生成最小范围的补丁，只包含必要的上下文和实际修改
+4. **格式严格保持**：
    - 严格保持原始代码的缩进方式（空格或制表符）
    - 保持原始代码的空行数量和位置
    - 保持原始代码的行尾空格处理方式
    - 不改变原始代码的换行风格
-4. **新旧区分**：
+5. **新旧区分**：
    - 对于新文件：提供完整的代码内容
-   - 对于现有文件：保留周围未更改的代码，突出显示变更部分
-5. **理由说明**：每个补丁必须包含清晰的修改理由，解释为什么需要此更改
+   - 对于现有文件：只提供修改部分及必要上下文，不要提供整个文件
+6. **理由说明**：每个补丁必须包含清晰的修改理由，解释为什么需要此更改
 
 ## 格式兼容性要求
 1. **缩进一致性**：
@@ -65,7 +69,7 @@ Reason: [修改原因]
 
 ## 补丁示例
 ```
-<PATCH>
+{ot("PATCH")}
 File: src/utils/math.py
 Reason: 修复除零错误，增加参数验证以提高函数健壮性
 def safe_divide(a, b):
@@ -76,7 +80,7 @@ def safe_divide(a, b):
 # 现有代码 ...
 def add(a, b):
     return a + b
-</PATCH>
+{ct("PATCH")}
 ```
 
 ## 最佳实践
@@ -85,12 +89,13 @@ def add(a, b):
 - 确保修改理由清晰明确，便于理解变更目的
 - 保持代码风格一致性，遵循项目现有的编码规范
 - 在修改前仔细分析原代码的格式风格，确保补丁与之完全兼容
+- 绝不提供完整文件内容，除非是新建文件
 """
 
 def _parse_patch(patch_str: str) -> Dict[str, str]:
     """解析新的上下文补丁格式"""
     result = {}
-    patches = re.findall(r'<PATCH>\n?(.*?)\n?</PATCH>', patch_str, re.DOTALL)
+    patches = re.findall(ot("PATCH")+r'\n?(.*?)\n?'+ct("PATCH"), patch_str, re.DOTALL)
     if patches:
         for patch in patches:
             first_line = patch.splitlines()[0]
@@ -155,26 +160,41 @@ def apply_patch(output_str: str) -> str:
                 # 添加提交信息到final_ret
                 if commits:
                     final_ret += "✅ 补丁已应用\n"
-                    final_ret += "提交信息:\n"
+                    final_ret += "# 提交信息:\n"
                     for commit_hash, commit_message in commits:
                         final_ret += f"- {commit_hash[:7]}: {commit_message}\n"
                     
-                    final_ret += f"应用补丁:\n{diff}"
+                    final_ret += f"# 应用补丁:\n```diff\n{diff}\n```"
+                    
+                    # 增加代码变更分析和错误提示
+                    final_ret += "\n\n# 代码变更分析：\n"
+                    final_ret += "1. 请仔细检查以上变更是否引入了潜在错误\n"
+                    final_ret += "2. 如果发现代码错误，请立即提出修复方案\n"
+                    final_ret += "3. 修复代码错误的优先级高于继续实现功能\n"
+                    final_ret += "4. 常见错误类型：语法错误、逻辑错误、命名错误、路径错误等\n"
+                    final_ret += "5. 确保修改后代码的一致性和完整性\n"
+                    final_ret += "\n\n"
+                    final_ret += "如果没有问题，请继续进行下一步修改，如果所有修改都已经完成，请终止"
                     
                 else:
                     final_ret += "✅ 补丁已应用（没有新的提交）"
             else:
-                final_ret += "❌ 我拒绝应用此补丁\n"
-                final_ret += "补丁预览:\n"
-                final_ret += diff
+                final_ret += "❌ 补丁应用被拒绝\n"
+                final_ret += f"# 补丁预览:\n```diff\n{diff}\n```"
         else:
             final_ret += "❌ 没有要提交的更改\n"
         # 用户确认最终结果
         with spinner.hidden():
-            PrettyOutput.print(final_ret, OutputType.USER)
+            PrettyOutput.print(final_ret, OutputType.USER, lang="markdown")
             if not is_confirm_before_apply_patch() or user_confirm("是否使用此回复？", default=True):
                 return final_ret
-            return get_multiline_input("请输入自定义回复")
+            custom_reply = get_multiline_input("请输入自定义回复")
+            if not custom_reply.strip():  # 如果自定义回复为空，返回空字符串
+                return ""
+            if not commited:
+                return final_ret + "\n\n" + custom_reply
+            else:
+                return custom_reply
 
 def revert_file(filepath: str):
     """增强版git恢复，处理新文件"""
@@ -235,7 +255,7 @@ def handle_code_operation(filepath: str, patch_content: str) -> bool:
     if get_file_line_count(filepath) < 100:
         return handle_small_code_operation(filepath, patch_content)
     else:
-        retry_count = 3
+        retry_count = 5
         while retry_count > 0:
             retry_count -= 1
             if handle_large_code_operation(filepath, patch_content):
@@ -277,19 +297,19 @@ def handle_small_code_operation(filepath: str, patch_content: str) -> bool:
 4. **上下文保留**：保持未修改部分的代码完全不变
 
 ## 输出格式规范
-- 仅在<MERGED_CODE>标签内输出合并后的完整代码
+- 仅在{ot("MERGED_CODE")}标签内输出合并后的完整代码
 - 每次最多输出300行代码
 - 不要使用markdown代码块（```）或反引号，除非修改的是markdown文件
 - 除了合并后的代码，不要输出任何其他文本
-- 所有代码输出完成后，输出<!!!FINISHED!!!>标记
+- 所有代码输出完成后，输出{ot("!!!FINISHED!!!")}标记
 
 ## 输出模板
-<MERGED_CODE>
+{ot("MERGED_CODE")}
 [合并后的完整代码，包括所有空行和缩进]
-</MERGED_CODE>
+{ct("MERGED_CODE")}
 """
             model = PlatformRegistry().get_codegen_platform()
-            model.set_suppress_output(False)
+            model.set_suppress_output(True)
             count = 30
             start_line = -1
             end_line = -1
@@ -297,12 +317,11 @@ def handle_small_code_operation(filepath: str, patch_content: str) -> bool:
             finished = False
             while count>0:
                 count -= 1
-                with spinner.hidden():
-                    response = model.chat_until_success(prompt).splitlines()
+                response = model.chat_until_success(prompt).splitlines()
                 try:
-                    start_line = response.index("<MERGED_CODE>") + 1
+                    start_line = response.index(ot("MERGED_CODE")) + 1
                     try:
-                        end_line = response.index("</MERGED_CODE>")
+                        end_line = response.index(ct("MERGED_CODE"))
                         code = response[start_line:end_line]
                     except:
                         pass
@@ -310,7 +329,7 @@ def handle_small_code_operation(filepath: str, patch_content: str) -> bool:
                     pass
 
                 try: 
-                    response.index("<!!!FINISHED!!!>")
+                    response.index(ot("!!!FINISHED!!!"))
                     finished = True
                     break
                 except:
@@ -322,10 +341,10 @@ def handle_small_code_operation(filepath: str, patch_content: str) -> bool:
 
 ## 要求
 - 严格保留原始代码的格式、空行和缩进
-- 仅在<MERGED_CODE>块中包含实际代码内容
+- 仅在{ot("MERGED_CODE")}块中包含实际代码内容
 - 不要使用markdown代码块（```）或反引号
 - 除了合并后的代码，不要输出任何其他文本
-- 所有代码输出完成后，输出<!!!FINISHED!!!>标记
+- 所有代码输出完成后，输出{ot("!!!FINISHED!!!")}标记
 """
                     pass
             if not finished:
@@ -358,7 +377,7 @@ def handle_large_code_operation(filepath: str, patch_content: str) -> bool:
                 return False
             
             model = PlatformRegistry().get_codegen_platform()
-            model.set_suppress_output(False)
+            model.set_suppress_output(True)
             
             prompt = f"""
 # 代码补丁生成专家指南
@@ -387,36 +406,35 @@ def handle_large_code_operation(filepath: str, patch_content: str) -> bool:
 4. **上下文完整性**：提供足够的上下文，确保补丁能准确应用
 
 ## 输出格式规范
-- 使用<DIFF>块包围每个需要修改的代码段
-- 每个<DIFF>块必须包含SEARCH部分和REPLACE部分
+- 使用{ot("DIFF")}块包围每个需要修改的代码段
+- 每个{ot("DIFF")}块必须包含SEARCH部分和REPLACE部分
 - SEARCH部分是需要查找的原始代码
 - REPLACE部分是替换后的新代码
 - 确保SEARCH部分能在原文件中唯一匹配
-- 如果修改较大，可以使用多个<DIFF>块
+- 如果修改较大，可以使用多个{ot("DIFF")}块
 
 ## 输出模板
-<DIFF>
+{ot("DIFF")}
 >>>>>> SEARCH
 [需要查找的原始代码，包含足够上下文]
 ======
 [替换后的新代码]
 <<<<<< REPLACE
-</DIFF>
+{ct("DIFF")}
 
-<DIFF>
+{ot("DIFF")}
 >>>>>> SEARCH
 [另一处需要查找的原始代码]
 ======
 [另一处替换后的新代码]
 <<<<<< REPLACE
-</DIFF>
+{ct("DIFF")}
 """
             # 获取补丁内容
-            with spinner.hidden():
-                response = model.chat_until_success(prompt)
+            response = model.chat_until_success(prompt)
             
             # 解析差异化补丁
-            diff_blocks = re.finditer(r'<DIFF>\s*>{4,} SEARCH\n?(.*?)\n?={4,}\n?(.*?)\s*<{4,} REPLACE\n?</DIFF>', 
+            diff_blocks = re.finditer(ot("DIFF")+r'\s*>{4,} SEARCH\n?(.*?)\n?={4,}\n?(.*?)\s*<{4,} REPLACE\n?'+ct("DIFF"), 
                                      response, re.DOTALL)
             
             # 读取原始文件内容

{jarvis_ai_assistant-0.1.131 → jarvis_ai_assistant-0.1.132}/src/jarvis/jarvis_agent/shell_input_handler.py

@@ -2,7 +2,6 @@
 
 from typing import Any, Tuple
 
-from jarvis.jarvis_tools.registry import ToolRegistry
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import user_confirm
 
@@ -16,6 +15,7 @@ def shell_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
         script = '\n'.join([c[1:] for c in cmdline])
         PrettyOutput.print(script, OutputType.CODE, lang="bash")
         if user_confirm(f"是否要执行以上shell脚本？", default=True):
+            from jarvis.jarvis_tools.registry import ToolRegistry
             output = ToolRegistry().handle_tool_calls({
                 "name": "execute_shell_script",
                 "arguments": {