jarvis-ai-assistant 0.2.7__py3-none-any.whl → 0.3.0__py3-none-any.whl

jarvis/jarvis_utils/input.py

@@ -9,40 +9,141 @@
 - 用于输入控制的自定义键绑定
 """
 import os
-from typing import Iterable
+from typing import Iterable, List
 
 from colorama import Fore
-from colorama import Style as ColoramaStyle  # type: ignore
-from fuzzywuzzy import process  # type: ignore
-from prompt_toolkit import PromptSession  # type: ignore
-from prompt_toolkit.completion import CompleteEvent  # type: ignore
+from colorama import Style as ColoramaStyle
+from fuzzywuzzy import process
+from prompt_toolkit import PromptSession
+from prompt_toolkit.application import Application
+from prompt_toolkit.completion import CompleteEvent
 from prompt_toolkit.completion import (
     Completer,
     Completion,
     PathCompleter,
 )
-from prompt_toolkit.document import Document  # type: ignore
-from prompt_toolkit.formatted_text import FormattedText  # type: ignore
-from prompt_toolkit.history import FileHistory  # type: ignore
-from prompt_toolkit.key_binding import KeyBindings  # type: ignore
-from prompt_toolkit.styles import Style as PromptStyle  # type: ignore
-
+from prompt_toolkit.document import Document
+from prompt_toolkit.formatted_text import FormattedText
+from prompt_toolkit.history import FileHistory
+from prompt_toolkit.key_binding import KeyBindings
+from prompt_toolkit.layout.containers import Window
+from prompt_toolkit.layout.controls import FormattedTextControl
+from prompt_toolkit.layout.layout import Layout
+from prompt_toolkit.styles import Style as PromptStyle
+
+from jarvis.jarvis_utils.clipboard import copy_to_clipboard
 from jarvis.jarvis_utils.config import get_data_dir, get_replace_map
+from jarvis.jarvis_utils.globals import get_message_history
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ot
-from jarvis.jarvis_utils.utils import copy_to_clipboard
 
 # Sentinel value to indicate that Ctrl+O was pressed
 CTRL_O_SENTINEL = "__CTRL_O_PRESSED__"
 
 
-def get_single_line_input(tip: str) -> str:
+def get_single_line_input(tip: str, default: str = "") -> str:
     """
     获取支持历史记录的单行输入。
     """
     session: PromptSession = PromptSession(history=None)
     style = PromptStyle.from_dict({"prompt": "ansicyan"})
-    return session.prompt(f"{tip}", style=style)
+    return session.prompt(f"{tip}", default=default, style=style)
+
+
+def get_choice(tip: str, choices: List[str]) -> str:
+    """
+    提供一个可滚动的选择列表供用户选择。
+    """
+    if not choices:
+        raise ValueError("Choices cannot be empty.")
+
+    try:
+        terminal_height = os.get_terminal_size().lines
+    except OSError:
+        terminal_height = 25  # 如果无法确定终端大小，则使用默认高度
+
+    # 为提示和缓冲区保留行
+    max_visible_choices = max(5, terminal_height - 4)
+
+    bindings = KeyBindings()
+    selected_index = 0
+    start_index = 0
+
+    @bindings.add("up")
+    def _(event):
+        nonlocal selected_index, start_index
+        selected_index = (selected_index - 1 + len(choices)) % len(choices)
+        if selected_index < start_index:
+            start_index = selected_index
+        elif selected_index == len(choices) - 1:  # 支持从第一项上翻到最后一项时滚动
+            start_index = max(0, len(choices) - max_visible_choices)
+        event.app.invalidate()
+
+    @bindings.add("down")
+    def _(event):
+        nonlocal selected_index, start_index
+        selected_index = (selected_index + 1) % len(choices)
+        if selected_index >= start_index + max_visible_choices:
+            start_index = selected_index - max_visible_choices + 1
+        elif selected_index == 0:  # 支持从最后一项下翻到第一项时滚动
+            start_index = 0
+        event.app.invalidate()
+
+    @bindings.add("enter")
+    def _(event):
+        event.app.exit(result=choices[selected_index])
+
+    def get_prompt_tokens():
+        tokens = [("class:question", f"{tip} (使用上下箭头选择, Enter确认)\n")]
+
+        end_index = min(start_index + max_visible_choices, len(choices))
+        visible_choices_slice = choices[start_index:end_index]
+
+        if start_index > 0:
+            tokens.append(("class:indicator", "  ... (更多选项在上方) ...\n"))
+
+        for i, choice in enumerate(visible_choices_slice, start=start_index):
+            if i == selected_index:
+                tokens.append(("class:selected", f"> {choice}\n"))
+            else:
+                tokens.append(("", f"  {choice}\n"))
+
+        if end_index < len(choices):
+            tokens.append(("class:indicator", "  ... (更多选项在下方) ...\n"))
+
+        return FormattedText(tokens)
+
+    style = PromptStyle.from_dict(
+        {
+            "question": "bold",
+            "selected": "bg:#696969 #ffffff",
+            "indicator": "fg:gray",
+        }
+    )
+
+    layout = Layout(
+        container=Window(
+            content=FormattedTextControl(
+                text=get_prompt_tokens,
+                focusable=True,
+                key_bindings=bindings,
+            )
+        )
+    )
+
+    app: Application = Application(
+        layout=layout,
+        key_bindings=bindings,
+        style=style,
+        mouse_support=True,
+        full_screen=True,
+    )
+
+    try:
+        result = app.run()
+        return result if result is not None else ""
+    except (KeyboardInterrupt, EOFError):
+        return ""
 
 
 class FileCompleter(Completer):
@@ -160,7 +261,6 @@ def _show_history_and_copy():
     Displays message history and handles copying to clipboard.
     This function uses standard I/O and is safe to call outside a prompt session.
     """
