jarvis-ai-assistant 0.1.210__py3-none-any.whl → 0.1.211__py3-none-any.whl

jarvis/jarvis_platform/human.py

@@ -52,12 +52,20 @@ class HumanPlatform(BasePlatform):
             session_info = f"(会话ID: {self.conversation_id})"
 
         if self.system_message and self.first_message:
-            prompt = f"{self.system_message}\n\n{message} {session_info}\n\n请回复:"
+            prompt = f"{self.system_message}\n\n{message} {session_info}"
             self.first_message = False
         else:
-            prompt = f"{message} {session_info}\n\n请回复:"
+            prompt = f"{message} {session_info}"
 
-        response = get_multiline_input(prompt)
+        # 将prompt复制到剪贴板
+        import subprocess
+        try:
+            subprocess.run(['xsel', '-ib'], input=prompt.encode('utf-8'), check=True)
+            PrettyOutput.print("提示已复制到剪贴板", OutputType.INFO)
+        except subprocess.CalledProcessError as e:
+            PrettyOutput.print(f"无法复制到剪贴板: {e}", OutputType.WARNING)
+
+        response = get_multiline_input(prompt + "\n\n请回复:")
         yield response
         return None
 

jarvis/jarvis_utils/embedding.py

@@ -1,8 +1,16 @@
 # -*- coding: utf-8 -*-
+import os
+from pathlib import Path
 from typing import List
 
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
+# 设置tiktoken缓存目录
+script_dir = Path(__file__).parent
+tiktoken_cache_dir = script_dir / "../jarvis_data/tiktoken"
+os.makedirs(tiktoken_cache_dir, exist_ok=True)
+os.environ["TIKTOKEN_CACHE_DIR"] = str(tiktoken_cache_dir.absolute())
+
 
 def get_context_token_count(text: str) -> int:
     """使用tiktoken获取文本的token数量。

jarvis/jarvis_utils/git_utils.py

@@ -513,9 +513,16 @@ def get_recent_commits_with_files() -> List[Dict[str, Any]]:
             失败时返回空列表
     """
     try:
-        # 获取最近5次提交的基本信息
+        # 获取当前git用户名
+        current_author = subprocess.run(
+            ["git", "config", "user.name"],
+            capture_output=True,
+            text=True,
+        ).stdout.strip()
+
+        # 获取当前用户最近5次提交的基本信息
         result = subprocess.run(
-            ["git", "log", "-5", "--pretty=format:%H%n%s%n%an%n%ad"],
+            ["git", "log", "-5", "--author=" + current_author, "--pretty=format:%H%n%s%n%an%n%ad"],
             capture_output=True,
             text=True,
         )

jarvis/jarvis_utils/utils.py

@@ -66,23 +66,6 @@ def _show_welcome_message(welcome_str: str) -> None:
     PrettyOutput.print_gradient_text(jarvis_ascii_art, (0, 120, 255), (0, 255, 200))
 
 
