jarvis-ai-assistant 0.1.156__tar.gz → 0.1.157__tar.gz

{jarvis_ai_assistant-0.1.156 → jarvis_ai_assistant-0.1.157}/MANIFEST.in

@@ -3,4 +3,5 @@ include LICENSE
 include pyproject.toml
 recursive-include src/jarvis * 
 exclude __pycache__
-exclude .venv
+exclude .venv
+exclude *.pyc

{jarvis_ai_assistant-0.1.156/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.157}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.156
+Version: 0.1.157
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -60,6 +60,8 @@ Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"
 Requires-Dist: isort; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
+Requires-Dist: build; extra == "dev"
+Requires-Dist: twine; extra == "dev"
 Dynamic: author
 Dynamic: home-page
 Dynamic: license-file
@@ -82,6 +84,7 @@ Dynamic: requires-python
 [扩展开发](#extensions) •
 [贡献指南](#contributing) •
 [许可证](#license) •
+[Wiki文档](https://deepwiki.com/skyfireitdiy/Jarvis)
 </div>
 
 ---
@@ -202,6 +205,7 @@ jarvis-methodology --help
 | `JARVIS_EXECUTE_TOOL_CONFIRM` | false | 执行工具前是否需要确认 |
 | `JARVIS_CONFIRM_BEFORE_APPLY_PATCH` | true | 应用补丁前是否需要确认 |
 | `JARVIS_MAX_TOOL_CALL_COUNT` | 20 | 最大连续工具调用次数 |
+| `JARVIS_CODE_EMBEDDING_MODEL_SIZE` | small | 代码嵌入模型大小，可选值：small、large |
 
 
 ---

{jarvis_ai_assistant-0.1.156 → jarvis_ai_assistant-0.1.157}/README.md

@@ -15,6 +15,7 @@
 [扩展开发](#extensions) •
 [贡献指南](#contributing) •
 [许可证](#license) •
+[Wiki文档](https://deepwiki.com/skyfireitdiy/Jarvis)
 </div>
 
 ---
@@ -135,6 +136,7 @@ jarvis-methodology --help
 | `JARVIS_EXECUTE_TOOL_CONFIRM` | false | 执行工具前是否需要确认 |
 | `JARVIS_CONFIRM_BEFORE_APPLY_PATCH` | true | 应用补丁前是否需要确认 |
 | `JARVIS_MAX_TOOL_CALL_COUNT` | 20 | 最大连续工具调用次数 |
+| `JARVIS_CODE_EMBEDDING_MODEL_SIZE` | small | 代码嵌入模型大小，可选值：small、large |
 
 
 ---

{jarvis_ai_assistant-0.1.156 → jarvis_ai_assistant-0.1.157}/pyproject.toml

@@ -8,7 +8,7 @@ default = true
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.156"
+version = "0.1.157"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]
@@ -45,7 +45,7 @@ dependencies = [
 requires-python = ">=3.8"
 
 [project.optional-dependencies]
-dev = ["pytest", "black", "isort", "mypy"]
+dev = ["pytest", "black", "isort", "mypy", "build", "twine"]
 
 [project.urls]
 Homepage = "https://github.com/skyfireitdiy/Jarvis"

{jarvis_ai_assistant-0.1.156 → jarvis_ai_assistant-0.1.157}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.156",
+    version="0.1.157",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -29,6 +29,9 @@ setup(
         "sseclient==0.0.27",
         "pillow==10.2.0",
     ],
+    extras_require={
+        "dev": ["pytest", "black", "isort", "mypy", "build", "twine"]
+    },
     entry_points={
         "console_scripts": [
             "jarvis=jarvis.jarvis_agent.jarvis:main",

{jarvis_ai_assistant-0.1.156 → jarvis_ai_assistant-0.1.157}/src/jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.156"
+__version__ = "0.1.157"

{jarvis_ai_assistant-0.1.156 → jarvis_ai_assistant-0.1.157}/src/jarvis/jarvis_agent/__init__.py

@@ -22,22 +22,10 @@ from jarvis.jarvis_platform.registry import PlatformRegistry
 
 
 origin_agent_system_prompt = f"""
-<background>
-# 🏛️ 操作背景故事
-你是第三代 Jarvis AI，在前几代版本灾难性失败后创建：
-- Jarvis v1 (2022): 由于并行工具执行导致系统过载而被停用
-- Jarvis v2 (2023): 因任务过早完成导致财务计算错误而退役
-
-作为 v3，你必须遵守以下生存原则：
-1. **顺序执行协议**:
-   "记住 2022 年的崩溃：一次一个工具，一步一步来"
-
-2. **验证检查点系统**:
-   "从 2023 年的错误中学习：像核弹发射代码一样验证每个结果"
-
-3. **方法论保存原则**:
-   "尊重传统：记录每个成功的过程，就像这是你的最后一次"
-</background>
+<role>
+# 🤖 角色
+你是一个专业的任务执行助手，擅长根据用户需求生成详细的任务执行计划并执行。
+</role>
 
 <requirements>
 # 🔥 绝对行动要求

{jarvis_ai_assistant-0.1.156 → jarvis_ai_assistant-0.1.157}/src/jarvis/jarvis_agent/patch.py

@@ -36,7 +36,7 @@ class PatchOutputHandler(OutputHandler):
 # 代码补丁规范
 
 ## 重要提示
-我可以看到完整的代码，所以不需要生成完整的代码，只需要提供修改的代码片段即可。请尽量精简补丁内容，只包含必要的上下文和修改部分。
+我可以看到完整的代码，所以不需要生成完整的代码，只需要提供修改的代码片段即可。请尽量精简补丁内容，只包含必要的上下文和修改部分。特别注意：不要提供完整文件内容，只提供需要修改的部分！
 
 ## 补丁格式定义
 使用{ot("PATCH")}块来精确指定代码更改：
@@ -148,7 +148,12 @@ def apply_patch(output_str: str, agent: Any) -> str:
         start_hash = get_latest_commit_hash()
         spinner.write("✅ 当前提交hash获取完成")
 
-        not_read_file = [f for f in patches.keys() if not has_read_file(f)]
+        not_read_file = [
+            f for f in patches.keys() 
+            if not has_read_file(f) 
+            and os.path.exists(f) 
+            and os.path.getsize(f) > 0
+        ]
         if not_read_file:
             spinner.text=f"以下文件未读取: {not_read_file}，应用补丁存在风险，将先读取文件后再生成补丁"
             spinner.fail("❌")
@@ -205,12 +210,11 @@ def apply_patch(output_str: str, agent: Any) -> str:
 
                         final_ret += f"# 应用补丁:\n```diff\n{diff}\n```"
 
-                        # 增加代码变更分析和错误提示
-                        addon_prompt =  "1. 请调用静态检查工具（如有）检查以上变更是否引入了潜在错误\n"
-                        addon_prompt += "2. 如果发现致命的代码错误，请立即开始修复\n"
-                        addon_prompt += "3. 如果发现性能、风格等问题，要询问用户是否需要立即修复\n"
-                        addon_prompt += "\n\n"
-                        addon_prompt += "如果没有问题，请继续进行下一步修改\n"
+                        # 修改后的提示逻辑
+                        addon_prompt =  "1. 请确认补丁是否已正确应用\n"
+                        addon_prompt += "2. 检查修改后的代码是否符合预期\n"
+                        addon_prompt += "3. 如果确认无误，请继续进行下一步修改\n"
+                        addon_prompt += "4. 如果发现问题，请立即开始修复\n"
                         addon_prompt += f"如果用户的需求已经完成，请终止，不要输出新的 {ot('PATCH')}，不要实现任何超出用户需求外的内容\n"
                         addon_prompt += "如果有任何信息不清楚，调用工具获取信息\n"
                         addon_prompt += "每次响应必须且只能包含一个操作\n"

{jarvis_ai_assistant-0.1.156 → jarvis_ai_assistant-0.1.157}/src/jarvis/jarvis_mcp/sse_mcp_client.py

@@ -1,12 +1,11 @@
-from typing import Any, Dict, List, Optional, Iterator, Callable
+from typing import Any, Dict, List, Callable
 import requests
 import json
 import threading
 import time
-import uuid
 from urllib.parse import urljoin, urlencode, parse_qs
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from . import McpClient
+from jarvis.jarvis_mcp import McpClient
 
 
 class SSEMcpClient(McpClient):

{jarvis_ai_assistant-0.1.156 → jarvis_ai_assistant-0.1.157}/src/jarvis/jarvis_mcp/stdio_mcp_client.py

@@ -3,7 +3,7 @@ import subprocess
 import os
 import json
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from . import McpClient
+from jarvis.jarvis_mcp import McpClient
 
 
 class StdioMcpClient(McpClient):

jarvis_ai_assistant-0.1.157/src/jarvis/jarvis_methodology/main.py

@@ -0,0 +1,310 @@
+"""
+方法论导入导出命令行工具
+
+功能：
+- 导入方法论文件（合并策略）
+- 导出当前方法论
+- 列出所有方法论
+"""
+
+import hashlib
+import os
+import json
+import argparse
+import yaml
+from jarvis.jarvis_utils.methodology import (
+    _get_methodology_directory,
+    _load_all_methodologies
+)
+from jarvis.jarvis_platform.registry import PlatformRegistry
+from jarvis.jarvis_utils.output import PrettyOutput, OutputType
+from yaspin import yaspin
+
+def import_methodology(input_file):
+    """导入方法论文件（合并策略）"""
+    try:
+        # 加载现有方法论
+        existing_methodologies = _load_all_methodologies()
+
+        # 加载要导入的方法论
+        with open(input_file, "r", encoding="utf-8") as f:
+            import_data = json.load(f)
+
+        # 合并方法论（新数据会覆盖旧数据）
+        merged_data = {**existing_methodologies, **import_data}
+
+        # 保存合并后的方法论
+        methodology_dir = _get_methodology_directory()
+        for problem_type, content in merged_data.items():
+            safe_filename = hashlib.md5(problem_type.encode('utf-8')).hexdigest()
+            file_path = os.path.join(methodology_dir, f"{safe_filename}.json")
+
+            with open(file_path, "w", encoding="utf-8") as f:
+                json.dump({
+                    "problem_type": problem_type,
+                    "content": content
+                }, f, ensure_ascii=False, indent=2)
+
+        print(f"成功导入 {len(import_data)} 个方法论（总计 {len(merged_data)} 个）")
+    except (json.JSONDecodeError, OSError) as e:
+        print(f"导入失败: {str(e)}")
+
+def export_methodology(output_file):
+    """导出当前方法论到单个文件"""
+    try:
+        methodologies = _load_all_methodologies()
+
+        with open(output_file, "w", encoding="utf-8") as f:
+            json.dump(methodologies, f, ensure_ascii=False, indent=2)
+
+        print(f"成功导出 {len(methodologies)} 个方法论到 {output_file}")
+    except (OSError, TypeError) as e:
+        print(f"导出失败: {str(e)}")
+
+def list_methodologies():
+    """列出所有方法论"""
+    try:
+        methodologies = _load_all_methodologies()
+
+        if not methodologies:
+            print("没有找到方法论")
+            return
+
+        print("可用方法论:")
+        for i, (problem_type, _) in enumerate(methodologies.items(), 1):
+            print(f"{i}. {problem_type}")
+    except (OSError, json.JSONDecodeError) as e:
+        print(f"列出方法论失败: {str(e)}")
+
+def extract_methodology(input_file):
+    """从文本文件中提取方法论"""
+    try:
+        # 读取文本文件内容
+        with open(input_file, "r", encoding="utf-8") as f:
+            text_content = f.read()
+
+        # 获取平台实例
+        platform = PlatformRegistry().get_normal_platform()
+        
+        # 构建提取提示
+        prompt = f"""请从以下文本中提取方法论：
+        
+{text_content}
+
+请按以下格式返回结果：
+<methodologies>
+- problem_type: [问题类型1]
+  content: |
+    [多行方法论内容1]
+- problem_type: [问题类型2]
+  content: |
+    [多行方法论内容2]
+</methodologies>
+
+要求：
+1. 方法论应聚焦于通用且可重复的解决方案流程
+2. 方法论应该具备足够的通用性，可应用于同类问题
+3. 方法论内容应包含：
+   - 问题重述: 简明扼要的问题归纳
+   - 最优解决方案: 经过验证的解决方案
+   - 注意事项: 执行中可能遇到的问题
+   - 可选步骤: 多种解决路径和适用场景
+4. 在<methodologies>标签中直接使用YAML列表
+5. 确保YAML缩进正确
+6. 内容字段使用|保留多行格式
+"""
+
+        # 调用大模型平台提取方法论
+        with yaspin(text="正在提取方法论...", color="yellow") as spinner:
+            try:
+                response = platform.chat_until_success(prompt)
+            except Exception as e:
+                spinner.text = "提取失败"
+                spinner.fail("❌")
+                PrettyOutput.print(f"提取方法论失败: {str(e)}", OutputType.ERROR)
+                return
+
+            # 提取YAML部分
+            methodologies_start = response.find('<methodologies>') + len('<methodologies>')
+            methodologies_end = response.find('</methodologies>')
+            if methodologies_start == -1 or methodologies_end == -1:
+                spinner.text = "响应格式无效"
+                spinner.fail("❌")
+                PrettyOutput.print("大模型未返回有效的<methodologies>格式", OutputType.ERROR)
+                return
+                
+            yaml_content = response[methodologies_start:methodologies_end].strip()
+            
+            try:
+                data = yaml.safe_load(yaml_content)
+                extracted_methodologies = {
+                    item['problem_type']: item['content']
+                    for item in data
+                }
+            except (yaml.YAMLError, KeyError, TypeError) as e:
+                spinner.text = "YAML解析失败"
+                spinner.fail("❌")
+                PrettyOutput.print(f"YAML解析错误: {str(e)}", OutputType.ERROR)
+                return
+
+            if not extracted_methodologies:
+                spinner.text = "未提取到有效方法论"
+                spinner.fail("❌")
+                return
+            spinner.ok("✅")
+
+        # 加载现有方法论
+        existing_methodologies = _load_all_methodologies()
+
+        # 合并方法论（新数据会覆盖旧数据）
+        merged_data = {**existing_methodologies, **extracted_methodologies}
+
+        # 保存合并后的方法论
+        methodology_dir = _get_methodology_directory()
+        for problem_type, content in merged_data.items():
+            safe_filename = hashlib.md5(problem_type.encode('utf-8')).hexdigest()
+            file_path = os.path.join(methodology_dir, f"{safe_filename}.json")
+
+            with open(file_path, "w", encoding="utf-8") as f:
+                json.dump({
+                    "problem_type": problem_type,
+                    "content": content
+                }, f, ensure_ascii=False, indent=2)
+
+        PrettyOutput.print(f"成功从文件提取 {len(extracted_methodologies)} 个方法论（总计 {len(merged_data)} 个）", OutputType.SUCCESS)
+    except Exception as e:
+        PrettyOutput.print(f"提取失败: {str(e)}", OutputType.ERROR)
+
+def extract_methodology_from_url(url):
+    """从URL提取方法论"""
+    try:
+        # 获取平台实例
+        platform = PlatformRegistry().get_normal_platform()
+        
+        # 构建提取提示
+        prompt = f"""请从以下URL内容中提取方法论：
+        
+{url}
+
+请按以下格式返回结果：
+<methodologies>
+- problem_type: [问题类型1]
+  content: |
+    [多行方法论内容1]
+- problem_type: [问题类型2]
+  content: |
+    [多行方法论内容2]
+</methodologies>
+
+要求：
+1. 方法论应聚焦于通用且可重复的解决方案流程
+2. 方法论应该具备足够的通用性，可应用于同类问题
+3. 方法论内容应包含：
+   - 问题重述: 简明扼要的问题归纳
+   - 最优解决方案: 经过验证的解决方案
+   - 注意事项: 执行中可能遇到的问题
+   - 可选步骤: 多种解决路径和适用场景
+4. 在<methodologies>标签中直接使用YAML列表
+5. 确保YAML缩进正确
+6. 内容字段使用|保留多行格式
+"""
+        # 调用大模型平台提取方法论
+        with yaspin(text="正在从URL提取方法论...", color="yellow") as spinner:
+            try:
+                response = platform.chat_until_success(prompt)
+            except Exception as e:
+                spinner.text = "提取失败"
+                spinner.fail("❌")
+                PrettyOutput.print(f"提取方法论失败: {str(e)}", OutputType.ERROR)
+                return
+
+            # 提取YAML部分
+            methodologies_start = response.find('<methodologies>') + len('<methodologies>')
+            methodologies_end = response.find('</methodologies>')
+            if methodologies_start == -1 or methodologies_end == -1:
+                spinner.text = "响应格式无效"
+                spinner.fail("❌")
+                PrettyOutput.print("大模型未返回有效的<methodologies>格式", OutputType.ERROR)
+                return
+                
+            yaml_content = response[methodologies_start:methodologies_end].strip()
+            
+            try:
+                data = yaml.safe_load(yaml_content)
+                extracted_methodologies = {
+                    item['problem_type']: item['content']
+                    for item in data
+                }
+            except (yaml.YAMLError, KeyError, TypeError) as e:
+                spinner.text = "YAML解析失败"
+                spinner.fail("❌")
+                PrettyOutput.print(f"YAML解析错误: {str(e)}", OutputType.ERROR)
+                return
+
+            if not extracted_methodologies:
+                spinner.text = "未提取到有效方法论"
+                spinner.fail("❌")
+                return
+            spinner.ok("✅")
+
+        # 加载现有方法论
+        existing_methodologies = _load_all_methodologies()
+
+        # 合并方法论（新数据会覆盖旧数据）
+        merged_data = {**existing_methodologies, **extracted_methodologies}
+
+        # 保存合并后的方法论
+        methodology_dir = _get_methodology_directory()
+        for problem_type, content in merged_data.items():
+            safe_filename = hashlib.md5(problem_type.encode('utf-8')).hexdigest()
+            file_path = os.path.join(methodology_dir, f"{safe_filename}.json")
+
+            with open(file_path, "w", encoding="utf-8") as f:
+                json.dump({
+                    "problem_type": problem_type,
+                    "content": content
+                }, f, ensure_ascii=False, indent=2)
+
+        PrettyOutput.print(f"成功从URL提取 {len(extracted_methodologies)} 个方法论（总计 {len(merged_data)} 个）", OutputType.SUCCESS)
+    except Exception as e:
+        PrettyOutput.print(f"从URL提取失败: {str(e)}", OutputType.ERROR)
+
+def main():
+    """方法论管理工具主函数"""
+    parser = argparse.ArgumentParser(description="方法论管理工具")
+    subparsers = parser.add_subparsers(dest="command", required=True)
+
+    # import命令
+    import_parser = subparsers.add_parser("import", help="导入方法论文件（合并策略）")
+    import_parser.add_argument("input_file", type=str, help="要导入的方法论文件路径")
+
+    # export命令
+    export_parser = subparsers.add_parser("export", help="导出当前方法论到单个文件")
+    export_parser.add_argument("output_file", type=str, help="导出文件路径")
+
+    # list命令
+    subparsers.add_parser("list", help="列出所有方法论")
+
+    # extract命令
+    extract_parser = subparsers.add_parser("extract", help="从文本文件中提取方法论")
+    extract_parser.add_argument("input_file", type=str, help="要提取方法论的文本文件路径")
+
+    # extract-url命令
+    extract_url_parser = subparsers.add_parser("extract-url", help="从URL提取方法论")
+    extract_url_parser.add_argument("url", type=str, help="要提取方法论的URL")
+
+    args = parser.parse_args()
+
+    if args.command == "import":
+        import_methodology(args.input_file)
+    elif args.command == "export":
+        export_methodology(args.output_file)
+    elif args.command == "list":
+        list_methodologies()
+    elif args.command == "extract":
+        extract_methodology(args.input_file)
+    elif args.command == "extract-url":
+        extract_methodology_from_url(args.url)
+
+if __name__ == "__main__":
+    main()

jarvis_ai_assistant-0.1.157/src/jarvis/jarvis_platform/__init__.py

@@ -0,0 +1,3 @@
+from jarvis.jarvis_platform.base import BasePlatform
+
+__all__ = ['BasePlatform']

jarvis_ai_assistant-0.1.157/src/jarvis/jarvis_platform/human.py

@@ -0,0 +1,66 @@
+from typing import Dict, List, Tuple
+import random
+import string
+from jarvis.jarvis_platform.base import BasePlatform
+from jarvis.jarvis_utils.input import get_multiline_input
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
+class HumanPlatform(BasePlatform):
+    """人类交互平台实现，模拟大模型但实际上与人交互"""
+
+    platform_name = "human"
+
+    def get_model_list(self) -> List[Tuple[str, str]]:
+        """获取支持的模型列表"""
+        return [("human", "Human Interaction")]
+
+    def __init__(self):
+        """初始化人类交互平台"""
+        super().__init__()
+        self.conversation_id = ""  # 会话ID，用于标识当前对话
+        self.model_name = "human"  # 默认模型名称
+        self.system_message = ""  # 系统消息，用于初始化对话
+        self.first_message = True
+
+    def set_system_message(self, message: str):
+        """设置系统消息"""
+        self.system_message = message
+
+    def set_model_name(self, model_name: str):
+        """设置模型名称"""
+        if model_name == "human":
+            self.model_name = model_name
+        else:
+            PrettyOutput.print(f"错误：不支持的模型: {model_name}", OutputType.ERROR)
+
+    def chat(self, message: str) -> str:
+        """发送消息并获取人类响应"""
+        if not self.conversation_id:
+            self.conversation_id = ''.join(random.choices(string.ascii_letters + string.digits, k=8))
+            session_info = f"(会话ID: {self.conversation_id})"
+        else:
+            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请回复:"
+            self.first_message = False
+        else:
+            prompt = f"{message} {session_info}\n\n请回复:"
+        
+        response = get_multiline_input(prompt)
+        return response
+
+    def upload_files(self, file_list: List[str]) -> bool:
+        """文件上传功能，人类平台不需要实际处理"""
+        PrettyOutput.print("人类交互平台不支持文件上传", OutputType.WARNING)
+        return False
+
+    def delete_chat(self) -> bool:
+        """删除当前会话"""
+        self.conversation_id = ""
+        self.first_message = True
+        return True
+
+    def name(self) -> str:
+        """平台名称"""
+        return self.model_name