jarvis-ai-assistant 0.1.92__py3-none-any.whl → 0.1.96__py3-none-any.whl

jarvis/models/oyi.py

@@ -23,7 +23,7 @@ class OyiModel(BasePlatform):
         self.messages = []
         self.system_message = ""
         self.conversation = None
-        self.upload_files = [] 
+        self.files = []
         self.first_chat = True
         
         self.token = os.getenv("OYI_API_KEY")
@@ -122,7 +122,7 @@ class OyiModel(BasePlatform):
             }
             
             payload = {
-                "topicId": self.conversation['result']['id'],
+                "topicId": self.conversation['result']['id'] if self.conversation else None,
                 "messages": self.messages,
                 "content": message,
                 "contentFiles": []
@@ -130,8 +130,8 @@ class OyiModel(BasePlatform):
             
             # 如果有上传的文件，添加到请求中
             if self.first_chat:
-                if self.upload_files:
-                    for file_data in self.upload_files:
+                if self.files:
+                    for file_data in self.files:
                         file_info = {
                             "contentType": 1,  # 1 表示图片
                             "fileUrl": file_data['result']['url'],
@@ -140,7 +140,7 @@ class OyiModel(BasePlatform):
                         }
                         payload["contentFiles"].append(file_info)
                     # 清空已使用的文件列表
-                    self.upload_files = []
+                    self.files = []
                 message = self.system_message + "\n" + message
                 payload["content"] = message
                 self.first_chat = False
@@ -195,7 +195,7 @@ class OyiModel(BasePlatform):
         """Reset model state"""
         self.messages = []
         self.conversation = None
-        self.upload_files = []
+        self.files = []
         self.first_chat = True
             
     def delete_chat(self) -> bool:
@@ -251,7 +251,7 @@ class OyiModel(BasePlatform):
             model_info = self.models.get(self.model_name)
             if not model_info or not model_info.get('uploadFile', False):
                 PrettyOutput.print(f"当前模型 {self.model_name} 不支持文件上传", OutputType.WARNING)
-                return None
+                return []
             
             headers = {
                 'Authorization': f'Bearer {self.token}',
@@ -283,18 +283,18 @@ class OyiModel(BasePlatform):
                     if response.status_code == 200:
                         data = response.json()
                         if data.get('code') == 200:
-                            self.upload_files.append(data)
-                            return data
+                            self.files.append(data)
                         else:
                             PrettyOutput.print(f"文件上传失败: {data.get('message')}", OutputType.ERROR)
-                            return None
+                            return []
                     else:
                         PrettyOutput.print(f"文件上传失败: {response.status_code}", OutputType.ERROR)
-                        return None
+                        return []
                 
+            return self.files
         except Exception as e:
             PrettyOutput.print(f"文件上传异常: {str(e)}", OutputType.ERROR)
-            return None
+            return []
 
     def get_available_models(self) -> List[str]:
         """获取可用的模型列表
@@ -364,5 +364,5 @@ class OyiModel(BasePlatform):
             return sorted(models)
             
         except Exception as e:
-            PrettyOutput.print(f"获取模型列表异常: {str(e)}", OutputType.ERROR)
+            PrettyOutput.print(f"获取模型列表异常: {str(e)}", OutputType.WARNING)
             return []

jarvis/tools/ask_user.py

@@ -34,8 +34,7 @@ class AskUserTool:
             PrettyOutput.print(question, OutputType.SYSTEM)
             
             # 获取用户输入
-            PrettyOutput.print("\n请输入您的回答（输入空行结束）:", OutputType.INPUT)
-            user_response = get_multiline_input()
+            user_response = get_multiline_input("请输入您的回答（输入空行结束）")
             
             if user_response == "__interrupt__":
                 return {

jarvis/tools/coder.py

@@ -0,0 +1,69 @@
+import os
+from typing import Dict, Any, Optional
+from jarvis.jarvis_coder.main import JarvisCoder
+from jarvis.utils import PrettyOutput, OutputType
+
+class CoderTool:
+    """代码修改工具"""
+    
+    name = "coder"
+    description = "分析并修改现有代码，用于实现新功能、修复bug、重构代码等。能理解代码上下文并进行精确的代码编辑。"
+    parameters = {
+        "feature": {
+            "type": "string",
+            "description": "要实现的功能描述或需要修改的内容，例如：'添加日志功能'、'修复内存泄漏'、'优化性能'等",
+            "required": True
+        },
+        "dir": {
+            "type": "string", 
+            "description": "项目根目录，默认为当前目录",
+            "required": False
+        },
+        "language": {
+            "type": "string",
+            "description": "项目的主要编程语言，默认为python",
+            "required": False
+        }
+    }
+
+    def __init__(self):
+        self._coder = None
+
+
+    def _init_coder(self, dir: Optional[str] = None, language: Optional[str] = "python") -> None:
+        """初始化JarvisCoder实例"""
+        if not self._coder:
+            import os
+            work_dir = dir or os.getcwd()
+            self._coder = JarvisCoder(work_dir, language)
+
+    def execute(self, args: Dict) -> Dict[str, Any]:
+        """执行代码修改
+        
+        Args:
+            feature: 要实现的功能描述
+            dir: 可选，项目根目录
+            language: 可选，编程语言
+            
+        Returns:
+            Dict[str, Any]: 执行结果
+        """
+        feature = args.get("feature")
+        dir = args.get("dir")
+        language = args.get("language", "python")
+        
+        try:
+            self.current_dir = os.getcwd()
+            self._init_coder(dir, language)
+            result = self._coder.execute(str(feature)) # type: ignore
+            return result
+        except Exception as e:
+            PrettyOutput.print(f"代码修改失败: {str(e)}", OutputType.ERROR)
+            return {
+                "success": False,
+                "stdout": "",
+                "stderr": f"执行失败: {str(e)}",
+                "error": e
+            } 
+        finally:
+            os.chdir(self.current_dir)

jarvis/utils.py

@@ -1,3 +1,4 @@
+from ast import List, Str
 import hashlib
 from pathlib import Path
 import sys
@@ -17,6 +18,9 @@ import torch
 # 初始化colorama
 colorama.init()
 
+os.environ["HF_ENDPOINT"] = "https://hf-mirror.com"
+os.environ["TOKENIZERS_PARALLELISM"] = "false"
+
 class OutputType(Enum):
     SYSTEM = "system"      # AI助手消息
     CODE = "code"         # 代码相关
@@ -213,7 +217,6 @@ def find_git_root(dir="."):
     return ret
 
 def load_embedding_model():
-    os.environ["TOKENIZERS_PARALLELISM"] = "false"
     model_name = "BAAI/bge-large-zh-v1.5"
     PrettyOutput.print(f"正在加载嵌入模型: {model_name}...", OutputType.INFO)
     try:
@@ -276,6 +279,27 @@ def load_rerank_model():
 def get_max_context_length():
     return int(os.getenv('JARVIS_MAX_CONTEXT_LENGTH', '131072'))  # 默认128k
 
+def is_long_context(files: list) -> bool:
+    """检测文件列表是否属于长上下文（总字符数超过最大上下文长度的80%）"""
+    max_length = get_max_context_length()
+    threshold = max_length * 0.8
+    total_chars = 0
+    
+    for file_path in files:
+        try:
+            with open(file_path, 'r', encoding='utf-8') as f:
+                content = f.read()
+                total_chars += len(content)
+                
+                # 提前终止检查如果已经超过阈值
+                if total_chars > threshold:
+                    return True
+        except Exception as e:
+            PrettyOutput.print(f"无法读取文件 {file_path}: {e}", OutputType.WARNING)
+            continue
+            
+    return total_chars > threshold
+
 def get_thread_count():
     return int(os.getenv('JARVIS_THREAD_COUNT', '1'))  
 

{jarvis_ai_assistant-0.1.92.dist-info → jarvis_ai_assistant-0.1.96.dist-info}/METADATA

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

@@ -1,9 +1,14 @@
-jarvis/__init__.py,sha256=B-7x9gjPocLrDGsU40qZVxV8Plx6L_NL5fV3Y4G0KPY,50
-jarvis/agent.py,sha256=GCMHORzolm-am3gEf4c-YSTxWoj5McS70JV0uFqa_cc,19373
-jarvis/main.py,sha256=Dz8OnMOcU2lW53Nm-A9enD13dBVgTza_QyOZAc82tt0,5809
-jarvis/utils.py,sha256=dYaRp8W_lQuQKioic0hIu-hB2rYRgp7sCaHGcBIEmQ0,10443
+jarvis/__init__.py,sha256=wUQ-PX-BDcjJtfA4ZlQb8sktjNJbfk0kiOu3_ZHJKyM,50
+jarvis/agent.py,sha256=vjWR-bIyac7nL3qMUOhastXMdT9PqufwRjT-h_hAnk0,19403
+jarvis/main.py,sha256=kHvlVDmjznWvXugl56M4HRb1Uedkn8lKsMEKr8tNy1Q,5824
+jarvis/utils.py,sha256=gIpS62j9cbKndvXQ7E36RQCaNOgl5bl2PRPcpiZZvew,11292
 jarvis/jarvis_codebase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_codebase/main.py,sha256=ZNGdg86urz2DJ6H7SSKRfG-v8PEmh_3mLcvZD2r1C0M,29963
+jarvis/jarvis_codebase/main.py,sha256=li3ccKSs4RwQw8EK35RssC3IHDg1PjEji0pNCC-HMtE,29885
+jarvis/jarvis_coder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_coder/git_utils.py,sha256=u5mUe_R3JDJthDoamlNOkrN3bJKf-47pf8YqCvtmYK4,2284
+jarvis/jarvis_coder/main.py,sha256=ZgmASwDsRLUx8_E_9Cnr2n_pXnyp-lHWAA1IGHwsfb8,25294
+jarvis/jarvis_coder/patch_handler.py,sha256=MPVdhWPECWMRbJa3Qg9BX_GBfbPhoq9tA7_OakTJoUA,21476
+jarvis/jarvis_coder/plan_generator.py,sha256=xtiYEE-RhexBWamBnsat_pUyzzc4IdP5PCI6p8wyqLE,2845
 jarvis/jarvis_platform/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_platform/main.py,sha256=uOv5TlxKVWO_lD2mnB7KAILkqCbezhOwiJ6g_CRQBlU,4868
 jarvis/jarvis_rag/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -11,18 +16,19 @@ jarvis/jarvis_rag/main.py,sha256=Gu8llgtBaRTg7sKMB-3pRLb0Tjs1ee_mbZLOku0kDPk,327
 jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_smart_shell/main.py,sha256=wqTbbXMaM3X6YIdOtNVF6B3Ua7fxu0XTeXBR7lfdWg0,3812
 jarvis/models/__init__.py,sha256=mrOt67nselz_H1gX9wdAO4y2DY5WPXzABqJbr5Des8k,63
-jarvis/models/ai8.py,sha256=ejMUAf614wBgmsYPkcWrCzONBcIAP4pUTy4b9hrolJY,11830
+jarvis/models/ai8.py,sha256=ARzNIg7v7-Vy5TtHHmTGV3Fn8rXbNxKw2pe_BylyADE,11887
 jarvis/models/base.py,sha256=qIpO32lejPhaZk5T3VIua3td4gEguXMaeFER5kXYwLY,1782
 jarvis/models/kimi.py,sha256=cB1tC_ifdTAZUEqndzNTIcgHWi4w4tM8zdzSOcDhOrQ,16348
 jarvis/models/ollama.py,sha256=fLVGGBfE5S_sFDiQ1ZC6-Oz9AY6EMnRqvILLi7lP-gw,5603
-jarvis/models/openai.py,sha256=W1FmaNnFSxeu-4qFQcuop5xeb-zh8-x6E-D56hMaVuA,4370
-jarvis/models/oyi.py,sha256=IWsrReLmphm-UMzxXcbAoiWP6w1fJRP3iQTlyDpSyg8,14491
+jarvis/models/openai.py,sha256=XdBsWRwlJgUwsqasux0IhUHhjo4UGZt0eg7xFQVNZhY,4400
+jarvis/models/oyi.py,sha256=ZMyX2WMHC_HG0mGCtTyJwfiARQmlLKtgOfpNP5YX0DI,14463
 jarvis/models/registry.py,sha256=SDnrNzf0wQi8mb7qbu4ZNfYIy5vhz1CxmVL3Ru-VATk,8797
 jarvis/tools/__init__.py,sha256=7Rqyj5hBAv5cWDVr5T9ZTZASO7ssBHeQNm2_4ZARdkA,72
-jarvis/tools/ask_user.py,sha256=KNRaiBlAqqAZ0uUkq_l7AKi-y9ZCLE83uLtTdd-UM0o,1919
+jarvis/tools/ask_user.py,sha256=naLLVYKKMSVkQSExvnyZbL9FHwFrpTqEQjlBFcJadp8,1865
 jarvis/tools/base.py,sha256=EGRGbdfbLXDLwtyoWdvp9rlxNX7bzc20t0Vc2VkwIEY,652
 jarvis/tools/chdir.py,sha256=TjfPbX8yvNKgUNJEMXh3ZlVDEIse_Fo8xMoVsiK7_dA,2688
 jarvis/tools/codebase_qa.py,sha256=Lk8EXkin45RKUsp5C_UHm6jADBhyCT-xsYubwJ1hSiE,2403
+jarvis/tools/coder.py,sha256=ws25Vni7Q_fKxSNyQLapqlcjlpP9jkavgJRIv78ATww,2315
 jarvis/tools/file_ops.py,sha256=h8g0eT9UvlJf4kt0DLXvdSsjcPj7x19lxWdDApeDfpg,3842
 jarvis/tools/generator.py,sha256=TB1zcw_JmRL2W9w6L4IxtrLF3gjnNw5Jj2Zrowj0eSg,5763
 jarvis/tools/methodology.py,sha256=UG6s5VYRcd9wrKX4cg6f7zJhet5AIcthFGMOAdevBiw,5175
@@ -33,9 +39,9 @@ jarvis/tools/shell.py,sha256=UPKshPyOaUwTngresUw-ot1jHjQIb4wCY5nkJqa38lU,2520
 jarvis/tools/sub_agent.py,sha256=rEtAmSVY2ZjFOZEKr5m5wpACOQIiM9Zr_3dT92FhXYU,2621
 jarvis/tools/thinker.py,sha256=yjY-JMf-Vp_UZdBNa7auvFZl8Wohcu1AqqNO2GSel-w,4598
 jarvis/tools/webpage.py,sha256=d3w3Jcjcu1ESciezTkz3n3Zf-rp_l91PrVoDEZnckOo,2391
-jarvis_ai_assistant-0.1.92.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.92.dist-info/METADATA,sha256=9caojGzGo5dmD6dtPekAul0WAlvSHlBtzP5ka0ymcq4,12766
-jarvis_ai_assistant-0.1.92.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.92.dist-info/entry_points.txt,sha256=47WUorU2y8wAKrGEVh5n6o3NaOB7A-4-PfSWp-xuFSg,286
-jarvis_ai_assistant-0.1.92.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.92.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.96.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.96.dist-info/METADATA,sha256=sPaPjxVKI7CjitabeUbJvsvujfPlkLgbmLFbBC2zkFc,12766
+jarvis_ai_assistant-0.1.96.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.96.dist-info/entry_points.txt,sha256=1D14s9v6rwpNzVD0muwe0tCKffJDEvLRBlEShbSFSbQ,331
+jarvis_ai_assistant-0.1.96.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.96.dist-info/RECORD,,

{jarvis_ai_assistant-0.1.92.dist-info → jarvis_ai_assistant-0.1.96.dist-info}/entry_points.txt

@@ -1,6 +1,7 @@
 [console_scripts]
 jarvis = jarvis.main:main
 jarvis-codebase = jarvis.jarvis_codebase.main:main
+jarvis-coder = jarvis.jarvis_coder.main:main
 jarvis-platform = jarvis.jarvis_platform.main:main
 jarvis-rag = jarvis.jarvis_rag.main:main
 jarvis-smart-shell = jarvis.jarvis_smart_shell.main:main