jarvis-ai-assistant 0.1.105__tar.gz → 0.1.107__tar.gz

{jarvis_ai_assistant-0.1.105/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.107}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.105
+Version: 0.1.107
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -154,8 +154,8 @@ Jarvis supports configuration through environment variables that can be set in t
 | JARVIS_NEED_SUMMARY | Generate summaries | true | No |
 | JARVIS_DONT_USE_LOCAL_MODEL | Avoid using local models | false | 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 |
+| OPENAI_API_BASE | Base URL for OpenAI API | https://api.openai.com | No |
+| OPENAI_MODEL_NAME | Model name for OpenAI | gpt-4o | No |
 | AI8_API_KEY | API key for AI8 platform | - | Required for AI8 |
 | KIMI_API_KEY | API key for Kimi platform | - | Required for Kimi |
 | OYI_API_KEY | API key for OYI platform | - | Required for OYI |
@@ -202,11 +202,8 @@ jss "describe what you want to do"
 # Manage git commits
 jarvis-git-commit
 
-# Generate and manage ctags
-jarvis-ctags
-
 # Manage AI platforms
-jarvis-platform
+jarvis-platform-manager
 ```
 
 Each command supports `--help` flag for detailed usage information:
@@ -216,9 +213,8 @@ jarvis-code-agent --help
 jarvis-codebase --help
 jarvis-rag --help
 jarvis-smart-shell --help
-jarvis-platform --help
+jarvis-platform-manager --help
 jarvis-git-commit --help
-jarvis-ctags --help
 ```
 
 ## 🛠️ Tools

{jarvis_ai_assistant-0.1.105 → jarvis_ai_assistant-0.1.107}/README.md

@@ -83,8 +83,8 @@ Jarvis supports configuration through environment variables that can be set in t
 | JARVIS_NEED_SUMMARY | Generate summaries | true | No |
 | JARVIS_DONT_USE_LOCAL_MODEL | Avoid using local models | false | 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 |
+| OPENAI_API_BASE | Base URL for OpenAI API | https://api.openai.com | No |
+| OPENAI_MODEL_NAME | Model name for OpenAI | gpt-4o | No |
 | AI8_API_KEY | API key for AI8 platform | - | Required for AI8 |
 | KIMI_API_KEY | API key for Kimi platform | - | Required for Kimi |
 | OYI_API_KEY | API key for OYI platform | - | Required for OYI |
@@ -131,11 +131,8 @@ jss "describe what you want to do"
 # Manage git commits
 jarvis-git-commit
 
-# Generate and manage ctags
-jarvis-ctags
-
 # Manage AI platforms
-jarvis-platform
+jarvis-platform-manager
 ```
 
 Each command supports `--help` flag for detailed usage information:
@@ -145,9 +142,8 @@ jarvis-code-agent --help
 jarvis-codebase --help
 jarvis-rag --help
 jarvis-smart-shell --help
-jarvis-platform --help
+jarvis-platform-manager --help
 jarvis-git-commit --help
-jarvis-ctags --help
 ```
 
 ## 🛠️ Tools

{jarvis_ai_assistant-0.1.105 → jarvis_ai_assistant-0.1.107}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.105"
+version = "0.1.107"
 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" }]
@@ -60,5 +60,4 @@ jarvis-smart-shell = "jarvis.jarvis_smart_shell.main:main"
 jss = "jarvis.jarvis_smart_shell.main:main"
 jarvis-platform-manager = "jarvis.jarvis_platform_manager.main:main"
 jarvis-git-commit = "jarvis.jarvis_tools.git_commiter:main"
-jarvis-ctags = "jarvis.jarvis_tools.create_ctags_agent:main"
 jarvis-code-review = "jarvis.jarvis_tools.code_review:main"

{jarvis_ai_assistant-0.1.105 → jarvis_ai_assistant-0.1.107}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.105",
+    version="0.1.107",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -45,7 +45,6 @@ setup(
             "jss=jarvis.jarvis_smart_shell.main:main",
             "jarvis-platform-manager=jarvis.jarvis_platform_manager.main:main",
             "jarvis-git-commit=jarvis.jarvis_tools.git_commiter:main",
-            "jarvis-ctags=jarvis.jarvis_tools.create_ctags_agent:main",
             "jarvis-code-review=jarvis.jarvis_tools.code_review:main",
         ],
     },

