jarvis-ai-assistant 0.1.183__tar.gz → 0.1.185__tar.gz

{jarvis_ai_assistant-0.1.183/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.185}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.183
+Version: 0.1.185
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -85,7 +85,7 @@ Dynamic: requires-python
 
 ## 🌟 核心特色 <a id="core-features"></a>
 
-- 🆓 零成本接入：无缝集成元宝、Kimi等优质模型，无需支付API费用，同时保留强大的文件处理、搜索和推理能力
+- 🆓 零成本接入：无缝集成腾讯元宝(推荐首选)、Kimi等优质模型，无需支付API费用，同时保留强大的文件处理、搜索和推理能力
 - 🛠️ 工具驱动：内置丰富工具集，涵盖脚本执行、代码开发、网页搜索、终端操作等核心功能
 - 👥 人机协作：支持实时交互，用户可随时介入指导，确保AI行为符合预期
 - 🔌 高度可扩展：支持自定义工具和平台，轻松集成MCP协议
@@ -117,9 +117,9 @@ pip3 install jarvis-ai-assistant
 
 将以下配置写入到`~/.jarvis/config.yaml`文件中。
 
-#### 腾讯元宝
+#### 腾讯元宝 (推荐首选)
 ```yaml
-JARVIS_PLATFORM: yuanbao
+JARVIS_PLATFORM: yuanbao  # 推荐使用腾讯元宝平台，适配性最佳
 JARVIS_MODEL: deep_seek_v3
 JARVIS_THINKING_PLATFORM: yuanbao
 JARVIS_THINKING_MODEL: deep_seek

{jarvis_ai_assistant-0.1.183 → jarvis_ai_assistant-0.1.185}/README.md

@@ -15,7 +15,7 @@
 
 ## 🌟 核心特色 <a id="core-features"></a>
 
-- 🆓 零成本接入：无缝集成元宝、Kimi等优质模型，无需支付API费用，同时保留强大的文件处理、搜索和推理能力
+- 🆓 零成本接入：无缝集成腾讯元宝(推荐首选)、Kimi等优质模型，无需支付API费用，同时保留强大的文件处理、搜索和推理能力
 - 🛠️ 工具驱动：内置丰富工具集，涵盖脚本执行、代码开发、网页搜索、终端操作等核心功能
 - 👥 人机协作：支持实时交互，用户可随时介入指导，确保AI行为符合预期
 - 🔌 高度可扩展：支持自定义工具和平台，轻松集成MCP协议
@@ -47,9 +47,9 @@ pip3 install jarvis-ai-assistant
 
 将以下配置写入到`~/.jarvis/config.yaml`文件中。
 
-#### 腾讯元宝
+#### 腾讯元宝 (推荐首选)
 ```yaml
-JARVIS_PLATFORM: yuanbao
+JARVIS_PLATFORM: yuanbao  # 推荐使用腾讯元宝平台，适配性最佳
 JARVIS_MODEL: deep_seek_v3
 JARVIS_THINKING_PLATFORM: yuanbao
 JARVIS_THINKING_MODEL: deep_seek

{jarvis_ai_assistant-0.1.183 → jarvis_ai_assistant-0.1.185}/pyproject.toml

@@ -8,7 +8,7 @@ default = true
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.183"
+version = "0.1.185"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]

{jarvis_ai_assistant-0.1.183 → jarvis_ai_assistant-0.1.185}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.183",
+    version="0.1.185",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.1.183 → jarvis_ai_assistant-0.1.185}/src/jarvis/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.183"
+__version__ = "0.1.185"

{jarvis_ai_assistant-0.1.183 → jarvis_ai_assistant-0.1.185}/src/jarvis/jarvis_agent/__init__.py

@@ -4,6 +4,8 @@ import datetime
 import platform
 from typing import Any, Callable, Dict, List, Optional, Protocol, Tuple, Union
 
+from jarvis.jarvis_platform.base import BasePlatform
+
 # 第三方库导入
 from yaspin import yaspin  # type: ignore
 
@@ -166,7 +168,9 @@ class Agent:
         multiline_inputer: Optional[Callable[[str], str]] = None,
         use_methodology: Optional[bool] = None,
         use_analysis: Optional[bool] = None,
+        files: List[str] = [],
     ):
+        self.files = files
         """初始化Jarvis Agent实例
 
         参数:
@@ -218,8 +222,9 @@ class Agent:
             multiline_inputer if multiline_inputer else get_multiline_input
         )
 
+        # 如果有上传文件，自动禁用方法论
         self.use_methodology = (
-            use_methodology if use_methodology is not None else is_use_methodology()
+            False if files else (use_methodology if use_methodology is not None else is_use_methodology())
         )
         self.use_analysis = (
             use_analysis if use_analysis is not None else is_use_analysis()
@@ -766,27 +771,31 @@ arguments:
         try:
             set_agent(self.name, self)
 
+            for handler in self.input_handler:
+                user_input, _ = handler(user_input, self)
+
             self.prompt = f"{user_input}"
 
-            if self.first and self.use_methodology:
-                # 先尝试上传方法轮
-                platform = self.model if hasattr(self.model, "upload_files") else None
-                if platform and upload_methodology(platform):
-                    self.prompt = f"{user_input}\n\n方法论已上传到平台，请参考平台上的方法论内容"
-                else:
-                    msg = user_input
-                    for handler in self.input_handler:
-                        msg, _ = handler(msg, self)
-                    # 上传失败则回退到本地加载
-                    self.prompt = f"{user_input}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(msg, self.get_tool_registry())}"
+            if self.first:
+                # 如果有上传文件，先上传文件
+                if self.files and isinstance(self.model, BasePlatform) and hasattr(self.model, "upload_files"):
+                    self.model.upload_files(self.files)
+                    self.prompt = f"{user_input}\n\n已上传{len(self.files)}个文件到平台"
+                
+                # 如果启用方法论且没有上传文件，上传方法论
+                elif self.use_methodology:
+                    platform = self.model if hasattr(self.model, "upload_files") else None
+                    if platform and upload_methodology(platform):
+                        self.prompt = f"{user_input}\n\n方法论已上传到平台，请参考平台上的方法论内容"
+                    else:
+                        # 上传失败则回退到本地加载
+                        self.prompt = f"{user_input}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(user_input, self.get_tool_registry())}"
 
                 self.first = False
 
             self.conversation_length = get_context_token_count(self.prompt)
             while True:
                 try:
-                    # 如果对话历史长度超过限制，在提示中添加提醒
-
                     current_response = self._call_model(self.prompt, True)
                     self.prompt = ""
                     self.conversation_length += get_context_token_count(

{jarvis_ai_assistant-0.1.183 → jarvis_ai_assistant-0.1.185}/src/jarvis/jarvis_agent/file_input_handler.py

@@ -95,7 +95,7 @@ def file_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
     if files:
         with yaspin(text="正在读取文件...", color="cyan") as spinner:
             old_prompt = prompt
-            result = FileOperationTool().execute({"operation":"read","files": files})
+            result = FileOperationTool().execute({"operation":"read","files": files, "agent": agent})
             if result["success"]:
                 spinner.text = "文件读取完成"
                 spinner.ok("✅")