jarvis-ai-assistant 0.3.3__tar.gz → 0.3.5__tar.gz

{jarvis_ai_assistant-0.3.3/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.3.5}/PKG-INFO

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

{jarvis_ai_assistant-0.3.3 → jarvis_ai_assistant-0.3.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.3.3"
+version = "0.3.5"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]
@@ -101,9 +101,8 @@ jst = "jarvis.jarvis_stats.cli:main"
 
 
 
-[[tool.uv.index]]
-name = "tsinghua"
-url = "https://pypi.tuna.tsinghua.edu.cn/simple"
+[tool.uv]
+index-strategy = "unsafe-first-match"
 
 [[tool.uv.index]]
 name = "aliyun"
@@ -112,3 +111,7 @@ url = "https://mirrors.aliyun.com/pypi/simple/"
 [[tool.uv.index]]
 name = "ustc"
 url = "https://pypi.mirrors.ustc.edu.cn/simple/"
+
+[[tool.uv.index]]
+name = "netease"
+url = "https://mirrors.163.com/pypi/simple/"

{jarvis_ai_assistant-0.3.3 → jarvis_ai_assistant-0.3.5}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.3.3",
+    version="0.3.5",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.3.3 → jarvis_ai_assistant-0.3.5}/src/jarvis/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI Assistant"""
 
-__version__ = "0.3.3"
+__version__ = "0.3.5"

{jarvis_ai_assistant-0.3.3 → jarvis_ai_assistant-0.3.5}/src/jarvis/jarvis_agent/__init__.py

@@ -3,6 +3,7 @@
 import datetime
 import os
 import platform
+from pathlib import Path
 from typing import Any, Callable, Dict, List, Optional, Protocol, Tuple, Union
 
 # 第三方库导入
@@ -14,6 +15,7 @@ from jarvis.jarvis_agent.protocols import OutputHandlerProtocol
 from jarvis.jarvis_agent.session_manager import SessionManager
 from jarvis.jarvis_agent.tool_executor import execute_tool_call
 from jarvis.jarvis_agent.memory_manager import MemoryManager
+from jarvis.jarvis_memory_organizer.memory_organizer import MemoryOrganizer
 from jarvis.jarvis_agent.task_analyzer import TaskAnalyzer
 from jarvis.jarvis_agent.file_methodology_manager import FileMethodologyManager
 from jarvis.jarvis_agent.prompts import (
@@ -28,6 +30,7 @@ from jarvis.jarvis_platform.registry import PlatformRegistry
 
 # jarvis_utils 相关
 from jarvis.jarvis_utils.config import (
+    get_data_dir,
     get_max_token_count,
     get_normal_model_name,
     get_normal_platform_name,
@@ -50,6 +53,98 @@ from jarvis.jarvis_utils.input import get_multiline_input, user_confirm
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ct, ot
 
+
+def show_agent_startup_stats(agent_name: str, model_name: str) -> None:
+    """输出启动时的统计信息
+
+    参数:
+        agent_name: Agent的名称
+        model_name: 使用的模型名称
+    """
+    try:
+        from jarvis.jarvis_utils.methodology import _load_all_methodologies
+        from jarvis.jarvis_tools.registry import ToolRegistry
+        from jarvis.jarvis_utils.config import get_data_dir
+        from pathlib import Path
+        from rich.console import Console
+        from rich.panel import Panel
+        from rich.text import Text
+        from rich.align import Align
+        import os
+
+        methodologies = _load_all_methodologies()
+        methodology_count = len(methodologies)
+
+        # 获取工具数量
+        # 创建一个临时的工具注册表类来获取所有工具（不应用过滤）
+        class TempToolRegistry(ToolRegistry):
+            def _apply_tool_config_filter(self) -> None:
+                """重写过滤方法，不执行任何过滤"""
+                pass
+
+        # 获取所有工具的数量
+        tool_registry_all = TempToolRegistry()
+        total_tool_count = len(tool_registry_all.tools)
+
+        # 获取可用工具的数量（应用过滤）
+        tool_registry = ToolRegistry()
+        available_tool_count = len(tool_registry.get_all_tools())
+
+        global_memory_dir = Path(get_data_dir()) / "memory" / "global_long_term"
+        global_memory_count = 0
+        if global_memory_dir.exists():
+            global_memory_count = len(list(global_memory_dir.glob("*.json")))
+
+        # 检查项目记忆
+        project_memory_dir = Path(".jarvis/memory")
+        project_memory_count = 0
+        if project_memory_dir.exists():
+            project_memory_count = len(list(project_memory_dir.glob("*.json")))
+
+        # 获取当前工作目录
+        current_dir = os.getcwd()
+
+        # 构建欢迎信息
+        welcome_message = f"{agent_name} 初始化完成 - 使用 {model_name} 模型"
+
+        stats_parts = [
+            f"📚  本地方法论: [bold cyan]{methodology_count}[/bold cyan]",
+            f"🛠️  工具: [bold green]{available_tool_count}/{total_tool_count}[/bold green] (可用/全部)",
+            f"🧠  全局记忆: [bold yellow]{global_memory_count}[/bold yellow]",
+        ]
+
+        # 如果有项目记忆，添加到统计信息中
+        if project_memory_count > 0:
+            stats_parts.append(
+                f"📝  项目记忆: [bold magenta]{project_memory_count}[/bold magenta]"
+            )
+
+        stats_text = Text.from_markup(" | ".join(stats_parts), justify="center")
+
+        # 创建包含欢迎信息和统计信息的面板内容
+        panel_content = Text()
+        panel_content.append(welcome_message, style="bold white")
+        panel_content.append("\n")
+        panel_content.append(f"📁  工作目录: {current_dir}", style="dim white")
+        panel_content.append("\n\n")
+        panel_content.append(stats_text)
+        panel_content.justify = "center"
+
+        panel = Panel(
+            panel_content,
+            title="✨ Jarvis 资源概览 ✨",
+            title_align="center",
+            border_style="blue",
+            expand=False,
+        )
+
+        console = Console()
+        console.print(Align.center(panel))
+
+    except Exception as e:
+        PrettyOutput.print(f"加载统计信息失败: {e}", OutputType.WARNING)
+
+
 origin_agent_system_prompt = f"""
 <role>
 # 🤖 角色
