jarvis-ai-assistant 0.1.159__py3-none-any.whl → 0.1.161__py3-none-any.whl

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.159"
+__version__ = "0.1.161"

jarvis/jarvis_agent/file_input_handler.py

@@ -7,9 +7,8 @@ from typing import Any, Tuple
 from yaspin import yaspin
 
 from jarvis.jarvis_tools.file_operation import FileOperationTool
-from jarvis.jarvis_utils.config import INPUT_WINDOW_REVERSE_SIZE, get_max_input_token_count
-from jarvis.jarvis_utils.embedding import get_context_token_count
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.utils import is_context_overflow
 
 
 def file_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
@@ -86,7 +85,7 @@ def file_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
                 spinner.text = "文件读取完成"
                 spinner.ok("✅")
                 prompt = result["stdout"] + "\n" + prompt
-                if get_context_token_count(prompt) > get_max_input_token_count() - INPUT_WINDOW_REVERSE_SIZE:
+                if is_context_overflow(prompt):
                     return old_prompt, False
 
     return prompt, False

jarvis/jarvis_agent/jarvis.py

@@ -94,7 +94,7 @@ def _select_task(tasks: Dict[str, str]) -> str:
                 # 询问是否需要补充信息
                 need_additional = user_confirm("需要为此任务添加补充信息吗？", default=False)
                 if need_additional:
-                    additional_input = get_multiline_input("请输入补充信息（输入空行结束）：")
+                    additional_input = get_multiline_input("请输入补充信息：")
                     if additional_input:
                         selected_task = f"{selected_task}\n\n补充信息:\n{additional_input}"
                 return selected_task

jarvis/jarvis_agent/patch.py

@@ -2,20 +2,19 @@ import re
 from typing import Dict, Any, Tuple
 import os
 
-from yaspin import yaspin
+from yaspin import yaspin # type: ignore
 
 from jarvis.jarvis_agent.output_handler import OutputHandler
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_git_utils.git_commiter import GitCommitTool
 from jarvis.jarvis_tools.file_operation import FileOperationTool
-from jarvis.jarvis_utils.config import INPUT_WINDOW_REVERSE_SIZE, get_max_input_token_count, is_confirm_before_apply_patch
-from jarvis.jarvis_utils.embedding import get_context_token_count
+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.globals import add_read_file_record, has_read_file
 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, chat_with_files
+from jarvis.jarvis_utils.utils import is_context_overflow, get_file_line_count, user_confirm
 from jarvis.jarvis_utils.tag import ot, ct
 
 
@@ -95,7 +94,7 @@ def add(a, b):
 - 保持代码风格一致性，遵循项目现有的编码规范
 - 在修改前仔细分析原代码的格式风格，确保补丁与之完全兼容
 - 绝不提供完整文件内容，除非是新建文件
-- 每个文件的修改是独立的，不能出现"参照xxx文件的修改"这样的描述
+- 每个文件的修改是独立的，不能出现“参照xxx文件的修改”这样的描述
 - 不要出现未实现的代码，如：TODO
 """
     
@@ -211,12 +210,8 @@ def apply_patch(output_str: str, agent: Any) -> str:
                         final_ret += f"# 应用补丁:\n```diff\n{diff}\n```"
 
                         # 修改后的提示逻辑
-                        addon_prompt =  "1. 请确认补丁是否已正确应用\n"
-                        addon_prompt += "2. 检查修改后的代码是否符合预期\n"
-                        addon_prompt += "3. 如果确认无误，请继续进行下一步修改\n"
-                        addon_prompt += "4. 如果发现问题，请立即开始修复\n"
-                        addon_prompt += f"如果用户的需求已经完成，请终止，不要输出新的 {ot('PATCH')}，不要实现任何超出用户需求外的内容\n"
-                        addon_prompt += "如果有任何信息不清楚，调用工具获取信息\n"
+                        addon_prompt = f"如果用户的需求未完成，请继续生成补丁，如果已经完成，请终止，不要输出新的 {ot('PATCH')}，不要实现任何超出用户需求外的内容\n"
+                        addon_prompt += "如果有任何信息不明确，调用工具获取信息\n"
                         addon_prompt += "每次响应必须且只能包含一个操作\n"
 
                         agent.set_addon_prompt(addon_prompt)
@@ -348,14 +343,36 @@ def handle_commit_workflow() -> bool:
     """Handle the git commit workflow and return the commit details.
 
     Returns:
-        tuple[bool, str, str]: (continue_execution, commit_id, commit_message)
+        bool: 提交是否成功
     """
     if is_confirm_before_apply_patch() and not user_confirm("是否要提交代码？", default=True):
         revert_change()
         return False
-    git_commiter = GitCommitTool()
-    commit_result = git_commiter.execute({})
-    return commit_result["success"]
+    
+    import subprocess
+    try:
+        # 获取当前分支的提交总数
+        commit_count = subprocess.run(
+            ['git', 'rev-list', '--count', 'HEAD'],
+            capture_output=True,
+            text=True
+        )
+        if commit_count.returncode != 0:
+            return False
+            
+        commit_count = int(commit_count.stdout.strip())
+        
+        # 暂存所有修改
+        subprocess.run(['git', 'add', '.'], check=True)
+        
+        # 提交变更
+        subprocess.run(
+            ['git', 'commit', '-m', f'CheckPoint #{commit_count + 1}'], 
+            check=True
+        )
+        return True
+    except subprocess.CalledProcessError as e:
+        return False
 
 
 def handle_code_operation(filepath: str, patch_content: str) -> bool:
@@ -377,7 +394,8 @@ def handle_small_code_operation(filepath: str, patch_content: str) -> bool:
         try:
             model = PlatformRegistry().get_normal_platform()
             file_content = FileOperationTool().execute({"operation":"read", "files":[{"path":filepath}]})["stdout"]
-            model.set_suppress_output(True)
+
+            model.set_suppress_output(False)
 
             prompt = f"""
 # 代码合并专家指南
@@ -407,6 +425,7 @@ def handle_small_code_operation(filepath: str, patch_content: str) -> bool:
 {ot("MERGED_CODE")}
 [合并后的完整代码，包括所有空行和缩进]
 {ct("MERGED_CODE")}
+
 # 原始代码
 {file_content}
 """
@@ -418,7 +437,8 @@ def handle_small_code_operation(filepath: str, patch_content: str) -> bool:
             finished = False
             while count > 0:
                 count -= 1
-                response = model.chat_until_success(prompt).splitlines()
+                with spinner.hidden():
+                    response = model.chat_until_success(prompt).splitlines()
                 try:
                     start_line = response.index(ot("MERGED_CODE")) + 1
                     try:
@@ -466,18 +486,23 @@ def handle_small_code_operation(filepath: str, patch_content: str) -> bool:
             return False
 
 
+
 def handle_large_code_operation(filepath: str, patch_content: str, model: BasePlatform) -> bool:
     """处理大型代码文件的补丁操作，使用差异化补丁格式"""
     with yaspin(text=f"正在处理文件 {filepath}...", color="cyan") as spinner:
         try:
             file_content = FileOperationTool().execute({"operation":"read", "files":[{"path":filepath}]})["stdout"]
-            
-            # 检查是否需要特殊处理大文件
-            need_special_handling = get_context_token_count(file_content) > get_max_input_token_count() - INPUT_WINDOW_REVERSE_SIZE
-            
-            model.set_suppress_output(True)
+            need_upload_file = is_context_overflow(file_content)
+            upload_success = False
+            # 读取原始文件内容
+            with spinner.hidden():  
+                if need_upload_file and model.upload_files([filepath]):
+                    upload_success = True
 
-            prompt = f"""
+
+            model.set_suppress_output(False)
+
+            main_prompt = f"""
 # 代码补丁生成专家指南
 
 ## 任务描述
@@ -487,8 +512,7 @@ def handle_large_code_operation(filepath: str, patch_content: str, model: BasePl
 ```
 {patch_content}
 ```
-"""
-            suffix_prompt = """
+
 ## 补丁生成要求
 1. **精确性**：严格按照补丁的意图修改代码
 2. **格式一致性**：严格保持原始代码的格式风格
@@ -523,77 +547,69 @@ def handle_large_code_operation(filepath: str, patch_content: str, model: BasePl
 <<<<<< REPLACE
 {ct("DIFF")}
 """
-            if need_special_handling:
-                # 尝试上传文件
-                upload_success = False
-                with spinner.hidden():  
-                    if model.upload_files([filepath]):
-                        upload_success = True
-
-                if upload_success:
-                    response = model.chat_until_success(prompt + suffix_prompt)
+            
+            for _ in range(3):
+                file_prompt = ""
+                if not need_upload_file:
+                    file_prompt = f"""
+    # 原始代码
+    {file_content}
+    """
+                    with spinner.hidden():
+                        response = model.chat_until_success(main_prompt + file_prompt)
                 else:
-                    # 使用chat_with_files生成补丁
-                    response = chat_with_files(
-                        [filepath],
-                        model,
-                        prompt,
-                        suffix_prompt
-                    )
-            else:
-                # 上下文足够，直接在prompt中包含文件内容
-                prompt += f"""
-# 原始文件内容
-```
-{file_content}
-```
-"""
-                response = model.chat_until_success(prompt + suffix_prompt)
-
-            # 解析差异化补丁
-            diff_blocks = re.finditer(ot("DIFF")+r'\s*>{4,} SEARCH\n?(.*?)\n?={4,}\n?(.*?)\s*<{4,} REPLACE\n?'+ct("DIFF"),
-                                    response, re.DOTALL)
-
-            # 读取原始文件内容
-            with open(filepath, 'r', encoding='utf-8', errors="ignore") as f:
-                file_content = f.read()
-
-            # 应用所有差异化补丁
-            modified_content = file_content
-            patch_count = 0
-            success = True
-            for match in diff_blocks:
-                search_text = match.group(1).strip()
-                replace_text = match.group(2).strip()
-                patch_count += 1
-                # 检查搜索文本是否存在于文件中
-                if search_text in modified_content:
-                    # 如果有多处，报错
-                    if modified_content.count(search_text) > 1:
-                        prompt = f"补丁 #{patch_count} 应用失败：找到多个匹配的代码段"
-                        spinner.write(f"❌ 补丁 #{patch_count} 应用失败：找到多个匹配的代码段")
+                    if upload_success:
+                        with spinner.hidden():
+                            response = model.chat_until_success(main_prompt)
+                    else:
+                        with spinner.hidden():
+                            response = model.chat_big_content(file_content, main_prompt)
+
+                # 解析差异化补丁
+                diff_blocks = re.finditer(ot("DIFF")+r'\s*>{4,} SEARCH\n?(.*?)\n?={4,}\n?(.*?)\s*<{4,} REPLACE\n?'+ct("DIFF"),
+                                        response, re.DOTALL)
+
+                # 读取原始文件内容
+                with open(filepath, 'r', encoding='utf-8', errors="ignore") as f:
+                    file_content = f.read()
+
+                # 应用所有差异化补丁
+                modified_content = file_content
+                patch_count = 0
+                success = True
+                for match in diff_blocks:
+                    search_text = match.group(1).strip()
+                    replace_text = match.group(2).strip()
+                    patch_count += 1
+                    # 检查搜索文本是否存在于文件中
+                    if search_text in modified_content:
+                        # 如果有多处，报错
+                        if modified_content.count(search_text) > 1:
+                            spinner.write(f"❌ 补丁 #{patch_count} 应用失败：找到多个匹配的代码段")
+                            success = False
+                            break
+                        # 应用替换
+                        modified_content = modified_content.replace(
+                            search_text, replace_text)
+                        spinner.write(f"✅ 补丁 #{patch_count} 应用成功")
+                    else:
+                        spinner.write(f"❌ 补丁 #{patch_count} 应用失败：无法找到匹配的代码段")
                         success = False
                         break
