jarvis-ai-assistant 0.1.91__py3-none-any.whl → 0.1.93__py3-none-any.whl

jarvis/tools/thinker.py

@@ -17,11 +17,10 @@ class ThinkerTool:
                 "description": "问题相关的上下文信息或背景知识",
                 "default": ""
             },
-            "approach": {
+            "goal": {
                 "type": "string",
-                "enum": ["chain_of_thought", "tree_of_thought", "step_by_step"],
-                "description": "思考方式：chain_of_thought(思维链)、tree_of_thought(思维树)、step_by_step(步骤分解)",
-                "default": "chain_of_thought"
+                "description": "期望达成的具体目标或结果",
+                "default": ""
             }
         },
         "required": ["question"]
@@ -31,89 +30,36 @@ class ThinkerTool:
         """初始化思考工具"""
         self.model = PlatformRegistry.get_global_platform_registry().get_thinking_platform()
 
-    def _generate_prompt(self, question: str, context: str, approach: str) -> str:
+    def _generate_prompt(self, question: str, context: str, goal: str) -> str:
         """生成提示词
         
         Args:
             question: 问题
             context: 上下文
-            approach: 思考方式
+            goal: 期望目标
             
         Returns:
             str: 完整的提示词
         """
         # 基础提示词
-        base_prompt = "你是一个擅长深度思考和逻辑推理的助手。"
-        
-        # 根据不同的思考方式添加具体指导
-        approach_prompts = {
-            "chain_of_thought": """请使用思维链方式分析问题：
-1. 仔细阅读问题和上下文
-2. 逐步推理，每一步都要说明推理依据
-3. 考虑多个可能的角度
-4. 得出最终结论
-
-请按以下格式输出：
-思考过程：
-1. [第一步推理]
-2. [第二步推理]
-...
-
-结论：
-[最终结论]""",
-
-            "tree_of_thought": """请使用思维树方式分析问题：
-1. 将问题分解为多个子问题
-2. 对每个子问题进行分支探索
-3. 评估每个分支的可行性
-4. 整合最优路径
-
-请按以下格式输出：
-问题分解：
-- 子问题1
-  - 分支1.1
-  - 分支1.2
-- 子问题2
-  - 分支2.1
-  - 分支2.2
-
-分析过程：
-[详细分析每个分支]
-
-最优路径：
-[说明选择原因]
-
-结论：
-[最终结论]""",
+        prompt = f"""你是一个擅长深度思考和逻辑推理的助手。请帮助分析问题并给出解决方案。
 
-            "step_by_step": """请使用步骤分解方式分析问题：
-1. 将问题分解为具体步骤
-2. 详细说明每个步骤的执行方法
-3. 考虑每个步骤可能的问题
-4. 提供完整的解决方案
-
-请按以下格式输出：
-步骤分解：
-步骤1: [具体内容]
-步骤2: [具体内容]
-...
-
-执行分析：
-[详细分析每个步骤]
-
-解决方案：
-[完整方案]"""
-        }
-
-        # 构建完整提示词
-        prompt = f"""{base_prompt}
-
-{approach_prompts[approach]}
+请按以下方式思考：
+1. 仔细理解问题和目标
+2. 进行系统性分析和推理
+3. 考虑多个可能的解决方案
+4. 给出最佳建议和具体行动步骤
 
 问题：
 {question}
-
 """
+        # 如果有目标，添加到提示词中
+        if goal:
+            prompt += f"""
+期望目标：
+{goal}
+"""
+
         # 如果有上下文，添加到提示词中
         if context:
             prompt += f"""
@@ -131,7 +77,7 @@ class ThinkerTool:
             args: 包含参数的字典
                 - question: 问题
                 - context: 上下文（可选）
-                - approach: 思考方式（可选）
+                - goal: 期望目标（可选）
                 
         Returns:
             Dict[str, Any]: 执行结果
@@ -140,16 +86,17 @@ class ThinkerTool:
             # 获取参数
             question = args["question"]
             context = args.get("context", "")
-            approach = args.get("approach", "chain_of_thought")
+            goal = args.get("goal", "")
             
             # 生成提示词
-            prompt = self._generate_prompt(question, context, approach)
+            prompt = self._generate_prompt(question, context, goal)
             
             # 记录开始分析
             PrettyOutput.print(f"开始分析问题: {question}", OutputType.INFO)
             if context:
                 PrettyOutput.print("包含上下文信息", OutputType.INFO)
-            PrettyOutput.print(f"使用{approach}方式思考", OutputType.INFO)
+            if goal:
+                PrettyOutput.print(f"目标: {goal}", OutputType.INFO)
             
             # 调用模型进行分析
             response = self.model.chat(prompt)
@@ -182,15 +129,14 @@ def main():
     parser = argparse.ArgumentParser(description='深度思考分析工具')
     parser.add_argument('--question', required=True, help='需要分析的问题')
     parser.add_argument('--context', help='问题相关的上下文信息')
-    parser.add_argument('--approach', choices=['chain_of_thought', 'tree_of_thought', 'step_by_step'],
-                      default='chain_of_thought', help='思考方式')
+    parser.add_argument('--goal', help='期望达成的具体目标或结果')
     args = parser.parse_args()
     
     tool = ThinkerTool()
     result = tool.execute({
         "question": args.question,
         "context": args.context,
-        "approach": args.approach
+        "goal": args.goal
     })
     
     if result["success"]:

jarvis/utils.py

@@ -1,3 +1,5 @@
+from ast import List, Str
+import hashlib
 from pathlib import Path
 import sys
 import time
@@ -16,6 +18,9 @@ import torch
 # 初始化colorama
 colorama.init()
 
+os.environ["HF_ENDPOINT"] = "https://hf-mirror.com"
+os.environ["TOKENIZERS_PARALLELISM"] = "false"
+
 class OutputType(Enum):
     SYSTEM = "system"      # AI助手消息
     CODE = "code"         # 代码相关
@@ -212,7 +217,6 @@ def find_git_root(dir="."):
     return ret
 
 def load_embedding_model():
-    os.environ["TOKENIZERS_PARALLELISM"] = "false"
     model_name = "BAAI/bge-large-zh-v1.5"
     PrettyOutput.print(f"正在加载嵌入模型: {model_name}...", OutputType.INFO)
     try:
@@ -275,5 +279,29 @@ def load_rerank_model():
 def get_max_context_length():
     return int(os.getenv('JARVIS_MAX_CONTEXT_LENGTH', '131072'))  # 默认128k
 
+def is_long_context(files: list) -> bool:
+    """检测文件列表是否属于长上下文（总字符数超过最大上下文长度的80%）"""
+    max_length = get_max_context_length()
+    threshold = max_length * 0.8
+    total_chars = 0
+    
+    for file_path in files:
+        try:
+            with open(file_path, 'r', encoding='utf-8') as f:
+                content = f.read()
+                total_chars += len(content)
+                
+                # 提前终止检查如果已经超过阈值
+                if total_chars > threshold:
+                    return True
+        except Exception as e:
+            PrettyOutput.print(f"无法读取文件 {file_path}: {e}", OutputType.WARNING)
+            continue
+            
+    return total_chars > threshold
+
 def get_thread_count():
-    return int(os.getenv('JARVIS_THREAD_COUNT', '1'))  
+    return int(os.getenv('JARVIS_THREAD_COUNT', '1'))  
+
+def get_file_md5(filepath: str)->str:    
+    return hashlib.md5(open(filepath, "rb").read(100*1024*1024)).hexdigest()

{jarvis_ai_assistant-0.1.91.dist-info → jarvis_ai_assistant-0.1.93.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.91
+Version: 0.1.93
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -53,6 +53,8 @@ Requires-Dist: PyMuPDF>=1.21.0
 Requires-Dist: python-docx>=0.8.11
 Requires-Dist: tiktoken>=0.3.0
 Requires-Dist: tqdm>=4.65.0
+Requires-Dist: docx>=0.2.4
+Requires-Dist: yaspin>=2.5.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"

jarvis_ai_assistant-0.1.93.dist-info/RECORD

@@ -0,0 +1,47 @@
+jarvis/__init__.py,sha256=f8113pl4O0dw4MOgNk0fK63GV0FVrx2v-G0-w75BjWc,50
+jarvis/agent.py,sha256=vjWR-bIyac7nL3qMUOhastXMdT9PqufwRjT-h_hAnk0,19403
+jarvis/main.py,sha256=kHvlVDmjznWvXugl56M4HRb1Uedkn8lKsMEKr8tNy1Q,5824
+jarvis/utils.py,sha256=gIpS62j9cbKndvXQ7E36RQCaNOgl5bl2PRPcpiZZvew,11292
+jarvis/jarvis_codebase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_codebase/main.py,sha256=li3ccKSs4RwQw8EK35RssC3IHDg1PjEji0pNCC-HMtE,29885
+jarvis/jarvis_coder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_coder/git_utils.py,sha256=u5mUe_R3JDJthDoamlNOkrN3bJKf-47pf8YqCvtmYK4,2284
+jarvis/jarvis_coder/main.py,sha256=ZgmASwDsRLUx8_E_9Cnr2n_pXnyp-lHWAA1IGHwsfb8,25294
+jarvis/jarvis_coder/patch_handler.py,sha256=OsAt-hCz49eoRgUW0c2hGf9Bcq_i5JrkCWaUtg4WWiw,21500
+jarvis/jarvis_coder/plan_generator.py,sha256=xtiYEE-RhexBWamBnsat_pUyzzc4IdP5PCI6p8wyqLE,2845
+jarvis/jarvis_platform/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_platform/main.py,sha256=uOv5TlxKVWO_lD2mnB7KAILkqCbezhOwiJ6g_CRQBlU,4868
+jarvis/jarvis_rag/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_rag/main.py,sha256=Gu8llgtBaRTg7sKMB-3pRLb0Tjs1ee_mbZLOku0kDPk,32752
+jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_smart_shell/main.py,sha256=wqTbbXMaM3X6YIdOtNVF6B3Ua7fxu0XTeXBR7lfdWg0,3812
+jarvis/models/__init__.py,sha256=mrOt67nselz_H1gX9wdAO4y2DY5WPXzABqJbr5Des8k,63
+jarvis/models/ai8.py,sha256=ARzNIg7v7-Vy5TtHHmTGV3Fn8rXbNxKw2pe_BylyADE,11887
+jarvis/models/base.py,sha256=qIpO32lejPhaZk5T3VIua3td4gEguXMaeFER5kXYwLY,1782
+jarvis/models/kimi.py,sha256=cB1tC_ifdTAZUEqndzNTIcgHWi4w4tM8zdzSOcDhOrQ,16348
+jarvis/models/ollama.py,sha256=fLVGGBfE5S_sFDiQ1ZC6-Oz9AY6EMnRqvILLi7lP-gw,5603
+jarvis/models/openai.py,sha256=XdBsWRwlJgUwsqasux0IhUHhjo4UGZt0eg7xFQVNZhY,4400
+jarvis/models/oyi.py,sha256=ZMyX2WMHC_HG0mGCtTyJwfiARQmlLKtgOfpNP5YX0DI,14463
+jarvis/models/registry.py,sha256=SDnrNzf0wQi8mb7qbu4ZNfYIy5vhz1CxmVL3Ru-VATk,8797
+jarvis/tools/__init__.py,sha256=7Rqyj5hBAv5cWDVr5T9ZTZASO7ssBHeQNm2_4ZARdkA,72
+jarvis/tools/ask_user.py,sha256=naLLVYKKMSVkQSExvnyZbL9FHwFrpTqEQjlBFcJadp8,1865
+jarvis/tools/base.py,sha256=EGRGbdfbLXDLwtyoWdvp9rlxNX7bzc20t0Vc2VkwIEY,652
+jarvis/tools/chdir.py,sha256=TjfPbX8yvNKgUNJEMXh3ZlVDEIse_Fo8xMoVsiK7_dA,2688
+jarvis/tools/codebase_qa.py,sha256=Lk8EXkin45RKUsp5C_UHm6jADBhyCT-xsYubwJ1hSiE,2403
+jarvis/tools/coder.py,sha256=ws25Vni7Q_fKxSNyQLapqlcjlpP9jkavgJRIv78ATww,2315
+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/rag.py,sha256=tJzuhHaTrujVXCBgmyMqSynVF0UFsIJeRTG0Y_Tt964,4483
+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/thinker.py,sha256=yjY-JMf-Vp_UZdBNa7auvFZl8Wohcu1AqqNO2GSel-w,4598
+jarvis/tools/webpage.py,sha256=d3w3Jcjcu1ESciezTkz3n3Zf-rp_l91PrVoDEZnckOo,2391
+jarvis_ai_assistant-0.1.93.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.93.dist-info/METADATA,sha256=9Xodq2q2pIZAi9fGA48lhjOgttGzDQafYVtK7OURt9c,12766
+jarvis_ai_assistant-0.1.93.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.93.dist-info/entry_points.txt,sha256=1D14s9v6rwpNzVD0muwe0tCKffJDEvLRBlEShbSFSbQ,331
+jarvis_ai_assistant-0.1.93.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.93.dist-info/RECORD,,

{jarvis_ai_assistant-0.1.91.dist-info → jarvis_ai_assistant-0.1.93.dist-info}/entry_points.txt

@@ -1,6 +1,7 @@
 [console_scripts]
 jarvis = jarvis.main:main
 jarvis-codebase = jarvis.jarvis_codebase.main:main
+jarvis-coder = jarvis.jarvis_coder.main:main
 jarvis-platform = jarvis.jarvis_platform.main:main
 jarvis-rag = jarvis.jarvis_rag.main:main
 jarvis-smart-shell = jarvis.jarvis_smart_shell.main:main

jarvis_ai_assistant-0.1.91.dist-info/RECORD

@@ -1,41 +0,0 @@
-jarvis/__init__.py,sha256=3Ab7ipGCmdagjBEJ81C-I_xiKdsal6hFcitNVQKYwt4,50
-jarvis/agent.py,sha256=82F6n8YKOaLaHp40eljZLfV-Ad4RktB8s-1c8X8-LGU,19128
-jarvis/main.py,sha256=72od8757A3bhe0ncE38S7u-YZsAh0y50w9ozMhgqIU8,5423
-jarvis/utils.py,sha256=Maqu93-rixR-_rjvoBCocCH6XiB1ol1Xozj1eMjNjE0,10308
-jarvis/jarvis_codebase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_codebase/main.py,sha256=hbFYetHZOKSU0HBbKUU8Vu4o3m25nufvBnHGI8OxT6g,26503
-jarvis/jarvis_platform/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_platform/main.py,sha256=V-gJQdfHihtrZD6WIYbVAQSDmtrf0PFVndZ7jPrlGZg,4277
-jarvis/jarvis_rag/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_rag/main.py,sha256=ZzNnU0KhAiz64kMmHd5BSBhImieXYbcfgRT-s-PiP2Y,26415
-jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_smart_shell/main.py,sha256=4BKXMIz7zGATC_4K47UQxHh7sHPH4K2dqj4RSIH9t4Y,3552
-jarvis/models/__init__.py,sha256=mrOt67nselz_H1gX9wdAO4y2DY5WPXzABqJbr5Des8k,63
-jarvis/models/ai8.py,sha256=ejMUAf614wBgmsYPkcWrCzONBcIAP4pUTy4b9hrolJY,11830
-jarvis/models/base.py,sha256=qIpO32lejPhaZk5T3VIua3td4gEguXMaeFER5kXYwLY,1782
-jarvis/models/kimi.py,sha256=cB1tC_ifdTAZUEqndzNTIcgHWi4w4tM8zdzSOcDhOrQ,16348
-jarvis/models/ollama.py,sha256=3Mb9ukwKk_HFfYp5dU0Zao5aa9AH_cTJoYhwHJt3MOo,5626
-jarvis/models/openai.py,sha256=W1FmaNnFSxeu-4qFQcuop5xeb-zh8-x6E-D56hMaVuA,4370
-jarvis/models/oyi.py,sha256=IWsrReLmphm-UMzxXcbAoiWP6w1fJRP3iQTlyDpSyg8,14491
-jarvis/models/registry.py,sha256=SDnrNzf0wQi8mb7qbu4ZNfYIy5vhz1CxmVL3Ru-VATk,8797
-jarvis/tools/__init__.py,sha256=7Rqyj5hBAv5cWDVr5T9ZTZASO7ssBHeQNm2_4ZARdkA,72
-jarvis/tools/ask_user.py,sha256=KNRaiBlAqqAZ0uUkq_l7AKi-y9ZCLE83uLtTdd-UM0o,1919
-jarvis/tools/base.py,sha256=EGRGbdfbLXDLwtyoWdvp9rlxNX7bzc20t0Vc2VkwIEY,652
-jarvis/tools/chdir.py,sha256=TjfPbX8yvNKgUNJEMXh3ZlVDEIse_Fo8xMoVsiK7_dA,2688
-jarvis/tools/codebase_qa.py,sha256=Lk8EXkin45RKUsp5C_UHm6jADBhyCT-xsYubwJ1hSiE,2403
-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/rag.py,sha256=tJzuhHaTrujVXCBgmyMqSynVF0UFsIJeRTG0Y_Tt964,4483
-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/thinker.py,sha256=Zv1v4Mp7R08w5p3e2iv5X4UWQstgAMyRD9huE-b-ZS0,5938
-jarvis/tools/webpage.py,sha256=d3w3Jcjcu1ESciezTkz3n3Zf-rp_l91PrVoDEZnckOo,2391
-jarvis_ai_assistant-0.1.91.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.91.dist-info/METADATA,sha256=ahfOtRplwS5KpK_gh3_YP2WzfbRsc3wi5D8GaSvAUps,12710
-jarvis_ai_assistant-0.1.91.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.91.dist-info/entry_points.txt,sha256=47WUorU2y8wAKrGEVh5n6o3NaOB7A-4-PfSWp-xuFSg,286
-jarvis_ai_assistant-0.1.91.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.91.dist-info/RECORD,,