jarvis-ai-assistant 0.1.81__py3-none-any.whl → 0.1.83__py3-none-any.whl

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.81" 
+__version__ = "0.1.83" 

jarvis/agent.py

@@ -224,7 +224,6 @@ class Agent:
             summary = self.model.chat(self.prompt + "\n" + prompt)
             
             # 清空当前对话历史，但保留系统消息
-            self.model.delete_chat()
             self.conversation_length = 0  # 重置对话长度
             
             # 添加总结作为新的上下文
@@ -293,13 +292,12 @@ class Agent:
         return self._call_model(self.prompt)
 
 
-    def run(self, user_input: str, file_list: Optional[List[str]] = None, keep_history: bool = False) -> str:
+    def run(self, user_input: str, file_list: Optional[List[str]] = None) -> str:
         """处理用户输入并返回响应，返回任务总结报告
         
         Args:
             user_input: 用户输入的任务描述
             file_list: 可选的文件列表，默认为None
-            keep_history: 是否保留对话历史，默认为False
         
         Returns:
             str: 任务总结报告
@@ -320,12 +318,12 @@ class Agent:
             tools_prompt = ""
 
             # 选择工具
-            PrettyOutput.section("选择工具", OutputType.PLANNING)
+            PrettyOutput.section("可用工具", OutputType.PLANNING)
             tools = self.tool_registry.get_all_tools()
             if tools:
                 tools_prompt += "可用工具:\n"
                 for tool in tools:
-                    PrettyOutput.print(f"选择工具: {tool['name']}", OutputType.INFO)
+                    PrettyOutput.print(f"{tool['name']}: {tool['description']}", OutputType.INFO)
                     tools_prompt += f"- 名称: {tool['name']}\n"
                     tools_prompt += f"  描述: {tool['description']}\n"
                     tools_prompt += f"  参数: {tool['parameters']}\n"
@@ -440,13 +438,6 @@ arguments:
             PrettyOutput.print(str(e), OutputType.ERROR)
             return f"Task failed: {str(e)}"
         
-        finally:
-            # 只在不保留历史时删除会话
-            if not keep_history:
-                try:
-                    self.model.delete_chat()
-                except Exception as e:
-                    PrettyOutput.print(f"清理会话时发生错误: {str(e)}", OutputType.ERROR)
 
     def clear_history(self):
         """清除对话历史，只保留系统提示"""

jarvis/jarvis_codebase/main.py

@@ -18,7 +18,7 @@ class CodeBase:
         load_env_from_file()
         self.root_dir = root_dir
         os.chdir(self.root_dir)
-        self.thread_count = int(os.environ.get("JARVIS_THREAD_COUNT") or 10)
+        self.thread_count = int(os.environ.get("JARVIS_THREAD_COUNT") or 1)
         self.max_context_length = int(os.getenv("JARVIS_MAX_CONTEXT_LENGTH", 65536))
             
         # 初始化数据目录
@@ -395,12 +395,11 @@ class CodeBase:
         if not initial_results:
             return []
 
-        model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
-        model.set_suppress_output(True)
+        model = PlatformRegistry.get_global_platform_registry().get_codegen_platform()
+        # model.set_suppress_output(True)
 
-        try:
-            # 构建重排序的prompt
-            prompt = f"""请根据用户的查询，对以下代码文件进行相关性排序。对每个文件给出0-100的相关性分数，分数越高表示越相关。
+        # 构建重排序的prompt
+        prompt = f"""请根据用户的查询，对以下代码文件进行相关性排序。对每个文件给出0-100的相关性分数，分数越高表示越相关。
 只需要输出每个文件的分数，格式为：
 <RERANK_START>
 文件路径: 分数
@@ -411,62 +410,57 @@ class CodeBase:
 
 待评估文件:
 """
