jarvis-ai-assistant 0.1.46__py3-none-any.whl → 0.1.48__py3-none-any.whl

jarvis/utils.py

@@ -13,25 +13,23 @@ from prompt_toolkit.formatted_text import FormattedText
 # 初始化colorama
 colorama.init()
 
-
 class OutputType(Enum):
     SYSTEM = "system"      # AI助手消息
     CODE = "code"         # 代码相关
     RESULT = "result"     # 工具执行结果
     ERROR = "error"       # 错误信息
     INFO = "info"         # 系统提示
-    PLANNING = "planning"  # 任务规划
-    PROGRESS = "progress"  # 执行进度
+    PLANNING = "planning" # 任务规划
+    PROGRESS = "progress" # 执行进度
     SUCCESS = "success"   # 成功信息
     WARNING = "warning"   # 警告信息
     DEBUG = "debug"       # 调试信息
     USER = "user"         # 用户输入
     TOOL = "tool"         # 工具调用
 
-
 class PrettyOutput:
     """美化输出类"""
-
+    
     # 颜色方案 - 只使用前景色
     COLORS = {
         OutputType.SYSTEM: Fore.CYAN,      # 青色 - AI助手
@@ -39,7 +37,7 @@ class PrettyOutput:
         OutputType.RESULT: Fore.BLUE,      # 蓝色 - 结果
         OutputType.ERROR: Fore.RED,        # 红色 - 错误
         OutputType.INFO: Fore.YELLOW,      # 黄色 - 提示
-        OutputType.PLANNING: Fore.MAGENTA,  # 紫色 - 规划
+        OutputType.PLANNING: Fore.MAGENTA, # 紫色 - 规划
         OutputType.PROGRESS: Fore.WHITE,   # 白色 - 进度
         OutputType.SUCCESS: Fore.GREEN,    # 绿色 - 成功
         OutputType.WARNING: Fore.YELLOW,   # 黄色 - 警告
@@ -47,7 +45,7 @@ class PrettyOutput:
         OutputType.USER: Fore.GREEN,       # 绿色 - 用户
         OutputType.TOOL: Fore.YELLOW,      # 黄色 - 工具
     }
-
+    
     # 图标方案
     ICONS = {
         OutputType.SYSTEM: "🤖",    # 机器人 - AI助手
@@ -63,7 +61,7 @@ class PrettyOutput:
         OutputType.USER: "👤",      # 用户 - 用户
         OutputType.TOOL: "🔧",      # 扳手 - 工具
     }
-
+    
     # 前缀方案
     PREFIXES = {
         OutputType.SYSTEM: "Assistant",
@@ -81,20 +79,18 @@ class PrettyOutput:
     }
 
     @staticmethod
-    def format(text: str, output_type: OutputType,
-               timestamp: bool = True) -> str:
+    def format(text: str, output_type: OutputType, timestamp: bool = True) -> str:
         """格式化输出文本"""
         color = PrettyOutput.COLORS.get(output_type, "")
         icon = PrettyOutput.ICONS.get(output_type, "")
         prefix = PrettyOutput.PREFIXES.get(output_type, "")
-
+        
         # 添加时间戳 - 使用白色
         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}{
-            ColoramaStyle.RESET_ALL}"
-
+        formatted_text = f"{time_str}{color}{icon} {prefix}: {text}{ColoramaStyle.RESET_ALL}"
+        
         return formatted_text
 
     @staticmethod
@@ -103,10 +99,7 @@ class PrettyOutput:
         print(PrettyOutput.format(text, output_type, timestamp))
         if output_type == OutputType.ERROR:
             import traceback
-            PrettyOutput.print(
-                f"错误追踪: {
-                    traceback.format_exc()}",
-                OutputType.INFO)
+            PrettyOutput.print(f"错误追踪: {traceback.format_exc()}", OutputType.INFO)
 
     @staticmethod
     def section(title: str, output_type: OutputType = OutputType.INFO):
@@ -114,11 +107,7 @@ class PrettyOutput:
         width = 60
         color = PrettyOutput.COLORS.get(output_type, "")
         print(f"\n{color}" + "=" * width + f"{ColoramaStyle.RESET_ALL}")
-        PrettyOutput.print(
-            title.center(
-                width - 10),
-            output_type,
-            timestamp=False)
+        PrettyOutput.print(title.center(width - 10), output_type, timestamp=False)
         print(f"{color}" + "=" * width + f"{ColoramaStyle.RESET_ALL}\n")
 
     @staticmethod
@@ -134,19 +123,18 @@ class PrettyOutput:
         sys.stdout.write("\n")
         sys.stdout.flush()
 
-
 def get_multiline_input(tip: str) -> str:
     """获取多行输入，支持方向键、历史记录等功能"""
     PrettyOutput.print(tip + "\n", OutputType.INFO)
