jarvis-ai-assistant 0.1.138__py3-none-any.whl → 0.1.141__py3-none-any.whl

jarvis/jarvis_utils/utils.py

@@ -2,13 +2,13 @@ import os
 import time
 import hashlib
 from pathlib import Path
-from typing import Dict
-import psutil
-from jarvis.jarvis_utils.config import get_max_token_count
+from typing import Union, List, Dict, Any, Callable, cast
+from bs4 import BeautifulSoup, Tag
+from jarvis.jarvis_utils.config import get_max_input_token_count
 from jarvis.jarvis_utils.embedding import get_context_token_count
 from jarvis.jarvis_utils.input import get_single_line_input
 from jarvis.jarvis_utils.output import PrettyOutput, OutputType
-def init_env():
+def init_env() -> None:
     """初始化环境变量从~/.jarvis/env文件
 
     功能：
@@ -35,7 +35,7 @@ def init_env():
                             continue
         except Exception as e:
             PrettyOutput.print(f"警告: 读取 {env_file} 失败: {e}", OutputType.WARNING)
-def while_success(func, sleep_time: float = 0.1):
+def while_success(func: Callable[[], Any], sleep_time: float = 0.1) -> Any:
     """循环执行函数直到成功
 
     参数：
@@ -52,7 +52,7 @@ def while_success(func, sleep_time: float = 0.1):
             PrettyOutput.print(f"执行失败: {str(e)}, 等待 {sleep_time}s...", OutputType.ERROR)
             time.sleep(sleep_time)
             continue
-def while_true(func, sleep_time: float = 0.1):
+def while_true(func: Callable[[], bool], sleep_time: float = 0.1) -> Any:
     """Loop execution function, until the function returns True"""
     while True:
         ret = func()
@@ -100,7 +100,7 @@ def get_file_line_count(filename: str) -> int:
         return 0
 
 
-def is_long_context(files: list) -> bool:
+def is_long_context(files: List[str]) -> bool:
     """检查文件列表是否属于长上下文
 
     判断标准：
@@ -112,8 +112,8 @@ def is_long_context(files: list) -> bool:
     返回：
     布尔值表示是否属于长上下文
     """
-    max_token_count = get_max_token_count()
-    threshold = max_token_count * 0.8
+    max_input_token_count = get_max_input_token_count()
+    threshold = max_input_token_count * 0.8
     total_tokens = 0
 
     for file_path in files:
@@ -152,3 +152,201 @@ def ct(tag_name: str) -> str:
     格式化的结束标签字符串
     """
     return f"</{tag_name}>"
+
+
+def create_soup_element(content: Union[str, Tag, List[Any]]) -> List[Union[Tag, str]]:
+    """Safely create a BeautifulSoup element, ensuring it's treated as markup
+    
+    Args:
+        content: Input content to convert to BeautifulSoup elements
+    Returns:
+        List of BeautifulSoup elements or strings
+    """
+    if isinstance(content, str):
+        # Create a wrapper tag to ensure proper parsing
+        soup_div = BeautifulSoup(f"<div>{content}</div>", 'html.parser').div
+        if soup_div is not None:
+            return [cast(Union[Tag, str], el) for el in soup_div.contents]
+        return []
+    elif isinstance(content, list):
+        return content
+    return [content]
+
+def extract_interactive_elements(html_content: str) -> List[Dict[str, Any]]:
+    """Extract all interactive elements from HTML content with their properties.
+    
+    Args:
+        html_content: HTML content to parse
+        
+    Returns:
+        List of dictionaries containing element properties:
+        - xpath: XPath of the element
+        - tag: HTML tag name
+        - text: Text content
+        - is_clickable: Whether element is clickable
+        - is_input: Whether element is an input field
+        - is_select: Whether element is a select dropdown
+    """
+    soup = BeautifulSoup(html_content, 'html.parser')
+    interactive_elements = []
+    
+    # Define interactive tags
+    clickable_tags = {'a', 'button', 'input', 'select', 'textarea'}
+    input_tags = {'input', 'textarea', 'select'}
+    
+    def get_xpath(element: Tag) -> str:
+        """Generate XPath for an element"""
+        components = []
+        current = element
+        
+        while current and current.name:
+            siblings = current.find_previous_siblings(current.name)
+            index = len(siblings) + 1
+            components.append(f"{current.name}[{index}]")
+            current = current.parent
+            
+        return "/".join(reversed(components))
+    
+    def process_element(element: Tag) -> None:
+        """Process a single element and add it to interactive_elements if it's interactive"""
+        tag_name = element.name.lower()
+        
+        # Skip non-interactive elements
+        if tag_name not in clickable_tags and not element.find_parent(clickable_tags):
+            return
+            
+        # Get element properties
+        element_info = {
+            'xpath': get_xpath(element),
+            'tag': tag_name,
+            'text': element.get_text().strip(),
+            'is_clickable': tag_name in clickable_tags or bool(element.find_parent('a')) or bool(element.find_parent('button')),
+            'is_input': tag_name in input_tags,
+            'is_select': tag_name == 'select'
+        }
+        
+        # Add additional properties for input elements
+        if element_info['is_input']:
+            element_info['input_type'] = element.get('type', 'text')
+            element_info['name'] = element.get('name', '')
+            element_info['value'] = element.get('value', '')
+            
+        # Add options for select elements
+        if element_info['is_select']:
+            element_info['options'] = [
+                {'value': opt.get('value', ''), 'text': opt.get_text().strip()}
+                for opt in element.find_all('option')
+                if isinstance(opt, Tag)
+            ]
+            
+        interactive_elements.append(element_info)
+    
+    # Process all elements
+    for element in soup.find_all():
+        if isinstance(element, Tag):
+            process_element(element)
+    
+    return interactive_elements
+
+def extract_display_elements(html_content: str) -> List[Dict[str, Any]]:
+    """Extract all display elements from HTML content with their properties.
+    
+    Args:
+        html_content: HTML content to parse
+        
+    Returns:
+        List of dictionaries containing element properties:
+        - xpath: XPath of the element
+        - tag: HTML tag name
+        - text: Text content
+        - heading_level: Heading level (1-6) if the element is a heading
+        - is_list: Whether the element is a list
+        - is_list_item: Whether the element is a list item
+        - is_table: Whether the element is a table
+        - is_table_cell: Whether the element is a table cell
+    """
+    soup = BeautifulSoup(html_content, 'html.parser')
+    display_elements = []
+    
+    # Define display tags
+    display_tags = {
+        'h1', 'h2', 'h3', 'h4', 'h5', 'h6',  # Headings
+        'p', 'div', 'span',                   # Text containers
+        'ul', 'ol', 'li',                     # Lists
+        'table', 'tr', 'td', 'th',            # Tables
+        'article', 'section', 'main',         # Content sections
+        'header', 'footer', 'nav',            # Layout sections
+        'aside', 'figure', 'figcaption'       # Side content
+    }
+    
+    # Define interactive tags to exclude
+    interactive_tags = {'a', 'button', 'input', 'select', 'textarea', 'form'}
+    
+    def get_xpath(element: Tag) -> str:
+        """Generate XPath for an element"""
+        components = []
+        current = element
+        
+        while current and current.name:
+            siblings = current.find_previous_siblings(current.name)
+            index = len(siblings) + 1
+            components.append(f"{current.name}[{index}]")
+            current = current.parent
+            
+        return "/".join(reversed(components))
+    
+    def process_element(element: Tag) -> None:
+        """Process a single element and add it to display_elements if it's a display element"""
+        tag_name = element.name.lower()
+        
+        # Skip non-display elements and interactive elements
+        if tag_name not in display_tags or element.find_parent(interactive_tags):
+            return
+            
+        # Get text content
+        text = element.get_text().strip()
+        if not text:  # Skip empty elements
+            return
+            
+        # Get element properties
+        element_info = {
+            'xpath': get_xpath(element),
+            'tag': tag_name,
+            'text': text,
+            'heading_level': int(tag_name[1]) if tag_name.startswith('h') and len(tag_name) == 2 else None,
+            'is_list': tag_name in {'ul', 'ol'},
+            'is_list_item': tag_name == 'li',
+            'is_table': tag_name == 'table',
+            'is_table_cell': tag_name in {'td', 'th'}
+        }
+        
+        # Add list-specific properties
+        if element_info['is_list']:
+            element_info['list_items'] = [
+                {'text': li.get_text().strip()}
+                for li in element.find_all('li')
+                if isinstance(li, Tag)
+            ]
+            
+        # Add table-specific properties
+        if element_info['is_table']:
+            element_info['table_rows'] = [
+                {
+                    'cells': [
+                        {'text': cell.get_text().strip(), 'is_header': cell.name == 'th'}
+                        for cell in row.find_all(['td', 'th'])
+                        if isinstance(cell, Tag)
+                    ]
+                }
+                for row in element.find_all('tr')
+                if isinstance(row, Tag)
+            ]
+            
+        display_elements.append(element_info)
+    
+    # Process all elements
+    for element in soup.find_all():
+        if isinstance(element, Tag):
+            process_element(element)
+    
+    return display_elements