-    from jarvis.jarvis_utils.globals import get_message_history
 
     history = get_message_history()
     if not history:
@@ -170,7 +270,9 @@ def _show_history_and_copy():
     print("\n" + "=" * 20 + " 消息历史记录 " + "=" * 20)
     for i, msg in enumerate(history):
         cleaned_msg = msg.replace("\n", r"\n")
-        display_msg = (cleaned_msg[:70] + "...") if len(cleaned_msg) > 70 else cleaned_msg
+        display_msg = (
+            (cleaned_msg[:70] + "...") if len(cleaned_msg) > 70 else cleaned_msg
+        )
         print(f"  {i + 1}: {display_msg.strip()}")
     print("=" * 58 + "\n")
 

jarvis/jarvis_utils/methodology.py

@@ -19,10 +19,12 @@ from jarvis.jarvis_utils.config import (
     get_data_dir,
     get_methodology_dirs,
     get_central_methodology_repo,
+    get_max_input_token_count,
 )
 from jarvis.jarvis_utils.globals import get_agent, current_agent_name
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import is_context_overflow, daily_check_git_updates
+from jarvis.jarvis_utils.embedding import get_context_token_count
 
 
 def _get_methodology_directory() -> str:
@@ -273,14 +275,16 @@ def load_methodology(user_input: str, tool_registery: Optional[Any] = None) -> s
         if not selected_methodologies:
             return "没有历史方法论可参考"
 
+        # 获取最大输入token数的2/3作为方法论的token限制
+        max_input_tokens = get_max_input_token_count()
+        methodology_token_limit = int(max_input_tokens * 2 / 3)
+
         # 步骤3：将选择出来的方法论内容提供给大模型生成步骤
