jarvis-ai-assistant 0.3.1__tar.gz → 0.3.2__tar.gz

{jarvis_ai_assistant-0.3.1/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.3.2}/PKG-INFO

@@ -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 → jarvis_ai_assistant-0.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.3.1"
+version = "0.3.2"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]

{jarvis_ai_assistant-0.3.1 → jarvis_ai_assistant-0.3.2}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.3.1",
+    version="0.3.2",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.3.1 → jarvis_ai_assistant-0.3.2}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.3.1 → jarvis_ai_assistant-0.3.2}/src/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_ai_assistant-0.3.1 → jarvis_ai_assistant-0.3.2}/src/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_ai_assistant-0.3.1 → jarvis_ai_assistant-0.3.2}/src/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_ai_assistant-0.3.1 → jarvis_ai_assistant-0.3.2}/src/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_ai_assistant-0.3.1 → jarvis_ai_assistant-0.3.2}/src/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_ai_assistant-0.3.1 → jarvis_ai_assistant-0.3.2}/src/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 → jarvis_ai_assistant-0.3.2/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -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