jarvis-ai-assistant 0.1.63__tar.gz → 0.1.65__tar.gz

{jarvis_ai_assistant-0.1.63/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.65}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.63
+Version: 0.1.65
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -44,6 +44,9 @@ 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.26.0
+Requires-Dist: faiss-cpu>=1.8.1
+Requires-Dist: sentence-transformers>=2.2.2
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"
@@ -120,8 +123,12 @@ Jarvis supports configuration through environment variables that can be set in t
 |---------|------|--------|------|
 | JARVIS_PLATFORM | AI platform to use, supports kimi/openai/ai8 etc | kimi | Yes |
 | JARVIS_MODEL | Model name to use | - | No |
+
 | JARVIS_CODEGEN_PLATFORM | AI platform for code generation | Same as JARVIS_PLATFORM | No |
 | JARVIS_CODEGEN_MODEL | Model name for code generation | Same as JARVIS_MODEL | No |
+| JARVIS_CHEAP_PLATFORM | AI platform for cheap operations | Same as JARVIS_PLATFORM | No |
+| JARVIS_CHEAP_MODEL | Model name for cheap operations | Same as JARVIS_MODEL | No |
+| JARVIS_EMBEDDING_MODEL | Embedding model for code analysis | BAAI/bge-large-zh-v1.5 | No |
 | OPENAI_API_KEY | API key for OpenAI platform | - | Required for OpenAI |
 | OPENAI_API_BASE | Base URL for OpenAI API | https://api.deepseek.com | No |
 | OPENAI_MODEL_NAME | Model name for OpenAI | deepseek-chat | No |
@@ -139,15 +146,26 @@ Jarvis supports configuration through environment variables that can be set in t
 jarvis
 ```
 
+
 ### With Specific Model
 ```bash
 jarvis -p kimi  # Use Kimi platform
 jarvis -p openai  # Use OpenAI platform
 ```
 
-### Process Files
+### Code Modification
+```bash
+jarvis coder --feature "Add new feature"  # Modify code to add new feature
+```
+
+### Codebase Search
 ```bash
-jarvis -f file1.py file2.py  # Process specific files
+jarvis codebase --search "database connection"  # Search codebase
+```
+
+### Codebase Question
+```bash
+jarvis codebase --ask "How to use the database?"  # Ask about codebase
 ```
 
 ### Keep Chat History
@@ -157,6 +175,7 @@ jarvis --keep-history  # Don't delete chat session after completion
 
 ## 🛠️ Tools
 
+
 ### Built-in Tools
 
 | Tool | Description |
@@ -166,27 +185,43 @@ jarvis --keep-history  # Don't delete chat session after completion
 | generate_tool | AI-powered tool generation and integration |
 | methodology | Experience accumulation and methodology management |
 | create_sub_agent | Create specialized sub-agents for specific tasks |
+| coder | Automatic code modification and generation tool |
+| codebase | Codebase management and search tool |
 
 ### Tool Locations
 - Built-in tools: `src/jarvis/tools/`
 - User tools: `~/.jarvis_tools/`
 
+
 ### Key Features
 
 #### 1. Self-Extending Capabilities
 - Tool generation through natural language description
 - Automatic code generation and integration
 - Dynamic capability expansion through sub-agents
+- Automatic code modification with version control
+- Codebase indexing and semantic search
 
 #### 2. Methodology Learning
 - Automatic experience accumulation from interactions
 - Pattern recognition and methodology extraction
 - Continuous refinement through usage
+- Code modification history tracking
+- Codebase analysis and documentation generation
 
 #### 3. Adaptive Problem Solving
 - Context-aware sub-agent creation
 - Dynamic tool composition
 - Learning from execution feedback
+- Codebase-aware problem solving
+- Multi-model collaboration for complex tasks
+
+#### 4. Code Intelligence
+- Automatic codebase indexing
+- Semantic code search
+- Code modification with git integration
+- Code analysis and documentation
+- Multi-model code generation
 
 ## 🎯 Extending Jarvis
 

{jarvis_ai_assistant-0.1.63 → jarvis_ai_assistant-0.1.65}/README.md

@@ -65,8 +65,12 @@ Jarvis supports configuration through environment variables that can be set in t
 |---------|------|--------|------|
 | JARVIS_PLATFORM | AI platform to use, supports kimi/openai/ai8 etc | kimi | Yes |
 | JARVIS_MODEL | Model name to use | - | No |
+
 | JARVIS_CODEGEN_PLATFORM | AI platform for code generation | Same as JARVIS_PLATFORM | No |
 | JARVIS_CODEGEN_MODEL | Model name for code generation | Same as JARVIS_MODEL | No |
+| JARVIS_CHEAP_PLATFORM | AI platform for cheap operations | Same as JARVIS_PLATFORM | No |
+| JARVIS_CHEAP_MODEL | Model name for cheap operations | Same as JARVIS_MODEL | No |
+| JARVIS_EMBEDDING_MODEL | Embedding model for code analysis | BAAI/bge-large-zh-v1.5 | No |
 | OPENAI_API_KEY | API key for OpenAI platform | - | Required for OpenAI |
 | OPENAI_API_BASE | Base URL for OpenAI API | https://api.deepseek.com | No |
 | OPENAI_MODEL_NAME | Model name for OpenAI | deepseek-chat | No |
@@ -84,15 +88,26 @@ Jarvis supports configuration through environment variables that can be set in t
 jarvis
 ```
 
+
 ### With Specific Model
 ```bash
 jarvis -p kimi  # Use Kimi platform
 jarvis -p openai  # Use OpenAI platform
 ```
 
-### Process Files
+### Code Modification
+```bash
+jarvis coder --feature "Add new feature"  # Modify code to add new feature
+```
+
+### Codebase Search
 ```bash
-jarvis -f file1.py file2.py  # Process specific files
+jarvis codebase --search "database connection"  # Search codebase
+```
+
+### Codebase Question
+```bash
+jarvis codebase --ask "How to use the database?"  # Ask about codebase
 ```
 
 ### Keep Chat History
@@ -102,6 +117,7 @@ jarvis --keep-history  # Don't delete chat session after completion
 
 ## 🛠️ Tools
 
+
 ### Built-in Tools
 
 | Tool | Description |
@@ -111,27 +127,43 @@ jarvis --keep-history  # Don't delete chat session after completion
 | generate_tool | AI-powered tool generation and integration |
 | methodology | Experience accumulation and methodology management |
 | create_sub_agent | Create specialized sub-agents for specific tasks |
+| coder | Automatic code modification and generation tool |
+| codebase | Codebase management and search tool |
 
 ### Tool Locations
 - Built-in tools: `src/jarvis/tools/`
 - User tools: `~/.jarvis_tools/`
 
+
 ### Key Features
 
 #### 1. Self-Extending Capabilities
 - Tool generation through natural language description
 - Automatic code generation and integration
 - Dynamic capability expansion through sub-agents
+- Automatic code modification with version control
+- Codebase indexing and semantic search
 
 #### 2. Methodology Learning
 - Automatic experience accumulation from interactions
 - Pattern recognition and methodology extraction
 - Continuous refinement through usage
+- Code modification history tracking
+- Codebase analysis and documentation generation
 
 #### 3. Adaptive Problem Solving
 - Context-aware sub-agent creation
 - Dynamic tool composition
 - Learning from execution feedback
+- Codebase-aware problem solving
+- Multi-model collaboration for complex tasks
+
+#### 4. Code Intelligence
+- Automatic codebase indexing
+- Semantic code search
+- Code modification with git integration
+- Code analysis and documentation
+- Multi-model code generation
 
 ## 🎯 Extending Jarvis
 

{jarvis_ai_assistant-0.1.63 → jarvis_ai_assistant-0.1.65}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.63"
+version = "0.1.65"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "Your Name", email = "your.email@example.com" }]
@@ -26,6 +26,9 @@ dependencies = [
     "prompt_toolkit>=3.0.0",
     "openai>=1.20.0",
     "playwright>=1.41.1",
+    "numpy>=1.26.0",
+    "faiss-cpu>=1.8.1",
+    "sentence-transformers>=2.2.2",
 ]
 requires-python = ">=3.8"
 
@@ -37,4 +40,5 @@ Homepage = "https://github.com/skyfireitdiy/Jarvis"
 
 [project.scripts]
 jarvis = "jarvis.main:main"
-jarvis-coder = "jarvis.jarvis_coder.main:main"
+jarvis-coder = "jarvis.jarvis_coder.main:main"
+jarvis-codebase = "jarvis.jarvis_codebase.main:main"

{jarvis_ai_assistant-0.1.63 → jarvis_ai_assistant-0.1.65}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.63",
+    version="0.1.65",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -19,11 +19,15 @@ setup(
         "prompt_toolkit>=3.0.0",
         "openai>=1.20.0",
         "playwright>=1.41.1",
+        "numpy>=1.26.0",
+        "faiss-cpu>=1.8.1",
+        "sentence-transformers>=2.2.2",
     ],
     entry_points={
         "console_scripts": [
             "jarvis=jarvis.main:main",
-            "jarvis-coder=jarvis.jarvis_coder.main:main"
+            "jarvis-coder=jarvis.jarvis_coder.main:main",
+            "jarvis-codebase=jarvis.jarvis_codebase.main:main",
         ],
     },
     python_requires=">=3.8",

{jarvis_ai_assistant-0.1.63 → jarvis_ai_assistant-0.1.65}/src/jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.63" 
+__version__ = "0.1.65" 

{jarvis_ai_assistant-0.1.63 → jarvis_ai_assistant-0.1.65}/src/jarvis/agent.py

@@ -142,20 +142,6 @@ class Agent:
         except Exception as e:
             PrettyOutput.print(f"总结对话历史失败: {str(e)}", OutputType.ERROR)
 
-    
-    def _choose_methodology(self, methodology: Dict[str, str], task: str) -> str:
-        """选择方法论"""
-        prompt = f"""请根据任务内容选择合适的方法论，并返回方法论内容，格式如下：
-任务内容:
-{task}
-
-方法论:
-"""
-        for k, v in methodology.items():
-            prompt += f"问题类型：{k}\n"
-            prompt += f"方法论：{v}\n"
-        return self._call_model(prompt)
-
     def _complete_task(self) -> str:
         """完成任务并生成总结
         
@@ -164,6 +150,34 @@ class Agent:
         """
         PrettyOutput.section("任务完成", OutputType.SUCCESS)
         
+        # 询问是否生成方法论，带输入验证
+        while True:
+            user_input = input("是否要为此任务生成方法论？(y/n): ").strip().lower()
+            if user_input in ['y', 'n', '']:
+                break
+            PrettyOutput.print("无效输入，请输入 y 或 n", OutputType.WARNING)
+        
+        if user_input == 'y':
+            try:
+                # 让模型判断是否需要生成方法论
+                analysis_prompt = """本次任务已结束，请分析是否需要生成方法论。
+如果认为需要生成方法论，请先判断是创建新的方法论还是更新已有方法论。如果是更新已有方法论，使用update，否则使用add。
+如果认为不需要生成方法论，请说明原因。
+仅输出方法论工具的调用指令，或者是不需要生成方法论的说明，除此之外不要输出任何内容。
+"""
+                self.prompt = analysis_prompt
+                response = self._call_model(self.prompt)
+                
+                # 检查是否包含工具调用
+                try:
+                    result = Agent.extract_tool_calls(response)
+                    PrettyOutput.print(result, OutputType.RESULT)
+                except Exception as e:
+                    PrettyOutput.print(f"处理方法论生成失败: {str(e)}", OutputType.ERROR)
+                
+            except Exception as e:
+                PrettyOutput.print(f"生成方法论时发生错误: {str(e)}", OutputType.ERROR)
+        
         if not self.is_sub_agent:
             return "Task completed"
         
@@ -198,9 +212,6 @@ class Agent:
 
             # 加载方法论
             methodology = self._load_methodology()
-
-            methodology =self._choose_methodology(methodology, user_input)
-
             methodology_prompt = ""
             if methodology:
                 methodology_prompt = f"""这是以往处理问题的标准方法论，如果当前任务与此类似，可参考：
@@ -271,7 +282,6 @@ arguments:
 
 特殊指令：
 1. !<<SUMMARIZE>>! - 当你发现对话历史过长可能导致token超限时，可以使用此指令总结当前对话要点并清空历史。使用方法：直接回复"!<<SUMMARIZE>>!"即可。
-2. !<<FINISHED>>! - 当你确认任务已经完成时，使用此指令结束任务。使用方法：在回复中包含"!<<FINISHED>>!"即可。
 
 -------------------------------------------------------------
 
@@ -316,10 +326,6 @@ arguments:
                         self.prompt = tool_result
                         continue
                     
-                    # 检查是否完成任务
-                    if "!<<FINISHED>>!" in current_response:
-                        return self._complete_task()
-                    
                     # 获取用户输入
                     user_input = get_multiline_input(f"{self.name}: 您可以继续输入，或输入空行结束当前任务")
                     if user_input == "__interrupt__":