jarvis-ai-assistant 0.3.1__py3-none-any.whl → 0.3.3__py3-none-any.whl

jarvis/__init__.py

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

jarvis/jarvis_agent/__init__.py

@@ -190,7 +190,9 @@ class Agent:
 
         self.model = PlatformRegistry().create_platform(platform_name)
         if self.model is None:
-            PrettyOutput.print(f"平台 {platform_name} 不存在，将使用普通模型", OutputType.WARNING)
+            PrettyOutput.print(
+                f"平台 {platform_name} 不存在，将使用普通模型", OutputType.WARNING
+            )
             self.model = PlatformRegistry().get_normal_platform()
 
         if model_name:
@@ -512,10 +514,6 @@ class Agent:
 
         if self.use_analysis:
             self.task_analyzer.analysis_task(satisfaction_feedback)
-        else:
-            # 如果没有开启分析，也提示用户是否有值得记忆的信息
-            if self.force_save_memory:
-                self.memory_manager.prompt_memory_save()
 
         if self.need_summary:
             print("📄 正在生成总结...")
@@ -689,7 +687,9 @@ class Agent:
         返回:
             str: "continue" 或 "complete"
         """
-        user_input = self.multiline_inputer(f"{self.name}: 请输入，或输入空行来结束当前任务：")
+        user_input = self.multiline_inputer(
+            f"{self.name}: 请输入，或输入空行来结束当前任务："
+        )
 
         if user_input:
             self.session.prompt = user_input

jarvis/jarvis_agent/jarvis.py

@@ -19,17 +19,17 @@ def run_cli(
     ctx: typer.Context,
     llm_type: str = typer.Option(
         "normal",
-        "--llm_type",
+        "-t", "--llm_type",
         help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
     ),
     task: Optional[str] = typer.Option(
-        None, "-t", "--task", help="从命令行直接输入任务内容"
+        None, "-T", "--task", help="从命令行直接输入任务内容"
     ),
     model_group: Optional[str] = typer.Option(
-        None, "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
+        None, "-g", "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
     ),
     tool_group: Optional[str] = typer.Option(
-        None, "--tool_group", help="使用的工具组，覆盖配置文件中的设置"
+        None, "-G", "--tool_group", help="使用的工具组，覆盖配置文件中的设置"
     ),
     config_file: Optional[str] = typer.Option(
         None, "-f", "--config", help="自定义配置文件路径"

jarvis/jarvis_agent/main.py

@@ -50,13 +50,12 @@ def cli(
     ),
     llm_type: str = typer.Option(
         "normal",
-        "--llm_type",
+        "-t", "--llm_type",
         help="使用的LLM类型，覆盖配置文件中的设置",
     ),
     model_group: Optional[str] = typer.Option(
-        None, "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
-    ),
-):
+        None, "-g", "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
+    ),):
     """Main entry point for Jarvis agent"""
     # Initialize environment
     init_env("欢迎使用 Jarvis AI 助手，您的智能助理已准备就绪！", config_file=config_file)

jarvis/jarvis_agent/share_manager.py

@@ -60,6 +60,28 @@ class ShareManager(ABC):
             subprocess.run(
                 ["git", "clone", self.central_repo_url, self.repo_path], check=True
             )
+            # 检查并添加.gitignore文件
+            gitignore_path = os.path.join(self.repo_path, ".gitignore")
+            modified = False
+            if not os.path.exists(gitignore_path):
+                with open(gitignore_path, "w") as f:
+                    f.write("__pycache__/\n")
+                modified = True
+            else:
+                with open(gitignore_path, "r+") as f:
+                    content = f.read()
+                    if "__pycache__" not in content:
+                        f.write("\n__pycache__/\n")
+                        modified = True
+            
+            if modified:
+                subprocess.run(["git", "add", ".gitignore"], cwd=self.repo_path, check=True)
+                subprocess.run(
+                    ["git", "commit", "-m", "chore: add __pycache__ to .gitignore"], 
+                    cwd=self.repo_path, 
+                    check=True
+                )
+                subprocess.run(["git", "push"], cwd=self.repo_path, check=True)
         else:
             PrettyOutput.print(
                 f"正在更新中心{self.get_resource_type()}仓库...", OutputType.INFO
@@ -76,6 +98,27 @@ class ShareManager(ABC):
                 )
                 # 如果有远程分支，执行pull
                 if result.stdout.strip():
+                    # 检查是否有未提交的更改
+                    status_result = subprocess.run(
+                        ["git", "status", "--porcelain"],
+                        cwd=self.repo_path,
+                        capture_output=True,
+                        text=True,
+                        check=True,
+                    )
+                    if status_result.stdout:
+                        if user_confirm(
+                            f"检测到中心{self.get_resource_type()}仓库 '{self.repo_name}' 存在未提交的更改，是否放弃这些更改并更新？"
+                        ):
+                            subprocess.run(
+                                ["git", "checkout", "."], cwd=self.repo_path, check=True
+                            )
+                        else:
+                            PrettyOutput.print(
+                                f"跳过更新 '{self.repo_name}' 以保留未提交的更改。",
+                                OutputType.INFO,
+                            )
+                            return
                     subprocess.run(["git", "pull"], cwd=self.repo_path, check=True)
                 else:
                     PrettyOutput.print(

jarvis/jarvis_code_agent/code_agent.py

@@ -431,9 +431,6 @@ class CodeAgent:
                     ["git", "commit", "-m", f"CheckPoint #{commit_count + 1}"],
                     check=True,
                 )
-
-                # 统计提交次数
-                StatsManager.increment("code_commits_accepted", group="code_agent")
             except subprocess.CalledProcessError as e:
                 PrettyOutput.print(f"提交失败: {str(e)}", OutputType.ERROR)
 
@@ -484,6 +481,10 @@ class CodeAgent:
             )
             git_commiter = GitCommitTool()
             git_commiter.execute({})
+
+            # 在用户接受commit后，根据配置决定是否保存记忆
+            if self.agent.force_save_memory:
+                self.agent.memory_manager.prompt_memory_save()
         elif start_commit:
             os.system(f"git reset --hard {str(start_commit)}")  # 确保转换为字符串
             PrettyOutput.print("已重置到初始提交", OutputType.INFO)
@@ -642,11 +643,12 @@ class CodeAgent:
 def cli(
     llm_type: str = typer.Option(
         "normal",
+        "-t",
         "--llm_type",
         help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
     ),
     model_group: Optional[str] = typer.Option(
-        None, "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
+        None, "-g", "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
     ),
     requirement: Optional[str] = typer.Option(
         None, "-r", "--requirement", help="要处理的需求描述"

jarvis/jarvis_code_analysis/code_review.py

@@ -300,7 +300,11 @@ class CodeReviewTool:
 
                     # Execute git command and get diff output
                     diff_output = subprocess.check_output(
-                        diff_cmd, shell=True, text=True, encoding="utf-8", errors="replace"
+                        diff_cmd,
+                        shell=True,
+                        text=True,
+                        encoding="utf-8",
+                        errors="replace",
                     )
                     if not diff_output:
                         return {
@@ -339,7 +343,11 @@ class CodeReviewTool:
 
                     # Execute git command and get diff output
                     diff_output = subprocess.check_output(
-                        diff_cmd, shell=True, text=True, encoding="utf-8", errors="replace"
+                        diff_cmd,
+                        shell=True,
+                        text=True,
+                        encoding="utf-8",
+                        errors="replace",
                     )
                     if not diff_output:
                         return {
@@ -381,7 +389,11 @@ class CodeReviewTool:
 
                     # Execute git command and get diff output
                     diff_output = subprocess.check_output(
-                        diff_cmd, shell=True, text=True, encoding="utf-8", errors="replace"
+                        diff_cmd,
+                        shell=True,
+                        text=True,
+                        encoding="utf-8",
+                        errors="replace",
                     )
                     if not diff_output:
                         return {
@@ -581,16 +593,48 @@ class CodeReviewTool:
                 tool_registry = ToolRegistry()
                 tool_registry.dont_use_tools(["code_review"])
 
-                # Use the provided agent's model_group or get it from globals
+                # Get llm_type and model_group from args
+                llm_type = args.get("llm_type", "normal")
+                model_group = args.get("model_group")
+
+                # Get platform and model based on llm_type and model_group
+                from jarvis.jarvis_utils.config import (
+                    get_normal_platform_name,
+                    get_normal_model_name,
+                    get_thinking_platform_name,
+                    get_thinking_model_name,
+                )
+
+                if llm_type == "thinking":
+                    platform_name = get_thinking_platform_name(model_group)
+                    model_name = get_thinking_model_name(model_group)
+                else:
+                    platform_name = get_normal_platform_name(model_group)
+                    model_name = get_normal_model_name(model_group)
+
+                # If no explicit parameters, try to get from existing agent
                 calling_agent = agent or get_agent(current_agent_name)
-                model_group = None
-                if calling_agent and hasattr(calling_agent, "model") and calling_agent.model:
-                    model_group = calling_agent.model.model_group
+                if (
+                    not platform_name
+                    and calling_agent
+                    and hasattr(calling_agent, "model")
+                    and calling_agent.model
+                ):
+                    platform_name = calling_agent.model.platform_name()
+                    model_name = calling_agent.model.name()
+
+                # Create a new platform instance
+                review_model = None
+                if platform_name:
+                    review_model = PlatformRegistry().create_platform(platform_name)
+                    if review_model and model_name:
+                        review_model.set_model_name(model_name)
+                        if model_group:
+                            review_model.model_group = model_group
 
                 agent = Agent(
                     system_prompt=system_prompt,
                     name="Code Review Agent",
-                    model_group=model_group,
                     summary_prompt=f"""<code_review_report>
 <overview>
 # 整体评估
