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

jarvis/__init__.py

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

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

jarvis/jarvis_code_agent/code_agent.py

@@ -642,11 +642,11 @@ class CodeAgent:
 def cli(
     llm_type: str = typer.Option(
         "normal",
-        "--llm_type",
+        "-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_platform_manager/main.py

@@ -8,6 +8,12 @@ import sys
 from typing import Any, Dict, List, Optional
 
 import typer
+from jarvis.jarvis_utils.config import (
+    get_normal_platform_name,
+    get_normal_model_name,
+    get_thinking_platform_name,
+    get_thinking_model_name,
+)
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils.input import get_multiline_input, get_single_line_input
@@ -19,22 +25,26 @@ app = typer.Typer(help="Jarvis AI 平台")
 
 
 @app.command("info")
-def list_platforms() -> None:
-    """列出所有支持的平台和模型。"""
+def list_platforms(
+    platform: Optional[str] = typer.Option(
+        None, "--platform", "-p", help="指定要查看的平台"
+    )
+) -> None:
+    """列出所有支持的平台和模型，或指定平台的详细信息。"""
     registry = PlatformRegistry.get_global_platform_registry()
-    platforms = registry.get_available_platforms()
+    platform_names = [platform] if platform else registry.get_available_platforms()
 
     PrettyOutput.section("Supported platforms and models", OutputType.SUCCESS)
 
-    for platform_name in platforms:
+    for platform_name in platform_names:
         try:
             # Create platform instance
-            platform = registry.create_platform(platform_name)
-            if not platform:
+            platform_instance = registry.create_platform(platform_name)
+            if not platform_instance:
                 continue
 
             # Get the list of models supported by the platform
-            models = platform.get_model_list()
+            models = platform_instance.get_model_list()
 
             # Print platform name
             PrettyOutput.section(f"{platform_name}", OutputType.SUCCESS)
@@ -55,13 +65,25 @@ def list_platforms() -> None:
             PrettyOutput.print(f"创建 {platform_name} 平台失败", OutputType.WARNING)
 
 
-def chat_with_model(platform_name: str, model_name: str, system_prompt: str) -> None:
-    """与指定平台和模型进行对话。"""
+def chat_with_model(
+    platform_name: str, model_name: str, system_prompt: str, llm_type: str = "normal"
+) -> None:
+    """与指定平台和模型进行对话。
+
+    参数:
+        platform_name: 平台名称
+        model_name: 模型名称
+        system_prompt: 系统提示语
+        llm_type: LLM类型，可选值：'normal'(普通)或 'thinking'(思考模式)
+    """
     registry = PlatformRegistry.get_global_platform_registry()
     conversation_history: List[Dict[str, str]] = []  # 存储对话记录
 
     # Create platform instance
     platform = registry.create_platform(platform_name)
+    if platform:
+        platform.set_model_name(model_name)
+
     if not platform:
         PrettyOutput.print(f"创建平台 {platform_name} 失败", OutputType.WARNING)
         return
@@ -100,7 +122,7 @@ def chat_with_model(platform_name: str, model_name: str, system_prompt: str) ->
             # Check if it is a clear session command
             if user_input.strip() == "/clear":
                 try:
-                    platform.reset()
+                    platform.reset()  # type: ignore[no-untyped-call]  # type: ignore[no-untyped-call]  # type: ignore[no-untyped-call]
                     platform.set_model_name(model_name)  # Reinitialize session
                     conversation_history = []  # 重置对话记录
                     PrettyOutput.print("会话已清除", OutputType.SUCCESS)
@@ -332,11 +354,32 @@ def chat_command(
         None, "--platform", "-p", help="指定要使用的平台"
     ),
     model: Optional[str] = typer.Option(None, "--model", "-m", help="指定要使用的模型"),
+    llm_type: str = typer.Option(
+        "normal",
+        "-t",
+        "--llm_type",
+        help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
+    ),
+    llm_group: Optional[str] = typer.Option(
+        None, "-g", "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
+    ),
 ) -> None:
     """与指定平台和模型聊天。"""
+    # 如果未提供平台或模型参数，则从config获取默认值
+    platform = platform or (
+        get_thinking_platform_name(llm_group)
+        if llm_type == "thinking"
+        else get_normal_platform_name(llm_group)
+    )
+    model = model or (
+        get_thinking_model_name(llm_group)
+        if llm_type == "thinking"
+        else get_normal_model_name(llm_group)
+    )
+
     if not validate_platform_model(platform, model):
         return
-    chat_with_model(platform, model, "")  # type: ignore
+    chat_with_model(platform, model, "", llm_type)
 
 
 @app.command("service")
@@ -351,6 +394,9 @@ def service_command(
     ),
 ) -> None:
     """启动OpenAI兼容的API服务。"""
+    # 如果未提供平台或模型参数，则从config获取默认值
+    platform = platform or get_normal_platform_name()
+    model = model or get_normal_model_name()
     start_service(host=host, port=port, default_platform=platform, default_model=model)
 
 
@@ -392,6 +438,15 @@ def role_command(
     model: Optional[str] = typer.Option(
         None, "--model", "-m", help="指定要使用的模型，覆盖角色配置"
     ),
+    llm_type: Optional[str] = typer.Option(
+        None,
+        "-t",
+        "--llm_type",
+        help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式），覆盖角色配置",
+    ),
+    llm_group: Optional[str] = typer.Option(
+        None, "-g", "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
+    ),
 ) -> None:
     """加载角色配置文件并开始对话。"""
     config_path = os.path.expanduser(config_file)
@@ -418,14 +473,54 @@ def role_command(
         PrettyOutput.print("无效的选择", OutputType.ERROR)
         return
 
+    # 获取llm_type，优先使用命令行参数，否则使用角色配置，默认为normal
+    role_llm_type = llm_type or selected_role.get("llm_type", "normal")
+
     # 初始化平台和模型
-    platform_name = platform or selected_role["platform"]
-    model_name = model or selected_role["model"]
+    # 如果提供了platform或model参数，优先使用命令行参数
+    # 否则，如果提供了llm_group，根据llm_type从配置中获取
+    # 最后才使用角色配置中的platform和model
+    if platform:
+        platform_name = platform
+    elif llm_group:
+        platform_name = (
+            get_thinking_platform_name(llm_group)
+            if role_llm_type == "thinking"
+            else get_normal_platform_name(llm_group)
+        )
+    else:
+        platform_name = selected_role.get("platform")
+        if not platform_name:
+            # 如果角色配置中没有platform，使用默认配置
+            platform_name = (
+                get_thinking_platform_name()
+                if role_llm_type == "thinking"
+                else get_normal_platform_name()
+            )
+
+    if model:
+        model_name = model
+    elif llm_group:
+        model_name = (
+            get_thinking_model_name(llm_group)
+            if role_llm_type == "thinking"
+            else get_normal_model_name(llm_group)
+        )
+    else:
+        model_name = selected_role.get("model")
+        if not model_name:
+            # 如果角色配置中没有model，使用默认配置
+            model_name = (
+                get_thinking_model_name()
+                if role_llm_type == "thinking"
+                else get_normal_model_name()
+            )
+
     system_prompt = selected_role.get("system_prompt", "")
 
     # 开始对话
     PrettyOutput.print(f"已选择角色: {selected_role['name']}", OutputType.SUCCESS)
-    chat_with_model(platform_name, model_name, system_prompt)
+    chat_with_model(platform_name, model_name, system_prompt, role_llm_type)
 
 
 def main() -> None:

jarvis/jarvis_stats/storage.py

@@ -12,6 +12,7 @@ from typing import Dict, List, Optional, Any
 from collections import defaultdict
 import sys
 import time
+import uuid
 
 
 class StatsStorage:
@@ -76,7 +77,9 @@ class StatsStorage:
     def _save_json(self, filepath: Path, data: Dict):
         """保存JSON文件"""
         # 使用临时文件+重命名的原子操作来避免并发写入问题
-        temp_filepath = filepath.with_suffix(".tmp")
+        # 使用唯一的临时文件名避免并发冲突
+        temp_suffix = f".tmp.{uuid.uuid4().hex[:8]}"
+        temp_filepath = filepath.with_suffix(temp_suffix)
         max_retries = 3
 
         for attempt in range(max_retries):

{jarvis_ai_assistant-0.3.1.dist-info → jarvis_ai_assistant-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.1
+Version: 0.3.2
 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.3.1.dist-info → jarvis_ai_assistant-0.3.2.dist-info}/RECORD

@@ -1,12 +1,12 @@
-jarvis/__init__.py,sha256=XcoTQZ6UV9jwJibx5WyZw3mcC4mymdL1YQyJuL5GUfY,73
+jarvis/__init__.py,sha256=lEwB7boP3teN71H_7lteEF13tfqihaQwtXiRqbFAWro,73
 jarvis/jarvis_agent/__init__.py,sha256=2zScM4N6GN4Vv5y_jDmJjTirea8ZGtRMiPf-UaGl0XE,25789
 jarvis/jarvis_agent/agent_manager.py,sha256=YzpMiF0H2-eyk2kn2o24Bkj3bXsQx7Pv2vfD4gWepo0,2893
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=Qs4LAr4xdKLBJpQE81YP4CkucAop86ms0iVoKa1nnso,2468
 jarvis/jarvis_agent/config_editor.py,sha256=Ctk82sO6w2cNW0-_5L7Bomj-hgM4U7WwMc52fwhAJyg,1809
 jarvis/jarvis_agent/edit_file_handler.py,sha256=w-byNJ4TN_SlV3djjfFC7OksySOFGrM8ku49w662dzc,11854
 jarvis/jarvis_agent/file_methodology_manager.py,sha256=h2ogMK9mSKjg_n04ITw24m28J_U225bhLNhfwpf9jpU,4383
-jarvis/jarvis_agent/jarvis.py,sha256=yCXqNVF9S-IX02tNfPTw4WesMuO3F0Ht3Z0u1Srv7VI,3234
-jarvis/jarvis_agent/main.py,sha256=56pLVy6v-3ZdyPCcWXdRkgbjmYsoIfC7zrA6B7sYivU,3334
+jarvis/jarvis_agent/jarvis.py,sha256=2XMuMA3A4ihE4RAo-XnYZHnJ0ZrGRFagE1s-eiGdZ9Q,3252
+jarvis/jarvis_agent/main.py,sha256=Sd4-OnBcMqY5i7vb-Riy_JT2fGfuANtgiAWvWFY8LXM,3345
 jarvis/jarvis_agent/memory_manager.py,sha256=F7HTNzdN1_-cSygnz7zKSJRJvPLUOosqcXQeiW8zG4U,5266
 jarvis/jarvis_agent/methodology_share_manager.py,sha256=vwWNexluTXSI3qeNP3zJAemOjWW37o_1AlqDR1C8wCI,6910
 jarvis/jarvis_agent/output_handler.py,sha256=P7oWpXBGFfOsWq7cIhS_z9crkQ19ES7qU5pM92KKjAs,1172
@@ -14,14 +14,14 @@ jarvis/jarvis_agent/prompt_builder.py,sha256=PH1fPDVa8z_RXkoXHJFNDf8PQjUoLNLYwkh
 jarvis/jarvis_agent/prompts.py,sha256=X6cXa-n0xqBQ8LDTgLsD0kqziAh1s0cNp89i4mxcvHg,9444
 jarvis/jarvis_agent/protocols.py,sha256=JWnJDikFEuwvFUv7uzXu0ggJ4O9K2FkMnfVCwIJ5REw,873
 jarvis/jarvis_agent/session_manager.py,sha256=DnvI9rWkVmkyO1XfKZyo9lTn4ajg4ccwzEkoRHFPOJM,2925
-jarvis/jarvis_agent/share_manager.py,sha256=3lXwoHv6TZb6nxkSN0r2BHLMk6J09HC0csT3C9Ep5w0,6615
+jarvis/jarvis_agent/share_manager.py,sha256=7w25cX2zupnBDdn_HDusMyOAXbHQMWKYVZYq9i4EJs0,7619
 jarvis/jarvis_agent/shell_input_handler.py,sha256=1IboqdxcJuoIqRpmDU10GugR9fWXUHyCEbVF4nIWbyo,1328
 jarvis/jarvis_agent/task_analyzer.py,sha256=-fQ9YBYFcc-Z1FSoDIPzRfAgkREFoIOXtU2TdBkB-e0,4656
 jarvis/jarvis_agent/task_manager.py,sha256=HJm4_SMpsFbQMUUsAZeHm7cZuhNbz28YW-DRLYgoarc,4422
 jarvis/jarvis_agent/tool_executor.py,sha256=nIq-sPNgrtimtM-IHpN09cWmId8jDzWRdCFoRzXnnoo,1721
 jarvis/jarvis_agent/tool_share_manager.py,sha256=R5ONIQlDXX9pFq3clwHFhEW8BAJ3ECaR2DqWCEC9tzM,5205
 jarvis/jarvis_code_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_code_agent/code_agent.py,sha256=cFLvSnUMQoQ_RkQ4MsZaln1G6DrxBF6u4Lgz79q2bSI,29305
+jarvis/jarvis_code_agent/code_agent.py,sha256=mFcvj3F2ZJS550Cbv8TrVyY1evQVow8SI6B-LCdRfxI,29317
 jarvis/jarvis_code_agent/lint.py,sha256=LZPsfyZPMo7Wm7LN4osZocuNJwZx1ojacO3MlF870x8,4009
 jarvis/jarvis_code_analysis/code_review.py,sha256=TMov1pqDe1bg0vM1ndnYeW9ejHrRN_jMroo3T4L9yag,32368
 jarvis/jarvis_code_analysis/checklists/__init__.py,sha256=LIXAYa1sW3l7foP6kohLWnE98I_EQ0T7z5bYKHq6rJA,78
@@ -66,7 +66,7 @@ jarvis/jarvis_platform/registry.py,sha256=1bMy0YZUa8NLzuZlKfC4CBtpa0iniypTxUZk0H
 jarvis/jarvis_platform/tongyi.py,sha256=uZP5ceCbHPApimKBqKthP5QynG52C3tMBglIyoBHwaY,22186
 jarvis/jarvis_platform/yuanbao.py,sha256=mS4aywK9CzgFU6FHh6GUxyY1Ly-NoBtGkBi74Jo_0XM,22921
 jarvis/jarvis_platform_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_platform_manager/main.py,sha256=VhP0qiLqGPk_nQ_j0xg6H5CSct5ckNBaFqohb82whYs,17490
+jarvis/jarvis_platform_manager/main.py,sha256=fRZbtCH6zrG7NXTMlplf0Oq4gRYkhebvPm3RrQtN_WU,20988
 jarvis/jarvis_platform_manager/service.py,sha256=myJYGSUclCEiRTf3JKs4JndwhXJeQj7MQQy4i13jMt0,13767
 jarvis/jarvis_rag/__init__.py,sha256=HRTXgnQxDuaE9x-e3r6SYqhJ5d4DSI_rrIxy2IGY6qk,320
 jarvis/jarvis_rag/cache.py,sha256=Tqx_Oe-AhuWlMXHGHUaIuG6OEHoHBVZq7mL3kldtFFU,2723
@@ -82,7 +82,7 @@ jarvis/jarvis_smart_shell/main.py,sha256=ReCC9bWPlgl84ylI0uvdzlE3J6fS0XzFSLOpQQy
 jarvis/jarvis_stats/__init__.py,sha256=jJzgP43nxzLbNGs8Do4Jfta1PNCJMf1Oq9YTPd6EnFM,342
 jarvis/jarvis_stats/cli.py,sha256=KqLH-9Kd_YlBJSke3QXY90XnFmiH2kYkRacL8ygtSsM,12649
 jarvis/jarvis_stats/stats.py,sha256=qLyOJvWAv0fgV7oohAUSQ2W2E1Hr4wWgEQXDOiI-4Cg,17674
-jarvis/jarvis_stats/storage.py,sha256=0hs-TkmvWavsf6J2LLOLXyyZzVK8g77jecRnt89MzYE,12724
+jarvis/jarvis_stats/storage.py,sha256=MBQRxExIWdePXzY1EE8JAs1IEpMqamImpgjruqt_u9A,12853
 jarvis/jarvis_stats/visualizer.py,sha256=ZIBmGELzs6c7qM01tQql1HF6eFKn6HDGVQfKXRUUIY0,8529
 jarvis/jarvis_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_tools/ask_user.py,sha256=M6DdLNryCE8y1JcdZHEifUgZkPUEPNKc-zDW5p0Mb1k,2029
@@ -117,9 +117,9 @@ jarvis/jarvis_utils/methodology.py,sha256=i8-chZtggN3GbhaDzeLV4eBl0DP3I5zctZ-I5H
 jarvis/jarvis_utils/output.py,sha256=QRLlKObQKT0KuRSeZRqYb7NlTQvsd1oZXZ41WxeWEuU,10894
 jarvis/jarvis_utils/tag.py,sha256=f211opbbbTcSyzCDwuIK_oCnKhXPNK-RknYyGzY1yD0,431
 jarvis/jarvis_utils/utils.py,sha256=RwhyPfBGx_x9OKawWUVw6bAbZeI4IlvxBhhYQ_RHpWQ,40847
-jarvis_ai_assistant-0.3.1.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.3.1.dist-info/METADATA,sha256=4A6JaiqkYbe-sqjWL5vB8MPelkKGP03DulZn-Y-zE3Y,16807
-jarvis_ai_assistant-0.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.3.1.dist-info/entry_points.txt,sha256=8cwi1VxZGU5UeSZMFiH-jG6NK95Asjukj5SBLBrGiGo,1257
-jarvis_ai_assistant-0.3.1.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.3.1.dist-info/RECORD,,
+jarvis_ai_assistant-0.3.2.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.3.2.dist-info/METADATA,sha256=DL481NElSBIOwMBr1GXz6tfFmzR1vE86Z0keZubnZ_E,16807
+jarvis_ai_assistant-0.3.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.3.2.dist-info/entry_points.txt,sha256=8cwi1VxZGU5UeSZMFiH-jG6NK95Asjukj5SBLBrGiGo,1257
+jarvis_ai_assistant-0.3.2.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.3.2.dist-info/RECORD,,