-
+    
     # 创建输入会话，启用历史记录
     session = PromptSession(history=None)  # 使用默认历史记录
-
+    
     # 定义提示符样式
     style = PromptStyle.from_dict({
         'prompt': 'ansicyan',
     })
-
+    
     lines = []
     try:
         while True:
@@ -154,32 +142,31 @@ def get_multiline_input(tip: str) -> str:
             prompt = FormattedText([
                 ('class:prompt', '... ' if lines else '>>> ')
             ])
-
+            
             # 获取输入
             line = session.prompt(
                 prompt,
                 style=style,
             ).strip()
-
+            
             # 空行处理
             if not line:
                 if not lines:  # 第一行就输入空行
                     return ""
                 break  # 结束多行输入
-
+                
             lines.append(line)
-
+            
     except KeyboardInterrupt:
         PrettyOutput.print("\n输入已取消", OutputType.ERROR)
         return "__interrupt__"
-
+    
     return "\n".join(lines)
 
-
 def load_env_from_file():
     """从~/.jarvis_env加载环境变量"""
     env_file = Path.home() / ".jarvis_env"
-
+    
     if env_file.exists():
         try:
             with open(env_file, "r", encoding="utf-8") as f:
@@ -188,29 +175,22 @@ def load_env_from_file():
                     if line and not line.startswith("#"):
                         try:
                             key, value = line.split("=", 1)
-                            os.environ[key.strip()] = value.strip().strip(
-                                "'").strip('"')
+                            os.environ[key.strip()] = value.strip().strip("'").strip('"')
                         except ValueError:
                             continue
         except Exception as e:
-            PrettyOutput.print(
-                f"Warning: Failed to read ~/.jarvis_env: {e}",
-                OutputType.WARNING)
-
-
+            PrettyOutput.print(f"Warning: Failed to read ~/.jarvis_env: {e}", OutputType.WARNING)
+    
+    
 def while_success(func, sleep_time: float = 0.1):
     while True:
         try:
             return func()
         except Exception as e:
-            PrettyOutput.print(
-                f"执行失败: {
-                    str(e)}, {sleep_time}s后重试...",
-                OutputType.ERROR)
+            PrettyOutput.print(f"执行失败: {str(e)}, {sleep_time}s后重试...", OutputType.ERROR)
             time.sleep(sleep_time)
             continue
 
-
 def while_true(func, sleep_time: float = 0.1):
     """循环执行函数，直到函数返回True"""
     while True:

