jarvis-ai-assistant 0.1.97__py3-none-any.whl → 0.1.99__py3-none-any.whl

jarvis/utils.py

@@ -6,20 +6,35 @@ import time
 import os
 from enum import Enum
 from datetime import datetime
+from typing import Any, Dict
 import colorama
 from colorama import Fore, Style as ColoramaStyle
+import numpy as np
 from prompt_toolkit import PromptSession
 from prompt_toolkit.styles import Style as PromptStyle
 from prompt_toolkit.formatted_text import FormattedText
 from sentence_transformers import SentenceTransformer
 from transformers import AutoModelForSequenceClassification, AutoTokenizer
 import torch
+import yaml
+import faiss
 
 # 初始化colorama
 colorama.init()
 
-os.environ["HF_ENDPOINT"] = "https://hf-mirror.com"
 os.environ["TOKENIZERS_PARALLELISM"] = "false"
+os.environ["HF_ENDPOINT"] = "https://hf-mirror.com"
+
+current_agent = []
+
+def add_agent(agent_name: str):
+    current_agent.append(agent_name)
+
+def get_current_agent():
+    return current_agent[-1] if current_agent else "No Agent"
+
+def delete_current_agent():
+    current_agent.pop()
 
 class OutputType(Enum):
     SYSTEM = "system"      # AI assistant message
@@ -94,7 +109,7 @@ class PrettyOutput:
         prefix = PrettyOutput.PREFIXES.get(output_type, "")
         
         # 添加时间戳 - 使用白色
-        time_str = f"{Fore.WHITE}[{datetime.now().strftime('%H:%M:%S')}]{ColoramaStyle.RESET_ALL} " if timestamp else ""
+        time_str = f"{Fore.BLUE}[{get_current_agent()}]{ColoramaStyle.RESET_ALL}{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}"
@@ -112,10 +127,10 @@ class PrettyOutput:
     @staticmethod
     def section(title: str, output_type: OutputType = OutputType.INFO):
         """Print paragraph title with separator"""
-        width = 60
+        width = 100
         color = PrettyOutput.COLORS.get(output_type, "")
         print(f"\n{color}" + "=" * width + f"{ColoramaStyle.RESET_ALL}")
-        PrettyOutput.print(title.center(width - 10), output_type, timestamp=True)
+        PrettyOutput.print(title.center(width - 25), output_type, timestamp=False)
         print(f"{color}" + "=" * width + f"{ColoramaStyle.RESET_ALL}\n")
 
     @staticmethod
@@ -131,6 +146,14 @@ class PrettyOutput:
         sys.stdout.write("\n")
         sys.stdout.flush()
 
+def get_single_line_input(tip: str) -> str:
+    """Get single line input, support direction key, history function, etc."""
+    session = PromptSession(history=None)
+    style = PromptStyle.from_dict({
+        'prompt': 'ansicyan',
+    })
+    return session.prompt(f"{tip}", style=style)
+
 def get_multiline_input(tip: str) -> str:
     """Get multi-line input, support direction key, history function, etc."""
     print(f"{Fore.GREEN}{tip}{ColoramaStyle.RESET_ALL}")
@@ -217,59 +240,50 @@ def find_git_root(dir="."):
     return ret
 
 def load_embedding_model():
