jarvis-ai-assistant 0.1.119__tar.gz → 0.1.121__tar.gz

{jarvis_ai_assistant-0.1.119/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.121}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.119
+Version: 0.1.121
 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.1.119 → jarvis_ai_assistant-0.1.121}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.119"
+version = "0.1.121"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "Your Name", email = "your.email@example.com" }]

{jarvis_ai_assistant-0.1.119 → jarvis_ai_assistant-0.1.121}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.119",
+    version="0.1.121",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.1.119 → jarvis_ai_assistant-0.1.121}/src/jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.119" 
+__version__ = "0.1.121" 

{jarvis_ai_assistant-0.1.119 → jarvis_ai_assistant-0.1.121}/src/jarvis/jarvis_agent/__init__.py

@@ -222,7 +222,7 @@ Please continue the task based on the above information.
             if handler.can_handle(response):
                 tool_list.append(handler)
         if len(tool_list) > 1:
-            PrettyOutput.print(f"操作失败：检测到多个操作。一次只能执行一个操作。尝试执行的操作：{', '.join([handler.name() for handler in tool_list])}", OutputType.ERROR)
+            PrettyOutput.print(f"操作失败：检测到多个操作。一次只能执行一个操作。尝试执行的操作：{', '.join([handler.name() for handler in tool_list])}", OutputType.WARNING)
             return False, f"Action failed: Multiple actions detected. Please only perform one action at a time. Actions attempted: {', '.join([handler.name() for handler in tool_list])}"
         if len(tool_list) == 0:
             return False, ""
@@ -376,7 +376,7 @@ def _load_tasks() -> dict:
                     if desc:  # Ensure description is not empty
                         tasks[str(name)] = str(desc)
             else:
-                PrettyOutput.print("警告: ~/.jarvis/pre-command 文件应该包含一个字典，键为任务名称，值为任务描述", OutputType.ERROR)
+                PrettyOutput.print("警告: ~/.jarvis/pre-command 文件应该包含一个字典，键为任务名称，值为任务描述", OutputType.WARNING)
         except Exception as e:
             PrettyOutput.print(f"加载 ~/.jarvis/pre-command 文件失败: {str(e)}", OutputType.ERROR)
     
@@ -392,7 +392,7 @@ def _load_tasks() -> dict:
                     if desc:  # Ensure description is not empty
                         tasks[str(name)] = str(desc)
             else:
-                PrettyOutput.print("警告: .jarvis/pre-command 文件应该包含一个字典，键为任务名称，值为任务描述", OutputType.ERROR)
+                PrettyOutput.print("警告: .jarvis/pre-command 文件应该包含一个字典，键为任务名称，值为任务描述", OutputType.WARNING)
         except Exception as e:
             PrettyOutput.print(f"加载 .jarvis/pre-command 文件失败: {str(e)}", OutputType.ERROR)
 

{jarvis_ai_assistant-0.1.119 → jarvis_ai_assistant-0.1.121}/src/jarvis/jarvis_code_agent/file_select.py

@@ -231,7 +231,7 @@ def file_input_handler(user_input: str, agent: Any) -> str:
     file_refs = re.findall(r'`([^`]+)`', user_input)
     
     for ref in file_refs:
-        # Handle file:start,end format
+        # Handle file:start,end or file:start:end format
         if ':' in ref:
             file_path, line_range = ref.split(':', 1)
             # Initialize with default values
@@ -239,9 +239,9 @@ def file_input_handler(user_input: str, agent: Any) -> str:
             end_line = -1
             
             # Process line range if specified
-            if ',' in line_range:
+            if ',' in line_range or ':' in line_range:
                 try:
-                    raw_start, raw_end = map(int, line_range.split(','))
+                    raw_start, raw_end = map(int, re.split(r'[,:]', line_range))
                     
                     # Handle special values and Python-style negative indices
                     with open(file_path, 'r', encoding='utf-8') as f:

{jarvis_ai_assistant-0.1.119 → jarvis_ai_assistant-0.1.121}/src/jarvis/jarvis_code_agent/patch.py

@@ -21,23 +21,20 @@ class PatchOutputHandler(OutputHandler):
     
     def prompt(self) -> str:
         return """
-# 📝 Code Modification Format
-Use specific blocks for different operations:
-
 # 🔄 REPLACE: Modify existing code
 <REPLACE>
 File: path/to/file
 Lines: [start,end] or [start,end)
------
-new_content
+[new content]
+...
 </REPLACE>
 
 # ➕ INSERT: Add new code
 <INSERT>
 File: path/to/file
 Line: position
------
-new_content
+[new content]
+...
 </INSERT>
 
 # 🗑️ DELETE: Remove existing code
@@ -49,8 +46,8 @@ Lines: [start,end] or [start,end)
 # 🆕 NEW_FILE: Create new file
 <NEW_FILE>
 File: path/to/file
------
-new_content
+[new content]
+...
 </NEW_FILE>
 
 # ➡️ MOVE_FILE: Relocate a file
@@ -77,7 +74,6 @@ File: path/to/file
    - Omit for NEW_FILE/REMOVE_FILE
 
 3. Content
-   - Use "-----" separator
    - Maintain original indentation
    - Follow existing code style
 
@@ -86,7 +82,6 @@ File: path/to/file
 <REPLACE>
 File: src/utils.py
 Lines: [9,13]
------
 def updated_function():
     # Replaces lines 9-13 inclusive
     return "new_implementation"
@@ -96,7 +91,6 @@ def updated_function():
 <REPLACE>
 File: src/calculator.py
 Lines: [5,8)
------
 def new_calculation():
     # Replaces lines 5-7 (excludes line 8)
     return 42
@@ -106,7 +100,6 @@ def new_calculation():
 <INSERT>
 File: src/main.py
 Line: 19
------
     # Inserted before line 19
     new_feature()
 </INSERT>
@@ -114,7 +107,6 @@ Line: 19
 ## NEW_FILE Example
 <NEW_FILE>
 File: src/new_module.py
------
 # New file creation
 def feature_entry():
     pass
@@ -146,6 +138,37 @@ File: src/obsolete.py
 6. Handle edge cases properly
 7. Include error handling
 8. Maintain code consistency
+
+# 🚫 Invalid Format Examples
+## BAD EXAMPLE 1 - Do not use diff format
+<REPLACE>
+File: src/file.py
+Lines: [5,8)
+- old_line_1
++ new_line_1
+</REPLACE>
+
+## BAD EXAMPLE 2 - Do not include previous and new tags
+<REPLACE>
+File: src/file.py
+Lines: [10,12]
+<PREVIOUS>
+old_code
+</PREVIOUS>
+<NEW>
+new_code
+</NEW>
+</REPLACE>
+
+## BAD EXAMPLE 3 - Do not use comment to explain
+<REPLACE>
+File: src/file.py
+Lines: [15,18]
+# Replace the following code
+old_function()
+# With the new implementation
+new_function()
+</REPLACE>
 """
 
 
@@ -172,13 +195,13 @@ def _parse_patch(patch_str: str) -> Dict[str, List[Dict[str, Any]]]:
         if patch_type in ['REPLACE', 'DELETE']:
             # 增强正则表达式兼容性
             line_match = re.match(
-                r"^Lines:\s*\[\s*(\d+)\s*,\s*(\d+)\s*([\]\)])\s*$",  # 匹配行尾
+                r"^Lines:\s*\[\s*(\d+)\s*(?:,\s*(\d+)\s*)?([\]\)])\s*$",  # 支持单数字格式
                 lines[1].strip(),  # 去除前后空格
                 re.IGNORECASE
             )
             if line_match:
                 start_line = int(line_match.group(1))
-                end_value = int(line_match.group(2))
+                end_value = int(line_match.group(2) or line_match.group(1))  # 第二个数字不存在时使用第一个
                 bracket_type = line_match.group(3).strip()
                 
                 # 根据括号类型处理区间
@@ -204,9 +227,21 @@ def _parse_patch(patch_str: str) -> Dict[str, List[Dict[str, Any]]]:
             else:
                 continue
         
-        # Get content (after separator)
-        separator_index = next((i for i, line in enumerate(lines) if line.strip() == "-----"), -1)
-        content = '\n'.join(lines[separator_index + 1:]) if separator_index != -1 else ''
+        # Get content (after metadata)
+        if patch_type in ['REPLACE', 'DELETE']:
+            content_start = 2  # File + Lines
+        elif patch_type == 'INSERT':
+            content_start = 2   # File + Line
+        elif patch_type == 'NEW_FILE':
+            content_start = 1   # File
+        elif patch_type == 'MOVE_FILE':
+            content_start = 2   # File + NewPath
+        elif patch_type == 'REMOVE_FILE':
+            content_start = 1   # File
+        
+        content_lines = lines[content_start:]
+        # 保留原始缩进和空行
+        content = '\n'.join(content_lines).rstrip('\n') + '\n'  # 保留末尾换行
 
         if filepath not in result:
             result[filepath] = []
@@ -257,7 +292,8 @@ def apply_patch(output_str: str) -> str:
             continue
 
     if has_uncommitted_changes():
-        if handle_commit_workflow():
+        diff = get_diff()
+        if handle_commit_workflow(diff):
             ret += "Successfully applied the patch\n"
             # Get modified line ranges
             modified_ranges = get_modified_line_ranges()
@@ -266,25 +302,27 @@ def apply_patch(output_str: str) -> str:
                 ret += "New code:\n"
                 ret += modified_code["stdout"]
         else:
-            ret += "User rejected the patch"
-        user_input = get_multiline_input("你可以继续输入: ")
+            ret += "User rejected the patch\nThis is your patch preview:\n"
+            ret += diff
+        user_input = get_multiline_input("你可以继续输入（输入空行重试，Ctrl+C退出）: ")
         if user_input:
             ret += "\n" + user_input
         else:
-            return ""
+            ret += "Please check the patch again"
 
     return ret  # Ensure a string is always returned
-    
-def handle_commit_workflow()->bool:
+
+def get_diff()->str:
+    os.system("git add .")
+    diff = os.popen("git diff HEAD").read()
+    os.system("git reset HEAD")
+    return diff
+def handle_commit_workflow(diff:str)->bool:
     """Handle the git commit workflow and return the commit details.
     
     Returns:
         tuple[bool, str, str]: (continue_execution, commit_id, commit_message)
     """
-    os.system("git add .")
-    diff = os.popen("git diff HEAD").read()
-    os.system("git reset HEAD")
-    PrettyOutput.print(diff, OutputType.CODE, lang="diff")
     if not user_confirm("是否要提交代码？", default=True):
         os.system("git reset HEAD")
         os.system("git checkout -- .")
@@ -300,7 +338,7 @@ def get_modified_line_ranges() -> Dict[str, Tuple[int, int]]:
     
     Returns:
         Dictionary mapping file paths to tuple with (start_line, end_line) ranges
-        for modified sections. Line numbers are 0-based.
+        for modified sections. Line numbers are 1-based.
     """
     # Get git diff for all files
     diff_output = os.popen("git show").read()
@@ -319,13 +357,12 @@ def get_modified_line_ranges() -> Dict[str, Tuple[int, int]]:
         # Match lines like "@@ -100,5 +100,7 @@" where the + part shows new lines
         range_match = re.match(r"^@@ -\d+(?:,\d+)? \+(\d+)(?:,(\d+))? @@", line)
         if range_match and current_file:
-            start_line = int(range_match.group(1)) - 1  # Convert to 0-based
+            start_line = int(range_match.group(1))  # Keep as 1-based
             line_count = int(range_match.group(2)) if range_match.group(2) else 1
-            end_line = start_line + line_count
+            end_line = start_line + line_count - 1
             result[current_file] = (start_line, end_line)
     
     return result
-
 # New handler functions below ▼▼▼
 
 def handle_move_file(filepath: str, patch: Dict[str, Any]):
@@ -364,7 +401,10 @@ def handle_code_operation(filepath: str, patch: Dict[str, Any]):
     end_line = patch.get('end_line', 0)
     new_content = patch.get('content', '').splitlines(keepends=True)
 
-    PrettyOutput.print(f"patch_type: {patch_type}\nstart_line: {start_line}\nend_line: {end_line}\nnew_content:\n{new_content}", OutputType.INFO)
+    if not new_content:
+        new_content = ['']
+
+    PrettyOutput.print(f"patch_type: {patch_type}\nstart_line: {start_line}\nend_line: {end_line}\nnew_content:\n{''.join(new_content)}", OutputType.INFO)
 
     if new_content and new_content[-1] and new_content[-1][-1] != '\n':
         new_content[-1] += '\n'

{jarvis_ai_assistant-0.1.119 → jarvis_ai_assistant-0.1.121}/src/jarvis/jarvis_codebase/main.py

@@ -336,7 +336,7 @@ Content: {content}
                 vectors = np.vstack(vectors)
                 if len(vectors) != len(ids):
                     PrettyOutput.print(f"向量数量不匹配: {len(vectors)} 个向量 vs {len(ids)} 个ID", 
-                                     output_type=OutputType.ERROR)
+                                     output_type=OutputType.WARNING)
                     self.index = None
                     return
                     
@@ -441,7 +441,7 @@ Content: {content}
                     output_lines.append("删除的文件:")
                     output_lines.extend(f"  {f}" for f in deleted_files)
                 
-                PrettyOutput.print("\n".join(output_lines), output_type=OutputType.WARNING)
+                PrettyOutput.print("\n".join(output_lines), output_type=OutputType.INFO)
 
                 # If force is True, continue directly
                 if not force:

{jarvis_ai_assistant-0.1.119 → jarvis_ai_assistant-0.1.121}/src/jarvis/jarvis_lsp/registry.py

@@ -59,8 +59,8 @@ class LSPRegistry:
         
         if missing_methods:
             PrettyOutput.print(
-                f"LSP {lsp_class.__name__} is missing necessary methods: {', '.join(missing_methods)}", 
-                OutputType.ERROR
+                f"LSP {lsp_class.__name__} 缺少必要的方法: {', '.join(missing_methods)}", 
+                OutputType.WARNING
             )
             return False
             
@@ -72,7 +72,7 @@ class LSPRegistry:
         lsp_servers = {}
         
         if not os.path.exists(directory):
-            PrettyOutput.print(f"LSP 目录不存在: {directory}", OutputType.ERROR)
+            PrettyOutput.print(f"LSP 目录不存在: {directory}", OutputType.WARNING)
             return lsp_servers
             
         package_name = None
@@ -138,7 +138,7 @@ class LSPRegistry:
     def create_lsp(self, language: str) -> Optional[BaseLSP]:
         """Create LSP instance for specified language."""
         if language not in self.lsp_servers:
-            PrettyOutput.print(f"没有找到 LSP 支持的语言: {language}", OutputType.ERROR)
+            PrettyOutput.print(f"没有找到 LSP 支持的语言: {language}", OutputType.WARNING)
             return None
             
         try:
@@ -186,11 +186,11 @@ def main():
     lsp = registry.create_lsp(args.language)
     
     if not lsp:
-        PrettyOutput.print(f"没有 LSP 支持的语言: {args.language}", OutputType.ERROR)
+        PrettyOutput.print(f"没有 LSP 支持的语言: {args.language}", OutputType.WARNING)
         return 1
         
     if not lsp.initialize(os.path.dirname(os.path.abspath(args.file))):
-        PrettyOutput.print("LSP 初始化失败", OutputType.ERROR)
+        PrettyOutput.print("LSP 初始化失败", OutputType.WARNING)
         return 1
     
     try:
@@ -208,7 +208,7 @@ def main():
                 
         elif args.action in ('references', 'definition'):
             if args.line is None or args.character is None:
-                PrettyOutput.print("需要行和字符位置用于 references/definition", OutputType.ERROR)
+                PrettyOutput.print("需要行和字符位置用于 references/definition", OutputType.WARNING)
                 return 1
                 
             if args.action == 'references':

{jarvis_ai_assistant-0.1.119 → jarvis_ai_assistant-0.1.121}/src/jarvis/jarvis_platform/ai8.py

@@ -60,12 +60,12 @@ class AI8Model(BasePlatform):
             )
             
             if response.status_code != 200:
-                PrettyOutput.print(f"创建会话失败: {response.status_code}", OutputType.ERROR)
+                PrettyOutput.print(f"创建会话失败: {response.status_code}", OutputType.WARNING)
                 return False
             
             data = response.json()
             if data['code'] != 0:
-                PrettyOutput.print(f"创建会话失败: {data.get('msg', '未知错误')}", OutputType.ERROR)
+                PrettyOutput.print(f"创建会话失败: {data.get('msg', '未知错误')}", OutputType.WARNING)
                 return False
             
             self.conversation = data['data']
@@ -93,10 +93,10 @@ class AI8Model(BasePlatform):
                     self.conversation = data['data']
                     return True
                 else:
-                    PrettyOutput.print(f"更新会话设置失败: {data.get('msg', '未知错误')}", OutputType.ERROR)
+                    PrettyOutput.print(f"更新会话设置失败: {data.get('msg', '未知错误')}", OutputType.WARNING)
                     return False
             else:
-                PrettyOutput.print(f"更新会话设置失败: {response.status_code}", OutputType.ERROR)
+                PrettyOutput.print(f"更新会话设置失败: {response.status_code}", OutputType.WARNING)
                 return False
             
         except Exception as e:
@@ -162,7 +162,7 @@ class AI8Model(BasePlatform):
             
             if response.status_code != 200:
                 error_msg = f"Failed to chat: {response.status_code} {response.text}"
-                PrettyOutput.print(error_msg, OutputType.ERROR)
+                PrettyOutput.print(error_msg, OutputType.WARNING)
                 raise Exception(error_msg)
             
             # 处理流式响应
@@ -229,11 +229,11 @@ class AI8Model(BasePlatform):
                     return True
                 else:
                     error_msg = f"删除会话失败: {data.get('msg', '未知错误')}"
-                    PrettyOutput.print(error_msg, OutputType.ERROR)
+                    PrettyOutput.print(error_msg, OutputType.WARNING)
                     return False
             else:
                 error_msg = f"删除会话请求失败: {response.status_code}"
-                PrettyOutput.print(error_msg, OutputType.ERROR)
+                PrettyOutput.print(error_msg, OutputType.WARNING)
                 return False
             
         except Exception as e:
@@ -265,12 +265,12 @@ class AI8Model(BasePlatform):
             )
             
             if response.status_code != 200:
-                PrettyOutput.print(f"获取模型列表失败: {response.status_code}", OutputType.ERROR)
+                PrettyOutput.print(f"获取模型列表失败: {response.status_code}", OutputType.WARNING)
                 return []
             
             data = response.json()
             if data['code'] != 0:
-                PrettyOutput.print(f"获取模型列表失败: {data.get('msg', '未知错误')}", OutputType.ERROR)
+                PrettyOutput.print(f"获取模型列表失败: {data.get('msg', '未知错误')}", OutputType.WARNING)
                 return []
             
             # 保存模型信息
@@ -309,6 +309,6 @@ class AI8Model(BasePlatform):
             return list(self.models.keys())
             
         except Exception as e:
-            PrettyOutput.print(f"获取模型列表失败: {str(e)}", OutputType.WARNING)
+            PrettyOutput.print(f"获取模型列表失败: {str(e)}", OutputType.ERROR)
             return []
         

{jarvis_ai_assistant-0.1.119 → jarvis_ai_assistant-0.1.121}/src/jarvis/jarvis_platform/base.py

@@ -45,9 +45,22 @@ class BasePlatform(ABC):
             duration = end_time - start_time
             char_count = len(response)
             
+            # Calculate token count and tokens per second
+            try:
+                from jarvis.jarvis_utils import get_context_token_count
+                token_count = get_context_token_count(response)
+                tokens_per_second = token_count / duration if duration > 0 else 0
+            except Exception as e:
+                PrettyOutput.print(f"Tokenization failed: {str(e)}", OutputType.WARNING)
+                token_count = 0
+                tokens_per_second = 0
+
             # Print statistics
-            PrettyOutput.print(f"对话完成 - 耗时: {duration:.2f}秒, 输出字符数: {char_count}", OutputType.INFO)
-            
+            PrettyOutput.print(
+                f"对话完成 - 耗时: {duration:.2f}秒, 输出字符数: {char_count}, 输出Token数量: {token_count}, 每秒Token数量: {tokens_per_second:.2f}",
+                OutputType.INFO,
+            )
+
             # Keep original think tag handling
             response = re.sub(r'<<think>>.*?</</think>>', '', response, flags=re.DOTALL)
             return response

{jarvis_ai_assistant-0.1.119 → jarvis_ai_assistant-0.1.121}/src/jarvis/jarvis_platform/kimi.py

@@ -198,11 +198,11 @@ class KimiModel(BasePlatform):
                         if self._wait_for_parse(file_info["id"]):
                             uploaded_files.append(file_info)
                         else:
-                            PrettyOutput.print(f"✗ 文件解析失败: {file_path}", OutputType.ERROR)
+                            PrettyOutput.print(f"✗ 文件解析失败: {file_path}", OutputType.WARNING)
                     else:
                         uploaded_files.append(file_info)
                 else:
-                    PrettyOutput.print(f"错误：文件上传失败: {file_path}", OutputType.ERROR)
+                    PrettyOutput.print(f"错误：文件上传失败: {file_path}", OutputType.WARNING)
                     
             except Exception as e:
                 PrettyOutput.print(f"✗ 处理文件出错 {file_path}: {str(e)}", OutputType.ERROR)
@@ -375,7 +375,7 @@ class KimiModel(BasePlatform):
                 self.reset()
                 return True
             else:
-                PrettyOutput.print(f"删除会话失败: HTTP {response.status_code}", OutputType.ERROR)
+                PrettyOutput.print(f"删除会话失败: HTTP {response.status_code}", OutputType.WARNING)
                 return False
         except Exception as e:
             PrettyOutput.print(f"删除会话时发生错误: {str(e)}", OutputType.ERROR)

{jarvis_ai_assistant-0.1.119 → jarvis_ai_assistant-0.1.121}/src/jarvis/jarvis_platform/oyi.py

@@ -83,10 +83,10 @@ class OyiModel(BasePlatform):
                     self.conversation = data
                     return True
                 else:
-                    PrettyOutput.print(f"创建会话失败: {data['message']}", OutputType.ERROR)
+                    PrettyOutput.print(f"创建会话失败: {data['message']}", OutputType.WARNING)
                     return False
             else:
-                PrettyOutput.print(f"创建会话失败: {response.status_code}", OutputType.ERROR)
+                PrettyOutput.print(f"创建会话失败: {response.status_code}", OutputType.WARNING)
                 return False
                 
         except Exception as e:
@@ -157,13 +157,13 @@ class OyiModel(BasePlatform):
             
             if response.status_code != 200:
                 error_msg = f"聊天请求失败: {response.status_code}"
-                PrettyOutput.print(error_msg, OutputType.ERROR)
+                PrettyOutput.print(error_msg, OutputType.WARNING)
                 raise Exception(error_msg)
             
             data = response.json()
             if data['code'] != 200 or data['type'] != 'success':
                 error_msg = f"聊天失败: {data.get('message', '未知错误')}"
-                PrettyOutput.print(error_msg, OutputType.ERROR)
+                PrettyOutput.print(error_msg, OutputType.WARNING)
                 raise Exception(error_msg)
             
             message_id = data['result'][-1]
@@ -196,7 +196,7 @@ class OyiModel(BasePlatform):
                 return full_response
             else:
                 error_msg = f"获取响应失败: {response.status_code}"
-                PrettyOutput.print(error_msg, OutputType.ERROR)
+                PrettyOutput.print(error_msg, OutputType.WARNING)
                 raise Exception(error_msg)
         except Exception as e:
             PrettyOutput.print(f"聊天失败: {str(e)}", OutputType.ERROR)
@@ -241,11 +241,11 @@ class OyiModel(BasePlatform):
                     return True
                 else:
                     error_msg = f"删除会话失败: {data.get('message', '未知错误')}"
-                    PrettyOutput.print(error_msg, OutputType.ERROR)
+                    PrettyOutput.print(error_msg, OutputType.WARNING)
                     return False
             else:
                 error_msg = f"删除会话请求失败: {response.status_code}"
-                PrettyOutput.print(error_msg, OutputType.ERROR)
+                PrettyOutput.print(error_msg, OutputType.WARNING)
                 return False
             
         except Exception as e:
@@ -281,7 +281,7 @@ class OyiModel(BasePlatform):
                 # 检查文件类型
                 file_type = mimetypes.guess_type(file_path)[0]
                 if not file_type or not file_type.startswith(('image/', 'text/', 'application/')):
-                    PrettyOutput.print(f"文件类型 {file_type} 不支持", OutputType.ERROR)
+                    PrettyOutput.print(f"文件类型 {file_type} 不支持", OutputType.WARNING)
                     continue
                 
                 with open(file_path, 'rb') as f:
@@ -300,10 +300,10 @@ class OyiModel(BasePlatform):
                         if data.get('code') == 200:
                             self.files.append(data)
                         else:
-                            PrettyOutput.print(f"文件上传失败: {data.get('message')}", OutputType.ERROR)
+                            PrettyOutput.print(f"文件上传失败: {data.get('message')}", OutputType.WARNING)
                             return []
                     else:
-                        PrettyOutput.print(f"文件上传失败: {response.status_code}", OutputType.ERROR)
+                        PrettyOutput.print(f"文件上传失败: {response.status_code}", OutputType.WARNING)
                         return []
                 
             return self.files
@@ -335,7 +335,7 @@ class OyiModel(BasePlatform):
             )
             
             if response.status_code != 200:
-                PrettyOutput.print(f"获取模型列表失败: {response.status_code}", OutputType.ERROR)
+                PrettyOutput.print(f"获取模型列表失败: {response.status_code}", OutputType.WARNING)
                 return []
             
             data = response.json()

{jarvis_ai_assistant-0.1.119 → jarvis_ai_assistant-0.1.121}/src/jarvis/jarvis_platform/registry.py

@@ -72,7 +72,7 @@ class PlatformRegistry:
         if missing_methods:
             PrettyOutput.print(
                 f"平台 {platform_class.__name__} 缺少必要的方法: {', '.join(missing_methods)}", 
-                OutputType.ERROR
+                OutputType.WARNING
             )
             return False
             
@@ -92,7 +92,7 @@ class PlatformRegistry:
         
         # 确保目录存在
         if not os.path.exists(directory):
-            PrettyOutput.print(f"平台目录不存在: {directory}", OutputType.ERROR)
+            PrettyOutput.print(f"平台目录不存在: {directory}", OutputType.WARNING)
             return platforms
             
         # 获取目录的包名
@@ -201,7 +201,7 @@ class PlatformRegistry:
             BasePlatform: Platform instance
         """
         if name not in self.platforms:
-            PrettyOutput.print(f"未找到平台: {name}", OutputType.ERROR)
+            PrettyOutput.print(f"未找到平台: {name}", OutputType.WARNING)
             return None
             
         try:

{jarvis_ai_assistant-0.1.119 → jarvis_ai_assistant-0.1.121}/src/jarvis/jarvis_platform_manager/main.py

@@ -55,7 +55,7 @@ def chat_with_model(platform_name: str, model_name: str):
     # Create platform instance
     platform = registry.create_platform(platform_name)
     if not platform:
-        PrettyOutput.print(f"创建平台 {platform_name} 失败", OutputType.ERROR)
+        PrettyOutput.print(f"创建平台 {platform_name} 失败", OutputType.WARNING)
         return
     
     try:
@@ -108,7 +108,7 @@ def chat_with_model(platform_name: str, model_name: str):
 # Helper function for platform and model validation
 def validate_platform_model(args):
     if not args.platform or not args.model:
-        PrettyOutput.print("请指定平台和模型。使用 'jarvis info' 查看可用平台和模型。", OutputType.ERROR)
+        PrettyOutput.print("请指定平台和模型。使用 'jarvis info' 查看可用平台和模型。", OutputType.WARNING)
         return False
     return True
 

{jarvis_ai_assistant-0.1.119 → jarvis_ai_assistant-0.1.121}/src/jarvis/jarvis_tools/ask_codebase.py

@@ -89,7 +89,7 @@ def main():
     if result["success"]:
         PrettyOutput.print(result["stdout"], OutputType.INFO, lang="markdown")
     else:
-        PrettyOutput.print(result["stderr"], OutputType.ERROR)
+        PrettyOutput.print(result["stderr"], OutputType.WARNING)
         
 
 if __name__ == "__main__":

{jarvis_ai_assistant-0.1.119 → jarvis_ai_assistant-0.1.121}/src/jarvis/jarvis_tools/code_review.py

@@ -241,7 +241,7 @@ def main():
         PrettyOutput.print(report, OutputType.SUCCESS, lang="yaml")
         
     else:
-        PrettyOutput.print(result["stderr"], OutputType.ERROR)
+        PrettyOutput.print(result["stderr"], OutputType.WARNING)
 
 if __name__ == "__main__":
     main()

{jarvis_ai_assistant-0.1.119 → jarvis_ai_assistant-0.1.121}/src/jarvis/jarvis_tools/create_code_agent.py

@@ -109,7 +109,7 @@ def main():
     if result["success"]:
         PrettyOutput.print(result["stdout"], OutputType.SUCCESS)
     else:
-        PrettyOutput.print(result["stderr"], OutputType.ERROR)
+        PrettyOutput.print(result["stderr"], OutputType.WARNING)
 
 if __name__ == "__main__":
     main()

{jarvis_ai_assistant-0.1.119 → jarvis_ai_assistant-0.1.121}/src/jarvis/jarvis_tools/git_commiter.py

@@ -1,9 +1,9 @@
 import os
 import re
 import shlex
+import subprocess
 from typing import Dict, Any
 import tempfile
-
 import yaml
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils import OutputType, PrettyOutput, has_uncommitted_changes, init_env
@@ -27,7 +27,13 @@ class GitCommitTool:
         return "<<FORMAT VIOLATION>> Invalid commit message structure"
     
     def _get_last_commit_hash(self):
-        return os.popen("git log -1 --pretty=%H").read().strip()
+        process = subprocess.Popen(
+            ["git", "log", "-1", "--pretty=%H"],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE
+        )
+        stdout, _ = process.communicate()
+        return stdout.decode().strip()
 
     def execute(self, args: Dict) -> Dict[str, Any]:
         """Execute automatic commit process with support for multi-line messages and special characters"""
@@ -37,10 +43,19 @@ class GitCommitTool:
                 return {"success": True, "stdout": "No changes to commit", "stderr": ""}
             
             PrettyOutput.print("准备添加文件到提交...", OutputType.SYSTEM)
-            os.system("git add .")
+            subprocess.Popen(
+                ["git", "add", "."],
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL
+            ).wait()
             
             PrettyOutput.print("获取差异...", OutputType.SYSTEM)
-            diff = os.popen("git diff --cached --exit-code").read()
+            process = subprocess.Popen(
+                ["git", "diff", "--cached", "--exit-code"],
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE
+            )
+            diff = process.communicate()[0].decode()
             PrettyOutput.print(diff, OutputType.CODE, lang="diff")
             
             prompt = f'''Generate commit message with the paranoia of someone who's lost production data:
@@ -69,7 +84,7 @@ YOU MUST USE EXACTLY THIS FORMAT:
             
             PrettyOutput.print("生成提交消息...", OutputType.SYSTEM)
             platform = PlatformRegistry().get_codegen_platform()
-            # platform.set_suppress_output(True)
+            platform.set_suppress_output(True)
             commit_message = platform.chat_until_success(prompt)
             commit_message = self._extract_commit_message(commit_message)
             
@@ -77,9 +92,13 @@ YOU MUST USE EXACTLY THIS FORMAT:
             with tempfile.NamedTemporaryFile(mode='w', delete=True) as tmp_file:
                 tmp_file.write(commit_message)
                 tmp_file.flush()  # 确保内容写入文件
-                commit_cmd = f"git commit -F {tmp_file.name}"
+                commit_cmd = ["git", "commit", "-F", tmp_file.name]
                 PrettyOutput.print("提交...", OutputType.INFO)
-                os.system(commit_cmd)
+                subprocess.Popen(
+                    commit_cmd,
+                    stdout=subprocess.DEVNULL,
+                    stderr=subprocess.DEVNULL
+                ).wait()
 
             commit_hash = self._get_last_commit_hash()
             PrettyOutput.print(f"提交哈希: {commit_hash}\n提交消息: {commit_message}", OutputType.SUCCESS)

{jarvis_ai_assistant-0.1.119 → jarvis_ai_assistant-0.1.121}/src/jarvis/jarvis_tools/rag.py

@@ -135,7 +135,7 @@ def main():
     if result["success"]:
         PrettyOutput.print(f"{result['stdout']}", OutputType.INFO, lang="markdown")
     else:
-        PrettyOutput.print(result["stderr"], OutputType.ERROR)
+        PrettyOutput.print(result["stderr"], OutputType.WARNING)
 
 if __name__ == "__main__":
     main() 

{jarvis_ai_assistant-0.1.119 → jarvis_ai_assistant-0.1.121}/src/jarvis/jarvis_utils/__init__.py

@@ -23,9 +23,11 @@ import psutil
 from rich.console import Console
 from rich.theme import Theme
 from rich.panel import Panel
+from rich.box import HEAVY
 from rich.text import Text
 from rich.traceback import install as install_rich_traceback
 from rich.syntax import Syntax
+from rich.style import Style as RichStyle
 
 from prompt_toolkit.completion import Completer, Completion, PathCompleter
 from prompt_toolkit.document import Document
@@ -45,18 +47,18 @@ install_rich_traceback()
 
 # Create console with custom theme
 custom_theme = Theme({
-    "info": "yellow",
-    "warning": "yellow",
-    "error": "red",
-    "success": "green",
-    "system": "cyan",
-    "code": "green",
-    "result": "blue",
-    "planning": "magenta",
-    "progress": "white",
-    "debug": "blue",
-    "user": "green",
-    "tool": "yellow",
+    "INFO": "yellow",
+    "WARNING": "yellow",
+    "ERROR": "red",
+    "SUCCESS": "green",
+    "SYSTEM": "cyan",
+    "CODE": "green",
+    "RESULT": "blue",
+    "PLANNING": "magenta",
+    "PROGRESS": "white",
+    "DEBUG": "blue",
+    "USER": "green",
+    "TOOL": "yellow",
 })
 
 console = Console(theme=custom_theme)
@@ -76,7 +78,7 @@ def set_agent(agent_name: str, agent: Any):
     current_agent_name = agent_name
 
 def get_agent_list():
-    return "[" + str(len(global_agents)) + "]" + current_agent_name if global_agents else "No Agent"
+    return "[" + str(len(global_agents)) + "]" + current_agent_name if global_agents else ""
 
 def delete_agent(agent_name: str):
     if agent_name in global_agents:
@@ -85,18 +87,18 @@ def delete_agent(agent_name: str):
         current_agent_name = ""
 
 class OutputType(Enum):
-    SYSTEM = "system"      # AI assistant message
-    CODE = "code"         # Code related
-    RESULT = "result"     # Tool execution result
-    ERROR = "error"       # Error information
-    INFO = "info"         # System prompt
-    PLANNING = "planning" # Task planning
-    PROGRESS = "progress" # Execution progress
-    SUCCESS = "success"   # Success information
-    WARNING = "warning"   # Warning information
-    DEBUG = "debug"       # Debug information
-    USER = "user"         # User input
-    TOOL = "tool"         # Tool call
+    SYSTEM = "SYSTEM"      # AI assistant message
+    CODE = "CODE"         # Code related
+    RESULT = "RESULT"     # Tool execution result
+    ERROR = "ERROR"       # Error information
+    INFO = "INFO"         # System prompt
+    PLANNING = "PLANNING" # Task planning
+    PROGRESS = "PROGRESS" # Execution progress
+    SUCCESS = "SUCCESS"   # Success information
+    WARNING = "WARNING"   # Warning information
+    DEBUG = "DEBUG"       # Debug information
+    USER = "USER"         # User input
+    TOOL = "TOOL"         # Tool call
 
 class PrettyOutput:
     """Pretty output using rich"""
@@ -164,18 +166,18 @@ class PrettyOutput:
             return default_lang
 
     @staticmethod
-    def _format(text: str, output_type: OutputType, timestamp: bool = True) -> Text:
+    def _format(output_type: OutputType, timestamp: bool = True) -> Text:
         """Format output text using rich Text"""
         # Create rich Text object
         formatted = Text()
         
         # Add timestamp and agent info
         if timestamp:
-            formatted.append(f"[{datetime.now().strftime('%H:%M:%S')}] ", style="white")
-        formatted.append(f"{get_agent_list()}", style="blue")
+            formatted.append(f"[{datetime.now().strftime('%H:%M:%S')}][{output_type.value}]", style=output_type.value)
+        formatted.append(f"[{get_agent_list()}]", style="blue")
         # Add icon
         icon = PrettyOutput._ICONS.get(output_type, "")
-        formatted.append(f"{icon} ", style=output_type.value)
+        formatted.append(f" {icon} ", style=output_type.value)
         
         return formatted
 
@@ -190,27 +192,88 @@ class PrettyOutput:
             lang: Language for syntax highlighting
             traceback: Whether to show traceback for errors
         """
-        from rich.style import Style as RichStyle
+        
         
         # Define styles for different output types
         styles = {
-            OutputType.SYSTEM: RichStyle(color="cyan", bold=True),
-            OutputType.CODE: RichStyle(color="green"),
-            OutputType.RESULT: RichStyle(color="blue"),
-            OutputType.ERROR: RichStyle(color="red", bold=True),
-            OutputType.INFO: RichStyle(color="yellow"),
-            OutputType.PLANNING: RichStyle(color="magenta"),
-            OutputType.PROGRESS: RichStyle(color="white"),
-            OutputType.SUCCESS: RichStyle(color="green", bold=True),
-            OutputType.WARNING: RichStyle(color="yellow", bold=True),
-            OutputType.DEBUG: RichStyle(color="blue", dim=True),
-            OutputType.USER: RichStyle(color="green"),
-            OutputType.TOOL: RichStyle(color="yellow", italic=True)
+            OutputType.SYSTEM: RichStyle(
+                color="bright_cyan", 
+                italic=True,
+                bold=True, 
+            ),
+            OutputType.CODE: RichStyle(
+                color="green", 
+                italic=True,
+                bgcolor="#1a1a1a",
+                frame=True
+            ),
+            OutputType.RESULT: RichStyle(
+                color="bright_blue",
+                bold=True,
+                italic=True,
+                overline=True,
+                bgcolor="navy_blue"
+            ),
+            OutputType.ERROR: RichStyle(
+                color="red", 
+                bold=True,
+                italic=True,
+                blink=True,
+                bgcolor="dark_red",
+            ),
+            OutputType.INFO: RichStyle(
+                color="gold1",
+                dim=True,
+                bgcolor="grey11",
+                italic=True
+            ),
+            OutputType.PLANNING: RichStyle(
+                color="purple", 
+                italic=True,
+                bold=True,
+            ),
+            OutputType.PROGRESS: RichStyle(
+                color="white", 
+                encircle=True,
+                italic=True,
+            ),
+            OutputType.SUCCESS: RichStyle(
+                color="bright_green", 
+                bold=True,
+                strike=False,
+                meta={"icon": "✓"},
+                italic=True
+            ),
+            OutputType.WARNING: RichStyle(
+                color="yellow", 
+                bold=True,
+                blink2=True,
+                bgcolor="dark_orange",
+                italic=True
+            ),
+            OutputType.DEBUG: RichStyle(
+                color="grey58",
+                dim=True,
+                italic=True,
+                conceal=True
+            ),
+            OutputType.USER: RichStyle(
+                color="spring_green2",
+                reverse=True,
+                frame=True,
+                italic=True
+            ),
+            OutputType.TOOL: RichStyle(
+                color="dark_sea_green4",
+                italic=True,
+                bgcolor="grey19",
+                overline=True
+            )
         }
         
         # Get formatted header
         lang = lang if lang is not None else PrettyOutput._detect_language(text, default_lang='markdown')
-        header = PrettyOutput._format("", output_type, timestamp)
+        header = PrettyOutput._format(output_type, timestamp)
         
         # Create syntax highlighted content
         content = Syntax(
@@ -218,7 +281,6 @@ class PrettyOutput:
             lang,
             theme="monokai",
             word_wrap=True,
-            background_color="default"
         )
         
         # Create panel with styling
@@ -229,7 +291,8 @@ class PrettyOutput:
             title=header,
             title_align="left",
             padding=(0, 0),
-            highlight=True
+            highlight=True,
+            box=HEAVY,
         )
         
         # Print panel
@@ -253,12 +316,22 @@ class PrettyOutput:
     @staticmethod
     def print_stream(text: str):
         """Print stream output without line break"""
-        console.print(text, style="system", end="")
+        # 使用进度类型样式
+        style = PrettyOutput._get_style(OutputType.SYSTEM)
+        console.print(text, style=style, end="")
 
     @staticmethod
     def print_stream_end():
         """End stream output with line break"""
-        console.print()
+        # 结束符样式
+        end_style = PrettyOutput._get_style(OutputType.SUCCESS)
+        console.print("\n", style=end_style)
+        console.file.flush()
+
+    @staticmethod
+    def _get_style(output_type: OutputType) -> RichStyle:
+        """Get pre-defined RichStyle for output type"""
+        return console.get_style(output_type.value)
 
 def get_single_line_input(tip: str) -> str:
     """Get single line input, support direction key, history function, etc."""

{jarvis_ai_assistant-0.1.119 → jarvis_ai_assistant-0.1.121/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.119
+Version: 0.1.121
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire