jarvis-ai-assistant 0.1.122__py3-none-any.whl → 0.1.123__py3-none-any.whl

jarvis/jarvis_platform/base.py

@@ -32,34 +32,29 @@ class BasePlatform(ABC):
         def _chat():
             import time
             start_time = time.time()
-            
-            if self.suppress_output:
-                with yaspin(Spinners.dots, text="Thinking", color="yellow") as spinner:
-                    response = self.chat(message)
-                    spinner.ok("✓")
-            else:
-                response = self.chat(message)
+            response = self.chat(message)
             
             # Calculate statistics
-            end_time = time.time()
-            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
+            if not self.suppress_output:
+                end_time = time.time()
+                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}, 输出Token数量: {token_count}, 每秒Token数量: {tokens_per_second:.2f}",
-                OutputType.INFO,
-            )
+                    # Print statistics
+                    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)

jarvis/jarvis_platform/openai.py

@@ -85,7 +85,7 @@ class OpenAIModel(BasePlatform):
             full_response = ""
             
             for chunk in response:
-                if chunk.choices[0].delta.content:
+                if chunk.choices and chunk.choices[0].delta.content:
                     text = chunk.choices[0].delta.content
                     if not self.suppress_output:
                         PrettyOutput.print_stream(text)

jarvis/jarvis_tools/read_code.py

@@ -119,7 +119,7 @@ class ReadCodeTool:
                 formatted_lines.append(f"{line_num:>5}:{line}")
                 
             content = "".join(formatted_lines)
-            output = f"File: {filepath}\nLines: [{start_line}, {end_line}]\n{content}"
+            output = f"\n\nFile: {filepath}\nLines: [{start_line}, {end_line}]\n{content}"
             return {
                 "success": True,
                 "stdout": output,

jarvis/jarvis_utils/__init__.py

@@ -412,7 +412,7 @@ class FileCompleter(Completer):
                 if file_path and score < 100:
                     display_text = f"{path} ({score}%)"
                 completion = Completion(
-                    text=f"`{path}`",  # 添加反引号包裹路径
+                    text=f"'{path}'",  # 添加单引号包裹路径
                     start_position=-replace_length,
                     display=display_text,
                     display_meta="File"
@@ -525,12 +525,19 @@ def find_git_root(dir="."):
     return ret
 
 def has_uncommitted_changes():
-    os.system("git add .")
+    import subprocess
+    # Add all changes silently
+    subprocess.run(["git", "add", "."], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    
     # Check working directory changes
-    working_changes = os.popen("git diff --exit-code").read().strip() != ""
+    working_changes = subprocess.run(["git", "diff", "--exit-code"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL).returncode != 0
+    
     # Check staged changes
-    staged_changes = os.popen("git diff --cached --exit-code").read().strip() != ""
-    os.system("git reset")
+    staged_changes = subprocess.run(["git", "diff", "--cached", "--exit-code"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL).returncode != 0
+    
+    # Reset changes silently
+    subprocess.run(["git", "reset"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    
     return working_changes or staged_changes
 
 def load_embedding_model():

{jarvis_ai_assistant-0.1.122.dist-info → jarvis_ai_assistant-0.1.123.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.122
+Version: 0.1.123
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
-Author-email: Your Name <your.email@example.com>
+Author-email: skyfire <skyfireitdiy@hotmail.com>
 License: MIT License
         
         Copyright (c) 2025 skyfire
@@ -28,14 +28,15 @@ License: MIT License
         SOFTWARE.
 Project-URL: Homepage, https://github.com/skyfireitdiy/Jarvis
 Keywords: jarvis,ai,assistant,tools,automation
+Classifier: Development Status :: 3 - Alpha
+Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python
+Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Operating System :: POSIX :: Linux
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -45,7 +46,7 @@ Requires-Dist: colorama>=0.4.6
 Requires-Dist: prompt_toolkit>=3.0.0
 Requires-Dist: openai>=1.20.0
 Requires-Dist: playwright>=1.41.1
-Requires-Dist: numpy>=1.17.4
+Requires-Dist: numpy==1.17.4
 Requires-Dist: faiss-cpu>=1.8.0
 Requires-Dist: sentence-transformers>=2.2.2
 Requires-Dist: bs4>=0.0.1

{jarvis_ai_assistant-0.1.122.dist-info → jarvis_ai_assistant-0.1.123.dist-info}/RECORD

@@ -1,13 +1,14 @@
-jarvis/__init__.py,sha256=22nldKPbyN6ugfIDvIPEph6pTnY9LfosD8SquYVE33M,51
+jarvis/__init__.py,sha256=Fd_y2qXT9cBkdEeg_-h8CvQ5Za_ELGG_KVryk5O1WC0,51
 jarvis/jarvis_agent/__init__.py,sha256=4nmQOpFbY68OpyM3sCUsQSHOQGBoTP8Xff8RyX08W4Y,22447
 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=yMRT3uIsy_0IfHnmmvnTDUTIGxVZ9Qd4CWQ7ptQjsa4,6135
-jarvis/jarvis_code_agent/file_select.py,sha256=imTILJLEfabJ-gI3Weg0FXh-zT5ZUrGImEjbTT1l-rc,11801
-jarvis/jarvis_code_agent/patch.py,sha256=h59qFqtXsw8LCFBw-zIqKbpD-3cLvbfpmmzdUd8OxeQ,8698
+jarvis/jarvis_code_agent/code_agent.py,sha256=_D4oPX9isUvCJk4l-afquLimqjxLA6XBd_IxnQxfTGs,6954
+jarvis/jarvis_code_agent/file_select.py,sha256=Q3ibitHZHMhqlNw9rmjaMgK3U5hb8RgW1MK-CPHqtJ8,11942
+jarvis/jarvis_code_agent/patch.py,sha256=IospCezRB2R8IM6h3Nx0zyfFVbx-S0RryuwSgotSg84,10285
 jarvis/jarvis_code_agent/relevant_files.py,sha256=Z9bHJ6qkRu8EhD06kS_e0raqrsUgRUwkYf5mgBfdKP8,3392
 jarvis/jarvis_codebase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_codebase/main.py,sha256=qwB74U9YDgqvBSdvglQ62HmPkBT_Y5x5YF4J8LnzbQU,39778
+jarvis/jarvis_dev/main.py,sha256=zNV7P0d9-jjZ5XAAq_o2FAYqcBfn_lai89mJgomL6fM,24270
 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
@@ -17,10 +18,10 @@ 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=rVPcbf0EbXV3lUPEmd_aO6UzYT0AHo4w13iGhHGvbjo,11964
-jarvis/jarvis_platform/base.py,sha256=HXUAa-Had4r_-4mAtOrF1bPxv7YPUGzvyXuPfomrfIQ,3576
+jarvis/jarvis_platform/base.py,sha256=qrgdJm-aZI3Tb4el6Is8u41cC5hfnJz-U2Vfj8zzlzE,3461
 jarvis/jarvis_platform/kimi.py,sha256=dQM4RLSfDiJwNV25qNWPKqseEpPTo7fel3SI2Pot3l4,15701
 jarvis/jarvis_platform/ollama.py,sha256=TsBEg8crPmBiLvMRDtXYVa2AIdeog36MmW2tn5j9x8U,5613
-jarvis/jarvis_platform/openai.py,sha256=rHzc20Frd5LzS0Wm97FxglSai65UKkY2ju8rg6q-gOg,4445
+jarvis/jarvis_platform/openai.py,sha256=Ofu-J4HmteyoPsxCHvCEDlY5J7-8t3qWr8QsCprw9-8,4463
 jarvis/jarvis_platform/oyi.py,sha256=YueBOGVMR33eTcQPRdfDdQPlM2g5awnYzYqA6z0Y1cg,15016
 jarvis/jarvis_platform/registry.py,sha256=h6gInSOMkUbvYqzNYwYliFLOyga5fS-WlODaw-YTICU,8514
 jarvis/jarvis_platform_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -49,16 +50,16 @@ jarvis/jarvis_tools/lsp_prepare_rename.py,sha256=RxUyIef4awtp-jgupcD1LcPlno9P3mO
 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=eY3GrzagaJIPQ8DmrqNUFFJnIF_GfUxqRjeSengEDss,4944
-jarvis/jarvis_tools/read_code.py,sha256=WEnaDXoktsy26-Jl5hje5hpUjQQ4tzdLeU5yk-jhzCg,7286
+jarvis/jarvis_tools/read_code.py,sha256=e0iX9rpwUlSfrhnzgQPNvfqJ-ebxuJybrNaTgb3Hnyw,7290
 jarvis/jarvis_tools/read_webpage.py,sha256=7QamwBi5s7lD-jTcjD0wsBvkmWPRC9-K-0JkGgeTpvs,3063
 jarvis/jarvis_tools/registry.py,sha256=XefDvujSfqKX2uLA6tnoJFg5kyBNW0iNAAJZocfIz9w,14836
 jarvis/jarvis_tools/search.py,sha256=NHrFpAqg6dtws_9wLJvIZimjeJ-kekETi0Bg0AWMG08,11437
 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=8hGiisn5DVsydqS7JeHBEcI7cnFy51gjE7aEp5oPkr0,31845
-jarvis_ai_assistant-0.1.122.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.122.dist-info/METADATA,sha256=r4eSSk-y7TFllLg0sfS8kbENPFlRaAuRKv3fE-bO7yw,13701
-jarvis_ai_assistant-0.1.122.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-jarvis_ai_assistant-0.1.122.dist-info/entry_points.txt,sha256=a0rHuUPtJFOGeYvaoWaEfLK8d1Lw5izawqBWmwu5A-M,578
-jarvis_ai_assistant-0.1.122.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.122.dist-info/RECORD,,
+jarvis/jarvis_utils/__init__.py,sha256=LYZktMl-iCtGLUa8RXpmDzQVMT_0Pm00aXyFGMBu95o,32207
+jarvis_ai_assistant-0.1.123.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.123.dist-info/METADATA,sha256=f9JvSSga3TWB7iIVfNpCitzs9R-h0CpHHuXrjKH88ZY,13746
+jarvis_ai_assistant-0.1.123.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+jarvis_ai_assistant-0.1.123.dist-info/entry_points.txt,sha256=H9Y_q7BZGDsgJijaXHD9GbscllATyKYfg22otrpKEoE,619
+jarvis_ai_assistant-0.1.123.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.123.dist-info/RECORD,,

{jarvis_ai_assistant-0.1.122.dist-info → jarvis_ai_assistant-0.1.123.dist-info}/entry_points.txt

@@ -3,6 +3,7 @@ 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-dev = jarvis.jarvis_dev.main:main
 jarvis-git-commit = jarvis.jarvis_tools.git_commiter:main
 jarvis-platform-manager = jarvis.jarvis_platform_manager.main:main
 jarvis-rag = jarvis.jarvis_rag.main:main