jarvis-ai-assistant 0.1.79__py3-none-any.whl → 0.1.81__py3-none-any.whl

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.79" 
+__version__ = "0.1.81" 

jarvis/agent.py

@@ -33,7 +33,7 @@ class Agent:
         
         # 从环境变量加载配置
         self.embedding_dimension = 1536  # Default for many embedding models
-        self.max_context_length = int(os.getenv('JARVIS_MAX_CONTEXT_LENGTH', '30720'))  # 默认30k
+        self.max_context_length = int(os.getenv('JARVIS_MAX_CONTEXT_LENGTH', '65536'))  # 默认30k
         
         # 初始化嵌入模型
         try:
@@ -195,7 +195,9 @@ class Agent:
             return {}
 
     def _summarize_and_clear_history(self) -> None:
-        """总结当前对话历史并清空历史记录，只保留系统消息和总结
+        """
+        [系统消息]
+        总结当前对话历史并清空历史记录，只保留系统消息和总结
         
         这个方法会：
         1. 请求模型总结当前对话的关键信息
@@ -219,7 +221,7 @@ class Agent:
 """
         
         try:
-            summary = self.model.chat(prompt)
+            summary = self.model.chat(self.prompt + "\n" + prompt)
             
             # 清空当前对话历史，但保留系统消息
             self.model.delete_chat()
@@ -341,12 +343,11 @@ class Agent:
 3. 设定目标：需要可达成，可检验的一个或多个目标
 4. 生成解决方案：生成一个或者多个具备可操作性的解决方案
 5. 评估解决方案：从众多解决方案中选择一种最优的方案
-6. 制定行动计划：根据目前可以使用的工具制定行动计划
+6. 制定行动计划：根据目前可以使用的工具制定行动计划，使用 PlantUML 格式输出明确的执行流程
 7. 执行行动计划：每步执行一个步骤，最多使用一个工具（工具执行完成后，等待工具结果再执行下一步）
 8. 监控与调整：如果执行结果与预期不符，则反思并调整行动计划，迭代之前的步骤
 9. 方法论：如果当前任务具有通用性且执行过程中遇到了值得记录的经验，使用方法论工具记录方法论，以提升后期处理类似问题的能力
 10. 任务结束：如果任务已经完成，使用任务结束指令结束任务
--------------------------------------------------------------                       
 
 方法论模板：
 1. 问题重述
@@ -381,13 +382,6 @@ arguments:
 8. 在多次迭代却没有任何进展时，可请求用户指导
 9. 如果返回的yaml字符串中包含冒号，请将整个字符串用引号包裹，避免yaml解析错误
 
--------------------------------------------------------------
-
-特殊指令：
-1. !<<SUMMARIZE>>! - 当你发现对话历史过长可能导致token超限时，可以使用此指令总结当前对话要点并清空历史。使用方法：直接回复"!<<SUMMARIZE>>!"即可。
-
--------------------------------------------------------------
-
 {methodology_prompt}
 
 -------------------------------------------------------------
@@ -405,16 +399,11 @@ arguments:
                     
                     # 如果对话历史长度超过限制，在提示中添加提醒
                     if self.conversation_length > self.max_context_length:
-                        self.prompt = f"{self.prompt}\n(提示：当前对话历史长度已超过{self.max_context_length}字符，建议使用 !<<SUMMARIZE>>! 指令总结对话历史，避免token超限)"
-                    
-                    current_response = self._call_model(self.prompt)
-                    self.conversation_length += len(current_response)  # 添加响应长度
-                    
-                    # 检查是否需要总结对话历史
-                    if "!<<SUMMARIZE>>!" in current_response:
-                        self._summarize_and_clear_history()
+                        current_response = self._summarize_and_clear_history()
                         continue
-                    
+                    else:
+                        current_response = self._call_model(self.prompt)
+                        self.conversation_length += len(current_response)  # 添加响应长度
                     try:
                         result = Agent.extract_tool_calls(current_response)
                     except Exception as e:

jarvis/jarvis_codebase/main.py

@@ -19,6 +19,7 @@ class CodeBase:
         self.root_dir = root_dir
         os.chdir(self.root_dir)
         self.thread_count = int(os.environ.get("JARVIS_THREAD_COUNT") or 10)
+        self.max_context_length = int(os.getenv("JARVIS_MAX_CONTEXT_LENGTH", 65536))
             
         # 初始化数据目录
         self.data_dir = os.path.join(self.root_dir, ".jarvis-codebase")
@@ -450,7 +451,7 @@ class CodeBase:
         
         return initial_results
 
-    def search_similar(self, query: str, top_k: int = 20) -> List[Tuple[str, float, str]]:
+    def search_similar(self, query: str, top_k: int = 30) -> List[Tuple[str, float, str]]:
         """搜索相似文件"""
         model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
         model.set_suppress_output(True)
@@ -515,7 +516,7 @@ class CodeBase:
 """
         for path, _, _ in results:
             try:
-                if len(prompt) > 30 * 1024:
+                if len(prompt) > self.max_context_length:
                     PrettyOutput.print(f"避免上下文超限，丢弃低相关度文件：{path}", OutputType.WARNING)
                     continue
                 content = open(path, "r", encoding="utf-8").read()

jarvis/jarvis_coder/main.py

@@ -22,6 +22,8 @@ class JarvisCoder:
     def __init__(self, root_dir: str, language: str):
         """初始化代码修改工具"""
 
+        self.max_context_length = int(os.getenv("JARVIS_MAX_CONTEXT_LENGTH", 65536))
+
 
         self.root_dir = find_git_root(root_dir)
         if not self.root_dir:
@@ -154,7 +156,7 @@ class JarvisCoder:
 文件列表如下：
 """
         for i, file in enumerate(related_files):
-            if len(prompt) > 30 * 1024:
+            if len(prompt) > self.max_context_length:
                 PrettyOutput.print(f'避免上下文超限，丢弃低相关度文件：{file["file_path"]}', OutputType.WARNING)
                 continue
             prompt += f"""{i}. {file["file_path"]}\n"""

jarvis/jarvis_smart_shell/main.py

@@ -0,0 +1,123 @@
+#!/usr/bin/env python3
+import argparse
+import os
+import sys
+import readline
+from typing import Optional
+
+from jarvis.models.registry import PlatformRegistry
+from jarvis.utils import PrettyOutput, OutputType, load_env_from_file
+
+def execute_command(command: str) -> None:
+    """显示命令并允许用户编辑，回车执行，Ctrl+C取消"""
+    try:
+        print("生成的命令 (可以编辑，回车执行，Ctrl+C取消):")
+        # 预填充输入行
+        readline.set_startup_hook(lambda: readline.insert_text(command))
+        try:
+            edited_command = input("> ")
+            if edited_command.strip():  # 确保命令不为空
+                os.system(edited_command)
+        except KeyboardInterrupt:
+            print("\n已取消执行")
+        finally:
+            readline.set_startup_hook()  # 清除预填充
+    except Exception as e:
+        PrettyOutput.print(f"执行命令时发生错误: {str(e)}", OutputType.ERROR)
+
+def process_request(request: str) -> Optional[str]:
+    """处理用户请求并返回对应的shell命令
+    
+    Args:
+        request: 用户的自然语言请求
+        
+    Returns:
+        Optional[str]: 对应的shell命令，如果处理失败则返回None
+    """
+    try:
+        # 获取语言模型实例
+        PlatformRegistry.suppress_output = True
+        model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
+        model.set_suppress_output(True)
+
+        shell = os.environ.get("SHELL") or "bash"
+        current_path = os.getcwd()
+        
+        # 设置系统提示
+        system_message = f"""你是一个 shell 命令生成助手。
+
+你的唯一任务是将用户的自然语言需求转换为对应的shell命令。
+
+严格要求：
+1. 只返回shell命令本身
+2. 不要添加任何标记（如```、/**/、//等）
+3. 不要添加任何解释或说明
+4. 不要添加任何换行或额外空格
+5. 如果需要多个命令，使用 && 连接
+
+安全要求：
+- 生成的命令必须是安全的，不能包含危险操作
+- 如果需要sudo权限，要明确提示用户
+- 对于复杂操作，优先使用管道而不是临时文件
+- 确保命令的可移植性，优先使用通用的POSIX命令
+
+示例输入：
+"查找当前目录下的所有Python文件"
+
+示例输出：
+find . -name "*.py"
+
+记住：只返回命令本身，不要有任何额外的内容。
+"""
+        model.set_system_message(system_message)
+
+        prefix = f"当前路径: {current_path}\n"
+        prefix += f"当前shell: {shell}\n"
+        
+        # 处理请求
+        result = model.chat(prefix + request)
+        
+        # 提取命令 - 简化处理逻辑，因为现在应该只返回纯命令
+        if result and isinstance(result, str):
+            return result.strip()
+        
+        return None
+        
+    except Exception as e:
+        PrettyOutput.print(f"处理请求时发生错误: {str(e)}", OutputType.ERROR)
+        return None
+
+def main():
+    # 创建参数解析器
+    load_env_from_file()
+    parser = argparse.ArgumentParser(
+        description="将自然语言需求转换为shell命令",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog="""
+示例:
+  %(prog)s "查找当前目录下所有的Python文件"
+  %(prog)s "压缩所有jpg图片"
+  %(prog)s "查找最近一周修改过的文档"
+""")
+    
+    # 添加参数
+    parser.add_argument(
+        "request",
+        help="用自然语言描述你需要执行的操作"
+    )
+    
+    # 解析参数
+    args = parser.parse_args()
+    
+    # 处理请求
+    command = process_request(args.request)
+    
+    # 输出结果
+    if command:
+        execute_command(command)  # 显示并执行命令
+        return 0
+    else:
+        return 1
+
+if __name__ == "__main__":
+    sys.exit(main())

jarvis/models/registry.py

@@ -19,6 +19,7 @@ class PlatformRegistry:
 
     global_platform_name = "kimi"
     global_platform_registry = None
+    suppress_output = False
 
     @staticmethod
     def get_platform_dir() -> str:
@@ -121,7 +122,8 @@ class PlatformRegistry:
                             # 检查平台实现
                             if not PlatformRegistry.check_platform_implementation(obj):
                                 continue
-                            PrettyOutput.print(f"从 {os.path.join(directory, filename)} 加载平台：{obj.platform_name}", OutputType.SUCCESS)
+                            if not PlatformRegistry.suppress_output:
+                                PrettyOutput.print(f"从 {os.path.join(directory, filename)} 加载平台：{obj.platform_name}", OutputType.SUCCESS)
                             platforms[obj.platform_name] = obj
                             break
                 except Exception as e:

jarvis/tools/registry.py

@@ -19,7 +19,7 @@ class ToolRegistry:
         # 加载内置工具和外部工具
         self._load_builtin_tools()
         self._load_external_tools()
-        self.max_context_length = int(os.getenv('JARVIS_MAX_CONTEXT_LENGTH', '30720'))  # 默认30k
+        self.max_context_length = int(os.getenv('JARVIS_MAX_CONTEXT_LENGTH', '65536'))  # 默认30k
 
     @staticmethod
     def get_global_tool_registry():
@@ -184,7 +184,7 @@ class ToolRegistry:
                         # 如果输出超过30k，只取最后30k字符
                         if len(output) > self.max_context_length:
                             output_to_summarize = output[-self.max_context_length:]
-                            truncation_notice = "\n(注意: 由于输出过长，仅总结最后30720字符)"
+                            truncation_notice = "\n(注意: 由于输出过长，仅总结最后65536字符)"
                         else:
                             output_to_summarize = output
                             truncation_notice = ""

{jarvis_ai_assistant-0.1.79.dist-info → jarvis_ai_assistant-0.1.81.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.79
+Version: 0.1.81
 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.79.dist-info → jarvis_ai_assistant-0.1.81.dist-info}/RECORD

@@ -1,20 +1,22 @@
-jarvis/__init__.py,sha256=yQPvXJ5FcieZn0Nq0nfH3oQgif5UqP0crtfwedPm4v8,50
-jarvis/agent.py,sha256=zFhEZDCly5JlezHOhWcwdE8WpYQ3fkyuqXv5Qq5wuDE,20032
+jarvis/__init__.py,sha256=B8CWgNiQrlCsbghyy-YN5DH1HNMJhUoKmyegydchC2w,50
+jarvis/agent.py,sha256=9cWBHjxrlqnI1GV3wB4wPvZUwK7d63ysyX40zqapNRc,19373
 jarvis/main.py,sha256=OJc7e5i988eQLByT7SzX7eoa0HKm4LMg814gZv9hBX8,5487
 jarvis/utils.py,sha256=jvo6ylvrTaSmXWcYY0qTTf14TwCkAhPsCUuIl5WHEuw,8640
 jarvis/jarvis_codebase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_codebase/main.py,sha256=DPMPw8qoKHooydELKwf_bXPa0a3459kdFcZOXdrM-N8,24785
+jarvis/jarvis_codebase/main.py,sha256=z6HRTkUjAhRQclfHqj4yt3wq_wxiRlp0OCJsL_99NfI,24884
 jarvis/jarvis_coder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_coder/main.py,sha256=Hr6T5LHC5n08s9tnOt-2_h8TmzothBUhqcd2-fzwuVI,23790
+jarvis/jarvis_coder/main.py,sha256=WZCjtlPDEvg2y6F6e4djc4xYWXM3eB_0pHrPpvlZEC4,23890
+jarvis/jarvis_rag/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_rag/main.py,sha256=drCH9KmwQozxtPICIfTFXmkIhwN8WDreMOCTxtj9SPc,20842
+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=vgy-r_3HHxGMAalZrA65VWHC1PuwBTYgtprSgHkCbrk,12557
 jarvis/models/base.py,sha256=ShV1H8Unee4RMaiFO4idROQA0Hc6wu4dyeRPX5fcszk,1433
 jarvis/models/kimi.py,sha256=1iTB0Z_WOmCML3Ufsge6jmeKOYvccr7I5lS3JUXymU4,17611
 jarvis/models/openai.py,sha256=ayaBWAN5VexMcKVrjEPDNB-Q9wx0sCV9Z4BCrvwYJ9w,4315
 jarvis/models/oyi.py,sha256=X2c5SWDIuQDCCFBcEKbzIWEz3I34eOAi0d1XAFgxlpw,15001
-jarvis/models/registry.py,sha256=Ez3MNCYIlvPxRS5rJrgV7b8BkXtaZ75bCkemPr3L9nw,8156
-jarvis/rag/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/rag/main.py,sha256=drCH9KmwQozxtPICIfTFXmkIhwN8WDreMOCTxtj9SPc,20842
+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/base.py,sha256=EGRGbdfbLXDLwtyoWdvp9rlxNX7bzc20t0Vc2VkwIEY,652
@@ -24,14 +26,14 @@ jarvis/tools/coder.py,sha256=kmotT2Klsug44S51QoSW9DzkxLzcF-XonyYAEoWZV6c,2295
 jarvis/tools/file_ops.py,sha256=h8g0eT9UvlJf4kt0DLXvdSsjcPj7x19lxWdDApeDfpg,3842
 jarvis/tools/generator.py,sha256=S1DhHBfhNvF6SrORnlk8Mz210yDiJPuxbfswbX_UACs,5791
 jarvis/tools/methodology.py,sha256=UG6s5VYRcd9wrKX4cg6f7zJhet5AIcthFGMOAdevBiw,5175
-jarvis/tools/registry.py,sha256=XhFufp57hJZkRj6MUC5m-q4WEHFp8hzGmW2zFIzk12w,9074
+jarvis/tools/registry.py,sha256=sgj5EVbRgfHSzXW5v-kbIZS_8cwAxTjHvSPAicxBRf4,9074
 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.79.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.79.dist-info/METADATA,sha256=rDiEYIVxK5o0hf9DBaTNURWMzrGyBOTlbXhu33S4Z-g,12736
-jarvis_ai_assistant-0.1.79.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.79.dist-info/entry_points.txt,sha256=iEvZ0rn-muMxWCNH5QEvw_mTTy_EVhyQyxDxWXqQQVo,174
-jarvis_ai_assistant-0.1.79.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.79.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.81.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.81.dist-info/METADATA,sha256=kVZXWoV6abWKNXWGuVA5Q0jodwrVDIgATc2jJEVhq6o,12736
+jarvis_ai_assistant-0.1.81.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.81.dist-info/entry_points.txt,sha256=sdmIO86MrIUepJTGyHs0i_Ho9VGf1q9YRP4RgQvGWcI,280
+jarvis_ai_assistant-0.1.81.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.81.dist-info/RECORD,,

{jarvis_ai_assistant-0.1.79.dist-info → jarvis_ai_assistant-0.1.81.dist-info}/entry_points.txt

@@ -2,4 +2,6 @@
 jarvis = jarvis.main:main
 jarvis-codebase = jarvis.jarvis_codebase.main:main
 jarvis-coder = jarvis.jarvis_coder.main:main
-jarvis-rag = jarvis.rag.main:main
+jarvis-rag = jarvis.jarvis_rag.main:main
+jarvis-smart-shell = jarvis.jarvis_smart_shell.main:main
+jss = jarvis.jarvis_smart_shell.main:main