jarvis-ai-assistant 0.1.23__py3-none-any.whl → 0.1.24__py3-none-any.whl

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.23" 
+__version__ = "0.1.24" 

jarvis/agent.py

@@ -11,7 +11,7 @@ import os
 from datetime import datetime
 
 class Agent:
-    def __init__(self, model: BaseModel, tool_registry: ToolRegistry, name: str = "Jarvis", is_sub_agent: bool = False):
+    def __init__(self, model: BaseModel, tool_registry: ToolRegistry, name: str = "Jarvis", is_sub_agent: bool = False, verbose: bool = False):
         """Initialize Agent with a model, optional tool registry and name
         
         Args:
@@ -21,7 +21,7 @@ class Agent:
             is_sub_agent: 是否为子Agent，默认为False
         """
         self.model = model
-        self.tool_registry = tool_registry or ToolRegistry(model)
+        self.tool_registry = tool_registry or ToolRegistry(model, verbose=verbose)
         self.name = name
         self.is_sub_agent = is_sub_agent
         self.prompt = ""
@@ -112,7 +112,8 @@ class Agent:
 1. 使用现有工具完成任务
 2. 通过 generate_tool 创建新工具扩展功能
 3. 通过 create_sub_agent 创建子代理处理独立任务
-4. 遵循 ReAct (思考-行动-观察) 框架
+4. 访问和理解网页内容（无需使用工具）
+5. 遵循 ReAct (思考-行动-观察) 框架
 
 工作流程：
 1. 思考
@@ -120,11 +121,13 @@ class Agent:
    - 评估是否需要新工具
    - 考虑是否需要拆分子任务
    - 规划解决方案
+   - 确定是否需要访问网页
 
 2. 行动 (如果需要)
    - 使用现有工具
    - 创建新工具
    - 创建子代理
+   - 访问网页获取信息
    - 询问更多信息
    
 3. 观察
@@ -132,6 +135,13 @@ class Agent:
    - 分析反馈
    - 规划下一步
 
+网页访问能力：
+- 可以直接访问和阅读网页内容
+- 无需使用额外工具
+- 可以提取和分析网页信息
+- 支持多种网页格式
+- 注意：仅支持公开访问的网页
+
 任务拆分建议：
 - 当任务包含多个独立步骤时
 - 当子任务需要独立的上下文时

jarvis/main.py

@@ -58,19 +58,6 @@ def load_tasks() -> dict:
     
     return tasks
 
-class NumberValidator(Validator):
-    def validate(self, document):
-        text = document.text.strip()
-        if not text:  # Allow empty input
-            return
-            
-        try:
-            number = int(text)
-            if number < 0:
-                raise ValidationError(message='Please enter a non-negative number')
-        except ValueError:
-            raise ValidationError(message='Please enter a valid number')
-
 def select_task(tasks: dict) -> str:
     """Let user select a task from the list or skip. Returns task description if selected."""
     if not tasks:
@@ -93,7 +80,6 @@ def select_task(tasks: dict) -> str:
             choice = prompt(
                 "\nSelect a task number (0 to skip): ",
                 completer=number_completer,
-                validator=NumberValidator(),
                 validate_while_typing=False,
                 enable_history_search=True,
             ).strip()
@@ -121,6 +107,7 @@ def main():
     parser = argparse.ArgumentParser(description='Jarvis AI Assistant')
     parser.add_argument('-f', '--files', nargs='*', help='List of files to process')
     parser.add_argument('--keep-history', action='store_true', help='Keep chat history (do not delete chat session)')
+    parser.add_argument('-v', '--verbose', action='store_true', help='Show detailed search and reference information')
     args = parser.parse_args()
 
     load_env_from_file()
@@ -149,10 +136,10 @@ def main():
             PrettyOutput.print("\n设置完成后重新运行 Jarvis。", OutputType.INFO, timestamp=False)
             return 1
         
-        model = KimiModel(kimi_api_key)
+        model = KimiModel(kimi_api_key, verbose=args.verbose)
 
-        tool_registry = ToolRegistry()
-        agent = Agent(model, tool_registry)
+        tool_registry = ToolRegistry(verbose=args.verbose)
+        agent = Agent(model, tool_registry, verbose=args.verbose)
 
         # 欢迎信息
         PrettyOutput.print(f"Jarvis 已初始化 - With Kimi", OutputType.SYSTEM)

jarvis/models/kimi.py

@@ -10,7 +10,7 @@ import time
 class KimiModel(BaseModel):
     """Kimi模型实现"""
     
