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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.181
+Version: 0.1.183
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -153,6 +153,35 @@ Kimi API Key获取方式：
 删除Bearer前缀，剩下的内容就是Kimi API Key。
 
 
+#### 通义千问
+```yaml
+JARVIS_PLATFORM: tongyi
+JARVIS_MODEL: Normal  # 可选模型：Normal, Thinking, Deep-Research, Code-Chat
+JARVIS_THINKING_PLATFORM: tongyi
+JARVIS_THINKING_MODEL: Thinking
+
+ENV:
+  TONGYI_COOKIES: <通义千问cookies>
+```
+
+通义千问cookies获取方式：
+
+![通义千问cookies获取方式](docs/images/tongyi.png)
+
+1. 登录[通义千问](https://www.tongyi.com/qianwen)
+2. 打开浏览器开发者工具（F12）
+3. 在Network标签页中找到任意请求
+4. 在请求头中找到Cookie字段，复制其值
+
+配置说明：
+1. `TONGYI_COOKIES`: 必填，用于身份验证
+2. 支持的模型：
+   - `Normal`: 标准对话模型
+   - `Thinking`: 深度思考模型
+   - `Deep-Research`: 深度研究模型
+   - `Code-Chat`: 代码对话模型
+
+
 #### OpenAI
 ```yaml
 JARVIS_PLATFORM: openai

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

@@ -83,6 +83,35 @@ Kimi API Key获取方式：
 删除Bearer前缀，剩下的内容就是Kimi API Key。
 
 
+#### 通义千问
+```yaml
+JARVIS_PLATFORM: tongyi
+JARVIS_MODEL: Normal  # 可选模型：Normal, Thinking, Deep-Research, Code-Chat
+JARVIS_THINKING_PLATFORM: tongyi
+JARVIS_THINKING_MODEL: Thinking
+
+ENV:
+  TONGYI_COOKIES: <通义千问cookies>
+```
+
+通义千问cookies获取方式：
+
+![通义千问cookies获取方式](docs/images/tongyi.png)
+
+1. 登录[通义千问](https://www.tongyi.com/qianwen)
+2. 打开浏览器开发者工具（F12）
+3. 在Network标签页中找到任意请求
+4. 在请求头中找到Cookie字段，复制其值
+
+配置说明：
+1. `TONGYI_COOKIES`: 必填，用于身份验证
+2. 支持的模型：
+   - `Normal`: 标准对话模型
+   - `Thinking`: 深度思考模型
+   - `Deep-Research`: 深度研究模型
+   - `Code-Chat`: 代码对话模型
+
+
 #### OpenAI
 ```yaml
 JARVIS_PLATFORM: openai

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

@@ -8,7 +8,7 @@ default = true
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.181"
+version = "0.1.183"
 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.181 → jarvis_ai_assistant-0.1.183}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.181",
+    version="0.1.183",
     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.181 → jarvis_ai_assistant-0.1.183}/src/jarvis/__init__.py

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

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

@@ -2,7 +2,7 @@
 # 标准库导入
 import datetime
 import platform
-from typing import Any, Callable, List, Optional, Protocol, Tuple, Union
+from typing import Any, Callable, Dict, List, Optional, Protocol, Tuple, Union
 
 # 第三方库导入
 from yaspin import yaspin  # type: ignore
@@ -205,6 +205,8 @@ class Agent:
         if model_name is not None:
             self.model.set_model_name(model_name)
 
+        self.user_data: Dict[str, Any] = {}
+
         self.model.set_suppress_output(False)
 
         from jarvis.jarvis_tools.registry import ToolRegistry
@@ -319,6 +321,14 @@ class Agent:
         )
         self.first = True
 
+    def set_user_data(self, key: str, value: Any):
+        """设置用户数据"""
+        self.user_data[key] = value
+
+    def get_user_data(self, key: str) -> Optional[Any]:
+        """获取用户数据"""
+        return self.user_data.get(key, None)
+
     def set_use_tools(self, use_tools):
         """设置要使用的工具列表"""
         from jarvis.jarvis_tools.registry import ToolRegistry
@@ -372,7 +382,7 @@ class Agent:
         )
 
         addon_prompt = f"""
-[系统提示开始]
+<system_prompt>
     请判断是否已经完成任务，如果已经完成：
     - 直接输出完成原因，不需要再有新的操作，不要输出{ot("TOOL_CALL")}标签
     {complete_prompt}
@@ -381,7 +391,7 @@ class Agent:
     - 如果信息不明确，请请求用户补充
     - 如果执行过程中连续失败5次，请使用ask_user询问用户操作
     - 操作列表：{action_handlers}
-[系统提示结束]
+</system_prompt>
 
 请继续。
 """

jarvis_ai_assistant-0.1.183/src/jarvis/jarvis_agent/file_input_handler.py

@@ -0,0 +1,112 @@
+# -*- coding: utf-8 -*-
+
+
+import os
+import re
+from typing import Any, Tuple
+
+from yaspin import yaspin
+
+from jarvis.jarvis_tools.file_operation import FileOperationTool
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.utils import is_context_overflow
+
+
+def file_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
+    """Process user input containing file references and read file contents.
+    
+    Args:
+        user_input: Input string that may contain file references in format:
+            - 'file_path' (whole file)
+            - 'file_path:start_line,end_line' (line range)
+            - 'file_path:start_line:end_line' (alternative range format)
+        agent: Agent object for further processing (currently unused)
+        
+    Returns:
+        Tuple[str, bool]: 
+            - Processed prompt string with file contents prepended
+            - Boolean indicating if context overflow occurred
+    """
+    prompt = user_input
+    files = []
+
+    file_refs = re.findall(r"'([^']+)'", user_input)
+    for ref in file_refs:
+        # Handle file:start,end or file:start:end format
+        if ':' in ref:
+            file_path, line_range = ref.split(':', 1)
+            # Initialize with default values
+            start_line = 1  # 1-based
+            end_line = -1
+
+            # Process line range if specified
+            if ',' in line_range or ':' in line_range:
+                try:
+                    raw_start, raw_end = map(int, re.split(r'[,:]', line_range))
+
+                    # Handle special values and Python-style negative indices
+                    try:
+                        with open(file_path, 'r', encoding='utf-8', errors="ignore") as f:
+                            total_lines = len(f.readlines())
+                    except FileNotFoundError:
+                        PrettyOutput.print(f"文件不存在: {file_path}", OutputType.WARNING)
+                        continue
+                    # Process start line (0 means whole file, negative means from end)
+                    if raw_start == 0:  # 0表示整个文件
+                        start_line = 1
+                        end_line = total_lines
+                    else:
+                        start_line = raw_start if raw_start > 0 else total_lines + raw_start + 1
+
+                    # Process end line
+                    if raw_end == 0:  # 0表示整个文件（如果start也是0）
+                        end_line = total_lines
+                    else:
+                        end_line = raw_end if raw_end > 0 else total_lines + raw_end + 1
+
+                    # Auto-correct ranges
+                    start_line = max(1, min(start_line, total_lines))
+                    end_line = max(start_line, min(end_line, total_lines))
+
+                    # Final validation
+                    if start_line < 1 or end_line > total_lines or start_line > end_line:
+                        raise ValueError
+
+                except:
+                    continue
+
+            # Add file if it exists
+            if os.path.isfile(file_path):
+                files.append({
+                    "path": file_path,
+                    "start_line": start_line,
+                    "end_line": end_line
+                })
+        else:
+            # Handle simple file path
+            if os.path.isfile(ref):
+                files.append({
+                    "path": ref,
+                    "start_line": 1,  # 1-based
+                    "end_line": -1
+                })
+
+    # Read and process files if any were found
+    if files:
+        with yaspin(text="正在读取文件...", color="cyan") as spinner:
+            old_prompt = prompt
+            result = FileOperationTool().execute({"operation":"read","files": files})
+            if result["success"]:
+                spinner.text = "文件读取完成"
+                spinner.ok("✅")
+                # Prepend file contents to prompt and check for overflow
+                prompt = f"""{prompt} 
+
+<file_context>
+{result["stdout"]}
+</file_context>"""
+                if is_context_overflow(prompt):
+                    return old_prompt, False
+
+    return prompt, False
+

{jarvis_ai_assistant-0.1.181 → jarvis_ai_assistant-0.1.183}/src/jarvis/jarvis_code_agent/code_agent.py

@@ -15,6 +15,7 @@ from yaspin import yaspin  # type: ignore
 from jarvis import __version__
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_agent.builtin_input_handler import builtin_input_handler
+from jarvis.jarvis_agent.file_input_handler import file_input_handler
 from jarvis.jarvis_agent.shell_input_handler import shell_input_handler
 # 忽略yaspin的类型检查
 from jarvis.jarvis_code_agent.lint import get_lint_tools
@@ -108,6 +109,7 @@ class CodeAgent:
             output_handler=[tool_registry],
             platform=platform_instance,
             input_handler=[
+                file_input_handler,
                 shell_input_handler,
                 builtin_input_handler
             ],

{jarvis_ai_assistant-0.1.181 → jarvis_ai_assistant-0.1.183}/src/jarvis/jarvis_platform/kimi.py

@@ -315,7 +315,7 @@ class KimiModel(BasePlatform):
 
     def name(self) -> str:
         """Model name"""
-        return "kimi"
+        return self.model_name
 
     def support_web(self) -> bool:
         """Kimi平台支持web功能"""

{jarvis_ai_assistant-0.1.181 → jarvis_ai_assistant-0.1.183}/src/jarvis/jarvis_platform/registry.py

@@ -19,7 +19,6 @@ REQUIRED_METHODS = [
     ('set_system_message', ['message']),
     ('set_model_name', ['model_name']),
     ('get_model_list', []),
-    ('set_suppress_output', ['suppress']),
     ('upload_files', ['file_list']),
 ]