{jarvis_ai_assistant-0.1.105 → jarvis_ai_assistant-0.1.107}/src/jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.105" 
+__version__ = "0.1.107" 

{jarvis_ai_assistant-0.1.105 → jarvis_ai_assistant-0.1.107}/src/jarvis/jarvis_codebase/main.py

@@ -648,7 +648,7 @@ Note: Only include files that have a strong connection to the query."""
             return []
 
     def _generate_query_variants(self, query: str) -> List[str]:
-        """Generate different expressions of the query
+        """Generate different expressions of the query optimized for vector search
         
         Args:
             query: Original query
@@ -657,14 +657,44 @@ Note: Only include files that have a strong connection to the query."""
             List[str]: The query variants list
         """
         model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
-        prompt = f"""Please generate 3 different expressions based on the following query in English, each expression should fully convey the meaning of the original query. These expressions will be used for code search, maintain professionalism and accuracy.
+        prompt = f"""Please generate 3 different expressions optimized for vector search based on the following query. Each expression should:
+
+1. Focus on key technical concepts and terminology
+2. Use clear and specific language
+3. Include important contextual terms
+4. Avoid general or ambiguous words
+5. Maintain semantic similarity with original query
+6. Be suitable for embedding-based search
+
 Original query: {query}
 
-Please output 3 expressions directly, separated by two line breaks, without numbering or other markers.
+Example transformations:
+Query: "How to handle user login?"
+Output format:
+<QUESTION>
+- user authentication implementation and flow
+- login system architecture and components
+- credential validation and session management
+- ...
+</QUESTION>
+
+Please provide 10 search-optimized expressions in the specified format.
 """
-        variants = model.chat_until_success(prompt).strip().split('\n\n')
-        variants.append(query)  # Add the original query
-        return variants
+        response = model.chat_until_success(prompt)
+        
+        # Parse the response using YAML format
+        import yaml
+        variants = []
+        question_match = re.search(r'<QUESTION>\n(.*?)</QUESTION>', response, re.DOTALL)
+        if question_match:
+            try:
+                variants = yaml.safe_load(question_match.group(1))
+            except Exception as e:
+                PrettyOutput.print(f"Failed to parse variants: {str(e)}", OutputType.ERROR)
+        
+        # Add original query
+        variants.append(query)
+        return variants if variants else [query]
 
     def _vector_search(self, query_variants: List[str], top_k: int) -> Dict[str, Tuple[str, float, str]]:
         """Use vector search to find related files
@@ -699,86 +729,128 @@ Please output 3 expressions directly, separated by two line breaks, without numb
 
 
     def search_similar(self, query: str, top_k: int = 30) -> List[str]:
-        """Search related files"""
+        """Search related files with optimized retrieval"""
         try:
             self.generate_codebase()
             if self.index is None:
-                return []            
-            # Generate the query variants
+                return []
+                
+            # Generate query variants for better coverage
             query_variants = self._generate_query_variants(query)
             
-            # Perform vector search
-            vector_results = self._vector_search(query_variants, top_k)            
-
-            results = list(vector_results.values())
-            results.sort(key=lambda x: x[1], reverse=True)
-
-            # Take the top top_k results for reordering
-            initial_results = results[:top_k]
+            # Collect results from all variants
+            all_results = []
+            seen_files = set()
             
-            # If no results are found, return directly
-            if not initial_results:
+            for variant in query_variants:
+                # Get vector for each variant
+                query_vector = self.get_embedding(variant)
+                query_vector = query_vector.reshape(1, -1)
+                
+                # Search with current variant
+                initial_k = min(top_k * 2, len(self.file_paths))
+                distances, indices = self.index.search(query_vector, initial_k) # type: ignore
+                
+                # Process results
+                for idx, dist in zip(indices[0], distances[0]):
+                    if idx != -1:
+                        file_path = self.file_paths[idx]
+                        if file_path not in seen_files:
+                            similarity = 1.0 / (1.0 + float(dist))
+                            if similarity > 0.3:  # Lower threshold for better recall
+                                seen_files.add(file_path)
+                                all_results.append((file_path, similarity, self.vector_cache[file_path]["description"]))
+            
+            if not all_results:
                 return []
+                
+            # Sort by similarity and take top_k
+            all_results.sort(key=lambda x: x[1], reverse=True)
+            results = all_results[:top_k]
             
-            # Filter low-scoring results
-            initial_results = [(path, score, desc) for path, score, desc in initial_results if score >= 0.5]
-
+            # Display results with scores
             message = "Found related files:\n"
-            for path, score, _ in initial_results:
-                message += f"File: {path} Similarity: {score:.3f}\n"
+            for path, score, _ in results:
+                message += f"File: {path} (Score: {score:.3f})\n"
             PrettyOutput.print(message.rstrip(), output_type=OutputType.INFO, lang="markdown")
-                
-            # Reorder the preliminary results
-            return self.pick_results(query, [path for path, _, _ in initial_results])
+            
+            return [path for path, _, _ in results]
             
         except Exception as e:
             PrettyOutput.print(f"Failed to search: {str(e)}", output_type=OutputType.ERROR)
             return []
 
     def ask_codebase(self, query: str, top_k: int=20) -> str:
-        """Query the codebase"""
-        reuslts_from_codebase = self.search_similar(query, top_k)
+        """Query the codebase with enhanced context building"""
+        files_from_codebase = self.search_similar(query, top_k)
         
         from jarvis.jarvis_code_agent.relevant_files import find_relevant_files_from_agent
-        results_from_agent = find_relevant_files_from_agent(query, reuslts_from_codebase)
+        files_from_agent = find_relevant_files_from_agent(query, files_from_codebase)
 
-        if not results_from_agent:
+        if not files_from_agent:
             PrettyOutput.print("No related files found", output_type=OutputType.WARNING)
             return ""
         
-        message = "Found related files:\n"
-        for path in results_from_agent:
-            message += f"File: {path}\n"
-        PrettyOutput.print(message.rstrip(), output_type=OutputType.SUCCESS, lang="markdown")
+        output = "Found related files:\n"
+        for path in files_from_agent:
+            output += f"- {path}\n"
+        PrettyOutput.print(output, output_type=OutputType.INFO, lang="markdown")
         
-        prompt = f"""You are a code expert, please answer the user's question based on the following file information:
+        # Build enhanced prompt
+        prompt = f"""Based on the following code files, please provide a comprehensive and accurate answer to the user's question.
+
+Important guidelines:
+1. Focus on code-specific details and implementation
+2. Explain technical concepts clearly
+3. Include relevant code snippets when helpful
+4. If the code doesn't fully answer the question, indicate what's missing
+
+Question: {query}
+
+Relevant code files (ordered by relevance):
 """
-        for path in results_from_agent:
+        # Add context with length control
+        available_length = self.max_context_length - len(prompt) - 1000  # Reserve space for answer
+        current_length = 0
+        
+        for path in files_from_agent:
             try:
-                if len(prompt) > self.max_context_length:
-                    PrettyOutput.print(f"Avoid context overflow, discard low-related file: {path}", OutputType.WARNING)
-                    continue
                 content = open(path, "r", encoding="utf-8").read()
-                prompt += f"""
-File path: {path}
-File content:
+                file_content = f"""
+File: {path}
+Content:
 {content}
-========================================
+----------------------------------------
 """
+                if current_length + len(file_content) > available_length:
+                    PrettyOutput.print(
+                        "Due to context length limit, some files were omitted", 
+                        output_type=OutputType.WARNING
+                    )
+                    break
+                    
+                prompt += file_content
+                current_length += len(file_content)
+                
             except Exception as e:
                 PrettyOutput.print(f"Failed to read file {path}: {str(e)}", 
-                                 output_type=OutputType.ERROR)
+                                output_type=OutputType.ERROR)
                 continue
-                
-        prompt += f"""
-User question: {query}
-
-Please answer the user's question in Chinese using professional language. If the provided file content is insufficient to answer the user's question, please inform the user. Never make up information.
-
-Add reference files and code snippets at the end of the answer.
+        
+        prompt += """
+Please structure your answer as follows:
+1. Direct answer to the question
+2. Relevant code explanations
+3. Implementation details
+4. Any missing information or limitations
+5. Add reference files and code snippets at the end of the answer.
+
+Answer in Chinese using professional language.
 """
-        model = PlatformRegistry.get_global_platform_registry().get_codegen_platform()
+        
+        model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
         response = model.chat_until_success(prompt)
+        
         return response
 
     def is_index_generated(self) -> bool: