jarvis-ai-assistant 0.1.207__py3-none-any.whl → 0.1.209__py3-none-any.whl

jarvis/jarvis_git_utils/git_commiter.py

@@ -7,13 +7,15 @@ import sys
 import tempfile
 from typing import Any, Dict, Optional
 
-import yaml
-from yaspin import yaspin
+import yaml  # type: ignore
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils.config import get_git_commit_prompt
-from jarvis.jarvis_utils.git_utils import (confirm_add_new_files, find_git_root,
-                                           has_uncommitted_changes)
+from jarvis.jarvis_utils.git_utils import (
+    confirm_add_new_files,
+    find_git_root_and_cd,
+    has_uncommitted_changes,
+)
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ct, ot
 from jarvis.jarvis_utils.utils import init_env, is_context_overflow
@@ -69,19 +71,19 @@ class GitCommitTool:
         """Prepare git environment by changing directory and checking for changes"""
         original_dir = os.getcwd()
         os.chdir(root_dir)
-        find_git_root()
+        find_git_root_and_cd()
         if not has_uncommitted_changes():
             PrettyOutput.print("没有未提交的更改", OutputType.SUCCESS)
             return None
         return original_dir
 
-    def _stage_changes(self, spinner) -> None:
+    def _stage_changes(self) -> None:
         """Stage all changes for commit"""
-        spinner.text = "正在添加文件到提交..."
+        print("📁 正在添加文件到提交...")
         subprocess.Popen(
             ["git", "add", "."], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL
         ).wait()
-        spinner.write("✅ 添加文件到提交")
+        print("✅ 添加文件到提交")
 
     def execute(self, args: Dict) -> Dict[str, Any]:
         """Execute automatic commit process with support for multi-line messages and special characters"""
@@ -102,41 +104,40 @@ class GitCommitTool:
             if not has_uncommitted_changes():
                 return {"success": True, "stdout": "No changes to commit", "stderr": ""}
 
-            with yaspin(text="正在初始化提交流程...", color="cyan") as spinner:
-                # 添加文件到暂存区
-                self._stage_changes(spinner)
+            print("🚀 正在初始化提交流程...")
+            self._stage_changes()
 
-                # 获取差异
-                spinner.text = "正在获取代码差异..."
-                # 获取文件列表
-                files_cmd = ["git", "diff", "--cached", "--name-only"]
-                process = subprocess.Popen(
-                    files_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE
-                )
-                files_output = process.communicate()[0].decode()
-                files = [f.strip() for f in files_output.split("\n") if f.strip()]
-                file_count = len(files)
-
-                # 获取完整差异
-                process = subprocess.Popen(
-                    ["git", "diff", "--cached", "--exit-code"],
-                    stdout=subprocess.PIPE,
-                    stderr=subprocess.PIPE,
-                )
-                diff = process.communicate()[0].decode(errors="ignore")
-                spinner.write(f"✅ 获取差异 ({file_count} 个文件)")
-                try:
-                    temp_diff_file_path = None
-                    # 生成提交信息
-                    spinner.text = "正在生成提交消息..."
-
-                    # 准备提示信息
-                    custom_prompt = get_git_commit_prompt()
-                    base_prompt = (
-                        custom_prompt
-                        if custom_prompt
-                        else f"""根据代码差异生成提交信息：
-                    提交信息应使用中文书写
+            # 获取差异
+            print("📊 正在获取代码差异...")
+            # 获取文件列表
+            files_cmd = ["git", "diff", "--cached", "--name-only"]
+            process = subprocess.Popen(
+                files_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+            )
+            files_output = process.communicate()[0].decode()
+            files = [f.strip() for f in files_output.split("\n") if f.strip()]
+            file_count = len(files)
+
+            # 获取完整差异
+            process = subprocess.Popen(
+                ["git", "diff", "--cached", "--exit-code"],
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+            )
+            diff = process.communicate()[0].decode(errors="ignore")
+            print(f"✅ 获取差异 ({file_count} 个文件)")
+            try:
+                temp_diff_file_path = None
+                # 生成提交信息
+                print("✨ 正在生成提交消息...")
+
+                # 准备提示信息
+                custom_prompt = get_git_commit_prompt()
+                base_prompt = (
+                    custom_prompt
+                    if custom_prompt
+                    else f"""根据代码差异生成提交信息：
+                提交信息应使用中文书写
 # 格式模板
 必须使用以下格式：
 
@@ -152,131 +153,125 @@ class GitCommitTool:
 5. 详细描述部分应解释"是什么"和"为什么"，而非"如何"
 6. 仅输出提交信息，不要输出其他内容
 """
-                    )
-                    base_prompt += f"""
+                )
+                base_prompt += f"""
 # 输出格式
 {ot("COMMIT_MESSAGE")}
 commit信息
 {ct("COMMIT_MESSAGE")}
-                    """
-
-                    # 获取模型并尝试上传文件
-                    platform = PlatformRegistry().get_normal_platform()
-                    upload_success = False
-
-                    # Check if content is too large
-                    is_large_content = is_context_overflow(diff)
-
-                    if is_large_content:
-                        if not platform.support_upload_files():
-                            spinner.text = "差异文件太大，无法处理"
-                            spinner.fail("❌")
-                            return {
-                                "success": False,
-                                "stdout": "",
-                                "stderr": "错误：差异文件太大，无法处理",
-                            }
-                        spinner.text = "正在上传代码差异文件..."
-                        with spinner.hidden():
-                            # 创建临时文件并写入差异内容
-                            with tempfile.NamedTemporaryFile(
-                                mode="w", suffix=".diff", delete=False
-                            ) as temp_diff_file:
-                                temp_diff_file_path = temp_diff_file.name
-                                temp_diff_file.write(diff)
-                                temp_diff_file.flush()
-                                spinner.write(f"✅ 差异内容已写入临时文件")
-                            upload_success = platform.upload_files(
-                                [temp_diff_file_path]
-                            )
-                        if upload_success:
-                            spinner.write("✅ 成功上传代码差异文件")
-                        else:
-                            spinner.text = "上传代码差异文件失败"
-                            spinner.fail("❌")
-                            return {
-                                "success": False,
-                                "stdout": "",
-                                "stderr": "错误：上传代码差异文件失败",
-                            }
-                    # 根据上传状态准备完整的提示
-                    if is_large_content:
-                        # 尝试生成提交信息
-                        spinner.text = "正在生成提交消息..."
-                        # 使用上传的文件
-                        prompt = (
-                            base_prompt
-                            + f"""
+                """
+
+                # 获取模型并尝试上传文件
+                platform = PlatformRegistry().get_normal_platform()
+                upload_success = False
+
+                # Check if content is too large
+                is_large_content = is_context_overflow(diff)
+
+                if is_large_content:
+                    if not platform.support_upload_files():
+                        print("❌ 差异文件太大，无法处理")
+                        return {
+                            "success": False,
+                            "stdout": "",
+                            "stderr": "错误：差异文件太大，无法处理",
+                        }
+                    print("📤 正在上传代码差异文件...")
+                    # 创建临时文件并写入差异内容
+                    with tempfile.NamedTemporaryFile(
+                        mode="w", suffix=".diff", delete=False
+                    ) as temp_diff_file:
+                        temp_diff_file_path = temp_diff_file.name
+                        temp_diff_file.write(diff)
+                        temp_diff_file.flush()
+                        print(f"✅ 差异内容已写入临时文件")
+                    upload_success = platform.upload_files([temp_diff_file_path])
+                    if upload_success:
+                        print("✅ 成功上传代码差异文件")
+                    else:
+                        print("❌ 上传代码差异文件失败")
+                        return {
+                            "success": False,
+                            "stdout": "",
+                            "stderr": "错误：上传代码差异文件失败",
+                        }
+                # 根据上传状态准备完整的提示
+                if is_large_content:
+                    # 尝试生成提交信息
+                    print("✨ 正在生成提交消息...")
+                    # 使用上传的文件
+                    prompt = (
+                        base_prompt
+                        + f"""
 # 变更概述
 - 变更文件数量: {file_count} 个文件
 - 已上传包含完整代码差异的文件
 
 请详细分析已上传的代码差异文件，生成符合上述格式的提交信息。
 """
-                        )
-                        commit_message = platform.chat_until_success(prompt)
-                    else:
-                        prompt = (
-                            base_prompt
-                            + f"""
+                    )
+                    commit_message = platform.chat_until_success(prompt)
+                else:
+                    prompt = (
+                        base_prompt
+                        + f"""
 # 分析材料
 {diff}
 """
-                        )
-                        commit_message = platform.chat_until_success(prompt)
-
-                    while True:
-                        # 只在特定情况下重新获取commit_message
-                        if (
-                            not upload_success
-                            and not is_large_content
-                            and not commit_message
-                        ):
-                            commit_message = platform.chat_until_success(prompt)
-                        extracted_message = self._extract_commit_message(commit_message)
-                        # 如果成功提取，就跳出循环
-                        if extracted_message:
-                            commit_message = extracted_message
-                            # 应用prefix和suffix
-                            if prefix:
-                                commit_message = f"{prefix} {commit_message}"
-                            if suffix:
-                                commit_message = f"{commit_message}\n{suffix}"
-                            break
-                        prompt = f"""格式错误，请按照以下格式重新生成提交信息：
-                        {ot("COMMIT_MESSAGE")}
-                        commit信息
-                        {ct("COMMIT_MESSAGE")}
-                        """
-                        commit_message = platform.chat_until_success(prompt)
-                    spinner.write("✅ 生成提交消息")
-
-                    # 执行提交
-                    spinner.text = "正在准备提交..."
-                    with tempfile.NamedTemporaryFile(mode="w", delete=True) as tmp_file:
-                        tmp_file.write(commit_message)
-                        tmp_file.flush()
-                        spinner.text = "正在执行提交..."
-                        commit_cmd = ["git", "commit", "-F", tmp_file.name]
-                        subprocess.Popen(
-                            commit_cmd,
-                            stdout=subprocess.DEVNULL,
-                            stderr=subprocess.DEVNULL,
-                        ).wait()
-                        spinner.write("✅ 提交")
-
-                    commit_hash = self._get_last_commit_hash()
-                    spinner.text = "完成提交"
-                    spinner.ok("✅")
-                finally:
-                    # 清理临时差异文件
-                    if temp_diff_file_path is not None and os.path.exists(
-                        temp_diff_file_path
+                    )
+                    commit_message = platform.chat_until_success(prompt)
+
+                while True:
+                    # 只在特定情况下重新获取commit_message
+                    if (
+                        not upload_success
+                        and not is_large_content
+                        and not commit_message
                     ):
-                        try:
-                            os.unlink(temp_diff_file_path)
-                        except Exception as e:
-                            spinner.write(f"⚠️ 无法删除临时文件: {str(e)}")
+                        commit_message = platform.chat_until_success(prompt)
+                    extracted_message = self._extract_commit_message(commit_message)
+                    # 如果成功提取，就跳出循环
+                    if extracted_message:
+                        commit_message = extracted_message
+                        # 应用prefix和suffix
+                        if prefix:
+                            commit_message = f"{prefix} {commit_message}"
+                        if suffix:
+                            commit_message = f"{commit_message}\n{suffix}"
+                        break
+                    prompt = f"""格式错误，请按照以下格式重新生成提交信息：
+                    {ot("COMMIT_MESSAGE")}
+                    commit信息
+                    {ct("COMMIT_MESSAGE")}
+                    """
+                    commit_message = platform.chat_until_success(prompt)
+                print("✅ 生成提交消息")
+
+                # 执行提交
+                print("⚙️ 正在准备提交...")
+                with tempfile.NamedTemporaryFile(mode="w", delete=True) as tmp_file:
+                    tmp_file.write(commit_message)
+                    tmp_file.flush()
+                    print("💾 正在执行提交...")
+                    commit_cmd = ["git", "commit", "-F", tmp_file.name]
+                    subprocess.Popen(
+                        commit_cmd,
+                        stdout=subprocess.DEVNULL,
+                        stderr=subprocess.DEVNULL,
+                    ).wait()
+                    print("✅ 提交")
+
+                commit_hash = self._get_last_commit_hash()
+                print("✅ 完成提交")
+            finally:
+                # 清理临时差异文件
+                if temp_diff_file_path is not None and os.path.exists(
+                    temp_diff_file_path
+                ):
+                    try:
+                        os.unlink(temp_diff_file_path)
+                    except Exception as e:
+                        print(f"⚠️ 无法删除临时文件: {str(e)}")
 
             PrettyOutput.print(
                 f"提交哈希: {commit_hash}\n提交消息: {commit_message}",

jarvis/jarvis_methodology/main.py

@@ -14,11 +14,12 @@ import json
 import os
 
 import yaml  # type: ignore
-from yaspin import yaspin  # type: ignore
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_utils.methodology import (_get_methodology_directory,
-                                             _load_all_methodologies)
+from jarvis.jarvis_utils.methodology import (
+    _get_methodology_directory,
+    _load_all_methodologies,
+)
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
@@ -128,46 +129,40 @@ def extract_methodology(input_file):
 """
 
         # 调用大模型平台提取方法论
-        with yaspin(text="正在提取方法论...", color="yellow") as spinner:
-            try:
-                response = platform.chat_until_success(prompt)
-            except Exception as e:
-                spinner.text = "提取失败"
-                spinner.fail("❌")
-                PrettyOutput.print(f"提取方法论失败: {str(e)}", OutputType.ERROR)
-                return
-
-            # 提取YAML部分
-            methodologies_start = response.find("<methodologies>") + len(
-                "<methodologies>"
+        print("📥 正在提取方法论...")
+        try:
+            response = platform.chat_until_success(prompt)
+        except Exception as e:
+            print("❌ 提取失败")
+            PrettyOutput.print(f"提取方法论失败: {str(e)}", OutputType.ERROR)
+            return
+
+        # 提取YAML部分
+        methodologies_start = response.find("<methodologies>") + len("<methodologies>")
+        methodologies_end = response.find("</methodologies>")
+        if methodologies_start == -1 or methodologies_end == -1:
+            print("❌ 响应格式无效")
+            PrettyOutput.print(
+                "大模型未返回有效的<methodologies>格式", OutputType.ERROR
             )
-            methodologies_end = response.find("</methodologies>")
-            if methodologies_start == -1 or methodologies_end == -1:
-                spinner.text = "响应格式无效"
-                spinner.fail("❌")
-                PrettyOutput.print(
-                    "大模型未返回有效的<methodologies>格式", OutputType.ERROR
-                )
-                return
-
-            yaml_content = response[methodologies_start:methodologies_end].strip()
-
-            try:
-                data = yaml.safe_load(yaml_content)
-                extracted_methodologies = {
-                    item["problem_type"]: item["content"] for item in data
-                }
-            except (yaml.YAMLError, KeyError, TypeError) as e:
-                spinner.text = "YAML解析失败"
-                spinner.fail("❌")
-                PrettyOutput.print(f"YAML解析错误: {str(e)}", OutputType.ERROR)
-                return
-
-            if not extracted_methodologies:
-                spinner.text = "未提取到有效方法论"
-                spinner.fail("❌")
-                return
-            spinner.ok("✅")
+            return
+
+        yaml_content = response[methodologies_start:methodologies_end].strip()
+
+        try:
+            data = yaml.safe_load(yaml_content)
+            extracted_methodologies = {
+                item["problem_type"]: item["content"] for item in data
+            }
+        except (yaml.YAMLError, KeyError, TypeError) as e:
+            print("❌ YAML解析失败")
+            PrettyOutput.print(f"YAML解析错误: {str(e)}", OutputType.ERROR)
+            return
+
+        if not extracted_methodologies:
+            print("❌ 未提取到有效方法论")
+            return
+        print("✅ 提取到有效方法论")
 
         # 加载现有方法论
         existing_methodologies = _load_all_methodologies()
@@ -233,46 +228,40 @@ def extract_methodology_from_url(url):
 6. 内容字段使用|保留多行格式
 """
         # 调用大模型平台提取方法论
-        with yaspin(text="正在从URL提取方法论...", color="yellow") as spinner:
-            try:
-                response = platform.chat_until_success(prompt)
-            except Exception as e:
-                spinner.text = "提取失败"
-                spinner.fail("❌")
-                PrettyOutput.print(f"提取方法论失败: {str(e)}", OutputType.ERROR)
-                return
-
-            # 提取YAML部分
-            methodologies_start = response.find("<methodologies>") + len(
-                "<methodologies>"
+        print("📥 正在从URL提取方法论...")
+        try:
+            response = platform.chat_until_success(prompt)
+        except Exception as e:
+            print("❌ 提取失败")
+            PrettyOutput.print(f"提取方法论失败: {str(e)}", OutputType.ERROR)
+            return
+
+        # 提取YAML部分
+        methodologies_start = response.find("<methodologies>") + len("<methodologies>")
+        methodologies_end = response.find("</methodologies>")
+        if methodologies_start == -1 or methodologies_end == -1:
+            print("❌ 响应格式无效")
+            PrettyOutput.print(
+                "大模型未返回有效的<methodologies>格式", OutputType.ERROR
             )
-            methodologies_end = response.find("</methodologies>")
-            if methodologies_start == -1 or methodologies_end == -1:
-                spinner.text = "响应格式无效"
-                spinner.fail("❌")
-                PrettyOutput.print(
-                    "大模型未返回有效的<methodologies>格式", OutputType.ERROR
-                )
-                return
-
-            yaml_content = response[methodologies_start:methodologies_end].strip()
-
-            try:
-                data = yaml.safe_load(yaml_content)
-                extracted_methodologies = {
-                    item["problem_type"]: item["content"] for item in data
-                }
-            except (yaml.YAMLError, KeyError, TypeError) as e:
-                spinner.text = "YAML解析失败"
-                spinner.fail("❌")
-                PrettyOutput.print(f"YAML解析错误: {str(e)}", OutputType.ERROR)
-                return
-
-            if not extracted_methodologies:
-                spinner.text = "未提取到有效方法论"
-                spinner.fail("❌")
-                return
-            spinner.ok("✅")
+            return
+
+        yaml_content = response[methodologies_start:methodologies_end].strip()
+
+        try:
+            data = yaml.safe_load(yaml_content)
+            extracted_methodologies = {
+                item["problem_type"]: item["content"] for item in data
+            }
+        except (yaml.YAMLError, KeyError, TypeError) as e:
+            print("❌ YAML解析失败")
+            PrettyOutput.print(f"YAML解析错误: {str(e)}", OutputType.ERROR)
+            return
+
+        if not extracted_methodologies:
+            print("❌ 未提取到有效方法论")
+            return
+        print("✅ 提取到有效方法论")
 
         # 加载现有方法论
         existing_methodologies = _load_all_methodologies()

jarvis/jarvis_platform/base.py

@@ -3,19 +3,21 @@ import re
 from abc import ABC, abstractmethod
 from typing import Generator, List, Tuple
 
-from rich import box # type: ignore
-from rich.live import Live # type: ignore
-from rich.panel import Panel # type: ignore
-from rich.text import Text # type: ignore
-
-from jarvis.jarvis_utils.config import (get_max_input_token_count,
-                                        get_pretty_output, is_print_prompt)
+from rich import box  # type: ignore
+from rich.live import Live  # type: ignore
+from rich.panel import Panel  # type: ignore
+from rich.text import Text  # type: ignore
+
+from jarvis.jarvis_utils.config import (
+    get_max_input_token_count,
+    get_pretty_output,
+    is_print_prompt,
+)
 from jarvis.jarvis_utils.embedding import split_text_into_chunks
 from jarvis.jarvis_utils.globals import set_in_chat
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ct, ot
-from jarvis.jarvis_utils.utils import (get_context_token_count, while_success,
-                                       while_true)
+from jarvis.jarvis_utils.utils import get_context_token_count, while_success, while_true
 
 
 class BasePlatform(ABC):
@@ -64,7 +66,7 @@ class BasePlatform(ABC):
             max_chunk_size = get_max_input_token_count() - 1024  # 留出一些余量
             min_chunk_size = get_max_input_token_count() - 2048
             inputs = split_text_into_chunks(message, max_chunk_size, min_chunk_size)
-            print("正在提交长上下文...")
+            print("📤 正在提交长上下文...")
             prefix_prompt = f"""
             我将分多次提供大量内容，在我明确告诉你内容已经全部提供完毕之前，每次仅需要输出"已收到"，明白请输出"开始接收输入"。
             """
@@ -76,10 +78,11 @@ class BasePlatform(ABC):
                 submit_count += 1
                 length += len(input)
                 print(
-                    f"正在提交第{submit_count}部分（共{len(inputs)}部分({length}/{len(message)})）"
+                    f"📤 正在提交第{submit_count}部分（共{len(inputs)}部分({length}/{len(message)})）"
                 )
-                
-                response += "\n" + while_true(
+
+                response += "\n"
+                for trunk in while_true(
                     lambda: while_success(
                         lambda: self.chat(
                             f"<part_content>{input}</part_content>\n\n请返回<已收到>，不需要返回其他任何内容"
@@ -87,12 +90,13 @@ class BasePlatform(ABC):
                         5,
                     ),
                     5,
-                )
-                
+                ):
+                    response += trunk
+
                 print(
-                    f"提交第{submit_count}部分完成，当前进度：{length}/{len(message)}"
+                    f"📤 提交第{submit_count}部分完成，当前进度：{length}/{len(message)}"
                 )
-            print("提交完成 ✅")
+            print("✅ 提交完成")
             response += "\n" + while_true(
                 lambda: while_success(
                     lambda: self._chat("内容已经全部提供完毕，请根据内容继续"), 5