-            for path, _, desc in initial_results:
-                prompt += f"""
+        for path, _, desc in initial_results:
+            prompt += f"""
 文件: {path}
 描述: {desc}
 ---
 """
-            
-            response = model.chat(prompt)
-            
-            # 提取<RERANK_START>和<RERANK_END>之间的内容
-            start_tag = "<RERANK_START>"
-            end_tag = "<RERANK_END>"
-            if start_tag in response and end_tag in response:
-                response = response[response.find(start_tag) + len(start_tag):response.find(end_tag)]
-            
-            # 解析响应，提取文件路径和分数
-            scored_results = []
-            for line in response.split('\n'):
-                if ':' not in line:
-                    continue
-                try:
-                    file_path, score_str = line.split(':', 1)
-                    file_path = file_path.strip()
-                    score = float(score_str.strip()) / 100.0  # 转换为0-1范围
-                    # 只保留相关度大于等于0.7的结果
-                    if score >= 0.7:
-                        # 找到对应的原始描述
-                        desc = next((desc for p, _, desc in initial_results if p == file_path), "")
-                        scored_results.append((file_path, score, desc))
-                except:
-                    continue
-            
-            # 按分数降序排序
-            return sorted(scored_results, key=lambda x: x[1], reverse=True)
-            
-        finally:
-            model.delete_chat()
         
-        return initial_results
+        response = model.chat(prompt)
+        
+        # 提取<RERANK_START>和<RERANK_END>之间的内容
+        start_tag = "<RERANK_START>"
+        end_tag = "<RERANK_END>"
+        if start_tag in response and end_tag in response:
+            response = response[response.find(start_tag) + len(start_tag):response.find(end_tag)]
+        
+        # 解析响应，提取文件路径和分数
+        scored_results = []
+        for line in response.split('\n'):
+            if ':' not in line:
+                continue
+            try:
+                file_path, score_str = line.split(':', 1)
+                file_path = file_path.strip()
+                score = float(score_str.strip()) / 100.0  # 转换为0-1范围
+                # 只保留相关度大于等于0.7的结果
+                if score >= 0.7:
+                    # 找到对应的原始描述
+                    desc = next((desc for p, _, desc in initial_results if p == file_path), "")
+                    scored_results.append((file_path, score, desc))
+            except:
+                continue
+        
+        # 按分数降序排序
+        return sorted(scored_results, key=lambda x: x[1], reverse=True)
+        
 
     def search_similar(self, query: str, top_k: int = 30) -> List[Tuple[str, float, str]]:
         """搜索相似文件"""
         model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
         model.set_suppress_output(True)
         
-        try:
-            prompt = f"""请根据以下查询，生成意思完全相同的另一个表述。这个表述将用于代码搜索，所以要保持专业性和准确性。
+
+        prompt = f"""请根据以下查询，生成意思完全相同的另一个表述。这个表述将用于代码搜索，所以要保持专业性和准确性。
 原始查询: {query}
 
 请直接输出新表述，不要有编号或其他标记。
 """
+        
+        query = model.chat(prompt)
             
-            query = model.chat(prompt)
-            
-        finally:
-            model.delete_chat()
+
 
         PrettyOutput.print(f"查询:  {query}", output_type=OutputType.INFO)
         
@@ -537,11 +531,8 @@ class CodeBase:
 请用专业的语言回答用户的问题，如果给出的文件内容不足以回答用户的问题，请告诉用户，绝对不要胡编乱造。
 """
         model = PlatformRegistry.get_global_platform_registry().get_codegen_platform()
-        try:
-            response = model.chat(prompt)
-            return response
-        finally:
-            model.delete_chat()
+        response = model.chat(prompt)
+        return response
 
     def is_index_generated(self) -> bool:
         """检查索引是否已经生成"""

jarvis/jarvis_coder/main.py

@@ -68,10 +68,7 @@ class JarvisCoder:
 
     def _new_model(self):
         """获取大模型"""
-        model = PlatformRegistry().get_global_platform_registry().create_platform(self.platform)
-        if self.model:
-            model_name = self.model
-            model.set_model_name(model_name)
+        model = PlatformRegistry().get_global_platform_registry().get_codegen_platform()
         return model
 
     def _has_uncommitted_files(self) -> bool:
@@ -407,8 +404,7 @@ class JarvisCoder:
 """
         
         # 使用normal模型生成commit信息
-        model = PlatformRegistry().get_global_platform_registry().create_platform(self.platform)
-        model.set_model_name(self.model)
+        model = PlatformRegistry().get_global_platform_registry().get_codegen_platform()
         model.set_suppress_output(True)
         success, response = self._call_model_with_retry(model, prompt)
         if not success:
@@ -486,9 +482,6 @@ def main():
     parser.add_argument('-l', '--language', help='编程语言', default="python")
     args = parser.parse_args()
     
-    # 设置平台
-    if not args.platform:
-        print("错误: 未指定AI平台，请使用 -p 参数")
         
     tool = JarvisCoder(args.dir, args.language)
     

jarvis/jarvis_rag/main.py

@@ -141,6 +141,7 @@ class RAGTool:
         # 初始化配置
         self.min_paragraph_length = int(os.environ.get("JARVIS_MIN_PARAGRAPH_LENGTH", "50"))  # 最小段落长度
         self.max_paragraph_length = int(os.environ.get("JARVIS_MAX_PARAGRAPH_LENGTH", "1000"))  # 最大段落长度
+        self.context_window = int(os.environ.get("JARVIS_CONTEXT_WINDOW", "5"))  # 上下文窗口大小，默认前后各5个片段
         
         # 初始化数据目录
         self.data_dir = os.path.join(self.root_dir, ".jarvis-rag")
@@ -160,6 +161,7 @@ class RAGTool:
         self.cache_path = os.path.join(self.data_dir, "cache.pkl")
         self.documents: List[Document] = []
         self.index = None
+        self.max_context_length = int(os.getenv("JARVIS_MAX_CONTEXT_LENGTH", 65536))
         
         # 加载缓存
         self._load_cache()
@@ -424,11 +426,58 @@ class RAGTool:
         
         # 返回结果
         results = []
+        current_length = 0
+        
         for idx, distance in zip(indices[0], distances[0]):
             if idx == -1:  # FAISS返回-1表示无效结果
                 continue
+                
+            doc = self.documents[idx]
             similarity = 1.0 / (1.0 + float(distance))
-            results.append((self.documents[idx], similarity))
+            
+            # 获取同一文件中的所有文档片段
+            file_docs = [d for d in self.documents if d.metadata['file_path'] == doc.metadata['file_path']]
+            file_docs.sort(key=lambda x: x.metadata['chunk_index'])
+            
+            # 找到当前片段的索引
+            current_idx = file_docs.index(doc)
+            
+            # 尝试不同的上下文窗口大小，从最大到最小
+            added = False
+            for window_size in range(self.context_window, -1, -1):
+                start_idx = max(0, current_idx - window_size)
+                end_idx = min(len(file_docs), current_idx + window_size + 1)
+                
+                # 合并内容，包含上下文
+                content_parts = []
+                content_parts.extend(file_docs[i].content for i in range(start_idx, current_idx))
+                content_parts.append(doc.content)
+                content_parts.extend(file_docs[i].content for i in range(current_idx + 1, end_idx))
+                
+                merged_content = "\n".join(content_parts)
+                
+                # 创建文档对象
+                context_doc = Document(
+                    content=merged_content,
+                    metadata={
+                        **doc.metadata,
+                        "similarity": similarity
+                    }
+                )
+                
+                # 计算添加这个结果后的总长度
+                total_content_length = len(merged_content)
+                
+                # 检查是否在长度限制内
+                if current_length + total_content_length <= self.max_context_length:
+                    results.append((context_doc, similarity))
+                    current_length += total_content_length
+                    added = True
+                    break
+            
+            # 如果即使没有上下文也无法添加，就停止添加更多结果
+            if not added:
+                break
                 
         return results
 
@@ -443,11 +492,8 @@ class RAGTool:
             query: 查询文本
             
         Returns:
-            相关文档列表
+            相关文档列表，包含上下文
         """
-        if not self.is_index_built():
-            raise ValueError("索引未构建，请先调用build_index()")
-            
         results = self.search(query)
         return [doc for doc, _ in results]
 
@@ -471,14 +517,13 @@ class RAGTool:
             for doc in results:
                 context.append(f"""
 来源文件: {doc.metadata['file_path']}
-片段位置: {doc.metadata['chunk_index'] + 1}/{doc.metadata['total_chunks']}
 内容:
 {doc.content}
 ---
 """)
 
             # 构建提示词
-            prompt = f"""请基于以下文档片段回答用户的问题。如果文档片段中的信息不足以完整回答问题，请明确指出。
+            prompt = f"""请基于以下文档片段回答用户的问题。如果文档内容不足以完整回答问题，请明确指出。
             
 用户问题: {question}
 
@@ -525,9 +570,6 @@ def main():
             return 0
 
         if args.search or args.ask:
-            if not rag.is_index_built():
-                PrettyOutput.print("索引尚未构建，请先使用 --dir 和 --build 参数构建索引", output_type=OutputType.WARNING)
-                return 1
 
             if args.search:
                 results = rag.query(args.search)

jarvis/main.py

@@ -123,7 +123,7 @@ def main():
             selected_task = select_task(tasks)
             if selected_task:
                 PrettyOutput.print(f"\n执行任务: {selected_task}", OutputType.INFO)
-                agent.run(selected_task, args.files, keep_history=args.keep_history)
+                agent.run(selected_task, args.files)
                 return 0
         
         # 如果没有选择预定义任务，进入交互模式

jarvis/models/ai8.py

@@ -11,6 +11,8 @@ class AI8Model(BasePlatform):
     
     platform_name = "ai8"
     BASE_URL = "https://ai8.rcouyi.com"
+
+    first_time = True
     
     def __init__(self):
         """Initialize model"""
@@ -23,46 +25,47 @@ class AI8Model(BasePlatform):
         # 获取可用模型列表
         available_models = self.get_available_models()
         
-        if available_models:
-            PrettyOutput.section("支持的模型", OutputType.SUCCESS)
-            for model in self.models.values():
-                # 格式化显示模型信息
-                model_str = f"{model['value']:<30}"
-                
-                # 添加标签
-                model_str += f"{model['label']}"
-                
-                # 添加标签和积分信息
-                attrs = []
-                if model['attr'].get('tag'):
-                    attrs.append(model['attr']['tag'])
-                if model['attr'].get('integral'):
-                    attrs.append(model['attr']['integral'])
+        if AI8Model.first_time:
+            AI8Model.first_time = False
+            if available_models:
+                PrettyOutput.section("支持的模型", OutputType.SUCCESS)
+                for model in self.models.values():
+                    # 格式化显示模型信息
+                    model_str = f"{model['value']:<30}"
                     
-                # 添加特性标记
-                features = []
-                if model['attr'].get('multimodal'):
-                    features.append("多模态")
-                if model['attr'].get('plugin'):
-                    features.append("插件支持")
-                if model['attr'].get('onlyImg'):
-                    features.append("图像支持")
-                if features:
-                    model_str += f" [{'|'.join(features)}]"
+                    # 添加标签
+                    model_str += f"{model['label']}"
                     
-                # 添加备注
-                if model['attr'].get('note'):
-                    model_str += f" - {model['attr']['note']}"
-                    
-                PrettyOutput.print(model_str, OutputType.INFO)
-        else:
-            PrettyOutput.print("获取模型列表失败", OutputType.WARNING)
+                    # 添加标签和积分信息
+                    attrs = []
+                    if model['attr'].get('tag'):
+                        attrs.append(model['attr']['tag'])
+                    if model['attr'].get('integral'):
+                        attrs.append(model['attr']['integral'])
+                        
+                    # 添加特性标记
+                    features = []
+                    if model['attr'].get('multimodal'):
+                        features.append("多模态")
+                    if model['attr'].get('plugin'):
+                        features.append("插件支持")
+                    if model['attr'].get('onlyImg'):
+                        features.append("图像支持")
+                    if features:
+                        model_str += f" [{'|'.join(features)}]"
+                        
+                    # 添加备注
+                    if model['attr'].get('note'):
+                        model_str += f" - {model['attr']['note']}"
+                        
+                    PrettyOutput.print(model_str, OutputType.INFO)
+            else:
+                PrettyOutput.print("获取模型列表失败", OutputType.WARNING)
 
         self.token = os.getenv("AI8_API_KEY")
         if not self.token:
             raise Exception("AI8_API_KEY is not set")
         
-        PrettyOutput.print("使用AI8_MODEL环境变量配置模型", OutputType.SUCCESS)
         
         self.model_name = os.getenv("JARVIS_MODEL") or "deepseek-chat"
         if self.model_name not in self.models:
@@ -103,7 +106,6 @@ class AI8Model(BasePlatform):
                 return False
             
             self.conversation = data['data']
-            PrettyOutput.print(f"创建会话成功: {data['data']['id']}", OutputType.SUCCESS)
             
             # 2. 更新会话设置
             session_data = {
@@ -111,7 +113,7 @@ class AI8Model(BasePlatform):
                 "model": self.model_name,
                 "contextCount": 1024,
                 "prompt": self.system_message,
-                "plugins": ["tavily_search"],
+                "plugins": [],
                 "localPlugins": None,
                 "useAppId": 0
             }
@@ -126,7 +128,6 @@ class AI8Model(BasePlatform):
                 data = response.json()
                 if data['code'] == 0:
                     self.conversation = data['data']
-                    PrettyOutput.print("会话设置更新成功", OutputType.SUCCESS)
                     return True
                 else:
                     PrettyOutput.print(f"更新会话设置失败: {data.get('msg', '未知错误')}", OutputType.ERROR)
@@ -149,7 +150,6 @@ class AI8Model(BasePlatform):
                 "name": name,
                 "data": f"data:image/png;base64,{base64_data}"
             })
-            PrettyOutput.print(f"文件 {name} 已准备好发送", OutputType.SUCCESS)
     
     def set_system_message(self, message: str):
         """Set system message"""
@@ -158,8 +158,6 @@ class AI8Model(BasePlatform):
     def chat(self, message: str) -> str:
         """执行对话"""
         try:
-            if not self.suppress_output:
-                PrettyOutput.print("发送请求...", OutputType.PROGRESS)
             
             # 确保有会话ID
             if not self.conversation:
@@ -263,7 +261,6 @@ class AI8Model(BasePlatform):
             if response.status_code == 200:
                 data = response.json()
                 if data['code'] == 0:
-                    PrettyOutput.print("会话删除成功", OutputType.SUCCESS)
                     self.reset()
                     return True
                 else:

jarvis/models/base.py

@@ -10,6 +10,10 @@ class BasePlatform(ABC):
         self.suppress_output = False  # 添加输出控制标志
         pass
 
+    def __del__(self):
+        """销毁模型"""
+        self.delete_chat()
+
     def set_model_name(self, model_name: str):
         """设置模型名称"""
         raise NotImplementedError("set_model_name is not implemented")

jarvis/models/kimi.py

@@ -162,10 +162,8 @@ class KimiModel(BasePlatform):
         if not file_list:
             return []
 
-        PrettyOutput.print("Progress: 开始处理文件上传...", OutputType.PROGRESS)
         
         if not self.chat_id:
-            PrettyOutput.print("创建新的对话会话...", OutputType.PROGRESS)
             if not self._create_chat():
                 raise Exception("Failed to create chat session")
 
@@ -178,28 +176,23 @@ class KimiModel(BasePlatform):
                 action = "image" if mime_type and mime_type.startswith('image/') else "file"
                 
                 # 获取预签名URL
-                PrettyOutput.print("获取上传URL...", OutputType.PROGRESS)
                 presigned_data = self._get_presigned_url(file_path, action)
                 
                 # 上传文件
-                PrettyOutput.print("上传文件内容...", OutputType.PROGRESS)
                 if self._upload_file(file_path, presigned_data["url"]):
                     # 获取文件信息
-                    PrettyOutput.print("获取文件信息...", OutputType.PROGRESS)
+                    file_info = self._get_file_info(presigned_data, os.path.basename(file_path), action)
                     file_info = self._get_file_info(presigned_data, os.path.basename(file_path), action)
                     # 等待文件解析
-                    PrettyOutput.print("等待文件解析完成...", OutputType.PROGRESS)
 
                     # 只有文件需要解析
                     if action == "file":
                         if self._wait_for_parse(file_info["id"]):
                             uploaded_files.append(file_info)
-                            PrettyOutput.print(f"Success: 文件处理成功: {file_path}", OutputType.SUCCESS)
                         else:
                             PrettyOutput.print(f"✗ 文件解析失败: {file_path}", OutputType.ERROR)
                     else:
                         uploaded_files.append(file_info)
-                        PrettyOutput.print(f"Success: 文件处理成功: {file_path}", OutputType.SUCCESS)
                 else:
                     PrettyOutput.print(f"Error: 文件上传失败: {file_path}", OutputType.ERROR)
                     
@@ -207,19 +200,12 @@ class KimiModel(BasePlatform):
                 PrettyOutput.print(f"✗ 处理文件出错 {file_path}: {str(e)}", OutputType.ERROR)
                 continue
         
-        if uploaded_files:
-            PrettyOutput.print(f"成功处理 {len(uploaded_files)}/{len(file_list)} 个文件", OutputType.SUCCESS)
-        else:
-            PrettyOutput.print("没有文件成功处理", OutputType.ERROR)
-        
         self.uploaded_files = uploaded_files
         return uploaded_files
 
     def chat(self, message: str) -> str:
         """发送消息并获取响应"""
         if not self.chat_id:
-            if not self.suppress_output:
-                PrettyOutput.print("创建新的对话会话...", OutputType.PROGRESS)
             if not self._create_chat():
                 raise Exception("Failed to create chat session")
 
@@ -230,15 +216,11 @@ class KimiModel(BasePlatform):
         refs_file = []
         if self.first_chat:
             if self.uploaded_files:
-                if not self.suppress_output:
-                    PrettyOutput.print(f"首次对话，引用 {len(self.uploaded_files)} 个文件...", OutputType.PROGRESS)
                 refs = [f["id"] for f in self.uploaded_files]
                 refs_file = self.uploaded_files
             message = self.system_message + "\n" + message
             self.first_chat = False
         
-        if not self.suppress_output:
-            PrettyOutput.print("发送请求...", OutputType.PROGRESS)
         payload = {
             "messages": [{"role": "user", "content": message}],
             "use_search": True,
@@ -263,9 +245,6 @@ class KimiModel(BasePlatform):
             search_results = []
             ref_sources = []
             
-            if not self.suppress_output:
-                PrettyOutput.print("接收响应...", OutputType.PROGRESS)
-            
             for line in response.iter_lines():
                 if not line:
                     continue
@@ -382,7 +361,6 @@ class KimiModel(BasePlatform):
         try:
             response = while_success(lambda: requests.delete(url, headers=headers), sleep_time=5)
             if response.status_code == 200:
-                PrettyOutput.print("会话已删除", OutputType.SUCCESS)
                 self.reset()
                 return True
             else:

jarvis/models/openai.py

@@ -54,8 +54,6 @@ class OpenAIModel(BasePlatform):
     def chat(self, message: str) -> str:
         """执行对话"""
         try:
-            if not self.suppress_output:
-                PrettyOutput.print("发送请求...", OutputType.PROGRESS)
             
             # 添加用户消息到历史记录
             self.messages.append({"role": "user", "content": message})
@@ -66,8 +64,6 @@ class OpenAIModel(BasePlatform):
                 stream=True
             )
             
-            if not self.suppress_output:
-                PrettyOutput.print("接收响应...", OutputType.PROGRESS)
             full_response = ""
             
             for chunk in response:

jarvis/models/oyi.py

@@ -11,6 +11,8 @@ class OyiModel(BasePlatform):
     
     platform_name = "oyi"
     BASE_URL = "https://api-10086.rcouyi.com"
+
+    first_time = True
     
     def __init__(self):
         """Initialize model"""
@@ -19,11 +21,14 @@ class OyiModel(BasePlatform):
         
         # 获取可用模型列表
         available_models = self.get_available_models()
-        if available_models:
-            for model in available_models:
-                PrettyOutput.print(model, OutputType.INFO)
-        else:
-            PrettyOutput.print("获取模型列表失败", OutputType.WARNING)
+
+        if OyiModel.first_time:
+            OyiModel.first_time = False
+            if available_models:
+                for model in available_models:
+                    PrettyOutput.print(model, OutputType.INFO)
+            else:
+                PrettyOutput.print("获取模型列表失败", OutputType.WARNING)
         
         self.messages = []
         self.system_message = ""
@@ -85,7 +90,6 @@ class OyiModel(BasePlatform):
                 data = response.json()
                 if data['code'] == 200 and data['type'] == 'success':
                     self.conversation = data
-                    PrettyOutput.print(f"创建会话成功: {data['result']['id']}", OutputType.SUCCESS)
                     return True
                 else:
                     PrettyOutput.print(f"创建会话失败: {data['message']}", OutputType.ERROR)
@@ -112,9 +116,6 @@ class OyiModel(BasePlatform):
             str: Model response
         """
         try:
-            if not self.suppress_output:
-                PrettyOutput.print("发送请求...", OutputType.PROGRESS)
-            
             # 确保有会话ID
             if not self.conversation:
                 if not self.create_conversation():
@@ -184,7 +185,6 @@ class OyiModel(BasePlatform):
             
             if response.status_code == 200:
                 if not self.suppress_output:
-                    PrettyOutput.print("接收响应...", OutputType.PROGRESS)
                     PrettyOutput.print(response.text, OutputType.SYSTEM)
                 self.messages.append({"role": "assistant", "content": response.text})
                 return response.text
@@ -232,7 +232,6 @@ class OyiModel(BasePlatform):
             if response.status_code == 200:
                 data = response.json()
                 if data['code'] == 200 and data['type'] == 'success':
-                    PrettyOutput.print("会话删除成功", OutputType.SUCCESS)
                     self.reset()
                     return True
                 else:
@@ -294,7 +293,6 @@ class OyiModel(BasePlatform):
                     if response.status_code == 200:
                         data = response.json()
                         if data.get('code') == 200:
-                            PrettyOutput.print("文件上传成功", OutputType.SUCCESS)
                             self.upload_files.append(data)
                             return data
                         else:

jarvis/tools/generator.py

@@ -102,7 +102,6 @@ class ExampleTool:
 
         # 调用模型生成代码
         response = model.chat(prompt)
-        model.delete_chat()
 
         # 提取代码块
         code_start = response.find("```python")

{jarvis_ai_assistant-0.1.81.dist-info → jarvis_ai_assistant-0.1.83.dist-info}/METADATA

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

@@ -1,21 +1,21 @@
-jarvis/__init__.py,sha256=B8CWgNiQrlCsbghyy-YN5DH1HNMJhUoKmyegydchC2w,50
-jarvis/agent.py,sha256=9cWBHjxrlqnI1GV3wB4wPvZUwK7d63ysyX40zqapNRc,19373
-jarvis/main.py,sha256=OJc7e5i988eQLByT7SzX7eoa0HKm4LMg814gZv9hBX8,5487
+jarvis/__init__.py,sha256=S9oTgBnIxuAWrIt79cFytfBwF-uR1VoqSb-FgvZCcF0,50
+jarvis/agent.py,sha256=2g2fl9BFosi4YasIEUgutS1pX6AMTf2wit5V0bZILMU,18944
+jarvis/main.py,sha256=ksZkJzqc4oow6wB-7QbGJLejGblrbZtRI3fdciS5DS4,5455
 jarvis/utils.py,sha256=jvo6ylvrTaSmXWcYY0qTTf14TwCkAhPsCUuIl5WHEuw,8640
 jarvis/jarvis_codebase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_codebase/main.py,sha256=z6HRTkUjAhRQclfHqj4yt3wq_wxiRlp0OCJsL_99NfI,24884
+jarvis/jarvis_codebase/main.py,sha256=rlcN44mm67c-ZlCtcsq52jmqWlf4wPxvc-_HbgmoXOk,24510
 jarvis/jarvis_coder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_coder/main.py,sha256=WZCjtlPDEvg2y6F6e4djc4xYWXM3eB_0pHrPpvlZEC4,23890
+jarvis/jarvis_coder/main.py,sha256=TxtFCzA5SJSorHtHX5_V3qQeJsoFMgVdrwxLJ9GnPw8,23619
 jarvis/jarvis_rag/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_rag/main.py,sha256=drCH9KmwQozxtPICIfTFXmkIhwN8WDreMOCTxtj9SPc,20842
+jarvis/jarvis_rag/main.py,sha256=6G5rpcedxzALanGtXdhBxKR_uG4Sjiei8qolI-BuDp4,22682
 jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_smart_shell/main.py,sha256=QgR1CZRcTVfC8a5hMso3onH3pFdDoniRjr0YQvY2jXQ,3809
 jarvis/models/__init__.py,sha256=mrOt67nselz_H1gX9wdAO4y2DY5WPXzABqJbr5Des8k,63
-jarvis/models/ai8.py,sha256=vgy-r_3HHxGMAalZrA65VWHC1PuwBTYgtprSgHkCbrk,12557
-jarvis/models/base.py,sha256=ShV1H8Unee4RMaiFO4idROQA0Hc6wu4dyeRPX5fcszk,1433
-jarvis/models/kimi.py,sha256=1iTB0Z_WOmCML3Ufsge6jmeKOYvccr7I5lS3JUXymU4,17611
-jarvis/models/openai.py,sha256=ayaBWAN5VexMcKVrjEPDNB-Q9wx0sCV9Z4BCrvwYJ9w,4315
-jarvis/models/oyi.py,sha256=X2c5SWDIuQDCCFBcEKbzIWEz3I34eOAi0d1XAFgxlpw,15001
+jarvis/models/ai8.py,sha256=P_p1ceyjn_olFk38WsubHGavWI9bMEBzo-1vo97HLPE,12215
+jarvis/models/base.py,sha256=vQmgr-l0fRzVTUX4orbQZIKsXEInagjFdYv1cL9Hp7U,1511
+jarvis/models/kimi.py,sha256=ltYoHQDn9vfZyhZ25eUVKMBpxKKlqlw4kManozVF7uo,16135
+jarvis/models/openai.py,sha256=XiZ0omZdaOfDVdmXX-IA-Dg78R8xIH429L6j0R_yHSI,4083
+jarvis/models/oyi.py,sha256=tdsBf3gegrEDkZf2VOJF9SRLwe9s2g8Al9s-qR9YQRg,14633
 jarvis/models/registry.py,sha256=Lt8IdVBAEx_CCFtfZJPgw3nxSEjfFcqI47I-U64kIbg,8257
 jarvis/tools/__init__.py,sha256=7Rqyj5hBAv5cWDVr5T9ZTZASO7ssBHeQNm2_4ZARdkA,72
 jarvis/tools/ask_user.py,sha256=xLXkYK3_f8EJ7kudA8MumOOCxyFl6z3DBS_zcscMH6Y,2151
@@ -24,16 +24,16 @@ jarvis/tools/chdir.py,sha256=TjfPbX8yvNKgUNJEMXh3ZlVDEIse_Fo8xMoVsiK7_dA,2688
 jarvis/tools/codebase_qa.py,sha256=LsowsgL7HBmdBwa7zXcYi_OkwOok4qbnzYWYsuZxHtU,2413
 jarvis/tools/coder.py,sha256=kmotT2Klsug44S51QoSW9DzkxLzcF-XonyYAEoWZV6c,2295
 jarvis/tools/file_ops.py,sha256=h8g0eT9UvlJf4kt0DLXvdSsjcPj7x19lxWdDApeDfpg,3842
-jarvis/tools/generator.py,sha256=S1DhHBfhNvF6SrORnlk8Mz210yDiJPuxbfswbX_UACs,5791
+jarvis/tools/generator.py,sha256=TB1zcw_JmRL2W9w6L4IxtrLF3gjnNw5Jj2Zrowj0eSg,5763
 jarvis/tools/methodology.py,sha256=UG6s5VYRcd9wrKX4cg6f7zJhet5AIcthFGMOAdevBiw,5175
 jarvis/tools/registry.py,sha256=sgj5EVbRgfHSzXW5v-kbIZS_8cwAxTjHvSPAicxBRf4,9074
 jarvis/tools/search.py,sha256=c9dXtyICdl8Lm8shNPNyIx9k67uY0rMF8xnIKu2RsnE,8787
 jarvis/tools/shell.py,sha256=UPKshPyOaUwTngresUw-ot1jHjQIb4wCY5nkJqa38lU,2520
 jarvis/tools/sub_agent.py,sha256=rEtAmSVY2ZjFOZEKr5m5wpACOQIiM9Zr_3dT92FhXYU,2621
 jarvis/tools/webpage.py,sha256=d3w3Jcjcu1ESciezTkz3n3Zf-rp_l91PrVoDEZnckOo,2391
-jarvis_ai_assistant-0.1.81.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.81.dist-info/METADATA,sha256=kVZXWoV6abWKNXWGuVA5Q0jodwrVDIgATc2jJEVhq6o,12736
-jarvis_ai_assistant-0.1.81.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.81.dist-info/entry_points.txt,sha256=sdmIO86MrIUepJTGyHs0i_Ho9VGf1q9YRP4RgQvGWcI,280
-jarvis_ai_assistant-0.1.81.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.81.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.83.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.83.dist-info/METADATA,sha256=7r6J3Z_AjmLRXsQjyIVtJ1F4DnmepO_ES8PLFIE_BLY,12736
+jarvis_ai_assistant-0.1.83.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.83.dist-info/entry_points.txt,sha256=sdmIO86MrIUepJTGyHs0i_Ho9VGf1q9YRP4RgQvGWcI,280
+jarvis_ai_assistant-0.1.83.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.83.dist-info/RECORD,,