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

jarvis/__init__.py

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

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/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.15.dist-info/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 skyfire
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

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

@@ -1,10 +1,31 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.13
+Version: 0.1.15
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
 Author-email: Your Name <your.email@example.com>
+License: MIT License
+        
+        Copyright (c) 2025 skyfire
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
 Project-URL: Homepage, https://github.com/skyfireitdiy/Jarvis
 Keywords: jarvis,ai,assistant,tools,automation
 Classifier: License :: OSI Approved :: MIT License
@@ -16,9 +37,11 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
+License-File: LICENSE
 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.dist-info → jarvis_ai_assistant-0.1.15.dist-info}/RECORD

@@ -1,13 +1,13 @@
-jarvis/__init__.py,sha256=jrXHMn5gCi9cu3LcMmzS0ZilSm1247EmQAqdktXtCtI,50
+jarvis/__init__.py,sha256=niTr-MJKWue4qLJei1KCeCXRCTZSNmqWYycm5EuGUn8,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=ZPCBPXhfoJqLeQYXxIy9irsVB1FsLB6ZWJ3AWOJnLgM,209
+jarvis/main.py,sha256=QD8FlhpJ-PFUEOjt77gllpHEgqtfNKV_S8NQZSWRTbE,6760
+jarvis/utils.py,sha256=YipQpEuIRwFE3y3YrgGlSVLEPDrlbBNY1gRiOJix9DU,6602
+jarvis/__pycache__/__init__.cpython-313.pyc,sha256=IBHd-4iRW_kLVUo4GAMIjwiDzO7BYWfUAvxmj_Tx71g,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__/main.cpython-313.pyc,sha256=vsL4l0JZFp805S22a0uZR_9k6NhpHrb-YHFY61JXF4M,9279
 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
+jarvis/__pycache__/utils.cpython-313.pyc,sha256=Jpkf2GOA1d_fgrRftqZch1yiO0mB75LWHzQk8IfhHRU,8977
 jarvis/__pycache__/zte_llm.cpython-313.pyc,sha256=kMm9IGundGmOPqjsgrm9oIaWLDagYGCPRAaE3ipkc-0,5662
 jarvis/models/__init__.py,sha256=B_IJFvKTaxdg19FAD1ea288tYp3-bRYRpkeGI0_OcBI,262
 jarvis/models/base.py,sha256=GgVl5N0qDqn-yqRcX_PX3wHjogouE6GPFAWktG40cXg,403
@@ -32,8 +32,9 @@ 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.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,,
+jarvis_ai_assistant-0.1.15.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.15.dist-info/METADATA,sha256=ol6VL7pVkPjG5nS3zCBfKG2gPG8OmrsxE2KegW7PILs,6525
+jarvis_ai_assistant-0.1.15.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.15.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
+jarvis_ai_assistant-0.1.15.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.15.dist-info/RECORD,,