jarvis-ai-assistant 0.2.1__py3-none-any.whl → 0.2.3__py3-none-any.whl

jarvis/jarvis_data/config_schema.json

@@ -141,38 +141,47 @@
       "description": "思考操作模型名称",
       "default": "deep_seek"
     },
-    "JARVIS_MODEL_GROUP": {
+    "JARVIS_LLM_GROUP": {
       "type": "string",
-      "description": "选择一个预定义的模型组"
+      "description": "选择一个预定义的模型组",
+      "default": ""
     },
-    "JARVIS_MODEL_GROUPS": {
+    "JARVIS_LLM_GROUPS": {
       "type": "array",
       "description": "预定义的模型配置组",
+      "default": [],
       "items": {
         "type": "object",
         "additionalProperties": {
           "type": "object",
           "properties": {
             "JARVIS_PLATFORM": {
-              "type": "string"
+              "type": "string",
+              "default": "yuanbao"
             },
             "JARVIS_MODEL": {
-              "type": "string"
+              "type": "string",
+              "default": "deep_seek_v3"
             },
             "JARVIS_THINKING_PLATFORM": {
-              "type": "string"
+              "type": "string",
+              "default": "yuanbao"
             },
             "JARVIS_THINKING_MODEL": {
-              "type": "string"
+              "type": "string",
+              "default": "deep_seek"
             },
             "JARVIS_MAX_TOKEN_COUNT": {
-              "type": "number"
+              "type": "number",
+              "default": 960000
             },
             "JARVIS_MAX_INPUT_TOKEN_COUNT": {
-              "type": "number"
+              "type": "number",
+              "default": 32000
             },
             "JARVIS_MAX_BIG_CONTENT_SIZE": {
-              "type": "number"
+              "type": "number",
+              "default": 160000
             }
           },
           "required": [
@@ -235,9 +244,43 @@
       "description": "是否启用静态代码分析",
       "default": true
     },
+    "JARVIS_RAG_GROUP": {
+      "type": "string",
+      "description": "选择一个预定义的RAG配置组",
+      "default": ""
+    },
+    "JARVIS_RAG_GROUPS": {
+      "type": "array",
+      "description": "预定义的RAG配置组",
+      "default": [],
+      "items": {
+        "type": "object",
+        "additionalProperties": {
+          "type": "object",
+          "properties": {
+            "embedding_model": {
+              "type": "string",
+              "default": "BAAI/bge-base-zh-v1.5"
+            },
+            "rerank_model": {
+              "type": "string",
+              "default": "BAAI/bge-reranker-base"
+            },
+            "use_bm25": {
+              "type": "boolean",
+              "default": true
+            },
+            "use_rerank": {
+              "type": "boolean",
+              "default": true
+            }
+          }
+        }
+      }
+    },
     "JARVIS_RAG": {
       "type": "object",
-      "description": "RAG框架的配置",
+      "description": "RAG框架的顶层配置。注意：此处的设置将覆盖任何由JARVIS_RAG_GROUP选择的组配置。",
       "properties": {
         "embedding_model": {
           "type": "string",
@@ -248,11 +291,23 @@
           "type": "string",
           "default": "BAAI/bge-reranker-base",
           "description": "用于RAG的rerank模型的名称, 默认为 'BAAI/bge-reranker-base'"
+        },
+        "use_bm25": {
+          "type": "boolean",
+          "default": true,
+          "description": "是否在RAG中为检索使用BM25, 默认为 true"
+        },
+        "use_rerank": {
+          "type": "boolean",
+          "default": true,
+          "description": "是否在RAG中为检索使用rerank, 默认为 true"
         }
       },
       "default": {
         "embedding_model": "BAAI/bge-base-zh-v1.5",
-        "rerank_model": "BAAI/bge-reranker-base"
+        "rerank_model": "BAAI/bge-reranker-base",
+        "use_bm25": true,
+        "use_rerank": true
       }
     },
     "JARVIS_REPLACE_MAP": {

jarvis/jarvis_git_squash/main.py

@@ -1,14 +1,16 @@
 # -*- coding: utf-8 -*-
-import argparse
 import subprocess
-import sys
 from typing import Dict
 
+import typer
+
 from jarvis.jarvis_git_utils.git_commiter import GitCommitTool
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import init_env
 from jarvis.jarvis_utils.input import user_confirm
 
+app = typer.Typer(help="Git squash tool")
+
 
 class GitSquashTool:
     name = "git_squash_agent"
@@ -49,18 +51,20 @@ class GitSquashTool:
             PrettyOutput.print(f"压缩提交失败: {str(e)}", OutputType.WARNING)
 
 
-def main():
+@app.command()
+def cli(
+    commit_hash: str = typer.Argument(..., help="Base commit hash to squash from"),
+    lang: str = typer.Option("Chinese", "--lang", help="Language for commit messages"),
+):
     init_env("欢迎使用 Jarvis-GitSquash，您的Git压缩助手已准备就绪！")
-    parser = argparse.ArgumentParser(description="Git squash tool")
-    parser.add_argument("commit_hash", type=str, help="Base commit hash to squash from")
-    parser.add_argument(
-        "--lang", type=str, default="Chinese", help="Language for commit messages"
-    )
-    args = parser.parse_args()
-
     tool = GitSquashTool()
-    tool.execute({"commit_hash": args.commit_hash, "lang": args.lang})
+    tool.execute({"commit_hash": commit_hash, "lang": lang})
+
+
+def main():
+    """Application entry point"""
+    app()
 
 
 if __name__ == "__main__":
-    sys.exit(main())
+    main()

jarvis/jarvis_git_utils/git_commiter.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import argparse
 import os
 import re
 import subprocess
@@ -7,6 +6,7 @@ import sys
 import tempfile
 from typing import Any, Dict, Optional
 
+import typer
 import yaml  # type: ignore
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
@@ -21,6 +21,8 @@ from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ct, ot
 from jarvis.jarvis_utils.utils import init_env, is_context_overflow
 
+app = typer.Typer(help="Git commit tool")
+
 
 class GitCommitTool:
     name = "git_commit_agent"
@@ -305,34 +307,37 @@ commit信息
             os.chdir(original_dir)
 
 
-def main():
-    init_env("欢迎使用 Jarvis-GitCommitTool，您的Git提交助手已准备就绪！")
-    parser = argparse.ArgumentParser(description="Git commit tool")
-    parser.add_argument(
-        "--root-dir", type=str, default=".", help="Root directory of the Git repository"
-    )
-    parser.add_argument(
+@app.command()
+def cli(
+    root_dir: str = typer.Option(
+        ".", "--root-dir", help="Root directory of the Git repository"
+    ),
+    prefix: str = typer.Option(
+        "",
         "--prefix",
-        type=str,
-        default="",
         help="Prefix to prepend to commit message (separated by space)",
-    )
-    parser.add_argument(
+    ),
+    suffix: str = typer.Option(
+        "",
         "--suffix",
-        type=str,
-        default="",
         help="Suffix to append to commit message (separated by newline)",
-    )
-    args = parser.parse_args()
+    ),
+):
+    init_env("欢迎使用 Jarvis-GitCommitTool，您的Git提交助手已准备就绪！")
     tool = GitCommitTool()
     tool.execute(
         {
-            "root_dir": args.root_dir,
-            "prefix": args.prefix if hasattr(args, "prefix") else "",
-            "suffix": args.suffix if hasattr(args, "suffix") else "",
+            "root_dir": root_dir,
+            "prefix": prefix,
+            "suffix": suffix,
         }
     )
 
 
+def main():
+    """Application entry point"""
+    app()
+
+
 if __name__ == "__main__":
-    sys.exit(main())
+    main()

jarvis/jarvis_methodology/main.py

@@ -8,11 +8,13 @@
 - 列出所有方法论
 """
 
-import argparse
 import hashlib
 import json
 import os
+import sys
+from typing import Optional
 
+import typer
 import yaml  # type: ignore
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
@@ -22,8 +24,13 @@ from jarvis.jarvis_utils.methodology import (
 )
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
+app = typer.Typer(help="方法论管理工具")
 
-def import_methodology(input_file):
+
+@app.command("import")
+def import_methodology(
+    input_file: str = typer.Argument(..., help="要导入的方法论文件路径")
+):
     """导入方法论文件（合并策略）"""
     try:
         # 加载现有方法论
@@ -56,9 +63,13 @@ def import_methodology(input_file):
         )
     except (json.JSONDecodeError, OSError) as e:
         PrettyOutput.print(f"导入失败: {str(e)}", OutputType.ERROR)
+        raise typer.Exit(code=1)
 
 
-def export_methodology(output_file):
+@app.command("export")
+def export_methodology(
+    output_file: str = typer.Argument(..., help="导出文件路径")
+):
     """导出当前方法论到单个文件"""
     try:
         methodologies = _load_all_methodologies()
@@ -72,8 +83,10 @@ def export_methodology(output_file):
         )
     except (OSError, TypeError) as e:
         PrettyOutput.print(f"导出失败: {str(e)}", OutputType.ERROR)
+        raise typer.Exit(code=1)
 
 
+@app.command("list")
 def list_methodologies():
     """列出所有方法论"""
     try:
@@ -88,9 +101,13 @@ def list_methodologies():
             PrettyOutput.print(f"{i}. {problem_type}", OutputType.INFO)
     except (OSError, json.JSONDecodeError) as e:
         PrettyOutput.print(f"列出方法论失败: {str(e)}", OutputType.ERROR)
+        raise typer.Exit(code=1)
 
 
-def extract_methodology(input_file):
+@app.command("extract")
+def extract_methodology(
+    input_file: str = typer.Argument(..., help="要提取方法论的文本文件路径")
+):
     """从文本文件中提取方法论"""
     try:
         # 读取文本文件内容
@@ -135,7 +152,7 @@ def extract_methodology(input_file):
         except Exception as e:
             print("❌ 提取失败")
             PrettyOutput.print(f"提取方法论失败: {str(e)}", OutputType.ERROR)
-            return
+            raise typer.Exit(code=1)
 
         # 提取YAML部分
         methodologies_start = response.find("<methodologies>") + len("<methodologies>")
@@ -145,7 +162,7 @@ def extract_methodology(input_file):
             PrettyOutput.print(
                 "大模型未返回有效的<methodologies>格式", OutputType.ERROR
             )
-            return
+            raise typer.Exit(code=1)
 
         yaml_content = response[methodologies_start:methodologies_end].strip()
 
@@ -157,7 +174,7 @@ def extract_methodology(input_file):
         except (yaml.YAMLError, KeyError, TypeError) as e:
             print("❌ YAML解析失败")
             PrettyOutput.print(f"YAML解析错误: {str(e)}", OutputType.ERROR)
-            return
+            raise typer.Exit(code=1)
 
         if not extracted_methodologies:
             print("❌ 未提取到有效方法论")
@@ -190,9 +207,11 @@ def extract_methodology(input_file):
         )
     except Exception as e:
         PrettyOutput.print(f"提取失败: {str(e)}", OutputType.ERROR)
+        raise typer.Exit(code=1)
 
 
-def extract_methodology_from_url(url):
+@app.command("extract-url")
+def extract_methodology_from_url(url: str = typer.Argument(..., help="要提取方法论的URL")):
     """从URL提取方法论"""
     try:
         # 获取平台实例
@@ -234,7 +253,7 @@ def extract_methodology_from_url(url):
         except Exception as e:
             print("❌ 提取失败")
             PrettyOutput.print(f"提取方法论失败: {str(e)}", OutputType.ERROR)
-            return
+            raise typer.Exit(code=1)
 
         # 提取YAML部分
         methodologies_start = response.find("<methodologies>") + len("<methodologies>")
@@ -244,7 +263,7 @@ def extract_methodology_from_url(url):
             PrettyOutput.print(
                 "大模型未返回有效的<methodologies>格式", OutputType.ERROR
             )
-            return
+            raise typer.Exit(code=1)
 
         yaml_content = response[methodologies_start:methodologies_end].strip()
 
@@ -256,7 +275,7 @@ def extract_methodology_from_url(url):
         except (yaml.YAMLError, KeyError, TypeError) as e:
             print("❌ YAML解析失败")
             PrettyOutput.print(f"YAML解析错误: {str(e)}", OutputType.ERROR)
-            return
+            raise typer.Exit(code=1)
 
         if not extracted_methodologies:
             print("❌ 未提取到有效方法论")
@@ -289,46 +308,12 @@ def extract_methodology_from_url(url):
         )
     except Exception as e:
         PrettyOutput.print(f"从URL提取失败: {str(e)}", OutputType.ERROR)
+        raise typer.Exit(code=1)
 
 
-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)
+def main() -> None:
+    """Application entry point"""
+    app()
 
 
 if __name__ == "__main__":

jarvis/jarvis_multi_agent/main.py

@@ -1,27 +1,26 @@
 # -*- coding: utf-8 -*-
+from typing import Optional
+
+import typer
 import yaml
 
 from jarvis.jarvis_multi_agent import MultiAgent
 from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.utils import init_env
 
+app = typer.Typer(help="多智能体系统启动器")
 
-def main():
-    """从YAML配置文件初始化并运行多智能体系统
 
-    Returns:
-        最终处理结果
-    """
+@app.command()
+def cli(
+    config: str = typer.Option(..., "--config", "-c", help="YAML配置文件路径"),
+    user_input: Optional[str] = typer.Option(None, "--input", "-i", help="用户输入（可选）"),
+):
+    """从YAML配置文件初始化并运行多智能体系统"""
     init_env("欢迎使用 Jarvis-MultiAgent，您的多智能体系统已准备就绪！")
-    import argparse
-
-    parser = argparse.ArgumentParser(description="多智能体系统启动器")
-    parser.add_argument("--config", "-c", required=True, help="YAML配置文件路径")
-    parser.add_argument("--input", "-i", help="用户输入（可选）")
-    args = parser.parse_args()
 
     try:
-        with open(args.config, "r", errors="ignore") as f:
+        with open(config, "r", errors="ignore") as f:
             config_data = yaml.safe_load(f)
 
         # 获取agents配置
@@ -33,20 +32,26 @@ def main():
 
         # 创建并运行多智能体系统
         multi_agent = MultiAgent(agents_config, main_agent_name)
-        user_input = (
-            args.input
-            if args.input is not None
+        final_input = (
+            user_input
+            if user_input is not None
             else get_multiline_input("请输入内容（输入空行结束）：")
         )
-        if user_input == "":
-            return
-        return multi_agent.run(user_input)
+        if not final_input:
+            raise typer.Exit(code=0)
+        multi_agent.run(final_input)
+
+    except typer.Exit:
+        raise
+    except (ValueError, RuntimeError, yaml.YAMLError) as e:
+        PrettyOutput.print(f"错误: {str(e)}", OutputType.ERROR)
+        raise typer.Exit(code=1)
+
 
-    except yaml.YAMLError as e:
-        raise ValueError(f"YAML配置文件解析错误: {str(e)}")
-    except Exception as e:
-        raise RuntimeError(f"多智能体系统初始化失败: {str(e)}")
+def main() -> None:
+    """Application entry point."""
+    app()
 
 
 if __name__ == "__main__":
-    result = main()
+    main()

jarvis/jarvis_platform/ai8.py

@@ -32,15 +32,21 @@ class AI8Model(BasePlatform):
 
         self.headers = {
             "Authorization": self.token,
+            "sec-ch-ua-platform": '"Windows"',
+            "sec-ch-ua": '"Not)A;Brand";v="8", "Chromium";v="138", "Google Chrome";v="138"',
+            "sec-ch-ua-mobile": "?0",
             "Content-Type": "application/json",
             "Accept": "application/json, text/plain, */*",
-            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36",
-            "X-APP-VERSION": "2.3.0",
+            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36",
+            "X-APP-VERSION": "2.4.2",
             "Origin": self.BASE_URL,
             "Referer": f"{self.BASE_URL}/chat?_userMenuKey=chat",
             "Sec-Fetch-Site": "same-origin",
             "Sec-Fetch-Mode": "cors",
             "Sec-Fetch-Dest": "empty",
+            "Accept-Language": "zh-CN,zh;q=0.9",
+            "Accept-Encoding": "gzip, deflate, br, zstd",
+            "Connection": "keep-alive",
         }
 
         self.model_name = os.getenv("JARVIS_MODEL") or "deepseek-chat"
@@ -60,7 +66,14 @@ class AI8Model(BasePlatform):
             # 1. 创建会话
             response = while_success(
                 lambda: http.post(
-                    f"{self.BASE_URL}/api/chat/session", headers=self.headers, json={}
+                    f"{self.BASE_URL}/api/chat/session",
+                    headers=self.headers,
+                    json={
+                        "mcp": [],
+                        "model": self.model_name,
+                        "plugins": [],
+                        "rags": [],
+                    },
                 ),
                 sleep_time=5,
             )
@@ -83,6 +96,7 @@ class AI8Model(BasePlatform):
                 "plugins": [],
                 "localPlugins": None,
                 "useAppId": 0,
+                "temperature": 0,
             }
 
             response = while_success(
@@ -127,33 +141,30 @@ class AI8Model(BasePlatform):
                 "files": [],
             }
 
+            # 为流式请求构造专用的请求头，避免 'Accept' 和 'accept' 键冲突
+            stream_headers = self.headers.copy()
+            stream_headers["Accept"] = "text/event-stream"  # 添加流式专用的accept头
+
             # 使用stream_post进行流式请求
             response_stream = while_success(
                 lambda: http.stream_post(
                     f"{self.BASE_URL}/api/chat/completions",
-                    headers=self.headers,
+                    headers=stream_headers,
                     json=payload,
                 ),
                 sleep_time=5,
             )
 
             # 处理流式响应
-            for chunk in response_stream:
-                if chunk:
+            for line in response_stream:
+                if line and line.startswith("data: "):
                     try:
-                        line = chunk.decode("utf-8")
-                        if line.startswith("data: "):
-                            try:
-                                data = json.loads(line[6:])
-                                if data.get("type") == "string":
-                                    chunk_data = data.get("data", "")
-                                    if chunk_data:
-                                        yield chunk_data
-
-                            except json.JSONDecodeError:
-                                continue
-
-                    except UnicodeDecodeError:
+                        data = json.loads(line[6:])
+                        if data.get("type") == "string":
+                            chunk_data = data.get("data", "")
+                            if chunk_data:
+                                yield chunk_data
+                    except json.JSONDecodeError:
                         continue
 
             return None
@@ -239,9 +250,7 @@ class AI8Model(BasePlatform):
             PrettyOutput.print(f"会话文件未找到: {file_path}", OutputType.ERROR)
             return False
         except KeyError as e:
-            PrettyOutput.print(
-                f"恢复失败: 会话文件格式不正确，缺少键 {e}", OutputType.ERROR
-            )
+            PrettyOutput.print(f"恢复失败: 会话文件格式不正确，缺少键 {e}", OutputType.ERROR)
             return False
         except Exception as e:
             PrettyOutput.print(f"恢复会话失败: {str(e)}", OutputType.ERROR)