jarvis-ai-assistant 0.1.193__py3-none-any.whl → 0.1.195__py3-none-any.whl

jarvis/jarvis_utils/input.py

@@ -12,7 +12,8 @@ from colorama import Fore
 from colorama import Style as ColoramaStyle
 from fuzzywuzzy import process
 from prompt_toolkit import PromptSession
-from prompt_toolkit.completion import Completer, Completion, PathCompleter
+from prompt_toolkit.completion import (CompleteEvent, Completer, Completion,
+                                       PathCompleter)
 from prompt_toolkit.document import Document
 from prompt_toolkit.formatted_text import FormattedText
 from prompt_toolkit.key_binding import KeyBindings
@@ -34,10 +35,14 @@ def get_single_line_input(tip: str) -> str:
         str: 用户的输入
     """
     session = 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):
     """
     带有模糊匹配的文件路径自定义补全器。
@@ -47,13 +52,15 @@ class FileCompleter(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, complete_event) -> Completion: # type: ignore
+
+    def get_completions(self, document: Document, _: CompleteEvent) -> Completion:  # type: ignore
         """
         生成带有模糊匹配的文件路径补全建议。
 
@@ -67,7 +74,7 @@ class FileCompleter(Completer):
         text = document.text_before_cursor
         cursor_pos = document.cursor_position
         # 查找文本中的所有@位置
-        at_positions = [i for i, char in enumerate(text) if char == '@']
+        at_positions = [i for i, char in enumerate(text) if char == "@"]
         if not at_positions:
             return
         # 获取最后一个@位置
@@ -76,12 +83,10 @@ class FileCompleter(Completer):
         if cursor_pos <= current_at_pos:
             return
         # 检查@之后是否有空格
-        text_after_at = text[current_at_pos + 1:cursor_pos]
-        if ' ' in text_after_at:
+        text_after_at = text[current_at_pos + 1 : cursor_pos]
+        if " " in text_after_at:
             return
-        
 
-            
         # 获取当前@之后的文本
         file_path = text_after_at.strip()
         # 计算替换长度
@@ -89,38 +94,52 @@ class FileCompleter(Completer):
 
         # 获取所有可能的补全项
         all_completions = []
-        
+
         # 1. 添加特殊标记
-        all_completions.extend([
-            (ot(tag), self._get_description(tag))
-            for tag in self.replace_map.keys()
-        ])
-        all_completions.extend([
-            (ot("Summary"), '总结'),
-            (ot("Clear"), '清除历史'),
-        ])
-        
+        all_completions.extend(
+            [(ot(tag), self._get_description(tag)) for tag in self.replace_map.keys()]
+        )
+        all_completions.extend(
+            [
+                (ot("Summary"), "总结"),
+                (ot("Clear"), "清除历史"),
+                (ot("ToolUsage"), "工具使用说明"),
+                (ot("ReloadConfig"), "重新加载配置"),
+            ]
+        )
+
         # 2. 添加文件列表
         try:
             import subprocess
-            result = subprocess.run(['git', 'ls-files'],
-                                 stdout=subprocess.PIPE,
-                                 stderr=subprocess.PIPE,
-                                 text=True)
+
+            result = subprocess.run(
+                ["git", "ls-files"],
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                text=True,
+            )
             if result.returncode == 0:
-                all_completions.extend([
-                    (path, "File") 
-                    for path in result.stdout.splitlines() 
-                    if path.strip()
-                ])
+                all_completions.extend(
+                    [
+                        (path, "File")
+                        for path in result.stdout.splitlines()
+                        if path.strip()
+                    ]
+                )
         except Exception:
             pass
-            
+
         # 统一过滤和排序
         if file_path:
             # 使用模糊匹配过滤
-            scored_items = process.extract(file_path, [item[0] for item in all_completions], limit=self.max_suggestions)
-            scored_items = [(item[0], item[1]) for item in scored_items if item[1] > self.min_score]
+            scored_items = process.extract(
+                file_path,
+                [item[0] for item in all_completions],
+                limit=self.max_suggestions,
+            )
+            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}
             # 生成补全项
@@ -132,23 +151,29 @@ class FileCompleter(Completer):
                     text=f"'{text}'",
                     start_position=-replace_length,
                     display=display_text,
-                    display_meta=completion_map.get(text, "")
-                ) # type: ignore
+                    display_meta=completion_map.get(text, ""),
+                )  # type: ignore
         else:
             # 没有输入时返回前max_suggestions个建议
-            for text, desc in all_completions[:self.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
-    
+                    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)" if "append" in self.replace_map[tag] and self.replace_map[tag]["append"] else "(Replace)"
+            return (
+                self.replace_map[tag].get("description", tag) + "(Append)"
+                if "append" in self.replace_map[tag] and self.replace_map[tag]["append"]
+                else "(Replace)"
+            )
         return tag
+
+
 def get_multiline_input(tip: str) -> str:
     """
     获取带有增强补全和确认功能的多行输入。
@@ -160,25 +185,35 @@ def get_multiline_input(tip: str) -> str:
         str: 用户的输入，如果取消则返回空字符串
     """
     # 显示输入说明
-    PrettyOutput.section("用户输入 - 使用 @ 触发文件补全，Tab 选择补全项，Ctrl+J 提交，按 Ctrl+C 取消输入", OutputType.USER)
+    PrettyOutput.section(
+        "用户输入 - 使用 @ 触发文件补全，Tab 选择补全项，Ctrl+J 提交，按 Ctrl+C 取消输入",
+        OutputType.USER,
+    )
     print(f"{Fore.GREEN}{tip}{ColoramaStyle.RESET_ALL}")
     # 配置键绑定
     bindings = KeyBindings()
-    @bindings.add('enter')
+
+    @bindings.add("enter")
     def _(event):
         """处理回车键以进行补全或换行。"""
         if event.current_buffer.complete_state:
-            event.current_buffer.apply_completion(event.current_buffer.complete_state.current_completion)
+            event.current_buffer.apply_completion(
+                event.current_buffer.complete_state.current_completion
+            )
         else:
-            event.current_buffer.insert_text('\n')
-    @bindings.add('c-j')
+            event.current_buffer.insert_text("\n")
+
+    @bindings.add("c-j")
     def _(event):
         """处理Ctrl+J以提交输入。"""
         event.current_buffer.validate_and_handle()
+
     # 配置提示会话
-    style = PromptStyle.from_dict({
-        'prompt': 'ansicyan',
-    })
+    style = PromptStyle.from_dict(
+        {
+            "prompt": "ansicyan",
+        }
+    )
     try:
         import os
 
@@ -190,17 +225,15 @@ def get_multiline_input(tip: str) -> str:
         history_dir = get_data_dir()
         # 初始化带历史记录的会话
         session = PromptSession(
-            history=FileHistory(os.path.join(history_dir, 'multiline_input_history')),
+            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
+            mouse_support=False,
         )
-        prompt = FormattedText([
-            ('class:prompt', '>>> ')
-        ])
+        prompt = FormattedText([("class:prompt", ">>> ")])
         # 获取输入
         text = session.prompt(
             prompt,

jarvis/jarvis_utils/jarvis_history.py

@@ -0,0 +1,43 @@
+import os
+from datetime import datetime
+from typing import Dict, List, Optional
+
+import yaml
+
+
+class JarvisHistory:
+    def __init__(self):
+        self.records: List[Dict[str, str]] = []
+        self.current_file: Optional[str] = None
+
+    def start_record(self, data_dir: str) -> None:
+        """Start a new recording session with timestamped filename"""
+        timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+        self.current_file = os.path.join(data_dir, f"history_{timestamp}.yaml")
+        self.records = []
+
+    def append_msg(self, role: str, msg: str) -> None:
+        """Append a message to current recording session"""
+        if not self.current_file:
+            raise RuntimeError("Recording not started. Call start_record first.")
+        self.records.append({"role": role, "message": msg})
+
+    def stop_record(self) -> None:
+        """Save recorded messages to YAML file"""
+        if not self.current_file:
+            raise RuntimeError("No recording session to stop.")
+
+        # Skip saving if records is empty
+        if not self.records:
+            self.current_file = None
+            self.records = []
+            return
+
+        # Ensure directory exists
+        os.makedirs(os.path.dirname(self.current_file), exist_ok=True)
+
+        with open(self.current_file, "w") as f:
+            yaml.safe_dump({"conversation": self.records}, f, allow_unicode=True)
+
+        self.current_file = None
+        self.records = []

jarvis/jarvis_utils/methodology.py

@@ -10,7 +10,7 @@
 import json
 import os
 import tempfile
-from typing import Any, Dict, Optional
+from typing import Any, Dict, List, Optional
 
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_platform.registry import PlatformRegistry
@@ -34,6 +34,7 @@ def _get_methodology_directory() -> str:
             PrettyOutput.print(f"创建方法论目录失败: {str(e)}", OutputType.ERROR)
     return methodology_dir
 
+
 def _load_all_methodologies() -> Dict[str, str]:
     """
     加载所有方法论文件
@@ -48,6 +49,7 @@ def _load_all_methodologies() -> Dict[str, str]:
         return all_methodologies
 
     import glob
+
     for filepath in glob.glob(os.path.join(methodology_dir, "*.json")):
         try:
             with open(filepath, "r", encoding="utf-8", errors="ignore") as f:
@@ -58,10 +60,13 @@ def _load_all_methodologies() -> Dict[str, str]:
                     all_methodologies[problem_type] = content
         except Exception as e:
             filename = os.path.basename(filepath)
-            PrettyOutput.print(f"加载方法论文件 {filename} 失败: {str(e)}", OutputType.WARNING)
+            PrettyOutput.print(
+                f"加载方法论文件 {filename} 失败: {str(e)}", OutputType.WARNING
+            )
 
     return all_methodologies
 
+
 def _create_methodology_temp_file(methodologies: Dict[str, str]) -> Optional[str]:
     """
     创建包含所有方法论的临时文件
@@ -74,33 +79,34 @@ def _create_methodology_temp_file(methodologies: Dict[str, str]) -> Optional[str
     """
     if not methodologies:
         return None
-    
+
     try:
         # 创建临时文件
-        fd, temp_path = tempfile.mkstemp(suffix='.md', prefix='methodologies_')
+        fd, temp_path = tempfile.mkstemp(suffix=".md", prefix="methodologies_")
         os.close(fd)
-        
+
         # 写入方法论内容
-        with open(temp_path, 'w', encoding='utf-8') as f:
+        with open(temp_path, "w", encoding="utf-8") as f:
             f.write("# 方法论集合\n\n")
             for problem_type, content in methodologies.items():
                 f.write(f"## {problem_type}\n\n")
                 f.write(f"{content}\n\n")
                 f.write("---\n\n")
             f.flush()
-        
+
         return temp_path
     except Exception as e:
         PrettyOutput.print(f"创建方法论临时文件失败: {str(e)}", OutputType.ERROR)
         return None
 
-def upload_methodology(platform: BasePlatform) -> bool:
+
+def upload_methodology(platform: BasePlatform, other_files: List[str] = []) -> bool:
     """
     上传方法论文件到指定平台
-    
+
     参数：
         platform: 平台实例，需实现upload_files方法
-    
+
     返回：
         bool: 上传是否成功
     """
@@ -108,19 +114,19 @@ def upload_methodology(platform: BasePlatform) -> bool:
     if not os.path.exists(methodology_dir):
         PrettyOutput.print("方法论文档不存在", OutputType.WARNING)
         return False
-    
+
     methodologies = _load_all_methodologies()
     if not methodologies:
         PrettyOutput.print("没有可用的方法论文档", OutputType.WARNING)
         return False
-    
+
     temp_file_path = _create_methodology_temp_file(methodologies)
     if not temp_file_path:
         return False
-    
+
     try:
-        return platform.upload_files([temp_file_path])
-        
+        return platform.upload_files([temp_file_path, *other_files])
+
     finally:
         if temp_file_path and os.path.exists(temp_file_path):
             try:
@@ -141,8 +147,6 @@ def load_methodology(user_input: str, tool_registery: Optional[Any] = None) -> s
     """
     from yaspin import yaspin  # type: ignore
 
-    from jarvis.jarvis_tools.registry import ToolRegistry
-
     prompt = tool_registery.prompt() if tool_registery else ""
 
     # 获取方法论目录
@@ -178,7 +182,7 @@ def load_methodology(user_input: str, tool_registery: Optional[Any] = None) -> s
 
         full_content += f"以下是所有可用的工具内容：\n\n"
         full_content += prompt
-        
+
         # 添加用户输入和输出要求
         full_content += f"""
 请根据以上方法论和可调用的工具内容，规划/总结出以下用户需求的执行步骤: {user_input}
@@ -199,7 +203,7 @@ def load_methodology(user_input: str, tool_registery: Optional[Any] = None) -> s
         # 检查内容是否过大
         is_large_content = is_context_overflow(full_content)
         temp_file_path = None
-        
+
         try:
             if is_large_content:
                 # 创建临时文件
@@ -214,10 +218,12 @@ def load_methodology(user_input: str, tool_registery: Optional[Any] = None) -> s
 
                 # 尝试上传文件
                 upload_success = platform.upload_files([temp_file_path])
-                
+
                 if upload_success:
                     # 使用上传的文件生成摘要
-                    return platform.chat_until_success(base_prompt + f"""
+                    return platform.chat_until_success(
+                        base_prompt
+                        + f"""
 请根据已上传的方法论和可调用的工具文件内容，规划/总结出以下用户需求的执行步骤: {user_input}
 
 请按以下格式回复：
@@ -231,12 +237,13 @@ def load_methodology(user_input: str, tool_registery: Optional[Any] = None) -> s
 
 如果没有匹配的方法论，请输出：没有历史方法论可参考
 除以上要求外，不要输出任何内容
-""")
+"""
+                    )
                 else:
                     return "没有历史方法论可参考"
             # 如果内容不大或上传失败，直接使用chat_until_success
             return platform.chat_until_success(full_content)
-        
+
         finally:
             # 清理临时文件
             if temp_file_path and os.path.exists(temp_file_path):
@@ -244,7 +251,7 @@ def load_methodology(user_input: str, tool_registery: Optional[Any] = None) -> s
                     os.remove(temp_file_path)
                 except Exception:
                     pass
-    
+
     except Exception as e:
         PrettyOutput.print(f"加载方法论失败: {str(e)}", OutputType.ERROR)
         return ""