{jarvis_ai_assistant-0.1.46.dist-info → jarvis_ai_assistant-0.1.48.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.46
+Version: 0.1.48
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire

jarvis_ai_assistant-0.1.48.dist-info/RECORD

@@ -0,0 +1,25 @@
+jarvis/__init__.py,sha256=5Kd0blvGwS59SYMJr_z-vMkb9qnFktJZho8oQ1uSNOw,50
+jarvis/agent.py,sha256=5GmC9iAOerTR4JoxzrfgLSspoz6qRm1E6xEIWLTR2OI,12222
+jarvis/main.py,sha256=VIqMYnqNrmVcnO5YC-Tc-ATVBt8IlqIcXHjZvHmyCFs,6272
+jarvis/utils.py,sha256=JlkuC9RtspXH2VWDmj9nR0vnb8ie1gIsKc4vC7WRco8,7321
+jarvis/models/__init__.py,sha256=mrOt67nselz_H1gX9wdAO4y2DY5WPXzABqJbr5Des8k,63
+jarvis/models/ai8.py,sha256=9i7n_-TPbvq0AaRILs9ERQ7Vy5tDyoibXkiPsJvwQio,12520
+jarvis/models/base.py,sha256=eeNJJbv9ikPVTtV_E7mgW8LZzVgjQ-OzxlHF6slYrHw,1237
+jarvis/models/kimi.py,sha256=N0bPQ1ugx0RwjR96jLchmOPvCmws-fXyA0mnOAdo2k4,17161
+jarvis/models/openai.py,sha256=pB7AaZuorHlmudTPaUnEbFOyl51Fy6uhU9KQBm98Ov8,4156
+jarvis/models/oyi.py,sha256=4_sppGOLS3rucBHinhzjLhSh_6rJKIgLu9h6trHIOGM,14900
+jarvis/models/registry.py,sha256=iVBjN9ImEvGHcz8WR-z8pPMJQZI907o_nccVOFANhak,7951
+jarvis/tools/__init__.py,sha256=Kj1bKj34lwRDKMKHLOrLyQElf2lHbqA2tDgP359eaDo,71
+jarvis/tools/base.py,sha256=EGRGbdfbLXDLwtyoWdvp9rlxNX7bzc20t0Vc2VkwIEY,652
+jarvis/tools/file_ops.py,sha256=h8g0eT9UvlJf4kt0DLXvdSsjcPj7x19lxWdDApeDfpg,3842
+jarvis/tools/generator.py,sha256=vVP3eN5cCDpRXf_fn0skETkPXAW1XZFWx9pt2_ahK48,5999
+jarvis/tools/methodology.py,sha256=G3cOaHTMujGZBhDLhQEqyCV2NISizO3MXRuho1KfI6Y,5223
+jarvis/tools/registry.py,sha256=NbH7A4A2lyN2IoyZGFwa5Ghed2dpzbJWCAd1Dg95WBI,7183
+jarvis/tools/shell.py,sha256=UPKshPyOaUwTngresUw-ot1jHjQIb4wCY5nkJqa38lU,2520
+jarvis/tools/sub_agent.py,sha256=rEtAmSVY2ZjFOZEKr5m5wpACOQIiM9Zr_3dT92FhXYU,2621
+jarvis_ai_assistant-0.1.48.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.48.dist-info/METADATA,sha256=aa15iAnYAREOwcLJP3tTpjdC5JAmXzouiqXIwKrO83g,10015
+jarvis_ai_assistant-0.1.48.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.48.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
+jarvis_ai_assistant-0.1.48.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.48.dist-info/RECORD,,

jarvis_ai_assistant-0.1.46.dist-info/RECORD

@@ -1,25 +0,0 @@
-jarvis/__init__.py,sha256=HiOdrOkDAfqQOFrFVCKd96C_U-XMAI6wE1pX3GjE8Yk,50
-jarvis/agent.py,sha256=omq58Bo4u-oEwpOuHnZTTE_3JeXG5Ow-1bhhJt6RlBs,12339
-jarvis/main.py,sha256=Zd1aoq7EXNZMZrZl6n-2OB8UIC202sIPcQEJGuJJkpE,6087
-jarvis/utils.py,sha256=CQo_V7qA_oGVvR4RrbfL9cd98lXzbE9tp1EB9S0ppIc,7469
-jarvis/models/__init__.py,sha256=8uX1dj3YLL-i2Q5AIz1V0GtrROb6BJmRRRzxrexj-aE,59
-jarvis/models/ai8.py,sha256=LEgtAZ7SZj94RoUuNlclXes_u-eh_vx5pxZ8kwSQG78,12658
-jarvis/models/base.py,sha256=Drotowk47m3s30BPYspEL1MZlo2MyCaLev0v-oaqszY,1211
-jarvis/models/kimi.py,sha256=ghL1g2iq9jnUNBB1flyV2wd0JKs7i7q0CpKr2-6kF3U,18570
-jarvis/models/openai.py,sha256=vh_4J7imSlqWi0J8xBrVhv6mpPXj6UqvD_xVlKayiXg,4330
-jarvis/models/oyi.py,sha256=pi4wD-TMz2Q6olkwQ5Vw5GCPKwL-KyTR8SNbrXiXvuo,14513
-jarvis/models/registry.py,sha256=RgzbCLJM6-FlQYuhaXnEmQASshur3FR5u0z3UBJtBgQ,8137
-jarvis/tools/__init__.py,sha256=ZXnUzaenBd2yX6xRI7T7tOjG7Hv2PjzcMva455VStgA,70
-jarvis/tools/base.py,sha256=UnYlIpkKLAZDVxLyIZy2imHLSqF5xQXAVg5sKrQgTFw,668
-jarvis/tools/file_ops.py,sha256=tuyeEg9gGcUBXiCL6WwO5IVtl2TRaNRJn1VYBkquFTs,3756
-jarvis/tools/generator.py,sha256=fKTx6KbCPZAo2LZixWV51uZZWwVSj_UmDo1b8Lq5Y-c,5945
-jarvis/tools/methodology.py,sha256=hpejF0ElrrMaCg90WBOrVRvCekfYkyiiQbAH13kC1ys,4995
-jarvis/tools/registry.py,sha256=eMRW0geKeNsaYhGBQB73bbRBkQMGUDORWy69rmjs3Hk,7201
-jarvis/tools/shell.py,sha256=NixHMaM2yF4XcDXxsgD3tAtdO1rZ3PxS_0_LlzjCpd8,2457
-jarvis/tools/sub_agent.py,sha256=m0H6dWIeI0VeK2cNETfI0uqWxlot8f70mW4o9aBMXYo,2620
-jarvis_ai_assistant-0.1.46.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.46.dist-info/METADATA,sha256=DLFgc6On2RrSRKOtXgFuefCkMuxgsya7ZvWP0TmcJO0,10015
-jarvis_ai_assistant-0.1.46.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.46.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
-jarvis_ai_assistant-0.1.46.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.46.dist-info/RECORD,,