{jarvis_ai_assistant-0.1.138.dist-info → jarvis_ai_assistant-0.1.141.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jarvis-ai-assistant
-Version: 0.1.138
+Version: 0.1.141
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -45,7 +45,6 @@ Requires-Dist: pyyaml>=5.1
 Requires-Dist: colorama>=0.4.6
 Requires-Dist: prompt-toolkit>=3.0.0
 Requires-Dist: openai>=1.20.0
-Requires-Dist: playwright>=1.41.1
 Requires-Dist: numpy>=1.19.5
 Requires-Dist: faiss-cpu>=1.8.0
 Requires-Dist: sentence-transformers>=2.2.2
@@ -55,7 +54,7 @@ Requires-Dist: python-docx>=0.8.11
 Requires-Dist: tiktoken>=0.3.0
 Requires-Dist: tqdm>=4.65.0
 Requires-Dist: docx>=0.2.4
-Requires-Dist: yaspin>=2.5.0
+Requires-Dist: yaspin>=2.4.0
 Requires-Dist: rich>=13.3.1
 Requires-Dist: pygments>=2.15.0
 Requires-Dist: fuzzywuzzy>=0.18.0
@@ -66,6 +65,7 @@ Requires-Dist: fastapi>=0.115.4
 Requires-Dist: uvicorn>=0.33.0
 Requires-Dist: python-pptx>=1.0.0
 Requires-Dist: pandas>=2.0.0
+Requires-Dist: html2text>=2024.2.26
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"
@@ -165,7 +165,7 @@ jarvis-ask-codebase --help
 |----------|------|
 | read_code | 支持行号和范围的代码文件读取 |
 | execute_shell | 执行系统命令并捕获输出 |
-| execute_shell_script | 执行shell脚本文件 |
+| execute_script | 执行脚本并返回结果，支持Shell命令、Shell脚本和Python脚本 |
 | ask_codebase | 智能代码库查询和分析，用于定位功能所在文件和理解单点实现，适合查询特定功能位置和实现原理 |
 | ask_user | 交互式用户输入收集 |
 | file_operation | 基础文件操作（读取/写入/存在性检查） |

jarvis_ai_assistant-0.1.141.dist-info/RECORD

@@ -0,0 +1,94 @@
+jarvis/__init__.py,sha256=qDMhmaE2-m_heV7fzBRSqmELTVxciZSojL01NXLJgCU,50
+jarvis/jarvis_agent/__init__.py,sha256=doFjWa2a6nVGkKkuQkgrupswqqY8dBNJxUDxUfckvPo,23557
+jarvis/jarvis_agent/builtin_input_handler.py,sha256=aWb5RiKaY5-07LtiLi_mMh9Z-l4DaA_3nLbmFbBGb-w,2429
+jarvis/jarvis_agent/file_input_handler.py,sha256=6rIF_FgC9_3UcQhFCmoMoECG4tjKaLBZZ5zDtBl037I,3235
+jarvis/jarvis_agent/jarvis.py,sha256=NmxVJ8KwSc4fumntNL1T5TWj-FvcRgssLeBhG4sA3xk,5368
+jarvis/jarvis_agent/main.py,sha256=Hx1cavfGkrGVEk_HrOJX6FNE0fEh2CDLy7Efr_VSiKI,2636
+jarvis/jarvis_agent/output_handler.py,sha256=4limQ-Kf-YYvQjT5SMjJIyyvD1DVG8tINv1A_qbv4ho,405
+jarvis/jarvis_agent/patch.py,sha256=ZVde3b7MobwGWR0KFKaGXfeCrMQjmT47GWoGpt2nM3c,19796
+jarvis/jarvis_agent/shell_input_handler.py,sha256=Pcm__ldcBp7GcHm5r3hbRc4nKe86LLWvNl0UE5JlAiU,1173
+jarvis/jarvis_code_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_code_agent/code_agent.py,sha256=c6UBBJku-yoH70f-uapsewewp4EKYxevTnMCZ-KqWKA,12599
+jarvis/jarvis_code_analysis/code_review.py,sha256=I_Bc0hDPz3m5textX9Yqreq7_f28CGd7KDW_-i4Cjgs,29543
+jarvis/jarvis_code_analysis/checklists/__init__.py,sha256=PCjlyxLa939613cAzS7pfEPgP57setO-1RvcdzzPivw,54
+jarvis/jarvis_code_analysis/checklists/c_cpp.py,sha256=8lfWmhImAxeTBdHPOgVXDjMllaq280Qki1ZOOSDBnvk,1293
+jarvis/jarvis_code_analysis/checklists/csharp.py,sha256=fg35Iima2nIsirEmAjianfAybVjwRYml9BtbSQFff7w,2396
+jarvis/jarvis_code_analysis/checklists/data_format.py,sha256=g8lubTeEY2Sx5bdPaMmn2PmaSIpxDZu5d1GgPc-DlDk,2981
+jarvis/jarvis_code_analysis/checklists/devops.py,sha256=kTvzFybZ0i1uo5ABD-pbn__h3t8n4QaURSrJ2o-MplQ,3518
+jarvis/jarvis_code_analysis/checklists/docs.py,sha256=7Tq9woxeYqbqmiql3PkbFZ59ui7uIHKRAOUFUGhjCPc,3317
+jarvis/jarvis_code_analysis/checklists/go.py,sha256=yF4gu1YNxyv6Ptgx9Qj4bxeyQHIwAgPQzt4Nm6gdhUc,1364
+jarvis/jarvis_code_analysis/checklists/infrastructure.py,sha256=l64mExwNc49Z8Ol1hy6qdVGFc00SMbagyvn0gOTOR04,3741
+jarvis/jarvis_code_analysis/checklists/java.py,sha256=KIQMukhnMqI8oRsm8oVLaX_s_dggECo2OX8eXqjjG_4,2061
+jarvis/jarvis_code_analysis/checklists/javascript.py,sha256=a0RAqQUfnhK6IItXT_zU5PW5_IH7uwc8BWKo49KuX2c,2316
+jarvis/jarvis_code_analysis/checklists/kotlin.py,sha256=FDtEa2Dyzd4bTSZkusllaLbGFhQKD6OW4g0yvKkBNgw,4412
+jarvis/jarvis_code_analysis/checklists/loader.py,sha256=l6k6Z7oeo1Hy4KAIeM5bGfcqZ7ftwzZoCDNUxAwkm9g,1895
+jarvis/jarvis_code_analysis/checklists/php.py,sha256=LoWeE-I5KonZCc_7fDcekgbPVbK7oVgyUwqq7ZqnDsc,2457
+jarvis/jarvis_code_analysis/checklists/python.py,sha256=ULPQoJBe5B_XKzbAqUv3DOCB7posc4sSv2IWFA4_7lA,1428
+jarvis/jarvis_code_analysis/checklists/ruby.py,sha256=qbaRNGk0VFeZFUYJSJRhLVdZK0JSmlGygHZOHr806YU,4250
+jarvis/jarvis_code_analysis/checklists/rust.py,sha256=6qNtIPxb4VWlyVx6dukMKITkYxqD_jLi5MlB-_jjzHQ,1622
+jarvis/jarvis_code_analysis/checklists/shell.py,sha256=UBtGhi3d5sIhyUSGmDckYOXwpeaQEAfJ-FKCH4izSC8,2595
+jarvis/jarvis_code_analysis/checklists/sql.py,sha256=-bGfYhaFJyHrbcJrUMbkMyPCNVbk8UljNqebqVJJKxM,2331
+jarvis/jarvis_code_analysis/checklists/swift.py,sha256=d-zPPbM_J1G8fgZ2M2-ASQbIxEocsdL1owL4Z2PCnOc,2542
+jarvis/jarvis_code_analysis/checklists/web.py,sha256=phdvLGqRHNijA0OyEwVtgHgz1Hi4ldtJJscOhEQvbSQ,3919
+jarvis/jarvis_dev/main.py,sha256=Rl2COZqMUds-SFyjrroLPfs056gtwTcIliMTJhrtWnM,27751
+jarvis/jarvis_git_details/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_git_details/main.py,sha256=YowncVxYyJ3y2EvGrZhAJeR4yizXp6aB3dqvoYTepFY,6117
+jarvis/jarvis_git_squash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_git_squash/main.py,sha256=xBNkAl7_8_pQC-C6RcUImA1mEU4KTqhjtA57rG_mMJ8,2179
+jarvis/jarvis_git_utils/git_commiter.py,sha256=6q70zosBrTM6vHqp01DV4780-y3zmazdSfJFGJT9jiw,10643
+jarvis/jarvis_init/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_init/main.py,sha256=Mb41DdhkWRYxdqEqCJPiQRAT4IspbRmak6la9ITcXdg,2102
+jarvis/jarvis_lsp/base.py,sha256=CWfiqiQ6ZBc_lrW64Y1YAsFQeNPGoWcgTBGKgOrPVQg,2047
+jarvis/jarvis_lsp/cpp.py,sha256=SOXFhpipvbdhlwUZ7Rh0hdWGXWnrNOxZVsmTN6ZXoZk,3148
+jarvis/jarvis_lsp/go.py,sha256=h7vA0ArGSq9rhLZcrPXg5HdnEbKwnjVr322IkYI1jHw,3465
+jarvis/jarvis_lsp/python.py,sha256=xMqSVJn8w6CZEquSIO2I-6TJ7-YOABgpt3SjNOV6UAk,1860
+jarvis/jarvis_lsp/registry.py,sha256=LduRCEVH5y75IODdY8lZ3ZB3OHKpgwbZnYNxuhUmA_o,6439
+jarvis/jarvis_lsp/rust.py,sha256=9UOiYTUwMwz2raj1G8Uec0aB5Oun7wMiWYGDhC4JMpI,3693
+jarvis/jarvis_methodology/main.py,sha256=IBv87UOmdCailgooMtWEcqZcQHmNLhZD-kkGw5jOcVg,3375
+jarvis/jarvis_multi_agent/__init__.py,sha256=SX8lBErhltKyYRM-rymrMz3sJ0Zl3hBXrpsPdFgzkQc,4399
+jarvis/jarvis_multi_agent/main.py,sha256=aGuUC3YQmahabqwDwZXJjfQLYsZ3KIZdf8DZDlVNMe4,1543
+jarvis/jarvis_platform/__init__.py,sha256=WIJtD5J7lOrWLX2bsgZGkmlMcN0NOJsnh_reybmHPjg,58
+jarvis/jarvis_platform/base.py,sha256=Ge-UgZGCHICFWOqrHzg-_qXQXjS1I2lZSxfYs5Angwo,3234
+jarvis/jarvis_platform/kimi.py,sha256=N2iNIjJzB57SMAgrfbCvRd595DvlbKtg038wXAz4BqU,16578
+jarvis/jarvis_platform/openai.py,sha256=V_76W4hwKXRQ4Je7qj4nrTOedgQDc2_8l_NUuJq3Q2U,4115
+jarvis/jarvis_platform/registry.py,sha256=QuH8V65uwqf-x_Y-T_rmvIDtPLzkX_COWPfzsH1eH0s,7612
+jarvis/jarvis_platform/yuanbao.py,sha256=MjJVD0z28HHCSxpZaBFQAYxUCDIQdaYjuGv08uIWP-w,21754
+jarvis/jarvis_platform_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_platform_manager/main.py,sha256=o7UDrcCkLf9dTh2LOO-_bQVHjWf2X6RuSY5XRtCGvZs,20245
+jarvis/jarvis_platform_manager/openai_test.py,sha256=8L9Xx-oR82X8l38NsVhkymYucICwMb-6yrH17Usk2TI,4954
+jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_smart_shell/main.py,sha256=slP_8CwpfMjWFZis0At1ANRlPb3gx1KteAg1B7R7dl4,4546
+jarvis/jarvis_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_tools/ask_codebase.py,sha256=xQTcuDl7cbH6uVkWlkA1HXJAo4_3r09-3SboUkBEBDU,10062
+jarvis/jarvis_tools/ask_user.py,sha256=yafF6D54rFTIuRzIZKg6OiYZD35ZT5n8LrmVclZbfk0,2203
+jarvis/jarvis_tools/base.py,sha256=MqUyC0R0Q960dioO0EYrcN25XrRWFwnUcxpA4Gp37Jo,1249
+jarvis/jarvis_tools/chdir.py,sha256=tijYhhGbaAiTcA877w9thlxt0smoK2SX2AntcBBETmA,2727
+jarvis/jarvis_tools/create_code_agent.py,sha256=7AOte1Ua6tOXjLYuetN6qwBx6ID0XX29IEjXmMAouxY,4295
+jarvis/jarvis_tools/create_sub_agent.py,sha256=Hpu50UO-ekakYHxD6-5Civi9lvti5aPnRpTwSxAbFVo,3046
+jarvis/jarvis_tools/execute_script.py,sha256=dMUwg_8nFkYqL-9gFO6LHM1kEKXYLW8PXHRtEWLFcBI,6485
+jarvis/jarvis_tools/file_analyzer.py,sha256=b8FuU6zRlAO_g2p_AbBaCyEfgc7U3yPwfoAKgHwvCiQ,4870
+jarvis/jarvis_tools/file_operation.py,sha256=efFTysX7G-4O8GyChZZRi_ozlDUV14ybflri_cGHRx0,10374
+jarvis/jarvis_tools/find_methodology.py,sha256=zLxDPhoxrkECu_K6OlUDgvOWKewokCOp8VJMdomQns0,2276
+jarvis/jarvis_tools/lsp_get_diagnostics.py,sha256=v_tnnaOgXBWog_73pbZdK-vR3MW2vC6BDmHVxlOF1GA,5363
+jarvis/jarvis_tools/methodology.py,sha256=Nh5dvsUuRaWuLtN9TjdSa1qdAtWk2eLj_bNpKZfQJKE,5200
+jarvis/jarvis_tools/read_code.py,sha256=8TFvORPxu_juMAPqj-UBa3qo810AMqXh8S3Gbq_IXaY,6133
+jarvis/jarvis_tools/read_webpage.py,sha256=6ILzxZm45lW1zke4_01RLclFUbxgI_7mKgaTQtTovYU,2231
+jarvis/jarvis_tools/registry.py,sha256=2rWau4Ib8AtJ2ZsckkNQp3CMC06wBQwSMktzGbv3v8I,17187
+jarvis/jarvis_tools/search_web.py,sha256=ZM1LKb7VApSBn7H1a7oawkhkv7_KBPcCSBKfETED7vo,1397
+jarvis/jarvis_tools/virtual_tty.py,sha256=9aSA14thmJ1e0PVhi0TNAj5lICiVD5j8DVIvzknDupc,15524
+jarvis/jarvis_utils/__init__.py,sha256=KMg-KY5rZIhGTeOD5e2Xo5CU7DX1DUz4ULWAaTQ-ZNw,825
+jarvis/jarvis_utils/config.py,sha256=W0N7aD0uMAQPLLbFapzK02uzGFtjlfotBQt6FbCIlwA,5190
+jarvis/jarvis_utils/embedding.py,sha256=NjbhqoUrSH0p0upQCalGO3O34CyXQ8MMvF1eQTRn5JQ,7129
+jarvis/jarvis_utils/file_processors.py,sha256=VchHOIXxxGWqSu5q0Q_epVWUHJTxaKz2wmqiDoRy5Ik,14324
+jarvis/jarvis_utils/git_utils.py,sha256=rAMXKlAYIvqF64iDFc_FDLxi5SMqEuKYH8GzC7RaZGY,4967
+jarvis/jarvis_utils/globals.py,sha256=DaQ-lfLtK8bDyGVlR6jtkenkkgxQVsIkSZCZwklelzc,2769
+jarvis/jarvis_utils/input.py,sha256=yBrak_UP9ZN3fgV7G19o6TDBjEYVdh3UOyjQ_IpRvz8,6585
+jarvis/jarvis_utils/methodology.py,sha256=A_LA-J2eOY22H0_NSTovcQA8f7BVwgpV6eWCoEZmvdM,6003
+jarvis/jarvis_utils/output.py,sha256=EUJQ1pnCj7PcD9-gXIXMFNrxAwyZBeUd8X-fNEJYJ1k,8443
+jarvis/jarvis_utils/utils.py,sha256=ZYclSrkrHBxatxYQkoNpAgIupO0j9CjiLIp8xBijWXc,12164
+jarvis_ai_assistant-0.1.141.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.141.dist-info/METADATA,sha256=McbbEQVqMZ1quCSQKwEbgQq21MvzZfVabCgSvo1N1wU,10004
+jarvis_ai_assistant-0.1.141.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+jarvis_ai_assistant-0.1.141.dist-info/entry_points.txt,sha256=vuvEtcYSta_LgCFHS4m0OjtF7z1jKX_Dy2pG0rOMNIE,972
+jarvis_ai_assistant-0.1.141.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.141.dist-info/RECORD,,

{jarvis_ai_assistant-0.1.138.dist-info → jarvis_ai_assistant-0.1.141.dist-info}/entry_points.txt

@@ -3,17 +3,17 @@ jarvis = jarvis.jarvis_agent.jarvis:main
 jarvis-agent = jarvis.jarvis_agent.main:main
 jarvis-ask-codebase = jarvis.jarvis_tools.ask_codebase:main
 jarvis-code-agent = jarvis.jarvis_code_agent.code_agent:main
-jarvis-code-review = jarvis.jarvis_tools.code_review:main
+jarvis-code-review = jarvis.jarvis_code_analysis.code_review:main
 jarvis-dev = jarvis.jarvis_dev.main:main
-jarvis-git-commit = jarvis.jarvis_tools.git_commiter:main
+jarvis-git-commit = jarvis.jarvis_git_utils.git_commiter:main
 jarvis-git-details = jarvis.jarvis_git_details.main:main
 jarvis-git-squash = jarvis.jarvis_git_squash.main:main
+jarvis-init = jarvis.jarvis_init.main:main
 jarvis-methodology = jarvis.jarvis_methodology.main:main
 jarvis-multi-agent = jarvis.jarvis_multi_agent.main:main
 jarvis-platform-manager = jarvis.jarvis_platform_manager.main:main
-jarvis-rag = jarvis.jarvis_rag.main:main
 jarvis-smart-shell = jarvis.jarvis_smart_shell.main:main
 jarvis-tool = jarvis.jarvis_tools.registry:main
 jca = jarvis.jarvis_code_agent.code_agent:main
-jgc = jarvis.jarvis_tools.git_commiter:main
+jgc = jarvis.jarvis_git_utils.git_commiter:main
 jss = jarvis.jarvis_smart_shell.main:main

jarvis/jarvis_code_agent/file_select.py

@@ -1,202 +0,0 @@
-import os
-import re
-from typing import Dict, List
-from prompt_toolkit import PromptSession
-from prompt_toolkit.completion import Completer, Completion
-
-from jarvis.jarvis_utils.input import get_single_line_input
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from jarvis.jarvis_utils.utils import user_confirm
-
-
-def _parse_file_selection(input_str: str, max_index: int) -> List[int]:
-    selected = set()
-
-    # Remove all whitespace characters
-    input_str = "".join(input_str.split())
-
-    # Process comma-separated parts
-    for part in input_str.split(","):
-        if not part:
-            continue
-
-        # Process range (e.g.: 3-6)
-        if "-" in part:
-            try:
-                start, end = map(int, part.split("-"))
-                # Convert to index starting from 0
-                start = max(0, start - 1)
-                end = min(max_index, end - 1)
-                if start <= end:
-                    selected.update(range(start, end + 1))
-            except ValueError:
-                PrettyOutput.print(f"忽略无效的范围表达式: {part}", OutputType.WARNING)
-        # Process single number
-        else:
-            try:
-                index = int(part) - 1  # Convert to index starting from 0
-                if 0 <= index < max_index:
-                    selected.add(index)
-                else:
-                    PrettyOutput.print(f"忽略超出范围的索引: {part}", OutputType.WARNING)
-            except ValueError:
-                PrettyOutput.print(f"忽略无效的数字: {part}", OutputType.WARNING)
-
-    return sorted(list(selected))
-
-def _get_file_completer(root_dir: str) -> Completer:
-    """Create file path completer"""
-    class FileCompleter(Completer):
-        def __init__(self, root_dir: str):
-            self.root_dir = root_dir
-
-        def get_completions(self, document, complete_event):
-            text = document.text_before_cursor
-
-            if not text:
-                for path in self._list_files(""):
-                    yield Completion(path, start_position=0)
-                return
-
-            # Generate fuzzy matching pattern
-            pattern = '.*'.join(map(re.escape, text))
-            try:
-                regex = re.compile(pattern, re.IGNORECASE)
-            except re.error:
-                return
-
-            for path in self._list_files(""):
-                if regex.search(path):
-                    yield Completion(path, start_position=-len(text))
-
-        def _list_files(self, current_dir: str) -> List[str]:
-            """List all files in the specified directory (recursively)"""
-            files = []
-            search_dir = os.path.join(self.root_dir, current_dir)
-
-            for root, _, filenames in os.walk(search_dir):
-                for filename in filenames:
-                    full_path = os.path.join(root, filename)
-                    rel_path = os.path.relpath(full_path, self.root_dir)
-                    if not any(part.startswith('.') for part in rel_path.split(os.sep)):
-                        files.append(rel_path)
-
-            return sorted(files)
-
-    return FileCompleter(root_dir)
-
-def _fuzzy_match_files(root_dir: str, pattern: str) -> List[str]:
-    """Fuzzy match file path
-
-    Args:
-        pattern: Matching pattern
-
-    Returns:
-        List[str]: List of matching file paths
-    """
-    matches = []
-
-    # 将模式转换为正则表达式
-    pattern = pattern.replace('.', r'\.').replace('*', '.*').replace('?', '.')
-    pattern = f".*{pattern}.*"  # 允许部分匹配
-    regex = re.compile(pattern, re.IGNORECASE)
-
-    # 遍历所有文件
-    for root, _, files in os.walk(root_dir):
-        for file in files:
-            full_path = os.path.join(root, file)
-            rel_path = os.path.relpath(full_path, root_dir)
-            # 忽略 .git 目录和其他隐藏文件
-            if not any(part.startswith('.') for part in rel_path.split(os.sep)):
-                if regex.match(rel_path):
-                    matches.append(rel_path)
-
-    return sorted(matches)
-
-def select_files(related_files: List[Dict[str, str]], root_dir: str) -> List[Dict[str, str]]:
-    """Let the user select and supplement related files"""
-    output = ""
-    # Display found files
-    selected_files = list(related_files)  # Default select all
-    for i, file in enumerate(related_files, 1):
-        output += f"[{i}] {file['file']} ({file['reason']})\n"
-
-    # Filter out files that do not exist
-    related_files = [f for f in related_files if os.path.isfile(os.path.join(root_dir, f["file"]))]
-
-    if output:
-        PrettyOutput.section("相关文件", OutputType.INFO)
-        PrettyOutput.print(output, OutputType.INFO, lang="markdown")
-
-    if len(related_files) > 0:
-        # Ask the user if they need to adjust the file list
-        if user_confirm("是否需要调整文件列表？", False):
-            # Let the user select files
-            numbers = get_single_line_input("请输入要包含的文件编号（支持: 1,3-6格式, 按回车保持当前选择）").strip()
-            if numbers:
-                selected_indices = _parse_file_selection(numbers, len(related_files))
-                if selected_indices:
-                    selected_files = [related_files[i] for i in selected_indices]
-                else:
-                    PrettyOutput.print("没有有效的文件被选择, 保持当前选择", OutputType.WARNING)
-
-    tips = ""
-    # Ask if they need to supplement files
-    if user_confirm("是否需要补充其他文件？", False):
-        # Create file completion session
-        session = PromptSession(
-            completer=_get_file_completer(root_dir),
-            complete_while_typing=True
-        )
-        PrettyOutput.print("请输入要补充的文件路径（支持Tab补全和*?通配符, 输入空行结束）", OutputType.INFO)
-        while True:
-            try:
-                file_path = session.prompt(">>> ").strip()
-            except KeyboardInterrupt:
-                break
-
-            if not file_path:
-                break
-
-            # Process wildcard matching
-            if '*' in file_path or '?' in file_path:
-                matches = _fuzzy_match_files(root_dir, file_path)
-                if not matches:
-                    PrettyOutput.print("没有找到匹配的文件", OutputType.WARNING)
-                    continue
-
-                # Display matching files
-                tips = "找到以下匹配的文件:"
-                for i, path in enumerate(matches, 1):
-                    tips += f"\n[{i}] {path}"
-                PrettyOutput.print(tips, OutputType.INFO)
-
-                # Let the user select
-                numbers = get_single_line_input("请选择要添加的文件编号（支持: 1,3-6格式, 按回车选择所有）").strip()
-                if numbers:
-                    indices = _parse_file_selection(numbers, len(matches))
-                    if not indices:
-                        continue
-                    paths_to_add = [matches[i] for i in indices]
-                else:
-                    paths_to_add = matches
-            else:
-                paths_to_add = [file_path]
-
-            # Add selected files
-            tips = "添加以下文件:"
-            for path in paths_to_add:
-                full_path = os.path.join(root_dir, path)
-                if not os.path.isfile(full_path):
-                    tips += f"\n文件不存在: {path}"
-                    continue
-
-                try:
-                    selected_files.append({"file": path, "reason": "I Added"})
-                    tips += f"\n文件已添加: {path}"
-                except Exception as e:
-                    tips += f"\n读取文件失败: {str(e)}"
-    selected_files = [f for f in selected_files if os.path.isfile(os.path.join(root_dir, f["file"]))]
-    if tips:
-        PrettyOutput.print(tips, OutputType.INFO)
-    return selected_files