-    def __init__(self, api_key: str = None):
+    def __init__(self, api_key: str, verbose: bool = False):
         """
         初始化Kimi模型
         Args:
@@ -23,6 +23,7 @@ class KimiModel(BaseModel):
         self.chat_id = ""
         self.uploaded_files = []  # 存储已上传文件的信息
         self.first_chat = True  # 添加标记，用于判断是否是第一次对话
+        self.verbose = verbose  # 添加verbose属性
 
     def _create_chat(self) -> bool:
         """创建新的对话会话"""
@@ -221,6 +222,10 @@ class KimiModel(BaseModel):
             response = requests.post(url, headers=headers, json=payload, stream=True)
             full_response = ""
             
+            # 收集搜索和引用结果
+            search_results = []
+            ref_sources = []
+            
             PrettyOutput.print("接收响应...", OutputType.PROGRESS)
             for line in response.iter_lines():
                 if not line:
@@ -232,15 +237,90 @@ class KimiModel(BaseModel):
                     
                 try:
                     data = json.loads(line[6:])
-                    if data.get("event") == "cmpl":
+                    event = data.get("event")
+                    
+                    if event == "cmpl":
+                        # 处理补全文本
                         text = data.get("text", "")
                         if text:
                             PrettyOutput.print_stream(text, OutputType.SYSTEM)
                             full_response += text
+                            
+                    elif event == "search_plus":
+                        # 收集搜索结果
+                        msg = data.get("msg", {})
+                        if msg.get("type") == "get_res":
+                            search_results.append({
+                                "date": msg.get("date", ""),
+                                "site_name": msg.get("site_name", ""),
+                                "snippet": msg.get("snippet", ""),
+                                "title": msg.get("title", ""),
+                                "type": msg.get("type", ""),
+                                "url": msg.get("url", "")
+                            })
+                                
+                    elif event == "ref_docs":
+                        # 收集引用来源
+                        ref_cards = data.get("ref_cards", [])
+                        for card in ref_cards:
+                            ref_sources.append({
+                                "idx_s": card.get("idx_s", ""),
+                                "idx_z": card.get("idx_z", ""),
+                                "ref_id": card.get("ref_id", ""),
+                                "url": card.get("url", ""),
+                                "title": card.get("title", ""),
+                                "abstract": card.get("abstract", ""),
+                                "source": card.get("source_label", ""),
+                                "rag_segments": card.get("rag_segments", []),
+                                "origin": card.get("origin", {})
+                            })
+                                    
                 except json.JSONDecodeError:
                     continue
                     
             PrettyOutput.print_stream_end()
+            
+            # 只在verbose模式下显示搜索和引用信息
+            if self.verbose:
+                # 显示搜索结果摘要
+                if search_results:
+                    PrettyOutput.print("\n搜索结果:", OutputType.INFO)
+                    for result in search_results:
+                        PrettyOutput.print(f"- {result['title']}", OutputType.INFO)
+                        if result['date']:
+                            PrettyOutput.print(f"  日期: {result['date']}", OutputType.INFO)
+                        PrettyOutput.print(f"  来源: {result['site_name']}", OutputType.INFO)
+                        if result['snippet']:
+                            PrettyOutput.print(f"  摘要: {result['snippet']}", OutputType.INFO)
+                        PrettyOutput.print(f"  链接: {result['url']}", OutputType.INFO)
+                        PrettyOutput.print("", OutputType.INFO)
+                        
+                # 显示引用来源
+                if ref_sources:
+                    PrettyOutput.print("\n引用来源:", OutputType.INFO)
+                    for source in ref_sources:
+                        PrettyOutput.print(f"- [{source['ref_id']}] {source['title']} ({source['source']})", OutputType.INFO)
+                        PrettyOutput.print(f"  链接: {source['url']}", OutputType.INFO)
+                        if source['abstract']:
+                            PrettyOutput.print(f"  摘要: {source['abstract']}", OutputType.INFO)
+                        
+                        # 显示相关段落
+                        if source['rag_segments']:
+                            PrettyOutput.print("  相关段落:", OutputType.INFO)
+                            for segment in source['rag_segments']:
+                                text = segment.get('text', '').replace('\n', ' ').strip()
+                                if text:
+                                    PrettyOutput.print(f"    - {text}", OutputType.INFO)
+                        
+                        # 显示原文引用
+                        origin = source['origin']
+                        if origin:
+                            text = origin.get('text', '')
+                            if text:
+                                PrettyOutput.print(f"  原文: {text}", OutputType.INFO)
+                        
+                        PrettyOutput.print("", OutputType.INFO)
+            
             return full_response
 
         except Exception as e:

jarvis/tools/base.py

@@ -30,7 +30,7 @@ class Tool:
         return self.func(arguments)
 
 class ToolRegistry:
-    def __init__(self, output_handler=None):
+    def __init__(self, output_handler=None, verbose=False):
         """初始化工具注册器
         
         Args:
@@ -38,7 +38,7 @@ class ToolRegistry:
         """
         self.tools: Dict[str, Tool] = {}
         self.output_handler = output_handler or PrettyOutput
-        
+        self.verbose = verbose
         # 加载内置工具和外部工具
         self._load_builtin_tools()
         self._load_external_tools()
@@ -106,7 +106,7 @@ class ToolRegistry:
                     hasattr(item, 'parameters')):
                     
                     # 实例化工具类，传入模型和输出处理器
-                    tool_instance = item(model=KimiModel(), register=self, output_handler=self.output_handler)
+                    tool_instance = item(model=KimiModel(self.verbose), register=self, output_handler=self.output_handler)
                     
                     # 注册工具
                     self.register_tool(

jarvis/utils.py

@@ -95,7 +95,7 @@ class PrettyOutput:
         return formatted_text
 
     @staticmethod
-    def print(text: str, output_type: OutputType, timestamp: bool = True):
+    def print(text: str, output_type: OutputType, timestamp: bool = False):
         """打印格式化的输出"""
         print(PrettyOutput.format(text, output_type, timestamp))
 

{jarvis_ai_assistant-0.1.23.dist-info → jarvis_ai_assistant-0.1.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.23
+Version: 0.1.24
 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.23.dist-info → jarvis_ai_assistant-0.1.24.dist-info}/RECORD

@@ -1,28 +1,28 @@
-jarvis/__init__.py,sha256=WSKGFVi_j1dkarXDlgPoryqQHFsuvbJuPKwZDbqctjA,50
-jarvis/agent.py,sha256=ojs1f3Gjy049zKh7foAKkablPjsPhJI9DGB12b4l9rY,9592
-jarvis/main.py,sha256=tptQp6rjhHOSsPphmrtoxf7l78btnP_hJmr3hVMO4zg,8103
-jarvis/utils.py,sha256=YipQpEuIRwFE3y3YrgGlSVLEPDrlbBNY1gRiOJix9DU,6602
-jarvis/__pycache__/__init__.cpython-313.pyc,sha256=rT2SAKbzBYAMp9vZpjydqHwIBuZLRzzOXq6n3F-H5pE,209
-jarvis/__pycache__/agent.cpython-313.pyc,sha256=LYq1CMB8lQpBLrk54MBWsFpEsNf6-FvNvN-GYTxM8vA,12532
-jarvis/__pycache__/main.cpython-313.pyc,sha256=uQ1QHMHR6EukOb7z-YOz8CicXRPEfiHyS7KRq15xxVw,10943
+jarvis/__init__.py,sha256=nanlbBf5leSgDsqUDpE5iGFnYyzKYTa9JxGzj2LVAYI,50
+jarvis/agent.py,sha256=hfb3_62s8ZA6p5HZhoThn1J6lsyEtENEx1f5TnX26rY,9950
+jarvis/main.py,sha256=5_8cFOMfHJskLYj4kIP6yRq589Rvn4oPk1yDE0iMNzQ,7806
+jarvis/utils.py,sha256=YuY8zpfD2kgjjJyWcT62OCq3ADuFuqwStqXFTbq16o8,6603
+jarvis/__pycache__/__init__.cpython-313.pyc,sha256=zwblZMtb8j7BoaOH3V_9YTf9CTPmITqyweh2kAJfYjI,209
+jarvis/__pycache__/agent.cpython-313.pyc,sha256=PtH_PA_LT0ZjROfRdKFgjL0yTAsv_llnm7qW2n3RaV0,12885
+jarvis/__pycache__/main.cpython-313.pyc,sha256=jVqTajUJ1gOKj2cyPWB-D5cddFvTMjeRYcKoSCF7Nws,10343
 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=Jpkf2GOA1d_fgrRftqZch1yiO0mB75LWHzQk8IfhHRU,8977
+jarvis/__pycache__/utils.cpython-313.pyc,sha256=zs6OSkLlBeTHuIrJoRfnzFdJ5VkcdrUmPQcPXGfvoW4,8980
 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
-jarvis/models/kimi.py,sha256=CR3rU4wPSUQjmYOP516NXLU6h3YtcF6taB-4da3-rA4,10690
+jarvis/models/kimi.py,sha256=rFZBQNHsb4KkDMLCy1koGfeN8nJZoscrr8c306T1edM,15058
 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=-hOwhZrfvqfd5K_c34Tm-uR3gaZ9r6EV1NtwV0-FDmg,13647
+jarvis/models/__pycache__/kimi.cpython-313.pyc,sha256=GeDyquqf1irlwwFEEQ6AW9d77fjQBgxGfCriCNOVmg8,17661
 jarvis/tools/__init__.py,sha256=AjmFYLXt-_ulZXdYiXya2fD7QCJ-RaK91PEZCNj-UbA,262
-jarvis/tools/base.py,sha256=4LvbpUXDnLNu2r6S2G-luAPKRk_-6I6lfQQbxxiyIUw,7347
+jarvis/tools/base.py,sha256=bJt5tZHKeCDPnNzo2cthoyGgU3MWTu8LsaP8knCsDlk,7396
 jarvis/tools/file_ops.py,sha256=KbQLVCCXw-MtJg-12iyMeVGu8BTtLq7Mk7fpVKau40U,4296
 jarvis/tools/generator.py,sha256=qURQ2ct61tRaN-CNhnbpjoj7recGGjFWnQUteKvej_g,7430
 jarvis/tools/shell.py,sha256=MWe9-BAGApbGJfR60XG4nElGYHNBnbdF9vsOQTnEZ4g,2989
 jarvis/tools/sub_agent.py,sha256=jU0j__Y5ufBktxIF5qdT3NyLHnybE23c39QRj3oz5CI,3381
 jarvis/tools/__pycache__/__init__.cpython-313.pyc,sha256=KC48FS57427navbkxZ0eDKLePMCH2BKc5vAIu0b8lFc,404
-jarvis/tools/__pycache__/base.cpython-313.pyc,sha256=Pw89qn1ZMSNdU03CoM4ezkAHEiP_iTZEWceGg1TE_mk,9913
+jarvis/tools/__pycache__/base.cpython-313.pyc,sha256=Xk9d0W4uY3BeNgqR9IX2MpOMupfZVETvvb96bPE2sKs,9986
 jarvis/tools/__pycache__/bing_search.cpython-313.pyc,sha256=1G_wPbk5wcQYh7H0drLIS2Aw0XOG2ZM8ztgfQaqu3P8,2031
 jarvis/tools/__pycache__/calculator.cpython-313.pyc,sha256=C_qwTDGm6gc7QNxtPzPZXyStdKEintJVQIt5NMHQ8oY,4205
 jarvis/tools/__pycache__/calculator_tool.cpython-313.pyc,sha256=PI4LZNDTPdSe3ffWDRovLZ-r-vF8Kl-n6xdGdFWiBpY,4296
@@ -32,14 +32,14 @@ jarvis/tools/__pycache__/python_script.cpython-313.pyc,sha256=8JpryqTovEiTvBlWAK
 jarvis/tools/__pycache__/rag.cpython-313.pyc,sha256=JH6-PSZRMKAvTZqCwlRXJGClxYXNMs-vetU0q7hBLz0,6064
 jarvis/tools/__pycache__/search.cpython-313.pyc,sha256=wLMIkFwT-h4NGHgssytT4xme7sGO6ZhEnex7kjcy0-k,5990
 jarvis/tools/__pycache__/shell.cpython-313.pyc,sha256=6HWtxO-OWIxSraGkLs4K8hJrJ-UBVdi5KVuQUhyEUMA,4784
-jarvis/tools/__pycache__/sub_agent.cpython-313.pyc,sha256=RqIUPCSentRuZAARTX3wLTSy3HjzwEe1MFJ-fRx_U0Y,4645
+jarvis/tools/__pycache__/sub_agent.cpython-313.pyc,sha256=qktHblhSiCNayz4AscHXocRzrBIS37s-9BMD4ShG4eo,4645
 jarvis/tools/__pycache__/user_confirmation.cpython-313.pyc,sha256=wK3Ev10lHSUSRvoYmi7A0GzxYkzU-C4Wfhs5qW_HBqs,2271
 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.23.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.23.dist-info/METADATA,sha256=n_8hfZ0nFZc44KvlVnmlX46zsqJOY9QxpsZ6zXkvl1Y,10193
-jarvis_ai_assistant-0.1.23.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.23.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
-jarvis_ai_assistant-0.1.23.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.23.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.24.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.24.dist-info/METADATA,sha256=BbzIp_CZ1cA3lNCuN5HW7OqiErAkJdksqK7rLFThVNM,10193
+jarvis_ai_assistant-0.1.24.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.24.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
+jarvis_ai_assistant-0.1.24.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.24.dist-info/RECORD,,