jarvis-ai-assistant 0.1.189__py3-none-any.whl → 0.1.191__py3-none-any.whl

jarvis/__init__.py

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

jarvis/jarvis_agent/__init__.py

@@ -19,8 +19,8 @@ from jarvis.jarvis_utils.config import (get_max_token_count,
                                         is_execute_tool_confirm,
                                         is_use_analysis, is_use_methodology)
 from jarvis.jarvis_utils.embedding import get_context_token_count
-from jarvis.jarvis_utils.globals import (delete_agent, make_agent_name,
-                                         set_agent)
+from jarvis.jarvis_utils.globals import (delete_agent, get_interrupt, make_agent_name,
+                                         set_agent, set_interrupt)
 from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.methodology import (load_methodology,
                                              upload_methodology)
@@ -319,7 +319,7 @@ class Agent:
 </actions>
 """
 
-        self.model.set_system_message(
+        self.model.set_system_prompt(
             f"""
 {self.system_prompt}
 
@@ -371,40 +371,6 @@ class Agent:
                 return handler
         return None
 
-    def make_default_addon_prompt(self, need_complete: bool) -> str:
-        """生成附加提示。
-
-        参数:
-            need_complete: 是否需要完成任务
-
-        """
-        # 结构化系统指令
-        action_handlers = ", ".join([handler.name() for handler in self.output_handler])
-
-        # 任务完成提示
-        complete_prompt = (
-            f"- 输出{ot('!!!COMPLETE!!!')}"
-            if need_complete and self.auto_complete
-            else ""
-        )
-
-        addon_prompt = f"""
-<system_prompt>
-    请判断是否已经完成任务，如果已经完成：
-    - 直接输出完成原因，不需要再有新的操作，不要输出{ot("TOOL_CALL")}标签
-    {complete_prompt}
-    如果没有完成，请进行下一步操作：
-    - 仅包含一个操作
-    - 如果信息不明确，请请求用户补充
-    - 如果执行过程中连续失败5次，请使用ask_user询问用户操作
-    - 操作列表：{action_handlers}
-</system_prompt>
-
-请继续。
-"""
-
-        return addon_prompt
-
     def _call_model(self, message: str, need_complete: bool = False) -> str:
         """调用AI模型并实现重试逻辑
 
@@ -429,8 +395,6 @@ class Agent:
         if self.addon_prompt:
             message += f"\n\n{self.addon_prompt}"
             self.addon_prompt = ""
-        else:
-            message += f"\n\n{self.make_default_addon_prompt(need_complete)}"
 
         # 累加对话长度
         self.conversation_length += get_context_token_count(message)
@@ -812,6 +776,14 @@ arguments:
                     if self.after_tool_call_cb:
                         self.after_tool_call_cb(self)
 
+                    if get_interrupt():
+                        set_interrupt(False)
+                        user_input = self.multiline_inputer(
+                            f"模型交互期间被中断，请输入用户干预信息："
+                        )
+                        if user_input:
+                            self.prompt += f"\n\n用户干预信息：{user_input}"
+
                     if self.prompt or self.addon_prompt:
                         continue
 

jarvis/jarvis_agent/jarvis.py

@@ -126,8 +126,6 @@ def main() -> None:
             need_summary=False
         )
 
-        agent.set_addon_prompt(agent.make_default_addon_prompt(False) + "\n如果使用脚本可以完成任务，优先execute_script工具")
-
         # 优先处理命令行直接传入的任务
         if args.task:
             agent.run(args.task)

jarvis/jarvis_git_utils/git_commiter.py

@@ -77,6 +77,7 @@ class GitCommitTool:
     def execute(self, args: Dict) -> Dict[str, Any]:
         """Execute automatic commit process with support for multi-line messages and special characters"""
         try:
+            original_dir = os.getcwd()
             root_dir = args.get("root_dir", ".")
             prefix = args.get("prefix", "")
             suffix = args.get("suffix", "")

jarvis/jarvis_platform/base.py

@@ -12,6 +12,7 @@ from yaspin import yaspin
 from jarvis.jarvis_utils.config import (get_max_input_token_count,
                                         get_pretty_output, is_print_prompt)
 from jarvis.jarvis_utils.embedding import split_text_into_chunks
+from jarvis.jarvis_utils.globals import set_in_chat
 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,
@@ -128,10 +129,14 @@ class BasePlatform(ABC):
     
     def chat_until_success(self, message: str) -> str:
         """Chat with model until successful response"""
-        if not self.suppress_output and is_print_prompt():
-            PrettyOutput.print(f"{message}", OutputType.USER)
-        result: str = while_true(lambda: while_success(lambda: self._chat(message), 5), 5)
-        return result
+        try:
+            set_in_chat(True)
+            if not self.suppress_output and is_print_prompt():
+                PrettyOutput.print(f"{message}", OutputType.USER)
+            result: str = while_true(lambda: while_success(lambda: self._chat(message), 5), 5)
+            return result
+        finally:
+            set_in_chat(False)
 
     @abstractmethod
     def name(self) -> str:
@@ -144,9 +149,9 @@ class BasePlatform(ABC):
         raise NotImplementedError("delete_chat is not implemented")
 
     @abstractmethod
-    def set_system_message(self, message: str):
+    def set_system_prompt(self, message: str):
         """Set system message"""
-        raise NotImplementedError("set_system_message is not implemented")
+        raise NotImplementedError("set_system_prompt is not implemented")
 
     @abstractmethod
     def get_model_list(self) -> List[Tuple[str, str]]:

jarvis/jarvis_platform/human.py

@@ -25,7 +25,7 @@ class HumanPlatform(BasePlatform):
         self.system_message = ""  # 系统消息，用于初始化对话
         self.first_message = True
 
-    def set_system_message(self, message: str):
+    def set_system_prompt(self, message: str):
         """设置系统消息"""
         self.system_message = message
 

jarvis/jarvis_platform/kimi.py

@@ -41,7 +41,7 @@ class KimiModel(BasePlatform):
         self.system_message = ""
         self.model_name = "kimi"
 
-    def set_system_message(self, message: str):
+    def set_system_prompt(self, message: str):
         """Set system message"""
         self.system_message = message
 

jarvis/jarvis_platform/openai.py

@@ -74,7 +74,7 @@ class OpenAIModel(BasePlatform):
 
         self.model_name = model_name
 
-    def set_system_message(self, message: str):
+    def set_system_prompt(self, message: str):
         """
         设置系统消息(角色设定)
         

jarvis/jarvis_platform/registry.py

@@ -16,7 +16,7 @@ REQUIRED_METHODS = [
     ('chat', ['message']),           # 方法名和参数列表
     ('name', []),
     ('delete_chat', []),
-    ('set_system_message', ['message']),
+    ('set_system_prompt', ['message']),
     ('set_model_name', ['model_name']),
     ('get_model_list', []),
     ('upload_files', ['file_list']),

jarvis/jarvis_platform/tongyi.py

@@ -493,7 +493,7 @@ class TongyiPlatform(BasePlatform):
             PrettyOutput.print(f"Error deleting chat: {str(e)}", OutputType.ERROR)
             return False
 
-    def set_system_message(self, message: str):
+    def set_system_prompt(self, message: str):
         """Set system message
 
         Args:

jarvis/jarvis_platform/yuanbao.py

@@ -45,7 +45,7 @@ class YuanbaoPlatform(BasePlatform):
         self.model_name = "deep_seek_v3"  # 默认模型名称，使用下划线保持一致
         self.multimedia = []
 
-    def set_system_message(self, message: str):
+    def set_system_prompt(self, message: str):
         """设置系统消息"""
         self.system_message = message