@@ -175,9 +270,8 @@ class Agent:
         # 设置系统提示词
         self._setup_system_prompt()
 
-        # 打印欢迎信息
-        welcome_message = f"{name} 初始化完成 - 使用 {self.model.name()} 模型"  # type: ignore
-        PrettyOutput.print(welcome_message, OutputType.SYSTEM)
+        # 输出统计信息（包含欢迎信息）
+        show_agent_startup_stats(name, self.model.name())  # type: ignore
 
     def _init_model(self, llm_type: str, model_group: Optional[str]):
         """初始化模型平台"""
@@ -515,6 +609,8 @@ class Agent:
         if self.use_analysis:
             self.task_analyzer.analysis_task(satisfaction_feedback)
 
+        self._check_and_organize_memory()
+
         if self.need_summary:
             print("📄 正在生成总结...")
             self.session.prompt = self.summary_prompt
@@ -711,6 +807,71 @@ class Agent:
 
         self.first = False
 
+    def _check_and_organize_memory(self):
+        """
+        检查记忆库状态，如果满足条件则提示用户整理。
+        每天只检测一次。
+        """
+        try:
+            # 检查项目记忆
+            self._perform_memory_check("project_long_term", Path(".jarvis"), "project")
+            # 检查全局记忆
+            self._perform_memory_check(
+                "global_long_term",
+                Path(get_data_dir()),
+                "global",
+            )
+        except Exception as e:
+            PrettyOutput.print(f"检查记忆库时发生意外错误: {e}", OutputType.WARNING)
+
+    def _perform_memory_check(self, memory_type: str, base_path: Path, scope_name: str):
+        """执行特定范围的记忆检查和整理"""
+        check_file = base_path / ".last_memory_organizer_check"
+        now = datetime.datetime.now()
+
+        if check_file.exists():
+            try:
+                last_check_time = datetime.datetime.fromisoformat(
+                    check_file.read_text()
+                )
+                if (now - last_check_time).total_seconds() < 24 * 3600:
+                    return  # 24小时内已检查
+            except (ValueError, FileNotFoundError):
+                # 文件内容无效或文件在读取时被删除，继续执行检查
+                pass
+
+        # 立即更新检查时间，防止并发或重复检查
+        base_path.mkdir(parents=True, exist_ok=True)
+        check_file.write_text(now.isoformat())
+
+        organizer = MemoryOrganizer()
+        # NOTE: 使用受保护方法以避免重复实现逻辑
+        memories = organizer._load_memories(memory_type)
+
+        if len(memories) < 200:
+            return
+
+        # NOTE: 使用受保护方法以避免重复实现逻辑
+        overlap_groups = organizer._find_overlapping_memories(memories, min_overlap=3)
+        has_significant_overlap = any(groups for groups in overlap_groups.values())
+
+        if not has_significant_overlap:
+            return
+
+        prompt = (
+            f"检测到您的 '{scope_name}' 记忆库中包含 {len(memories)} 条记忆，"
+            f"并且存在3个以上标签重叠的记忆。\n"
+            f"是否立即整理记忆库以优化性能和相关性？"
+        )
+        if user_confirm(prompt, default=True):
+            PrettyOutput.print(
+                f"正在开始整理 '{scope_name}' ({memory_type}) 记忆库...",
+                OutputType.INFO,
+            )
+            organizer.organize_memories(memory_type, min_overlap=3)
+        else:
+            PrettyOutput.print(f"已取消 '{scope_name}' 记忆库整理。", OutputType.INFO)
+
     def clear_history(self):
         """
         Clears conversation history by delegating to the session manager.

{jarvis_ai_assistant-0.3.3 → jarvis_ai_assistant-0.3.5}/src/jarvis/jarvis_agent/file_methodology_manager.py

@@ -80,7 +80,12 @@ class FileMethodologyManager:
 
         memory_manager = MemoryManager(self.agent)
         memory_tags_prompt = memory_manager.prepare_memory_tags_prompt()
-        methodology = load_methodology(msg, self.agent.get_tool_registry())
+        methodology = load_methodology(
+            msg,
+            self.agent.get_tool_registry(),
+            platform_name=self.agent.model.platform_name(),
+            model_name=self.agent.model.name(),
+        )
         self.agent.session.prompt = f"{self.agent.session.prompt}\n\n以下是历史类似问题的执行经验，可参考：\n{methodology}{memory_tags_prompt}"
 
     def handle_history_with_file_upload(self) -> str:

{jarvis_ai_assistant-0.3.3 → jarvis_ai_assistant-0.3.5}/src/jarvis/jarvis_agent/tool_executor.py

@@ -41,9 +41,13 @@ def execute_tool_call(response: str, agent: "Agent") -> Tuple[bool, Any]:
     if not agent.execute_tool_confirm or user_confirm(
         f"需要执行{tool_to_execute.name()}确认执行？", True
     ):
-        print(f"🔧 正在执行{tool_to_execute.name()}...")
-        result = tool_to_execute.handle(response, agent)
-        print(f"✅ {tool_to_execute.name()}执行完成")
-        return result
+        try:
+            print(f"🔧 正在执行{tool_to_execute.name()}...")
+            result = tool_to_execute.handle(response, agent)
+            print(f"✅ {tool_to_execute.name()}执行完成")
+            return result
+        except Exception as e:
+            PrettyOutput.print(f"工具执行失败: {str(e)}", OutputType.ERROR)
+            return False, str(e)
 
     return False, ""

{jarvis_ai_assistant-0.3.3 → jarvis_ai_assistant-0.3.5}/src/jarvis/jarvis_code_agent/code_agent.py

@@ -398,11 +398,6 @@ class CodeAgent:
             if not user_confirm("是否要提交？", True):
                 return
 
-            # 用户确认修改，统计修改次数
-            from jarvis.jarvis_stats.stats import StatsManager
-
-            StatsManager.increment("code_modification_confirmed", group="code_agent")
-
             try:
                 confirm_add_new_files()
 
@@ -697,9 +692,7 @@ def cli(
             sys.exit(0)
 
     curr_dir = os.getcwd()
-    git_dir = find_git_root_and_cd(curr_dir)
-    PrettyOutput.print(f"当前目录: {git_dir}", OutputType.INFO)
-
+    find_git_root_and_cd(curr_dir)
     try:
         agent = CodeAgent(
             llm_type=llm_type,

{jarvis_ai_assistant-0.3.3 → jarvis_ai_assistant-0.3.5}/src/jarvis/jarvis_memory_organizer/memory_organizer.py

@@ -278,8 +278,23 @@ tags:
         # 从高重叠度开始处理
         max_tags = max(len(m.get("tags", [])) for m in memories)
 
+        # 创建一个标记已删除记忆的集合
+        deleted_indices = set()
+
         for overlap_count in range(min(max_tags, 5), min_overlap - 1, -1):
-            overlap_groups = self._find_overlapping_memories(memories, overlap_count)
+            # 过滤掉已删除的记忆
+            active_memories = [
+                (i, mem) for i, mem in enumerate(memories) if i not in deleted_indices
+            ]
+            if not active_memories:
+                break
+
+            # 创建索引映射：原始索引 -> 活跃索引
+            active_memory_list = [mem for _, mem in active_memories]
+
+            overlap_groups = self._find_overlapping_memories(
+                active_memory_list, overlap_count
+            )
 
             if overlap_count in overlap_groups:
                 groups = overlap_groups[overlap_count]
@@ -289,7 +304,13 @@ tags:
                 )
 
                 for group in groups:
-                    group_memories = [memories[i] for i in group]
+                    # 将活跃索引转换回原始索引
+                    original_indices = set()
+                    for active_idx in group:
+                        original_idx = active_memories[active_idx][0]
+                        original_indices.add(original_idx)
+
+                    group_memories = [memories[i] for i in original_indices]
 
                     # 显示将要合并的记忆
                     PrettyOutput.print(
@@ -315,16 +336,17 @@ tags:
 
                         # 保存新记忆
                         self._save_merged_memory(
-                            merged_memory, memory_type, [memories[i] for i in group]
+                            merged_memory,
+                            memory_type,
+                            [memories[i] for i in original_indices],
                         )
 
                         stats["processed_groups"] += 1
-                        stats["merged_memories"] += len(group)
+                        stats["merged_memories"] += len(original_indices)
                         stats["created_memories"] += 1
 
-                        # 从列表中移除已合并的记忆
-                        for i in sorted(group, reverse=True):
-                            del memories[i]
+                        # 标记这些记忆已被删除
+                        deleted_indices.update(original_indices)
                     else:
                         PrettyOutput.print("  [模拟运行] 跳过实际合并", OutputType.INFO)
 
@@ -376,11 +398,18 @@ tags:
         for orig_memory in original_memories:
             if "file_path" in orig_memory:
                 try:
-                    Path(orig_memory["file_path"]).unlink()
-                    PrettyOutput.print(
-                        f"删除原始记忆: {orig_memory.get('id', '未知')}",
-                        OutputType.INFO,
-                    )
+                    file_path = Path(orig_memory["file_path"])
+                    if file_path.exists():
+                        file_path.unlink()
+                        PrettyOutput.print(
+                            f"删除原始记忆: {orig_memory.get('id', '未知')}",
+                            OutputType.INFO,
+                        )
+                    else:
+                        PrettyOutput.print(
+                            f"原始记忆文件已不存在，跳过删除: {orig_memory.get('id', '未知')}",
+                            OutputType.INFO,
+                        )
                 except Exception as e:
                     PrettyOutput.print(
                         f"删除记忆文件失败 {orig_memory['file_path']}: {str(e)}",
@@ -607,6 +636,9 @@ def organize(
         else:
             raise typer.Exit(0)  # 即使没有处理也是正常退出
 
+    except typer.Exit:
+        # typer.Exit 是正常的退出方式，直接传播
+        raise
     except Exception as e:
         PrettyOutput.print(f"记忆整理失败: {str(e)}", OutputType.ERROR)
         raise typer.Exit(1)

{jarvis_ai_assistant-0.3.3 → jarvis_ai_assistant-0.3.5}/src/jarvis/jarvis_platform/base.py

@@ -142,20 +142,9 @@ class BasePlatform(ABC):
                             live.update(panel)
                         end_time = time.time()
                         duration = end_time - start_time
-                        char_count = len(response)
-                        # Calculate token count and tokens per second
-                        try:
-                            token_count = get_context_token_count(response)
-                            tokens_per_second = (
-                                token_count / duration if duration > 0 else 0
-                            )
-                        except Exception as e:
-                            PrettyOutput.print(
-                                f"Tokenization failed: {str(e)}", OutputType.WARNING
-                            )
-                            token_count = 0
-                            tokens_per_second = 0
-                        panel.subtitle = f"[bold green]✓ 对话完成耗时: {duration:.2f}秒, 输入字符数: {len(message)}, 输入Token数量: {input_token_count}, 输出字符数: {char_count}, 输出Token数量: {token_count}, 每秒Token数量: {tokens_per_second:.2f}[/bold green]"
+                        panel.subtitle = (
+                            f"[bold green]✓ 对话完成耗时: {duration:.2f}秒[/bold green]"
+                        )
                         live.update(panel)
                 else:
                     for s in self.chat(message):

{jarvis_ai_assistant-0.3.3 → jarvis_ai_assistant-0.3.5}/src/jarvis/jarvis_tools/base.py

@@ -39,4 +39,11 @@ class Tool:
         返回:
             Dict[str, Any]: 工具执行结果
         """
-        return self.func(arguments)
+        try:
+            return self.func(arguments)
+        except Exception as e:
+            return {
+                "success": False,
+                "stderr": f"工具 {self.name} 执行失败: {str(e)}",
+                "stdout": "",
+            }

{jarvis_ai_assistant-0.3.3 → jarvis_ai_assistant-0.3.5}/src/jarvis/jarvis_utils/git_utils.py

@@ -309,7 +309,9 @@ def get_modified_line_ranges() -> Dict[str, List[Tuple[int, int]]]:
             start_line = int(range_match.group(1))  # 保持从1开始
             line_count = int(range_match.group(2)) if range_match.group(2) else 1
             end_line = start_line + line_count - 1
-            result[current_file] = (start_line, end_line)
+            if current_file not in result:
+                result[current_file] = []
+            result[current_file].append((start_line, end_line))
 
     return result
 
@@ -414,8 +416,23 @@ def check_and_update_git_repo(repo_path: str) -> bool:
                     hasattr(sys, "base_prefix") and sys.base_prefix != sys.prefix
                 )
 
-                # 尝试普通安装
-                install_cmd = [sys.executable, "-m", "pip", "install", "-e", "."]
+                is_uv_env = False
+                if in_venv:
+                    # 检查是否在uv创建的虚拟环境内
+                    if sys.platform == "win32":
+                        uv_path = os.path.join(sys.prefix, "Scripts", "uv.exe")
+                    else:
+                        uv_path = os.path.join(sys.prefix, "bin", "uv")
+                    if os.path.exists(uv_path):
+                        is_uv_env = True
+
+                # 根据环境选择安装命令
+                if is_uv_env:
+                    install_cmd = ["uv", "pip", "install", "-e", "."]
+                else:
+                    install_cmd = [sys.executable, "-m", "pip", "install", "-e", "."]
+
+                # 尝试安装
                 result = subprocess.run(
                     install_cmd, cwd=git_root, capture_output=True, text=True
                 )

{jarvis_ai_assistant-0.3.3 → jarvis_ai_assistant-0.3.5}/src/jarvis/jarvis_utils/methodology.py

@@ -175,13 +175,20 @@ def upload_methodology(platform: BasePlatform, other_files: List[str] = []) -> b
                 pass
 
 
-def load_methodology(user_input: str, tool_registery: Optional[Any] = None) -> str:
+def load_methodology(
+    user_input: str,
+    tool_registery: Optional[Any] = None,
+    platform_name: Optional[str] = None,
+    model_name: Optional[str] = None,
+) -> str:
     """
     加载方法论并上传到大模型。
 
     参数：
         user_input: 用户输入文本，用于提示大模型
         tool_registery: 工具注册表，用于获取工具列表
+        platform_name (str, optional): 指定的平台名称. Defaults to None.
+        model_name (str, optional): 指定的模型名称. Defaults to None.
 
     返回：
         str: 相关的方法论提示，如果未找到方法论则返回空字符串
@@ -203,7 +210,17 @@ def load_methodology(user_input: str, tool_registery: Optional[Any] = None) -> s
             return ""
         print(f"✅ 加载方法论文件完成 (共 {len(methodologies)} 个)")
 
-        platform = PlatformRegistry().get_normal_platform()
+        if platform_name:
+            platform = PlatformRegistry().create_platform(platform_name)
+            if platform and model_name:
+                platform.set_model_name(model_name)
+        else:
+            platform = PlatformRegistry().get_normal_platform()
+
+        if not platform:
+            PrettyOutput.print("无法创建平台实例", OutputType.ERROR)
+            return ""
+
         platform.set_suppress_output(True)
 
         # 步骤1：获取所有方法论的标题