-def _extract_huggingface_models() -> None:
-    """解压HuggingFace模型"""
-    data_dir = Path(get_data_dir())
-    script_dir = Path(os.path.dirname(os.path.dirname(__file__)))
-    hf_archive = script_dir / "jarvis_data" / "huggingface.tar.gz"
-    hf_dir = data_dir / "huggingface" / "hub"
-
-    if not hf_dir.exists() and hf_archive.exists():
-        try:
-            PrettyOutput.print("正在解压HuggingFace模型...", OutputType.INFO)
-            with tarfile.open(hf_archive, "r:gz") as tar:
-                tar.extractall(path=data_dir)
-            PrettyOutput.print("HuggingFace模型解压完成", OutputType.SUCCESS)
-        except Exception as e:
-            PrettyOutput.print(f"解压HuggingFace模型失败: {e}", OutputType.ERROR)
-
-
 def _check_git_updates() -> bool:
     """检查并更新git仓库
 
@@ -117,10 +100,7 @@ def init_env(welcome_str: str, config_file: Optional[str] = None) -> None:
     g_config_file = config_file
     load_config()
 
-    # 5. 解压模型
-    _extract_huggingface_models()
-
-    # 6. 检查git更新
+    # 5. 检查git更新
     if _check_git_updates():
         os.execv(sys.executable, [sys.executable] + sys.argv)
         sys.exit(0)

{jarvis_ai_assistant-0.1.210.dist-info → jarvis_ai_assistant-0.1.211.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.210
+Version: 0.1.211
 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.1.210.dist-info → jarvis_ai_assistant-0.1.211.dist-info}/RECORD

@@ -1,4 +1,4 @@
-jarvis/__init__.py,sha256=C0RxOVy8FTEwTYuX80VZUOqJoMzlTgvrlyWs2b71wag,75
+jarvis/__init__.py,sha256=cqFgIO8VkgWyzLkk14Tuu3hR1gSzDxeUVLp3NtZ1Uos,75
 jarvis/jarvis_agent/__init__.py,sha256=QbI5vkourPJZ2OR63RBZAtFptTYrZz_si8bIkc9EB2o,31709
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=1V7kV5Zhw2HE3Xgjs1R-43RZ2huq3Kg-32NCdNnyZmA,2216
 jarvis/jarvis_agent/edit_file_handler.py,sha256=bIciBghx5maDz09x0XNTxdNsyrBbTND95GupVdJIVVg,16762
@@ -31,6 +31,7 @@ jarvis/jarvis_code_analysis/checklists/sql.py,sha256=vR0T6qC7b4dURjJVAd7kSVxyvZE
 jarvis/jarvis_code_analysis/checklists/swift.py,sha256=TPx4I6Gupvs6tSerRKmTSKEPQpOLEbH2Y7LXg1uBgxc,2566
 jarvis/jarvis_code_analysis/checklists/web.py,sha256=25gGD7pDadZQybNFvALYxWvK0VRjGQb1NVJQElwjyk0,3943
 jarvis/jarvis_data/config_schema.json,sha256=BeaihTD2eYRZq65-tbmCIx7lBdS5U0V1FOQGIc6XCq0,5849
+jarvis/jarvis_data/tiktoken/9b5ad71b2ce5302211f9c61530b329a4922fc6a4,sha256=Ijkht27pm96ZW3_3OFE-7xAPtR0YyTWXoRO8_-hlsqc,1681126
 jarvis/jarvis_git_details/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_git_details/main.py,sha256=MjpUHB4ErR_SKPBx1TLLK_XLkH427RTtsyVn6EUd88Y,8907
 jarvis/jarvis_git_squash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -45,7 +46,7 @@ jarvis/jarvis_multi_agent/__init__.py,sha256=sDd3sK88dS7_qAz2ywIAaEWdQ4iRVCiuBu2
 jarvis/jarvis_multi_agent/main.py,sha256=h7VUSwoPrES0XTK8z5kt3XLX1mmcm8UEuFEHQOUWPH4,1696
 jarvis/jarvis_platform/__init__.py,sha256=WLQHSiE87PPket2M50_hHzjdMIgPIBx2VF8JfB_NNRk,105
 jarvis/jarvis_platform/base.py,sha256=xN0DGYs03eS-wSQk4JgBOzFl0kvDAmqnssUU59EOXU8,7775
-jarvis/jarvis_platform/human.py,sha256=r8Vlltp_LirJZeZh1Mmi30iJr9tl1JaNFoqthSRHF6o,2826
+jarvis/jarvis_platform/human.py,sha256=_WQtC5w6QJnHh-3KuW8T49C-HucXiHsBEVw-m51ykj4,3196
 jarvis/jarvis_platform/kimi.py,sha256=W5MKkH6rxS5JeNY3VZY0EOT9ugeZJqr_eHO9wd9cEW4,12444
 jarvis/jarvis_platform/openai.py,sha256=uEjBikfFj7kp5wondLvOx4WdkmTX0aqF6kixxAufcHg,4806
 jarvis/jarvis_platform/registry.py,sha256=Sz4ADAaxuufpAQG0KSQZuL1yALzH-aF3FDapkNn5foE,8107
@@ -75,19 +76,19 @@ jarvis/jarvis_tools/cli/main.py,sha256=Mg6TQDxMdzB1Ua1UrZ2EE-uQWsbaeojWaEGHJp2Hi
 jarvis/jarvis_utils/__init__.py,sha256=67h0ldisGlh3oK4DAeNEL2Bl_VsI3tSmfclasyVlueM,850
 jarvis/jarvis_utils/builtin_replace_map.py,sha256=EI8JnHqr-ZpAhpwocTu48DhHUMHNd8tNUpDNYI47OLE,1717
 jarvis/jarvis_utils/config.py,sha256=MO2-1z_7f3KkSrv7heGK1650Zb0SjnljO2hzLE2jA5c,6598
-jarvis/jarvis_utils/embedding.py,sha256=nOe_jvn8pr4env83D9gNCBcId8LaUsvQxa8awLP1_2Y,2437
+jarvis/jarvis_utils/embedding.py,sha256=oEOEM2qf16DMYwPsQe6srET9BknyjOdY2ef0jsp3Or8,2714
 jarvis/jarvis_utils/file_processors.py,sha256=XiM248SHS7lLgQDCbORVFWqinbVDUawYxWDOsLXDxP8,3043
-jarvis/jarvis_utils/git_utils.py,sha256=VBf1_9xM75kQSKSFFtKRdP-_3rVpdlt9scnjYlTeHGc,21397
+jarvis/jarvis_utils/git_utils.py,sha256=7AZblSD4b76vXxaDFkmZOy5rNkwvkwQQxGUy3NAusDQ,21641
 jarvis/jarvis_utils/globals.py,sha256=9NTMfCVd0jvtloOv14-KE6clhcVStFmyN9jWxLmQ5so,3369
 jarvis/jarvis_utils/http.py,sha256=Uqt1kcz0HWnAfXHHi1fNGwLb2lcVUqpbrG2Uk_-kcIU,4882
 jarvis/jarvis_utils/input.py,sha256=ehvHkIgwqnBOHkwOeRCBFRggqOgOZuUdGQXn2ATUFwU,8049
 jarvis/jarvis_utils/methodology.py,sha256=-cvM6pwgJK7BXCYg2uVjIId_j3v5RUh2z2PBcK_2vj4,8155
 jarvis/jarvis_utils/output.py,sha256=PRCgudPOB8gMEP3u-g0FGD2c6tBgJhLXUMqNPglfjV8,10813
 jarvis/jarvis_utils/tag.py,sha256=f211opbbbTcSyzCDwuIK_oCnKhXPNK-RknYyGzY1yD0,431
-jarvis/jarvis_utils/utils.py,sha256=zgkdtpQ6kN86pzYi0iBBa3IUJp_GMrm31RKh5V_6Vzg,15306
-jarvis_ai_assistant-0.1.210.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.210.dist-info/METADATA,sha256=CHgOUpcFWMUDiGpyAPis5qVu50OR6btWYFuBuESVbMs,19564
-jarvis_ai_assistant-0.1.210.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.1.210.dist-info/entry_points.txt,sha256=SF46ViTZcQVZEfbqzJDKKVc9TrN1x-P1mQ6wup7u2HY,875
-jarvis_ai_assistant-0.1.210.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.210.dist-info/RECORD,,
+jarvis/jarvis_utils/utils.py,sha256=BoRwLcixdf7mU3Tawe95ygGhQpkMffrFYLYhPwIvw8A,14498
+jarvis_ai_assistant-0.1.211.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.211.dist-info/METADATA,sha256=DXSWr3mZ247PHP_3dZzWhbgM0QBJEo2uxK1YX6v9WoU,19564
+jarvis_ai_assistant-0.1.211.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.1.211.dist-info/entry_points.txt,sha256=SF46ViTZcQVZEfbqzJDKKVc9TrN1x-P1mQ6wup7u2HY,875
+jarvis_ai_assistant-0.1.211.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.211.dist-info/RECORD,,