jarvis-ai-assistant 0.1.63__py3-none-any.whl → 0.1.74__py3-none-any.whl

jarvis/models/oyi.py

@@ -25,8 +25,6 @@ class OyiModel(BasePlatform):
         else:
             PrettyOutput.print("获取模型列表失败", OutputType.WARNING)
         
-        PrettyOutput.print("使用OYI_MODEL环境变量配置模型", OutputType.SUCCESS)
-        
         self.messages = []
         self.system_message = ""
         self.conversation = None
@@ -37,11 +35,10 @@ class OyiModel(BasePlatform):
         if not self.token:
             raise Exception("OYI_API_KEY is not set")
         
-        self.model_name = os.getenv("OYI_MODEL") or os.getenv("JARVIS_MODEL") or "deepseek-chat"
+        self.model_name = os.getenv("JARVIS_MODEL") or "deepseek-chat"
         if self.model_name not in [m.split()[0] for m in available_models]:
             PrettyOutput.print(f"警告: 当前选择的模型 {self.model_name} 不在可用列表中", OutputType.WARNING)
         
-        PrettyOutput.print(f"当前使用模型: {self.model_name}", OutputType.SYSTEM)
 
     def set_model_name(self, model_name: str):
         """设置模型名称"""

jarvis/models/registry.py

@@ -121,7 +121,7 @@ class PlatformRegistry:
                             # 检查平台实现
                             if not PlatformRegistry.check_platform_implementation(obj):
                                 continue
-
+                            PrettyOutput.print(f"从 {os.path.join(directory, filename)} 加载平台：{obj.platform_name}", OutputType.SUCCESS)
                             platforms[obj.platform_name] = obj
                             break
                 except Exception as e:

jarvis/tools/__init__.py

@@ -3,3 +3,4 @@ from .registry import ToolRegistry
 __all__ = [
     'ToolRegistry',
 ] 
+

jarvis/tools/codebase_qa.py

@@ -0,0 +1,74 @@
+import os
+from typing import Any, Dict
+from jarvis.jarvis_codebase.main import CodeBase
+from jarvis.utils import find_git_root, PrettyOutput, OutputType
+
+class CodebaseQATool:
+    """代码库问答工具，用于回答关于代码库的问题"""
+    
+    name = "codebase_qa"
+    description = "回答关于代码库的问题，可以查询和理解代码的功能、结构和实现细节"
+    parameters = {
+        "type": "object",
+        "properties": {
+            "dir": {
+                "type": "string",
+                "description": "项目根目录"
+            },
+            "question": {
+                "type": "string",
+                "description": "关于代码库的问题"
+            },
+            "top_k": {
+                "type": "integer",
+                "description": "搜索相关文件的数量",
+                "default": 5
+            }
+        },
+        "required": ["question"]
+    }
+    
+    def execute(self, params: Dict[str, Any]) -> Dict[str, Any]:
+        """执行代码问答"""
+        try:
+            dir = params.get("dir")
+            question = params["question"]
+            top_k = params.get("top_k", 5)
+            
+            # 初始化代码库
+            current_dir = os.getcwd()
+            root_dir = find_git_root(dir or current_dir)
+            if not root_dir:
+                return {
+                    "success": False,
+                    "stdout": "",
+                    "stderr": "错误：当前目录不在Git仓库中",
+                    "error": "NotInGitRepository"
+                }
+
+            os.chdir(root_dir)
+            codebase = CodeBase(root_dir)
+            # 生成索引
+
+            codebase.generate_codebase(force=True)
+            # 执行问答
+            response = codebase.ask_codebase(question, top_k)
+            os.chdir(current_dir)
+            return {
+                "success": True,
+                "stdout": response,
+                "stderr": "",
+                "error": None
+            }
+            
+        except Exception as e:
+            PrettyOutput.print(f"代码问答出错: {str(e)}", output_type=OutputType.ERROR)
+            return {
+                "success": False,
+                "stdout": "",
+                "stderr": f"执行代码问答时发生错误: {str(e)}",
+                "error": str(type(e).__name__)
+            }
+
+def register():
+    return CodebaseQATool() 

jarvis/tools/registry.py

@@ -99,7 +99,7 @@ class ToolRegistry:
                         parameters=tool_instance.parameters,
                         func=tool_instance.execute
                     )
-                    PrettyOutput.print(f"从 {file_path} 加载工具: {tool_instance.name}: {tool_instance.description}", OutputType.INFO)
+                    PrettyOutput.print(f"从 {file_path} 加载工具: {tool_instance.name}: {tool_instance.description}", OutputType.SUCCESS)
                     tool_found = True
                     break
                     

jarvis/utils.py

@@ -158,7 +158,7 @@ def get_multiline_input(tip: str) -> str:
             lines.append(line)
             
     except KeyboardInterrupt:
-        PrettyOutput.print("\n输入已取消", OutputType.ERROR)
+        PrettyOutput.print("\n输入已取消", OutputType.INFO)
         return "__interrupt__"
     
     return "\n".join(lines)
@@ -200,3 +200,10 @@ def while_true(func, sleep_time: float = 0.1):
         PrettyOutput.print(f"执行失败，{sleep_time}s后重试...", OutputType.WARNING)
         time.sleep(sleep_time)
     return ret
+
+def find_git_root(dir="."):
+    curr_dir = os.getcwd()
+    os.chdir(dir)
+    ret = os.popen("git rev-parse --show-toplevel").read().strip()
+    os.chdir(curr_dir)
+    return ret

{jarvis_ai_assistant-0.1.63.dist-info → jarvis_ai_assistant-0.1.74.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.63
+Version: 0.1.74
 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,10 @@ 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.24.0
+Requires-Dist: faiss-cpu>=1.8.0
+Requires-Dist: sentence-transformers>=2.2.2
+Requires-Dist: bs4>=0.0.1
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"
@@ -122,6 +126,9 @@ Jarvis supports configuration through environment variables that can be set in t
 | 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 -f file1.py file2.py  # Process specific files
+jarvis-coder --feature "Add new feature"  # Modify code to add new feature
+```
+
+### Codebase Search
+```bash
+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.74.dist-info/RECORD

@@ -0,0 +1,33 @@
+jarvis/__init__.py,sha256=un8MKMurE4TQ58dJg7nKMX1AVpzjB6SOlLsT0fZsdWI,50
+jarvis/agent.py,sha256=jQAEJ3C8DEcmtCozXCieUcRKhhPSXJe8ylWuI4LSrOk,15032
+jarvis/main.py,sha256=7EcSlxa5JFFXBujzKDWdNtwX6axLhFFdJMc2GxTjfdk,6295
+jarvis/utils.py,sha256=vZV8sHj0ggZy4Rb8RxIujQhRWgeNEomhqVl4WXmpq7c,7498
+jarvis/jarvis_codebase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_codebase/main.py,sha256=G8ADdTgjZTxEjvP11IBbjHiNWCvuTkFiLkDKq_8UpI0,26947
+jarvis/jarvis_coder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_coder/main.py,sha256=4YhQ20MD8ntdD5hjmjJbBHYEDPDZ2aPIgAviJCvtOXE,24458
+jarvis/models/__init__.py,sha256=mrOt67nselz_H1gX9wdAO4y2DY5WPXzABqJbr5Des8k,63
+jarvis/models/ai8.py,sha256=vgy-r_3HHxGMAalZrA65VWHC1PuwBTYgtprSgHkCbrk,12557
+jarvis/models/base.py,sha256=ShV1H8Unee4RMaiFO4idROQA0Hc6wu4dyeRPX5fcszk,1433
+jarvis/models/kimi.py,sha256=1iTB0Z_WOmCML3Ufsge6jmeKOYvccr7I5lS3JUXymU4,17611
+jarvis/models/openai.py,sha256=ayaBWAN5VexMcKVrjEPDNB-Q9wx0sCV9Z4BCrvwYJ9w,4315
+jarvis/models/oyi.py,sha256=X2c5SWDIuQDCCFBcEKbzIWEz3I34eOAi0d1XAFgxlpw,15001
+jarvis/models/registry.py,sha256=YpooKSpk5pSWfb5cBDz5wRfPK-abb9uuUZr4WBejqwI,7762
+jarvis/tools/__init__.py,sha256=7Rqyj5hBAv5cWDVr5T9ZTZASO7ssBHeQNm2_4ZARdkA,72
+jarvis/tools/base.py,sha256=EGRGbdfbLXDLwtyoWdvp9rlxNX7bzc20t0Vc2VkwIEY,652
+jarvis/tools/codebase_qa.py,sha256=LsowsgL7HBmdBwa7zXcYi_OkwOok4qbnzYWYsuZxHtU,2413
+jarvis/tools/coder.py,sha256=ZJfPInKms4Hj3-eQlBwamVsvZ-2nlZ-4jsqJ-tJc6mg,2040
+jarvis/tools/file_ops.py,sha256=h8g0eT9UvlJf4kt0DLXvdSsjcPj7x19lxWdDApeDfpg,3842
+jarvis/tools/generator.py,sha256=vVP3eN5cCDpRXf_fn0skETkPXAW1XZFWx9pt2_ahK48,5999
+jarvis/tools/methodology.py,sha256=UG6s5VYRcd9wrKX4cg6f7zJhet5AIcthFGMOAdevBiw,5175
+jarvis/tools/registry.py,sha256=MeTYNdZNRdhlgABviVxzbDPSgLpwDp2Nx2dGzedRu8U,7212
+jarvis/tools/search.py,sha256=1EqOVvLhg2Csh-i03-XeCrusbyfmH69FZ8khwZt8Tow,6131
+jarvis/tools/shell.py,sha256=UPKshPyOaUwTngresUw-ot1jHjQIb4wCY5nkJqa38lU,2520
+jarvis/tools/sub_agent.py,sha256=rEtAmSVY2ZjFOZEKr5m5wpACOQIiM9Zr_3dT92FhXYU,2621
+jarvis/tools/webpage.py,sha256=d3w3Jcjcu1ESciezTkz3n3Zf-rp_l91PrVoDEZnckOo,2391
+jarvis_ai_assistant-0.1.74.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.74.dist-info/METADATA,sha256=ajh1yMCWevAgppfPVYQxcKV4J143iOBz1SyBC9KGd9o,12399
+jarvis_ai_assistant-0.1.74.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.74.dist-info/entry_points.txt,sha256=QNUeqmUJd7nHufel2FO7cRttS1uKFfnbIyObv8eVyOY,140
+jarvis_ai_assistant-0.1.74.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.74.dist-info/RECORD,,

{jarvis_ai_assistant-0.1.63.dist-info → jarvis_ai_assistant-0.1.74.dist-info}/entry_points.txt

@@ -1,3 +1,4 @@
 [console_scripts]
 jarvis = jarvis.main:main
+jarvis-codebase = jarvis.jarvis_codebase.main:main
 jarvis-coder = jarvis.jarvis_coder.main:main

jarvis_ai_assistant-0.1.63.dist-info/RECORD

@@ -1,29 +0,0 @@
-jarvis/__init__.py,sha256=sZ5DQXpur0P2tY_PCFzbnYK8EQLpCoUcnhPRL-xFwRg,50
-jarvis/agent.py,sha256=aIth7geQ2ZIugBYjW_Rx3sr-I6NuZtH1INEj4hOBVD4,14242
-jarvis/main.py,sha256=gXXtnrkkvGwEswJL6qiYjVrg3bpzye-GJeAe0Nf2B9o,6509
-jarvis/utils.py,sha256=JlkuC9RtspXH2VWDmj9nR0vnb8ie1gIsKc4vC7WRco8,7321
-jarvis/jarvis_coder/main.py,sha256=TosDDiaYSjDpzKPNKcygxZ3XXWbcnvBmIIMn3UMBc60,35102
-jarvis/models/__init__.py,sha256=mrOt67nselz_H1gX9wdAO4y2DY5WPXzABqJbr5Des8k,63
-jarvis/models/ai8.py,sha256=AMBZRS9hKW1Ts_YoHMMelhT0CRMeMzHtVH31z0FpP-Q,12671
-jarvis/models/base.py,sha256=ShV1H8Unee4RMaiFO4idROQA0Hc6wu4dyeRPX5fcszk,1433
-jarvis/models/kimi.py,sha256=1iTB0Z_WOmCML3Ufsge6jmeKOYvccr7I5lS3JUXymU4,17611
-jarvis/models/openai.py,sha256=7oOxrL6EM7iaqJgZsaFvVmyzY0ars4BP3EKAUlX1RPw,4403
-jarvis/models/oyi.py,sha256=mW-uhUZbts2L_oI8WueZUTEmrLY1CiBHn4UV2HP7ZCE,15214
-jarvis/models/registry.py,sha256=hJyaROiOF_TkbtIXsjOD8-ArOvAvtxviawyqBFfLV6s,7617
-jarvis/tools/__init__.py,sha256=Kj1bKj34lwRDKMKHLOrLyQElf2lHbqA2tDgP359eaDo,71
-jarvis/tools/base.py,sha256=EGRGbdfbLXDLwtyoWdvp9rlxNX7bzc20t0Vc2VkwIEY,652
-jarvis/tools/coder.py,sha256=ZJfPInKms4Hj3-eQlBwamVsvZ-2nlZ-4jsqJ-tJc6mg,2040
-jarvis/tools/file_ops.py,sha256=h8g0eT9UvlJf4kt0DLXvdSsjcPj7x19lxWdDApeDfpg,3842
-jarvis/tools/generator.py,sha256=vVP3eN5cCDpRXf_fn0skETkPXAW1XZFWx9pt2_ahK48,5999
-jarvis/tools/methodology.py,sha256=UG6s5VYRcd9wrKX4cg6f7zJhet5AIcthFGMOAdevBiw,5175
-jarvis/tools/registry.py,sha256=mlOAmUq3yzRz-7yvwrrCwbe5Lmw8eh1v8-_Fa5sezwI,7209
-jarvis/tools/search.py,sha256=1EqOVvLhg2Csh-i03-XeCrusbyfmH69FZ8khwZt8Tow,6131
-jarvis/tools/shell.py,sha256=UPKshPyOaUwTngresUw-ot1jHjQIb4wCY5nkJqa38lU,2520
-jarvis/tools/sub_agent.py,sha256=rEtAmSVY2ZjFOZEKr5m5wpACOQIiM9Zr_3dT92FhXYU,2621
-jarvis/tools/webpage.py,sha256=d3w3Jcjcu1ESciezTkz3n3Zf-rp_l91PrVoDEZnckOo,2391
-jarvis_ai_assistant-0.1.63.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.63.dist-info/METADATA,sha256=8Kq0xkFkfbqX9sB6kR3h9yKJhtb2T5hgeVBy_1Onyx4,11213
-jarvis_ai_assistant-0.1.63.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.63.dist-info/entry_points.txt,sha256=ieRI4ilnGNx1R6LlzT2P510mJ27lhLesVZToezDjSd8,89
-jarvis_ai_assistant-0.1.63.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.63.dist-info/RECORD,,