jarvis-ai-assistant 0.2.2__py3-none-any.whl → 0.2.4__py3-none-any.whl

jarvis/jarvis_utils/globals.py

@@ -9,9 +9,11 @@
 """
 import os
 
-# 全局变量：保存最后一条消息
-last_message: str = ""
-from typing import Any, Dict, Set
+# 全局变量：保存消息历史
+from typing import Any, Dict, Set, List
+
+message_history: List[str] = []
+MAX_HISTORY_SIZE = 50
 
 import colorama
 from rich.console import Console
@@ -169,13 +171,18 @@ def get_interrupt() -> int:
 
 def set_last_message(message: str) -> None:
     """
-    设置最后一条消息。
+    将消息添加到历史记录中。
 
     参数:
         message: 要保存的消息
     """
-    global last_message
-    last_message = message
+    global message_history
+    if message:
+        # 避免重复添加
+        if not message_history or message_history[-1] != message:
+            message_history.append(message)
+            if len(message_history) > MAX_HISTORY_SIZE:
+                message_history.pop(0)
 
 
 def get_last_message() -> str:
@@ -183,6 +190,20 @@ def get_last_message() -> str:
     获取最后一条消息。
 
     返回:
-        str: 最后一条消息
+        str: 最后一条消息，如果历史记录为空则返回空字符串
+    """
+    global message_history
+    if message_history:
+        return message_history[-1]
+    return ""
+
+
+def get_message_history() -> List[str]:
+    """
+    获取完整的消息历史记录。
+
+    返回:
+        List[str]: 消息历史列表
     """
-    return last_message
+    global message_history
+    return message_history

jarvis/jarvis_utils/input.py

@@ -8,99 +8,73 @@
 - 带有模糊匹配的文件路径补全
 - 用于输入控制的自定义键绑定
 """
-from colorama import Fore  # type: ignore
+import os
+from typing import Iterable
+
+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 prompt_toolkit.completion import (
-    CompleteEvent,
     Completer,
-    Completion,  # type: ignore
+    Completion,
     PathCompleter,
-)  # type: ignore
+)
 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 jarvis.jarvis_utils.config import get_replace_map
+from jarvis.jarvis_utils.config import get_data_dir, get_replace_map
 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:
     """
     获取支持历史记录的单行输入。
-
-    参数：
-        tip: 要显示的提示信息
-
-    返回：
-        str: 用户的输入
     """
     session: PromptSession = PromptSession(history=None)
-    style = PromptStyle.from_dict(
-        {
-            "prompt": "ansicyan",
-        }
-    )
+    style = PromptStyle.from_dict({"prompt": "ansicyan"})
     return session.prompt(f"{tip}", style=style)
 
 
 class FileCompleter(Completer):
     """
     带有模糊匹配的文件路径自定义补全器。