-        final_prompt = f"""以下是与用户需求相关的方法论内容：
+        # 首先构建基础提示词部分
+        base_prompt = f"""以下是与用户需求相关的方法论内容：
 
 """
-        for problem_type, content in selected_methodologies.items():
-            final_prompt += f"## {problem_type}\n\n{content}\n\n---\n\n"
-
-        final_prompt += f"""以下是所有可用的工具内容：
+        suffix_prompt = f"""以下是所有可用的工具内容：
 
 {prompt}
 
@@ -300,6 +304,45 @@ def load_methodology(user_input: str, tool_registery: Optional[Any] = None) -> s
 除以上要求外，不要输出任何内容
 """
 
+        # 计算基础部分的token数
+        base_tokens = get_context_token_count(base_prompt + suffix_prompt)
+        available_tokens = methodology_token_limit - base_tokens
+
+        # 基于token限制筛选方法论内容
+        final_prompt = base_prompt
+        selected_count = 0
+        total_methodology_tokens = 0
+
+        for problem_type, content in selected_methodologies.items():
+            methodology_text = f"## {problem_type}\n\n{content}\n\n---\n\n"
+            methodology_tokens = get_context_token_count(methodology_text)
+
+            # 检查是否会超过token限制
+            if total_methodology_tokens + methodology_tokens > available_tokens:
+                PrettyOutput.print(
+                    f"达到方法论token限制 ({total_methodology_tokens}/{available_tokens})，停止加载更多方法论",
+                    OutputType.INFO,
+                )
+                break
+
+            final_prompt += methodology_text
+            total_methodology_tokens += methodology_tokens
+            selected_count += 1
+
+        # 如果一个方法论都没有加载成功
+        if selected_count == 0:
+            PrettyOutput.print(
+                "警告：由于token限制，无法加载任何方法论内容", OutputType.WARNING
+            )
+            return "没有历史方法论可参考"
+
+        final_prompt += suffix_prompt
+
+        PrettyOutput.print(
+            f"成功加载 {selected_count} 个方法论，总token数: {total_methodology_tokens}",
+            OutputType.INFO,
+        )
+
         # 如果内容不大，直接使用chat_until_success
         return platform.chat_until_success(final_prompt)
 

jarvis/jarvis_utils/utils.py

@@ -330,11 +330,18 @@ def _show_usage_stats() -> None:
                 if total_changes > 0:
                     parts.append(f"代码修改 {total_changes:,} 次")
                 if total_lines_modified > 0:
-                    parts.append(f"代码行数 {total_lines_modified:,} 行")
+                    parts.append(f"修改代码行数 {total_lines_modified:,} 行")
 
                 if parts:
                     summary_content.append(f"📈 总计: {', '.join(parts)}")
 
+                # 添加代码采纳率显示
+                adoption_metrics = categorized_stats["adoption"]["metrics"]
+                if "adoption_rate" in adoption_metrics:
+                    summary_content.append(
+                        f"✅ 代码采纳率: {adoption_metrics['adoption_rate']}"
+                    )
+
             # 计算节省的时间
             time_saved_seconds = 0
             tool_stats = categorized_stats["tool"]["metrics"]
@@ -484,6 +491,153 @@ def init_env(welcome_str: str, config_file: Optional[str] = None) -> None:
         sys.exit(0)
 
 
