jarvis-ai-assistant 0.1.85__py3-none-any.whl → 0.1.87__py3-none-any.whl

jarvis/tools/registry.py

@@ -7,7 +7,7 @@ from typing import Any, Callable, Dict, List, Optional
 
 from jarvis.models.registry import PlatformRegistry
 from jarvis.tools.base import Tool
-from jarvis.utils import OutputType, PrettyOutput
+from jarvis.utils import OutputType, PrettyOutput, get_max_context_length
 
 
 class ToolRegistry:
@@ -19,7 +19,8 @@ class ToolRegistry:
         # 加载内置工具和外部工具
         self._load_builtin_tools()
         self._load_external_tools()
-        self.max_context_length = int(os.getenv('JARVIS_MAX_CONTEXT_LENGTH', '65536'))  # 默认30k
+        # 确保 max_context_length 是整数
+        self.max_context_length = int(get_max_context_length() * 0.8)
 
     @staticmethod
     def get_global_tool_registry():
@@ -176,15 +177,16 @@ class ToolRegistry:
                 PrettyOutput.section("执行成功", OutputType.SUCCESS)
                 
                 # 如果输出超过4k字符，使用大模型总结
-                if len(output) > 4096:
+                if len(output) > self.max_context_length:
                     try:
                         PrettyOutput.print("输出较长，正在总结...", OutputType.PROGRESS)
                         model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
                         
-                        # 如果输出超过30k，只取最后30k字符
-                        if len(output) > self.max_context_length:
-                            output_to_summarize = output[-self.max_context_length:]
-                            truncation_notice = "\n(注意: 由于输出过长，仅总结最后65536字符)"
+                        # 如果输出超过最大上下文长度，只取最后部分
+                        max_len = self.max_context_length
+                        if len(output) > max_len:
+                            output_to_summarize = output[-max_len:]
+                            truncation_notice = f"\n(注意: 由于输出过长，仅总结最后{max_len}字符)"
                         else:
                             output_to_summarize = output
                             truncation_notice = ""
@@ -209,7 +211,7 @@ class ToolRegistry:
 --- 总结结束 ---"""
                         
                     except Exception as e:
-                        PrettyOutput.print(f"总结失败: {str(e)}", OutputType.WARNING)
+                        PrettyOutput.print(f"总结失败: {str(e)}", OutputType.ERROR)
                         output = f"输出较长 ({len(output)} 字符)，建议查看原始输出。\n前300字符预览:\n{output[:300]}..."
             
             else:

jarvis/utils.py

@@ -10,6 +10,8 @@ from prompt_toolkit import PromptSession
 from prompt_toolkit.styles import Style as PromptStyle
 from prompt_toolkit.formatted_text import FormattedText
 from sentence_transformers import SentenceTransformer
+from transformers import AutoModelForSequenceClassification, AutoTokenizer
+import torch
 
 # 初始化colorama
 colorama.init()
@@ -211,7 +213,7 @@ def find_git_root(dir="."):
 
 def load_embedding_model():
     os.environ["TOKENIZERS_PARALLELISM"] = "false"
-    model_name = os.environ.get("JARVIS_EMBEDDING_MODEL", "BAAI/bge-large-zh-v1.5")
+    model_name = "BAAI/bge-large-zh-v1.5"
     PrettyOutput.print(f"正在加载嵌入模型: {model_name}...", OutputType.INFO)
     try:
         # 首先尝试离线加载
@@ -232,4 +234,48 @@ def load_embedding_model():
         )
         PrettyOutput.print("模型下载并加载成功", OutputType.SUCCESS)
     
-    return embedding_model
+    return embedding_model
+
+def load_rerank_model():
+    """加载重排序模型"""
+    model_name = "BAAI/bge-reranker-v2-m3"
+    PrettyOutput.print(f"正在加载重排序模型: {model_name}...", OutputType.INFO)
+    
+    try:
+        # 首先尝试离线加载
+        tokenizer = AutoTokenizer.from_pretrained(
+            model_name,
+            local_files_only=True,
+            cache_dir=os.path.expanduser("~/.cache/huggingface/hub")
+        )
+        model = AutoModelForSequenceClassification.from_pretrained(
+            model_name,
+            local_files_only=True,
+            cache_dir=os.path.expanduser("~/.cache/huggingface/hub")
+        )
+        PrettyOutput.print("使用本地缓存加载模型成功", OutputType.SUCCESS)
+    except Exception as local_error:
+        PrettyOutput.print(f"本地加载失败，尝试在线下载: {str(local_error)}", OutputType.WARNING)
+        # 如果离线加载失败，尝试在线下载
+        tokenizer = AutoTokenizer.from_pretrained(
+            model_name,
+            cache_dir=os.path.expanduser("~/.cache/huggingface/hub")
+        )
+        model = AutoModelForSequenceClassification.from_pretrained(
+            model_name,
+            cache_dir=os.path.expanduser("~/.cache/huggingface/hub")
+        )
+        PrettyOutput.print("模型下载并加载成功", OutputType.SUCCESS)
+    
+    # 如果有 GPU 就使用 GPU
+    if torch.cuda.is_available():
+        model = model.cuda()
+    model.eval()
+    
+    return model, tokenizer
+
+def get_max_context_length():
+    return int(os.getenv('JARVIS_MAX_CONTEXT_LENGTH', '131072'))  # 默认128k
+
+def get_thread_count():
+    return int(os.getenv('JARVIS_THREAD_COUNT', '1'))  

{jarvis_ai_assistant-0.1.85.dist-info → jarvis_ai_assistant-0.1.87.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.85
+Version: 0.1.87
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -134,15 +134,13 @@ Jarvis supports configuration through environment variables that can be set in t
 | JARVIS_CODEGEN_MODEL | Model name for code generation | Same as JARVIS_MODEL | No |
 | JARVIS_CHEAP_PLATFORM | AI platform for cheap operations | Same as JARVIS_PLATFORM | No |
 | JARVIS_CHEAP_MODEL | Model name for cheap operations | Same as JARVIS_MODEL | No |
-| JARVIS_EMBEDDING_MODEL | Embedding model for code analysis | BAAI/bge-large-zh-v1.5 | No |
 | OPENAI_API_KEY | API key for OpenAI platform | - | Required for OpenAI |
 | OPENAI_API_BASE | Base URL for OpenAI API | https://api.deepseek.com | No |
 | OPENAI_MODEL_NAME | Model name for OpenAI | deepseek-chat | No |
 | AI8_API_KEY | API key for AI8 platform | - | Required for AI8 |
-| AI8_MODEL | Model name for AI8 platform | deepseek-chat | No |
 | KIMI_API_KEY | API key for Kimi platform | - | Required for Kimi |
 | OYI_API_KEY | API key for OYI platform | - | Required for OYI |
-| OYI_MODEL | Model name for OYI platform | deepseek-chat | No |
+| OLLAMA_API_BASE | Base URL for Ollama API | http://localhost:11434 | No |
 
 
 ## 🎯 Usage

{jarvis_ai_assistant-0.1.85.dist-info → jarvis_ai_assistant-0.1.87.dist-info}/RECORD

@@ -1,24 +1,25 @@
-jarvis/__init__.py,sha256=CSCMvkP7vytslNiqC8OQkG-M3_75PziRYYuzcVBVfp0,50
-jarvis/agent.py,sha256=LfWTMp7lyrMebby56up-58VuxK5JSnfq0cyJDWG7HBw,19069
+jarvis/__init__.py,sha256=Qu_hhtdNbd4dzRrFbg7RZnEUuZ1vjkIa45ZGmskpboY,50
+jarvis/agent.py,sha256=_qh4mSojAgClOEz5pTiRIfRJU-5_3QGzBAU09roCjtk,19095
 jarvis/main.py,sha256=ksZkJzqc4oow6wB-7QbGJLejGblrbZtRI3fdciS5DS4,5455
-jarvis/utils.py,sha256=jvo6ylvrTaSmXWcYY0qTTf14TwCkAhPsCUuIl5WHEuw,8640
+jarvis/utils.py,sha256=Y5zig7AgIzdWHF31qHaMUziezythfjVKjxFRtMzd1m4,10357
 jarvis/jarvis_codebase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_codebase/main.py,sha256=tefwhPXVcUoV7ZIhF4AiIBsZ9sJRCkjI_i5lyusbZOI,24972
+jarvis/jarvis_codebase/main.py,sha256=nlh0zkJhJfA8jaENV8wNo9OAXCeEKX1lbGzKOBjkzV4,26518
 jarvis/jarvis_coder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_coder/main.py,sha256=TxtFCzA5SJSorHtHX5_V3qQeJsoFMgVdrwxLJ9GnPw8,23619
+jarvis/jarvis_coder/main.py,sha256=Rdt9w_uGamDHN-jjZXtHdUNGHa0q2fbGe9R9Ay6XXe0,25431
 jarvis/jarvis_rag/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_rag/main.py,sha256=pIZXnw7xl6yqdN0Lghu7WDwd-kyh36KTCAgOoSn95uk,22932
+jarvis/jarvis_rag/main.py,sha256=a8TtPVCh5Xd6W1AaRFGeXvU_1hEnHQdoMElxnMuq0ew,24773
 jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_smart_shell/main.py,sha256=QgR1CZRcTVfC8a5hMso3onH3pFdDoniRjr0YQvY2jXQ,3809
 jarvis/models/__init__.py,sha256=mrOt67nselz_H1gX9wdAO4y2DY5WPXzABqJbr5Des8k,63
-jarvis/models/ai8.py,sha256=P_p1ceyjn_olFk38WsubHGavWI9bMEBzo-1vo97HLPE,12215
+jarvis/models/ai8.py,sha256=Te-zqUVTTsismsoS8yXljAMwxKY5BVHdfwJyzPrIYSc,12216
 jarvis/models/base.py,sha256=vQmgr-l0fRzVTUX4orbQZIKsXEInagjFdYv1cL9Hp7U,1511
 jarvis/models/kimi.py,sha256=ltYoHQDn9vfZyhZ25eUVKMBpxKKlqlw4kManozVF7uo,16135
-jarvis/models/openai.py,sha256=XiZ0omZdaOfDVdmXX-IA-Dg78R8xIH429L6j0R_yHSI,4083
-jarvis/models/oyi.py,sha256=tdsBf3gegrEDkZf2VOJF9SRLwe9s2g8Al9s-qR9YQRg,14633
+jarvis/models/ollama.py,sha256=iPCsJKZs3kXtuJyVBo6d6Ls5qBkSRgtuqF38PDFadso,6097
+jarvis/models/openai.py,sha256=Ns_kpJcWoQuxdKScOFlfkSGjrL2dVGzgmvcnP44sEgs,4044
+jarvis/models/oyi.py,sha256=vV3IMsdegxQqhS2vvG6MB648fec6bVopdNZC5xcdY_c,14678
 jarvis/models/registry.py,sha256=Lt8IdVBAEx_CCFtfZJPgw3nxSEjfFcqI47I-U64kIbg,8257
 jarvis/tools/__init__.py,sha256=7Rqyj5hBAv5cWDVr5T9ZTZASO7ssBHeQNm2_4ZARdkA,72
-jarvis/tools/ask_user.py,sha256=xLXkYK3_f8EJ7kudA8MumOOCxyFl6z3DBS_zcscMH6Y,2151
+jarvis/tools/ask_user.py,sha256=OELDt7oTCjI2G-CebvnBSxFJhqkIWcugLStU-XxouzE,1998
 jarvis/tools/base.py,sha256=EGRGbdfbLXDLwtyoWdvp9rlxNX7bzc20t0Vc2VkwIEY,652
 jarvis/tools/chdir.py,sha256=TjfPbX8yvNKgUNJEMXh3ZlVDEIse_Fo8xMoVsiK7_dA,2688
 jarvis/tools/codebase_qa.py,sha256=LsowsgL7HBmdBwa7zXcYi_OkwOok4qbnzYWYsuZxHtU,2413
@@ -26,14 +27,14 @@ jarvis/tools/coder.py,sha256=kmotT2Klsug44S51QoSW9DzkxLzcF-XonyYAEoWZV6c,2295
 jarvis/tools/file_ops.py,sha256=h8g0eT9UvlJf4kt0DLXvdSsjcPj7x19lxWdDApeDfpg,3842
 jarvis/tools/generator.py,sha256=TB1zcw_JmRL2W9w6L4IxtrLF3gjnNw5Jj2Zrowj0eSg,5763
 jarvis/tools/methodology.py,sha256=UG6s5VYRcd9wrKX4cg6f7zJhet5AIcthFGMOAdevBiw,5175
-jarvis/tools/registry.py,sha256=sgj5EVbRgfHSzXW5v-kbIZS_8cwAxTjHvSPAicxBRf4,9074
+jarvis/tools/registry.py,sha256=AbADf8pcjHqfNoQNJkWqEuVg6zHRdryhJyDQ5w4O2sc,9177
 jarvis/tools/search.py,sha256=c9dXtyICdl8Lm8shNPNyIx9k67uY0rMF8xnIKu2RsnE,8787
 jarvis/tools/shell.py,sha256=UPKshPyOaUwTngresUw-ot1jHjQIb4wCY5nkJqa38lU,2520
 jarvis/tools/sub_agent.py,sha256=rEtAmSVY2ZjFOZEKr5m5wpACOQIiM9Zr_3dT92FhXYU,2621
 jarvis/tools/webpage.py,sha256=d3w3Jcjcu1ESciezTkz3n3Zf-rp_l91PrVoDEZnckOo,2391
-jarvis_ai_assistant-0.1.85.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.85.dist-info/METADATA,sha256=RK6Yy0tqkTb0tMnqxLLyizhi6fZmFTEwAP-rI6PRCHM,12736
-jarvis_ai_assistant-0.1.85.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.85.dist-info/entry_points.txt,sha256=sdmIO86MrIUepJTGyHs0i_Ho9VGf1q9YRP4RgQvGWcI,280
-jarvis_ai_assistant-0.1.85.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.85.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.87.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.87.dist-info/METADATA,sha256=1W0ZGe3z8R5w--7LJhwc5KGb_HpLrN-CUkgAOp-d41g,12589
+jarvis_ai_assistant-0.1.87.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.87.dist-info/entry_points.txt,sha256=sdmIO86MrIUepJTGyHs0i_Ho9VGf1q9YRP4RgQvGWcI,280
+jarvis_ai_assistant-0.1.87.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.87.dist-info/RECORD,,