-
-    属性：
-        path_completer: 基础路径补全器
-        max_suggestions: 显示的最大建议数量
-        min_score: 建议的最小匹配分数
     """
 
     def __init__(self):
-        """使用默认设置初始化文件补全器。"""
         self.path_completer = PathCompleter()
         self.max_suggestions = 10
         self.min_score = 10
         self.replace_map = get_replace_map()
 
-    def get_completions(self, document: Document, _: CompleteEvent) -> Completion:  # type: ignore
-        """
-        生成带有模糊匹配的文件路径补全建议。
-
-        参数：
-            document: 当前正在编辑的文档
-            complete_event: 补全事件
-
-        生成：
-            Completion: 建议的补全项
-        """
+    def get_completions(
+        self, document: Document, _: CompleteEvent
+    ) -> Iterable[Completion]:
         text = document.text_before_cursor
         cursor_pos = document.cursor_position
-        # 查找文本中的所有@位置
         at_positions = [i for i, char in enumerate(text) if char == "@"]
         if not at_positions:
             return
-        # 获取最后一个@位置
         current_at_pos = at_positions[-1]
-        # 如果光标不在最后一个@之后，则不补全
         if cursor_pos <= current_at_pos:
             return
-        # 检查@之后是否有空格
         text_after_at = text[current_at_pos + 1 : cursor_pos]
         if " " in text_after_at:
             return
 
-        # 获取当前@之后的文本
         file_path = text_after_at.strip()
-        # 计算替换长度
         replace_length = len(text_after_at) + 1
 
-        # 获取所有可能的补全项
         all_completions = []
-
-        # 1. 添加特殊标记
         all_completions.extend(
             [(ot(tag), self._get_description(tag)) for tag in self.replace_map.keys()]
         )
@@ -114,7 +88,6 @@ class FileCompleter(Completer):
             ]
         )
 
-        # 2. 添加文件列表
         try:
             import subprocess
 
@@ -135,9 +108,7 @@ class FileCompleter(Completer):
         except Exception:
             pass
 
-        # 统一过滤和排序
         if file_path:
-            # 使用模糊匹配过滤
             scored_items = process.extract(
                 file_path,
                 [item[0] for item in all_completions],
@@ -146,31 +117,25 @@ class FileCompleter(Completer):
             scored_items = [
                 (item[0], item[1]) for item in scored_items if item[1] > self.min_score
             ]
-            # 创建映射以便查找描述
             completion_map = {item[0]: item[1] for item in all_completions}
-            # 生成补全项
             for text, score in scored_items:
-                display_text = text
-                if score < 100:
-                    display_text = f"{text} ({score}%)"
+                display_text = f"{text} ({score}%)" if score < 100 else text
                 yield Completion(
                     text=f"'{text}'",
                     start_position=-replace_length,
                     display=display_text,
                     display_meta=completion_map.get(text, ""),
-                )  # type: ignore
+                )
         else:
-            # 没有输入时返回前max_suggestions个建议
             for text, desc in all_completions[: self.max_suggestions]:
                 yield Completion(
                     text=f"'{text}'",
                     start_position=-replace_length,
                     display=text,
                     display_meta=desc,
-                )  # type: ignore
+                )
 
     def _get_description(self, tag: str) -> str:
-        """获取标记的描述信息"""
         if tag in self.replace_map:
             return (
                 self.replace_map[tag].get("description", tag) + "(Append)"
@@ -181,15 +146,7 @@ class FileCompleter(Completer):
 
 
 def user_confirm(tip: str, default: bool = True) -> bool:
-    """提示用户确认是/否问题
-
-    参数:
-        tip: 显示给用户的消息
-        default: 用户直接回车时的默认响应
-
-    返回:
-        bool: 用户确认返回True，否则返回False
-    """
+    """提示用户确认是/否问题"""
     try:
         suffix = "[Y/n]" if default else "[y/N]"
         ret = get_single_line_input(f"{tip} {suffix}: ")
@@ -198,28 +155,66 @@ def user_confirm(tip: str, default: bool = True) -> bool:
         return False
 
 
-def get_multiline_input(tip: str) -> str:
+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:
+        PrettyOutput.print("没有可复制的消息", OutputType.INFO)
+        return
 
-    参数：
-        tip: 要显示的提示信息
+    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
+        print(f"  {i + 1}: {display_msg.strip()}")
+    print("=" * 58 + "\n")
 
-    返回：
-        str: 用户的输入，如果取消则返回空字符串
+    while True:
+        try:
+            prompt_text = f"{Fore.CYAN}请输入要复制的条目序号 (或输入c取消, 直接回车选择最后一条): {ColoramaStyle.RESET_ALL}"
+            choice_str = input(prompt_text)
+
+            if not choice_str:  # User pressed Enter
+                if not history:
+                    print("没有历史记录可供选择。")
+                    break
+                choice = len(history) - 1
+            elif choice_str.lower() == "c":
+                print("已取消")
+                break
+            else:
+                choice = int(choice_str) - 1
+
+            if 0 <= choice < len(history):
+                selected_msg = history[choice]
+                copy_to_clipboard(selected_msg)
+                PrettyOutput.print(
+                    f"已复制消息: {selected_msg[:70]}...", OutputType.SUCCESS
+                )
+                break
+            else:
+                print("无效的序号，请重试。")
+        except ValueError:
+            print("无效的输入，请输入数字。")
+        except (KeyboardInterrupt, EOFError):
+            print("\n操作取消")
+            break
+
+
+def _get_multiline_input_internal(tip: str) -> str:
+    """
+    Internal function to get multiline input using prompt_toolkit.
+    Returns a sentinel value if Ctrl+O is pressed.
     """
-    # 显示输入说明
-    PrettyOutput.section(
-        "用户输入 - 使用 @ 触发文件补全，Tab 选择补全项，Ctrl+J 提交，Ctrl+O 复制最后一条消息，按 Ctrl+C 取消输入",
-        OutputType.USER,
-    )
-    print(f"{Fore.GREEN}{tip}{ColoramaStyle.RESET_ALL}")
-    # 配置键绑定
     bindings = KeyBindings()
 
     @bindings.add("enter")
     def _(event):
-        """处理回车键以进行补全或换行。"""
         if event.current_buffer.complete_state:
             event.current_buffer.apply_completion(
                 event.current_buffer.complete_state.current_completion
@@ -229,55 +224,53 @@ def get_multiline_input(tip: str) -> str:
 
     @bindings.add("c-j")
     def _(event):
-        """处理Ctrl+J以提交输入。"""
         event.current_buffer.validate_and_handle()
 
     @bindings.add("c-o")
     def _(event):
-        """处理Ctrl+O以复制最后一条消息到剪贴板。"""
-        from jarvis.jarvis_utils.globals import get_last_message
-
-        last_msg = get_last_message()
-        if last_msg:
-            print(f"{last_msg}")
-            copy_to_clipboard(last_msg)
-        else:
-            PrettyOutput.print("没有可复制的消息", OutputType.INFO)
+        """Handle Ctrl+O by exiting the prompt and returning the sentinel value."""
+        event.app.exit(result=CTRL_O_SENTINEL)
+
+    style = PromptStyle.from_dict({"prompt": "ansicyan"})
+
+    history_dir = get_data_dir()
+    session: PromptSession = PromptSession(
+        history=FileHistory(os.path.join(history_dir, "multiline_input_history")),
+        completer=FileCompleter(),
+        key_bindings=bindings,
+        complete_while_typing=True,
+        multiline=True,
+        vi_mode=False,
+        mouse_support=False,
+    )
 
-        event.app.invalidate()
+    print(f"{Fore.GREEN}{tip}{ColoramaStyle.RESET_ALL}")
+    prompt = FormattedText([("class:prompt", ">>> ")])
 
-    # 配置提示会话
-    style = PromptStyle.from_dict(
-        {
-            "prompt": "ansicyan",
-        }
-    )
     try:
-        import os
-
-        from prompt_toolkit.history import FileHistory  # type: ignore
-
-        from jarvis.jarvis_utils.config import get_data_dir
-
-        # 获取数据目录路径
-        history_dir = get_data_dir()
-        # 初始化带历史记录的会话
-        session: PromptSession = PromptSession(
-            history=FileHistory(os.path.join(history_dir, "multiline_input_history")),
-            completer=FileCompleter(),
-            key_bindings=bindings,
-            complete_while_typing=True,
-            multiline=True,
-            vi_mode=False,
-            mouse_support=False,
-        )
-        prompt = FormattedText([("class:prompt", ">>> ")])
-        # 获取输入
-        text = session.prompt(
-            prompt,
-            style=style,
-        ).strip()
-        return text
-    except KeyboardInterrupt:
-        PrettyOutput.print("输入已取消", OutputType.INFO)
+        return session.prompt(prompt, style=style, pre_run=lambda: None).strip()
+    except (KeyboardInterrupt, EOFError):
         return ""
+
+
+def get_multiline_input(tip: str) -> str:
+    """
+    获取带有增强补全和确认功能的多行输入。
+    此函数处理控制流，允许在不破坏终端状态的情况下处理历史记录复制。
+    """
+    PrettyOutput.section(
+        "用户输入 - 使用 @ 触发文件补全，Tab 选择补全项，Ctrl+J 提交，Ctrl+O 从历史记录中选择消息复制，按 Ctrl+C/D 取消输入",
+        OutputType.USER,
+    )
+
+    while True:
+        user_input = _get_multiline_input_internal(tip)
+
+        if user_input == CTRL_O_SENTINEL:
+            _show_history_and_copy()
+            tip = "请继续输入（或按Ctrl+J提交）:"
+            continue
+        else:
+            if not user_input:
+                PrettyOutput.print("\n输入已取消", OutputType.INFO)
+            return user_input