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

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

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.3.5"
+version = "0.3.7"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]
@@ -112,6 +112,3 @@ url = "https://mirrors.aliyun.com/pypi/simple/"
 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.5 → jarvis_ai_assistant-0.3.7}/setup.py

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

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

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

@@ -163,11 +163,13 @@ class MemoryOrganizer:
             )
             all_tags.update(memory.get("tags", []))
 
+        memory_contents_str = (("="*50) + "\n").join(memory_contents)
+
         prompt = f"""请将以下{len(memories)}个相关记忆合并成一个综合性的记忆。
 
 原始记忆（按时间从新到旧排序）：
 {"="*50}
-{(("="*50) + "\n").join(memory_contents)}
+{memory_contents_str}
 {"="*50}
 
 原始标签集合：{', '.join(sorted(all_tags))}

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

@@ -427,10 +427,40 @@ def check_and_update_git_repo(repo_path: str) -> bool:
                         is_uv_env = True
 
                 # 根据环境选择安装命令
-                if is_uv_env:
-                    install_cmd = ["uv", "pip", "install", "-e", "."]
+                # 检测是否安装了 RAG 特性
+                rag_installed = False
+                try:
+                    import langchain  # noqa
+
+                    rag_installed = True
+                except ImportError:
+                    pass
+
+                # 根据环境和 RAG 特性选择安装命令
+                if rag_installed:
+                    if is_uv_env:
+                        install_cmd = ["uv", "pip", "install", "-e", ".[rag]"]
+                    else:
+                        install_cmd = [
+                            sys.executable,
+                            "-m",
+                            "pip",
+                            "install",
+                            "-e",
+                            ".[rag]",
+                        ]
                 else:
-                    install_cmd = [sys.executable, "-m", "pip", "install", "-e", "."]
+                    if is_uv_env:
+                        install_cmd = ["uv", "pip", "install", "-e", "."]
+                    else:
+                        install_cmd = [
+                            sys.executable,
+                            "-m",
+                            "pip",
+                            "install",
+                            "-e",
+                            ".",
+                        ]
 
                 # 尝试安装
                 result = subprocess.run(

{jarvis_ai_assistant-0.3.5 → jarvis_ai_assistant-0.3.7}/src/jarvis/jarvis_utils/utils.py

@@ -9,7 +9,7 @@ import sys
 import time
 from pathlib import Path
 from typing import Any, Callable, Dict, List, Optional
-from datetime import datetime
+from datetime import datetime, date
 
 import yaml  # type: ignore
 from rich.align import Align
@@ -79,16 +79,110 @@ def _setup_signal_handler() -> None:
     signal.signal(signal.SIGINT, sigint_handler)
 
 
-def _check_git_updates() -> bool:
-    """检查并更新git仓库
+def _check_pip_updates() -> bool:
+    """检查pip安装的Jarvis是否有更新
+
+    返回:
+        bool: 是否执行了更新（总是返回False，因为pip更新需要用户手动执行）
+    """
+    import urllib.request
+    import urllib.error
+    from packaging import version
+
+    # 检查上次检查日期
+    last_check_file = Path(get_data_dir()) / "last_pip_check"
+    today_str = date.today().strftime("%Y-%m-%d")
+
+    if last_check_file.exists():
+        try:
+            last_check_date = last_check_file.read_text().strip()
+            if last_check_date == today_str:
+                return False
+        except Exception:
+            pass
+
+    try:
+        # 获取PyPI上的最新版本
+        url = "https://pypi.org/pypi/jarvis-ai-assistant/json"
+        try:
+            with urllib.request.urlopen(url, timeout=5) as response:
+                data = json.loads(response.read().decode())
+                latest_version = data["info"]["version"]
+        except (urllib.error.URLError, KeyError, json.JSONDecodeError) as e:
+            return False
+
+        # 比较版本
+        current_ver = version.parse(__version__)
+        latest_ver = version.parse(latest_version)
+
+        if latest_ver > current_ver:
+            PrettyOutput.print(
+                f"检测到新版本 v{latest_version} (当前版本: v{__version__})",
+                OutputType.INFO,
+            )
+
+            # 检测是否在虚拟环境中
+            in_venv = hasattr(sys, "real_prefix") or (
+                hasattr(sys, "base_prefix") and sys.base_prefix != sys.prefix
+            )
+
+            # 检测是否使用uv
+            is_uv_env = False
+            if in_venv:
+                if sys.platform == "win32":
+                    uv_path = Path(sys.prefix) / "Scripts" / "uv.exe"
+                else:
+                    uv_path = Path(sys.prefix) / "bin" / "uv"
+                if uv_path.exists():
+                    is_uv_env = True
+
+            # 检测是否安装了 RAG 特性
+            rag_installed = False
+            try:
+                import langchain  # noqa
+
+                rag_installed = True
+            except ImportError:
+                pass
+
+            # 提供更新命令
+            package_spec = (
+                "jarvis-ai-assistant[rag]" if rag_installed else "jarvis-ai-assistant"
+            )
+            if is_uv_env:
+                update_cmd = f"uv pip install --upgrade {package_spec}"
+            else:
+                update_cmd = f"{sys.executable} -m pip install --upgrade {package_spec}"
+
+            PrettyOutput.print(f"请手动执行以下命令更新: {update_cmd}", OutputType.INFO)
+
+        # 更新检查日期
+        last_check_file.write_text(today_str)
+
+    except Exception as e:
+        # 静默处理错误，不影响正常使用
+        pass
+
+    return False
+
+
+def _check_jarvis_updates() -> bool:
+    """检查并更新Jarvis本身（git仓库或pip包）
 
     返回:
         bool: 是否需要重启进程
     """
     script_dir = Path(os.path.dirname(os.path.dirname(__file__)))
-    from jarvis.jarvis_utils.git_utils import check_and_update_git_repo
 
-    return check_and_update_git_repo(str(script_dir))
+    # 先检查是否是git源码安装
+    git_dir = script_dir / ".git"
+    if git_dir.exists():
+        from jarvis.jarvis_utils.git_utils import check_and_update_git_repo
+
+        return check_and_update_git_repo(str(script_dir))
+
+    # 检查是否是pip/uv pip安装的版本
+    return _check_pip_updates()
 
 
 def _show_usage_stats(welcome_str: str) -> None:
@@ -531,8 +625,8 @@ def init_env(welcome_str: str, config_file: Optional[str] = None) -> None:
     if welcome_str:
         _show_usage_stats(welcome_str)
 
-    # 5. 检查git更新
-    if _check_git_updates():
+    # 5. 检查Jarvis更新
+    if _check_jarvis_updates():
         os.execv(sys.executable, [sys.executable] + sys.argv)
         sys.exit(0)
 

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

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