jarvis-ai-assistant 0.1.11__py3-none-any.whl → 0.1.13__py3-none-any.whl

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.11" 
+__version__ = "0.1.13" 

jarvis/agent.py

@@ -105,6 +105,13 @@ class Agent:
 
 {tools_prompt}
 
+关键规则：
+‼️ 禁止创建虚假对话
+‼️ 禁止假设用户回应
+‼️ 禁止在没有实际用户输入时继续
+‼️ 只回应用户实际说的内容
+‼️ 每个动作后停止并等待
+
 ReAct 框架：
 1. 思考
    - 分析当前情况

jarvis/main.py

@@ -82,7 +82,25 @@ def main():
     try:
         kimi_api_key = os.getenv("KIMI_API_KEY")
         if not kimi_api_key:
-            PrettyOutput.print("Kimi API key 未设置", OutputType.ERROR)
+            PrettyOutput.section("环境配置缺失", OutputType.ERROR)
+            PrettyOutput.print("\n需要设置 KIMI_API_KEY 才能使用 Jarvis。请按以下步骤操作：", OutputType.INFO, timestamp=False)
+            PrettyOutput.print("\n1. 获取 Kimi API Key:", OutputType.INFO, timestamp=False)
+            PrettyOutput.print("   • 访问 Kimi AI 平台: https://kimi.moonshot.cn", OutputType.INFO, timestamp=False)
+            PrettyOutput.print("   • 登录您的账号", OutputType.INFO, timestamp=False)
+            PrettyOutput.print("   • 打开浏览器开发者工具 (F12 或右键 -> 检查)", OutputType.INFO, timestamp=False)
+            PrettyOutput.print("   • 切换到 Network 标签页", OutputType.INFO, timestamp=False)
+            PrettyOutput.print("   • 发送任意消息", OutputType.INFO, timestamp=False)
+            PrettyOutput.print("   • 在请求中找到 Authorization 头部", OutputType.INFO, timestamp=False)
+            PrettyOutput.print("   • 复制 token 值（去掉 'Bearer ' 前缀）", OutputType.INFO, timestamp=False)
+            
+            PrettyOutput.print("\n2. 设置环境变量:", OutputType.INFO, timestamp=False)
+            PrettyOutput.print("   方法 1: 创建或编辑 ~/.jarvis_env 文件:", OutputType.INFO, timestamp=False)
+            PrettyOutput.print("   echo 'KIMI_API_KEY=your_key_here' > ~/.jarvis_env", OutputType.CODE, timestamp=False)
+            
+            PrettyOutput.print("\n   方法 2: 直接设置环境变量:", OutputType.INFO, timestamp=False)
+            PrettyOutput.print("   export KIMI_API_KEY=your_key_here", OutputType.CODE, timestamp=False)
+            
+            PrettyOutput.print("\n设置完成后重新运行 Jarvis。", OutputType.INFO, timestamp=False)
             return 1
         
         model = KimiModel(kimi_api_key)

{jarvis_ai_assistant-0.1.11.dist-info → jarvis_ai_assistant-0.1.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.11
+Version: 0.1.13
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -36,7 +36,7 @@ Dynamic: requires-python
   <img src="docs/images/jarvis-logo.png" alt="Jarvis Logo" width="200"/>
 </p>
 
-[![PyPI version](https://badge.fury.io/py/jarvis-ai.svg)](https://badge.fury.io/py/jarvis-ai)
+[![PyPI version](https://badge.fury.io/py/jarvis-ai-assistant.svg)](https://badge.fury.io/py/jarvis-ai-assistant)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![Python 3.8+](https://img.shields.io/badge/python-3.8+-blue.svg)](https://www.python.org/downloads/)
 
@@ -54,20 +54,59 @@ Dynamic: requires-python
 
 ## 🌟 Features
 
-🤖 **Multiple AI Models**
-- Ollama integration (llama3.2, qwen2.5:14b)
-- DuckDuckGo AI search capabilities
+🤖 **AI Integration**
+- Kimi AI integration with streaming responses
+- Context-aware conversations
+- File understanding capabilities
 
 🛠️ **Rich Tool Integration**
-- RAG (Retrieval-Augmented Generation)
-- File operations & Shell commands
-- Web search & content extraction
-- Python code execution with dependency management
+- Shell command execution
+- File operations (read/write/append)
+- Task automation
+- Predefined task support
 
 🔄 **Interactive Experience**
 - Natural language understanding
 - Context-aware responses
 - User-friendly interface
+- Multi-line input support
+- Colored output with progress indicators
+
+
+## ⚙️ Environment Setup
+
+Before using Jarvis, you need to set up your environment:
+
+1. **API Key Configuration**
+
+Create a `.jarvis_env` file in your home directory (`~/.jarvis_env`):
+
+```bash
+KIMI_API_KEY=your_kimi_api_key_here
+```
+
+To get your Kimi API key:
+1. Visit [Kimi AI Platform](https://kimi.moonshot.cn) in your browser
+2. Login to your account
+3. Open browser Developer Tools (F12 or right-click -> Inspect)
+4. Go to Network tab
+5. Make any request (e.g., send a message)
+6. Find a request to the Kimi API
+7. Look for the `Authorization` header in the request headers
+8. Copy the token value (remove the "Bearer " prefix)
+9. Use this token as your `KIMI_API_KEY` in the `.jarvis_env` file
+
+2. **Task Configuration (Optional)**
+
+Create a `.jarvis` file in your working directory to define predefined tasks:
+
+```yaml
+# .jarvis
+analyze_code: Analyze the code structure and quality in the current directory
+fix_bugs: Help me find and fix potential bugs in the code
+optimize: Suggest optimizations for the code
+document: Generate documentation for the code
+```
 
 ## 🚀 Installation
 
@@ -77,29 +116,50 @@ pip install jarvis-ai-assistant
 
 ## 💡 Usage
 
+1. **Basic Usage**
 ```bash
-# Quick Start
+# Start Jarvis
 jarvis
 
-# Using Specific Model
-jarvis --platform ollama --model qwen2.5:14b
+# Process specific files
+jarvis -f file1.txt file2.py
+```
+
+2. **Using Predefined Tasks**
 
-# Custom Ollama API
-jarvis --platform ollama --model llama3.2 --api-base http://localhost:11434
+If you have a `.jarvis` file in your working directory:
+```bash
+# Jarvis will show available tasks on startup
+# Select a task number or start a new conversation
 ```
 
+3. **Interactive Features**
+- Multi-line input support (press Enter twice to submit)
+- File understanding and analysis
+- Context-aware conversations
+- Tool integration for system operations
+
+4. **Environment Variables**
+- `KIMI_API_KEY`: Your Kimi AI API key (required)
+- Location: `~/.jarvis_env`
+- Format: `KEY=value` (one per line)
+
+5. **Task Configuration**
+- File: `.jarvis` in working directory
+- Format: `task_name: task_description`
+- Purpose: Define commonly used tasks for quick access
+- Example tasks:
+  - Code analysis
+  - Bug finding
+  - Documentation generation
+  - Performance optimization
+
 ## 🧰 Tools
 
 | Tool | Description | Example |
 |------|-------------|---------|
-| 🔍 Search | Web search using DuckDuckGo | Search latest tech news |
-| 📚 RAG | Document querying with embeddings | Query your documentation |
-| 🐍 Python | Execute Python code | Run data analysis |
 | 🖥️ Shell | Execute system commands | Manage files and processes |
 | 📂 Files | Read/write operations | Handle configuration files |
-| 🌐 Web | Extract webpage content | Gather information |
-| 👤 User | Interactive input/confirmation | Get user preferences |
-
 
 ## 🤝 Contributing
 
@@ -115,6 +175,14 @@ Contributions are welcome! Please feel free to submit a Pull Request.
 
 This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
 
+## ⚙️ Environment Setup
+
+Create a `.jarvis_env` file in your home directory with:
+
+```bash
+KIMI_API_KEY=your_kimi_api_key_here
+```
+
 ---
 
 <div align="center">

{jarvis_ai_assistant-0.1.11.dist-info → jarvis_ai_assistant-0.1.13.dist-info}/RECORD

@@ -1,10 +1,10 @@
-jarvis/__init__.py,sha256=_aIzFZNgMY8TxeqpWoDZOcvaSQ7uK4SxZvtdW_HPIHw,50
-jarvis/agent.py,sha256=AJCRmjrvlK19K-yj5zNwrFvVDbZ3mWEnzwHwxKCXTL8,8462
-jarvis/main.py,sha256=_1hE0MZ1OsIJpmlipUwtqFszh9rm7VmQcnnWr80o3p4,4176
+jarvis/__init__.py,sha256=jrXHMn5gCi9cu3LcMmzS0ZilSm1247EmQAqdktXtCtI,50
+jarvis/agent.py,sha256=xo5YdY8UbgE3AJaitT1dXoNoVm769LrWyFzEXxVCG7A,8672
+jarvis/main.py,sha256=NnnMbAJxR_nfw74TI4paMSwm_1dHDA26WHwovJ2Dji0,5890
 jarvis/utils.py,sha256=3hLtv-HcBL8Ngw69cowhARuIFrjcQ6yRP3Y1o9CvtsI,5992
-jarvis/__pycache__/__init__.cpython-313.pyc,sha256=QtWKLHgbSECIa7pnYFe-pSmrHEzJUhP4Aorar8bxZqA,209
-jarvis/__pycache__/agent.cpython-313.pyc,sha256=sLDZttVT9sOC6WKgs_SWhrEzfsN9vzlMhknMJkEqkVY,9746
-jarvis/__pycache__/main.cpython-313.pyc,sha256=o80rvS95KbpeL4MSEoMC0rt0Y91-asDHbHPJU8M8kxo,5933
+jarvis/__pycache__/__init__.cpython-313.pyc,sha256=ZPCBPXhfoJqLeQYXxIy9irsVB1FsLB6ZWJ3AWOJnLgM,209
+jarvis/__pycache__/agent.cpython-313.pyc,sha256=DP0zgyKjGuwc62rH_vpoy_hXmGMI3zoHPlXZYu0qqp4,9956
+jarvis/__pycache__/main.cpython-313.pyc,sha256=BQNr4ZeU7-Bsa1NbfND9ZjH0In4dcF_63NExSEY5NSM,8142
 jarvis/__pycache__/models.cpython-313.pyc,sha256=uWuRIjGrY4YDB3dGW5PGDLWaS03et8g11O725TjY_eU,5960
 jarvis/__pycache__/tools.cpython-313.pyc,sha256=lAD4LrnnWzNZQmHXGfZ_2l7oskOpr2_2OC-gdFhxQY8,33933
 jarvis/__pycache__/utils.cpython-313.pyc,sha256=k4jyAlx4tlW0MKLMLzV7OOH9zsKrK0H955kY6M2SuFU,8772
@@ -14,7 +14,7 @@ jarvis/models/base.py,sha256=GgVl5N0qDqn-yqRcX_PX3wHjogouE6GPFAWktG40cXg,403
 jarvis/models/kimi.py,sha256=J_0QB6XY61tY-Oeu2cexWto58QbMU_liYj1f6PKbNRw,9763
 jarvis/models/__pycache__/__init__.cpython-313.pyc,sha256=jAwySX4diR7EWM_alK75tiIb_J8bVfs4Bh_U3bdjDLo,534
 jarvis/models/__pycache__/base.cpython-313.pyc,sha256=4I9KZlXHvTB7vENA9YWK4Fx0sns_KvIOtWqzE9y_-Co,1094
-jarvis/models/__pycache__/kimi.cpython-313.pyc,sha256=doDXu1nPClQOVqnDFGGBl2p_3AMDuDaiFAgdsP-G1NM,12524
+jarvis/models/__pycache__/kimi.cpython-313.pyc,sha256=ks1WiR1d8NTu-0B4s9zIyifWUvijBN4qI6AFD0Jtgk0,12524
 jarvis/tools/__init__.py,sha256=000SvX1Z0yzKtuVR9NS45r41DHUVpE6EiSEzzE99uR0,196
 jarvis/tools/base.py,sha256=qm73kMOkqAWHjUisUWFye-x69LJuZdwm0U3Tct-mmMc,3890
 jarvis/tools/file_ops.py,sha256=zTksx45NZm3iz9itN5iQGZ8DoxnSeTHdrnF08_ix7PU,3770
@@ -32,8 +32,8 @@ jarvis/tools/__pycache__/user_confirmation.cpython-313.pyc,sha256=wK3Ev10lHSUSRv
 jarvis/tools/__pycache__/user_input.cpython-313.pyc,sha256=JjTFOhObKsKF4Pn8KBRuKfV1_Ssj083fjU7Mfc_5z7c,2531
 jarvis/tools/__pycache__/user_interaction.cpython-313.pyc,sha256=RuVZ-pmiPBDywY3efgXSfohMAciC1avMGPmBK5qlnew,3305
 jarvis/tools/__pycache__/webpage.cpython-313.pyc,sha256=BjzSfnNzsKCrLETCcWjt32lNDLzwnjqcVGg4JfWd9OM,3008
-jarvis_ai_assistant-0.1.11.dist-info/METADATA,sha256=PLBiD-OM5rCBVi3MWF93SXePf6piXNW0OI8I_D2tUP8,3585
-jarvis_ai_assistant-0.1.11.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.11.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
-jarvis_ai_assistant-0.1.11.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.11.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.13.dist-info/METADATA,sha256=eHll-S4aOAuIsUDqR4dcLL11uBIfipD6ySAC9N8oqlI,5233
+jarvis_ai_assistant-0.1.13.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.13.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
+jarvis_ai_assistant-0.1.13.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.13.dist-info/RECORD,,