jarvis-ai-assistant 0.1.208__py3-none-any.whl → 0.1.209__py3-none-any.whl

jarvis/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.208"
+__version__ = "0.1.209"

jarvis/jarvis_agent/__init__.py

@@ -16,13 +16,9 @@ from jarvis.jarvis_platform.registry import PlatformRegistry
 
 # jarvis_utils 相关
 from jarvis.jarvis_utils.config import (
-    get_data_dir,
     get_max_token_count,
-    get_max_tool_call_count,
-    is_auto_complete,
     is_execute_tool_confirm,
     is_use_analysis,
-    get_history_count,
     is_use_methodology,
 )
 from jarvis.jarvis_utils.embedding import get_context_token_count
@@ -34,7 +30,6 @@ from jarvis.jarvis_utils.globals import (
     set_interrupt,
 )
 from jarvis.jarvis_utils.input import get_multiline_input
-from jarvis.jarvis_utils.jarvis_history import JarvisHistory
 from jarvis.jarvis_utils.methodology import load_methodology, upload_methodology
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ct, ot
@@ -147,7 +142,7 @@ class Agent:
         self.prompt = ""
 
     def __del__(self):
-        self.history.stop_record()
+        # 只有在记录启动时才停止记录
         delete_agent(self.name)
 
     def __init__(
@@ -158,7 +153,7 @@ class Agent:
         platform: Union[Optional[BasePlatform], Optional[str]] = None,
         model_name: Optional[str] = None,
         summary_prompt: Optional[str] = None,
-        auto_complete: Optional[bool] = None,
+        auto_complete: bool = False,
         output_handler: List[OutputHandlerProtocol] = [],
         use_tools: List[str] = [],
         input_handler: Optional[List[Callable[[str, Any], Tuple[str, bool]]]] = None,
@@ -168,7 +163,6 @@ class Agent:
         use_methodology: Optional[bool] = None,
         use_analysis: Optional[bool] = None,
         files: List[str] = [],
-        history_count: Optional[int] = None,
     ):
         self.files = files
         """初始化Jarvis Agent实例
@@ -243,18 +237,8 @@ class Agent:
         # Load configuration from environment variables
         self.addon_prompt = ""
 
-        self.tool_call_count = 0
-        self.max_tool_call_count = get_max_tool_call_count()
         self.after_tool_call_cb: Optional[Callable[[Agent], None]] = None
 
-        self.history = JarvisHistory()
-        self.history_dir = str(Path(get_data_dir()) / "history")
-        self.history.start_record(self.history_dir)
-
-        self.history_count = (
-            history_count if history_count is not None else get_history_count()
-        )
-
         self.execute_tool_confirm = (
             execute_tool_confirm
             if execute_tool_confirm is not None
@@ -283,9 +267,7 @@ class Agent:
         )
 
         self.max_token_count = get_max_token_count()
-        self.auto_complete = (
-            auto_complete if auto_complete is not None else is_auto_complete()
-        )
+        self.auto_complete = auto_complete
         welcome_message = f"{name} 初始化完成 - 使用 {self.model.name()} 模型"
 
         PrettyOutput.print(welcome_message, OutputType.SYSTEM)
@@ -416,10 +398,10 @@ class Agent:
         if self.conversation_length > self.max_token_count:
             message = self._summarize_and_clear_history() + "\n\n" + message
             self.conversation_length += get_context_token_count(message)
-        self.history.append_msg("user", message)
+
         response = self.model.chat_until_success(message)  # type: ignore
         self.conversation_length += get_context_token_count(response)
-        self.history.append_msg("assistant", response)
+
         return response
 
     def generate_summary(self) -> str:
@@ -491,7 +473,6 @@ class Agent:
 
                 tmp_file = tempfile.NamedTemporaryFile(delete=False)
                 tmp_file_name = tmp_file.name
-                self.history.save_history(tmp_file_name)
             self.clear_history()  # type: ignore
 
             if need_summary:
@@ -547,29 +528,17 @@ class Agent:
             )
         if len(tool_list) == 0:
             return False, ""
-        if (
-            self.max_tool_call_count > 0
-            and self.tool_call_count >= self.max_tool_call_count
-        ):
-            if user_confirm(f"工具调用次数超过限制，是否继续执行？", True):
-                self.reset_tool_call_count()
-            else:
-                return False, ""
-        if self.execute_tool_confirm:
-            self.reset_tool_call_count()
+
         if not self.execute_tool_confirm or user_confirm(
             f"需要执行{tool_list[0].name()}确认执行？", True
         ):
             print(f"🔧 正在执行{tool_list[0].name()}...")
             result = tool_list[0].handle(response, self)
             print(f"✅ {tool_list[0].name()}执行完成")
-            self.tool_call_count += 1
+
             return result
         return False, ""
 
-    def reset_tool_call_count(self):
-        self.tool_call_count = 0
-
     def _complete_task(self) -> str:
         """完成任务并生成总结(如果需要)
 
@@ -804,9 +773,8 @@ arguments:
             set_agent(self.name, self)
 
             while True:
-                history_md = ""
                 if self.first:
-                    history_md = self._first_run()
+                    self._first_run()
                 try:
                     current_response = self._call_model(self.prompt, True)
                     self.prompt = ""
@@ -844,8 +812,6 @@ arguments:
                     if self.auto_complete and ot("!!!COMPLETE!!!") in current_response:
                         return self._complete_task()
 
-                    self.reset_tool_call_count()
-
                     # 获取用户输入
                     user_input = self.multiline_inputer(
                         f"{self.name}: 请输入，或输入空行来结束当前任务："
@@ -859,8 +825,6 @@ arguments:
                         return self._complete_task()
 
                 except Exception as e:
-                    if history_md:
-                        os.remove(history_md)
                     PrettyOutput.print(f"任务失败: {str(e)}", OutputType.ERROR)
                     return f"Task failed: {str(e)}"
 
@@ -869,20 +833,7 @@ arguments:
             return f"Task failed: {str(e)}"
 
     def _first_run(self):
-        history_md = ""
-        if self.history_count > 0 and self.model and self.model.support_upload_files():
-            import tempfile
-
-            timestamp = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")
-            history_md = str(
-                Path(tempfile.gettempdir()) / f"{self.name}_history_{timestamp}.md"
-            )
-            self.history.export_history_to_markdown(
-                self.history_dir, history_md, max_files=self.history_count
-            )
-            self.files.append(history_md)
-
-            # 如果有上传文件，先上传文件
+        # 如果有上传文件，先上传文件
         if self.model and self.model.support_upload_files():
             if self.use_methodology:
                 if not upload_methodology(self.model, other_files=self.files):
@@ -917,7 +868,6 @@ arguments:
                 self.prompt = f"{self.prompt}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(msg, self.get_tool_registry())}"
 
         self.first = False
-        return history_md
 
     def clear_history(self):
         """清空对话历史但保留系统提示

jarvis/jarvis_agent/edit_file_handler.py

@@ -312,7 +312,7 @@ class EditFileHandler(OutputHandler):
             ):
                 upload_success = True
 
-            model.set_suppress_output(True)
+            model.set_suppress_output(False)
 
             # 构建补丁内容
             patch_content = []

jarvis/jarvis_code_agent/code_agent.py

@@ -21,7 +21,7 @@ from jarvis.jarvis_tools.registry import ToolRegistry
 from jarvis.jarvis_utils.config import is_confirm_before_apply_patch
 from jarvis.jarvis_utils.git_utils import (
     confirm_add_new_files,
-    find_git_root,
+    find_git_root_and_cd,
     get_commits_between,
     get_diff,
     get_diff_file_list,
@@ -134,18 +134,63 @@ class CodeAgent:
 
         self.agent.set_after_tool_call_cb(self.after_tool_call_cb)
 
-    def _init_env(self) -> None:
-        """初始化环境，包括：
-        1. 查找git根目录
-        2. 检查并处理未提交的修改
+    def _find_git_root(self) -> str:
+        """查找并切换到git根目录
+
+        返回:
+            str: git根目录路径
         """
-        print("🚀 正在初始化环境...")
+        print("🔍 正在查找git根目录...")
         curr_dir = os.getcwd()
-        git_dir = find_git_root(curr_dir)
+        git_dir = find_git_root_and_cd(curr_dir)
         self.root_dir = git_dir
+        print(f"✅ 已找到git根目录: {git_dir}")
+        return git_dir
+
+    def _update_gitignore(self, git_dir: str) -> None:
+        """检查并更新.gitignore文件，确保忽略.jarvis目录
+
+        参数:
+            git_dir: git根目录路径
+        """
+        print("📝 正在检查.gitignore文件...")
+        gitignore_path = os.path.join(git_dir, ".gitignore")
+        jarvis_ignore = ".jarvis"
+
+        if not os.path.exists(gitignore_path):
+            with open(gitignore_path, "w") as f:
+                f.write(f"{jarvis_ignore}\n")
+            print(f"✅ 已创建.gitignore文件并添加'{jarvis_ignore}'")
+        else:
+            with open(gitignore_path, "r+") as f:
+                content = f.read()
+                if jarvis_ignore not in content.splitlines():
+                    f.write(f"\n{jarvis_ignore}\n")
+                    print(f"✅ 已更新.gitignore文件，添加'{jarvis_ignore}'")
+                else:
+                    print("ℹ️ .jarvis已在.gitignore中")
+
+    def _handle_git_changes(self) -> None:
+        """处理git仓库中的未提交修改"""
+        print("🔄 正在检查未提交的修改...")
         if has_uncommitted_changes():
+            print("⏳ 发现未提交修改，正在处理...")
             git_commiter = GitCommitTool()
             git_commiter.execute({})
+            print("✅ 未提交修改已处理完成")
+        else:
+            print("✅ 没有未提交的修改")
+
+    def _init_env(self) -> None:
+        """初始化环境，组合以下功能：
+        1. 查找git根目录
+        2. 检查并更新.gitignore文件
+        3. 处理未提交的修改
+        """
+        print("🚀 正在初始化环境...")
+        git_dir = self._find_git_root()
+        self._update_gitignore(git_dir)
+        self._handle_git_changes()
         print("✅ 环境初始化完成")
 
     def _handle_uncommitted_changes(self) -> None:
@@ -376,7 +421,7 @@ def main() -> None:
     args = parser.parse_args()
 
     curr_dir = os.getcwd()
-    git_dir = find_git_root(curr_dir)
+    git_dir = find_git_root_and_cd(curr_dir)
     PrettyOutput.print(f"当前目录: {git_dir}", OutputType.INFO)
 
     try:

jarvis/jarvis_code_agent/lint.py

@@ -8,7 +8,7 @@ Lint工具配置模块
 import os
 from typing import Dict, List
 
-import yaml
+import yaml  # type: ignore
 
 from jarvis.jarvis_utils.config import get_data_dir
 

jarvis/jarvis_data/config_schema.json

@@ -121,16 +121,6 @@
       "description": "模型能处理的最大输入token数量",
       "default": 32000
     },
-    "JARVIS_AUTO_COMPLETE": {
-      "type": "boolean",
-      "description": "是否启用自动补全功能",
-      "default": false
-    },
-    "SHELL": {
-      "type": "string",
-      "description": "系统shell名称(如: bash, zsh)",
-      "default": "/bin/bash"
-    },
     "JARVIS_PLATFORM": {
       "type": "string",
       "description": "常规操作平台名称",
@@ -161,21 +151,11 @@
       "description": "应用补丁前是否需要确认",
       "default": false
     },
-    "JARVIS_MAX_TOOL_CALL_COUNT": {
-      "type": "number",
-      "description": "最大连续工具调用次数",
-      "default": 20
-    },
     "JARVIS_DATA_PATH": {
       "type": "string",
       "description": "Jarvis数据存储目录路径",
       "default": "~/.jarvis"
     },
-    "JARVIS_AUTO_UPDATE": {
-      "type": "boolean",
-      "description": "是否自动更新git仓库",
-      "default": true
-    },
     "JARVIS_MAX_BIG_CONTENT_SIZE": {
       "type": "number",
       "description": "最大大内容尺寸",
@@ -201,11 +181,6 @@
       "description": "是否打印提示",
       "default": false
     },
-    "JARVIS_USE_HISTORY_COUNT": {
-      "type": "number",
-      "description": "使用的历史记录数量",
-      "default": 0
-    },
     "JARVIS_REPLACE_MAP": {
       "type": "object",
       "description": "自定义替换映射表配置",

jarvis/jarvis_git_utils/git_commiter.py

@@ -13,7 +13,7 @@ from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils.config import get_git_commit_prompt
 from jarvis.jarvis_utils.git_utils import (
     confirm_add_new_files,
-    find_git_root,
+    find_git_root_and_cd,
     has_uncommitted_changes,
 )
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
@@ -71,7 +71,7 @@ class GitCommitTool:
         """Prepare git environment by changing directory and checking for changes"""
         original_dir = os.getcwd()
         os.chdir(root_dir)
-        find_git_root()
+        find_git_root_and_cd()
         if not has_uncommitted_changes():
             PrettyOutput.print("没有未提交的更改", OutputType.SUCCESS)
             return None

jarvis/jarvis_platform/kimi.py

@@ -7,9 +7,8 @@ import os
 import time
 from typing import Dict, Generator, List, Tuple
 
-import requests  # type: ignore
-
 from jarvis.jarvis_platform.base import BasePlatform
+from jarvis.jarvis_utils import http
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import while_success
 
@@ -67,7 +66,7 @@ class KimiModel(BasePlatform):
         }
         try:
             response = while_success(
-                lambda: requests.request("POST", url, headers=headers, data=payload),
+                lambda: http.post(url, headers=headers, data=payload),
                 sleep_time=5,
             )
             if response.status_code != 200:
@@ -95,7 +94,7 @@ class KimiModel(BasePlatform):
         }
 
         response = while_success(
-            lambda: requests.post(url, headers=headers, data=payload), sleep_time=5
+            lambda: http.post(url, headers=headers, data=payload), sleep_time=5
         )
         return response.json()
 
@@ -109,7 +108,7 @@ class KimiModel(BasePlatform):
             with open(file_path, "rb") as f:
                 content = f.read()
                 response = while_success(
-                    lambda: requests.put(presigned_url, data=content), sleep_time=5
+                    lambda: http.put(presigned_url, data=content), sleep_time=5
                 )
                 return response.status_code == 200
         except Exception as e:
@@ -136,7 +135,7 @@ class KimiModel(BasePlatform):
         }
 
         response = while_success(
-            lambda: requests.post(url, headers=headers, data=payload), sleep_time=5
+            lambda: http.post(url, headers=headers, data=payload), sleep_time=5
         )
         return response.json()
 
@@ -154,7 +153,7 @@ class KimiModel(BasePlatform):
         while retry_count < max_retries:
             payload = json.dumps({"ids": [file_id]}, ensure_ascii=False)
             response = while_success(
-                lambda: requests.post(url, headers=headers, data=payload, stream=True),
+                lambda: http.post(url, headers=headers, data=payload, stream=True),
                 sleep_time=5,
             )
 
@@ -162,7 +161,12 @@ class KimiModel(BasePlatform):
                 if not line:
                     continue
 
-                line = line.decode("utf-8")
+                # httpx 返回字符串，requests 返回字节，需要兼容处理
+                if isinstance(line, bytes):
+                    line = line.decode("utf-8")
+                else:
+                    line = str(line)
+
                 if not line.startswith("data: "):
                     continue
 
@@ -281,7 +285,7 @@ class KimiModel(BasePlatform):
 
         try:
             response = while_success(
-                lambda: requests.post(url, headers=headers, json=payload, stream=True),
+                lambda: http.post(url, headers=headers, json=payload, stream=True),
                 sleep_time=5,
             )
             # 如果禁止输出，则静默处理
@@ -289,7 +293,12 @@ class KimiModel(BasePlatform):
                 if not line:
                     continue
 
-                line = line.decode("utf-8")
+                # httpx 返回字符串，requests 返回字节，需要兼容处理
+                if isinstance(line, bytes):
+                    line = line.decode("utf-8")
+                else:
+                    line = str(line)
+
                 if not line.startswith("data: "):
                     continue
 
@@ -323,7 +332,7 @@ class KimiModel(BasePlatform):
 
         try:
             response = while_success(
-                lambda: requests.delete(url, headers=headers), sleep_time=5
+                lambda: http.delete(url, headers=headers), sleep_time=5
             )
             if response.status_code == 200:
                 self.chat_id = ""

jarvis/jarvis_platform/tongyi.py

@@ -5,9 +5,8 @@ import time
 import uuid
 from typing import Any, Dict, Generator, List, Tuple
 
-import requests  # type: ignore
-
 from jarvis.jarvis_platform.base import BasePlatform
+from jarvis.jarvis_utils import http
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import while_success
 
@@ -161,7 +160,7 @@ class TongyiPlatform(BasePlatform):
 
         try:
             response = while_success(
-                lambda: requests.post(url, headers=headers, json=payload, stream=True),
+                lambda: http.post(url, headers=headers, json=payload, stream=True),
                 sleep_time=5,
             )
             if response.status_code != 200:
@@ -174,7 +173,13 @@ class TongyiPlatform(BasePlatform):
             for line in response.iter_lines():
                 if not line:
                     continue
-                line_str = line.decode("utf-8")
+
+                # httpx 返回字符串，requests 返回字节，需要兼容处理
+                if isinstance(line, bytes):
+                    line_str = line.decode("utf-8")
+                else:
+                    line_str = str(line)
+
                 if not line_str.startswith("data: "):
                     continue
 
@@ -258,7 +263,7 @@ class TongyiPlatform(BasePlatform):
 
         try:
             response = while_success(
-                lambda: requests.post(url, headers=headers, json=payload), sleep_time=5
+                lambda: http.post(url, headers=headers, json=payload), sleep_time=5
             )
             if response.status_code != 200:
                 raise Exception(f"HTTP {response.status_code}: {response.text}")
