jarvis-ai-assistant 0.3.30__py3-none-any.whl → 0.7.0__py3-none-any.whl

jarvis/jarvis_multi_agent/main.py

@@ -3,10 +3,12 @@ from typing import Optional
 
 import typer
 import yaml  # type: ignore[import-untyped]
+import os
 
 from jarvis.jarvis_multi_agent import MultiAgent
 from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.utils import init_env
+from jarvis.jarvis_utils.config import set_config
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 app = typer.Typer(help="多智能体系统启动器")
@@ -18,9 +20,39 @@ def cli(
     user_input: Optional[str] = typer.Option(
         None, "--input", "-i", help="用户输入（可选）"
     ),
+    model_group: Optional[str] = typer.Option(
+        None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
+    ),
+    non_interactive: bool = typer.Option(
+        False, "-n", "--non-interactive", help="启用非交互模式：用户无法与命令交互，脚本执行超时限制为5分钟"
+    ),
 ):
     """从YAML配置文件初始化并运行多智能体系统"""
+    # CLI 标志：非交互模式（不依赖配置文件）
+    if non_interactive:
+        try:
+            os.environ["JARVIS_NON_INTERACTIVE"] = "true"
+        except Exception:
+            pass
+        # 注意：全局配置同步在 init_env 之后执行，避免被覆盖
+    # 非交互模式要求从命令行传入任务
+    if non_interactive and not (user_input and str(user_input).strip()):
+        PrettyOutput.print(
+            "非交互模式已启用：必须使用 --input 传入任务内容，因多行输入不可用。",
+            OutputType.ERROR,
+        )
+        raise typer.Exit(code=2)
     init_env("欢迎使用 Jarvis-MultiAgent，您的多智能体系统已准备就绪！")
+    
+    # 在初始化环境后同步 CLI 选项到全局配置，避免被 init_env 覆盖
+    try:
+        if non_interactive:
+            set_config("JARVIS_NON_INTERACTIVE", True)
+        if model_group:
+            set_config("JARVIS_LLM_GROUP", str(model_group))
+    except Exception:
+        # 静默忽略同步异常，不影响主流程
+        pass
 
     try:
         with open(config, "r", errors="ignore") as f:
@@ -34,7 +66,11 @@ def cli(
             raise ValueError("必须指定main_agent作为主智能体")
 
         # 创建并运行多智能体系统
-        multi_agent = MultiAgent(agents_config, main_agent_name)
+        multi_agent = MultiAgent(
+            agents_config,
+            main_agent_name,
+            common_system_prompt=str(config_data.get("common_system_prompt", "") or "")
+        )
         final_input = (
             user_input
             if user_input is not None

jarvis/jarvis_platform/base.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 import re
+import os
+from datetime import datetime
 from abc import ABC, abstractmethod
 from types import TracebackType
 from typing import Dict, Generator, List, Optional, Tuple, Type
@@ -17,9 +19,12 @@ from jarvis.jarvis_utils.config import (
     get_pretty_output,
     is_print_prompt,
     is_immediate_abort,
+    is_save_session_history,
+    get_data_dir,
 )
 from jarvis.jarvis_utils.embedding import split_text_into_chunks
 from jarvis.jarvis_utils.globals import set_in_chat, get_interrupt, console
+import jarvis.jarvis_utils.globals as G
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ct, ot
 from jarvis.jarvis_utils.utils import get_context_token_count, while_success, while_true
@@ -34,6 +39,7 @@ class BasePlatform(ABC):
         self.web = False  # 添加web属性，默认false
         self._saved = False
         self.model_group: Optional[str] = None
+        self._session_history_file: Optional[str] = None
 
     def __enter__(self) -> Self:
         """Enter context manager"""
@@ -57,6 +63,7 @@ class BasePlatform(ABC):
     def reset(self):
         """Reset model"""
         self.delete_chat()
+        self._session_history_file = None
 
     @abstractmethod
     def chat(self, message: str) -> Generator[str, None, None]:
@@ -77,6 +84,11 @@ class BasePlatform(ABC):
 
         start_time = time.time()
 
+        # 当输入为空白字符串时，打印警告并直接返回空字符串
+        if message.strip() == "":
+            PrettyOutput.print("输入为空白字符串，已忽略本次请求", OutputType.WARNING)
+            return ""
+
         input_token_count = get_context_token_count(message)
 
         if input_token_count > get_max_input_token_count(self.model_group):
@@ -127,7 +139,9 @@ class BasePlatform(ABC):
                     first_chunk = None
 
                     with Status(
-                        f"🤔 {self.name()} 正在思考中...", spinner="dots", console=console
+                        f"🤔 {(G.current_agent_name + ' · ') if G.current_agent_name else ''}{self.name()} 正在思考中...",
+                        spinner="dots",
+                        console=console,
                     ):
                         try:
                             while True:
@@ -135,79 +149,66 @@ class BasePlatform(ABC):
                                 if first_chunk:
                                     break
                         except StopIteration:
+                            self._append_session_history(message, "")
                             return ""
 
                     text_content = Text(overflow="fold")
                     panel = Panel(
                         text_content,
-                        title=f"[bold cyan]{self.name()}[/bold cyan]",
+                        title=f"[bold cyan]{(G.current_agent_name + ' · ') if G.current_agent_name else ''}{self.name()}[/bold cyan]",
                         subtitle="[yellow]正在回答... (按 Ctrl+C 中断)[/yellow]",
                         border_style="bright_blue",
                         box=box.ROUNDED,
                         expand=True,  # 允许面板自动调整大小
                     )
 
-                    buffer = []
-                    buffer_count = 0
                     with Live(panel, refresh_per_second=4, transient=False) as live:
+
+                        def _update_panel_content(content: str):
+                            text_content.append(content, style="bright_white")
+                            # --- Scrolling Logic ---
+                            # Calculate available height in the panel
+                            max_text_height = (
+                                console.height - 5
+                            )  # Leave space for borders/titles
+                            if max_text_height <= 0:
+                                max_text_height = 1
+
+                            # Get the actual number of lines the text will wrap to
+                            lines = text_content.wrap(
+                                console,
+                                console.width - 4 if console.width > 4 else 1,
+                            )
+
+                            # If content overflows, truncate to show only the last few lines
+                            if len(lines) > max_text_height:
+                                # Rebuild the text from the wrapped lines to ensure visual consistency
+                                # This correctly handles both wrapped long lines and explicit newlines
+                                text_content.plain = "\n".join(
+                                    [line.plain for line in lines[-max_text_height:]]
+                                )
+
+                            panel.subtitle = (
+                                "[yellow]正在回答... (按 Ctrl+C 中断)[/yellow]"
+                            )
+                            live.update(panel)
+
                         # Process first chunk
                         response += first_chunk
-                        buffer.append(first_chunk)
-                        buffer_count += 1
+                        if first_chunk:
+                            _update_panel_content(first_chunk)
 
                         # Process rest of the chunks
                         for s in chat_iterator:
                             if not s:
                                 continue
                             response += s  # Accumulate the full response string
-                            buffer.append(s)
-                            buffer_count += 1
-
-                            # 积累一定量或达到最后再更新，减少闪烁
-                            if buffer_count >= 5 or s == "":
-                                # Append buffered content to the Text object
-                                text_content.append(
-                                    "".join(buffer), style="bright_white"
-                                )
-                                buffer.clear()
-                                buffer_count = 0
-
-                                # --- Scrolling Logic ---
-                                # Calculate available height in the panel
-                                max_text_height = (
-                                    console.height - 5
-                                )  # Leave space for borders/titles
-                                if max_text_height <= 0:
-                                    max_text_height = 1
-
-                                # Get the actual number of lines the text will wrap to
-                                lines = text_content.wrap(
-                                    console,
-                                    console.width - 4 if console.width > 4 else 1,
-                                )
-
-                                # If content overflows, truncate to show only the last few lines
-                                if len(lines) > max_text_height:
-                                    # Rebuild the text from the wrapped lines to ensure visual consistency
-                                    # This correctly handles both wrapped long lines and explicit newlines
-                                    text_content.plain = "\n".join(
-                                        [line.plain for line in lines[-max_text_height:]]
-                                    )
-
-                                panel.subtitle = (
-                                    "[yellow]正在回答... (按 Ctrl+C 中断)[/yellow]"
-                                )
-                                live.update(panel)
+                            _update_panel_content(s)
 
                             if is_immediate_abort() and get_interrupt():
+                                self._append_session_history(message, response)
                                 return response  # Return the partial response immediately
 
-                        # Ensure any remaining content in the buffer is displayed
-                        if buffer:
-                            text_content.append(
-                                "".join(buffer), style="bright_white"
-                            )
-
                         # At the end, display the entire response
                         text_content.plain = response
 
@@ -215,16 +216,18 @@ class BasePlatform(ABC):
                         duration = end_time - start_time
                         panel.subtitle = f"[bold green]✓ 对话完成耗时: {duration:.2f}秒[/bold green]"
                         live.update(panel)
+                    console.print()
                 else:
                     # Print a clear prefix line before streaming model output (non-pretty mode)
                     console.print(
-                        f"🤖 模型输出 - {self.name()}  (按 Ctrl+C 中断)",
+                        f"🤖 模型输出 - {(G.current_agent_name + ' · ') if G.current_agent_name else ''}{self.name()}  (按 Ctrl+C 中断)",
                         soft_wrap=False,
                     )
                     for s in self.chat(message):
                         console.print(s, end="")
                         response += s
                         if is_immediate_abort() and get_interrupt():
+                            self._append_session_history(message, response)
                             return response
                     console.print()
                     end_time = time.time()
@@ -234,6 +237,7 @@ class BasePlatform(ABC):
                 for s in self.chat(message):
                     response += s
                     if is_immediate_abort() and get_interrupt():
+                        self._append_session_history(message, response)
                         return response
         # Keep original think tag handling
         response = re.sub(
@@ -242,6 +246,8 @@ class BasePlatform(ABC):
         response = re.sub(
             ot("thinking") + r".*?" + ct("thinking"), "", response, flags=re.DOTALL
         )
+        # Save session history (input and full response)
+        self._append_session_history(message, response)
         return response
 
     def chat_until_success(self, message: str) -> str:
@@ -346,6 +352,52 @@ class BasePlatform(ABC):
         """Set web flag"""
         self.web = web
 
+    def _append_session_history(self, user_input: str, model_output: str) -> None:
+        """
+        Append the user input and model output to a session history file if enabled.
+        The file name is generated on first save and reused until reset.
+        """
+        try:
+            if not is_save_session_history():
+                return
+
+            if self._session_history_file is None:
+                # Ensure session history directory exists under data directory
+                data_dir = get_data_dir()
+                session_dir = os.path.join(data_dir, "session_history")
+                os.makedirs(session_dir, exist_ok=True)
+
+                # Build a safe filename including platform, model and timestamp
+                try:
+                    platform_name = type(self).platform_name()
+                except Exception:
+                    platform_name = "unknown_platform"
+
+                try:
+                    model_name = self.name()
+                except Exception:
+                    model_name = "unknown_model"
+
+                safe_platform = re.sub(r"[^\w\-\.]+", "_", str(platform_name))
+                safe_model = re.sub(r"[^\w\-\.]+", "_", str(model_name))
+                ts = datetime.now().strftime("%Y%m%d_%H%M%S")
+
+                self._session_history_file = os.path.join(
+                    session_dir, f"session_history_{safe_platform}_{safe_model}_{ts}.log"
+                )
+
+            # Append record
+            with open(self._session_history_file, "a", encoding="utf-8", errors="ignore") as f:
+                ts_line = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+                f.write(f"===== {ts_line} =====\n")
+                f.write("USER:\n")
+                f.write(f"{user_input}\n")
+                f.write("\nASSISTANT:\n")
+                f.write(f"{model_output}\n\n")
+        except Exception:
+            # Do not break chat flow if writing history fails
+            pass
+
     @abstractmethod
     def support_web(self) -> bool:
         """Check if platform supports web functionality"""

jarvis/jarvis_platform/openai.py

@@ -24,7 +24,32 @@ class OpenAIModel(BasePlatform):
         self.base_url = os.getenv("OPENAI_API_BASE", "https://api.openai.com/v1")
         self.model_name = os.getenv("JARVIS_MODEL") or "gpt-4o"
 
-        self.client = OpenAI(api_key=self.api_key, base_url=self.base_url)
+                # Optional: Inject extra HTTP headers via environment variable
+        # Expected format: OPENAI_EXTRA_HEADERS='{"Header-Name": "value", "X-Trace": "abc"}'
+        headers_str = os.getenv("OPENAI_EXTRA_HEADERS")
+        self.extra_headers: Dict[str, str] = {}
+        if headers_str:
+            try:
+                parsed = json.loads(headers_str)
+                if isinstance(parsed, dict):
+                    # Ensure all header keys/values are strings
+                    self.extra_headers = {str(k): str(v) for k, v in parsed.items()}
+                else:
+                    PrettyOutput.print("OPENAI_EXTRA_HEADERS 应为 JSON 对象，如 {'X-Source':'jarvis'}", OutputType.WARNING)
+            except Exception as e:
+                PrettyOutput.print(f"解析 OPENAI_EXTRA_HEADERS 失败: {e}", OutputType.WARNING)
+
+        # Initialize OpenAI client, try to pass default headers if SDK supports it
+        try:
+            if self.extra_headers:
+                self.client = OpenAI(api_key=self.api_key, base_url=self.base_url, default_headers=self.extra_headers)
+            else:
+                self.client = OpenAI(api_key=self.api_key, base_url=self.base_url)
+        except TypeError:
+            # Fallback: SDK version may not support default_headers
+            self.client = OpenAI(api_key=self.api_key, base_url=self.base_url)
+            if self.extra_headers:
+                PrettyOutput.print("当前 OpenAI SDK 不支持 default_headers，未能注入额外 HTTP 头", OutputType.WARNING)
         self.messages: List[Dict[str, str]] = []
         self.system_message = ""
 

jarvis/jarvis_platform/yuanbao.py

@@ -77,7 +77,7 @@ class YuanbaoPlatform(BasePlatform):
             "Referer": f"https://yuanbao.tencent.com/chat/{self.agent_id}",
             "X-Source": "web",
             "Accept-Encoding": "gzip, deflate, br, zstd",
-            "Accept": "*/*",
+
             "Sec-Fetch-Site": "same-origin",
             "Sec-Fetch-Mode": "cors",
             "Sec-Fetch-Dest": "empty",

jarvis/jarvis_platform_manager/service.py

@@ -100,7 +100,7 @@ def start_service(
     PrettyOutput.print(
         f"Starting Jarvis API server on {host}:{port}", OutputType.SUCCESS
     )
-    PrettyOutput.print("This server provides an OpenAI-compatible API", OutputType.INFO)
+    PrettyOutput.print("本服务提供与 OpenAI 兼容的 API", OutputType.INFO)
 
     if default_platform and default_model:
         PrettyOutput.print(
@@ -151,7 +151,7 @@ def start_service(
             if response:
                 f.write(f"\nResponse:\n{response}\n")
 
-        PrettyOutput.print(f"Conversation logged to {log_file}", OutputType.INFO)
+        PrettyOutput.print(f"会话已记录到 {log_file}", OutputType.INFO)
 
     @app.get("/v1/models")
     async def list_models() -> Dict[str, Any]:

jarvis/jarvis_rag/cli.py

@@ -54,10 +54,10 @@ _project_root = os.path.abspath(
 if _project_root not in sys.path:
     sys.path.insert(0, _project_root)
 
-from jarvis.jarvis_platform.base import BasePlatform
-from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_rag.llm_interface import LLMInterface
-from jarvis.jarvis_rag.rag_pipeline import JarvisRAGPipeline
+from jarvis.jarvis_platform.base import BasePlatform  # noqa: E402
+from jarvis.jarvis_platform.registry import PlatformRegistry  # noqa: E402
+from jarvis.jarvis_rag.llm_interface import LLMInterface  # noqa: E402
+from jarvis.jarvis_rag.rag_pipeline import JarvisRAGPipeline  # noqa: E402
 
 app = typer.Typer(
     name="jarvis-rag",