jarvis-ai-assistant 0.1.119__py3-none-any.whl → 0.1.120__py3-none-any.whl

jarvis/__init__.py

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

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
@@ -204,9 +196,20 @@ 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).strip()
 
         if filepath not in result:
             result[filepath] = []
@@ -364,6 +367,9 @@ 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)
 
+    if not new_content:
+        new_content = ['']
+
     PrettyOutput.print(f"patch_type: {patch_type}\nstart_line: {start_line}\nend_line: {end_line}\nnew_content:\n{new_content}", OutputType.INFO)
 
     if new_content and new_content[-1] and new_content[-1][-1] != '\n':

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.dist-info → jarvis_ai_assistant-0.1.120.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.119
+Version: 0.1.120
 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.dist-info → jarvis_ai_assistant-0.1.120.dist-info}/RECORD

@@ -1,10 +1,10 @@
-jarvis/__init__.py,sha256=HwpqO7gDhgMRv9lqXELtgo1mrM7LBNbBitORgvnwpCs,51
+jarvis/__init__.py,sha256=WXicnhWkcCvbf7sM1SBpoWQnsc4VhXTtp1qmcSLHA_g,51
 jarvis/jarvis_agent/__init__.py,sha256=V9sQJq-ygUQBvlfqcndkiGsOZd0fKf-mbB2PThK5k9E,22441
 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=8bOvUtMqq6CvL-SkLOfdJl0DrPQB1G5YN7dJN_bkZrc,7046
 jarvis/jarvis_code_agent/file_select.py,sha256=Kfjed4Kfa142dpuq0a6jxWM-v2JwWG1BTwwjlC1BJgc,11754
-jarvis/jarvis_code_agent/patch.py,sha256=ZpUR3YzHenlL-QrlGAS7Bb2e0fFpijMfCvcwiwY0Tcg,13043
+jarvis/jarvis_code_agent/patch.py,sha256=S4UbHupNUbkx3QrygOm1i0Ynz-w_56jfVURKfYPCw3c,13306
 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=bvyYACCBNTrlJvaUCcJAJ8gUklKjy2HrMEfKjGYKtVQ,39779
@@ -18,7 +18,7 @@ jarvis/jarvis_lsp/rust.py,sha256=ZvUoOZm9GWLl3kobfByBuTGrQ8aM2dLuNxS_NHr1aQQ,554
 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=YN8Y0B-8z-kdQg30dYQfX_9a0IOAfvJlb15V0CSWUkQ,2975
+jarvis/jarvis_platform/base.py,sha256=HXUAa-Had4r_-4mAtOrF1bPxv7YPUGzvyXuPfomrfIQ,3576
 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
@@ -57,9 +57,9 @@ jarvis/jarvis_tools/search.py,sha256=NHrFpAqg6dtws_9wLJvIZimjeJ-kekETi0Bg0AWMG08
 jarvis/jarvis_tools/select_code_files.py,sha256=vbEdneWWtAN90OFASohtllTgZW400ZxQbrkgroPK1qc,1902
 jarvis/jarvis_tools/tool_generator.py,sha256=jdniHyKcEyF9KyouudrCoZBH3czZmQXc3ns0_trZ3yU,6332
 jarvis/jarvis_utils/__init__.py,sha256=utMWglhmeTc6YagV_BY3X-SkvhwjT13GUAbby7tGJ4Y,29911
-jarvis_ai_assistant-0.1.119.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.119.dist-info/METADATA,sha256=BvkmoVyecDqDdYErZyaojB2DvRrxcqBltB4Gkdd4P3Q,13701
-jarvis_ai_assistant-0.1.119.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-jarvis_ai_assistant-0.1.119.dist-info/entry_points.txt,sha256=H9Y_q7BZGDsgJijaXHD9GbscllATyKYfg22otrpKEoE,619
-jarvis_ai_assistant-0.1.119.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.119.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.120.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.120.dist-info/METADATA,sha256=v6tHk0aRBdLovk6oSRHn71341o6hRXJdvYsV2PsXUbk,13701
+jarvis_ai_assistant-0.1.120.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+jarvis_ai_assistant-0.1.120.dist-info/entry_points.txt,sha256=H9Y_q7BZGDsgJijaXHD9GbscllATyKYfg22otrpKEoE,619
+jarvis_ai_assistant-0.1.120.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.120.dist-info/RECORD,,