@@ -660,6 +704,10 @@ class CodeReviewTool:
                     auto_complete=False,
                 )
 
+                # Replace the agent's model with our custom platform instance
+                if review_model:
+                    agent.model = review_model
+
                 # Determine if we need to split the diff due to size
                 max_diff_size = 100 * 1024 * 1024  # Limit to 100MB
 
@@ -693,7 +741,9 @@ class CodeReviewTool:
 
                 try:
                     # Check if content is too large
-                    is_large_content = is_context_overflow(diff_output, model_group)
+                    is_large_content = is_context_overflow(
+                        diff_output, review_model.model_group if review_model else None
+                    )
 
                     # Upload the file to the agent's model
                     if is_large_content:
@@ -773,10 +823,25 @@ def extract_code_report(result: str) -> str:
 def review_commit(
     commit: str = typer.Argument(..., help="要审查的提交SHA"),
     root_dir: str = typer.Option(".", "--root-dir", help="代码库根目录路径"),
+    llm_type: str = typer.Option(
+        "normal",
+        "-t",
+        "--llm_type",
+        help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
+    ),
+    model_group: Optional[str] = typer.Option(
+        None, "-g", "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
+    ),
 ):
     """审查指定的提交"""
     tool = CodeReviewTool()
-    tool_args = {"review_type": "commit", "commit_sha": commit, "root_dir": root_dir}
+    tool_args = {
+        "review_type": "commit",
+        "commit_sha": commit,
+        "root_dir": root_dir,
+        "llm_type": llm_type,
+        "model_group": model_group,
+    }
     result = tool.execute(tool_args)
     if result["success"]:
         PrettyOutput.section("自动代码审查结果:", OutputType.SUCCESS)
@@ -789,10 +854,24 @@ def review_commit(
 @app.command("current")
 def review_current(
     root_dir: str = typer.Option(".", "--root-dir", help="代码库根目录路径"),
+    llm_type: str = typer.Option(
+        "normal",
+        "-t",
+        "--llm_type",
+        help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
+    ),
+    model_group: Optional[str] = typer.Option(
+        None, "-g", "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
+    ),
 ):
     """审查当前的变更"""
     tool = CodeReviewTool()
-    tool_args = {"review_type": "current", "root_dir": root_dir}
+    tool_args = {
+        "review_type": "current",
+        "root_dir": root_dir,
+        "llm_type": llm_type,
+        "model_group": model_group,
+    }
     result = tool.execute(tool_args)
     if result["success"]:
         PrettyOutput.section("自动代码审查结果:", OutputType.SUCCESS)
@@ -807,6 +886,15 @@ def review_range(
     start_commit: str = typer.Argument(..., help="起始提交SHA"),
     end_commit: str = typer.Argument(..., help="结束提交SHA"),
     root_dir: str = typer.Option(".", "--root-dir", help="代码库根目录路径"),
+    llm_type: str = typer.Option(
+        "normal",
+        "-t",
+        "--llm_type",
+        help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
+    ),
+    model_group: Optional[str] = typer.Option(
+        None, "-g", "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
+    ),
 ):
     """审查提交范围"""
     tool = CodeReviewTool()
@@ -815,6 +903,8 @@ def review_range(
         "start_commit": start_commit,
         "end_commit": end_commit,
         "root_dir": root_dir,
+        "llm_type": llm_type,
+        "model_group": model_group,
     }
     result = tool.execute(tool_args)
     if result["success"]:
@@ -829,10 +919,25 @@ def review_range(
 def review_file(
     file: str = typer.Argument(..., help="要审查的文件路径"),
     root_dir: str = typer.Option(".", "--root-dir", help="代码库根目录路径"),
+    llm_type: str = typer.Option(
+        "normal",
+        "-t",
+        "--llm_type",
+        help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
+    ),
+    model_group: Optional[str] = typer.Option(
+        None, "-g", "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
+    ),
 ):
     """审查指定的文件"""
     tool = CodeReviewTool()
-    tool_args = {"review_type": "file", "file_path": file, "root_dir": root_dir}
+    tool_args = {
+        "review_type": "file",
+        "file_path": file,
+        "root_dir": root_dir,
+        "llm_type": llm_type,
+        "model_group": model_group,
+    }
     result = tool.execute(tool_args)
     if result["success"]:
         PrettyOutput.section("自动代码审查结果:", OutputType.SUCCESS)

jarvis/jarvis_git_utils/git_commiter.py

@@ -164,14 +164,59 @@ commit信息
 {ct("COMMIT_MESSAGE")}
                 """
 
-                # 获取模型并尝试上传文件
+                # Get llm_type and model_group from args
+                llm_type = args.get("llm_type", "normal")
+                model_group = args.get("model_group")
+
+                # Get platform and model based on llm_type and model_group
+                from jarvis.jarvis_utils.config import (
+                    get_normal_platform_name,
+                    get_normal_model_name,
+                    get_thinking_platform_name,
+                    get_thinking_model_name,
+                )
+
+                if llm_type == "thinking":
+                    platform_name = get_thinking_platform_name(model_group)
+                    model_name = get_thinking_model_name(model_group)
+                else:
+                    platform_name = get_normal_platform_name(model_group)
+                    model_name = get_normal_model_name(model_group)
+
+                # If no explicit parameters, try to get from existing agent
                 agent = get_agent(current_agent_name)
-                if agent:
-                    platform = agent.model
-                    model_group = agent.model.model_group
+                if (
+                    not platform_name
+                    and agent
+                    and hasattr(agent, "model")
+                    and agent.model
+                ):
+                    platform_name = agent.model.platform_name()
+                    model_name = agent.model.name()
+                    if not model_group:
+                        model_group = agent.model.model_group
+
+                # Create a new platform instance
+                if platform_name:
+                    platform = PlatformRegistry().create_platform(platform_name)
+                    if platform and model_name:
+                        platform.set_model_name(model_name)
+                        if model_group:
+                            platform.model_group = model_group
                 else:
-                    platform = PlatformRegistry().get_normal_platform()
-                    model_group = None
+                    if llm_type == "thinking":
+                        platform = PlatformRegistry().get_thinking_platform()
+                    else:
+                        platform = PlatformRegistry().get_normal_platform()
+
+                # Ensure platform is not None
+                if not platform:
+                    return {
+                        "success": False,
+                        "stdout": "",
+                        "stderr": "错误：无法创建平台实例",
+                    }
+
                 upload_success = False
 
                 # Check if content is too large
@@ -330,9 +375,7 @@ commit信息
 
 @app.command()
 def cli(
-    root_dir: str = typer.Option(
-        ".", "--root-dir", help="Git仓库的根目录路径"
-    ),
+    root_dir: str = typer.Option(".", "--root-dir", help="Git仓库的根目录路径"),
     prefix: str = typer.Option(
         "",
         "--prefix",
@@ -343,6 +386,15 @@ def cli(
         "--suffix",
         help="提交信息后缀（用换行分隔）",
     ),
+    llm_type: str = typer.Option(
+        "normal",
+        "-t",
+        "--llm_type",
+        help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
+    ),
+    model_group: Optional[str] = typer.Option(
+        None, "-g", "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
+    ),
 ):
     init_env("欢迎使用 Jarvis-GitCommitTool，您的Git提交助手已准备就绪！")
     tool = GitCommitTool()
@@ -351,6 +403,8 @@ def cli(
             "root_dir": root_dir,
             "prefix": prefix,
             "suffix": suffix,
+            "llm_type": llm_type,
+            "model_group": model_group,
         }
     )