jarvis-ai-assistant 0.1.115__py3-none-any.whl → 0.1.117__py3-none-any.whl

jarvis/jarvis_tools/registry.py

@@ -1,51 +1,91 @@
 import json
 from pathlib import Path
+import re
 import sys
-from typing import Any, Callable, Dict, List, Optional
+from typing import Any, Callable, Dict, List, Optional, Tuple
 
+import yaml
+
+from jarvis.jarvis_agent.output_handler import OutputHandler
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.base import Tool
-from jarvis.utils import OutputType, PrettyOutput, get_context_token_count, get_max_token_count
+from jarvis.jarvis_utils import OutputType, PrettyOutput, get_context_token_count, get_max_token_count
 
 
-tool_call_help = """## Tool Usage Format
+tool_call_help = """
+# 🛠️ Tool Usage System
+You are using a tool execution system that requires precise formatting and strict rules.
 
+# 📋 Tool Call Format
+```yaml
 <TOOL_CALL>
 name: tool_name
 arguments:
     param1: value1
     param2: value2
 </TOOL_CALL>
+```
 
-STRICT RULES:
-- EXECUTE ONLY ONE TOOL AT EVERY TURN
-- TOOL EXECUTION MUST STRICTLY FOLLOW THE TOOL USAGE FORMAT
-- WAIT FOR USER TO PROVIDE EXECUTION RESULTS
-- DON'T ASSUME OR IMAGINE RESULTS
-- DON'T CREATE FAKE DIALOGUES
-- IF CURRENT INFORMATION IS INSUFFICIENT, YOU MAY ASK THE USER FOR MORE INFORMATION
-- NOT ALL PROBLEM-SOLVING STEPS ARE MANDATORY, SKIP AS APPROPRIATE
-- Request user guidance when multiple iterations show no progress
-- ALWAYS use | syntax for string parameters to prevent parsing errors
-    Example:
-    <TOOL_CALL>
-    name: execute_shell
-    arguments:
-        command: |
-            git status --porcelain
-    </TOOL_CALL>
-    <TOOL_CALL>
-    name: execute_shell
-    arguments:
-        command: |
-            git commit -m "fix bug"
-    </TOOL_CALL>
-    
-- If you can start executing the task, please start directly without asking the user if you can begin.
+# ❗ Critical Rules
+1. ONE Tool Per Turn
+   - Execute only ONE tool at a time
+   - Wait for results before next action
+
+2. Strict Format Adherence
+   - Follow exact format shown above
+   - Use proper YAML indentation
+   - Include all required parameters
+
+3. Result Handling
+   - Wait for execution results
+   - Never assume outcomes
+   - Don't create fake responses
+   - Don't imagine dialogues
+
+4. Information Management
+   - Ask user if info is insufficient
+   - Skip unnecessary steps
+   - Request guidance if stuck
+   - Don't proceed with incomplete info
+
+# 📝 String Parameter Format
+ALWAYS use | syntax for string parameters:
+
+```yaml
+<TOOL_CALL>
+name: execute_shell
+arguments:
+    command: |
+        git status --porcelain
+</TOOL_CALL>
+```
+
+# 💡 Best Practices
+- Start execution immediately when ready
+- No need to ask for permission to begin
+- Use proper string formatting
+- Monitor progress and adjust
+- Request help when stuck
+
+# ⚠️ Common Mistakes to Avoid
+- Multiple tool calls at once
+- Missing | for string parameters
+- Assuming tool results
+- Creating fictional dialogues
+- Proceeding without required info
 """
 
-class ToolRegistry:
-    def load_tools(self) -> str:
+class ToolRegistry(OutputHandler):
+
+    def name(self) -> str:
+        return "TOOL_CALL"
+
+    def can_handle(self, response: str) -> bool:
+        if self._extract_tool_calls(response):
+            return True
+        return False
+    
+    def prompt(self) -> str:
         """Load tools"""
         tools = self.get_all_tools()
         if tools:
@@ -57,6 +97,16 @@ class ToolRegistry:
             tools_prompt += tool_call_help
             return tools_prompt
         return ""
+    
+    def handle(self, response: str) -> Tuple[bool, Any]:
+        tool_calls = self._extract_tool_calls(response)
+        if len(tool_calls) > 1:
+            PrettyOutput.print(f"操作失败：检测到多个操作。一次只能执行一个操作。尝试执行的操作：{', '.join([tool_call['name'] for tool_call in tool_calls])}", OutputType.WARNING)
+            return False, f"Call failed: Handle multiple tool calls, please ONLY handle one tool call at a time."
+        if len(tool_calls) == 0:
+            return False, ""
+        tool_call = tool_calls[0]
+        return False, self.handle_tool_calls(tool_call)
 
     def __init__(self):
         """Initialize tool registry"""
@@ -169,6 +219,30 @@ class ToolRegistry:
         except Exception as e:
             PrettyOutput.print(f"从 {Path(file_path).name} 加载工具失败: {str(e)}", OutputType.ERROR)
             return False
+    @staticmethod
+    def _extract_tool_calls(content: str) -> List[Dict]:
+        """Extract tool calls from content.
+        
+        Args:
+            content: The content containing tool calls
+            
+        Returns:
+            List[Dict]: List of extracted tool calls with name and arguments
+            
+        Raises:
+            Exception: If tool call is missing necessary fields
+        """
+        # Split content into lines
+        data = re.findall(r'<TOOL_CALL>(.*?)</TOOL_CALL>', content, re.DOTALL)
+        ret = []
+        for item in data:
+            try:
+                msg = yaml.safe_load(item)
+                if 'name' in msg and 'arguments' in msg:
+                    ret.append(msg)
+            except Exception as e:
+                continue
+        return ret
 
     def register_tool(self, name: str, description: str, parameters: Dict, func: Callable):
         """Register a new tool"""
@@ -197,14 +271,66 @@ class ToolRegistry:
             args = tool_call["arguments"]
 
             tool_call_help = """
-Tool Usage Format:
+# 🛠️ Tool Usage System
+You are using a tool execution system that requires precise formatting and strict rules.
 
+# 📋 Tool Call Format
+```yaml
 <TOOL_CALL>
 name: tool_name
 arguments:
     param1: value1
     param2: value2
 </TOOL_CALL>
+```
+
+# ❗ Critical Rules
+1. ONE Tool Per Turn
+   - Execute only ONE tool at a time
+   - Wait for results before next action
+
+2. Strict Format Adherence
+   - Follow exact format shown above
+   - Use proper YAML indentation
+   - Include all required parameters
+
+3. Result Handling
+   - Wait for execution results
+   - Never assume outcomes
+   - Don't create fake responses
+   - Don't imagine dialogues
+
+4. Information Management
+   - Ask user if info is insufficient
+   - Skip unnecessary steps
+   - Request guidance if stuck
+   - Don't proceed with incomplete info
+
+# 📝 String Parameter Format
+ALWAYS use | syntax for string parameters:
+
+```yaml
+<TOOL_CALL>
+name: execute_shell
+arguments:
+    command: |
+        git status --porcelain
+</TOOL_CALL>
+```
+
+# 💡 Best Practices
+- Start execution immediately when ready
+- No need to ask for permission to begin
+- Use proper string formatting
+- Monitor progress and adjust
+- Request help when stuck
+
+# ⚠️ Common Mistakes to Avoid
+- Multiple tool calls at once
+- Missing | for string parameters
+- Assuming tool results
+- Creating fictional dialogues
+- Proceeding without required info
 """
             
             if isinstance(args, str):

jarvis/jarvis_tools/search.py

@@ -1,6 +1,6 @@
 from typing import Dict, Any, List
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.utils import PrettyOutput, OutputType, get_context_token_count, get_max_token_count
+from jarvis.jarvis_utils import PrettyOutput, OutputType, get_context_token_count, get_max_token_count
 from jarvis.jarvis_tools.read_webpage import WebpageTool
 from playwright.sync_api import sync_playwright
 from urllib.parse import quote

jarvis/jarvis_tools/select_code_files.py

@@ -1,6 +1,6 @@
 from typing import Dict, Any
 
-from jarvis.utils import OutputType, PrettyOutput
+from jarvis.jarvis_utils import OutputType, PrettyOutput
 from jarvis.jarvis_code_agent.file_select import select_files
 
 

jarvis/{utils.py → jarvis_utils/__init__.py}

@@ -29,7 +29,8 @@ from rich.syntax import Syntax
 
 from prompt_toolkit.completion import Completer, Completion, PathCompleter
 from prompt_toolkit.document import Document
-from fuzzywuzzy import fuzz
+from fuzzywuzzy import process
+from prompt_toolkit.key_binding import KeyBindings
 
 # 初始化colorama
 colorama.init()
@@ -271,8 +272,8 @@ class FileCompleter(Completer):
     """Custom completer for file paths with fuzzy matching."""
     def __init__(self):
         self.path_completer = PathCompleter()
-        self.max_suggestions = 10  # 增加显示数量
-        self.min_score = 10  # 降低相似度阈值
+        self.max_suggestions = 10
+        self.min_score = 10
         
     def get_completions(self, document: Document, complete_event):
         text = document.text_before_cursor
@@ -299,23 +300,33 @@ class FileCompleter(Completer):
         # Get the text after the current @
         file_path = text_after_at.strip()
         
-        # Get all possible files from current directory
+        # 计算需要删除的字符数（包括@符号）
+        replace_length = len(text_after_at) + 1  # +1 包含@符号
+        
+        # Get all possible files using git ls-files only
         all_files = []
-        for root, _, files in os.walk('.'):
-            for f in files:
-                path = os.path.join(root, f)
-                # Remove ./ from the beginning
-                path = path[2:] if path.startswith('./') else path
-                all_files.append(path)
+        try:
+            # Use git ls-files to get tracked files
+            import subprocess
+            result = subprocess.run(['git', 'ls-files'], 
+                                   stdout=subprocess.PIPE, 
+                                   stderr=subprocess.PIPE,
+                                   text=True)
+            if result.returncode == 0:
+                all_files = [line.strip() for line in result.stdout.splitlines() if line.strip()]
+        except Exception:
+            # If git command fails, just use an empty list
+            pass
         
         # If no input after @, show all files
         # Otherwise use fuzzy matching
         if not file_path:
             scored_files = [(path, 100) for path in all_files[:self.max_suggestions]]
         else:
+            scored_files_data = process.extract(file_path, all_files, limit=self.max_suggestions)
             scored_files = [
-                (path, fuzz.ratio(file_path.lower(), path.lower()))
-                for path in all_files
+                (m[0], m[1])
+                for m in scored_files_data
             ]
             # Sort by score and take top results
             scored_files.sort(key=lambda x: x[1], reverse=True)
@@ -324,66 +335,71 @@ class FileCompleter(Completer):
         # Return completions for files
         for path, score in scored_files:
             if not file_path or score > self.min_score:
-                display_text = path
+                display_text = path  # 显示时不带反引号
                 if file_path and score < 100:
                     display_text = f"{path} ({score}%)"
                 completion = Completion(
-                    text=path,
-                    start_position=-len(file_path),
+                    text=f"`{path}`",  # 添加反引号包裹路径
+                    start_position=-replace_length,
                     display=display_text,
                     display_meta="File"
                 )
                 yield completion
 
 def get_multiline_input(tip: str) -> str:
-    """Get multi-line input, support direction key, history function, and file completion.
+    """Get multi-line input with enhanced completion confirmation"""
+    # 单行输入说明
+    PrettyOutput.section("用户输入 - 使用 @ 触发文件补全，Tab 选择补全项，Ctrl+J 提交", OutputType.USER)
     
-    Args:
-        tip: The prompt tip to display
-        
-    Returns:
-        str: The entered text
-    """
     print(f"{Fore.GREEN}{tip}{ColoramaStyle.RESET_ALL}")
     
-    # Define prompt style
+    # 自定义按键绑定
+    bindings = KeyBindings()
+    
+    @bindings.add('enter')
+    def _(event):
+        # 当有补全菜单时，回车键确认补全
+        if event.current_buffer.complete_state:
+            event.current_buffer.apply_completion(event.current_buffer.complete_state.current_completion)
+        else:
+            # 没有补全菜单时插入换行
+            event.current_buffer.insert_text('\n')
+
+    @bindings.add('c-j')  # 修改为支持的按键组合
+    def _(event):
+        # 使用 Ctrl+J 提交输入
+        event.current_buffer.validate_and_handle()
+
     style = PromptStyle.from_dict({
         'prompt': 'ansicyan',
     })
-    
-    lines = []
+
     try:
-        while True:
-            # Set prompt
-            prompt = FormattedText([
-                ('class:prompt', '... ' if lines else '>>> ')
-            ])
-            
-            # Create new session with new completer for each line
-            session = PromptSession(
-                history=None,  # Use default history
-                completer=FileCompleter()  # New completer instance for each line
-            )
-            
-            # Get input with completion support
-            line = session.prompt(
-                prompt,
-                style=style,
-            ).strip()
-            
-            # Handle empty line
-            if not line:
-                if not lines:  # First line is empty
-                    return ""
-                break  # End multi-line input
-                
-            lines.append(line)
-            
+        session = PromptSession(
+            history=None,
+            completer=FileCompleter(),
+            key_bindings=bindings,
+            complete_while_typing=True,
+            multiline=True,  # 启用原生多行支持
+            vi_mode=False,
+            mouse_support=False
+        )
+        
+        prompt = FormattedText([
+            ('class:prompt', '>>> ')
+        ])
+        
+        # 单次获取多行输入
+        text = session.prompt(
+            prompt,
+            style=style,
+        ).strip()
+        
+        return text
+        
     except KeyboardInterrupt:
         PrettyOutput.print("输入已取消", OutputType.INFO)
         return ""
-    
-    return "\n".join(lines)
 
 def init_env():
     """Load environment variables from ~/.jarvis/env"""

{jarvis_ai_assistant-0.1.115.dist-info → jarvis_ai_assistant-0.1.117.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.115
+Version: 0.1.117
 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.117.dist-info/RECORD

@@ -0,0 +1,65 @@
+jarvis/__init__.py,sha256=5w1BCkqWjNXnQYjmLPW7k0NeGNQ1LZvOLbVCFhky-Ss,51
+jarvis/jarvis_agent/__init__.py,sha256=g5ig3AdJeR4ANY5hKpmtFr843vgTlxb5WoSc-6FBFkM,21618
+jarvis/jarvis_agent/output_handler.py,sha256=kJeFTjjSu0K_2p0wyhq2veSZuhRXoaFC_8wVaoBKX0w,401
+jarvis/jarvis_code_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_code_agent/code_agent.py,sha256=D8og7lZ5j1eKNNz-kY2E5YM-MsiuFzJvCuJZc7Kz3J8,7630
+jarvis/jarvis_code_agent/file_select.py,sha256=uxNA0ODy7NHMDNnCS9tFhttQ-omILUya7OjX3WuhSfo,8850
+jarvis/jarvis_code_agent/patch.py,sha256=i4AZYoxwv0igeC5oe9ls5mwYVNdcnL-yzOkcshKC-JM,6355
+jarvis/jarvis_code_agent/relevant_files.py,sha256=u9wae9sn-XLaUoSK69-LRLomHWcE-K1y7W10BFdmQVE,3402
+jarvis/jarvis_codebase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_codebase/main.py,sha256=6JPaAkRUtQpmp4eFtsdCsiuRxWgI6hx9VE2b-J8a3JA,39791
+jarvis/jarvis_dev/main.py,sha256=C8uLge20ZO9smGLUAvHjQlsWBOMI1HQ-WSSDBbdGGRk,21284
+jarvis/jarvis_lsp/base.py,sha256=_7pdbMKjdtYBW0DsRbjIodDHM3J7df-YgXHejN_WIrU,4490
+jarvis/jarvis_lsp/cpp.py,sha256=sYQHEl0FoVC5Iw2pJvvGKpeNLD95XjNuTOINvdZLgME,4986
+jarvis/jarvis_lsp/go.py,sha256=3soEuID2XV65zaxyR70RxNsvtm02l9PEZ46F_nsDdqY,5311
+jarvis/jarvis_lsp/python.py,sha256=_Vo2pPwVh_vAsyS0XowXMbT4Syd78naPEZj586bi004,4747
+jarvis/jarvis_lsp/registry.py,sha256=x7OFlW10AWQ_tWEbHWkdpngoFHTP3t1vSyGxVVLk46w,9933
+jarvis/jarvis_lsp/rust.py,sha256=ZvUoOZm9GWLl3kobfByBuTGrQ8aM2dLuNxS_NHr1aQQ,5542
+jarvis/jarvis_multi_agent/__init__.py,sha256=Z6QaRZrqUUa6r6Pe_KZi34Ymle5amQe1N-AINxiOi1c,6011
+jarvis/jarvis_platform/__init__.py,sha256=mrOt67nselz_H1gX9wdAO4y2DY5WPXzABqJbr5Des8k,63
+jarvis/jarvis_platform/ai8.py,sha256=AO42OVzrwQMDY74TR2B4gtrsfeRVxJRf5OmHBM3cVQY,11948
+jarvis/jarvis_platform/base.py,sha256=8iYNCe7PGSs9sDG66jeNDr2TYzWUYBiGVvKgHTDsFLg,2641
+jarvis/jarvis_platform/kimi.py,sha256=WCRyG7jnqnpHNu6M9_pGFE_RBVKqYDtd_F1EPdT_FKU,15761
+jarvis/jarvis_platform/ollama.py,sha256=TsBEg8crPmBiLvMRDtXYVa2AIdeog36MmW2tn5j9x8U,5613
+jarvis/jarvis_platform/openai.py,sha256=rHzc20Frd5LzS0Wm97FxglSai65UKkY2ju8rg6q-gOg,4445
+jarvis/jarvis_platform/oyi.py,sha256=3yuWHEGtGV--6IuFCCc1R2F1Y-p21xy4Vk-P5pQRAys,14994
+jarvis/jarvis_platform/registry.py,sha256=SmBcf86h6uf4TB7cut-Bhb9Ivj5z2wAg1pWkcJLi_80,8508
+jarvis/jarvis_platform_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_platform_manager/main.py,sha256=Ja0f-PiYxABIj-Ioh9NNZuqy0dB2Jk7dhrObgzgXApw,20958
+jarvis/jarvis_platform_manager/openai_test.py,sha256=BAoZgOJ431gjjbbdgiX-ARfI0aLXK_cRLAQQJzQI6MI,5200
+jarvis/jarvis_rag/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_rag/main.py,sha256=2Nq5d5DBXdZ35_KEeHkdKJPFzxKgxt9bkwp1PMHpLzI,31754
+jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_smart_shell/main.py,sha256=ZD_rqV-2S3xA1jW1TPEzM4PHLBYOjZFtgJZxHpZZ0TE,4476
+jarvis/jarvis_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_tools/ask_codebase.py,sha256=MF7zeBqVDa7T45JxDR9mePA92kzZm5bQ9op8o5Qo9lM,3003
+jarvis/jarvis_tools/ask_user.py,sha256=tIyiKk9F8xchjQ3Yh5fMQjhpflQTuh75HTuXMftGxZY,1827
+jarvis/jarvis_tools/base.py,sha256=c0DMoDDPxmsqUYJR989zgUs7nIYRY6GWBrAdusIZKjc,656
+jarvis/jarvis_tools/chdir.py,sha256=06GAtMqoi5fT1FXD2HUUlHKosVtz-Z8KI13lpEFQw3g,1820
+jarvis/jarvis_tools/code_review.py,sha256=DFnw-li4afcpHdfDC2TX_PHSNn7GxEHbtagCAkLQ-9U,8598
+jarvis/jarvis_tools/create_code_agent.py,sha256=4tJLcKk_e1AOyN2wgOeAWVB9N4aa7GsusUNdaYmAYww,3906
+jarvis/jarvis_tools/create_sub_agent.py,sha256=ldpNn5LczybExvt9Sz4t1ybetLX-dTJIAF5f_oH-Z3M,2869
+jarvis/jarvis_tools/execute_shell.py,sha256=MwgVyI1O1wshU9yR-DvSWIgoSQpVjtH9JpjVQvSrKF0,2566
+jarvis/jarvis_tools/file_operation.py,sha256=8CAWozKfsRx_TzCmRPcNSj-bRo3K69IEDmmN8IWMlmg,5647
+jarvis/jarvis_tools/git_commiter.py,sha256=oq_jh6YkB-cZi2XRhu139seZeF7Vubwx04cvpugjmt4,2732
+jarvis/jarvis_tools/lsp_find_definition.py,sha256=xV8YeN1RJfwd2F3gE6OnDeTwl-AnCmrxueHocbXkQOc,4800
+jarvis/jarvis_tools/lsp_find_references.py,sha256=FohlJeLfTxcMUASfbjOT93hQGtI2WeyTpMGwRwShW_I,4043
+jarvis/jarvis_tools/lsp_get_diagnostics.py,sha256=bEvbDk8TnKg9TTFFxMrYOJm5TBDgz5gO04WJFQUwQQE,4490
+jarvis/jarvis_tools/lsp_get_document_symbols.py,sha256=dspL6r9HYnXL5TpARSApFY3IQLm2kcYVNVWCff2xoXI,3080
+jarvis/jarvis_tools/lsp_prepare_rename.py,sha256=RxUyIef4awtp-jgupcD1LcPlno9P3mOE8AS3_Fm71Ys,4832
+jarvis/jarvis_tools/lsp_validate_edit.py,sha256=M0iglK2QbnIEFv0RYK6o2iAYnv259jB6EU7To-rc51E,5247
+jarvis/jarvis_tools/methodology.py,sha256=JvHV6rHhC6fbPuSqC6UHFaGEE39d4g7zFLodR72wM0g,5758
+jarvis/jarvis_tools/rag.py,sha256=ZhmvwVUHBFsttDRdVncc-S-a-XVOy5jbdNd7Vk4uTlk,4942
+jarvis/jarvis_tools/read_code.py,sha256=rt5m-bcXY0W-WLrGgr5xG08KxB1nNGD5UD0TSj7v7lg,6826
+jarvis/jarvis_tools/read_webpage.py,sha256=7QamwBi5s7lD-jTcjD0wsBvkmWPRC9-K-0JkGgeTpvs,3063
+jarvis/jarvis_tools/registry.py,sha256=y3cVCT8dsAnWuT8QyDccqkyCtc3IMkccZZwVOndNMH0,14883
+jarvis/jarvis_tools/search.py,sha256=NHrFpAqg6dtws_9wLJvIZimjeJ-kekETi0Bg0AWMG08,11437
+jarvis/jarvis_tools/select_code_files.py,sha256=242K79SiNF_gY7fpThY3xoi2ihfgJdjB27X1jKkeXK0,1889
+jarvis/jarvis_tools/tool_generator.py,sha256=jdniHyKcEyF9KyouudrCoZBH3czZmQXc3ns0_trZ3yU,6332
+jarvis/jarvis_utils/__init__.py,sha256=2GbATVP6NXe8obg2YYArNRAeSj0X4-GCULZrMiHh3fw,29885
+jarvis_ai_assistant-0.1.117.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.117.dist-info/METADATA,sha256=uTPQoN_2eEdKrJ3V7CRgW3imgk7P3nt6uN4mG_Yvb4A,13701
+jarvis_ai_assistant-0.1.117.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+jarvis_ai_assistant-0.1.117.dist-info/entry_points.txt,sha256=YgRAus5Rz4xVwB6DxWKokQd0zoKIjyRdyvmp8J5CI0w,528
+jarvis_ai_assistant-0.1.117.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.117.dist-info/RECORD,,

{jarvis_ai_assistant-0.1.115.dist-info → jarvis_ai_assistant-0.1.117.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{jarvis_ai_assistant-0.1.115.dist-info → jarvis_ai_assistant-0.1.117.dist-info}/entry_points.txt

@@ -1,5 +1,5 @@
 [console_scripts]
-jarvis = jarvis.agent:main
+jarvis = jarvis.jarvis_agent:main
 jarvis-code-agent = jarvis.jarvis_code_agent.code_agent:main
 jarvis-code-review = jarvis.jarvis_tools.code_review:main
 jarvis-codebase = jarvis.jarvis_codebase.main:main

jarvis/multi_agent.py

@@ -1,76 +0,0 @@
-
-
-from typing import Dict, List, Optional
-
-from jarvis.agent import Agent
-from jarvis.utils import OutputType, PrettyOutput
-
-
-class AgentConfig:
-    def __init__(self, **config):
-        self.system_prompt = config.get('system_prompt', '')
-        self.name = config.get('name', 'Jarvis')
-        self.description = config.get('description', '')
-        self.is_sub_agent = config.get('is_sub_agent', False)
-        self.tool_registry = config.get('tool_registry', [])
-        self.platform = config.get('platform')
-        self.model_name = config.get('model_name')
-        self.summary_prompt = config.get('summary_prompt')
-        self.auto_complete = config.get('auto_complete', False)
-        self.output_handler_before_tool = config.get('output_handler_before_tool')
-        self.output_handler_after_tool = config.get('output_handler_after_tool')
-        self.input_handler = config.get('input_handler')
-        self.max_context_length = config.get('max_context_length')
-        self.execute_tool_confirm = config.get('execute_tool_confirm')
-
-class MultiAgent:
-    def __init__(self, configs: List[AgentConfig], main_agent_name: str):
-        self.agents_config = configs
-        self.agents = {}
-        self.init_agents()
-        self.main_agent_name = main_agent_name
-
-    def init_agents(self):
-        for agent_config in self.agents_config:
-            agent = Agent(system_prompt=agent_config.system_prompt,
-                          name=agent_config.name,
-                          description=agent_config.description,
-                          model_name=agent_config.model_name,
-                          platform=agent_config.platform,
-                          max_context_length=agent_config.max_context_length,
-                          support_send_msg=True,
-                          execute_tool_confirm=agent_config.execute_tool_confirm,
-                          input_handler=agent_config.input_handler,
-                          output_handler_before_tool=agent_config.output_handler_before_tool,
-                          output_handler_after_tool=agent_config.output_handler_after_tool,
-                          use_methodology=False,
-                          record_methodology=False,
-                          need_summary=False,
-                          auto_complete=agent_config.auto_complete,
-                          summary_prompt=agent_config.summary_prompt,
-                          is_sub_agent=agent_config.is_sub_agent,
-                          tool_registry=agent_config.tool_registry,
-                          )
-            agent.system_prompt += "You can send message to following agents: " + "\n".join([f"{c.name}: {c.description}" for c in self.agents_config])
-            self.agents[agent_config.name] = agent
-
-    def run(self, user_input: str, file_list: Optional[List[str]] = None) -> str:
-        last_agent = self.main_agent_name
-        msg = self.agents[self.main_agent_name].run(user_input, file_list)
-        while msg:
-            if isinstance(msg, str):
-                return msg
-            elif isinstance(msg, Dict):
-                prompt  = f"""
-Please handle this message:
-from: {last_agent}
-content: {msg['content']}
-"""
-                if msg['to'] not in self.agents:
-                    PrettyOutput.print(f"没有找到{msg['to']}，重试...", OutputType.WARNING)
-                    msg = self.agents[last_agent].run(f"The agent {msg['to']} is not found, agent list: {self.agents.keys()}")
-                    continue
-                PrettyOutput.print(f"{last_agent} 发送消息给 {msg['to']}...", OutputType.INFO)
-                last_agent = self.agents[msg['to']]
-                msg = self.agents[msg['to']].run(prompt)
-        return ""

jarvis/utils/date_utils.py

@@ -1,19 +0,0 @@
-from datetime import datetime
-
-class DateValidator:
-    @staticmethod
-    def validate_iso_date(date_str: str) -> bool:
-        try:
-            datetime.fromisoformat(date_str)
-            return True
-        except ValueError:
-            return False
-
-    @staticmethod
-    def validate_date_range(start: str, end: str) -> bool:
-        try:
-            start_dt = datetime.fromisoformat(start)
-            end_dt = datetime.fromisoformat(end)
-            return start_dt <= end_dt
-        except ValueError:
-            return False