jarvis-ai-assistant 0.3.25__tar.gz → 0.3.26__tar.gz

{jarvis_ai_assistant-0.3.25/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.3.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.25
+Version: 0.3.26
 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.25 → jarvis_ai_assistant-0.3.26}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.3.25"
+version = "0.3.26"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]

{jarvis_ai_assistant-0.3.25 → jarvis_ai_assistant-0.3.26}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.3.25",
+    version="0.3.26",
     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.25 → jarvis_ai_assistant-0.3.26}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.3.25 → jarvis_ai_assistant-0.3.26}/src/jarvis/jarvis_agent/__init__.py

@@ -662,6 +662,10 @@ class Agent:
         if self.use_analysis:
             self.task_analyzer.analysis_task(satisfaction_feedback)
 
+        # 当开启强制保存记忆时，在分析步骤之后触发一次记忆保存
+        if self.force_save_memory:
+            self.memory_manager.prompt_memory_save()
+
         self._check_and_organize_memory()
 
         if self.need_summary:

{jarvis_ai_assistant-0.3.25 → jarvis_ai_assistant-0.3.26}/src/jarvis/jarvis_rag/cli.py

@@ -14,7 +14,7 @@ from langchain_community.document_loaders import (
 from langchain_core.document_loaders.base import BaseLoader
 from rich.markdown import Markdown
 
-from jarvis.jarvis_utils.utils import init_env
+from jarvis.jarvis_utils.utils import init_env, is_rag_installed, get_missing_rag_modules
 from jarvis.jarvis_utils.config import (
     get_rag_embedding_model,
     get_rag_use_bm25,
@@ -469,19 +469,15 @@ def query(
         raise typer.Exit(code=1)
 
 
-_RAG_INSTALLED = False
-try:
-    import langchain  # noqa
 
-    _RAG_INSTALLED = True
-except ImportError:
-    pass
 
 
 def _check_rag_dependencies():
-    if not _RAG_INSTALLED:
+    if not is_rag_installed():
+        missing = get_missing_rag_modules()
+        missing_str = f"缺少依赖: {', '.join(missing)}。" if missing else ""
         PrettyOutput.print(
-            "RAG依赖项未安装。请运行 'pip install \"jarvis-ai-assistant[rag]\"' 来使用此命令。",
+            f"RAG依赖项未安装或不完整。{missing_str}请运行 'pip install \"jarvis-ai-assistant[rag]\"' 后重试。",
             OutputType.ERROR,
         )
         raise typer.Exit(code=1)

{jarvis_ai_assistant-0.3.25 → jarvis_ai_assistant-0.3.26}/src/jarvis/jarvis_utils/git_utils.py

@@ -19,6 +19,7 @@ from typing import Any, Dict, List, Set, Tuple
 from jarvis.jarvis_utils.config import get_data_dir, is_confirm_before_apply_patch
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.input import user_confirm
+from jarvis.jarvis_utils.utils import is_rag_installed
 
 
 def find_git_root_and_cd(start_dir: str = ".") -> str:
@@ -427,14 +428,8 @@ def check_and_update_git_repo(repo_path: str) -> bool:
                         is_uv_env = True
 
                 # 根据环境选择安装命令
-                # 检测是否安装了 RAG 特性
-                rag_installed = False
-                try:
-                    import langchain  # noqa
-
-                    rag_installed = True
-                except ImportError:
-                    pass
+                # 检测是否安装了 RAG 特性（更精确）
+                rag_installed = is_rag_installed()
 
                 # 根据环境和 RAG 特性选择安装命令
                 if rag_installed:

{jarvis_ai_assistant-0.3.25 → jarvis_ai_assistant-0.3.26}/src/jarvis/jarvis_utils/utils.py

@@ -65,6 +65,41 @@ COMMAND_MAPPING = {
     "jmo": "jarvis-memory-organizer",
 }
 
+# RAG 依赖检测工具函数（更精确）
+_RAG_REQUIRED_MODULES = [
+    "langchain",
+    "langchain_community",
+    "chromadb",
+    "sentence_transformers",
+    "rank_bm25",
+    "unstructured",
+]
+_RAG_OPTIONAL_MODULES = [
+    "langchain_huggingface",
+]
+
+
+def get_missing_rag_modules() -> List[str]:
+    """
+    返回缺失的 RAG 关键依赖模块列表。
+    仅检查必要模块，不导入模块，避免副作用。
+    """
+    try:
+        from importlib.util import find_spec
+
+        missing = [m for m in _RAG_REQUIRED_MODULES if find_spec(m) is None]
+        return missing
+    except Exception:
+        # 任何异常都视为无法确认，保持保守策略
+        return _RAG_REQUIRED_MODULES[:]  # 视为全部缺失
+
+
+def is_rag_installed() -> bool:
+    """
+    更准确的 RAG 安装检测：确认关键依赖模块均可用。
+    """
+    return len(get_missing_rag_modules()) == 0
+
 
 def _setup_signal_handler() -> None:
     """设置SIGINT信号处理函数"""
@@ -139,14 +174,11 @@ def _check_pip_updates() -> bool:
                 if uv_path.exists():
                     is_uv_env = True
 
-            # 检测是否安装了 RAG 特性
-            rag_installed = False
-            try:
-                import langchain  # type: ignore # noqa
-
-                rag_installed = True
-            except ImportError:
-                pass
+            # 检测是否安装了 RAG 特性（更精确）
+            from jarvis.jarvis_utils.utils import (
+                is_rag_installed as _is_rag_installed,
+            )  # 延迟导入避免潜在循环依赖
+            rag_installed = _is_rag_installed()
 
             # 提供更新命令
             package_spec = (

{jarvis_ai_assistant-0.3.25 → jarvis_ai_assistant-0.3.26/src/jarvis_ai_assistant.egg-info}/PKG-INFO

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