-    model_name = "BAAI/bge-large-zh-v1.5"
-    PrettyOutput.print(f"Loading embedding model: {model_name}...", OutputType.INFO)
-    try:
-        # 首先尝试离线加载
-        embedding_model = SentenceTransformer(
-            model_name,
-            cache_folder=os.path.expanduser("~/.cache/huggingface/hub"),
-            local_files_only=True
-        )
-        PrettyOutput.print("Successfully loaded model using local cache", OutputType.SUCCESS)
-    except Exception as local_error:
-        PrettyOutput.print(f"Failed to load locally, trying to download online: {str(local_error)}", OutputType.WARNING)
-        # 如果离线加载失败，尝试在线下载
-        embedding_model = SentenceTransformer(
-            model_name,
-            cache_folder=os.path.expanduser("~/.cache/huggingface/hub")
-        )
-        PrettyOutput.print("Successfully downloaded and loaded model", OutputType.SUCCESS)
+    model_name = "BAAI/bge-m3"
+    cache_dir = os.path.expanduser("~/.cache/huggingface/hub")
+    model_dir = os.path.join(cache_dir, "models--" + model_name.replace("/", "--"))
+    
+    # Check if model exists
+    if not os.path.exists(model_dir):
+        PrettyOutput.print("Model not found locally, downloading using huggingface-cli...", OutputType.INFO)
+        os.system(f'huggingface-cli download --repo-type model --local-dir {cache_dir} {model_name}' + f' --token {os.getenv("HF_TOKEN")}' if os.getenv("HF_TOKEN") else "")
+    
+    # Load model
+    embedding_model = SentenceTransformer(
+        model_name,
+        cache_folder=cache_dir,
+        local_files_only=True
+    )
     
     return embedding_model
 
 def load_rerank_model():
     """Load reranking model"""
     model_name = "BAAI/bge-reranker-v2-m3"
+    cache_dir = os.path.expanduser("~/.cache/huggingface/hub")
+    model_dir = os.path.join(cache_dir, "models--" + model_name.replace("/", "--"))
+    
     PrettyOutput.print(f"Loading reranking model: {model_name}...", OutputType.INFO)
     
-    try:
-        # 首先尝试离线加载
-        tokenizer = AutoTokenizer.from_pretrained(
-            model_name,
-            local_files_only=True,
-            cache_dir=os.path.expanduser("~/.cache/huggingface/hub")
-        )
-        model = AutoModelForSequenceClassification.from_pretrained(
-            model_name,
-            local_files_only=True,
-            cache_dir=os.path.expanduser("~/.cache/huggingface/hub")
-        )
-        PrettyOutput.print("Successfully loaded model using local cache", OutputType.SUCCESS)
-    except Exception as local_error:
-        PrettyOutput.print(f"Failed to load locally, trying to download online: {str(local_error)}", OutputType.WARNING)
-        # 如果离线加载失败，尝试在线下载
-        tokenizer = AutoTokenizer.from_pretrained(
-            model_name,
-            cache_dir=os.path.expanduser("~/.cache/huggingface/hub")
-        )
-        model = AutoModelForSequenceClassification.from_pretrained(
-            model_name,
-            cache_dir=os.path.expanduser("~/.cache/huggingface/hub")
-        )
-        PrettyOutput.print("Successfully downloaded and loaded model", OutputType.SUCCESS)
+    # Check if model exists
+    if not os.path.exists(model_dir):
+        PrettyOutput.print("Model not found locally, downloading using huggingface-cli...", OutputType.INFO)
+        os.system(f'huggingface-cli download --repo-type model --local-dir {cache_dir} {model_name}' + f' --token {os.getenv("HF_TOKEN")}' if os.getenv("HF_TOKEN") else "")
+    
+    # Load model and tokenizer
+    tokenizer = AutoTokenizer.from_pretrained(
+        model_name,
+        cache_dir=cache_dir,
+        local_files_only=True
+    )
+    model = AutoModelForSequenceClassification.from_pretrained(
+        model_name,
+        cache_dir=cache_dir,
+        local_files_only=True
+    )
     
-    # 如果有 GPU 就使用 GPU
+    # Use GPU if available
     if torch.cuda.is_available():
         model = model.cuda()
     model.eval()
@@ -303,4 +317,94 @@ def get_thread_count():
     return int(os.getenv('JARVIS_THREAD_COUNT', '1'))  
 
 def get_file_md5(filepath: str)->str:    
-    return hashlib.md5(open(filepath, "rb").read(100*1024*1024)).hexdigest()
+    return hashlib.md5(open(filepath, "rb").read(100*1024*1024)).hexdigest()
+
+
+def _create_methodology_embedding(embedding_model: Any, methodology_text: str) -> np.ndarray:
+    """Create embedding vector for methodology text"""
+    try:
+        # Truncate long text
+        max_length = 512
+        text = ' '.join(methodology_text.split()[:max_length])
+        
+        # 使用sentence_transformers模型获取嵌入向量
+        embedding = embedding_model.encode([text], 
+                                                convert_to_tensor=True,
+                                                normalize_embeddings=True)
+        vector = np.array(embedding.cpu().numpy(), dtype=np.float32)
+        return vector[0]  # Return first vector, because we only encoded one text
+    except Exception as e:
+        PrettyOutput.print(f"Failed to create methodology embedding vector: {str(e)}", OutputType.ERROR)
+        return np.zeros(1536, dtype=np.float32)
+
+
+def load_methodology(user_input: str) -> str:
+    """Load methodology and build vector index"""
+    PrettyOutput.print("Loading methodology...", OutputType.PROGRESS)
+    user_jarvis_methodology = os.path.expanduser("~/.jarvis_methodology")
+    if not os.path.exists(user_jarvis_methodology):
+        return ""
+
+    try:
+        with open(user_jarvis_methodology, "r", encoding="utf-8") as f:
+            data = yaml.safe_load(f)
+
+        # Reset data structure
+        methodology_data = []
+        vectors = []
+        ids = []
+
+        # Get embedding model
+        embedding_model = load_embedding_model()
+        
+        # Create test embedding to get correct dimension
+        test_embedding = _create_methodology_embedding(embedding_model, "test")
+        embedding_dimension = len(test_embedding)
+
+        # Create embedding vector for each methodology
+        for i, (key, value) in enumerate(data.items()):
+            PrettyOutput.print(f"Vectorizing methodology: {key} ...", OutputType.INFO)
+            methodology_text = f"{key}\n{value}"
+            embedding = _create_methodology_embedding(embedding_model, methodology_text)
+            vectors.append(embedding)
+            ids.append(i)
+            methodology_data.append({"key": key, "value": value})
+
+        if vectors:
+            vectors_array = np.vstack(vectors)
+            # Use correct dimension from test embedding
+            hnsw_index = faiss.IndexHNSWFlat(embedding_dimension, 16)
+            hnsw_index.hnsw.efConstruction = 40
+            hnsw_index.hnsw.efSearch = 16
+            methodology_index = faiss.IndexIDMap(hnsw_index)
+            methodology_index.add_with_ids(vectors_array, np.array(ids)) # type: ignore
+            query_embedding = _create_methodology_embedding(embedding_model, user_input)
+            k = min(5, len(methodology_data))
+            PrettyOutput.print(f"Retrieving methodology...", OutputType.INFO)
+            distances, indices = methodology_index.search(
+                query_embedding.reshape(1, -1), k
+            ) # type: ignore
+
+            relevant_methodologies = {}
+            for dist, idx in zip(distances[0], indices[0]):
+                if idx >= 0:
+                    similarity = 1.0 / (1.0 + float(dist))
+                    methodology = methodology_data[idx]
+                    PrettyOutput.print(
+                        f"Methodology '{methodology['key']}' similarity: {similarity:.3f}",
+                        OutputType.INFO
+                    )
+                    if similarity >= 0.5:
+                        relevant_methodologies[methodology["key"]] = methodology["value"]
+                    
+            if relevant_methodologies:
+                return f"""This is the standard methodology for handling previous problems, if the current task is similar, you can refer to it:
+                        {relevant_methodologies}
+                        """
+        return ""
+
+    except Exception as e:
+        PrettyOutput.print(f"Error loading methodology: {str(e)}", OutputType.ERROR)
+        import traceback
+        PrettyOutput.print(f"Error trace: {traceback.format_exc()}", OutputType.INFO)
+        return ""

{jarvis_ai_assistant-0.1.97.dist-info → jarvis_ai_assistant-0.1.99.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.97
+Version: 0.1.99
 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.99.dist-info/RECORD

@@ -0,0 +1,52 @@
+jarvis/__init__.py,sha256=U2J1Jkr2YHJwfc3OfDOe-JfIpiajjVBplRfsmc4xL8U,50
+jarvis/agent.py,sha256=EwufsNRQPYLnQ5HsZkjsw9-tOtc3GCn9h73kuZoNg3k,20780
+jarvis/utils.py,sha256=WtIZrwed5q0KvDWTxS6Y4K_m9svZROvOxyehJ7u1OSc,15495
+jarvis/jarvis_code_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_code_agent/main.py,sha256=7mCwsvBDtnI-VohCy1ng6jEpSQL9G5Xztml11PgjRvs,6307
+jarvis/jarvis_codebase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_codebase/main.py,sha256=lvIWXmdl16WHVhroSFFxr00uHnpv5e9dEDOjz9ibH9A,36874
+jarvis/jarvis_coder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_coder/file_select.py,sha256=BobNj5Kirr6jSwy59LOghC3o8Uff1CwTXNtlTO-idEo,8475
+jarvis/jarvis_coder/git_utils.py,sha256=0xKgUzfKy8Pk4wEIBmTggPpRafiHWtPD1SfZOapZnj8,5029
+jarvis/jarvis_coder/main.py,sha256=b8p-FrQe23bM2_H3sY3A3Y6J332DM6ojSi6yoi_K77E,8879
+jarvis/jarvis_coder/patch_handler.py,sha256=pMKgwHOc7U0rFKj3-MZNlshzq_im4kZw4QV2yrvUr-s,13061
+jarvis/jarvis_coder/plan_generator.py,sha256=x-FalwoRg79h-fvDgFQ8Cl-I8zJ7x2qcXsEUnRip9GA,6186
+jarvis/jarvis_platform/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_platform/main.py,sha256=Hb40MmN4We9oY8BHzLyrNTm-p7Mg50s2nqLaLxflC48,4981
+jarvis/jarvis_rag/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_rag/main.py,sha256=qi_JokG5ZZOFZ7R1V8aoIjst_knGyA1-lwJcRVvBX6A,33625
+jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_smart_shell/main.py,sha256=pAtNXLDAubNRLXAVz5oDw0BVI4juk9PX4Jbuyl7omQQ,4014
+jarvis/models/__init__.py,sha256=mrOt67nselz_H1gX9wdAO4y2DY5WPXzABqJbr5Des8k,63
+jarvis/models/ai8.py,sha256=ZRNO3aRjmICRjCXl-_F9pTNQTY4j1tUd-WJoJpb9n4Y,11958
+jarvis/models/base.py,sha256=nQ-rsJL1Z-gMev3TPoY7tYdwxhCJY8LG6_gtJ-maiW0,2181
+jarvis/models/kimi.py,sha256=wLXEA-17yLVvMRn-SAMGwQ_gx6mBaGhlSsP8F5pfoL0,16391
+jarvis/models/ollama.py,sha256=LzEA4kbkw1KflQ1T__hkmXu4--6xUPho2NTnj_ZQe6k,5761
+jarvis/models/openai.py,sha256=tAvz2Pne7woDXUppD7Ina461mVQCxy0vG5cwv5MHpLg,4404
+jarvis/models/oyi.py,sha256=iA8E5vzN9VIt-rlzpT5wmbyl7umVU1_y5yo_5gz3DXc,14534
+jarvis/models/registry.py,sha256=5z75vdBoudH2oJRESHzV3SOFX0JZaefpcWsrUNpmaJM,8814
+jarvis/tools/__init__.py,sha256=7Rqyj5hBAv5cWDVr5T9ZTZASO7ssBHeQNm2_4ZARdkA,72
+jarvis/tools/ask_user.py,sha256=2hEaR-L7pjYLVXFC5-zAu2us7B7OHTLvwssfKX2i3co,2006
+jarvis/tools/base.py,sha256=c0DMoDDPxmsqUYJR989zgUs7nIYRY6GWBrAdusIZKjc,656
+jarvis/tools/chdir.py,sha256=YMrzj6V3JHxX94e8adz97x1_E5aWjUoEwkhDM4T2DEs,2793
+jarvis/tools/codebase_qa.py,sha256=CpxL2RtPcdkrtaoKO5rU6YhWoZ6WdmGrD6P3pYDSkbA,2364
+jarvis/tools/create_code_sub_agent.py,sha256=aWxeF-4PM_bKS9TYk3iqQOZbMRnG6E469XdRGHG0dNw,1687
+jarvis/tools/create_sub_agent.py,sha256=4Uim7UGgStw7nhVz9i1S_nzSC__jUwxpCh80ZsLT2TA,2776
+jarvis/tools/execute_code_modification.py,sha256=yRBoayavmnUCP1GKgiOI2NjZK3HMcufZ_ed4L9ecvKE,2572
+jarvis/tools/execute_shell.py,sha256=6XIDzdTf67PDIObUZqLtHvhnlOLSyuV_GlfFwQJsSaU,2580
+jarvis/tools/file_operation.py,sha256=e37kkZKop75hUMh9MJjYNz2MbLir6J5iDFiXA_VzVWg,3899
+jarvis/tools/find_related_files.py,sha256=Q7O1qkNK1i7rGXrQjyJk2QIPPQNYUPFTHJTEbysntyw,3242
+jarvis/tools/generate_tool.py,sha256=5iw8-uLwMcwSzQ2DouoWYa4WYm_7ZmYfdJBU50z9SUE,6040
+jarvis/tools/methodology.py,sha256=wzkVbxetg_rvK_wDqPvgVQ9yeCwSkwEoQ5EsN0uB7G8,5377
+jarvis/tools/rag.py,sha256=gzut7Yk6vhYeT94GFBE6YMwTj5tvKEzlU9McY6fOdK8,4742
+jarvis/tools/read_webpage.py,sha256=_ts9ioSFR2wcMwjId_aV-jqSWpbiydU_beJQyn_aAv4,2405
+jarvis/tools/registry.py,sha256=-JSgZ-6Tp0xmADRLiX-lrlh14uob_TCe0r3gN0mpGyo,10583
+jarvis/tools/search.py,sha256=BIcp92A2iP0lj3EOh7RoIK2KsWIpd53txeM9x3IA8kg,9080
+jarvis/tools/select_code_files.py,sha256=lHX93It0FjAonzIhpg5CO27Zx9O8v_zDoW3040qQsUA,2107
+jarvis/tools/thinker.py,sha256=VFq0z9geAtGsRCbd8S73Rk7afAuGm3KQp6t5nayUJVg,4800
+jarvis_ai_assistant-0.1.99.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.99.dist-info/METADATA,sha256=o8sh7rX00sPwv35yMUB-hq5iSxB9nY8sfHj-i1cgBxM,12766
+jarvis_ai_assistant-0.1.99.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.99.dist-info/entry_points.txt,sha256=x0jA_mYRc7hBVdLuOFQBYQjpXjf8NPrAn0C54DJ9t2I,387
+jarvis_ai_assistant-0.1.99.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.99.dist-info/RECORD,,

{jarvis_ai_assistant-0.1.97.dist-info → jarvis_ai_assistant-0.1.99.dist-info}/entry_points.txt

@@ -1,5 +1,6 @@
 [console_scripts]
-jarvis = jarvis.main:main
+jarvis = jarvis.agent:main
+jarvis-code-agent = jarvis.jarvis_code_agent.main:main
 jarvis-codebase = jarvis.jarvis_codebase.main:main
 jarvis-coder = jarvis.jarvis_coder.main:main
 jarvis-platform = jarvis.jarvis_platform.main:main

jarvis/main.py

@@ -1,155 +0,0 @@
-#!/usr/bin/env python3
-"""Command line interface for Jarvis."""
-
-import argparse
-import yaml
-import os
-import sys
-from pathlib import Path
-from prompt_toolkit import prompt
-
-from jarvis.models.registry import PlatformRegistry
-
-# Add parent directory to Python path to support imports    
-sys.path.insert(0, str(Path(__file__).parent.parent))
-
-from jarvis.agent import Agent
-from jarvis.tools import ToolRegistry
-from jarvis.utils import PrettyOutput, OutputType, get_multiline_input, load_env_from_file
-
-
-def load_tasks() -> dict:
-    """Load tasks from .jarvis files in user home and current directory."""
-    tasks = {}
-    
-    # Check .jarvis in user directory
-    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)
-                
-            if isinstance(user_tasks, dict):
-                # Validate and add user directory tasks
-                for name, desc in user_tasks.items():
-                    if desc:  # Ensure description is not empty
-                        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)
-    
-    # Check .jarvis in current directory
-    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):
-                # Validate and add current directory tasks, overwrite user directory tasks if there is a name conflict
-                for name, desc in local_tasks.items():
-                    if desc:  # Ensure description is not empty
-                        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)
-
-    # Read methodology
-    method_path = os.path.expanduser("~/.jarvis_methodology")
-    if os.path.exists(method_path):
-        with open(method_path, "r", encoding="utf-8") as f:
-            methodology = yaml.safe_load(f)
-        if isinstance(methodology, dict):
-            for name, desc in methodology.items():
-                tasks[f"Run Methodology: {str(name)}\n {str(desc)}" ] = str(desc)
-    
-    return tasks
-
-def select_task(tasks: dict) -> str:
-    """Let user select a task from the list or skip. Returns task description if selected."""
-    if not tasks:
-        return ""
-    
-    # Convert tasks to list for ordered display
-    task_names = list(tasks.keys())
-    
-    PrettyOutput.print("\nAvailable tasks:", OutputType.INFO)
-    for i, name in enumerate(task_names, 1):
-        PrettyOutput.print(f"[{i}] {name}", OutputType.INFO)
-    PrettyOutput.print("[0] Skip predefined tasks", OutputType.INFO)
-    
-    
-    while True:
-        try:
-            choice = prompt(
-                "\nPlease select a task number (0 to skip): ",
-            ).strip()
-            
-            if not choice:
-                return ""
-            
-            choice = int(choice)
-            if choice == 0:
-                return ""
-            elif 1 <= choice <= len(task_names):
-                selected_name = task_names[choice - 1]
-                return tasks[selected_name]  # Return the task description
-            else:
-                PrettyOutput.print("Invalid choice. Please select a number from the list.", OutputType.ERROR)
-                
-        except KeyboardInterrupt:
-            return ""  # Return empty on Ctrl+C
-        except EOFError:
-            return ""  # Return empty on Ctrl+D
-        except Exception as e:
-            PrettyOutput.print(f"Failed to select task: {str(e)}", OutputType.ERROR)
-            continue
-
-def main():
-    """Jarvis main entry point"""
-    # Add argument parser
-    load_env_from_file()
-    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 session)')
-    args = parser.parse_args()
-
-    try:
-        # 获取全局模型实例
-        agent = Agent()
-
-        # 如果用户传入了模型参数，则更换当前模型为用户指定的模型
-
-        # Welcome information
-        PrettyOutput.print(f"Jarvis initialized - With {agent.model.name()}", OutputType.SYSTEM)
-        if args.keep_history:
-            PrettyOutput.print("History preservation mode enabled", OutputType.INFO)
-        
-        # 加载预定义任务
-        tasks = load_tasks()
-        if tasks:
-            selected_task = select_task(tasks)
-            if selected_task:
-                PrettyOutput.print(f"\nExecute task: {selected_task}", OutputType.INFO)
-                agent.run(selected_task, args.files)
-                return 0
-        
-        # 如果没有选择预定义任务，进入交互模式
-        while True:
-            try:
-                user_input = get_multiline_input("Please enter your task (input empty line to exit):")
-                if not user_input or user_input == "__interrupt__":
-                    break
-                agent.run(user_input, args.files)
-            except Exception as e:
-                PrettyOutput.print(f"Error: {str(e)}", OutputType.ERROR)
-
-    except Exception as e:
-        PrettyOutput.print(f"Initialization error: {str(e)}", OutputType.ERROR)
-        return 1
-
-    return 0
-
-if __name__ == "__main__":
-    exit(main())

jarvis/tools/coder.py

@@ -1,69 +0,0 @@
-import os
-from typing import Dict, Any, Optional
-from jarvis.jarvis_coder.main import JarvisCoder
-from jarvis.utils import PrettyOutput, OutputType
-
-class CoderTool:
-    """代码修改工具"""
-    
-    name = "coder"
-    description = "Analyze and modify existing code for implementing new features, fixing bugs, refactoring code, etc. Can understand code context and perform precise code edits."
-    parameters = {
-        "feature": {
-            "type": "string",
-            "description": "Description of the feature to implement or content to modify, e.g., 'add logging functionality', 'fix memory leak', 'optimize performance', etc.",
-            "required": True
-        },
-        "dir": {
-            "type": "string", 
-            "description": "Project root directory, defaults to current directory",
-            "required": False
-        },
-        "language": {
-            "type": "string",
-            "description": "Main programming language of the project, defaults to python",
-            "required": False
-        }
-    }
-
-    def __init__(self):
-        self._coder = None
-
-
-    def _init_coder(self, dir: Optional[str] = None, language: Optional[str] = "python") -> None:
-        """初始化JarvisCoder实例"""
-        if not self._coder:
-            import os
-            work_dir = dir or os.getcwd()
-            self._coder = JarvisCoder(work_dir, language)
-
-    def execute(self, args: Dict) -> Dict[str, Any]:
-        """执行代码修改
-        
-        Args:
-            feature: 要实现的功能描述
-            dir: 可选，项目根目录
-            language: 可选，编程语言
-            
-        Returns:
-            Dict[str, Any]: 执行结果
-        """
-        feature = args.get("feature")
-        dir = args.get("dir")
-        language = args.get("language", "python")
-        
-        try:
-            self.current_dir = os.getcwd()
-            self._init_coder(dir, language)
-            result = self._coder.execute(str(feature)) # type: ignore
-            return result
-        except Exception as e:
-            PrettyOutput.print(f"代码修改失败: {str(e)}", OutputType.ERROR)
-            return {
-                "success": False,
-                "stdout": "",
-                "stderr": f"执行失败: {str(e)}",
-                "error": e
-            } 
-        finally:
-            os.chdir(self.current_dir)

jarvis_ai_assistant-0.1.97.dist-info/RECORD

@@ -1,47 +0,0 @@
-jarvis/__init__.py,sha256=H5VVLl_TbloHsL4Uo5ZiI3kdTZALf6RmT-dv6Xy76a8,50
-jarvis/agent.py,sha256=9dfXBYO2QPYpiIXJixgoc1-CKHBDQcBlhskWrb0ZNYc,19636
-jarvis/main.py,sha256=mV_rW268R2CWnwDLUqmCqVOzEZBodwJoTzPiz979QF8,5919
-jarvis/utils.py,sha256=nqmOuQtmoIsc67iQNuWADwbXf2D3cbGjXan5VXLaTYk,11373
-jarvis/jarvis_codebase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_codebase/main.py,sha256=8A4VwK_MjAknT6ANj5Ptgf3wDD6e8rFOQVcU4gcVvH8,31183
-jarvis/jarvis_coder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_coder/git_utils.py,sha256=Rm0odJSbI3KGo8rTAAv1YsuudgjROlbHl7UBVOcxK3c,2237
-jarvis/jarvis_coder/main.py,sha256=l8q4xEvxSlha0kHJ3GarDCeu3mIu1un6OFeWALbQAqY,25144
-jarvis/jarvis_coder/patch_handler.py,sha256=FJy8NxECVExBudBlbOchoBKaLJQyG8z-KorjNkXUig0,9649
-jarvis/jarvis_coder/plan_generator.py,sha256=ODBeCT7pSv-SA0l22q8nAOwn2Usqr1TKHci8zMVpwmk,4474
-jarvis/jarvis_platform/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_platform/main.py,sha256=R0b51en28HaMpqc2jxP4xnOUXYIQa4GBUs0vC_acD34,4882
-jarvis/jarvis_rag/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_rag/main.py,sha256=gVHdF_WyzJEoOgda6xVe-P9R2iAIRNf_vj6xZ1WPvrw,32766
-jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_smart_shell/main.py,sha256=nTIErwnib9z8a67f5k3PqlhTvbXffo4BVpAANXWekos,3895
-jarvis/models/__init__.py,sha256=mrOt67nselz_H1gX9wdAO4y2DY5WPXzABqJbr5Des8k,63
-jarvis/models/ai8.py,sha256=ZRNO3aRjmICRjCXl-_F9pTNQTY4j1tUd-WJoJpb9n4Y,11958
-jarvis/models/base.py,sha256=5QQAghMmVsg7jXvQN9ZzVoqCmMR0jb9bKgAVR3eOjQ8,2005
-jarvis/models/kimi.py,sha256=wLXEA-17yLVvMRn-SAMGwQ_gx6mBaGhlSsP8F5pfoL0,16391
-jarvis/models/ollama.py,sha256=E8JDe378yMreglSVN5c_9lHAGBbuzHcYG05v07mS2BI,5724
-jarvis/models/openai.py,sha256=tAvz2Pne7woDXUppD7Ina461mVQCxy0vG5cwv5MHpLg,4404
-jarvis/models/oyi.py,sha256=iA8E5vzN9VIt-rlzpT5wmbyl7umVU1_y5yo_5gz3DXc,14534
-jarvis/models/registry.py,sha256=wswPmR8gzsyFnJ6TcTh58Py4uj6N0vApblyuXI7NeOQ,9062
-jarvis/tools/__init__.py,sha256=7Rqyj5hBAv5cWDVr5T9ZTZASO7ssBHeQNm2_4ZARdkA,72
-jarvis/tools/ask_user.py,sha256=u1opLhuHUmqz7bvlpj44x0vgMlKrTzFuFqc6YFaajW0,1953
-jarvis/tools/base.py,sha256=c0DMoDDPxmsqUYJR989zgUs7nIYRY6GWBrAdusIZKjc,656
-jarvis/tools/chdir.py,sha256=YMrzj6V3JHxX94e8adz97x1_E5aWjUoEwkhDM4T2DEs,2793
-jarvis/tools/codebase_qa.py,sha256=AJEJYnmw3ro5PEqUQGbNEpqY7YwwjXvYpEzmZheMptk,2446
-jarvis/tools/coder.py,sha256=HKBIbDwkpK05Zh4-ZDhmkB4x0HL-wNZL8T_ojwCk7KM,2383
-jarvis/tools/file_ops.py,sha256=lRoKl6d53wT3-sun_JqGLY6MO4RiXfxJL3ybP-chzTQ,3845
-jarvis/tools/generator.py,sha256=5iw8-uLwMcwSzQ2DouoWYa4WYm_7ZmYfdJBU50z9SUE,6040
-jarvis/tools/methodology.py,sha256=zsEr-i5mifJH1BXg0JgrmPaToTBcbjGdm_aM88vVmug,5199
-jarvis/tools/rag.py,sha256=zUrAJNis_HmTDCfSztmulqYt4ulaYHRb6fd-EMXRO9c,4528
-jarvis/tools/registry.py,sha256=-Qwt_2wcahN2XBwRtziZgm6eVF18jOvtLwgXgwre1nA,9471
-jarvis/tools/search.py,sha256=qbSfHJ5RHx8cHSdcmOfTFMQCNg6IxztKH5Vg4FtVTdE,9075
-jarvis/tools/shell.py,sha256=6XIDzdTf67PDIObUZqLtHvhnlOLSyuV_GlfFwQJsSaU,2580
-jarvis/tools/sub_agent.py,sha256=7YPY3qUocH7RjE3MDKFGlXKlAMIQv3-ufPRzlNXwo7w,2676
-jarvis/tools/thinker.py,sha256=VFq0z9geAtGsRCbd8S73Rk7afAuGm3KQp6t5nayUJVg,4800
-jarvis/tools/webpage.py,sha256=_ts9ioSFR2wcMwjId_aV-jqSWpbiydU_beJQyn_aAv4,2405
-jarvis_ai_assistant-0.1.97.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.97.dist-info/METADATA,sha256=23tqwSyUw2Nx2F6Q3VPuQBjAfi76ae2B6cafd2ZgboA,12766
-jarvis_ai_assistant-0.1.97.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.97.dist-info/entry_points.txt,sha256=1D14s9v6rwpNzVD0muwe0tCKffJDEvLRBlEShbSFSbQ,331
-jarvis_ai_assistant-0.1.97.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.97.dist-info/RECORD,,