jarvis-ai-assistant 0.3.25__py3-none-any.whl → 0.3.26__py3-none-any.whl

jarvis/__init__.py

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

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/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/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/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.dist-info → jarvis_ai_assistant-0.3.26.dist-info}/METADATA

@@ -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.dist-info → jarvis_ai_assistant-0.3.26.dist-info}/RECORD

@@ -1,5 +1,5 @@
-jarvis/__init__.py,sha256=Y5YWCRMaj8nleHAZXhZE59v10sX-ZvJ5CW8wpIDG-SM,74
-jarvis/jarvis_agent/__init__.py,sha256=eLSiwd-Eo6KqG0qLJ5peI-symxWUrTsxWCBnOgEO474,37524
+jarvis/__init__.py,sha256=iYbIKGj1PIzlv-YretRu86LOVz9abIwPUZ9co3CM1oo,74
+jarvis/jarvis_agent/__init__.py,sha256=S62A_Mki77-RIli_9uNJvz27wRlu2LL3EsFuZjKBybw,37702
 jarvis/jarvis_agent/agent_manager.py,sha256=mmDe26Wa1Dnyp8CkTKupcKipC-5HSuCnk-oVJseOdTg,2801
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=wS-FqpT3pIXwHn1dfL3SpXonUKWgVThbQueUIeyRc2U,2917
 jarvis/jarvis_agent/config_editor.py,sha256=IHyuwI4SRDrqxz8lO0NNgt2F3uYAw1WEKXMxQV49bYI,1928
@@ -72,7 +72,7 @@ jarvis/jarvis_platform_manager/main.py,sha256=tU25oVQzEFPB8aOqPec8SgnxsapCFuHBkY
 jarvis/jarvis_platform_manager/service.py,sha256=WG2r0JRBGfSLGdsKxqYvmaacU_ne3PTn3RkczTzUb_M,14899
 jarvis/jarvis_rag/__init__.py,sha256=HRTXgnQxDuaE9x-e3r6SYqhJ5d4DSI_rrIxy2IGY6qk,320
 jarvis/jarvis_rag/cache.py,sha256=Tqx_Oe-AhuWlMXHGHUaIuG6OEHoHBVZq7mL3kldtFFU,2723
-jarvis/jarvis_rag/cli.py,sha256=l2TsLEC9plcJ5C2CF3JAYLigM-64QOPZR9Ywlb5FGiE,17454
+jarvis/jarvis_rag/cli.py,sha256=4tcB76I87QNHCSp29JDslETJSH5oWPtNYMlos-6dZu0,17532
 jarvis/jarvis_rag/embedding_manager.py,sha256=SF7BW8hoZWzDhDqlOdhnX6XTw42Fx2GKs7Y_RUT1ydo,10400
 jarvis/jarvis_rag/llm_interface.py,sha256=DH46Vm3AgzK1o41X7wUUYUbbOOVPgmDCxS5l6djm9eA,4561
 jarvis/jarvis_rag/query_rewriter.py,sha256=LGAWZ8kwH_dpquuYqc4QWC7IXmHX3SsnPSYMWOn-nDE,4072
@@ -113,17 +113,17 @@ jarvis/jarvis_utils/clipboard.py,sha256=D3wzQeqg_yiH7Axs4d6MRxyNa9XxdnenH-ND2uj2
 jarvis/jarvis_utils/config.py,sha256=44MIH-CLRYpv8ltpirnq5_EccE1fVVGQciCiWRuDYmo,18824
 jarvis/jarvis_utils/embedding.py,sha256=oEOEM2qf16DMYwPsQe6srET9BknyjOdY2ef0jsp3Or8,2714
 jarvis/jarvis_utils/file_processors.py,sha256=XiM248SHS7lLgQDCbORVFWqinbVDUawYxWDOsLXDxP8,3043
-jarvis/jarvis_utils/git_utils.py,sha256=AkczUiRcGcOnPfz2v3mdLwV1S41IopiAYD2tjeMTDrE,23586
+jarvis/jarvis_utils/git_utils.py,sha256=X-j4aopmzmAW8Uv5rs3SDRnsAQYwJRnR6gR8yxXGEWg,23500
 jarvis/jarvis_utils/globals.py,sha256=aTrOHcCgPAeZFLFIWMAMiJCYlmr4XhdFZf5gZ745hnE,8900
 jarvis/jarvis_utils/http.py,sha256=eRhV3-GYuWmQ0ogq9di9WMlQkFcVb1zGCrySnOgT1x0,4392
 jarvis/jarvis_utils/input.py,sha256=tGIr3-t46gT3dD-Z6Bcb5xagIifM62cAHRkk3w9p7_Q,36635
 jarvis/jarvis_utils/methodology.py,sha256=3PAMHVF85IflBBblV_mMwkYXMelUML0nZYZ8MOAYUJ8,12918
 jarvis/jarvis_utils/output.py,sha256=svCHLuXHe3Ta_qfoT5DxO80nyYyMfBFIKgziQS__Nmg,13632
 jarvis/jarvis_utils/tag.py,sha256=f211opbbbTcSyzCDwuIK_oCnKhXPNK-RknYyGzY1yD0,431
-jarvis/jarvis_utils/utils.py,sha256=sK0-A6DVxqyxJE54K7j2vKGIAVQBpd7O54xOtBWLFt4,62268
-jarvis_ai_assistant-0.3.25.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.3.25.dist-info/METADATA,sha256=x_-BQj684awisXcDf-gV-9T7ycgni8QWZiAAZI6KSrg,18790
-jarvis_ai_assistant-0.3.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.3.25.dist-info/entry_points.txt,sha256=4GcWKFxRJD-QU14gw_3ZaW4KuEVxOcZK9i270rwPdjA,1395
-jarvis_ai_assistant-0.3.25.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.3.25.dist-info/RECORD,,
+jarvis/jarvis_utils/utils.py,sha256=npqPuSVqCYFmcrIK_J-MqmMlRxZ9oZDbps9bT_tNI-E,63205
+jarvis_ai_assistant-0.3.26.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.3.26.dist-info/METADATA,sha256=AFxKVvM2rsHE0Y18QCxQ9bddXdJKcmk0t2S1NWKaXw4,18790
+jarvis_ai_assistant-0.3.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.3.26.dist-info/entry_points.txt,sha256=4GcWKFxRJD-QU14gw_3ZaW4KuEVxOcZK9i270rwPdjA,1395
+jarvis_ai_assistant-0.3.26.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.3.26.dist-info/RECORD,,