-                    # 应用替换
-                    modified_content = modified_content.replace(
-                        search_text, replace_text)
-                    spinner.write(f"✅ 补丁 #{patch_count} 应用成功")
-                else:
-                    spinner.write(f"❌ 补丁 #{patch_count} 应用失败：无法找到匹配的代码段")
-                    prompt = f"补丁 #{patch_count} 应用失败：无法找到匹配的代码段"
-                    success = False
-                    break
-            if not success:
-                revert_file(filepath)
-                return False
+                if not success:
+                    revert_file(filepath)
+                    continue
 
-            # 写入修改后的内容
-            with open(filepath, 'w', encoding='utf-8', errors="ignore") as f:
-                f.write(modified_content)
+                # 写入修改后的内容
+                with open(filepath, 'w', encoding='utf-8', errors="ignore") as f:
+                    f.write(modified_content)
 
-            spinner.text = f"文件 {filepath} 修改完成，应用了 {patch_count} 个补丁"
-            spinner.ok("✅")
-            return True
+                spinner.text = f"文件 {filepath} 修改完成，应用了 {patch_count} 个补丁"
+                spinner.ok("✅")
+                return True
+            spinner.text = f"文件 {filepath} 修改失败"
+            spinner.fail("❌")
+            return False
 
         except Exception as e:
             spinner.text = f"文件修改失败: {str(e)}"

jarvis/jarvis_code_agent/code_agent.py

@@ -7,7 +7,7 @@ import os
 import sys
 import subprocess
 import argparse
-from typing import Optional, List, Tuple
+from typing import Any, Dict, Optional, List, Tuple
 
 # 忽略yaspin的类型检查
 from yaspin import yaspin  # type: ignore
@@ -243,6 +243,83 @@ class CodeAgent:
         """
         return self.root_dir
 
+    def get_loc_stats(self) -> str:
+        """使用loc命令获取当前目录的代码统计信息
+        
+        返回:
+            str: loc命令输出的原始字符串，失败时返回空字符串
+        """
+        try:
+            result = subprocess.run(
+                ['loc'],
+                cwd=self.root_dir,
+                capture_output=True,
+                text=True
+            )
+            return result.stdout if result.returncode == 0 else ""
+        except FileNotFoundError:
+            return ""
+
+    def get_recent_commits_with_files(self) -> List[Dict[str, Any]]:
+        """获取最近5次提交的commit信息和文件清单
+        
+        返回:
+            List[Dict[str, Any]]: 包含commit信息和文件清单的字典列表，格式为:
+                [
+                    {
+                        'hash': 提交hash,
+                        'message': 提交信息,
+                        'author': 作者,
+                        'date': 提交日期,
+                        'files': [修改的文件列表] (最多50个文件)
+                    },
+                    ...
+                ]
+                失败时返回空列表
+        """
+        try:
+            # 获取最近5次提交的基本信息
+            result = subprocess.run(
+                ['git', 'log', '-5', '--pretty=format:%H%n%s%n%an%n%ad'],
+                cwd=self.root_dir,
+                capture_output=True,
+                text=True
+            )
+            if result.returncode != 0:
+                return []
+
+            # 解析提交信息
+            commits = []
+            lines = result.stdout.splitlines()
+            for i in range(0, len(lines), 4):
+                if i + 3 >= len(lines):
+                    break
+                commit = {
+                    'hash': lines[i],
+                    'message': lines[i+1],
+                    'author': lines[i+2],
+                    'date': lines[i+3],
+                    'files': []
+                }
+                commits.append(commit)
+
+            # 获取每个提交的文件修改清单
+            for commit in commits:
+                files_result = subprocess.run(
+                    ['git', 'show', '--name-only', '--pretty=format:', commit['hash']],
+                    cwd=self.root_dir,
+                    capture_output=True,
+                    text=True
+                )
+                if files_result.returncode == 0:
+                    files = list(set(filter(None, files_result.stdout.splitlines())))
+                    commit['files'] = files[:50]  # 限制最多50个文件
+
+            return commits
+
+        except subprocess.CalledProcessError:
+            return []
+
     def _init_env(self) -> None:
         """初始化环境"""
         with yaspin(text="正在初始化环境...", color="cyan") as spinner:
@@ -261,8 +338,29 @@ class CodeAgent:
         if has_uncommitted_changes():
             PrettyOutput.print("检测到未提交的修改，是否要提交？", OutputType.WARNING)
             if user_confirm("是否要提交？", True):
-                git_commiter = GitCommitTool()
-                git_commiter.execute({})
+                import subprocess
+                try:
+                    # 获取当前分支的提交总数
+                    commit_count = subprocess.run(
+                        ['git', 'rev-list', '--count', 'HEAD'],
+                        capture_output=True,
+                        text=True
+                    )
+                    if commit_count.returncode != 0:
+                        return
+                        
+                    commit_count = int(commit_count.stdout.strip())
+                    
+                    # 暂存所有修改
+                    subprocess.run(['git', 'add', '.'], check=True)
+                    
+                    # 提交变更
+                    subprocess.run(
+                        ['git', 'commit', '-m', f'CheckPoint #{commit_count + 1}'], 
+                        check=True
+                    )
+                except subprocess.CalledProcessError as e:
+                    PrettyOutput.print(f"提交失败: {str(e)}", OutputType.ERROR)
 
     def _show_commit_history(
         self,
@@ -301,17 +399,14 @@ class CodeAgent:
     ) -> None:
         """处理提交确认和可能的重置"""
         if commits and user_confirm("是否接受以上提交记录？", True):
-            if len(commits) > 1 and user_confirm(
-                "是否要合并为一个更清晰的提交记录？", True
-            ):
-                subprocess.run(
-                    ["git", "reset", "--mixed", str(start_commit)],
-                    stdout=subprocess.DEVNULL,
-                    stderr=subprocess.DEVNULL,
-                    check=True
-                )
-                git_commiter = GitCommitTool()
-                git_commiter.execute({})
+            subprocess.run(
+                ["git", "reset", "--mixed", str(start_commit)],
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL,
+                check=True
+            )
+            git_commiter = GitCommitTool()
+            git_commiter.execute({})
         elif start_commit:
             os.system(f"git reset --hard {str(start_commit)}")  # 确保转换为字符串
             PrettyOutput.print("已重置到初始提交", OutputType.INFO)
@@ -329,8 +424,24 @@ class CodeAgent:
             self._init_env()
             start_commit = get_latest_commit_hash()
 
+            # 获取项目统计信息并附加到用户输入
+            loc_stats = self.get_loc_stats()
+            commits_info = self.get_recent_commits_with_files()
+            
+            project_info = []
+            if loc_stats:
+                project_info.append(f"代码统计:\n{loc_stats}")
+            if commits_info:
+                commits_str = "\n".join(
+                    f"提交 {i+1}: {commit['hash'][:7]} - {commit['message']} ({len(commit['files'])}个文件)"
+                    for i, commit in enumerate(commits_info)
+                )
+                project_info.append(f"最近提交:\n{commits_str}")
+            
+            enhanced_input = f"{user_input}\n\n项目概况:\n" + "\n\n".join(project_info) if project_info else user_input
+
             try:
-                self.agent.run(user_input)
+                self.agent.run(enhanced_input)
             except RuntimeError as e:
                 PrettyOutput.print(f"执行失败: {str(e)}", OutputType.WARNING)
                 return str(e)

jarvis/jarvis_code_analysis/code_review.py

@@ -10,10 +10,8 @@ from jarvis.jarvis_tools.read_code import ReadCodeTool
 from jarvis.jarvis_tools.registry import ToolRegistry
 from jarvis.jarvis_agent import Agent
 
-from jarvis.jarvis_utils.config import INPUT_WINDOW_REVERSE_SIZE, get_max_input_token_count
-from jarvis.jarvis_utils.embedding import get_context_token_count
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from jarvis.jarvis_utils.utils import init_env, chat_with_files
+from jarvis.jarvis_utils.utils import init_env, is_context_overflow
 from jarvis.jarvis_utils.tag import ot, ct
 from jarvis.jarvis_code_analysis.checklists.loader import get_language_checklist
 
@@ -587,28 +585,27 @@ class CodeReviewTool:
                     temp_file.flush()
                 
                 try:
-                    # 检查文件大小
-                    is_large_file = get_context_token_count(diff_output) > get_max_input_token_count() - INPUT_WINDOW_REVERSE_SIZE
+                    upload_success = False
+                    # Check if content is too large
+                    is_large_content = is_context_overflow(diff_output)
                     
-                    if is_large_file:
-                        # 文件较大，尝试上传
-                        upload_success = False
-                        with yaspin(text="正在上传代码差异文件...", color="cyan") as spinner:
-                            if agent.model and hasattr(agent.model, 'upload_files'):
-                                upload_success = agent.model.upload_files([temp_file_path])
-                                if upload_success:
-                                    spinner.ok("✅")
-                                    PrettyOutput.print(f"已成功上传代码差异文件", OutputType.SUCCESS)
-                                else:
-                                    spinner.fail("❌")
-                                    PrettyOutput.print(f"文件上传失败，将使用chat_with_files处理", OutputType.WARNING)
+                    # Upload the file to the agent's model
+                    with yaspin(text="正在上传代码差异文件...", color="cyan") as spinner:
+                        if is_large_content and agent.model and hasattr(agent.model, 'upload_files'):
+                            upload_success = agent.model.upload_files([temp_file_path])
+                            if upload_success:
+                                spinner.ok("✅")
+                                PrettyOutput.print(f"已成功上传代码差异文件", OutputType.SUCCESS)
                             else:
                                 spinner.fail("❌")
-                                PrettyOutput.print(f"模型不支持文件上传，将使用chat_with_files处理", OutputType.WARNING)
-                        
-                        if upload_success:
-                            # 文件上传成功，使用上传的文件
-                            complete_prompt = user_prompt + f"""
+                                PrettyOutput.print(f"上传代码差异文件失败，将使用分块处理", OutputType.WARNING)
+                        else:
+                            upload_success = False
+                    
+                    # Prepare the prompt based on upload status
+                    if upload_success:
+                        # When file is uploaded, reference it in the prompt
+                        complete_prompt = user_prompt + f"""
 
 我已上传了一个包含代码差异的文件。该文件包含:
 - 审查类型: {review_type}
@@ -616,20 +613,17 @@ class CodeReviewTool:
 - 检测到的编程语言: {', '.join(detected_languages) if detected_languages else '未检测到特定语言'}
 
 请基于上传的代码差异文件进行全面审查，并生成详细的代码审查报告。"""
-                            result = agent.run(complete_prompt)
-                        else:
-                            # 文件上传失败，使用chat_with_files
-                            PrettyOutput.print("使用chat_with_files处理大文件...", OutputType.INFO)
-                            result = chat_with_files(
-                                [temp_file_path],
-                                agent.model,
-                                user_prompt,
-                                "请基于以上代码差异进行全面审查，并生成详细的代码审查报告。"
-                            )
-                    else:
-                        # 文件较小，直接包含在prompt中
-                        complete_prompt = user_prompt + "\n\n代码差异内容:\n```diff\n" + diff_output + "\n```"
+                        # Run the agent with the prompt
                         result = agent.run(complete_prompt)
+                    else:
+                        # If upload failed or not needed, handle based on context size
+                        if is_large_content and agent.model and hasattr(agent.model, 'chat_big_content'):
+                            # Use chat_big_content for large content when upload fails
+                            result = agent.model.chat_big_content(diff_output, user_prompt)
+                        else:
+                            # Include the diff directly in the prompt for smaller content
+                            complete_prompt = user_prompt + "\n\n代码差异内容:\n```diff\n" + diff_output + "\n```"
+                            result = agent.run(complete_prompt)
                 finally:
                     # Clean up the temporary file
                     if os.path.exists(temp_file_path):