+def _interactive_config_setup(config_file_path: Path):
+    """交互式配置引导"""
+    from jarvis.jarvis_platform.registry import PlatformRegistry
+    from jarvis.jarvis_utils.input import (
+        get_choice,
+        get_single_line_input as get_input,
+        user_confirm as get_yes_no,
+    )
+
+    PrettyOutput.print(
+        "欢迎使用 Jarvis！未找到配置文件，现在开始引导配置。", OutputType.INFO
+    )
+
+    # 1. 选择平台
+    registry = PlatformRegistry.get_global_platform_registry()
+    platforms = registry.get_available_platforms()
+    platform_name = get_choice("请选择您要使用的AI平台", platforms)
+
+    # 2. 配置环境变量
+    platform_class = registry.platforms.get(platform_name)
+    if not platform_class:
+        PrettyOutput.print(f"平台 '{platform_name}' 加载失败。", OutputType.ERROR)
+        sys.exit(1)
+
+    env_vars = {}
+    required_keys = platform_class.get_required_env_keys()
+    defaults = platform_class.get_env_defaults()
+    if required_keys:
+        PrettyOutput.print(
+            f"请输入 {platform_name} 平台所需的配置信息:", OutputType.INFO
+        )
+        for key in required_keys:
+            default_value = defaults.get(key, "")
+            prompt_text = f"  - {key}"
+            if default_value:
+                prompt_text += f" (默认: {default_value})"
+            prompt_text += ": "
+
+            value = get_input(prompt_text, default=default_value)
+            env_vars[key] = value
+            os.environ[key] = value  # 立即设置环境变量以便后续测试
+
+    # 3. 选择模型
+    try:
+        platform_instance = registry.create_platform(platform_name)
+        if not platform_instance:
+            PrettyOutput.print(f"无法创建平台 '{platform_name}'。", OutputType.ERROR)
+            sys.exit(1)
+
+        model_list_tuples = platform_instance.get_model_list()
+        model_choices = [f"{name} ({desc})" for name, desc in model_list_tuples]
+        model_display_name = get_choice("请选择要使用的模型", model_choices)
+
+        # 从显示名称反向查找模型ID
+        selected_index = model_choices.index(model_display_name)
+        model_name, _ = model_list_tuples[selected_index]
+
+    except Exception:
+        PrettyOutput.print("获取模型列表失败", OutputType.ERROR)
+        if not get_yes_no("无法获取模型列表，是否继续配置？"):
+            sys.exit(1)
+        model_name = get_input("请输入模型名称:")
+
+    # 4. 测试配置
+    PrettyOutput.print("正在测试配置...", OutputType.INFO)
+    test_passed = False
+    try:
+        platform_instance = registry.create_platform(platform_name)
+        if platform_instance:
+            platform_instance.set_model_name(model_name)
+            response_generator = platform_instance.chat("hello")
+            response = "".join(response_generator)
+            if response:
+                PrettyOutput.print(
+                    f"测试成功，模型响应: {response}", OutputType.SUCCESS
+                )
+                test_passed = True
+            else:
+                PrettyOutput.print("测试失败，模型没有响应。", OutputType.ERROR)
+        else:
+            PrettyOutput.print("测试失败，无法创建平台实例。", OutputType.ERROR)
+    except Exception:
+        PrettyOutput.print("测试失败", OutputType.ERROR)
+
+    # 5. 生成并保存配置
+    config_data = {
+        "ENV": env_vars,
+        "JARVIS_PLATFORM": platform_name,
+        "JARVIS_THINKING_PLATFORM": platform_name,
+        "JARVIS_MODEL": model_name,
+        "JARVIS_THINKING_MODEL": model_name,
+    }
+
+    if test_passed:
+        PrettyOutput.print("配置已测试通过，将为您生成配置文件。", OutputType.SUCCESS)
+    else:
+        if not get_yes_no("配置测试失败，您确定要保存这个配置吗？"):
+            PrettyOutput.print("配置未保存。", OutputType.INFO)
+            sys.exit(0)
+
+    try:
+        schema_path = (
+            Path(__file__).parent.parent / "jarvis_data" / "config_schema.json"
+        )
+        if schema_path.exists():
+            config_file_path.parent.mkdir(parents=True, exist_ok=True)
+            # 使用现有的函数生成默认结构，然后覆盖引导配置
+            generate_default_config(str(schema_path.absolute()), str(config_file_path))
+
+            # 读取刚生成的默认配置
+            with open(config_file_path, "r", encoding="utf-8") as f:
+                content = f.read()
+                default_config = yaml.safe_load(
+                    content.split("\n", 1)[1]
+                )  # 跳过 schema 行
+
+            # 合并用户配置
+            if default_config is None:
+                default_config = {}
+            default_config.update(config_data)
+
+            # 写回合并后的配置
+            final_content = (
+                f"# yaml-language-server: $schema={str(schema_path.absolute())}\n"
+            )
+            final_content += yaml.dump(
+                default_config, allow_unicode=True, sort_keys=False
+            )
+            with open(config_file_path, "w", encoding="utf-8") as f:
+                f.write(final_content)
+
+            PrettyOutput.print(
+                f"配置文件已生成: {config_file_path}", OutputType.SUCCESS
+            )
+            PrettyOutput.print("配置完成，请重新启动Jarvis。", OutputType.INFO)
+            sys.exit(0)
+        else:
+            PrettyOutput.print(
+                "未找到config schema，无法生成配置文件。", OutputType.ERROR
+            )
+            sys.exit(1)
+
+    except Exception:
+        PrettyOutput.print("生成配置文件失败", OutputType.ERROR)
+        sys.exit(1)
+
+
 def load_config():
     config_file = g_config_file
     config_file_path = (
@@ -498,22 +652,7 @@ def load_config():
         if old_config_file.exists():  # 旧的配置文件存在
             _read_old_config_file(old_config_file)
         else:
-            # 生成默认配置文件
-            schema_path = (
-                Path(__file__).parent.parent / "jarvis_data" / "config_schema.json"
-            )
-            if schema_path.exists():
-                try:
-                    config_file_path.parent.mkdir(parents=True, exist_ok=True)
-                    generate_default_config(
-                        str(schema_path.absolute()), str(config_file_path)
-                    )
-                    PrettyOutput.print(
-                        f"已生成默认配置文件: {config_file_path}", OutputType.INFO
-                    )
-                    sys.exit(0)
-                except Exception as e:
-                    PrettyOutput.print(f"生成默认配置文件失败: {e}", OutputType.ERROR)
+            _interactive_config_setup(config_file_path)
     else:
         _load_and_process_config(str(config_file_path.parent), str(config_file_path))
 
@@ -521,6 +660,9 @@ def load_config():
 from typing import Tuple
 
 
+from typing import Tuple
+
+
 def _load_config_file(config_file: str) -> Tuple[str, dict]:
     """读取并解析YAML格式的配置文件
 
@@ -587,10 +729,24 @@ def _load_and_process_config(jarvis_dir: str, config_file: str) -> None:
         jarvis_dir: Jarvis数据目录路径
         config_file: 配置文件路径
     """
-    content, config_data = _load_config_file(config_file)
-    _ensure_schema_declaration(jarvis_dir, config_file, content, config_data)
-    set_global_env_data(config_data)
-    _process_env_variables(config_data)
+    from jarvis.jarvis_utils.input import user_confirm as get_yes_no
+
+    try:
+        content, config_data = _load_config_file(config_file)
+        _ensure_schema_declaration(jarvis_dir, config_file, content, config_data)
+        set_global_env_data(config_data)
+        _process_env_variables(config_data)
+    except Exception:
+        PrettyOutput.print("加载配置文件失败", OutputType.ERROR)
+        if get_yes_no("配置文件格式错误，是否删除并重新配置？"):
+            try:
+                os.remove(config_file)
+                PrettyOutput.print(
+                    "已删除损坏的配置文件，请重启Jarvis以重新配置。", OutputType.SUCCESS
+                )
+            except Exception:
+                PrettyOutput.print("删除配置文件失败", OutputType.ERROR)
+        sys.exit(1)
 
 
 def generate_default_config(schema_path: str, output_path: str) -> None:
@@ -804,91 +960,6 @@ def get_loc_stats() -> str:
         return ""
 
 
-def copy_to_clipboard(text: str) -> None:
-    """将文本复制到剪贴板，支持Windows、macOS和Linux
-
-    参数:
-        text: 要复制的文本
-    """
-    print("--- 剪贴板内容开始 ---")
-    print(text)
-    print("--- 剪贴板内容结束 ---")
-
-    system = platform.system()
-
-    # Windows系统
-    if system == "Windows":
-        try:
-            # 使用Windows的clip命令
-            process = subprocess.Popen(
-                ["clip"],
-                stdin=subprocess.PIPE,
-                stdout=subprocess.DEVNULL,
-                stderr=subprocess.DEVNULL,
-                shell=True,
-            )
-            if process.stdin:
-                process.stdin.write(text.encode("utf-8"))
-                process.stdin.close()
-            return
-        except Exception as e:
-            PrettyOutput.print(f"使用Windows clip命令时出错: {e}", OutputType.WARNING)
-
-    # macOS系统
-    elif system == "Darwin":
-        try:
-            process = subprocess.Popen(
-                ["pbcopy"],
-                stdin=subprocess.PIPE,
-                stdout=subprocess.DEVNULL,
-                stderr=subprocess.DEVNULL,
-            )
-            if process.stdin:
-                process.stdin.write(text.encode("utf-8"))
-                process.stdin.close()
-            return
-        except Exception as e:
-            PrettyOutput.print(f"使用macOS pbcopy命令时出错: {e}", OutputType.WARNING)
-
-    # Linux系统
-    else:
-        # 尝试使用 xsel
-        try:
-            process = subprocess.Popen(
-                ["xsel", "-b", "-i"],
-                stdin=subprocess.PIPE,
-                stdout=subprocess.DEVNULL,
-                stderr=subprocess.DEVNULL,
-            )
-            if process.stdin:
-                process.stdin.write(text.encode("utf-8"))
-                process.stdin.close()
-            return
-        except FileNotFoundError:
-            pass  # xsel 未安装，继续尝试下一个
-        except Exception as e:
-            PrettyOutput.print(f"使用xsel时出错: {e}", OutputType.WARNING)
-
-        # 尝试使用 xclip
-        try:
-            process = subprocess.Popen(
-                ["xclip", "-selection", "clipboard"],
-                stdin=subprocess.PIPE,
-                stdout=subprocess.DEVNULL,
-                stderr=subprocess.DEVNULL,
-            )
-            if process.stdin:
-                process.stdin.write(text.encode("utf-8"))
-                process.stdin.close()
-            return
-        except FileNotFoundError:
-            PrettyOutput.print(
-                "xsel 和 xclip 均未安装, 无法复制到剪贴板", OutputType.WARNING
-            )
-        except Exception as e:
-            PrettyOutput.print(f"使用xclip时出错: {e}", OutputType.WARNING)
-
-
 def _pull_git_repo(repo_path: Path, repo_type: str):
     """对指定的git仓库执行git pull操作，并根据commit hash判断是否有更新。"""
     git_dir = repo_path / ".git"
@@ -946,6 +1017,25 @@ def _pull_git_repo(repo_path: Path, repo_type: str):
         )
         before_hash = before_hash_result.stdout.strip()
 
+        # 检查是否是空仓库
+        ls_remote_result = subprocess.run(
+            ["git", "ls-remote", "--heads", "origin"],
+            cwd=repo_path,
+            capture_output=True,
+            text=True,
+            encoding="utf-8",
+            errors="replace",
+            check=True,
+            timeout=10,
+        )
+
+        if not ls_remote_result.stdout.strip():
+            PrettyOutput.print(
+                f"{repo_type}库 '{repo_path.name}' 的远程仓库是空的，跳过更新。",
+                OutputType.INFO,
+            )
+            return
+
         # 执行 git pull
         pull_result = subprocess.run(
             ["git", "pull"],

{jarvis_ai_assistant-0.2.7.dist-info → jarvis_ai_assistant-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.2.7
+Version: 0.3.0
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire