jarvis-ai-assistant 0.1.13__tar.gz → 0.1.14__tar.gz

{jarvis_ai_assistant-0.1.13 → jarvis_ai_assistant-0.1.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.13
+Version: 0.1.14
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -19,6 +19,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: requests>=2.25.1
 Requires-Dist: pyyaml>=5.1
 Requires-Dist: colorama>=0.4.6
+Requires-Dist: prompt_toolkit>=3.0.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"

{jarvis_ai_assistant-0.1.13 → jarvis_ai_assistant-0.1.14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.13"
+version = "0.1.14"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "Your Name", email = "your.email@example.com" }]
@@ -23,6 +23,7 @@ dependencies = [
     "requests>=2.25.1",
     "pyyaml>=5.1",
     "colorama>=0.4.6",
+    "prompt_toolkit>=3.0.0",
 ]
 requires-python = ">=3.8"
 

{jarvis_ai_assistant-0.1.13 → jarvis_ai_assistant-0.1.14}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.13",
+    version="0.1.14",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -16,6 +16,7 @@ setup(
         "requests>=2.25.1",
         "pyyaml>=5.1",
         "colorama>=0.4.6",
+        "prompt_toolkit>=3.0.0",
     ],
     entry_points={
         "console_scripts": [

{jarvis_ai_assistant-0.1.13 → jarvis_ai_assistant-0.1.14}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.1.13 → jarvis_ai_assistant-0.1.14}/src/jarvis/main.py

@@ -17,28 +17,43 @@ from jarvis.utils import PrettyOutput, OutputType, get_multiline_input, load_env
 
 
 def load_tasks() -> dict:
-    """Load tasks from .jarvis file if it exists."""
-    if not os.path.exists(".jarvis"):
-        return {}
+    """Load tasks from .jarvis files in user home and current directory."""
+    tasks = {}
     
-    try:
-        with open(".jarvis", "r", encoding="utf-8") as f:
-            tasks = yaml.safe_load(f)
-            
-        if not isinstance(tasks, dict):
-            PrettyOutput.print("Warning: .jarvis file should contain a dictionary of task_name: task_description", OutputType.ERROR)
-            return {}
-            
-        # Validate format and convert all values to strings
-        validated_tasks = {}
-        for name, desc in tasks.items():
-            if desc:  # Ensure description is not empty
-                validated_tasks[str(name)] = str(desc)
+    # 检查用户目录下的 .jarvis
+    user_jarvis = os.path.expanduser("~/.jarvis")
+    if os.path.exists(user_jarvis):
+        try:
+            with open(user_jarvis, "r", encoding="utf-8") as f:
+                user_tasks = yaml.safe_load(f)
                 
-        return validated_tasks
-    except Exception as e:
-        PrettyOutput.print(f"Error loading .jarvis file: {str(e)}", OutputType.ERROR)
-        return {}
+            if isinstance(user_tasks, dict):
+                # 验证并添加用户目录的任务
+                for name, desc in user_tasks.items():
+                    if desc:  # 确保描述不为空
+                        tasks[str(name)] = str(desc)
+            else:
+                PrettyOutput.print("Warning: ~/.jarvis file should contain a dictionary of task_name: task_description", OutputType.ERROR)
+        except Exception as e:
+            PrettyOutput.print(f"Error loading ~/.jarvis file: {str(e)}", OutputType.ERROR)
+    
+    # 检查当前目录下的 .jarvis
+    if os.path.exists(".jarvis"):
+        try:
+            with open(".jarvis", "r", encoding="utf-8") as f:
+                local_tasks = yaml.safe_load(f)
+                
+            if isinstance(local_tasks, dict):
+                # 验证并添加当前目录的任务，如果有重名则覆盖用户目录的任务
+                for name, desc in local_tasks.items():
+                    if desc:  # 确保描述不为空
+                        tasks[str(name)] = str(desc)
+            else:
+                PrettyOutput.print("Warning: .jarvis file should contain a dictionary of task_name: task_description", OutputType.ERROR)
+        except Exception as e:
+            PrettyOutput.print(f"Error loading .jarvis file: {str(e)}", OutputType.ERROR)
+    
+    return tasks
 
 def select_task(tasks: dict) -> str:
     """Let user select a task from the list or skip. Returns task description if selected."""

{jarvis_ai_assistant-0.1.13 → jarvis_ai_assistant-0.1.14}/src/jarvis/utils.py

@@ -1,12 +1,15 @@
 from pathlib import Path
 import sys
 import time
+import os
 from typing import Dict, Optional
 from enum import Enum
 from datetime import datetime
 import colorama
-from colorama import Fore, Style
-import os
+from colorama import Fore, Style as ColoramaStyle
+from prompt_toolkit import PromptSession
+from prompt_toolkit.styles import Style as PromptStyle
+from prompt_toolkit.formatted_text import FormattedText
 
 # 初始化colorama
 colorama.init()
@@ -84,10 +87,10 @@ class PrettyOutput:
         prefix = PrettyOutput.PREFIXES.get(output_type, "")
         
         # 添加时间戳 - 使用白色
-        time_str = f"{Fore.WHITE}[{datetime.now().strftime('%H:%M:%S')}]{Style.RESET_ALL} " if timestamp else ""
+        time_str = f"{Fore.WHITE}[{datetime.now().strftime('%H:%M:%S')}]{ColoramaStyle.RESET_ALL} " if timestamp else ""
         
         # 格式化输出
-        formatted_text = f"{time_str}{color}{icon} {prefix}: {text}{Style.RESET_ALL}"
+        formatted_text = f"{time_str}{color}{icon} {prefix}: {text}{ColoramaStyle.RESET_ALL}"
         
         return formatted_text
 
@@ -101,15 +104,15 @@ class PrettyOutput:
         """打印带分隔线的段落标题"""
         width = 60
         color = PrettyOutput.COLORS.get(output_type, "")
-        print(f"\n{color}" + "=" * width + f"{Style.RESET_ALL}")
+        print(f"\n{color}" + "=" * width + f"{ColoramaStyle.RESET_ALL}")
         PrettyOutput.print(title.center(width - 10), output_type, timestamp=False)
-        print(f"{color}" + "=" * width + f"{Style.RESET_ALL}\n")
+        print(f"{color}" + "=" * width + f"{ColoramaStyle.RESET_ALL}\n")
 
     @staticmethod
     def print_stream(text: str, output_type: OutputType):
         """打印流式输出，不换行"""
         color = PrettyOutput.COLORS.get(output_type, "")
-        sys.stdout.write(f"{color}{text}{Style.RESET_ALL}")
+        sys.stdout.write(f"{color}{text}{ColoramaStyle.RESET_ALL}")
         sys.stdout.flush()
 
     @staticmethod
@@ -119,29 +122,44 @@ class PrettyOutput:
         sys.stdout.flush()
 
 def get_multiline_input(tip: str) -> str:
-    """获取多行输入"""
+    """获取多行输入，支持方向键、历史记录等功能"""
     PrettyOutput.print(tip + "\n", OutputType.INFO)
-    lines = []
     
-    while True:
-        try:
-            prompt = "... " if lines else ">>> "
-            sys.stdout.write(f"{Fore.GREEN}{prompt}{Style.RESET_ALL}")
-            sys.stdout.flush()
+    # 创建输入会话，启用历史记录
+    session = PromptSession(history=None)  # 使用默认历史记录
+    
+    # 定义提示符样式
+    style = PromptStyle.from_dict({
+        'prompt': 'ansicyan',
+    })
+    
+    lines = []
+    try:
+        while True:
+            # 设置提示符
+            prompt = FormattedText([
+                ('class:prompt', '... ' if lines else '>>> ')
+            ])
             
-            line = input().strip()
+            # 获取输入
+            line = session.prompt(
+                prompt,
+                style=style,
+            ).strip()
+            
+            # 空行处理
             if not line:
-                if not lines:  # 如果是第一行就输入空行
+                if not lines:  # 第一行就输入空行
                     return ""
-                break
-            
+                break  # 结束多行输入
+                
             lines.append(line)
             
-        except KeyboardInterrupt:
-            PrettyOutput.print("\n输入已取消", OutputType.ERROR)
-            return "__interrupt__"
+    except KeyboardInterrupt:
+        PrettyOutput.print("\n输入已取消", OutputType.ERROR)
+        return "__interrupt__"
     
-    return "\n".join(lines).strip()
+    return "\n".join(lines)
 
 def load_env_from_file():
     """从~/.jarvis_env加载环境变量"""

{jarvis_ai_assistant-0.1.13 → jarvis_ai_assistant-0.1.14}/src/jarvis_ai_assistant.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.13
+Version: 0.1.14
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -19,6 +19,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: requests>=2.25.1
 Requires-Dist: pyyaml>=5.1
 Requires-Dist: colorama>=0.4.6
+Requires-Dist: prompt_toolkit>=3.0.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"

{jarvis_ai_assistant-0.1.13 → jarvis_ai_assistant-0.1.14}/src/jarvis_ai_assistant.egg-info/requires.txt

@@ -1,6 +1,7 @@
 requests>=2.25.1
 pyyaml>=5.1
 colorama>=0.4.6
+prompt_toolkit>=3.0.0
 
 [dev]
 pytest