@@ -314,7 +319,7 @@ class TongyiPlatform(BasePlatform):
                     print(f"📤 正在上传文件: {file_name}")
 
                     # Upload file
-                    response = requests.post(
+                    response = http.post(
                         upload_token["host"], data=form_data, files=files
                     )
 
@@ -349,7 +354,7 @@ class TongyiPlatform(BasePlatform):
                         "dir": upload_token["dir"],
                     }
 
-                    response = requests.post(url, headers=headers, json=payload)
+                    response = http.post(url, headers=headers, json=payload)
                     if response.status_code != 200:
                         print(f"❌ 获取下载链接失败: HTTP {response.status_code}")
                         return False
@@ -381,7 +386,7 @@ class TongyiPlatform(BasePlatform):
                             "fileSize": os.path.getsize(file_path),
                         }
 
-                        add_response = requests.post(
+                        add_response = http.post(
                             add_url, headers=headers, json=add_payload
                         )
                         if add_response.status_code != 200:
@@ -464,7 +469,7 @@ class TongyiPlatform(BasePlatform):
 
         try:
             response = while_success(
-                lambda: requests.post(url, headers=headers, json=payload), sleep_time=5
+                lambda: http.post(url, headers=headers, json=payload), sleep_time=5
             )
             if response.status_code != 200:
                 PrettyOutput.print(

jarvis/jarvis_platform/yuanbao.py

@@ -7,10 +7,10 @@ import time
 import urllib.parse
 from typing import Dict, Generator, List, Tuple
 
-import requests  # type: ignore
 from PIL import Image  # type: ignore
 
 from jarvis.jarvis_platform.base import BasePlatform
+from jarvis.jarvis_utils import http
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import while_success
 
@@ -37,7 +37,7 @@ class YuanbaoPlatform(BasePlatform):
         self.conversation_id = ""  # 会话ID，用于标识当前对话
         # 从环境变量中获取必要参数
         self.cookies = os.getenv("YUANBAO_COOKIES")  # 认证cookies
-        self.agent_id = os.getenv("YUANBAO_AGENT_ID")  # 代理ID
+        self.agent_id = "naQivTmsDa"
 
         if not self.cookies:
             PrettyOutput.print("YUANBAO_COOKIES 未设置", OutputType.WARNING)
@@ -95,7 +95,7 @@ class YuanbaoPlatform(BasePlatform):
 
         try:
             response = while_success(
-                lambda: requests.post(url, headers=headers, data=payload, timeout=600),
+                lambda: http.post(url, headers=headers, data=payload),
                 sleep_time=5,
             )
             response_json = response.json()
@@ -254,7 +254,7 @@ class YuanbaoPlatform(BasePlatform):
 
         try:
             response = while_success(
-                lambda: requests.post(url, headers=headers, json=payload, timeout=600),
+                lambda: http.post(url, headers=headers, json=payload),
                 sleep_time=5,
             )
 
@@ -331,7 +331,7 @@ class YuanbaoPlatform(BasePlatform):
             )
 
             # Upload the file
-            response = requests.put(url, headers=headers, data=file_content)
+            response = http.put(url, headers=headers, data=file_content)
 
             if response.status_code not in [200, 204]:
                 PrettyOutput.print(
@@ -470,8 +470,11 @@ class YuanbaoPlatform(BasePlatform):
         try:
             # 发送消息请求，获取流式响应
             response = while_success(
-                lambda: requests.post(
-                    url, headers=headers, json=payload, stream=True, timeout=600
+                lambda: http.post(
+                    url,
+                    headers=headers,
+                    json=payload,
+                    stream=True,
                 ),
                 sleep_time=5,
             )
@@ -547,7 +550,7 @@ class YuanbaoPlatform(BasePlatform):
 
         try:
             response = while_success(
-                lambda: requests.post(url, headers=headers, json=payload, timeout=600),
+                lambda: http.post(url, headers=headers, json=payload),
                 sleep_time=5,
             )
 

jarvis/jarvis_tools/ask_user.py

@@ -34,7 +34,6 @@ class AskUserTool:
 
             # 获取agent对象并重置工具调用计数
             agent = args["agent"]
-            agent.reset_tool_call_count()
 
             # 显示问题给用户
             PrettyOutput.print(f"问题: {question}", OutputType.SYSTEM)

jarvis/jarvis_tools/file_analyzer.py

@@ -45,9 +45,6 @@ class FileAnalyzerTool:
             file_paths = args["file_paths"]
             prompt = args["prompt"]
 
-            agent = args["agent"]
-            agent.reset_tool_call_count()
-
             # 验证文件路径
             valid_files = []
             for file_path in file_paths: